Merge branch 'buildsystem' into next

[kdenlive] / src / customruler.h

diff --git a/src/customruler.h b/src/customruler.h
index ffd6860e44b131cf711a051dc4f48634e356d3d2..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
 
@@ -42,7 +48,7 @@ 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);
@@ -73,6 +79,7 @@ private:
     int m_rate;
     int m_startRate;
     MOUSE_MOVE m_mouseMove;
+    QMenu *m_goMenu;
 
 
 public slots:
@@ -82,6 +89,7 @@ public slots:
 private slots:
     void slotEditGuide();
     void slotDeleteGuide();
+    void slotGoToGuide(QAction *act);
 
 signals:
     void zoneMoved(int, int);