4 files changed, 23 insertions, 16 deletions

diff --git a/noncore/multimedia/opieplayer2/mediawidget.cpp b/noncore/multimedia/opieplayer2/mediawidget.cpp
index 2031b4d..4de7ea9 100644
--- a/noncore/multimedia/opieplayer2/mediawidget.cpp
+++ b/noncore/multimedia/opieplayer2/mediawidget.cpp
@@ -44,7 +44,7 @@ MediaWidget::~MediaWidget()
 }
 
 void MediaWidget::setupButtons( const SkinButtonInfo *skinInfo, uint buttonCount,
-                                const QString &imagePrefix, const QSize &buttonAreaSize )
+                                const Skin &skin, const QSize &buttonAreaSize )
 {
     buttonMask = QImage( buttonAreaSize, 8, 255 );
     buttonMask.fill( 0 );
@@ -53,40 +53,37 @@ void MediaWidget::setupButtons( const SkinButtonInfo *skinInfo, uint buttonCount
     buttons.reserve( buttonCount );
 
     for ( uint i = 0; i < buttonCount; ++i ) {
-        Button button = setupButton( skinInfo[ i ], imagePrefix );
+        Button button = setupButton( skinInfo[ i ], skin );
         buttons.push_back( button );
     }
 }
 
-MediaWidget::Button MediaWidget::setupButton( const SkinButtonInfo &buttonInfo, const QString &imagePrefix )
+MediaWidget::Button MediaWidget::setupButton( const SkinButtonInfo &buttonInfo, const Skin &skin )
 {
     Button button;
     button.command = buttonInfo.command;
     button.type = buttonInfo.type;
 
-    QString fileName = imagePrefix + buttonInfo.fileName + ".png";
-
-    button.mask = setupButtonMask( button.command, fileName );
+    button.mask = setupButtonMask( button.command, skin.buttonMaskImage( buttonInfo.fileName ) );
 
     return button;
 }
 
-QBitmap MediaWidget::setupButtonMask( const Command &command, const QString &fileName )
+QBitmap MediaWidget::setupButtonMask( const Command &command, const QImage &maskImage )
 {
-    QImage imgMask( Resource::findPixmap( fileName ) );
-    if ( imgMask.isNull() )
+    if ( maskImage.isNull() )
         return QBitmap();
 
     uchar **dest = buttonMask.jumpTable();
     for ( int y = 0; y < buttonMask.height(); y++ ) {
         uchar *line = dest[y];
         for ( int x = 0; x < buttonMask.width(); x++ )
-            if ( !qRed( imgMask.pixel( x, y ) ) )
+            if ( !qRed( maskImage.pixel( x, y ) ) )
                 line[x] = command + 1;
     }
 
     // ### grmbl qt2. use constructor when switching to qt3.
-    QBitmap bm; bm = imgMask;
+    QBitmap bm; bm = maskImage;
     return bm;
 }
 
@@ -108,8 +105,7 @@ void MediaWidget::loadSkin( const SkinButtonInfo *skinInfo, uint buttonCount, co
     buttonUpImage = skin.buttonUpImage();
     buttonDownImage = skin.buttonDownImage();
 
-    setupButtons( skinInfo, buttonCount,
-                  skinPath + QString::fromLatin1( "/skin%1_mask_" ).arg( fileNameInfix ), buttonUpImage.size() );
+    setupButtons( skinInfo, buttonCount, skin, buttonUpImage.size() );
 }
 
 void MediaWidget::closeEvent( QCloseEvent * )
diff --git a/noncore/multimedia/opieplayer2/mediawidget.h b/noncore/multimedia/opieplayer2/mediawidget.h
index 52b9fcb..0d635aa 100644
--- a/noncore/multimedia/opieplayer2/mediawidget.h
+++ b/noncore/multimedia/opieplayer2/mediawidget.h
@@ -43,6 +43,8 @@ namespace
     };
 }
 
+class Skin;
+
 class MediaWidget : public QWidget
 {
     Q_OBJECT
@@ -100,9 +102,9 @@ signals:
 
 protected:
     void setupButtons( const SkinButtonInfo *skinInfo, uint buttonCount,
-                       const QString &imagePrefix, const QSize &buttonAreaSize );
-    Button setupButton( const SkinButtonInfo &buttonInfo, const QString &imagePrefix );
-    QBitmap setupButtonMask( const Command &command, const QString &fileName );
+                       const Skin &skin, const QSize &buttonAreaSize );
+    Button setupButton( const SkinButtonInfo &buttonInfo, const Skin &skin );
+    QBitmap setupButtonMask( const Command &command, const QImage &maskImage );
 
     void loadDefaultSkin( const SkinButtonInfo *skinInfo, uint buttonCount, const QString &fileNameInfix = QString::null );
     void loadSkin( const SkinButtonInfo *skinInfo, uint buttonCount, const QString &name, const QString &fileNameInfix );
diff --git a/noncore/multimedia/opieplayer2/skin.cpp b/noncore/multimedia/opieplayer2/skin.cpp
index 352368f..fb1c9c4 100644
--- a/noncore/multimedia/opieplayer2/skin.cpp
+++ b/noncore/multimedia/opieplayer2/skin.cpp
@@ -24,5 +24,12 @@ QImage Skin::buttonDownImage() const
     return QImage( Resource::findPixmap( QString( "%1/skin%2_down" ).arg( m_skinPath ).arg( m_fileNameInfix ) ) );
 }
 
+QImage Skin::buttonMaskImage( const QString &fileName ) const
+{
+    QString prefix = m_skinPath + QString::fromLatin1( "/skin%1_mask_" ).arg( m_fileNameInfix );
+    QString path = prefix + fileName + ".png";
+    return QImage( Resource::findPixmap( path ) );
+}
+
 /* vim: et sw=4 ts=4
  */
diff --git a/noncore/multimedia/opieplayer2/skin.h b/noncore/multimedia/opieplayer2/skin.h
index 85f9e57..f160b3c 100644
--- a/noncore/multimedia/opieplayer2/skin.h
+++ b/noncore/multimedia/opieplayer2/skin.h
@@ -13,6 +13,8 @@ public:
     QImage buttonUpImage() const;
     QImage buttonDownImage() const;
 
+    QImage buttonMaskImage( const QString &fileName ) const;
+
 private:
     QString m_name;
     QString m_fileNameInfix;