X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Feffectstack%2Fcollapsibleeffect.h;h=54daa70b7724faff8389f0bf2e00545dea940b10;hb=17a4a5bf6c8ab0cb1554a010a002a2e208d988c9;hp=35bafcc53b60da952df23a9062674c70c6b26724;hpb=e9d3607c48796a396961f65a014aff1005df7cf5;p=kdenlive

diff --git a/src/effectstack/collapsibleeffect.h b/src/effectstack/collapsibleeffect.h
index 35bafcc5..54daa70b 100644
--- a/src/effectstack/collapsibleeffect.h
+++ b/src/effectstack/collapsibleeffect.h
@@ -21,95 +21,17 @@
 #ifndef COLLAPSIBLEEFFECT_H
 #define COLLAPSIBLEEFFECT_H
 
-
-#include "ui_collapsiblewidget_ui.h"
-
+#include "parametercontainer.h"
 #include "abstractcollapsiblewidget.h"
 #include "timecode.h"
-#include "keyframeedit.h"
+
 
 #include <QDomElement>
 #include <QToolButton>
 
 class QFrame;
-class Monitor;
-class GeometryWidget;
-
-struct EffectMetaInfo {
-    MltVideoProfile profile;
-    Timecode timecode;
-    Monitor *monitor;
-    QPoint frameSize;
-    bool trackMode;
-};
-
-enum WIPE_DIRECTON { UP = 0, DOWN = 1, LEFT = 2, RIGHT = 3, CENTER = 4 };
-
-struct wipeInfo {
-    WIPE_DIRECTON start;
-    WIPE_DIRECTON end;
-    int startTransparency;
-    int endTransparency;
-};
-
-class MySpinBox : public QSpinBox
-{
-    Q_OBJECT
-
-public:
-    MySpinBox(QWidget * parent = 0);
-    
-protected:
-    virtual void focusInEvent(QFocusEvent*);
-    virtual void focusOutEvent(QFocusEvent*);
-};
-
-class ParameterContainer : public QObject
-{
-    Q_OBJECT
-
-public:
-    ParameterContainer(QDomElement effect, ItemInfo info, EffectMetaInfo *metaInfo, QWidget * parent = 0);
-    ~ParameterContainer();
-    void updateTimecodeFormat();
-    void updateProjectFormat(MltVideoProfile profile, Timecode t);
-    void updateParameter(const QString &key, const QString &value);
+class QLabel;
 
-private slots:
-    void slotCollectAllParameters();
-    void slotStartFilterJobAction();
-
-private:
-        /** @brief Updates parameter @param name according to new value of dependency.
-    * @param name Name of the parameter which will be updated
-    * @param type Type of the parameter which will be updated
-    * @param value Value of the dependency parameter */
-    void meetDependency(const QString& name, QString type, QString value);
-    wipeInfo getWipeInfo(QString value);
-    QString getWipeString(wipeInfo info);
-    
-    int m_in;
-    int m_out;
-    QList<QWidget*> m_uiItems;
-    QMap<QString, QWidget*> m_valueItems;
-    Timecode m_timecode;
-    KeyframeEdit *m_keyframeEditor;
-    GeometryWidget *m_geometryWidget;
-    EffectMetaInfo *m_metaInfo;
-    QDomElement m_effect;
-    QVBoxLayout *m_vbox;
-
-signals:
-    void parameterChanged(const QDomElement, const QDomElement, int);
-    void syncEffectsPos(int);
-    void effectStateChanged(bool);
-    void checkMonitorPosition(int);
-    void seekTimeline(int);
-    void showComments(bool);    
-    /** @brief Start an MLT filter job on this clip. */
-    void startFilterJob(QString filterName, QString filterParams, QString finalFilterName, QString consumer, QString consumerParams, QString properties);
-    
-};
 
 /**)
  * @class CollapsibleEffect
@@ -117,14 +39,15 @@ signals:
  * @author Jean-Baptiste Mardelle
  */
 
-class CollapsibleEffect : public AbstractCollapsibleWidget, public Ui::CollapsibleWidget_UI
+class CollapsibleEffect : public AbstractCollapsibleWidget
 {
     Q_OBJECT
 
 public:
     CollapsibleEffect(QDomElement effect, QDomElement original_effect, ItemInfo info, EffectMetaInfo *metaInfo, bool lastEffect, QWidget * parent = 0);
     ~CollapsibleEffect();
-    static QMap<QString, QImage> iconCache;
+    QLabel *title;
+	
     void setupWidget(ItemInfo info, EffectMetaInfo *metaInfo);
     void updateTimecodeFormat();
     void setActive(bool activate);
@@ -144,13 +67,16 @@ public:
     bool isActive() const;
     /** @brief Should the wheel event be sent to parent widget for scrolling. */
     bool filterWheelEvent;
-    
-    /** @brief Return the stylesheet required for effect parameters. */
-    static const QString getStyleSheet();
+    /** @brief Parent group was collapsed, update. */
+    void groupStateChanged(bool collapsed);
+    /** @brief Show / hide up / down buttons. */
+    void adjustButtons(int ix, int max);
+    /** @brief Returns true of this effect requires an on monitor adjustable effect scene. */
+    bool needsMonitorEffectScene() const;
 
 public slots:
     void slotSyncEffectsPos(int pos);
-    void slotEnable(bool enable, bool updateMainStatus = true);
+    void slotDisable(bool disable, bool emitInfo = true);
     void slotResetEffect();
 
 private slots:
@@ -165,6 +91,8 @@ private slots:
     void slotUnGroup();
     /** @brief A sub effect parameter was changed */
     void slotUpdateRegionEffectParams(const QDomElement /*old*/, const QDomElement /*e*/, int /*ix*/);
+    /** @brief Dis/enable effect before processing an operation (color picker) */
+    void slotDisableEffect(bool disable);
 
 private:
     ParameterContainer *m_paramWidget;
@@ -180,6 +108,10 @@ private:
     EffectInfo m_info;
     /** @brief True if this is a region effect, which behaves in a special way, like a group. */
     bool m_regionEffect;
+    /** @brief The add group action. */
+    QAction *m_groupAction;
+    /** @brief Check if collapsed state changed and inform MLT. */
+    void updateCollapsedState();
     
 protected:
     virtual void mouseDoubleClickEvent ( QMouseEvent * event );
@@ -191,24 +123,21 @@ protected:
 signals:
     void parameterChanged(const QDomElement, const QDomElement, int);
     void syncEffectsPos(int);
-    void effectStateChanged(bool, int ix = -1, bool updateMainStatus = true);
+    void effectStateChanged(bool, int ix, bool effectNeedsMonitorScene);
     void deleteEffect(const QDomElement);
-    void changeEffectPosition(int, bool);
     void activateEffect(int);
     void checkMonitorPosition(int);
     void seekTimeline(int);
     /** @brief Start an MLT filter job on this clip. */
-    void startFilterJob(QString filterName, QString filterParams, QString finalFilterName, QString consumer, QString consumerParams, QString properties);
-    /** @brief An effect was saved, trigger effect list reload. */
-    void reloadEffects();
+    void startFilterJob(QString filterName, QString filterParams, QString finalFilterName, QString consumer, QString consumerParams, QStringList extraParams);
     /** @brief An effect was reset, trigger param reload. */
     void resetEffect(int ix);
     /** @brief Ask for creation of a group. */
     void createGroup(int ix);
-    void moveEffect(int current_pos, int new_pos, int groupIndex, QString groupName);
     void unGroup(CollapsibleEffect *);
-    void addEffect(QDomElement e);
     void createRegion(int, KUrl);
+    void deleteGroup(QDomDocument);
+    void importClipKeyframes();
 };