X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Fmonitor.h;h=6b0be9d30e4357a5db8e06d0cad7923e12e9af27;hb=6c43f987273f567fa7659d5a4ad3a5e73f6e5b73;hp=f246af70d1b8645b75b9e56e627d3788032b0874;hpb=ffbd98f8303b09f3fd4f7cf2c74c20080c7fd115;p=kdenlive diff --git a/src/monitor.h b/src/monitor.h index f246af70..6b0be9d3 100644 --- a/src/monitor.h +++ b/src/monitor.h @@ -30,6 +30,7 @@ #include "gentime.h" #include "ui_monitor_ui.h" +#include "timecodedisplay.h" #ifdef Q_WS_MAC #include "videoglwidget.h" #endif @@ -56,7 +57,6 @@ class Overlay : public QLabel Q_OBJECT public: Overlay(QWidget* parent); - virtual void paintEvent(QPaintEvent * event); void setOverlayText(const QString &, bool isZone = true); private: @@ -87,14 +87,20 @@ public: 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 second, without Ctrl it moves by a single frame. */ 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; @@ -110,7 +116,7 @@ private: MonitorRefresh *m_monitorRefresh; KIcon m_playIcon; KIcon m_pauseIcon; - KRestrictedLine *m_timePos; + TimecodeDisplay *m_timePos; QAction *m_playAction; QMenu *m_contextMenu; QMenu *m_configMenu; @@ -121,7 +127,6 @@ private: VideoGLWidget *m_glWidget; #endif GenTime getSnapForPos(bool previous); - bool m_frametimecode; private slots: void seekCursor(int pos);