- centralize more of the skin loading code, so it can be factored out later

  more easily

4 files changed, 28 insertions, 22 deletions

diff --git a/noncore/multimedia/opieplayer2/audiowidget.cpp b/noncore/multimedia/opieplayer2/audiowidget.cpp
index 0b7cc45..bb686f1 100644
--- a/noncore/multimedia/opieplayer2/audiowidget.cpp
+++ b/noncore/multimedia/opieplayer2/audiowidget.cpp
@@ -192,18 +192,7 @@ void AudioWidget::setDisplayType( MediaPlayerState::DisplayType mediaType ) {
 
 void AudioWidget::loadSkin()
 {
-    Config cfg("OpiePlayer");
-    cfg.setGroup("Options");
-    skin = cfg.readEntry("Skin","default");
-    //skin = "scaleTest";
-    // color of background, frame, degree of transparency
-
-    QString skinPath = "opieplayer2/skins/" + skin;
-    backgroundPixmap = QPixmap( Resource::loadPixmap( QString("%1/background").arg(skinPath) ) );
-    buttonUpImage = QImage( Resource::loadImage( QString("%1/skin_up").arg(skinPath) ) );
-    buttonDownImage = QImage( Resource::loadImage( QString("%1/skin_down").arg(skinPath) ) );
-
-    setupButtons( skinInfo, buttonCount, QPEApplication::qpeDir()  + "/pics/" + skinPath + "/skin_mask_", buttonUpImage.size() );
+    loadDefaultSkin( skinInfo, buttonCount );
 
     setBackgroundPixmap( backgroundPixmap );
 
diff --git a/noncore/multimedia/opieplayer2/mediawidget.cpp b/noncore/multimedia/opieplayer2/mediawidget.cpp
index d60dc0d..c9d7db8 100644
--- a/noncore/multimedia/opieplayer2/mediawidget.cpp
+++ b/noncore/multimedia/opieplayer2/mediawidget.cpp
@@ -24,6 +24,9 @@
 #include "mediawidget.h"
 #include "playlistwidget.h"
 
+#include <qpe/config.h>
+#include <qpe/qpeapplication.h>
+
 MediaWidget::MediaWidget( PlayListWidget &_playList, MediaPlayerState &_mediaPlayerState, QWidget *parent, const char *name )
     : QWidget( parent, name ), mediaPlayerState( _mediaPlayerState ), playList( _playList )
 {
@@ -85,6 +88,26 @@ QBitmap MediaWidget::setupButtonMask( const Command &command, const QString &fil
     return mask;
 }
 
+void MediaWidget::loadDefaultSkin( const SkinButtonInfo *skinInfo, uint buttonCount, const QString &fileNameInfix )
+{
+    Config cfg( "OpiePlayer" );
+    cfg.setGroup( "Options" );
+    QString skin = cfg.readEntry( "Skin","default" );
+
+    loadSkin( skinInfo, buttonCount, skin, fileNameInfix );
+}
+
+void MediaWidget::loadSkin( const SkinButtonInfo *skinInfo, uint buttonCount, const QString &name, const QString &fileNameInfix )
+{
+    QString skinPath = "opieplayer2/skins/" + name;
+    backgroundPixmap = QPixmap( Resource::loadPixmap( QString( "%1/background" ).arg( skinPath ) ) );
+    buttonUpImage = QImage( Resource::loadImage( QString( "%1/skin%2_up" ).arg( skinPath ).arg( fileNameInfix ) ) );
+    buttonDownImage = QImage( Resource::loadImage( QString( "%1/skin%2_down" ).arg( skinPath ).arg( fileNameInfix ) ) );
+
+    setupButtons( skinInfo, buttonCount,
+                  QPEApplication::qpeDir()  + "/pics/" + skinPath + QString::fromLatin1( "/skin%1_mask_" ).arg( fileNameInfix ), buttonUpImage.size() );
+}
+
 void MediaWidget::closeEvent( QCloseEvent * )
 {
     mediaPlayerState.setList();
diff --git a/noncore/multimedia/opieplayer2/mediawidget.h b/noncore/multimedia/opieplayer2/mediawidget.h
index 754228e..52b9fcb 100644
--- a/noncore/multimedia/opieplayer2/mediawidget.h
+++ b/noncore/multimedia/opieplayer2/mediawidget.h
@@ -104,6 +104,9 @@ protected:
     Button setupButton( const SkinButtonInfo &buttonInfo, const QString &imagePrefix );
     QBitmap setupButtonMask( const Command &command, const QString &fileName );
 
+    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 );
+
     virtual void closeEvent( QCloseEvent * );
 
     virtual void paintEvent( QPaintEvent *pe );
diff --git a/noncore/multimedia/opieplayer2/videowidget.cpp b/noncore/multimedia/opieplayer2/videowidget.cpp
index 0047ac0..bc47717 100644
--- a/noncore/multimedia/opieplayer2/videowidget.cpp
+++ b/noncore/multimedia/opieplayer2/videowidget.cpp
@@ -185,16 +185,7 @@ void VideoWidget::setDisplayType( MediaPlayerState::DisplayType displayType )
 
 void VideoWidget::loadSkin()
 {
-    Config cfg("OpiePlayer");
-    cfg.setGroup("Options");
-    QString skin = cfg.readEntry("Skin","default");
-
-    QString skinPath = "opieplayer2/skins/" + skin;
-    backgroundPixmap = QPixmap( Resource::loadPixmap( QString("%1/background").arg(skinPath) ) );
-    buttonUpImage = QImage( Resource::loadImage( QString("%1/skinV_up").arg(skinPath) ) );
-    buttonDownImage = QImage( Resource::loadImage( QString("%1/skinV_down").arg(skinPath) ) );
-
-    setupButtons( skinInfo, buttonCount, QPEApplication::qpeDir()  + "/pics/" + skinPath + "/skinV_mask_", buttonUpImage.size() );
+    loadDefaultSkin( skinInfo, buttonCount, "V" );
 
     setBackgroundPixmap( backgroundPixmap );