X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Feffectstackedit.h;h=c1fff7d9f5cd31115b139ac0621a608147ccdfd9;hb=0e31c05683b6930bcc40eec89de447e70e3a3be7;hp=c7767b496ed9d0e99bd7a667f151a2af18f3003e;hpb=f42900025509b167f8e9e7b0cfe41e132feb53bd;p=kdenlive

diff --git a/src/effectstackedit.h b/src/effectstackedit.h
index c7767b49..c1fff7d9 100644
--- a/src/effectstackedit.h
+++ b/src/effectstackedit.h
@@ -18,14 +18,16 @@
 #ifndef EFFECTSTACKEDIT_H
 #define EFFECTSTACKEDIT_H
 
+#include "definitions.h"
+#include "timecode.h"
+#include "keyframeedit.h"
+
 #include <QWidget>
 #include <QDomElement>
 #include <QVBoxLayout>
 #include <QList>
 #include <QMap>
-
-#include "definitions.h"
-#include "timecode.h"
+#include <QScrollArea>
 
 enum WIPE_DIRECTON { UP = 0, DOWN = 1, LEFT = 2, RIGHT = 3, CENTER = 4 };
 
@@ -38,7 +40,7 @@ struct wipeInfo {
 
 class QFrame;
 
-class EffectStackEdit : public QWidget
+class EffectStackEdit : public QScrollArea
 {
     Q_OBJECT
 public:
@@ -47,41 +49,39 @@ public:
     void updateProjectFormat(MltVideoProfile profile, Timecode t);
     static QMap<QString, QImage> iconCache;
     void updateParameter(const QString &name, const QString &value);
-
-    class UiItem {
-    public:
-        UiItem() {};
-        ~UiItem() {};
-    };
+    void setFrameSize(QPoint p);
+    void updateTimecodeFormat();
 
 private:
     void clearAllItems();
-    QVBoxLayout *vbox;
-    QList<QWidget*> items;
-    QList<UiItem*> uiItems;
-    QDomElement params;
-    QMap<QString, void*> valueItems;
-    void createSliderItem(const QString& name, int val , int min, int max);
+    QVBoxLayout *m_vbox;
+    QList<QWidget*> m_uiItems;
+    QWidget *m_baseWidget;
+    QDomElement m_params;
+    QMap<QString, QWidget*> m_valueItems;
+    void createSliderItem(const QString& name, int val , int min, int max, const QString);
     wipeInfo getWipeInfo(QString value);
     QString getWipeString(wipeInfo info);
     MltVideoProfile m_profile;
     Timecode m_timecode;
     int m_in;
     int m_out;
+    QPoint m_frameSize;
+    KeyframeEdit *m_keyframeEditor;
 
 public slots:
-    void transferParamDesc(const QDomElement&, int , int);
+    void transferParamDesc(const QDomElement, int , int);
     void slotSliderMoved(int);
     /** \brief Called whenever(?) some parameter is changed in the gui.
      *
-     * Transfers all Dynamic gui parameter settings into params(??) */
+     * Transfers all Dynamic gui parameter settings into m_params(??) */
     void collectAllParameters();
 
 private slots:
     void slotSeekToPos(int);
 
 signals:
-    void parameterChanged(const QDomElement&, const QDomElement&);
+    void parameterChanged(const QDomElement, const QDomElement);
     void seekTimeline(int);
 };