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
@@ -208,65 +208,65 @@ void PlayListWidget::addToSelection( const DocLnk& lnk ) {
     d->setDocumentUsed = FALSE;
     if ( mediaPlayerState->playlist() ) {
         if( QFileInfo( lnk.file() ).exists() || lnk.file().left(4) == "http" )
             d->selectedFiles->addToSelection( lnk );
     }
     else
         mediaPlayerState->setPlaying( TRUE );
 }
 
 
 void PlayListWidget::clearList() {
     while ( first() ) {
         d->selectedFiles->removeSelected();
     }
 }
 
 
 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;
     }
 }
 
 
 void PlayListWidget::addAllToList() {
     DocLnkSet filesAll;
     Global::findDocuments(&filesAll, "video/*;audio/*");
     QListIterator<DocLnk> Adit( filesAll.children() );
     for ( ; Adit.current(); ++Adit ) {
         if( QFileInfo( Adit.current()->file() ).exists() ) {
             d->selectedFiles->addToSelection( **Adit );
         }
     }
 }
 
 
 void PlayListWidget::addAllMusicToList() {
     QListIterator<DocLnk> dit( files.children() );
     for ( ; dit.current(); ++dit ) {
         if( QFileInfo(dit.current()->file() ).exists() ) {
@@ -313,72 +313,48 @@ void PlayListWidget::setDocument( const QString& fileref ) {
         setCaption( tr("OpiePlayer") );
     }
 }
 
 
 void PlayListWidget::useSelectedDocument() {
     d->setDocumentUsed = FALSE;
 }
 
 
 const DocLnk *PlayListWidget::current() { // this is fugly
     switch ( whichList() ) {
     case 0: //playlist
     {
 //      qDebug("playlist");
         if ( mediaPlayerState->playlist() ) {
             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() ) {
             const DocLnk *cur = current();
             int j = 1 + (int)(97.0 * rand() / (RAND_MAX + 1.0));
             for ( int i = 0; i < j; i++ ) {
                 if ( !d->selectedFiles->next() )
                     d->selectedFiles->first();
             }
             if ( cur == current() )
                 if ( !d->selectedFiles->next() ) {
                     d->selectedFiles->first();
                 }
             return TRUE;
         } else {
             if ( !d->selectedFiles->prev() ) {
                 if ( mediaPlayerState->looping() ) {
                     return d->selectedFiles->last();
                 } else {
@@ -614,48 +590,49 @@ void PlayListWidget::tabChanged(QWidget *) {
     case 2:
     {
         videoView->clear();
         populateVideoView();
         if( !tbDeletePlaylist->isHidden() ) {
             tbDeletePlaylist->hide();
         }
         d->tbRemoveFromList->setEnabled(FALSE);
         d->tbAddToList->setEnabled(TRUE);
     }
     break;
     case 3:
     {
         if( tbDeletePlaylist->isHidden() ) {
             tbDeletePlaylist->show();
         }
         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);
 //     }
 //     break;
 //   case 1:
 //     {
 //       mediaPlayerState->setPlaying(b);
 //       qApp->processEvents();
 //       insanityBool=FALSE;
 //     }//          audioView->clearSelection();
 //     break;
 //   case 2:
 //     {
 //   //     addToSelection( videoView->currentItem() );
 //       mediaPlayerState->setPlaying(b);
 //       qApp->processEvents();
 //   //     d->selectedFiles->removeSelected( );
 // //       tabWidget->setCurrentPage(2);
 // //       d->selectedFiles->unSelect();
@@ -1019,64 +996,64 @@ void PlayListWidget::pmViewActivated(int index) {
         pmView->setItemChecked( index, b);
         Config cfg( "OpiePlayer" );
         cfg.writeEntry( "FullScreen", b );
     }
     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() );
+//        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 ) );
 }
 
 int PlayListWidget::whichList() {
     return tabWidget->currentPageIndex();
 }
 
 QString PlayListWidget::currentFileListPathName() {
     switch (whichList()) {
       case 1: 
           return audioView->currentItem()->text(3);
           break;
       case 2: 
           return videoView->currentItem()->text(3);
           break;
     };
     return "";
 }