sync with op2

2 files changed, 57 insertions, 79 deletions

diff --git a/core/multimedia/opieplayer/audiowidget.cpp b/core/multimedia/opieplayer/audiowidget.cpp
index ef7c8dc..9a55608 100644
--- a/core/multimedia/opieplayer/audiowidget.cpp
+++ b/core/multimedia/opieplayer/audiowidget.cpp
@@ -83,8 +83,9 @@ AudioWidget::AudioWidget(QWidget* parent, const char* name, WFlags f) :
     skin = cfg.readEntry("Skin","default");
       //skin = "scaleTest";
 // color of background, frame, degree of transparency
 
+//    QString skinPath = "opieplayer/skins/" + skin;
     QString skinPath = "opieplayer2/skins/" + skin;
     qDebug("skin path "+skinPath);
     
     pixBg = new QPixmap( Resource::loadPixmap( QString("%1/background").arg(skinPath) ) );
@@ -119,11 +120,11 @@ AudioWidget::AudioWidget(QWidget* parent, const char* name, WFlags f) :
     setBackgroundPixmap( *pixBg );
 
     songInfo.setFocusPolicy( QWidget::NoFocus );
     
-    changeTextColor( &songInfo );
-    songInfo.setBackgroundColor( QColor( 167, 212, 167 ));
-    songInfo.setFrameStyle( QFrame::NoFrame);
+//    changeTextColor( &songInfo );
+//    songInfo.setBackgroundColor( QColor( 167, 212, 167 ));
+//    songInfo.setFrameStyle( QFrame::NoFrame);
 //    songInfo.setFrameStyle( QFrame::WinPanel | QFrame::Sunken );
       //NoFrame
 //    songInfo.setForegroundColor(Qt::white);
     
diff --git a/core/multimedia/opieplayer/playlistwidget.cpp b/core/multimedia/opieplayer/playlistwidget.cpp
index a937d7c..c28548c 100644
--- a/core/multimedia/opieplayer/playlistwidget.cpp
+++ b/core/multimedia/opieplayer/playlistwidget.cpp
@@ -243,8 +243,10 @@ PlayListWidget::PlayListWidget( QWidget* parent, const char* name, WFlags fl )
     audioView->setMinimumSize(233,260);
     audioView->addColumn( tr("Title"),140);
     audioView->addColumn(tr("Size"), -1);
     audioView->addColumn(tr("Media"),-1);
+    audioView->addColumn( tr( "Path" ), 0 );
+    
     audioView->setColumnAlignment(1, Qt::AlignRight);
     audioView->setColumnAlignment(2, Qt::AlignRight);
     audioView->setAllColumnsShowFocus(TRUE);
 
@@ -266,8 +268,9 @@ 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->addColumn(tr( "Path" ), 0 );
     videoView->setColumnAlignment(1, Qt::AlignRight);
     videoView->setColumnAlignment(2, Qt::AlignRight);
     videoView->setAllColumnsShowFocus(TRUE);
     videoView->setMultiSelection( TRUE );
@@ -318,11 +321,11 @@ PlayListWidget::PlayListWidget( QWidget* parent, const char* name, WFlags fl )
     setCentralWidget( vbox5 );
 
     Config cfg( "OpiePlayer" );
     readConfig( cfg );
-    QString currentPlaylist = cfg.readEntry("CurrentPlaylist","");
+    QString currentPlaylist = cfg.readEntry("CurrentPlaylist","default");
     loadList(DocLnk( currentPlaylist));
-    setCaption(tr("OpiePlayer: ")+ currentPlaylist );
+    setCaption(tr("OpiePlayer: ")+ QFileInfo(currentPlaylist).baseName());
     
     initializeStates();
 }
 
@@ -422,24 +425,36 @@ void PlayListWidget::addAllToList() {
     QListIterator<DocLnk> Adit( filesAll.children() );
     for ( ; Adit.current(); ++Adit )
         if(QFileInfo(Adit.current()->file()).exists())
             d->selectedFiles->addToSelection( **Adit );
+    tabWidget->setCurrentPage(0);
+    
+    writeCurrentM3u();
+    d->selectedFiles->first();
 }
 
 
 void PlayListWidget::addAllMusicToList() {
     QListIterator<DocLnk> dit( files.children() );
     for ( ; dit.current(); ++dit ) 
         if(QFileInfo(dit.current()->file()).exists())
             d->selectedFiles->addToSelection( **dit );
+    tabWidget->setCurrentPage(0);
+    
+    writeCurrentM3u();
+    d->selectedFiles->first();
 }
 
 
 void PlayListWidget::addAllVideoToList() {
     QListIterator<DocLnk> dit( vFiles.children() );
     for ( ; dit.current(); ++dit )
         if(QFileInfo( dit.current()->file()).exists())
             d->selectedFiles->addToSelection( **dit );
+    tabWidget->setCurrentPage(0);
+    
+    writeCurrentM3u();
+    d->selectedFiles->first();
 }
 
 
 void PlayListWidget::setDocument(const QString& fileref) {
@@ -644,69 +659,35 @@ void PlayListWidget::setView( char view ) {
         hide();
 }
 
 void PlayListWidget::addSelected() {
-
-    Config cfg( "OpiePlayer" );
-    cfg.setGroup("PlayList");
-    QString currentPlaylist = cfg.readEntry("CurrentPlaylist","");
-//    int noOfFiles = cfg.readNumEntry("NumberOfFiles", 0 );
-
+  qDebug("addSelected");
+  DocLnk lnk;
+  QString filename;
     switch (tabWidget->currentPageIndex()) {
+
       case 0: //playlist
+    return;
           break;
       case 1: { //audio
-//                 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);
-              }
-          }
-          tabWidget->setCurrentPage(0);
+    filename=audioView->currentItem()->text(3);
+    //    d->selectedFiles->next();
       }           
       break;
+    
       case 2: { // video
-          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 );
-                      }
-                  }
+    filename=videoView->currentItem()->text(3);
+    //          tabWidget->setCurrentPage(0);
 
-                  videoView->setSelected( it.current(),FALSE);
-              }
-          }
-//             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;
     };
+  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( );
@@ -725,30 +706,24 @@ void PlayListWidget::addToSelection( QListViewItem *it) {
     d->setDocumentUsed = FALSE;
     
     if(it) {
         switch (tabWidget->currentPageIndex()) {
-          case 1: {
-              QListIterator<DocLnk> dit( files.children() );
-              for ( ; dit.current(); ++dit ) {
-                  if( dit.current()->name() == it->text(0)) {
-                      d->selectedFiles->addToSelection(  **dit );
-                  }
-              }
-          }
-          break;
-          case 2: {
-              QListIterator<DocLnk> dit( vFiles.children() );
-              for ( ; dit.current(); ++dit ) {
-                  if( dit.current()->name() == it->text(0)) {
-                      d->selectedFiles->addToSelection(  **dit );
-                  }
-              }
-          }
-          break;
-          case 0:
+    case 0: //playlist
+      return;
               break;
         };
+    //      case 1: {
+    DocLnk lnk;
+    QString filename;
+
+    filename=it->text(3);
+    lnk.setName( QFileInfo(filename).baseName() ); //sets name
+    lnk.setFile( filename ); //sets file name
+    d->selectedFiles->addToSelection(  lnk);
+ 
+    writeCurrentM3u();          
         tabWidget->setCurrentPage(0);
+        
     }
 }
 
 void PlayListWidget::tabChanged(QWidget *) {
@@ -988,9 +963,9 @@ void PlayListWidget::populateAudioView() {
             else 
                 size = QFile( dit.current()->file() ).size();
 //            qDebug(dit.current()->name());
             newItem= /*(void)*/ new QListViewItem( audioView, dit.current()->name(),
-                                                   QString::number(size ), storage);
+                      QString::number(size ), storage, dit.current()->file());
             newItem->setPixmap(0, Resource::loadPixmap( "opieplayer/musicfile" ));
         }
     }
 
@@ -1016,9 +991,10 @@ void PlayListWidget::populateVideoView() {
 
         QListViewItem * newItem;
         if ( QFile( Vdit.current()->file()).exists() ) {
             newItem= /*(void)*/ new QListViewItem( videoView, Vdit.current()->name(),
-                                                   QString::number( QFile( Vdit.current()->file()).size() ), storage);
+                   QString::number( QFile( Vdit.current()->file() ).size() ),
+                                                   storage, Vdit.current()->file());
             newItem->setPixmap(0, Resource::loadPixmap( "opieplayer/videofile" ));
         }
     }
 }
@@ -1061,9 +1037,11 @@ void PlayListWidget::openFile() {
 
         } else if( filename.right(3) == "pls" ) {
             readPls( filename );
         } else {
-            d->selectedFiles->addToSelection(  DocLnk(filename) );
+            lnk.setName( QFileInfo(filename).baseName() ); //sets name
+            lnk.setFile( filename ); //sets file name
+            d->selectedFiles->addToSelection(  lnk);
             writeCurrentM3u();
         }
     }
             
@@ -1176,13 +1154,12 @@ void PlayListWidget::writeCurrentM3u() {
   qDebug("writing to current m3u");
   Config cfg( "OpiePlayer" );
   cfg.setGroup("PlayList");
   QString currentPlaylist = cfg.readEntry("CurrentPlaylist","");
-
-  if( d->selectedFiles->first()) {
   Om3u *m3uList;
   m3uList = new Om3u( currentPlaylist, IO_ReadWrite | IO_Truncate );
 
+  if( d->selectedFiles->first()) {
   do {
       qDebug( "writeCurrentM3u " +d->selectedFiles->current()->file());
     m3uList->add( d->selectedFiles->current()->file() );
   }