Effectstack: Fix dropping on a group

[kdenlive] / src / effectstack / effectstackview2.h

diff --git a/src/effectstack/effectstackview2.h b/src/effectstack/effectstackview2.h
index fc8e601f8126788cb05af0cde0b94de135ca8c03..a3ab02f02d8db433e1590c4d597f62b6cf46567b 100644 (file)
--- a/src/effectstack/effectstackview2.h
+++ b/src/effectstack/effectstackview2.h
@@ -45,10 +45,6 @@ public:
     /** @brief Raises @param dock if a clip is loaded. */
     void raiseWindow(QWidget* dock);
 
-    /** @brief Sets the add effect button's menu to @param menu. */
-    void setMenu(QMenu *menu);
-
-
     /** @brief return the index of the track displayed in effect stack
      ** @param ok set to true if we are looking at a track's effects, otherwise false. */
     int isTrackMode(bool *ok) const;
@@ -66,10 +62,14 @@ public:
     virtual bool eventFilter( QObject * o, QEvent * e );
     
     CollapsibleEffect *getEffectByIndex(int ix);
+    
+    /** @brief Delete currently selected effect. */
+    void deleteCurrentEffect();
 
 protected:
     virtual void mouseMoveEvent(QMouseEvent * event);
     virtual void mouseReleaseEvent(QMouseEvent * event);
+    virtual void resizeEvent ( QResizeEvent * event );
   
 private:
     Ui::EffectStack2_UI m_ui;
@@ -109,9 +109,9 @@ public slots:
     void slotClipItemSelected(ClipItem* c, int ix);
 
     void slotTrackItemSelected(int ix, const TrackInfo info);
-
-    /** @brief Removes the selected effect. */
-    void slotItemDel();
+   
+    /** @brief Check if the mouse wheel events should be used for scrolling the widget view. */
+    void slotCheckWheelEventFilter();
 
 private slots:
 
@@ -130,10 +130,10 @@ private slots:
     /** @brief Move an effect in the stack.
      * @param index The effect index in the stack
      * @param up true if we want to move effect up, false for down */
-    void slotMoveEffect(int index, bool up);
+    void slotMoveEffectUp(int index, bool up);
 
     /** @brief Delete an effect in the stack. */
-    void slotDeleteEffect(const QDomElement effect, int index);
+    void slotDeleteEffect(const QDomElement effect);
 
     /** @brief Pass position changes of the timeline cursor to the effects to keep their local timelines in sync. */
     void slotRenderPos(int pos);
@@ -154,11 +154,25 @@ private slots:
     
     /** @brief Move an effect into a group.
       ** @param ix the index of effect to move in stack layout
-      ** @param group the effect group where the effect is moved
+      ** @param group the effect on which the effect was dropped
       ** @param lastEffectIndex the last effect index in the group, effect will be inserted after that index
       */
-    void slotMoveEffectToGroup(int ix, CollapsibleEffect *group, int lastEffectIndex);
-
+    void slotMoveEffect(int currentIndex, int newIndex, CollapsibleEffect* target);
+    
+    /** @brief Remove effects from a group */
+    void slotUnGroup(CollapsibleEffect* group);
+    
+    /** @brief Add en effect to selected clip */
+    void slotAddEffect(QDomElement effect);
+    
+    /** @brief Enable / disable all effects for the clip */
+    void slotCheckAll(int state);
+    
+    /** @brief Update check all button status */
+    void slotUpdateCheckAllButton();
+    
+    /** @brief Display additionnal effect info */
+    void slotShowComments();
 
 signals:
     void removeEffect(ClipItem*, int, QDomElement);
@@ -180,6 +194,7 @@ signals:
     void displayMessage(const QString&, int);
     void showComments(bool show);
     void startFilterJob(ItemInfo info, const QString &clipId, const QString &filterName, const QString &filterParams, const QString&finalFilterName, const QString &consumer, const QString &consumerParams, const QString &properties);
+    void addEffect(ClipItem*,QDomElement);
 };
 
 #endif