Scroll timeline when seeking near a border and also when dragging a clip, should...

[kdenlive] / src / customtrackview.h

diff --git a/src/customtrackview.h b/src/customtrackview.h
index 099fbb6da935a84bcf79a2dcf3b750adea12f4b0..30d09246e6ebc36b299922a1422cabc76e0dc160 100644 (file)
--- a/src/customtrackview.h
+++ b/src/customtrackview.h
@@ -68,11 +68,11 @@ public:
     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, int ix);
+    void updateEffect(int track, GenTime pos, QDomElement effect, int ix, bool triggeredByUser = true);
     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);
-    void updateTransition(int track, GenTime pos,  QDomElement oldTransition, QDomElement transition);
+    void updateTransition(int track, GenTime pos,  QDomElement oldTransition, QDomElement transition, bool updateTransitionWidget);
     void moveTransition(GenTime oldpos, GenTime newpos);
     void activateMonitor();
     int duration() const;
@@ -94,7 +94,7 @@ public:
     void clipStart();
     void clipEnd();
     void changeClipSpeed();
-    void doChangeClipSpeed(ItemInfo info, double speed, const QString &id);
+    void doChangeClipSpeed(ItemInfo info, const double speed, const double oldspeed, const QString &id);
     void setDocumentModified();
     void setInPoint();
     void setOutPoint();
@@ -112,6 +112,7 @@ public slots:
     void slotAddTransition(ClipItem* clip, ItemInfo transitionInfo, int endTrack, QDomElement transition = QDomElement());
     void slotAddTransitionToSelectedClips(QDomElement transition);
     void slotTransitionUpdated(Transition *, QDomElement);
+    void slotTransitionTrackUpdated(Transition *tr, int track);
     void slotSwitchTrackAudio(int ix);
     void slotSwitchTrackVideo(int ix);
     void slotUpdateClip(const QString &clipId);
@@ -127,6 +128,7 @@ public slots:
     void pasteClip();
     void pasteClipEffects();
     void slotUpdateAllThumbs();
+    void slotCheckPositionScrolling();
 
 protected:
     virtual void drawBackground(QPainter * painter, const QRectF & rect);
@@ -176,6 +178,8 @@ private:
     QMenu *m_timelineContextMenu;
     QMenu *m_timelineContextClipMenu;
     QMenu *m_timelineContextTransitionMenu;
+    QTimer m_scrollTimer;
+    int m_scrollOffset;
 
     QList <CommentedTime> m_searchStrings;
     int m_findIndex;
@@ -187,7 +191,6 @@ private:
     QPoint m_menuPosition;
     bool m_blockRefresh;
     AbstractGroupItem *m_selectionGroup;
-    AbstractGroupItem *m_dropGroup;
 
     /** Get the index of the video track that is just below current track */
     int getPreviousVideoTrack(int track);
@@ -198,10 +201,12 @@ private:
     ClipItem *getClipUnderCursor() const;
     ClipItem *getMainActiveClip() const;
     ClipItem *getActiveClipUnderCursor() const;
+    bool insertPossible(AbstractGroupItem *group, const QPoint &pos) const;
 
 private slots:
     void slotRefreshGuides();
     void slotEnableRefresh();
+    void slotCheckMouseScrolling();
 
 signals:
     void cursorMoved(int, int);
@@ -209,7 +214,7 @@ signals:
     void zoomOut();
     void mousePosition(int);
     void clipItemSelected(ClipItem*, int ix = -1);
-    void transitionItemSelected(Transition*);
+    void transitionItemSelected(Transition*, bool update = false);
     void activateDocumentMonitor();
     void trackHeightChanged();
     void displayMessage(const QString, MessageType);