Mercurial > hg > svgui
diff view/Pane.h @ 808:40c6c9344ff6 warnfix_no_size_t
Merge from branch tony_integration
author | Chris Cannam |
---|---|
date | Wed, 18 Jun 2014 08:40:46 +0100 |
parents | 4c8ca536b54f 584b11df8e4f |
children | d974ed657176 |
line wrap: on
line diff
--- a/view/Pane.h Tue Jun 17 15:55:27 2014 +0100 +++ b/view/Pane.h Wed Jun 18 08:40:46 2014 +0100 @@ -91,6 +91,9 @@ void mouseEnteredWidget(); void mouseLeftWidget(); +protected slots: + void playbackScheduleTimerElapsed(); + protected: virtual void paintEvent(QPaintEvent *e); virtual void mousePressEvent(QMouseEvent *e); @@ -139,6 +142,8 @@ Layer *getTopFlexiNoteLayer(); + void schedulePlaybackFrameMove(int frame); + bool m_identifyFeatures; QPoint m_identifyPoint; QPoint m_clickPos; @@ -184,6 +189,9 @@ bool m_mouseInWidget; + bool m_playbackFrameMoveScheduled; + int m_playbackFrameMoveTo; + static QCursor *m_measureCursor1; static QCursor *m_measureCursor2; };