Fix moving of keyframes in composite transitions

[kdenlive] / src / trackview.h

diff --git a/src/trackview.h b/src/trackview.h
index 514cdd880c54d3f9e7391148a73dd2f141974195..2defee005c97dff256b5daf8c9832b90d8f85829 100644 (file)
--- a/src/trackview.h
+++ b/src/trackview.h
@@ -22,7 +22,6 @@
 #define TRACKVIEW_H
 
 #include <QScrollArea>
-#include <QVBoxLayout>
 #include <KRuler>
 #include <QGroupBox>
 #include <QGraphicsScene>
@@ -40,12 +39,12 @@ class KdenliveDoc;
 class CustomRuler;
 class DocClipBase;
 
-class TrackView : public QWidget
+class TrackView : public QWidget, public Ui::TimeLine_UI
 {
     Q_OBJECT
 
 public:
-    explicit TrackView(KdenliveDoc *doc, QWidget *parent = 0);
+    explicit TrackView(KdenliveDoc *doc, bool *ok, QWidget *parent = 0);
     virtual ~ TrackView();
     void setEditMode(const QString & editMode);
     const QString & editMode() const;
@@ -55,18 +54,21 @@ public:
     int tracksNumber() const;
     KdenliveDoc *document();
     void refresh() ;
+    void updateProjectFps();
     int outPoint() const;
     int inPoint() const;
     int fitZoom() const;
 
+protected:
+    virtual void keyPressEvent(QKeyEvent * event);
+
 public slots:
     void slotDeleteClip(const QString &clipId);
-    void slotChangeZoom(int factor);
+    void slotChangeZoom(int horizontal, int vertical = -1);
     void setDuration(int dur);
     void slotSetZone(QPoint p);
 
 private:
-    Ui::TimeLine_UI m_view;
     CustomRuler *m_ruler;
     CustomTrackView *m_trackview;
     QList <QString> m_invalidProducers;
@@ -77,19 +79,24 @@ private:
 
     KdenliveDoc *m_doc;
     int m_verticalZoom;
-    QVBoxLayout *m_headersLayout;
     QString m_documentErrors;
     void parseDocument(QDomDocument doc);
     int slotAddProjectTrack(int ix, QDomElement xml, bool locked);
     DocClipBase *getMissingProducer(const QString id) const;
+    void adjustTrackHeaders();
 
 private slots:
     void setCursorPos(int pos);
     void moveCursorPos(int pos);
-    void slotRebuildTrackHeaders(bool resetZoom = false);
+    /** \brief Rebuild the track headers */
+    void slotRebuildTrackHeaders();
+    /** \brief The tracks count or a track name changed, rebuild and notify */
+    void slotReloadTracks();
     void slotChangeTrackLock(int ix, bool lock);
     void slotVerticalZoomDown();
     void slotVerticalZoomUp();
+    void slotRenameTrack(int ix);
+    void slotRepaintTracks();
 
 signals:
     void mousePosition(int);
@@ -98,6 +105,8 @@ signals:
     void insertTrack(int);
     void deleteTrack(int);
     void changeTrack(int);
+    void updateTracksInfo();
+    void setZoom(int);
 };
 
 #endif