moved undostack to its own source file

effects/effect.cpp

@@ -20,6 +20,19 @@
 
 #include "effect.h"
 
+#include <QCheckBox>
+#include <QGridLayout>
+#include <QXmlStreamReader>
+#include <QXmlStreamWriter>
+#include <QMessageBox>
+#include <QOpenGLContext>
+#include <QDir>
+#include <QPainter>
+#include <QtMath>
+#include <QMenu>
+#include <QApplication>
+#include <QFileDialog>
+
 #include "panels/panels.h"
 #include "panels/viewer.h"
 #include "ui/viewerwidget.h"
@@ -39,6 +52,7 @@
 #include "project/clipboard.h"
 #include "global/config.h"
 #include "transition.h"
+#include "undo/undostack.h"
 
 #include "effects/internal/transformeffect.h"
 #include "effects/internal/texteffect.h"
@@ -54,19 +68,6 @@
 #include "effects/internal/fillleftrighteffect.h"
 #include "effects/internal/frei0reffect.h"
 
-#include <QCheckBox>
-#include <QGridLayout>
-#include <QXmlStreamReader>
-#include <QXmlStreamWriter>
-#include <QMessageBox>
-#include <QOpenGLContext>
-#include <QDir>
-#include <QPainter>
-#include <QtMath>
-#include <QMenu>
-#include <QApplication>
-#include <QFileDialog>
-
 QVector<EffectMeta> effects;
 
 EffectPtr Effect::Create(Clip* c, const EffectMeta* em) {
@@ -295,7 +296,7 @@ Effect::Effect(Clip* c, const EffectMeta *em) :
               }
             }
           } else if (reader.name() == "shader" && reader.isStartElement()) {
-            SetFlags(Flags() & ShaderFlag);
+            SetFlags(Flags() | ShaderFlag);
             const QXmlStreamAttributes& attributes = reader.attributes();
             for (int i=0;i<attributes.size();i++) {
               const QXmlStreamAttribute& attr = attributes.at(i);
@@ -855,6 +856,7 @@ void Effect::process_shader(double timecode, GLTextureCoords&, int iteration) {
         case EffectField::EFFECT_FIELD_STRING:
         case EffectField::EFFECT_FIELD_FONT:
         case EffectField::EFFECT_FIELD_FILE:
+        case EffectField::EFFECT_FIELD_UI:
           break;
         }
       }

effects/effectfield.h

@@ -27,6 +27,7 @@
 
 #include "effects/keyframe.h"
 #include "undo/undo.h"
+#include "undo/undostack.h"
 
 class EffectRow;
 class ComboAction;

effects/effectgizmo.cpp

@@ -46,16 +46,6 @@ EffectGizmo::EffectGizmo(Effect *parent, int type) :
   color = Qt::white;
 }
 
-void EffectGizmo::set_previous_value() {
-  // TODO address this
-  /*
-  if (x_field1 != nullptr) static_cast<LabelSlider*>(x_field1->ui_element)->set_previous_value();
-  if (y_field1 != nullptr) static_cast<LabelSlider*>(y_field1->ui_element)->set_previous_value();
-  if (x_field2 != nullptr) static_cast<LabelSlider*>(x_field2->ui_element)->set_previous_value();
-  if (y_field2 != nullptr) static_cast<LabelSlider*>(y_field2->ui_element)->set_previous_value();
-  */
-}
-
 int EffectGizmo::get_point_count() {
   return world_pos.size();
 }

effects/effectgizmo.h

@@ -57,8 +57,6 @@ public:
   DoubleField* y_field2;
   double y_field_multi2;
 
-  void set_previous_value();
-
   QColor color;
   int get_point_count();
 

effects/effectrow.cpp

@@ -25,6 +25,7 @@
 #include <QMessageBox>
 
 #include "undo/undo.h"
+#include "undo/undostack.h"
 #include "timeline/clip.h"
 #include "timeline/sequence.h"
 #include "panels/panels.h"

effects/internal/cornerpineffect.cpp

@@ -25,7 +25,7 @@
 #include "global/debug.h"
 
 CornerPinEffect::CornerPinEffect(Clip* c, const EffectMeta *em) : Effect(c, em) {
-  SetFlags(Effect::CoordsFlag & Effect::ShaderFlag);
+  SetFlags(Effect::CoordsFlag | Effect::ShaderFlag);
 
   EffectRow* top_left = new EffectRow(this, tr("Top Left"));
   top_left_x = new DoubleField(top_left, "topleftx");

effects/keyframe.cpp

@@ -24,6 +24,7 @@
 
 #include "effectfields.h"
 #include "undo/undo.h"
+#include "undo/undostack.h"
 #include "panels/panels.h"
 
 EffectKeyframe::EffectKeyframe()