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
@@ -132,7 +132,7 @@ AudioWidget::AudioWidget(QWidget* parent, const char* name, WFlags f) :
     setCaption( tr("OpiePlayer") );
 
     Config cfg("OpiePlayer");
-    cfg.setGroup("AudioWidget");
+    cfg.setGroup("Options");
     skin = cfg.readEntry("Skin","default");
       //skin = "scaleTest";
 // color of background, frame, degree of transparency
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
@@ -173,6 +173,13 @@ PlayListWidget::PlayListWidget( QWidget* parent, const char* name, WFlags fl )
 
     pmView->insertItem(  Resource::loadPixmap("opieplayer/scale") , tr( "Scale"), mediaPlayerState, SLOT(toggleScaled() ) );
 
+    pmView->insertSeparator(-1);
+
+    skinsMenu = new QPopupMenu( this );
+    pmView->insertItem( tr( "Skins" ), skinsMenu );
+    skinsMenu->isCheckable();
+    populateSkinsMenu();
+
     QVBox *vbox5 = new QVBox( this ); vbox5->setBackgroundMode( PaletteButton );
     QVBox *vbox4 = new QVBox( vbox5 ); vbox4->setBackgroundMode( PaletteButton );
 
@@ -250,7 +257,9 @@ PlayListWidget::PlayListWidget( QWidget* parent, const char* name, WFlags fl )
 
     connect(tbDeletePlaylist,(SIGNAL(released())),SLOT( deletePlaylist()));
 
-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) ) );
 
 //    connect( scaleButton, SIGNAL(activated()), mediaPlayerState, SLOT(toggleScaled() ) );
 
@@ -1235,3 +1244,42 @@ switch(index) {
   break;
 };
 }
+
+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
@@ -56,6 +56,8 @@ protected:
 void keyReleaseEvent( QKeyEvent *e);
 void keyPressEvent( QKeyEvent *e);
 private:
+    int defaultSkinIndex; 
+    QPopupMenu *skinsMenu; 
     bool audioScan, videoScan;
     void doBlank();
     void doUnblank();
@@ -69,6 +71,8 @@ private:
     void populateAudioView();
     void populateVideoView();
 private slots:
+    void populateSkinsMenu();
+    void skinsMenuActivated(int); 
     void pmViewActivated(int);
     void writem3u();
     void scanForAudio();
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
@@ -87,7 +87,7 @@ QWidget( parent, name, f ), scaledWidth( 0 ), scaledHeight( 0 ) {
     connect ( videoFrame, SIGNAL( videoResized ( const QSize & )), this, SIGNAL( videoResized ( const QSize & )));
 
     Config cfg("OpiePlayer");
-    cfg.setGroup("VideoWidget");
+    cfg.setGroup("Options");
     skin = cfg.readEntry("Skin","default");
 
     QString skinPath = "opieplayer2/skins/" + skin;