finish audio skin

3 files changed, 63 insertions, 10 deletions

diff --git a/core/multimedia/opieplayer/audiowidget.cpp b/core/multimedia/opieplayer/audiowidget.cpp
index 896da91..d20d560 100644
--- a/core/multimedia/opieplayer/audiowidget.cpp
+++ b/core/multimedia/opieplayer/audiowidget.cpp
@@ -50,3 +50,2 @@ MediaButton audioButtons[] = {
    { FALSE, FALSE, FALSE }, // stop
-   { TRUE,  FALSE, FALSE }, // pause
    { FALSE, FALSE, FALSE }, // next
@@ -58,7 +57,7 @@ MediaButton audioButtons[] = {
    { FALSE, FALSE, FALSE }, // forward
-   { FALSE, FALSE, FALSE }  // back 
+   { FALSE, FALSE, FALSE }  // back
 };
 
-const char *skin_mask_file_names[11] = {
-   "play", "stop", "pause", "next", "prev", "up",
+const char *skin_mask_file_names[10] = {
+   "play", "stop", "next", "prev", "up",
    "down", "loop", "playlist", "forward", "back"
@@ -66,3 +65,2 @@ const char *skin_mask_file_names[11] = {
 
-
 static void changeTextColor( QWidget *w ) {
@@ -83,3 +81,3 @@ AudioWidget::AudioWidget(QWidget* parent, const char* name, WFlags f) :
     Config cfg("OpiePlayer");
-    cfg.setGroup("AudioWidget");
+    cfg.setGroup("Options");
     skin = cfg.readEntry("Skin","default");
@@ -89,2 +87,4 @@ AudioWidget::AudioWidget(QWidget* parent, const char* name, WFlags f) :
     QString skinPath = "opieplayer2/skins/" + skin;
+    qDebug("skin path "+skinPath);
+    
     pixBg = new QPixmap( Resource::loadPixmap( QString("%1/background").arg(skinPath) ) );
@@ -96,3 +96,3 @@ AudioWidget::AudioWidget(QWidget* parent, const char* name, WFlags f) :
 
-    for ( int i = 0; i < 11; i++ ) {
+    for ( int i = 0; i < 10; i++ ) {
         QString filename = QString(getenv("OPIEDIR")) + "/pics/" + skinPath + "/skin_mask_" + skin_mask_file_names[i] + ".png";
@@ -163,3 +163,3 @@ AudioWidget::~AudioWidget() {
     
-    for ( int i = 0; i < 11; i++ ) {
+    for ( int i = 0; i < 10; i++ ) {
         delete buttonPixUp[i];
@@ -171,3 +171,3 @@ AudioWidget::~AudioWidget() {
     delete imgButtonMask;
-    for ( int i = 0; i < 11; i++ ) {
+    for ( int i = 0; i < 10; i++ ) {
         delete masks[i];
@@ -212,3 +212,3 @@ void AudioWidget::resizeEvent( QResizeEvent * ) {
 
-    for ( int i = 0; i < 11; i++ ) {
+    for ( int i = 0; i < 10; i++ ) {
         if ( !masks[i]->isNull() ) {
diff --git a/core/multimedia/opieplayer/playlistwidget.cpp b/core/multimedia/opieplayer/playlistwidget.cpp
index 6580a88..a937d7c 100644
--- a/core/multimedia/opieplayer/playlistwidget.cpp
+++ b/core/multimedia/opieplayer/playlistwidget.cpp
@@ -195,2 +195,10 @@ PlayListWidget::PlayListWidget( QWidget* parent, const char* name, WFlags fl )
 
+
+    skinsMenu = new QPopupMenu( this );
+    menu->insertItem( tr( "Skins" ), skinsMenu );
+    skinsMenu->isCheckable();
+    connect( skinsMenu, SIGNAL( activated( int ) ) ,
+             this, SLOT( skinsMenuActivated( int ) ) );
+    populateSkinsMenu();
+
     QVBox *vbox5 = new QVBox( this ); vbox5->setBackgroundMode( PaletteButton );
@@ -1352 +1360,41 @@ void PlayListWidget::doUnblank() {
 
+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/core/multimedia/opieplayer/playlistwidget.h b/core/multimedia/opieplayer/playlistwidget.h
index 1be5a15..1118b76 100644
--- a/core/multimedia/opieplayer/playlistwidget.h
+++ b/core/multimedia/opieplayer/playlistwidget.h
@@ -39,2 +39,3 @@ class QAction;
 class QLabel;
+class QPopupMenu;
 
@@ -69,2 +70,3 @@ public slots:
 protected:
+        QPopupMenu *skinsMenu;
 /*     void contentsMousePressEvent( QMouseEvent * e ); */
@@ -74,2 +76,3 @@ void keyPressEvent( QKeyEvent *e);
 private:
+    int defaultSkinIndex;
     bool audioScan, videoScan; 
@@ -89,2 +92,4 @@ private slots:
 
+    void populateSkinsMenu();
+    void skinsMenuActivated(int);
     void writem3u();