1 files changed, 5 insertions, 28 deletions

diff --git a/noncore/multimedia/opieplayer2/playlistwidget.cpp b/noncore/multimedia/opieplayer2/playlistwidget.cpp
index 15c70c3..2b58402 100644
--- a/noncore/multimedia/opieplayer2/playlistwidget.cpp
+++ b/noncore/multimedia/opieplayer2/playlistwidget.cpp
@@ -224,33 +224,33 @@ void PlayListWidget::clearList() {
 
 void PlayListWidget::viewPressed( int mouse, QListViewItem *, const QPoint& , int) {
     switch (mouse) {
     case 1:
         break;
     case 2:
     {
         QPopupMenu  m;
-        m.insertItem( tr( "Play" ), this, SLOT( playSelected() ));
+        m.insertItem( tr( "Play Selected" ), this, SLOT( playSelected() ));
         m.insertItem( tr( "Add to Playlist" ), this, SLOT( addSelected() ));
         m.exec( QCursor::pos() );
     }
         break;
     }
 }
 
 
 void PlayListWidget::playlistViewPressed( int mouse, QListViewItem *, const QPoint& , int ) {
     switch (mouse) {
     case 1:
         break;
     case 2:
     {
         QPopupMenu  m;
-        m.insertItem( tr( "Play Selected" ), this, SLOT( playSelected() ));
+        m.insertItem( tr( "Play" ), this, SLOT( playSelected() ));
         m.insertItem( tr( "Remove" ), this, SLOT( removeSelected() ));
         m.exec( QCursor::pos() );
     }
     break;
     }
 }
 
 
@@ -329,40 +329,16 @@ const DocLnk *PlayListWidget::current() { // this is fugly
             return d->selectedFiles->current();
         } else if ( d->setDocumentUsed && d->current ) {
             return d->current;
         } else {
             return d->files->selected();
         }
     }
     break;
-    case 1://audio
-    {
-//      qDebug("audioView");
-        QListIterator<DocLnk> dit( files.children() );
-        for ( ; dit.current(); ++dit ) {
-            if( dit.current()->name() == audioView->currentItem()->text( 0 ) && !insanityBool ) {
-                insanityBool = TRUE;
-                return dit;
-            }
-        }
-    }
-    break;
-    case 2: // video
-    {
-//      qDebug("videoView");
-        QListIterator<DocLnk> Vdit( vFiles.children() );
-        for ( ; Vdit.current(); ++Vdit ) {
-            if( Vdit.current()->name() == videoView->currentItem()->text( 0 ) && !insanityBool) {
-                insanityBool = TRUE;
-                return Vdit;
-            }
-        }
-    }
-    break;
     };
     return 0;
 }
 
 
 bool PlayListWidget::prev() {
     if ( mediaPlayerState->playlist() ) {
         if ( mediaPlayerState->shuffled() ) {
@@ -630,16 +606,17 @@ void PlayListWidget::tabChanged(QWidget *) {
         playLists->reread();
     }
     break;
     };
 }
 
 
 void PlayListWidget::btnPlay(bool b) {
+//    mediaPlayerState->setPlaying(false);
     mediaPlayerState->setPlaying(b);
     qApp->processEvents();
     insanityBool=FALSE;
 //   switch ( whichList()) {
 //   case 0:
 //     {
 //       mediaPlayerState->setPlaying(b);
 //     }
@@ -1035,32 +1012,32 @@ void PlayListWidget::populateSkinsMenu() {
     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() );
+//        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( uint i = defaultSkinIndex; i > defaultSkinIndex - skinsMenu->count(); i-- ) {
+    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 ) );
 }