3 files changed, 26 insertions, 10 deletions

diff --git a/noncore/multimedia/opieplayer2/mediawidget.cpp b/noncore/multimedia/opieplayer2/mediawidget.cpp
index 0d1c8b6..ab23aa8 100644
--- a/noncore/multimedia/opieplayer2/mediawidget.cpp
+++ b/noncore/multimedia/opieplayer2/mediawidget.cpp
@@ -20,19 +20,16 @@
    Boston, MA 02111-1307, USA.
 */
 
 
 #include "mediawidget.h"
 #include "playlistwidget.h"
 #include "skin.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 )
 {
     connect( &mediaPlayerState, SIGNAL( displayTypeChanged( MediaPlayerState::DisplayType ) ),
              this, SLOT( setDisplayType( MediaPlayerState::DisplayType ) ) );
     connect( &mediaPlayerState, SIGNAL( lengthChanged( long ) ),
              this, SLOT( setLength( long ) ) );
     connect( &mediaPlayerState, SIGNAL( playingToggled( bool ) ),
@@ -64,21 +61,17 @@ MediaWidget::Button MediaWidget::setupButton( const SkinButtonInfo &buttonInfo,
     button.type = buttonInfo.type;
     button.mask = skin.buttonMaskImage( buttonInfo.fileName );
 
     return button;
 }
 
 void MediaWidget::loadDefaultSkin( const SkinButtonInfo *skinInfo, uint buttonCount, const QString &fileNameInfix )
 {
-    Config cfg( "OpiePlayer" );
-    cfg.setGroup( "Options" );
-    QString name = cfg.readEntry( "Skin","default" );
-
-    Skin skin( name, fileNameInfix );
+    Skin skin( fileNameInfix );
     loadSkin( skinInfo, buttonCount, skin );
 }
 
 void MediaWidget::loadSkin( const SkinButtonInfo *skinInfo, uint buttonCount, const Skin &skin )
 {
     backgroundPixmap = skin.backgroundImage();
     buttonUpImage = skin.buttonUpImage();
     buttonDownImage = skin.buttonDownImage();
diff --git a/noncore/multimedia/opieplayer2/skin.cpp b/noncore/multimedia/opieplayer2/skin.cpp
index d3918d1..8281b20 100644
--- a/noncore/multimedia/opieplayer2/skin.cpp
+++ b/noncore/multimedia/opieplayer2/skin.cpp
@@ -1,15 +1,27 @@
 
 #include "skin.h"
 
 #include <qpe/resource.h>
+#include <qpe/config.h>
 
 Skin::Skin( const QString &name, const QString &fileNameInfix )
-    : m_name( name ), m_fileNameInfix( fileNameInfix )
+    : m_fileNameInfix( fileNameInfix )
+{
+    init( name );
+}
+
+Skin::Skin( const QString &fileNameInfix )
+    : m_fileNameInfix( fileNameInfix )
+{
+    init( defaultSkinName() );
+}
+
+void Skin::init( const QString &name )
 {
     m_skinPath = "opieplayer2/skins/" + name;
 }
 
 void Skin::preload( const MediaWidget::SkinButtonInfo *skinButtonInfo, uint buttonCount )
 {
     backgroundImage();
     buttonUpImage();
@@ -74,10 +86,17 @@ QImage Skin::buttonMaskImage( const QString &fileName ) const
     if ( it == m_buttonMasks.end() ) {
         QString prefix = m_skinPath + QString::fromLatin1( "/skin%1_mask_" ).arg( m_fileNameInfix );
         QString path = prefix + fileName + ".png";
         it = m_buttonMasks.insert( fileName, QImage( Resource::findPixmap( path ) ) );
     }
     return *it;
 }
 
+QString Skin::defaultSkinName()
+{
+    Config cfg( "OpiePlayer" );
+    cfg.setGroup( "Options" );
+    return cfg.readEntry( "Skin", "default" );
+}
+
 /* vim: et sw=4 ts=4
  */
diff --git a/noncore/multimedia/opieplayer2/skin.h b/noncore/multimedia/opieplayer2/skin.h
index ee19f4b..58f1849 100644
--- a/noncore/multimedia/opieplayer2/skin.h
+++ b/noncore/multimedia/opieplayer2/skin.h
@@ -6,31 +6,35 @@
 #include <qmap.h>
 
 #include "mediawidget.h"
 
 class Skin
 {
 public:
     Skin( const QString &name, const QString &fileNameInfix );
+    Skin( const QString &fileNameInfix );
 
     void preload( const MediaWidget::SkinButtonInfo *skinButtonInfo, uint buttonCount );
 
     QImage backgroundImage() const;
     QImage buttonUpImage() const;
     QImage buttonDownImage() const;
 
     QImage buttonMask( const MediaWidget::SkinButtonInfo *skinButtonInfo, uint buttonCount ) const;
 
     QImage buttonMaskImage( const QString &fileName ) const;
 
+    static QString defaultSkinName();
+
 private:
+    void init( const QString &name );
+
     void addButtonToMask( int tag, const QImage &maskImage ) const;
 
-    QString m_name;
     QString m_fileNameInfix;
     QString m_skinPath;
 
     typedef QMap<QString, QImage> ButtonMaskImageMap;
 
     mutable QImage m_backgroundImage;
     mutable QImage m_buttonUpImage;
     mutable QImage m_buttonDownImage;