fix multiselect addto playlist

1 files changed, 20 insertions, 8 deletions

diff --git a/noncore/multimedia/opieplayer2/playlistwidget.cpp b/noncore/multimedia/opieplayer2/playlistwidget.cpp
index 16467c0..ccf654f 100644
--- a/noncore/multimedia/opieplayer2/playlistwidget.cpp
+++ b/noncore/multimedia/opieplayer2/playlistwidget.cpp
@@ -534,47 +534,59 @@ void PlayListWidget::setPlaylist( bool shown ) {
     } else {
         d->playListFrame->hide();
     }
 }
 
 
 void PlayListWidget::addSelected() {
   qDebug("addSelected");
   DocLnk lnk;
   QString filename;
   switch (whichList()) {
 
   case 0: //playlist
     return;
     break;
   case 1: { //audio
-    filename=audioView->currentItem()->text(3);
-    //    d->selectedFiles->next();
+    QListViewItemIterator it( audioView );
+    for ( ; it.current(); ++it ) {
+      if ( it.current()->isSelected() ) {
+        filename=it.current()->text(3);
+        lnk.setName( QFileInfo(filename).baseName() ); //sets name
+        lnk.setFile( filename ); //sets file name
+        d->selectedFiles->addToSelection(  lnk);
+      }
+    }
   }
     break;
     
   case 2: { // video
-    filename=videoView->currentItem()->text(3);
-    //          tabWidget->setCurrentPage(0);
+    QListViewItemIterator it( videoView );
+    for ( ; it.current(); ++it ) {
+      if ( it.current()->isSelected() ) {
+        //      myFile = (*it);
     
+        filename=it.current()->text(3);
+        lnk.setName( QFileInfo(filename).baseName() ); //sets name
+        lnk.setFile( filename ); //sets file name
+        d->selectedFiles->addToSelection(  lnk);
+      }
+    }
   }
     break;
   };
-  lnk.setName( QFileInfo(filename).baseName() ); //sets name
-  lnk.setFile( filename ); //sets file name
-  d->selectedFiles->addToSelection(  lnk);
   tabWidget->setCurrentPage(0);
   writeCurrentM3u();          
 }
 
 
 void PlayListWidget::removeSelected() {
     d->selectedFiles->removeSelected( );
     writeCurrentM3u();          
 }
 
 
 void PlayListWidget::playIt( QListViewItem *it) {
     if(!it) return;
     mediaPlayerState->setPlaying(FALSE);
     mediaPlayerState->setPlaying(TRUE);
     d->selectedFiles->unSelect();
@@ -983,33 +995,33 @@ void PlayListWidget::writem3u() {
         if( d->selectedFiles->first()) {
           m3uList = new Om3u(filename, IO_ReadWrite);
 
           do {
             m3uList->add( d->selectedFiles->current()->file());
           }
           while ( d->selectedFiles->next() );
           //    qDebug( list );
           m3uList->write();
           m3uList->close();
           if(m3uList) delete m3uList;
         
           if(fileDlg) delete fileDlg;
 
           DocLnk lnk;
           lnk.setFile( filename);
-//          lnk.setIcon("opieplayer2/playlist2");
+          lnk.setIcon("opieplayer2/playlist2");
           lnk.setName( name); //sets file name
 
           // qDebug(filename);
           Config config( "OpiePlayer" );
           config.setGroup( "PlayList" );
     
           config.writeEntry("CurrentPlaylist",filename);
           currentPlayList=filename;
 
           if(!lnk.writeLink()) {
             qDebug("Writing doclink did not work");
           }
 
           setCaption(tr("OpiePlayer: ") + name);
         }
     }