X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Fcustomruler.h;h=f7ba21bd61f521cb859f31e827dfaa5e3c9d1581;hb=32c8c40056e65b230f058b168e8e078ba066038b;hp=b7ac39782f7b61913efa6d47ec278dc256708f10;hpb=e6f3dd3d92bb9f0196245645d584ecfe02171ac0;p=kdenlive

diff --git a/src/customruler.h b/src/customruler.h
index b7ac3978..f7ba21bd 100644
--- 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,12 +48,16 @@ public:
     void setZone(QPoint p);
     int offset() const;
     void updateProjectFps(Timecode t);
-
+    void updateFrameSize();
+    void updatePalette();
+    
 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);
+    virtual void leaveEvent(QEvent * event);
 
 private:
     Timecode m_timecode;
@@ -54,29 +65,40 @@ private:
     int m_zoneStart;
     int m_zoneEnd;
     int m_duration;
-    QColor m_bgColor;
-    QColor m_cursorColor;
     QColor m_zoneColor;
     double m_textSpacing;
     double m_factor;
     double m_scale;
     int m_offset;
+    int m_lastSeekPosition;
     RULER_MOVE m_moveCursor;
     QMenu *m_contextMenu;
     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;
+    QBrush m_cursorColor;
+
 
 public slots:
     void slotMoveRuler(int newPos);
     void slotCursorMoved(int oldpos, int newpos);
+    void updateRuler();
 
 private slots:
     void slotEditGuide();
     void slotDeleteGuide();
+    void slotGoToGuide(QAction *act);
 
 signals:
     void zoneMoved(int, int);
+    void adjustZoom(int);
+    void mousePosition(int);
 };
 
 #endif