Fix group move, should solve:

[kdenlive] / src / customtrackview.h

diff --git a/src/customtrackview.h b/src/customtrackview.h
index 79a0510b0d7b36151ccafe423bdfcd3a942bcf30..9c6a91ec8e715d76f78c500fb5af6bf5e105639c 100644 (file)
--- a/src/customtrackview.h
+++ b/src/customtrackview.h
@@ -48,8 +48,9 @@ public:
     virtual void mouseReleaseEvent(QMouseEvent * event);
     virtual void mouseMoveEvent(QMouseEvent * event);
     virtual void mouseDoubleClickEvent(QMouseEvent *event);
-    void addTrack(TrackInfo type);
-    void removeTrack();
+    void addTrack(TrackInfo type, int ix = -1);
+    void removeTrack(int ix);
+    void changeTrack(int ix, TrackInfo type);
     int cursorPos();
     void checkAutoScroll();
     void moveClip(const ItemInfo start, const ItemInfo end);
@@ -58,10 +59,8 @@ public:
     void resizeClip(const ItemInfo start, const ItemInfo end);
     void addClip(QDomElement xml, const QString &clipId, ItemInfo info, EffectsList list = EffectsList());
     void deleteClip(ItemInfo info);
-    void slotAddClipMarker();
-    void slotEditClipMarker();
-    void slotDeleteClipMarker();
-    void slotDeleteAllClipMarkers();
+    void slotDeleteClipMarker(const QString &comment, const QString &id, const GenTime &position);
+    void slotDeleteAllClipMarkers(const QString &id);
     void addMarker(const QString &id, const GenTime &pos, const QString comment);
     void setScale(double scaleFactor);
     void deleteClip(const QString &clipId);
@@ -80,7 +79,7 @@ public:
     void cutSelectedClips();
     void setContextMenu(QMenu *timeline, QMenu *clip, QMenu *transition);
     void checkTrackHeight();
-    QList <TrackInfo> tracksList() const;
+    //QList <TrackInfo> tracksList() const;
     void setTool(PROJECTTOOL tool);
     void cutClip(ItemInfo info, GenTime cutTime, bool cut);
     void slotSeekToPreviousSnap();
@@ -99,7 +98,12 @@ public:
     void setInPoint();
     void setOutPoint();
     void slotInsertSpace();
+    void slotRemoveSpace();
     void insertSpace(const GenTime &pos, int track, const GenTime duration, bool add);
+    ClipItem *getActiveClipUnderCursor(bool allowOutsideCursor = false) const;
+    void addTimelineTrack(int ix, TrackInfo trackinfo);
+    void deleteTimelineTrack(int ix, TrackInfo trackinfo);
+    void changeTimelineTrack(int ix, TrackInfo trackinfo);
 
 public slots:
     void setCursorPos(int pos, bool seek = true);
@@ -131,6 +135,9 @@ public slots:
     void pasteClipEffects();
     void slotUpdateAllThumbs();
     void slotCheckPositionScrolling();
+    void slotInsertTrack(int ix);
+    void slotDeleteTrack(int ix);
+    void slotChangeTrack(int ix);
 
 protected:
     virtual void drawBackground(QPainter * painter, const QRectF & rect);
@@ -149,6 +156,7 @@ private:
     uint m_selectedTrack;
     int m_projectDuration;
     int m_cursorPos;
+    int m_spacerStart;
     KdenliveDoc *m_document;
     CustomTrackScene *m_scene;
     QGraphicsLineItem *m_cursorLine;
@@ -187,6 +195,7 @@ private:
     int m_findIndex;
     PROJECTTOOL m_tool;
     QCursor m_razorCursor;
+    QCursor m_spacerCursor;
     /** list containing items currently copied in the timeline */
     QList<AbstractClipItem *> m_copiedItems;
     /** Used to get the point in timeline where a context menu was opened */
@@ -202,8 +211,9 @@ private:
     bool canBeMoved(QList<AbstractClipItem *> items, GenTime offset, int trackOffset) const;
     ClipItem *getClipUnderCursor() const;
     ClipItem *getMainActiveClip() const;
-    ClipItem *getActiveClipUnderCursor() const;
     bool insertPossible(AbstractGroupItem *group, const QPoint &pos) const;
+    void resetSelectionGroup();
+    void groupSelectedItems();
 
 private slots:
     void slotRefreshGuides();