4 files changed, 55 insertions, 3 deletions

diff --git a/noncore/multimedia/opieplayer2/audiowidget.cpp b/noncore/multimedia/opieplayer2/audiowidget.cpp
index 2ee9383..a3d34f4 100644
--- a/noncore/multimedia/opieplayer2/audiowidget.cpp
+++ b/noncore/multimedia/opieplayer2/audiowidget.cpp
@@ -134,3 +134,3 @@ AudioWidget::AudioWidget(QWidget* parent, const char* name, WFlags f) :
     Config cfg("OpiePlayer");
-    cfg.setGroup("AudioWidget");
+    cfg.setGroup("Options");
     skin = cfg.readEntry("Skin","default");
diff --git a/noncore/multimedia/opieplayer2/playlistwidget.cpp b/noncore/multimedia/opieplayer2/playlistwidget.cpp
index 2521906..c210ffb 100644
--- a/noncore/multimedia/opieplayer2/playlistwidget.cpp
+++ b/noncore/multimedia/opieplayer2/playlistwidget.cpp
@@ -175,2 +175,9 @@ PlayListWidget::PlayListWidget( QWidget* parent, const char* name, WFlags fl )
 
+    pmView->insertSeparator(-1);
+
+    skinsMenu = new QPopupMenu( this );
+    pmView->insertItem( tr( "Skins" ), skinsMenu );
+    skinsMenu->isCheckable();
+    populateSkinsMenu();
+
     QVBox *vbox5 = new QVBox( this ); vbox5->setBackgroundMode( PaletteButton );
@@ -252,3 +259,5 @@ PlayListWidget::PlayListWidget( QWidget* parent, const char* name, WFlags fl )
 
-connect( pmView, SIGNAL( activated(int)), this, SLOT( pmViewActivated(int) ) );
+    connect( pmView, SIGNAL( activated(int)), this, SLOT( pmViewActivated(int) ) );
+
+    connect( skinsMenu, SIGNAL( activated(int)), this, SLOT(skinsMenuActivated(int) ) );
 
@@ -1237 +1246,40 @@ switch(index) {
 }
+
+void PlayListWidget::populateSkinsMenu() {
+    int item=0;
+    defaultSkinIndex=0;
+    QString skinName;
+    Config cfg( "OpiePlayer" );
+    cfg.setGroup("Options");
+    QString skin = cfg.readEntry("Skin","default");
+
+    QDir skinsDir(QPEApplication::qpeDir()+"/pics/opieplayer2/skins");
+    skinsDir.setFilter( QDir::Dirs);
+    skinsDir.setSorting(QDir::Name);
+    const QFileInfoList *skinslist = skinsDir.entryInfoList();
+    QFileInfoListIterator it( *skinslist );
+    QFileInfo *fi;
+    while ( (fi=it.current()) ) {
+        skinName =  fi->fileName();
+        qDebug(  fi->fileName());
+        if( skinName != "." &&  skinName != ".." && skinName !="CVS")
+            item = skinsMenu->insertItem( fi->fileName());
+        if( skinName == "default")
+            defaultSkinIndex = item;
+        if( skinName == skin)
+            skinsMenu->setItemChecked( item, TRUE);
+                
+        ++it;
+    }
+}
+
+void PlayListWidget::skinsMenuActivated(int item) {
+    for(int i = defaultSkinIndex; i > defaultSkinIndex - skinsMenu->count(); i--) {
+        skinsMenu->setItemChecked( i, FALSE);
+    }
+    skinsMenu->setItemChecked( item, TRUE);
+
+    Config cfg( "OpiePlayer" );
+    cfg.setGroup("Options");
+    cfg.writeEntry("Skin", skinsMenu->text( item));
+}
diff --git a/noncore/multimedia/opieplayer2/playlistwidget.h b/noncore/multimedia/opieplayer2/playlistwidget.h
index dd49892..67a85a8 100644
--- a/noncore/multimedia/opieplayer2/playlistwidget.h
+++ b/noncore/multimedia/opieplayer2/playlistwidget.h
@@ -58,2 +58,4 @@ void keyPressEvent( QKeyEvent *e);
 private:
+    int defaultSkinIndex; 
+    QPopupMenu *skinsMenu; 
     bool audioScan, videoScan;
@@ -71,2 +73,4 @@ private:
 private slots:
+    void populateSkinsMenu();
+    void skinsMenuActivated(int); 
     void pmViewActivated(int);
diff --git a/noncore/multimedia/opieplayer2/videowidget.cpp b/noncore/multimedia/opieplayer2/videowidget.cpp
index b4e69b5..fb375f0 100644
--- a/noncore/multimedia/opieplayer2/videowidget.cpp
+++ b/noncore/multimedia/opieplayer2/videowidget.cpp
@@ -89,3 +89,3 @@ QWidget( parent, name, f ), scaledWidth( 0 ), scaledHeight( 0 ) {
     Config cfg("OpiePlayer");
-    cfg.setGroup("VideoWidget");
+    cfg.setGroup("Options");
     skin = cfg.readEntry("Skin","default");