Fix wrong group moving when groups overlap

[kdenlive] / src / trackview.h

diff --git a/src/trackview.h b/src/trackview.h
index 5dcbd7e997385ac44266a879be77e27aa87d1e19..c5992e98b25be755a27e883b742d2c6dad6d43ec 100644 (file)
--- a/src/trackview.h
+++ b/src/trackview.h
@@ -51,7 +51,7 @@ class TrackView : public QWidget, public Ui::TimeLine_UI
     Q_OBJECT
 
 public:
-    explicit TrackView(KdenliveDoc *doc, bool *ok, QWidget *parent = 0);
+    explicit TrackView(KdenliveDoc *doc, QList <QAction *> actions, bool *ok, QWidget *parent = 0);
     virtual ~ TrackView();
     void setEditMode(const QString & editMode);
     const QString & editMode() const;
@@ -76,6 +76,10 @@ public:
     * Parses all tracks to check if there is audio data. */
     bool checkProjectAudio() const;
 
+    void checkTrackHeight();
+    void updateProfile();
+    void updatePalette();
+
 protected:
     virtual void keyPressEvent(QKeyEvent * event);
 
@@ -100,11 +104,20 @@ private:
     KdenliveDoc *m_doc;
     int m_verticalZoom;
     QString m_documentErrors;
+    QList <QAction *> m_trackActions;
+    
     void parseDocument(QDomDocument doc);
     int slotAddProjectTrack(int ix, QDomElement xml, bool locked, QDomNodeList producers);
     DocClipBase *getMissingProducer(const QString id) const;
     void adjustTrackHeaders();
+    /** @brief Add effects from the xml. Returns true if some effect was upgraded, false if everything went fine.*/
     void slotAddProjectEffects(QDomNodeList effects, QDomElement parentNode, ClipItem *clip, int trackIndex);
+    
+    /** @brief Returns a kdenlive effect xml description from an effect tag / id */
+    QDomElement getEffectByTag(const QString &effecttag, const QString &effectid);
+    
+    /** @brief Adjust kdenlive effect xml parameters to the MLT value*/
+    void adjustparameterValue(QDomNodeList clipeffectparams, const QString &paramname, const QString &paramvalue);
 
 private slots:
     void setCursorPos(int pos);
@@ -137,8 +150,6 @@ signals:
     void mousePosition(int);
     void cursorMoved();
     void zoneMoved(int, int);
-    void insertTrack(int);
-    void deleteTrack(int);
     void configTrack(int);
     void updateTracksInfo();
     void setZoom(int);