Merge branch 'buildsystem' into next

[kdenlive] / src / customruler.h

diff --git a/src/customruler.h b/src/customruler.h
index b7ac39782f7b61913efa6d47ec278dc256708f10..c36cdd3f7e01707c235bca38e0045007f74468d5 100644 (file)
--- a/src/customruler.h
+++ b/src/customruler.h
@@ -17,6 +17,12 @@
  *   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA          *
  ***************************************************************************/
 
+/**
+ * @class CustomRuler
+ * @author Jean-Baptiste Mardelle
+ * @brief Manages the timeline ruler.
+ */
+
 #ifndef CUSTOMRULER_H
 #define CUSTOMRULER_H
 
@@ -26,6 +32,7 @@
 #include "timecode.h"
 
 enum RULER_MOVE { RULER_CURSOR = 0, RULER_START = 1, RULER_MIDDLE = 2, RULER_END = 3 };
+enum MOUSE_MOVE { NO_MOVE = 0, HORIZONTAL_MOVE = 1, VERTICAL_MOVE = 2 };
 
 class CustomRuler : public QWidget
 {
@@ -33,7 +40,7 @@ class CustomRuler : public QWidget
 
 public:
     CustomRuler(Timecode tc, CustomTrackView *parent);
-    void setPixelPerMark(double rate);
+    void setPixelPerMark(int rate);
     static const int comboScale[];
     int outPoint() const;
     int inPoint() const;
@@ -41,11 +48,12 @@ public:
     void setZone(QPoint p);
     int offset() const;
     void updateProjectFps(Timecode t);
-
+    void updateFrameSize();
 protected:
     virtual void paintEvent(QPaintEvent * /*e*/);
     virtual void wheelEvent(QWheelEvent * e);
     virtual void mousePressEvent(QMouseEvent * event);
+    virtual void mouseReleaseEvent(QMouseEvent * event);
     virtual void mouseMoveEvent(QMouseEvent * event);
 
 private:
@@ -66,6 +74,13 @@ private:
     QAction *m_editGuide;
     QAction *m_deleteGuide;
     int m_clickedGuide;
+    /** Used for zooming through vertical move */
+    QPoint m_clickPoint;
+    int m_rate;
+    int m_startRate;
+    MOUSE_MOVE m_mouseMove;
+    QMenu *m_goMenu;
+
 
 public slots:
     void slotMoveRuler(int newPos);
@@ -74,9 +89,11 @@ public slots:
 private slots:
     void slotEditGuide();
     void slotDeleteGuide();
+    void slotGoToGuide(QAction *act);
 
 signals:
     void zoneMoved(int, int);
+    void adjustZoom(int);
 };
 
 #endif