- moved default skin name reading over to skin class

1 files changed, 20 insertions, 1 deletions

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,13 +1,25 @@
 
 #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 )
 {
@@ -76,8 +88,15 @@ QImage Skin::buttonMaskImage( const QString &fileName ) const
         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
  */