-rw-r--r-- | noncore/multimedia/opieplayer2/audiowidget.cpp | 13 | ||||
-rw-r--r-- | noncore/multimedia/opieplayer2/audiowidget.h | 1 | ||||
-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 | 15 | ||||
-rw-r--r-- | noncore/multimedia/opieplayer2/videowidget.h | 1 |
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 @@ -314,13 +314,4 @@ void AudioWidget::setToggleButton( int i, bool down ) { } -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; @@ -416,5 +407,5 @@ void AudioWidget::paintEvent( QPaintEvent * pe ) { 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 ); @@ -422,5 +413,5 @@ void AudioWidget::paintEvent( QPaintEvent * pe ) { QPainter p( this ); for ( unsigned int i = 0; i < buttons.count(); i++ ) - paintButton( p, i ); + paintButton( p, buttons[ i ] ); } } 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 @@ -93,5 +93,4 @@ private slots: private: void setToggleButton( int, bool ); - virtual void paintButton( QPainter &p, int i ); int skipDirection; QString skin; 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 @@ -72,5 +72,13 @@ 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 ); } 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 @@ -87,5 +87,5 @@ protected: void paintButton( int buttonId ); - virtual void paintButton( QPainter &p, int i ) = 0; + void paintButton( QPainter &p, const Button &button ); void toggleButton( int buttonId ); 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 @@ -249,15 +249,4 @@ void VideoWidget::setToggleButton( int i, bool down ) { } -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++ ) { @@ -404,5 +393,5 @@ void VideoWidget::paintEvent( QPaintEvent * pe) { 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 ); @@ -411,5 +400,5 @@ void VideoWidget::paintEvent( QPaintEvent * pe) { 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 @@ -104,5 +104,4 @@ private: - virtual void paintButton( QPainter &p, int i ); void setToggleButton( int, bool ); |