author | simon <simon> | 2002-12-09 20:13:12 (UTC) |
---|---|---|
committer | simon <simon> | 2002-12-09 20:13:12 (UTC) |
commit | accc4e231dc34744e75d32af77eeb98f46006c27 (patch) (unidiff) | |
tree | 1ee00b2439fb186f7851da602166b1571b9bc600 | |
parent | 2d2d57e3b7988f4246319cdfd0dc7fa90110db8e (diff) | |
download | opie-accc4e231dc34744e75d32af77eeb98f46006c27.zip opie-accc4e231dc34744e75d32af77eeb98f46006c27.tar.gz opie-accc4e231dc34744e75d32af77eeb98f46006c27.tar.bz2 |
- minor cleanup
-rw-r--r-- | noncore/multimedia/opieplayer2/audiowidget.cpp | 5 | ||||
-rw-r--r-- | noncore/multimedia/opieplayer2/audiowidget.h | 1 | ||||
-rw-r--r-- | noncore/multimedia/opieplayer2/videowidget.cpp | 10 | ||||
-rw-r--r-- | noncore/multimedia/opieplayer2/videowidget.h | 1 |
4 files changed, 2 insertions, 15 deletions
diff --git a/noncore/multimedia/opieplayer2/audiowidget.cpp b/noncore/multimedia/opieplayer2/audiowidget.cpp index 8e9bbf1..23d12ec 100644 --- a/noncore/multimedia/opieplayer2/audiowidget.cpp +++ b/noncore/multimedia/opieplayer2/audiowidget.cpp | |||
@@ -328,21 +328,16 @@ void AudioWidget::stopSkip() { | |||
328 | void AudioWidget::timerEvent( QTimerEvent * ) { | 328 | void AudioWidget::timerEvent( QTimerEvent * ) { |
329 | if ( skipDirection == +1 ) { | 329 | if ( skipDirection == +1 ) { |
330 | mediaPlayerState.setPosition( mediaPlayerState.position() + 2 ); | 330 | mediaPlayerState.setPosition( mediaPlayerState.position() + 2 ); |
331 | } else if ( skipDirection == -1 ) { | 331 | } else if ( skipDirection == -1 ) { |
332 | mediaPlayerState.setPosition( mediaPlayerState.position() - 2 ); | 332 | mediaPlayerState.setPosition( mediaPlayerState.position() - 2 ); |
333 | } | 333 | } |
334 | } | 334 | } |
335 | 335 | ||
336 | void AudioWidget::showEvent( QShowEvent* ) { | ||
337 | QMouseEvent event( QEvent::MouseMove, QPoint( 0, 0 ), 0, 0 ); | ||
338 | mouseMoveEvent( &event ); | ||
339 | } | ||
340 | |||
341 | void AudioWidget::keyReleaseEvent( QKeyEvent *e) { | 336 | void AudioWidget::keyReleaseEvent( QKeyEvent *e) { |
342 | switch ( e->key() ) { | 337 | switch ( e->key() ) { |
343 | ////////////////////////////// Zaurus keys | 338 | ////////////////////////////// Zaurus keys |
344 | case Key_Home: | 339 | case Key_Home: |
345 | break; | 340 | break; |
346 | case Key_F9: //activity | 341 | case Key_F9: //activity |
347 | hide(); | 342 | hide(); |
348 | // qDebug("Audio F9"); | 343 | // qDebug("Audio F9"); |
diff --git a/noncore/multimedia/opieplayer2/audiowidget.h b/noncore/multimedia/opieplayer2/audiowidget.h index e2e2314..53982a1 100644 --- a/noncore/multimedia/opieplayer2/audiowidget.h +++ b/noncore/multimedia/opieplayer2/audiowidget.h | |||
@@ -69,17 +69,16 @@ public: | |||
69 | virtual void setDisplayType( MediaPlayerState::DisplayType displayType ); | 69 | virtual void setDisplayType( MediaPlayerState::DisplayType displayType ); |
70 | 70 | ||
71 | signals: | 71 | signals: |
72 | void sliderMoved(long); | 72 | void sliderMoved(long); |
73 | 73 | ||
74 | protected: | 74 | protected: |
75 | void doBlank(); | 75 | void doBlank(); |
76 | void doUnblank(); | 76 | void doUnblank(); |
77 | void showEvent( QShowEvent *se ); | ||
78 | void resizeEvent( QResizeEvent *re ); | 77 | void resizeEvent( QResizeEvent *re ); |
79 | void timerEvent( QTimerEvent *event ); | 78 | void timerEvent( QTimerEvent *event ); |
80 | void keyReleaseEvent( QKeyEvent *e); | 79 | void keyReleaseEvent( QKeyEvent *e); |
81 | private slots: | 80 | private slots: |
82 | void skipFor(); | 81 | void skipFor(); |
83 | void skipBack(); | 82 | void skipBack(); |
84 | void stopSkip(); | 83 | void stopSkip(); |
85 | private: | 84 | private: |
diff --git a/noncore/multimedia/opieplayer2/videowidget.cpp b/noncore/multimedia/opieplayer2/videowidget.cpp index 04b09f9..4901e47 100644 --- a/noncore/multimedia/opieplayer2/videowidget.cpp +++ b/noncore/multimedia/opieplayer2/videowidget.cpp | |||
@@ -244,26 +244,20 @@ void VideoWidget::updateSlider( long i, long max ) { | |||
244 | void VideoWidget::mouseReleaseEvent( QMouseEvent *event ) { | 244 | void VideoWidget::mouseReleaseEvent( QMouseEvent *event ) { |
245 | if ( mediaPlayerState.isFullscreen() ) { | 245 | if ( mediaPlayerState.isFullscreen() ) { |
246 | mediaPlayerState.setFullscreen( FALSE ); | 246 | mediaPlayerState.setFullscreen( FALSE ); |
247 | makeVisible(); | 247 | makeVisible(); |
248 | } | 248 | } |
249 | MediaWidget::mouseReleaseEvent( event ); | 249 | MediaWidget::mouseReleaseEvent( event ); |
250 | } | 250 | } |
251 | 251 | ||
252 | void VideoWidget::showEvent( QShowEvent* ) { | 252 | void VideoWidget::backToNormal() { |
253 | QMouseEvent event( QEvent::MouseMove, QPoint( 0, 0 ), 0, 0 ); | ||
254 | mouseMoveEvent( &event ); | ||
255 | } | ||
256 | |||
257 | |||
258 | void VideoWidget::backToNormal() { | ||
259 | mediaPlayerState.setFullscreen( FALSE ); | 253 | mediaPlayerState.setFullscreen( FALSE ); |
260 | makeVisible(); | 254 | makeVisible(); |
261 | } | 255 | } |
262 | 256 | ||
263 | void VideoWidget::makeVisible() { | 257 | void VideoWidget::makeVisible() { |
264 | if ( mediaPlayerState.isFullscreen() ) { | 258 | if ( mediaPlayerState.isFullscreen() ) { |
265 | setBackgroundMode( QWidget::NoBackground ); | 259 | setBackgroundMode( QWidget::NoBackground ); |
266 | showFullScreen(); | 260 | showFullScreen(); |
267 | resize( qApp->desktop()->size() ); | 261 | resize( qApp->desktop()->size() ); |
268 | videoFrame-> setGeometry ( 0, 0, width ( ), height ( )); | 262 | videoFrame-> setGeometry ( 0, 0, width ( ), height ( )); |
269 | 263 | ||
diff --git a/noncore/multimedia/opieplayer2/videowidget.h b/noncore/multimedia/opieplayer2/videowidget.h index 985c094..21a4e9e 100644 --- a/noncore/multimedia/opieplayer2/videowidget.h +++ b/noncore/multimedia/opieplayer2/videowidget.h | |||
@@ -70,17 +70,16 @@ signals: | |||
70 | void moreClicked(); | 70 | void moreClicked(); |
71 | void lessClicked(); | 71 | void lessClicked(); |
72 | void sliderMoved( long ); | 72 | void sliderMoved( long ); |
73 | void videoResized ( const QSize &s ); | 73 | void videoResized ( const QSize &s ); |
74 | 74 | ||
75 | protected: | 75 | protected: |
76 | 76 | ||
77 | void resizeEvent( QResizeEvent * ); | 77 | void resizeEvent( QResizeEvent * ); |
78 | void showEvent( QShowEvent *se ); | ||
79 | void mouseReleaseEvent( QMouseEvent *event ); | 78 | void mouseReleaseEvent( QMouseEvent *event ); |
80 | void keyReleaseEvent( QKeyEvent *e); | 79 | void keyReleaseEvent( QKeyEvent *e); |
81 | 80 | ||
82 | private: | 81 | private: |
83 | // Ticker songInfo; | 82 | // Ticker songInfo; |
84 | QImage imgUp; | 83 | QImage imgUp; |
85 | QImage imgDn; | 84 | QImage imgDn; |
86 | QString skin; | 85 | QString skin; |