- another small cleanup in the mouse handling

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
@@ -324,34 +324,24 @@ void AudioWidget::stopSkip() {
     killTimers();
 }
 
 
 void AudioWidget::timerEvent( QTimerEvent * ) {
     if ( skipDirection == +1 ) {
         mediaPlayerState.setPosition( mediaPlayerState.position() + 2 );
     }  else if ( skipDirection == -1 ) {
         mediaPlayerState.setPosition( mediaPlayerState.position() - 2 );
     }
 }
 
-void AudioWidget::mousePressEvent( QMouseEvent *event ) {
-    mouseMoveEvent( event );
-}
-
-
-void AudioWidget::mouseReleaseEvent( QMouseEvent *event ) {
-    mouseMoveEvent( event );
-}
-
-
 void AudioWidget::showEvent( QShowEvent* ) {
     QMouseEvent event( QEvent::MouseMove, QPoint( 0, 0 ), 0, 0 );
     mouseMoveEvent( &event );
 }
 
 void AudioWidget::keyReleaseEvent( QKeyEvent *e) {
     switch ( e->key() ) {
         ////////////////////////////// Zaurus keys
       case Key_Home:
           break;
       case Key_F9: //activity
            hide();
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
@@ -67,26 +67,24 @@ public:
     virtual void setLength( long );
     virtual void setPlaying( bool b) { setToggleButton( Play, b ); }
     virtual void setDisplayType( MediaPlayerState::DisplayType displayType );
 
 signals:
     void sliderMoved(long);
 
 protected:
     void doBlank();
     void doUnblank();
     void showEvent( QShowEvent *se );
     void resizeEvent( QResizeEvent *re );
-    void mousePressEvent( QMouseEvent *event );
-    void mouseReleaseEvent( QMouseEvent *event );
     void timerEvent( QTimerEvent *event );
     void keyReleaseEvent( QKeyEvent *e);
 private slots:
     void skipFor();
     void skipBack();
     void stopSkip();
 private:
     int skipDirection;
     QString skin;
     QImage  imgUp;
     QImage  imgDn;
 
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
@@ -104,24 +104,34 @@ void MediaWidget::mouseMoveEvent( QMouseEvent *event )
         } else {
             if ( button.isHeld ) {
                 button.isHeld = FALSE;
                 if ( button.type != ToggleButton ) {
                     setToggleButton( button, FALSE );
                 }
                 handleCommand( command, button.isDown );
             }
         }
     }
 }
 
+void MediaWidget::mousePressEvent( QMouseEvent *event )
+{
+    mouseMoveEvent( event );
+}
+
+void MediaWidget::mouseReleaseEvent( QMouseEvent *event )
+{
+    mouseMoveEvent( event );
+}
+
 void MediaWidget::makeVisible()
 {
 }
 
 void MediaWidget::handleCommand( Command command, bool buttonDown )
 {
     switch ( command ) {
         case Play:       mediaPlayerState.togglePaused();
         case Stop:       mediaPlayerState.setPlaying(FALSE); return;
         case Next:       if( playList.currentTab() == PlayListWidget::CurrentPlayList ) mediaPlayerState.setNext(); return;
         case Previous:   if( playList.currentTab() == PlayListWidget::CurrentPlayList ) mediaPlayerState.setPrev(); return;
         case Loop:       mediaPlayerState.setLooping( buttonDown ); return;
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
@@ -79,24 +79,26 @@ signals:
     void backReleased();
     void forwardClicked();
     void backClicked();
     void moreClicked();
     void lessClicked();
 
 protected:
     virtual void closeEvent( QCloseEvent * );
 
     virtual void paintEvent( QPaintEvent *pe );
 
     virtual void mouseMoveEvent( QMouseEvent *event );
+    virtual void mousePressEvent( QMouseEvent *event );
+    virtual void mouseReleaseEvent( QMouseEvent *event );
 
     virtual void makeVisible();
 
     void handleCommand( Command command, bool buttonDown );
 
     bool isOverButton( const QPoint &position, int buttonId ) const;
 
     void paintAllButtons( QPainter &p );
     void paintButton( const Button &button );
     void paintButton( QPainter &p, const Button &button );
 
     void setToggleButton( Button &button, bool down );
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
@@ -232,34 +232,30 @@ void VideoWidget::updateSlider( long i, long max ) {
     int width = slider->width();
     int val = int((double)i * width / max);
     if ( !mediaPlayerState.isFullscreen() && !videoSliderBeingMoved ) {
         if ( slider->value() != val ) {
             slider->setValue( val );
         }
         if ( slider->maxValue() != width ) {
             slider->setMaxValue( width );
         }
     }
 }
 
-void VideoWidget::mousePressEvent( QMouseEvent *event ) {
-    mouseMoveEvent( event );
-}
-
 void VideoWidget::mouseReleaseEvent( QMouseEvent *event ) {
     if ( mediaPlayerState.isFullscreen() ) {
         mediaPlayerState.setFullscreen( FALSE );
         makeVisible();
     }
-    mouseMoveEvent( event );
+    MediaWidget::mouseReleaseEvent( event );
 }
 
 void VideoWidget::showEvent( QShowEvent* ) {
     QMouseEvent event( QEvent::MouseMove, QPoint( 0, 0 ), 0, 0 );
     mouseMoveEvent( &event );
 }
 
 
  void VideoWidget::backToNormal() {
      mediaPlayerState.setFullscreen( FALSE );
      makeVisible();
  }
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
@@ -67,25 +67,24 @@ public:
     virtual void setDisplayType( MediaPlayerState::DisplayType displayType );
 
 signals:
     void moreClicked();
     void lessClicked();
     void sliderMoved( long );
     void videoResized ( const QSize &s );
 
 protected:
 
     void resizeEvent( QResizeEvent * );
     void showEvent( QShowEvent *se );
-    void mousePressEvent( QMouseEvent *event );
     void mouseReleaseEvent( QMouseEvent *event );
     void keyReleaseEvent( QKeyEvent *e);
 
 private:
 //    Ticker songInfo;
     QImage  imgUp;
     QImage  imgDn;
     QString skin;
 
 
 
     QString backgroundPix;