X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Fcustomtrackview.h;h=c56cf2acbafaf0082da22947b1d893e8cf1f26aa;hb=64bfc766fdc06622b5a6fae7ed2512de7736bdf8;hp=991936f3ca16d670a018af1127089f57ef8e3289;hpb=217122c6962f460874ec81478e7dfb6d7a52b3d0;p=kdenlive diff --git a/src/customtrackview.h b/src/customtrackview.h index 991936f3..c56cf2ac 100644 --- a/src/customtrackview.h +++ b/src/customtrackview.h @@ -25,8 +25,7 @@ #include #include #include - -#include +#include #include "kdenlivedoc.h" #include "docclipbase.h" @@ -35,43 +34,44 @@ class ClipItem; class AbstractClipItem; +class AbstractGroupItem; class Transition; +class CustomTrackScene; class CustomTrackView : public QGraphicsView { Q_OBJECT public: - CustomTrackView(KdenliveDoc *doc, QGraphicsScene * projectscene, QWidget *parent = 0); + CustomTrackView(KdenliveDoc *doc, CustomTrackScene* projectscene, QWidget *parent = 0); virtual ~ CustomTrackView(); virtual void mousePressEvent(QMouseEvent * event); 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); /** 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, EffectsList list = EffectsList()); + 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 addMarker(const int id, const GenTime &pos, const QString comment); + 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(int clipId); + void deleteClip(const QString &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, 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; @@ -79,7 +79,7 @@ public: void cutSelectedClips(); void setContextMenu(QMenu *timeline, QMenu *clip, QMenu *transition); void checkTrackHeight(); - QList tracksList() const; + //QList tracksList() const; void setTool(PROJECTTOOL tool); void cutClip(ItemInfo info, GenTime cutTime, bool cut); void slotSeekToPreviousSnap(); @@ -92,6 +92,18 @@ public: void clearSearchStrings(); void clipStart(); void clipEnd(); + void changeClipSpeed(); + void doChangeClipSpeed(ItemInfo info, const double speed, const double oldspeed, const QString &id); + void setDocumentModified(); + 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); @@ -106,10 +118,11 @@ 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(int clipId); - void slotAddClipMarker(int id, GenTime t, QString c); + void slotUpdateClip(const QString &clipId); + void slotAddClipMarker(const QString &id, GenTime t, QString c); bool addGuide(const GenTime pos, const QString &comment); void slotAddGuide(); void slotEditGuide(CommentedTime guide); @@ -119,6 +132,12 @@ public slots: void editGuide(const GenTime oldPos, const GenTime pos, const QString &comment); void copyClip(); void pasteClip(); + 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); @@ -134,27 +153,27 @@ protected: private: uint m_tracksHeight; + uint m_selectedTrack; int m_projectDuration; int m_cursorPos; - ClipItem *m_dropItem; + int m_spacerStart; KdenliveDoc *m_document; - void addItem(DocClipBase *clip, QPoint pos); + CustomTrackScene *m_scene; QGraphicsLineItem *m_cursorLine; ItemInfo m_dragItemInfo; + ItemInfo m_selectionGroupInfo; OPERATIONTYPE m_operationMode; OPERATIONTYPE m_moveOpMode; AbstractClipItem *m_dragItem; Guide *m_dragGuide; - KUndoStack *m_commandStack; + QUndoStack *m_commandStack; QGraphicsItem *m_visualTip; QGraphicsItemAnimation *m_animation; QTimeLine *m_animationTimer; QColor m_tipColor; QPen m_tipPen; - double m_scale; QPoint m_clickPoint; QPoint m_clickEvent; - QList m_snapPoints; QList m_searchPoints; QList m_guides; void updateSnapPoints(AbstractClipItem *selected); @@ -169,16 +188,20 @@ private: QMenu *m_timelineContextMenu; QMenu *m_timelineContextClipMenu; QMenu *m_timelineContextTransitionMenu; - QList m_tracksList; + QTimer m_scrollTimer; + int m_scrollOffset; + QList m_searchStrings; int m_findIndex; PROJECTTOOL m_tool; QCursor m_razorCursor; + QCursor m_spacerCursor; /** list containing items currently copied in the timeline */ QList m_copiedItems; - QList m_selectedClipList; /** Used to get the point in timeline where a context menu was opened */ QPoint m_menuPosition; + bool m_blockRefresh; + AbstractGroupItem *m_selectionGroup; /** Get the index of the video track that is just below current track */ int getPreviousVideoTrack(int track); @@ -186,17 +209,23 @@ private: bool canBePastedTo(ItemInfo info, int type) const; bool canBePasted(QList items, GenTime offset, int trackOffset) const; bool canBeMoved(QList items, GenTime offset, int trackOffset) const; + ClipItem *getClipUnderCursor() const; + ClipItem *getMainActiveClip() const; + bool insertPossible(AbstractGroupItem *group, const QPoint &pos) const; + void resetSelectionGroup(); private slots: void slotRefreshGuides(); + void slotEnableRefresh(); + void slotCheckMouseScrolling(); signals: void cursorMoved(int, int); void zoomIn(); void zoomOut(); void mousePosition(int); - void clipItemSelected(ClipItem*); - void transitionItemSelected(Transition*); + void clipItemSelected(ClipItem*, int ix = -1); + void transitionItemSelected(Transition*, bool update = false); void activateDocumentMonitor(); void trackHeightChanged(); void displayMessage(const QString, MessageType);