X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Fcustomtrackview.h;h=cc75ed8f51d87f6c341c83d11a303751c6b9a984;hb=211a654bf4ff449637ce35800155f20844cebd72;hp=951abb536016fb4e8e7ffadb4ea398a674b6d3ce;hpb=233fa54c55ff9746c79dcd8c306565d24fd739e2;p=kdenlive

diff --git a/src/customtrackview.h b/src/customtrackview.h
index 951abb53..cc75ed8f 100644
--- a/src/customtrackview.h
+++ b/src/customtrackview.h
@@ -38,7 +38,8 @@ class AbstractGroupItem;
 class Transition;
 class CustomTrackScene;
 
-class CustomTrackView : public QGraphicsView {
+class CustomTrackView : public QGraphicsView
+{
     Q_OBJECT
 
 public:
@@ -66,6 +67,7 @@ public:
     void setScale(double scaleFactor);
     void deleteClip(const QString &clipId);
     void slotAddEffect(QDomElement effect, GenTime pos, int track);
+    void slotAddGroupEffect(QDomElement effect, AbstractGroupItem *group);
     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, bool triggeredByUser = true);
@@ -78,7 +80,7 @@ public:
     int duration() const;
     void deleteSelectedClips();
     void cutSelectedClips();
-    void setContextMenu(QMenu *timeline, QMenu *clip, QMenu *transition);
+    void setContextMenu(QMenu *timeline, QMenu *clip, QMenu *transition, QActionGroup *clipTypeGroup);
     void checkTrackHeight();
     //QList <TrackInfo> tracksList() const;
     void setTool(PROJECTTOOL tool);
@@ -109,6 +111,16 @@ public:
     QStringList getLadspaParams(QDomElement effect) const;
     void initCursorPos(int pos);
     void lockTrack(int ix, bool lock);
+    void groupClips(bool group = true);
+    void doGroupClips(QList <ItemInfo> clipInfos, QList <ItemInfo> transitionInfos, bool group);
+    void loadGroups(const QDomNodeList groups);
+    void splitAudio();
+    void doSplitAudio(const GenTime &pos, int track, bool split);
+    void setVideoOnly();
+    void setAudioOnly();
+    void setAudioAndVideo();
+    void doChangeClipType(const GenTime &pos, int track, bool videoOnly, bool audioOnly);
+    int hasGuide(int pos, int offset);
 
 public slots:
     void setCursorPos(int pos, bool seek = true);
@@ -131,8 +143,8 @@ public slots:
     bool addGuide(const GenTime pos, const QString &comment);
     void slotAddGuide();
     void slotEditGuide(CommentedTime guide);
-    void slotEditGuide();
-    void slotDeleteGuide();
+    void slotEditGuide(int guidePos = -1);
+    void slotDeleteGuide(int guidePos = -1);
     void slotDeleteAllGuides();
     void editGuide(const GenTime oldPos, const GenTime pos, const QString &comment);
     void copyClip();
@@ -155,11 +167,9 @@ protected:
     virtual void wheelEvent(QWheelEvent * e);
     virtual QStringList mimeTypes() const;
     virtual Qt::DropActions supportedDropActions() const;
-    virtual void resizeEvent(QResizeEvent * event);
 
 private:
-    uint m_tracksHeight;
-    uint m_selectedTrack;
+    int m_tracksHeight;
     int m_projectDuration;
     int m_cursorPos;
     KdenliveDoc *m_document;
@@ -186,21 +196,28 @@ private:
     ClipItem *getClipItemAt(GenTime pos, int track);
     ClipItem *getClipItemAtEnd(GenTime pos, int track);
     ClipItem *getClipItemAtStart(GenTime pos, int track);
+    Transition *getTransitionItemAt(int pos, int track);
     Transition *getTransitionItemAt(GenTime pos, int track);
     Transition *getTransitionItemAtEnd(GenTime pos, int track);
     Transition *getTransitionItemAtStart(GenTime pos, int track);
     void checkScrolling();
     /** Should we auto scroll while playing (keep in sync with KdenliveSettings::autoscroll() */
     bool m_autoScroll;
-    void displayContextMenu(QPoint pos, AbstractClipItem *clip = NULL);
+    void displayContextMenu(QPoint pos, AbstractClipItem *clip, AbstractGroupItem *group);
     QMenu *m_timelineContextMenu;
     QMenu *m_timelineContextClipMenu;
     QMenu *m_timelineContextTransitionMenu;
     QAction *m_autoTransition;
+    QAction *m_changeSpeedAction;
+    QAction *m_pasteEffectsAction;
+    QAction *m_ungroupAction;
+    QAction *m_editGuide;
+    QAction *m_deleteGuide;
+    QActionGroup *m_clipTypeGroup;
     QTimer m_scrollTimer;
     int m_scrollOffset;
+    bool m_clipDrag;
 
-    QList <CommentedTime> m_searchStrings;
     int m_findIndex;
     PROJECTTOOL m_tool;
     QCursor m_razorCursor;
@@ -222,12 +239,19 @@ private:
     ClipItem *getMainActiveClip() const;
     bool insertPossible(AbstractGroupItem *group, const QPoint &pos) const;
     void resetSelectionGroup(bool selectItems = true);
-    void groupSelectedItems(bool force = false);
+    void groupSelectedItems(bool force = false, bool createNewGroup = false);
+    /** Get available space for clip move (min and max free positions) */
+    void getClipAvailableSpace(AbstractClipItem *item, GenTime &minimum, GenTime &maximum);
+    /** Get available space for transition move (min and max free positions) */
+    void getTransitionAvailableSpace(AbstractClipItem *item, GenTime &minimum, GenTime &maximum);
+    void updateClipTypeActions(ClipItem *clip);
 
 private slots:
     void slotRefreshGuides();
     void slotEnableRefresh();
     void slotCheckMouseScrolling();
+    void slotEditTimeLineGuide();
+    void slotDeleteTimeLineGuide();
 
 signals:
     void cursorMoved(int, int);