Fix timeline handling of objects (move them instead of changing their bounding rect

[kdenlive] / src / customtrackview.h

diff --git a/src/customtrackview.h b/src/customtrackview.h
index e26d5aa7372bea71a801b22ec3a6069e94131c8c..2a4e5d24bddd1bb7664d269b07a93e9bd6d52639 100644 (file)
--- a/src/customtrackview.h
+++ b/src/customtrackview.h
@@ -25,12 +25,12 @@
 #include <QGraphicsItemAnimation>
 #include <QTimeLine>
 #include <QMenu>
-
-#include <KUndoStack>
+#include <QUndoStack>
 
 #include "kdenlivedoc.h"
 #include "docclipbase.h"
 #include "guide.h"
+#include "effectslist.h"
 
 class ClipItem;
 class AbstractClipItem;
@@ -54,18 +54,19 @@ public:
     /** move transition, startPos = (old start, old end), endPos = (new start, new end) */
     void moveTransition(const ItemInfo start, const ItemInfo end);
     void resizeClip(const ItemInfo start, const ItemInfo end);
-    void addClip(QDomElement xml, int clipId, ItemInfo info);
+    void addClip(QDomElement xml, int clipId, ItemInfo info, EffectsList list = EffectsList());
     void deleteClip(ItemInfo info);
     void slotAddClipMarker();
     void slotEditClipMarker();
     void slotDeleteClipMarker();
+    void slotDeleteAllClipMarkers();
     void addMarker(const int id, const GenTime &pos, const QString comment);
     void setScale(double scaleFactor);
     void deleteClip(int clipId);
     void slotAddEffect(QDomElement effect, GenTime pos, int track);
     void addEffect(int track, GenTime pos, QDomElement effect);
     void deleteEffect(int track, GenTime pos, QDomElement effect);
-    void updateEffect(int track, GenTime pos, QDomElement effect);
+    void updateEffect(int track, GenTime pos, QDomElement effect, int ix);
     void moveEffect(int track, GenTime pos, int oldPos, int newPos);
     void addTransition(ItemInfo transitionInfo, int endTrack, QDomElement params);
     void deleteTransition(ItemInfo transitionInfo, int endTrack, QDomElement params);
@@ -83,17 +84,24 @@ public:
     void slotSeekToPreviousSnap();
     void slotSeekToNextSnap();
     double getSnapPointForPos(double pos);
-    QDomElement xmlInfo();
     void editKeyFrame(const GenTime pos, const int track, const int index, const QString keyframes);
+    bool findString(const QString &text);
+    bool findNextString(const QString &text);
+    void initSearchStrings();
+    void clearSearchStrings();
+    void clipStart();
+    void clipEnd();
+    void changeClipSpeed();
+    void doChangeClipSpeed(ItemInfo info, double speed, int id);
 
 public slots:
     void setCursorPos(int pos, bool seek = true);
     void moveCursorPos(int delta);
     void updateCursorPos();
     void slotDeleteEffect(ClipItem *clip, QDomElement effect);
-    void slotChangeEffectState(ClipItem *clip, QDomElement effect, bool disable);
+    void slotChangeEffectState(ClipItem *clip, int effectPos, bool disable);
     void slotChangeEffectPosition(ClipItem *clip, int currentPos, int newPos);
-    void slotUpdateClipEffect(ClipItem *clip, QDomElement oldeffect, QDomElement effect);
+    void slotUpdateClipEffect(ClipItem *clip, QDomElement oldeffect, QDomElement effect, int ix);
     void slotRefreshEffects(ClipItem *clip);
     void setDuration(int duration);
     void slotAddTransition(ClipItem* clip, ItemInfo transitionInfo, int endTrack, QDomElement transition = QDomElement());
@@ -105,8 +113,14 @@ public slots:
     void slotAddClipMarker(int id, GenTime t, QString c);
     bool addGuide(const GenTime pos, const QString &comment);
     void slotAddGuide();
+    void slotEditGuide(CommentedTime guide);
+    void slotEditGuide();
     void slotDeleteGuide();
+    void slotDeleteAllGuides();
     void editGuide(const GenTime oldPos, const GenTime pos, const QString &comment);
+    void copyClip();
+    void pasteClip();
+    void pasteClipEffects();
 
 protected:
     virtual void drawBackground(QPainter * painter, const QRectF & rect);
@@ -133,7 +147,7 @@ private:
     OPERATIONTYPE m_moveOpMode;
     AbstractClipItem *m_dragItem;
     Guide *m_dragGuide;
-    KUndoStack *m_commandStack;
+    QUndoStack *m_commandStack;
     QGraphicsItem *m_visualTip;
     QGraphicsItemAnimation *m_animation;
     QTimeLine *m_animationTimer;
@@ -143,6 +157,7 @@ private:
     QPoint m_clickPoint;
     QPoint m_clickEvent;
     QList <GenTime> m_snapPoints;
+    QList <CommentedTime> m_searchPoints;
     QList <Guide *> m_guides;
     void updateSnapPoints(AbstractClipItem *selected);
     ClipItem *getClipItemAt(int pos, int track);
@@ -157,11 +172,27 @@ private:
     QMenu *m_timelineContextClipMenu;
     QMenu *m_timelineContextTransitionMenu;
     QList <TrackInfo> m_tracksList;
+    QList <CommentedTime> m_searchStrings;
+    int m_findIndex;
     PROJECTTOOL m_tool;
     QCursor m_razorCursor;
+    /** list containing items currently copied in the timeline */
+    QList<AbstractClipItem *> m_copiedItems;
+    QList<AbstractClipItem *> m_selectedClipList;
+    /** Used to get the point in timeline where a context menu was opened */
+    QPoint m_menuPosition;
+    bool m_blockRefresh;
+
     /** Get the index of the video track that is just below current track */
     int getPreviousVideoTrack(int track);
     void updateClipFade(ClipItem * item, bool updateFadeOut = false);
+    bool canBePastedTo(ItemInfo info, int type) const;
+    bool canBePasted(QList<AbstractClipItem *> items, GenTime offset, int trackOffset) const;
+    bool canBeMoved(QList<AbstractClipItem *> items, GenTime offset, int trackOffset) const;
+
+private slots:
+    void slotRefreshGuides();
+    void slotEnableRefresh();
 
 signals:
     void cursorMoved(int, int);