comparison 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
comparison
equal deleted inserted replaced
807:e4773943c9c1 808:40c6c9344ff6
89 void zoomToRegion(QRect r); 89 void zoomToRegion(QRect r);
90 90
91 void mouseEnteredWidget(); 91 void mouseEnteredWidget();
92 void mouseLeftWidget(); 92 void mouseLeftWidget();
93 93
94 protected slots:
95 void playbackScheduleTimerElapsed();
96
94 protected: 97 protected:
95 virtual void paintEvent(QPaintEvent *e); 98 virtual void paintEvent(QPaintEvent *e);
96 virtual void mousePressEvent(QMouseEvent *e); 99 virtual void mousePressEvent(QMouseEvent *e);
97 virtual void mouseReleaseEvent(QMouseEvent *e); 100 virtual void mouseReleaseEvent(QMouseEvent *e);
98 virtual void mouseMoveEvent(QMouseEvent *e); 101 virtual void mouseMoveEvent(QMouseEvent *e);
137 void updateContextHelp(const QPoint *pos); 140 void updateContextHelp(const QPoint *pos);
138 void edgeScrollMaybe(int x); 141 void edgeScrollMaybe(int x);
139 142
140 Layer *getTopFlexiNoteLayer(); 143 Layer *getTopFlexiNoteLayer();
141 144
145 void schedulePlaybackFrameMove(int frame);
146
142 bool m_identifyFeatures; 147 bool m_identifyFeatures;
143 QPoint m_identifyPoint; 148 QPoint m_identifyPoint;
144 QPoint m_clickPos; 149 QPoint m_clickPos;
145 QPoint m_mousePos; 150 QPoint m_mousePos;
146 bool m_clickedInRange; 151 bool m_clickedInRange;
182 Thumbwheel *m_vthumb; 187 Thumbwheel *m_vthumb;
183 NotifyingPushButton *m_reset; 188 NotifyingPushButton *m_reset;
184 189
185 bool m_mouseInWidget; 190 bool m_mouseInWidget;
186 191
192 bool m_playbackFrameMoveScheduled;
193 int m_playbackFrameMoveTo;
194
187 static QCursor *m_measureCursor1; 195 static QCursor *m_measureCursor1;
188 static QCursor *m_measureCursor2; 196 static QCursor *m_measureCursor2;
189 }; 197 };
190 198
191 #endif 199 #endif