simplify monitor overlay info

[kdenlive] / src / monitor.h

diff --git a/src/monitor.h b/src/monitor.h
index 9d7723f381bd69a0d5ef863400604385fa44e731..898754ee0acac5231c5d2e3fd79486180823bb27 100644 (file)
--- a/src/monitor.h
+++ b/src/monitor.h
@@ -56,7 +56,6 @@ class Overlay : public QLabel
     Q_OBJECT
 public:
     Overlay(QWidget* parent);
-    virtual void paintEvent(QPaintEvent * event);
     void setOverlayText(const QString &, bool isZone = true);
 
 private:
@@ -68,10 +67,10 @@ class Monitor : public QWidget
     Q_OBJECT
 
 public:
-    Monitor(QString name, MonitorManager *manager, QWidget *parent = 0);
+    Monitor(QString name, MonitorManager *manager, QString profile = QString(), QWidget *parent = 0);
     virtual ~Monitor();
     Render *render;
-    void resetProfile();
+    void resetProfile(const QString profile);
     QString name() const;
     void resetSize();
     bool isActive() const;
@@ -82,18 +81,27 @@ public:
     GenTime position();
     void checkOverlay();
     void updateTimecodeFormat();
+    void updateMarkers(DocClipBase *source);
 
 protected:
     virtual void mousePressEvent(QMouseEvent * event);
     virtual void mouseReleaseEvent(QMouseEvent * event);
+
+    /** @brief Move to another position on mouse wheel event.
+     *
+     * Moves towards the end of the clip/timeline on mouse wheel down/back, the
+     * opposite on mouse wheel up/forward.
+     * Ctrl + wheel moves by a single frame, without Ctrl it moves by a second.
+     *
+     * See also http://www.kdenlive.org/mantis/view.php?id=265. */
     virtual void wheelEvent(QWheelEvent * event);
     virtual void mouseMoveEvent(QMouseEvent *event);
     virtual QStringList mimeTypes() const;
-    /*    virtual void dragMoveEvent(QDragMoveEvent * event);
-        virtual Qt::DropActions supportedDropActions() const;*/
+    /*virtual void dragMoveEvent(QDragMoveEvent * event);
+    virtual Qt::DropActions supportedDropActions() const;*/
 
-//    virtual void resizeEvent(QResizeEvent * event);
-//    virtual void paintEvent(QPaintEvent * event);
+    //virtual void resizeEvent(QResizeEvent * event);
+    //virtual void paintEvent(QPaintEvent * event);
 
 private:
     Ui::Monitor_UI m_ui;
@@ -114,6 +122,7 @@ private:
     QMenu *m_contextMenu;
     QMenu *m_configMenu;
     QMenu *m_playMenu;
+    QMenu *m_markerMenu;
     QPoint m_DragStartPosition;
 #ifdef Q_WS_MAC
     VideoGLWidget *m_glWidget;
@@ -133,10 +142,11 @@ private slots:
     void setClipZone(QPoint pos);
     void slotSwitchMonitorInfo(bool show);
     void slotSwitchDropFrames(bool show);
+    void slotGoToMarker(QAction *action);
 
 public slots:
     void slotOpenFile(const QString &);
-    void slotSetXml(DocClipBase *clip, const int position = -1);
+    void slotSetXml(DocClipBase *clip, QPoint zone = QPoint(), const int position = -1);
     void initMonitor();
     void refreshMonitor(bool visible = true);
     void slotSeek(int pos);
@@ -162,6 +172,7 @@ public slots:
     void slotSeekToPreviousSnap();
     void adjustRulerSize(int length);
     void setTimePos(const QString &pos);
+    QStringList getZoneInfo() const;
 
 signals:
     void renderPosition(int);
@@ -170,7 +181,6 @@ signals:
     void adjustMonitorSize();
     void zoneUpdated(QPoint);
     void saveZone(Render *, QPoint);
-    void blockMonitors();
 };
 
 #endif