merged with master

effects/effect.cpp

@@ -44,7 +44,6 @@
 #include "panels/timeline.h"
 #include "panels/effectcontrols.h"
 #include "panels/grapheditor.h"
-#include "ui/checkboxex.h"
 #include "global/debug.h"
 #include "global/path.h"
 #include "ui/mainwindow.h"

effects/effect.h

@@ -41,7 +41,6 @@
 #include <random>
 
 #include "ui/collapsiblewidget.h"
-#include "ui/checkboxex.h"
 #include "effectrow.h"
 #include "effectgizmo.h"
 #include "rendering/qopenglshaderprogramptr.h"

effects/effectfield.cpp

@@ -23,26 +23,14 @@
 #include <QDateTime>
 #include <QtMath>
 
-#include "ui/labelslider.h"
-#include "ui/colorbutton.h"
-#include "ui/texteditex.h"
-#include "ui/checkboxex.h"
-#include "ui/comboboxex.h"
-#include "ui/embeddedfilechooser.h"
-
 #include "rendering/renderfunctions.h"
-
 #include "global/config.h"
-
 #include "effects/effectrow.h"
 #include "effects/effect.h"
-
 #include "undo/undo.h"
 #include "timeline/clip.h"
 #include "timeline/sequence.h"
-
 #include "global/math.h"
-
 #include "global/debug.h"
 
 EffectField::EffectField(EffectRow* parent, const QString &i, EffectFieldType t) :

effects/fields/boolfield.h

@@ -23,6 +23,11 @@
 
 #include "../effectfield.h"
 
+/**
+ * @brief The BoolField class
+ *
+ * An EffectField derivative the uses boolean values (true or false) and uses a checkbox as its visual representation.
+ */
 class BoolField : public EffectField
 {
   Q_OBJECT

effects/fields/stringfield.cpp

@@ -30,7 +30,8 @@ StringField::StringField(EffectRow* parent, const QString& id, bool rich_text) :
   EffectField(parent, id, EFFECT_FIELD_STRING),
   rich_text_(rich_text)
 {
-
+  // Set default value to an empty string
+  SetValueAt(0, "");
 }
 
 QString StringField::GetStringAt(double timecode)
@@ -50,9 +51,9 @@ QWidget *StringField::CreateWidget(QWidget *existing)
     text_edit->setUndoRedoEnabled(true);
 
     // the "2" is because the height needs one extra pixel of padding on the top and the bottom
-    text_edit->setFixedHeight(qCeil(text_edit->fontMetrics().lineSpacing()*olive::CurrentConfig.effect_textbox_lines
-                                    + text_edit->document()->documentMargin()
-                                    + text_edit->document()->documentMargin() + 2));
+    text_edit->setTextHeight(qCeil(text_edit->fontMetrics().lineSpacing()*olive::CurrentConfig.effect_textbox_lines
+                                   + text_edit->document()->documentMargin()
+                                   + text_edit->document()->documentMargin() + 2));
 
   } else {
 

effects/internal/texteffect.cpp

@@ -298,8 +298,6 @@ void TextEffect::redraw(double timecode) {
 }
 
 void TextEffect::shadow_enable(bool e) {
-  close();
-
   shadow_color->SetEnabled(e);
   shadow_angle->SetEnabled(e);
   shadow_distance->SetEnabled(e);

effects/internal/timecodeeffect.cpp

@@ -82,7 +82,7 @@ TimecodeEffect::TimecodeEffect(Clip* c, const EffectMeta* em) :
   offset_y_val = new DoubleField(offset_row, "offsety");
 
   EffectRow* prepent_text_row = new EffectRow(this, tr("Prepend"));
-  prepend_text = new StringField(prepent_text_row, "prepend");
+  prepend_text = new StringField(prepent_text_row, "prepend", false);
   prepend_text->SetColumnSpan(2);
 }
 

effects/internal/vsthost.cpp

@@ -31,6 +31,7 @@
 
 #include "rendering/audio.h"
 #include "ui/mainwindow.h"
+#include "global/global.h"
 #include "global/debug.h"
 
 #ifdef __linux__
@@ -83,7 +84,7 @@ intptr_t hostCallback(AEffect* effect, int32_t opcode, int32_t index, intptr_t v
     // but we are aware of it
     break;
   case audioMasterEndEdit: // change made
-    olive::MainWindow->setWindowModified(true);
+    olive::Global->set_modified(true);
     break;
   default:
     qInfo() << "Plugin requested unhandled opcode" << opcode;