- paintButton is no more a duplicated method but centralized in the

  base class now :)

6 files changed, 14 insertions, 28 deletions

diff --git a/noncore/multimedia/opieplayer2/audiowidget.cpp b/noncore/multimedia/opieplayer2/audiowidget.cpp
index 12f91a9..5cc2814 100644
--- a/noncore/multimedia/opieplayer2/audiowidget.cpp
+++ b/noncore/multimedia/opieplayer2/audiowidget.cpp
@@ -310,21 +310,12 @@ void AudioWidget::setToggleButton( int i, bool down ) {
     qDebug("setToggleButton %d", i);
     if ( down != buttons[i].isDown ) {
         toggleButton( i );
     }
 }
 
-void AudioWidget::paintButton( QPainter &p, int i ) {
-    if ( buttons[i].isDown ) {
-        p.drawPixmap( upperLeftOfButtonMask, buttons[i].pixDown );
-    } else {
-        p.drawPixmap( upperLeftOfButtonMask, buttons[i].pixUp );
-    }
-}
-
-
 void AudioWidget::skipFor() {
     skipDirection = +1;
     startTimer( 50 );
     mediaPlayerState.setPosition( mediaPlayerState.position() + 2 );
 }
 
@@ -412,19 +403,19 @@ void AudioWidget::paintEvent( QPaintEvent * pe ) {
           // Combine with background and double buffer
         QPixmap pix( pe->rect().size() );
         QPainter p( &pix );
         p.translate( -pe->rect().topLeft().x(), -pe->rect().topLeft().y() );
         p.drawTiledPixmap( pe->rect(), pixBg, pe->rect().topLeft() );
         for ( unsigned int i = 0; i < buttons.count(); i++ )
-            paintButton( p, i );
+            paintButton( p, buttons[ i ] );
         QPainter p2( this );
         p2.drawPixmap( pe->rect().topLeft(), pix );
     } else {
         QPainter p( this );
         for ( unsigned int i = 0; i < buttons.count(); i++ )
-            paintButton( p, i );
+            paintButton( p, buttons[ i ] );
     }
 }
 
 void AudioWidget::keyReleaseEvent( QKeyEvent *e) {
     switch ( e->key() ) {
         ////////////////////////////// Zaurus keys
diff --git a/noncore/multimedia/opieplayer2/audiowidget.h b/noncore/multimedia/opieplayer2/audiowidget.h
index 332fb4b..7a775cd 100644
--- a/noncore/multimedia/opieplayer2/audiowidget.h
+++ b/noncore/multimedia/opieplayer2/audiowidget.h
@@ -89,13 +89,12 @@ protected:
 private slots:
     void skipFor();
     void skipBack();
     void stopSkip();
 private:
     void setToggleButton( int, bool );
-    virtual void paintButton( QPainter &p, int i );
     int skipDirection;
     QString skin;
     QPixmap pixBg;
     QImage  imgUp;
     QImage  imgDn;
 
diff --git a/noncore/multimedia/opieplayer2/mediawidget.cpp b/noncore/multimedia/opieplayer2/mediawidget.cpp
index 62266ad..f977b61 100644
--- a/noncore/multimedia/opieplayer2/mediawidget.cpp
+++ b/noncore/multimedia/opieplayer2/mediawidget.cpp
@@ -68,13 +68,21 @@ bool MediaWidget::isOverButton( const QPoint &position, int buttonId ) const
              buttonMask.pixelIndex( position.x(), position.y() ) == buttonId + 1 );
 }
 
 void MediaWidget::paintButton( int buttonId )
 {
     QPainter p( this );
-    paintButton( p, buttonId );
+    paintButton( p, buttons[ buttonId ] );
+}
+
+void MediaWidget::paintButton( QPainter &p, const Button &button )
+{
+    if ( button.isDown )
+        p.drawPixmap( upperLeftOfButtonMask, button.pixDown );
+    else
+        p.drawPixmap( upperLeftOfButtonMask, button.pixUp );
 }
 
 void MediaWidget::toggleButton( int buttonId )
 {
     buttons[ buttonId ].isDown = !buttons[ buttonId ].isDown;
     paintButton( buttonId );
diff --git a/noncore/multimedia/opieplayer2/mediawidget.h b/noncore/multimedia/opieplayer2/mediawidget.h
index 49bf024..163f449 100644
--- a/noncore/multimedia/opieplayer2/mediawidget.h
+++ b/noncore/multimedia/opieplayer2/mediawidget.h
@@ -83,13 +83,13 @@ protected:
 
     void handleCommand( Command command, bool buttonDown );
 
     bool isOverButton( const QPoint &position, int buttonId ) const;
 
     void paintButton( int buttonId );
-    virtual void paintButton( QPainter &p, int i ) = 0;
+    void paintButton( QPainter &p, const Button &button );
 
     void toggleButton( int buttonId );
 
     MediaPlayerState &mediaPlayerState;
     PlayListWidget &playList;
 
diff --git a/noncore/multimedia/opieplayer2/videowidget.cpp b/noncore/multimedia/opieplayer2/videowidget.cpp
index 3baa087..a483434 100644
--- a/noncore/multimedia/opieplayer2/videowidget.cpp
+++ b/noncore/multimedia/opieplayer2/videowidget.cpp
@@ -245,23 +245,12 @@ void VideoWidget::updateSlider( long i, long max ) {
 void VideoWidget::setToggleButton( int i, bool down ) {
     if ( down != buttons[i].isDown ) {
         toggleButton( i );
     }
 }
 
-void VideoWidget::paintButton( QPainter &p, int i ) {
-
-    Button &button = buttons[ i ];
-
-    if ( button.isDown ) {
-        p.drawPixmap( upperLeftOfButtonMask, button.pixDown );
-    } else {
-        p.drawPixmap( upperLeftOfButtonMask, button.pixUp );
-    }
-}
-
 void VideoWidget::mouseMoveEvent( QMouseEvent *event ) {
     for ( unsigned int i = 0; i < buttons.count(); i++ ) {
         if ( event->state() == QMouseEvent::LeftButton ) {
             // The test to see if the mouse click is inside the button or not
             bool isOnButton = isOverButton( event->pos() - upperLeftOfButtonMask, i );
 
@@ -400,20 +389,20 @@ void VideoWidget::paintEvent( QPaintEvent * pe) {
             // Combine with background and double buffer
             QPixmap pix( pe->rect().size() );
             QPainter p( &pix );
             p.translate( -pe->rect().topLeft().x(), -pe->rect().topLeft().y() );
             p.drawTiledPixmap( pe->rect(), pixBg, pe->rect().topLeft() );
             for ( unsigned int i = 0; i < buttons.count(); i++ ) {
-                paintButton( p, i );
+                paintButton( p, buttons[ i ] );
             }
             QPainter p2( this );
             p2.drawPixmap( pe->rect().topLeft(), pix );
         } else {
             QPainter p( this );
             for ( unsigned int i = 0; i < buttons.count(); i++ )
-                paintButton( p, i );
+                paintButton( p, buttons[ i ] );
         }
         //slider->repaint( TRUE );
         }
 }
 
 
diff --git a/noncore/multimedia/opieplayer2/videowidget.h b/noncore/multimedia/opieplayer2/videowidget.h
index 937feac..a271120 100644
--- a/noncore/multimedia/opieplayer2/videowidget.h
+++ b/noncore/multimedia/opieplayer2/videowidget.h
@@ -100,13 +100,12 @@ private:
     QPixmap pixBg;
     QImage  imgUp;
     QImage  imgDn;
     QString skin;
 
 
-    virtual void paintButton( QPainter &p, int i );
     void setToggleButton( int, bool );
 
     QString backgroundPix;
     QSlider *slider;
     QImage *currentFrame;
     int scaledWidth;