1 files changed, 36 insertions, 12 deletions

diff --git a/core/multimedia/opieplayer/playlistwidget.cpp b/core/multimedia/opieplayer/playlistwidget.cpp
index cb58888..9969526 100644
--- a/core/multimedia/opieplayer/playlistwidget.cpp
+++ b/core/multimedia/opieplayer/playlistwidget.cpp
@@ -19,5 +19,4 @@
 **********************************************************************/
 // code added by L. J. Potter Sat 03-02-2002 06:17:54
-
 #include <qpe/qpemenubar.h>
 #include <qpe/qpetoolbar.h>
@@ -257,4 +256,5 @@ PlayListWidget::PlayListWidget( QWidget* parent, const char* name, WFlags fl )
     playLists->setMinimumSize(233,260);;
     tabWidget->insertTab(LTab,"Lists");
+
     connect( playLists, SIGNAL( fileSelected( const DocLnk &) ), this, SLOT( loadList( const DocLnk & ) ) );
 //      connect( playLists, SIGNAL( newSelected( const DocLnk &) ), this, SLOT( newFile( const DocLnk & ) ) );
@@ -265,8 +265,8 @@ PlayListWidget::PlayListWidget( QWidget* parent, const char* name, WFlags fl )
 
 
-   connect( audioView, SIGNAL( rightButtonClicked( QListViewItem *, const QPoint &, int)),
-            this, SLOT( fauxPlay( QListViewItem *) ) );
-   connect( videoView, SIGNAL( rightButtonClicked( QListViewItem *, const QPoint &, int)),
-            this, SLOT( fauxPlay( QListViewItem *)) );
+//     connect( audioView, SIGNAL( rightButtonClicked( QListViewItem *, const QPoint &, int)),
+//              this, SLOT( fauxPlay( QListViewItem *) ) );
+//     connect( videoView, SIGNAL( rightButtonClicked( QListViewItem *, const QPoint &, int)),
+//              this, SLOT( fauxPlay( QListViewItem *)) );
 
 //    connect( audioView, SIGNAL( clicked( QListViewItem *) ), this, SLOT( fauxPlay( QListViewItem *) ) );
@@ -289,4 +289,8 @@ PlayListWidget::PlayListWidget( QWidget* parent, const char* name, WFlags fl )
     Config cfg( "MediaPlayer" );
     readConfig( cfg );
+    QString currentPlaylist = cfg.readEntry("CurrentPlaylist","");
+//    qDebug("currentList is "+currentPlaylist);
+    loadList(DocLnk( currentPlaylist));
+    setCaption("OpiePlayer: "+ currentPlaylist );
 
     initializeStates();
@@ -298,4 +302,5 @@ PlayListWidget::~PlayListWidget() {
     writeConfig( cfg );
 
+
     if ( d->current )
   delete d->current;
@@ -315,5 +320,4 @@ void PlayListWidget::initializeStates() {
         setPlaylist( true);
         d->selectedFiles->first();
-
 }
 
@@ -373,5 +377,5 @@ void PlayListWidget::writeConfig( Config& cfg ) const {
 
 void PlayListWidget::addToSelection( const DocLnk& lnk ) {
-    qDebug("add");
+//    qDebug("add");
     d->setDocumentUsed = FALSE;
     if ( mediaPlayerState->playlist() )
@@ -420,4 +424,5 @@ void PlayListWidget::setDocument(const QString& fileref) {
         return;
     }
+//    qDebug("setDocument");
     if(fileref.find("playlist",0,TRUE) == -1) {
     addToSelection( DocLnk( fileref ) );
@@ -537,8 +542,17 @@ void PlayListWidget::saveList() {
     fileDlg->exec();
     if( fileDlg->result() == 1 ) {
+    if ( d->current )
+        delete d->current;
         filename = fileDlg->LineEdit1->text();//+".playlist";
-        qDebug("saving playlist "+filename+".playlist");
+//        qDebug("saving playlist "+filename+".playlist");
         Config cfg( filename +".playlist");
         writeConfig( cfg );
+        if( playLists->selected()->name() == filename) {
+//            qDebug("same name so delete lnk");
+            QFile().remove(playLists->selected()->file());
+            QFile().remove(playLists->selected()->linkFile());
+            playLists->reread();
+        }
+            
         DocLnk lnk;
 //        lnk.setComment( "");
@@ -550,5 +564,8 @@ void PlayListWidget::saveList() {
             qDebug("Writing doclink did not work");
     }
-
+        Config config( "MediaPlayer" );
+        config.writeEntry("CurrentPlaylist",filename);
+        setCaption("OpiePlayer: "+filename);
+        d->selectedFiles->first();
     if(fileDlg)
         delete fileDlg;
@@ -558,10 +575,17 @@ void PlayListWidget::saveList() {
 
 void PlayListWidget::loadList( const DocLnk & lnk) {
-    qDebug("load list "+ lnk.name()+".playlist");
+    QString name= lnk.name();
+//    qDebug("currentList is "+name);
+    if( name.length()>1) {
+        setCaption("OpiePlayer: "+name);
+//    qDebug("load list "+ name+".playlist");
     clearList();
-    Config cfg( lnk.name()+".playlist");
+        Config cfg( name+".playlist");
     readConfig(cfg);
     tabWidget->setCurrentPage(0);
-    setCaption("OpiePlayer: "+lnk.name());
+        Config config( "MediaPlayer" );
+        config.writeEntry("CurrentPlaylist", name);
+        d->selectedFiles->first();
+    }
 }