1 files changed, 48 insertions, 30 deletions

diff --git a/core/multimedia/opieplayer/playlistwidget.cpp b/core/multimedia/opieplayer/playlistwidget.cpp
index ff156f8..7c76400 100644
--- a/core/multimedia/opieplayer/playlistwidget.cpp
+++ b/core/multimedia/opieplayer/playlistwidget.cpp
@@ -218,14 +218,15 @@ PlayListWidget::PlayListWidget( QWidget* parent, const char* name, WFlags fl )
     audioView->addColumn( tr("Title"),140);
     audioView->addColumn(tr("Size"), -1);
     audioView->addColumn(tr("Media"),-1);
     audioView->setColumnAlignment(1, Qt::AlignRight);
     audioView->setColumnAlignment(2, Qt::AlignRight);
     audioView->setAllColumnsShowFocus(TRUE);
-//     audioView->setMultiSelection( TRUE );
-//     audioView->setSelectionMode( QListView::Extended);
+
+    audioView->setMultiSelection( TRUE );
+    audioView->setSelectionMode( QListView::Extended);
     
     tabWidget->insertTab(aTab,tr("Audio"));
 
     QPEApplication::setStylusOperation( audioView->viewport(),QPEApplication::RightOnHold);
     connect( audioView, SIGNAL( mouseButtonPressed( int, QListViewItem *, const QPoint&, int)),
              this,SLOT( viewPressed(int, QListViewItem *, const QPoint&, int)) );
@@ -243,14 +244,14 @@ PlayListWidget::PlayListWidget( QWidget* parent, const char* name, WFlags fl )
     videoView->addColumn(tr("Title"),140);
     videoView->addColumn(tr("Size"),-1);
     videoView->addColumn(tr("Media"),-1);
     videoView->setColumnAlignment(1, Qt::AlignRight);
     videoView->setColumnAlignment(2, Qt::AlignRight);
     videoView->setAllColumnsShowFocus(TRUE);
-//     videoView->setMultiSelection( TRUE );
-//     videoView->setSelectionMode( QListView::Extended);
+    videoView->setMultiSelection( TRUE );
+    videoView->setSelectionMode( QListView::Extended);
 
     QPEApplication::setStylusOperation( videoView->viewport(),QPEApplication::RightOnHold);
     connect( videoView, SIGNAL( mouseButtonPressed( int, QListViewItem *, const QPoint&, int)),
              this,SLOT( viewPressed(int, QListViewItem *, const QPoint&, int)) );
 
     tabWidget->insertTab( vTab,tr("Video"));
@@ -677,43 +678,60 @@ void PlayListWidget::addSelected() {
       int noOfFiles = cfg.readNumEntry("NumberOfFiles", 0 );
 
       switch (tabWidget->currentPageIndex()) {
         case 0: //playlist
             break;
         case 1: { //audio
-            for ( int i = 0; i < noOfFiles; i++ ) {
-                QString entryName;
-                entryName.sprintf( "File%i", i + 1 );
-                QString linkFile = cfg.readEntry( entryName );
-                  if( DocLnk( linkFile).name() == audioView->selectedItem()->text(0) ) {
-                      int result= QMessageBox::warning(this,tr("OpiePlayer"),
-                                  tr("This is all ready in your playlist.\nContinue?"),
-                                  tr("Yes"),tr("No"),0,0,1);
-                      if (result !=0)
-                          return;
-                  }
+//                 QString entryName;
+//                 entryName.sprintf( "File%i", i + 1 );
+//                 QString linkFile = cfg.readEntry( entryName );
+            QListViewItemIterator it(  audioView  );
+              // iterate through all items of the listview
+            for ( ; it.current(); ++it ) {
+                if ( it.current()->isSelected() ) {
+                    QListIterator<DocLnk> dit( files.children() );
+                    for ( ; dit.current(); ++dit ) {
+                        if( dit.current()->name() == it.current()->text(0) ) {
+                            d->selectedFiles->addToSelection(  **dit );
+                        }
+                    }
+                    audioView->setSelected( it.current(),FALSE);
+                }
             }
-            addToSelection( audioView->selectedItem() );
-            tabWidget->setCurrentPage(1);
+            tabWidget->setCurrentPage(0);
         }           
         break;
         case 2: { // video
-            for ( int i = 0; i < noOfFiles; i++ ) {
-                QString entryName;
-                entryName.sprintf( "File%i", i + 1 );
-                QString linkFile = cfg.readEntry( entryName );
-                  if( DocLnk( linkFile).name() == videoView->selectedItem()->text(0) ) {
-                      int result= QMessageBox::warning(this,tr("OpiePlayer"),
-                                  tr("This is all ready in your playlist.\nContinue?"),
-                                  tr("Yes"),tr("No"),0,0,1);
-                      if (result !=0)
-                          return;
-                  }
+            QListViewItemIterator it(  videoView  );
+              // iterate through all items of the listview
+            for ( ; it.current(); ++it ) {
+                if ( it.current()->isSelected() ) {
+                    QListIterator<DocLnk> dit( vFiles.children() );
+                    for ( ; dit.current(); ++dit ) {
+                        if( dit.current()->name() == it.current()->text(0) ) {
+                            d->selectedFiles->addToSelection(  **dit );
+                        }
+                    }
+
+                    videoView->setSelected( it.current(),FALSE);
+                }
             }
-            addToSelection( videoView->selectedItem() );
-            tabWidget->setCurrentPage(2);
+//             for ( int i = 0; i < noOfFiles; i++ ) {
+//                 QString entryName;
+//                 entryName.sprintf( "File%i", i + 1 );
+//                 QString linkFile = cfg.readEntry( entryName );
+//                   if( DocLnk( linkFile).name() == videoView->selectedItem()->text(0) ) {
+//                       int result= QMessageBox::warning(this,tr("OpiePlayer"),
+//                                   tr("This is all ready in your playlist.\nContinue?"),
+//                                   tr("Yes"),tr("No"),0,0,1);
+//                       if (result !=0)
+//                           return;
+//                   }
+//             }
+//             addToSelection( videoView->selectedItem() );
+            tabWidget->setCurrentPage(0);
         }
         break;
       };
 }
 
 void PlayListWidget::removeSelected() {