1 files changed, 18 insertions, 12 deletions

diff --git a/noncore/multimedia/opieplayer2/playlistwidget.cpp b/noncore/multimedia/opieplayer2/playlistwidget.cpp
index b15f95e..0825eed 100644
--- a/noncore/multimedia/opieplayer2/playlistwidget.cpp
+++ b/noncore/multimedia/opieplayer2/playlistwidget.cpp
@@ -158,7 +158,7 @@ PlayListWidget::PlayListWidget( QWidget* parent, const char* name, WFlags fl )
 
     cfg.setGroup("PlayList");
-    QString currentPlaylist = cfg.readEntry( "CurrentPlaylist", "" );
+    QString currentPlaylist = cfg.readEntry( "CurrentPlaylist", "default");
     loadList(DocLnk(  currentPlaylist ) );
-    setCaption( tr( "OpiePlayer: " ) + currentPlaylist );
+    
 }
 
@@ -741,5 +741,7 @@ void PlayListWidget::openFile() {
             lnk.setName( filename ); //sets name
             lnk.setFile( filename ); //sets file name
-            lnk.setIcon("opieplayer2/musicfile");
+
+//            lnk.setIcon("opieplayer2/musicfile");
+
             d->selectedFiles->addToSelection(  lnk );
             writeCurrentM3u();
@@ -751,5 +753,7 @@ void PlayListWidget::openFile() {
             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();
         }
@@ -789,9 +793,11 @@ void PlayListWidget::readm3u( const QString &filename ) {
             //            qDebug("set link "+QFileInfo(filename).dirPath()+"/"+s);
             lnk.setFile( QFileInfo(filename).dirPath()+"/"+s);
-            lnk.setIcon("SoundPlayer");
+//            lnk.setIcon(MimeType(s).pixmap() );
+//            lnk.setIcon("SoundPlayer");
           } else {
             //            qDebug("set link2 "+s);
             lnk.setFile( s);
-            lnk.setIcon("SoundPlayer");
+//            lnk.setIcon(MimeType(s).pixmap() );
+//            lnk.setIcon("SoundPlayer");
           }
         }
@@ -843,7 +849,7 @@ void PlayListWidget::readPls( const QString &filename ) {
             lnk.setFile( s );
          } else { //if its a url
-            if( name.right( 1 ).find( '/' ) == -1) {
-                s += "/";
-            }
+//             if( name.right( 1 ).find( '/' ) == -1) {
+//                 s += "/";
+//             }
             lnk.setFile( s );
         }
@@ -866,10 +872,10 @@ void PlayListWidget::writeCurrentM3u() {
   QString currentPlaylist = cfg.readEntry("CurrentPlaylist","default");
 
-  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());
+      qDebug( "add writeCurrentM3u " +d->selectedFiles->current()->file());
     m3uList->add( d->selectedFiles->current()->file() );
   }
@@ -920,5 +926,5 @@ void PlayListWidget::writem3u() {
           DocLnk lnk;
           lnk.setFile( filename);
-          lnk.setIcon("opieplayer2/playlist2");
+//          lnk.setIcon("opieplayer2/playlist2");
           lnk.setName( name); //sets file name