2 files changed, 37 insertions, 13 deletions

diff --git a/core/multimedia/opieplayer/main.cpp b/core/multimedia/opieplayer/main.cpp
index 4f43ff6..18cd7a6 100644
--- a/core/multimedia/opieplayer/main.cpp
+++ b/core/multimedia/opieplayer/main.cpp
@@ -44,13 +44,13 @@ int main(int argc, char **argv) {
     VideoWidget vw( 0, "videoUI" );
     videoUI = &vw;
     LoopControl lc( 0, "loopControl" );
     loopControl = &lc;
     MediaPlayer mp( 0, "mediaPlayer" );
 
-    pl.setCaption( MediaPlayer::tr("OpiePlayer") );
+//    pl.setCaption( MediaPlayer::tr("OpiePlayer") );
     a.showMainDocumentWidget(&pl);
 
     return a.exec();
 }
 
 
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
@@ -15,13 +15,12 @@
 **
 ** Contact info@trolltech.com if any conditions of this licensing are
 ** not clear to you.
 **
 **********************************************************************/
 // code added by L. J. Potter Sat 03-02-2002 06:17:54
-
 #include <qpe/qpemenubar.h>
 #include <qpe/qpetoolbar.h>
 #include <qpe/fileselector.h>
 #include <qpe/qpeapplication.h>
 
 #include <qpe/applnk.h>
@@ -253,24 +252,25 @@ PlayListWidget::PlayListWidget( QWidget* parent, const char* name, WFlags fl )
 //playlists list
     QWidget *LTab;
     LTab = new QWidget( tabWidget, "LTab" );
     playLists = new FileSelector( "playlist/plain", LTab, "fileselector" , FALSE, FALSE); //buggy
     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 & ) ) );
 
 
 // add the library area
    QPEApplication::setStylusOperation( this, QPEApplication::RightOnHold );
 
 
-   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 *) ) );
 //    connect( videoView, SIGNAL( clicked( QListViewItem *) ), this, SLOT( fauxPlay( QListViewItem *) ) );
 
    connect( audioView, SIGNAL( doubleClicked( QListViewItem *) ), this, SLOT( addToSelection( QListViewItem *) ) );
    connect( videoView, SIGNAL( doubleClicked( QListViewItem *) ), this, SLOT( addToSelection( QListViewItem *) ) );
@@ -285,21 +285,26 @@ PlayListWidget::PlayListWidget( QWidget* parent, const char* name, WFlags fl )
 //   connect( d->selectedFiles, SIGNAL( fileSelected( const DocLnk & ) ), this, SLOT( addToSelection( const DocLnk & ) ) );
 
     setCentralWidget( vbox5 );
 
     Config cfg( "MediaPlayer" );
     readConfig( cfg );
+    QString currentPlaylist = cfg.readEntry("CurrentPlaylist","");
+//    qDebug("currentList is "+currentPlaylist);
+    loadList(DocLnk( currentPlaylist));
+    setCaption("OpiePlayer: "+ currentPlaylist );
 
     initializeStates();
 }
 
 
 PlayListWidget::~PlayListWidget() {
     Config cfg( "MediaPlayer" );
     writeConfig( cfg );
 
+
     if ( d->current )
   delete d->current;
     delete d;
 }
 
 
@@ -311,13 +316,12 @@ void PlayListWidget::initializeStates() {
 //     d->tbFull->setOn( mediaPlayerState->fullscreen() );
 //     d->tbScale->setOn( mediaPlayerState->scaled() );
 //     d->tbScale->setEnabled( mediaPlayerState->fullscreen() );
 //    setPlaylist( mediaPlayerState->playlist() );
         setPlaylist( true);
         d->selectedFiles->first();
-
 }
 
 
 void PlayListWidget::readConfig( Config& cfg ) {
     cfg.setGroup("PlayList");
     
@@ -369,13 +373,13 @@ void PlayListWidget::writeConfig( Config& cfg ) const {
 
    
 }
 
 
 void PlayListWidget::addToSelection( const DocLnk& lnk ) {
-    qDebug("add");
+//    qDebug("add");
     d->setDocumentUsed = FALSE;
     if ( mediaPlayerState->playlist() )
         d->selectedFiles->addToSelection( lnk );
     else
   mediaPlayerState->setPlaying( TRUE );
 }
@@ -416,12 +420,13 @@ void PlayListWidget::addAllVideoToList() {
 
 void PlayListWidget::setDocument(const QString& fileref) {
     if ( fileref.isNull() ) {
         QMessageBox::critical( 0, tr( "Invalid File" ), tr( "There was a problem in getting the file." ) );
         return;
     }
+//    qDebug("setDocument");
     if(fileref.find("playlist",0,TRUE) == -1) {
     addToSelection( DocLnk( fileref ) );
     d->setDocumentUsed = TRUE;
     qApp->processEvents();
     mediaPlayerState->setPlaying( FALSE );
     qApp->processEvents();
@@ -533,39 +538,58 @@ void PlayListWidget::saveList() {
 
     QString filename;
     InputDialog *fileDlg;
     fileDlg=new InputDialog(this,"Save Playlist",TRUE, 0);
     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( "");
         lnk.setFile(QDir::homeDirPath()+"/Settings/"+filename+".playlist.conf"); //sets File property
         lnk.setType("playlist/plain");// hey is this a REGISTERED mime type?!?!? ;D
         lnk.setIcon("mpegplayer/playlist2");
         lnk.setName( filename); //sets file name
         if(!lnk.writeLink())
             qDebug("Writing doclink did not work");
     }
-
+        Config config( "MediaPlayer" );
+        config.writeEntry("CurrentPlaylist",filename);
+        setCaption("OpiePlayer: "+filename);
+        d->selectedFiles->first();
     if(fileDlg)
         delete fileDlg;
 
 }
 
 
 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();
+    }
 }
 
 
 void PlayListWidget::setPlaylist( bool shown ) {
     if ( shown ) 
   d->playListFrame->show();