-rw-r--r-- | noncore/multimedia/opieplayer2/audiowidget.cpp | 10 | ||||
-rw-r--r-- | noncore/multimedia/opieplayer2/audiowidget.h | 2 | ||||
-rw-r--r-- | noncore/multimedia/opieplayer2/mediawidget.cpp | 10 | ||||
-rw-r--r-- | noncore/multimedia/opieplayer2/mediawidget.h | 2 | ||||
-rw-r--r-- | noncore/multimedia/opieplayer2/videowidget.cpp | 6 | ||||
-rw-r--r-- | noncore/multimedia/opieplayer2/videowidget.h | 1 |
6 files changed, 13 insertions, 18 deletions
diff --git a/noncore/multimedia/opieplayer2/audiowidget.cpp b/noncore/multimedia/opieplayer2/audiowidget.cpp index dda039c..5986a72 100644 --- a/noncore/multimedia/opieplayer2/audiowidget.cpp +++ b/noncore/multimedia/opieplayer2/audiowidget.cpp | |||
@@ -332,18 +332,8 @@ void AudioWidget::timerEvent( QTimerEvent * ) { | |||
332 | mediaPlayerState.setPosition( mediaPlayerState.position() - 2 ); | 332 | mediaPlayerState.setPosition( mediaPlayerState.position() - 2 ); |
333 | } | 333 | } |
334 | } | 334 | } |
335 | 335 | ||
336 | void AudioWidget::mousePressEvent( QMouseEvent *event ) { | ||
337 | mouseMoveEvent( event ); | ||
338 | } | ||
339 | |||
340 | |||
341 | void AudioWidget::mouseReleaseEvent( QMouseEvent *event ) { | ||
342 | mouseMoveEvent( event ); | ||
343 | } | ||
344 | |||
345 | |||
346 | void AudioWidget::showEvent( QShowEvent* ) { | 336 | void AudioWidget::showEvent( QShowEvent* ) { |
347 | QMouseEvent event( QEvent::MouseMove, QPoint( 0, 0 ), 0, 0 ); | 337 | QMouseEvent event( QEvent::MouseMove, QPoint( 0, 0 ), 0, 0 ); |
348 | mouseMoveEvent( &event ); | 338 | mouseMoveEvent( &event ); |
349 | } | 339 | } |
diff --git a/noncore/multimedia/opieplayer2/audiowidget.h b/noncore/multimedia/opieplayer2/audiowidget.h index 690d1b3..e2e2314 100644 --- a/noncore/multimedia/opieplayer2/audiowidget.h +++ b/noncore/multimedia/opieplayer2/audiowidget.h | |||
@@ -75,10 +75,8 @@ protected: | |||
75 | void doBlank(); | 75 | void doBlank(); |
76 | void doUnblank(); | 76 | void doUnblank(); |
77 | void showEvent( QShowEvent *se ); | 77 | void showEvent( QShowEvent *se ); |
78 | void resizeEvent( QResizeEvent *re ); | 78 | void resizeEvent( QResizeEvent *re ); |
79 | void mousePressEvent( QMouseEvent *event ); | ||
80 | void mouseReleaseEvent( QMouseEvent *event ); | ||
81 | void timerEvent( QTimerEvent *event ); | 79 | void timerEvent( QTimerEvent *event ); |
82 | void keyReleaseEvent( QKeyEvent *e); | 80 | void keyReleaseEvent( QKeyEvent *e); |
83 | private slots: | 81 | private slots: |
84 | void skipFor(); | 82 | void skipFor(); |
diff --git a/noncore/multimedia/opieplayer2/mediawidget.cpp b/noncore/multimedia/opieplayer2/mediawidget.cpp index 3533d74..439ba2e 100644 --- a/noncore/multimedia/opieplayer2/mediawidget.cpp +++ b/noncore/multimedia/opieplayer2/mediawidget.cpp | |||
@@ -112,8 +112,18 @@ void MediaWidget::mouseMoveEvent( QMouseEvent *event ) | |||
112 | } | 112 | } |
113 | } | 113 | } |
114 | } | 114 | } |
115 | 115 | ||
116 | void MediaWidget::mousePressEvent( QMouseEvent *event ) | ||
117 | { | ||
118 | mouseMoveEvent( event ); | ||
119 | } | ||
120 | |||
121 | void MediaWidget::mouseReleaseEvent( QMouseEvent *event ) | ||
122 | { | ||
123 | mouseMoveEvent( event ); | ||
124 | } | ||
125 | |||
116 | void MediaWidget::makeVisible() | 126 | void MediaWidget::makeVisible() |
117 | { | 127 | { |
118 | } | 128 | } |
119 | 129 | ||
diff --git a/noncore/multimedia/opieplayer2/mediawidget.h b/noncore/multimedia/opieplayer2/mediawidget.h index c261728..9042d5b 100644 --- a/noncore/multimedia/opieplayer2/mediawidget.h +++ b/noncore/multimedia/opieplayer2/mediawidget.h | |||
@@ -87,8 +87,10 @@ protected: | |||
87 | 87 | ||
88 | virtual void paintEvent( QPaintEvent *pe ); | 88 | virtual void paintEvent( QPaintEvent *pe ); |
89 | 89 | ||
90 | virtual void mouseMoveEvent( QMouseEvent *event ); | 90 | virtual void mouseMoveEvent( QMouseEvent *event ); |
91 | virtual void mousePressEvent( QMouseEvent *event ); | ||
92 | virtual void mouseReleaseEvent( QMouseEvent *event ); | ||
91 | 93 | ||
92 | virtual void makeVisible(); | 94 | virtual void makeVisible(); |
93 | 95 | ||
94 | void handleCommand( Command command, bool buttonDown ); | 96 | void handleCommand( Command command, bool buttonDown ); |
diff --git a/noncore/multimedia/opieplayer2/videowidget.cpp b/noncore/multimedia/opieplayer2/videowidget.cpp index 26777e6..04b09f9 100644 --- a/noncore/multimedia/opieplayer2/videowidget.cpp +++ b/noncore/multimedia/opieplayer2/videowidget.cpp | |||
@@ -240,18 +240,14 @@ void VideoWidget::updateSlider( long i, long max ) { | |||
240 | } | 240 | } |
241 | } | 241 | } |
242 | } | 242 | } |
243 | 243 | ||
244 | void VideoWidget::mousePressEvent( QMouseEvent *event ) { | ||
245 | mouseMoveEvent( event ); | ||
246 | } | ||
247 | |||
248 | void VideoWidget::mouseReleaseEvent( QMouseEvent *event ) { | 244 | void VideoWidget::mouseReleaseEvent( QMouseEvent *event ) { |
249 | if ( mediaPlayerState.isFullscreen() ) { | 245 | if ( mediaPlayerState.isFullscreen() ) { |
250 | mediaPlayerState.setFullscreen( FALSE ); | 246 | mediaPlayerState.setFullscreen( FALSE ); |
251 | makeVisible(); | 247 | makeVisible(); |
252 | } | 248 | } |
253 | mouseMoveEvent( event ); | 249 | MediaWidget::mouseReleaseEvent( event ); |
254 | } | 250 | } |
255 | 251 | ||
256 | void VideoWidget::showEvent( QShowEvent* ) { | 252 | void VideoWidget::showEvent( QShowEvent* ) { |
257 | QMouseEvent event( QEvent::MouseMove, QPoint( 0, 0 ), 0, 0 ); | 253 | QMouseEvent event( QEvent::MouseMove, QPoint( 0, 0 ), 0, 0 ); |
diff --git a/noncore/multimedia/opieplayer2/videowidget.h b/noncore/multimedia/opieplayer2/videowidget.h index bed2116..985c094 100644 --- a/noncore/multimedia/opieplayer2/videowidget.h +++ b/noncore/multimedia/opieplayer2/videowidget.h | |||
@@ -75,9 +75,8 @@ signals: | |||
75 | protected: | 75 | protected: |
76 | 76 | ||
77 | void resizeEvent( QResizeEvent * ); | 77 | void resizeEvent( QResizeEvent * ); |
78 | void showEvent( QShowEvent *se ); | 78 | void showEvent( QShowEvent *se ); |
79 | void mousePressEvent( QMouseEvent *event ); | ||
80 | void mouseReleaseEvent( QMouseEvent *event ); | 79 | void mouseReleaseEvent( QMouseEvent *event ); |
81 | void keyReleaseEvent( QKeyEvent *e); | 80 | void keyReleaseEvent( QKeyEvent *e); |
82 | 81 | ||
83 | private: | 82 | private: |