changed to better layout

1 files changed, 33 insertions, 6 deletions

diff --git a/noncore/multimedia/opieplayer2/playlistwidget.cpp b/noncore/multimedia/opieplayer2/playlistwidget.cpp
index 0cfd720..0c3ea74 100644
--- a/noncore/multimedia/opieplayer2/playlistwidget.cpp
+++ b/noncore/multimedia/opieplayer2/playlistwidget.cpp
@@ -1,936 +1,963 @@
 
 #define QTOPIA_INTERNAL_FSLP
 #include <qpe/qpemenubar.h>
 #include <qpe/qpetoolbar.h>
 #include <qpe/fileselector.h>
 #include <qpe/qpeapplication.h>
 #include <qpe/lnkproperties.h>
 #include <qpe/storage.h>
 
 #include <qpe/applnk.h>
 #include <qpopupmenu.h>
 #include <qpe/config.h>
 #include <qpe/global.h>
 #include <qpe/resource.h>
 #include <qaction.h>
 #include <qcursor.h>
 #include <qimage.h>
 #include <qfile.h>
 #include <qdir.h>
 #include <qlayout.h>
 #include <qlabel.h>
 #include <qlist.h>
 #include <qlistbox.h>
 #include <qmainwindow.h>
 #include <qmessagebox.h>
 #include <qtoolbutton.h>
 #include <qtabwidget.h>
 #include <qlistview.h>
 #include <qpoint.h>
 #include <qlineedit.h>
 #include <qpushbutton.h>
 #include <qregexp.h>
 #include <qtextstream.h>
 
 
 #include "playlistselection.h"
 #include "playlistwidget.h"
 #include "mediaplayerstate.h"
 
 #include "inputDialog.h"
 
 #include <stdlib.h>
 #include "audiowidget.h"
 #include "videowidget.h"
 
 #define BUTTONS_ON_TOOLBAR
 #define SIDE_BUTTONS
 #define CAN_SAVE_LOAD_PLAYLISTS
 
 extern MediaPlayerState *mediaPlayerState;
 
 
 class PlayListWidgetPrivate {
 public:
     QToolButton *tbPlay, *tbFull, *tbLoop, *tbScale, *tbShuffle, *tbAddToList,  *tbRemoveFromList, *tbMoveUp, *tbMoveDown, *tbRemove;
     QFrame *playListFrame;
     FileSelector *files;
     PlayListSelection *selectedFiles;
     bool setDocumentUsed;
     DocLnk *current;
 };
 
 
 class ToolButton : public QToolButton {
 public:
     ToolButton( QWidget *parent, const char *name, const QString& icon, QObject *handler, const QString& slot, bool t = FALSE )
         : QToolButton( parent, name ) {
         setTextLabel( name );
         setPixmap( Resource::loadPixmap( icon ) );
         setAutoRaise( TRUE );
         setFocusPolicy( QWidget::NoFocus );
         setToggleButton( t );
         connect( this, t ? SIGNAL( toggled(bool) ) : SIGNAL( clicked() ), handler, slot );
         QPEMenuToolFocusManager::manager()->addWidget( this );
     }
 };
 
 
 class MenuItem : public QAction {
 public:
     MenuItem( QWidget *parent, const QString& text, QObject *handler, const QString& slot )
             : QAction( text, QString::null, 0, 0 ) {
         connect( this, SIGNAL( activated() ), handler, slot );
         addTo( parent );
     }
 };
 
 
 PlayListWidget::PlayListWidget( QWidget* parent, const char* name, WFlags fl )
     : QMainWindow( parent, name, fl ) {
 
     d = new PlayListWidgetPrivate;
     d->setDocumentUsed = FALSE;
     d->current = NULL;
     fromSetDocument = FALSE;
     insanityBool=FALSE;
     audioScan = FALSE;
     videoScan = FALSE;
 
     setBackgroundMode( PaletteButton );
 
     setCaption( tr("OpiePlayer") );
     setIcon( Resource::loadPixmap( "opieplayer2/MPEGPlayer" ) );
 
     setToolBarsMovable( FALSE );
 
     // Create Toolbar
     QPEToolBar *toolbar = new QPEToolBar( this );
     toolbar->setHorizontalStretchable( TRUE );
 
     // Create Menubar
     QPEMenuBar *menu = new QPEMenuBar( toolbar );
     menu->setMargin( 0 );
 
     QPEToolBar *bar = new QPEToolBar( this );
     bar->setLabel( tr( "Play Operations" ) );
 
     tbDeletePlaylist = new QPushButton( Resource::loadIconSet("trash"),"",bar,"close");
     tbDeletePlaylist->setFlat(TRUE);
     tbDeletePlaylist->setFixedSize(20,20);
 
     d->tbAddToList =  new ToolButton( bar, tr( "Add to Playlist" ), "opieplayer2/add_to_playlist",
                                       this , SLOT(addSelected()) );
     d->tbRemoveFromList = new ToolButton( bar, tr( "Remove from Playlist" ), "opieplayer2/remove_from_playlist",
                                           this , SLOT(removeSelected()) );
     d->tbPlay    = new ToolButton( bar, tr( "Play" ), "opieplayer2/play",
                                    this , SLOT( btnPlay(bool) ), TRUE );
     d->tbShuffle = new ToolButton( bar, tr( "Randomize" ),"opieplayer2/shuffle",
                                    mediaPlayerState, SLOT(setShuffled(bool)), TRUE );
     d->tbLoop    = new ToolButton( bar, tr( "Loop" ),"opieplayer2/loop",
                                    mediaPlayerState, SLOT(setLooping(bool)), TRUE );
     tbDeletePlaylist->hide();
 
     QPopupMenu *pmPlayList = new QPopupMenu( this );
     menu->insertItem( tr( "File" ), pmPlayList );
     new MenuItem( pmPlayList, tr( "Clear List" ), this, SLOT( clearList() ) );
     new MenuItem( pmPlayList, tr( "Add all audio files" ), this, SLOT( addAllMusicToList() ) );
     new MenuItem( pmPlayList, tr( "Add all video files" ), this, SLOT( addAllVideoToList() ) );
     new MenuItem( pmPlayList, tr( "Add all files" ), this, SLOT( addAllToList() ) );
     pmPlayList->insertSeparator(-1);
     new MenuItem( pmPlayList, tr( "Save PlayList" ), this, SLOT( saveList() ) );
     new MenuItem( pmPlayList, tr( "Export playlist to m3u" ), this, SLOT(writem3u() ) );
     pmPlayList->insertSeparator(-1);
     new MenuItem( pmPlayList, tr( "Open File or URL" ), this,SLOT( openFile() ) );
     pmPlayList->insertSeparator(-1);
     new MenuItem( pmPlayList, tr( "Rescan for Audio Files" ), this,SLOT( scanForAudio() ) );
     new MenuItem( pmPlayList, tr( "Rescan for Video Files" ), this,SLOT( scanForVideo() ) );
 
 
     pmView = new QPopupMenu( this );
     menu->insertItem( tr( "View" ), pmView );
     pmView->isCheckable();
 
     pmView->insertItem(  Resource::loadPixmap("fullscreen") , tr( "Full Screen"), mediaPlayerState, SLOT( toggleFullscreen() ) );
 
     Config cfg( "OpiePlayer" );
     bool b= cfg.readBoolEntry("FullScreen", 0);
     mediaPlayerState->setFullscreen(  b );
     pmView->setItemChecked( -16, b );
 
     //    pmView->insertItem(  Resource::loadPixmap("opieplayer/scale") , tr( "Scale"), mediaPlayerState, SLOT(toggleScaled() ) );
 
     pmView->insertSeparator(-1);
 
     skinsMenu = new QPopupMenu( this );
     pmView->insertItem( tr( "Skins" ), skinsMenu );
     skinsMenu->isCheckable();
     populateSkinsMenu();
 
     QVBox *vbox5 = new QVBox( this ); vbox5->setBackgroundMode( PaletteButton );
     QVBox *vbox4 = new QVBox( vbox5 ); vbox4->setBackgroundMode( PaletteButton );
 
     QHBox *hbox6 = new QHBox( vbox4 ); hbox6->setBackgroundMode( PaletteButton );
 
     tabWidget = new QTabWidget( hbox6, "tabWidget" );
 //    tabWidget->setTabShape(QTabWidget::Triangular);
 
     QWidget *pTab;
     pTab = new QWidget( tabWidget, "pTab" );
     tabWidget->insertTab( pTab,"Playlist");
 
 
+   QGridLayout *Playout = new QGridLayout( pTab );
+   Playout->setSpacing( 2);
+   Playout->setMargin( 2);
+
     // Add the playlist area
 
     QVBox *vbox3 = new QVBox( pTab ); vbox3->setBackgroundMode( PaletteButton );
     d->playListFrame = vbox3;
-    d->playListFrame ->setMinimumSize(235,250);
 
     QHBox *hbox2 = new QHBox( vbox3 ); hbox2->setBackgroundMode( PaletteButton );
 
     d->selectedFiles = new PlayListSelection( hbox2);
     QVBox *vbox1 = new QVBox( hbox2 ); vbox1->setBackgroundMode( PaletteButton );
 
     QPEApplication::setStylusOperation( d->selectedFiles->viewport(),QPEApplication::RightOnHold);
 
     QVBox *stretch1 = new QVBox( vbox1 ); stretch1->setBackgroundMode( PaletteButton ); // add stretch
     new ToolButton( vbox1, tr( "Move Up" ),   "opieplayer2/up",   d->selectedFiles, SLOT(moveSelectedUp()) );
     new ToolButton( vbox1, tr( "Remove" ),    "opieplayer2/cut",  d->selectedFiles, SLOT(removeSelected()) );
     new ToolButton( vbox1, tr( "Move Down" ), "opieplayer2/down", d->selectedFiles, SLOT(moveSelectedDown()) );
     QVBox *stretch2 = new QVBox( vbox1 ); stretch2->setBackgroundMode( PaletteButton ); // add stretch
 
+    
+    Playout->addMultiCellWidget( vbox3, 0, 0, 0, 1 );
+
     QWidget *aTab;
     aTab = new QWidget( tabWidget, "aTab" );
+
+   QGridLayout *Alayout = new QGridLayout( aTab );
+   Alayout->setSpacing( 2);
+   Alayout->setMargin( 2);
+
     audioView = new QListView( aTab, "Audioview" );
-    audioView->setMinimumSize(233,250);
     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);
 
+    Alayout->addMultiCellWidget( audioView, 0, 0, 0, 1 );
+
     tabWidget->insertTab(aTab,tr("Audio"));
 
     QPEApplication::setStylusOperation( audioView->viewport(),QPEApplication::RightOnHold);
 
     QWidget *vTab;
     vTab = new QWidget( tabWidget, "vTab" );
+
+    QGridLayout *Vlayout = new QGridLayout( vTab );
+   Vlayout->setSpacing( 2);
+   Vlayout->setMargin( 2);
+
     videoView = new QListView( vTab, "Videoview" );
-    videoView->setMinimumSize(233,250);
 
     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);
 
+//     d->playListFrame->setMaximumSize(235,240);
+//     audioView->setMaximumSize(233,240);
+//     videoView->setMaximumSize(233,240);
+
+    Vlayout->addMultiCellWidget( videoView, 0, 0, 0, 1 );
+
     QPEApplication::setStylusOperation( videoView->viewport(),QPEApplication::RightOnHold);
 
     tabWidget->insertTab( vTab,tr("Video"));
 
     //playlists list
     QWidget *LTab;
     LTab = new QWidget( tabWidget, "LTab" );
+    QGridLayout *Llayout = new QGridLayout( LTab );
+   Llayout->setSpacing( 2);
+   Llayout->setMargin( 2);
+
     playLists = new FileSelector( "playlist/plain", LTab, "fileselector" , FALSE, FALSE); //buggy
-    playLists->setMinimumSize(233,260);
+    //    playLists->setMinimumSize(233,260);
+    Llayout->addMultiCellWidget( playLists, 0, 0, 0, 1 );
+
     tabWidget->insertTab(LTab,tr("Lists"));
 
     connect(tbDeletePlaylist,(SIGNAL(released())),SLOT( deletePlaylist()));
 
     connect( pmView, SIGNAL( activated(int)), this, SLOT( pmViewActivated(int) ) );
 
     connect( skinsMenu, SIGNAL( activated(int)), this, SLOT(skinsMenuActivated(int) ) );
 
 //    connect( scaleButton, SIGNAL(activated()), mediaPlayerState, SLOT(toggleScaled() ) );
 
     connect( d->selectedFiles, SIGNAL( mouseButtonPressed( int, QListViewItem *, const QPoint&, int)),
              this,SLOT( playlistViewPressed(int, QListViewItem *, const QPoint&, int)) );
     connect( audioView, SIGNAL( mouseButtonPressed( int, QListViewItem *, const QPoint&, int)),
              this,SLOT( viewPressed(int, QListViewItem *, const QPoint&, int)) );
     connect( audioView, SIGNAL( returnPressed( QListViewItem *)),
              this,SLOT( playIt( QListViewItem *)) );
     connect( audioView, SIGNAL( doubleClicked( QListViewItem *) ), this, SLOT( addToSelection( QListViewItem *) ) );
     connect( videoView, SIGNAL( mouseButtonPressed( int, QListViewItem *, const QPoint&, int)),
              this,SLOT( viewPressed(int, QListViewItem *, const QPoint&, int)) );
     connect( videoView, SIGNAL( returnPressed( QListViewItem *)),
              this,SLOT( playIt( QListViewItem *)) );
     connect( videoView, SIGNAL( doubleClicked( QListViewItem *) ), this, SLOT( addToSelection( QListViewItem *) ) );
     connect( playLists, SIGNAL( fileSelected( const DocLnk &) ), this, SLOT( loadList( const DocLnk & ) ) );
     connect( tabWidget, SIGNAL (currentChanged(QWidget*)),this,SLOT(tabChanged(QWidget*)));
     connect( mediaPlayerState, SIGNAL( playingToggled( bool ) ),    d->tbPlay,    SLOT( setOn( bool ) ) );
     connect( mediaPlayerState, SIGNAL( loopingToggled( bool ) ),    d->tbLoop,    SLOT( setOn( bool ) ) );
     connect( mediaPlayerState, SIGNAL( shuffledToggled( bool ) ),   d->tbShuffle, SLOT( setOn( bool ) ) );
     connect( mediaPlayerState, SIGNAL( playlistToggled( bool ) ),   this,         SLOT( setPlaylist( bool ) ) );
     connect( d->selectedFiles, SIGNAL( doubleClicked( QListViewItem *) ), this, SLOT( playIt( QListViewItem *) ) );
 
     setCentralWidget( vbox5 );
 
     readConfig( cfg );
     QString currentPlaylist = cfg.readEntry("CurrentPlaylist","");
     loadList(DocLnk( currentPlaylist));
     setCaption(tr("OpiePlayer: ")+ currentPlaylist );
 
     initializeStates();
 }
 
 
 PlayListWidget::~PlayListWidget() {
     Config cfg( "OpiePlayer" );
     writeConfig( cfg );
 
     if ( d->current ) {
         delete d->current;
     }
     delete d;
 }
 
 
 void PlayListWidget::initializeStates() {
 
     d->tbPlay->setOn( mediaPlayerState->playing() );
     d->tbLoop->setOn( mediaPlayerState->looping() );
     d->tbShuffle->setOn( mediaPlayerState->shuffled() );
     setPlaylist( true);
 }
 
 
 void PlayListWidget::readConfig( Config& cfg ) {
     cfg.setGroup("PlayList");
     QString currentString = cfg.readEntry("current", "" );
     int noOfFiles = cfg.readNumEntry("NumberOfFiles", 0 );
     for ( int i = 0; i < noOfFiles; i++ ) {
         QString entryName;
         entryName.sprintf( "File%i", i + 1 );
         QString linkFile = cfg.readEntry( entryName );
         if(QFileInfo( linkFile).exists() ) {
             DocLnk lnk( linkFile );
             if ( QFileInfo( lnk.file()).exists() || linkFile.find("http",0,TRUE) != -1) {
                 d->selectedFiles->addToSelection( lnk );
             }
         }
     }
 d->selectedFiles->setSelectedItem( currentString);
 }
 
 
 void PlayListWidget::writeConfig( Config& cfg ) const {
 
     d->selectedFiles->writeCurrent( cfg);
     cfg.setGroup("PlayList");
     int noOfFiles = 0;
     d->selectedFiles->first();
     do {
         const DocLnk *lnk = d->selectedFiles->current();
         if ( lnk ) {
             QString entryName;
             entryName.sprintf( "File%i", noOfFiles + 1 );
             cfg.writeEntry( entryName, lnk->linkFile() );
               // if this link does exist, add it so we have the file
               // next time...
             if ( !QFile::exists( lnk->linkFile() ) ) {
                   // the way writing lnks doesn't really check for out
                   // of disk space, but check it anyway.
                 if ( !lnk->writeLink() ) {
                     QMessageBox::critical( 0, tr("Out of space"),
                                            tr( "There was a problem saving "
                                                "the playlist.\n"
                                                "Your playlist "
                                                "may be missing some entries\n"
                                                "the next time you start it." )
                                            );
                 }
             }
             noOfFiles++;
         }
     }
     while ( d->selectedFiles->next() );
     cfg.writeEntry("NumberOfFiles", noOfFiles );
 }
 
 
 void PlayListWidget::addToSelection( const DocLnk& lnk ) {
         d->setDocumentUsed = FALSE;
         if ( mediaPlayerState->playlist() ) {
             if(QFileInfo(lnk.file()).exists() || lnk.file().left(4) == "http" )
                 d->selectedFiles->addToSelection( lnk );
         }
         else
             mediaPlayerState->setPlaying( TRUE );
 }
 
 
 void PlayListWidget::clearList() {
     while ( first() ) {
         d->selectedFiles->removeSelected();
     }
 }
 
 
 void PlayListWidget::addAllToList() {
     DocLnkSet filesAll;
     Global::findDocuments(&filesAll, "video/*;audio/*");
     QListIterator<DocLnk> Adit( filesAll.children() );
     for ( ; Adit.current(); ++Adit ) {
         if(QFileInfo(Adit.current()->file()).exists()) {
             d->selectedFiles->addToSelection( **Adit );
         }
     }
 }
 
 
 void PlayListWidget::addAllMusicToList() {
     QListIterator<DocLnk> dit( files.children() );
     for ( ; dit.current(); ++dit ) {
         if(QFileInfo(dit.current()->file()).exists()) {
             d->selectedFiles->addToSelection( **dit );
         }
     }
 }
 
 
 void PlayListWidget::addAllVideoToList() {
     QListIterator<DocLnk> dit( vFiles.children() );
     for ( ; dit.current(); ++dit )
         if(QFileInfo( dit.current()->file()).exists())
             d->selectedFiles->addToSelection( **dit );
 }
 
 
 void PlayListWidget::setDocument(const QString& fileref) {
     qDebug(fileref);
     fromSetDocument = TRUE;
     if ( fileref.isNull() ) {
         QMessageBox::critical( 0, tr( "Invalid File" ), tr( "There was a problem in getting the file." ) );
         return;
     }
 
     if(fileref.find("m3u",0,TRUE) != -1) { //is m3u
         readm3u( fileref);
     } else if(fileref.find("pls",0,TRUE) != -1) { //is pls
         readPls( fileref);
     } else if(fileref.find("playlist",0,TRUE) != -1) {//is playlist
         clearList();
         loadList(DocLnk(fileref));
         d->selectedFiles->first();
     } else {
         clearList();
         addToSelection( DocLnk( fileref ) );
         d->setDocumentUsed = TRUE;
         mediaPlayerState->setPlaying( FALSE );
         qApp->processEvents();
         mediaPlayerState->setPlaying( TRUE );
         qApp->processEvents();
         setCaption(tr("OpiePlayer"));
     }
 }
 
 
 void PlayListWidget::setActiveWindow() {
     qDebug("SETTING active window");
     // When we get raised we need to ensure that it switches views
     char origView = mediaPlayerState->view();
     mediaPlayerState->setView( 'l' ); // invalidate
     mediaPlayerState->setView( origView ); // now switch back
 }
 
 
 void PlayListWidget::useSelectedDocument() {
     d->setDocumentUsed = FALSE;
 }
 
 
 const DocLnk *PlayListWidget::current() { // this is fugly
 
     switch (tabWidget->currentPageIndex()) {
       case 0: //playlist
       {
           qDebug("playlist");
           if ( mediaPlayerState->playlist() ) {
               return d->selectedFiles->current();
           } else if ( d->setDocumentUsed && d->current ) {
               return d->current;
           } else {
               return d->files->selected();
           }
       }
       break;
       case 1://audio
       {
           qDebug("audioView");
           QListIterator<DocLnk> dit( files.children() );
           for ( ; dit.current(); ++dit ) {
               if( dit.current()->name() == audioView->currentItem()->text(0) && !insanityBool) {
                   qDebug("here");
                   insanityBool=TRUE;
                   return dit;
               }
           }
       }
       break;
       case 2: // video
       {
           qDebug("videoView");
           QListIterator<DocLnk> Vdit( vFiles.children() );
           for ( ; Vdit.current(); ++Vdit ) {
               if( Vdit.current()->name() == videoView->currentItem()->text(0) && !insanityBool) {
                   insanityBool=TRUE;
                   return Vdit;
               }
           }
       }
       break;
     };
     return 0;
 }
 
 bool PlayListWidget::prev() {
     if ( mediaPlayerState->playlist() ) {
         if ( mediaPlayerState->shuffled() ) {
             const DocLnk *cur = current();
             int j = 1 + (int)(97.0 * rand() / (RAND_MAX + 1.0));
             for ( int i = 0; i < j; i++ ) {
                 if ( !d->selectedFiles->next() )
                     d->selectedFiles->first();
             }
             if ( cur == current() )
                 if ( !d->selectedFiles->next() )
                     d->selectedFiles->first();
             return TRUE;
         } else {
             if ( !d->selectedFiles->prev() ) {
                 if ( mediaPlayerState->looping() ) {
                     return d->selectedFiles->last();
                 } else {
                     return FALSE;
                 }
             }
             return TRUE;
         }
     } else {
         return mediaPlayerState->looping();
     }
 }
 
 
 bool PlayListWidget::next() {
     if ( mediaPlayerState->playlist() ) {
         if ( mediaPlayerState->shuffled() ) {
             return prev();
         } else {
             if ( !d->selectedFiles->next() ) {
                 if ( mediaPlayerState->looping() ) {
                     return d->selectedFiles->first();
                 } else {
                     return FALSE;
                 }
             }
             return TRUE;
         }
     } else {
         return mediaPlayerState->looping();
     }
 }
 
 
 bool PlayListWidget::first() {
     if ( mediaPlayerState->playlist() )
         return d->selectedFiles->first();
     else
         return mediaPlayerState->looping();
 }
 
 
 bool PlayListWidget::last() {
     if ( mediaPlayerState->playlist() )
         return d->selectedFiles->last();
     else
         return mediaPlayerState->looping();
 }
 
 
 void PlayListWidget::saveList() {
 
     QString filename;
     InputDialog *fileDlg;
     fileDlg = new InputDialog(this,tr("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");
         Config cfg( filename +".playlist");
         writeConfig( cfg );
 
         DocLnk lnk;
         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("opieplayer2/playlist2");
         lnk.setName( filename); //sets file name
         // qDebug(filename);
         if(!lnk.writeLink()) {
             qDebug("Writing doclink did not work");
         }
     }
     Config config( "OpiePlayer" );
     config.writeEntry("CurrentPlaylist",filename);
     setCaption(tr("OpiePlayer: ")+filename);
     d->selectedFiles->first();
     if(fileDlg) {
         delete fileDlg;
     }
 }
 
 void PlayListWidget::loadList( const DocLnk & lnk) {
     QString name= lnk.name();
     // qDebug("currentList is "+name);
     if( name.length()>1) {
         setCaption("OpiePlayer: "+name);
         // qDebug("load list "+ name+".playlist");
         clearList();
         Config cfg( name+".playlist");
         readConfig(cfg);
 
         tabWidget->setCurrentPage(0);
 
         Config config( "OpiePlayer" );
         config.writeEntry("CurrentPlaylist", name);
         //        d->selectedFiles->first();
     }
 
 }
 
 void PlayListWidget::setPlaylist( bool shown ) {
     if ( shown ) {
         d->playListFrame->show();
     } else {
         d->playListFrame->hide();
     }
 }
 
 void PlayListWidget::setView( char view ) {
     if ( view == 'l' )
         showMaximized();
     else
         hide();
 }
 
 void PlayListWidget::addSelected() {
 
     Config cfg( "OpiePlayer" );
     cfg.setGroup("PlayList");
     QString currentPlaylist = cfg.readEntry("CurrentPlaylist","");
 //    int noOfFiles = cfg.readNumEntry("NumberOfFiles", 0 );
 
     switch (tabWidget->currentPageIndex()) {
       case 0: //playlist
           break;
       case 1: { //audio
           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) ) {
                           if(QFileInfo( dit.current()->file()).exists())
                               d->selectedFiles->addToSelection(  **dit );
                       }
                   }
                   audioView->setSelected( it.current(),FALSE);
               }
           }
           tabWidget->setCurrentPage(0);
       }
       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) ) {
                           if(QFileInfo( dit.current()->file()).exists())
                               d->selectedFiles->addToSelection(  **dit );
                       }
                   }
                   videoView->setSelected( it.current(),FALSE);
               }
           }
           tabWidget->setCurrentPage(0);
       }
       break;
     };
 }
 
 void PlayListWidget::removeSelected() {
     d->selectedFiles->removeSelected( );
 }
 
 void PlayListWidget::playIt( QListViewItem *it) {
-    // if(it==NULL) return;
-    qDebug("playIt");
+ if(!it) return;
     mediaPlayerState->setPlaying(FALSE);
     mediaPlayerState->setPlaying(TRUE);
     d->selectedFiles->unSelect();
 }
 
 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)) {
                       if(QFileInfo( dit.current()->file()).exists())
                           d->selectedFiles->addToSelection(  **dit );
                   }
               }
           }
           break;
           case 2: {
               QListIterator<DocLnk> dit( vFiles.children() );
               for ( ; dit.current(); ++dit ) {
                   if( dit.current()->name() == it->text(0)) {
                       if(QFileInfo( dit.current()->file()).exists())
                           d->selectedFiles->addToSelection(  **dit );
                   }
               }
           }
           break;
           case 0:
               break;
         };
         tabWidget->setCurrentPage(0);
     }
 }
 
 void PlayListWidget::tabChanged(QWidget *) {
 
     switch ( tabWidget->currentPageIndex()) {
       case 0:
       {
           if( !tbDeletePlaylist->isHidden())
               tbDeletePlaylist->hide();
           d->tbRemoveFromList->setEnabled(TRUE);
           d->tbAddToList->setEnabled(FALSE);
       }
       break;
       case 1:
       {
           audioView->clear();
           populateAudioView();
 
           if( !tbDeletePlaylist->isHidden())
               tbDeletePlaylist->hide();
           d->tbRemoveFromList->setEnabled(FALSE);
           d->tbAddToList->setEnabled(TRUE);
       }
       break;
       case 2:
       {
           videoView->clear();
           populateVideoView();
           if( !tbDeletePlaylist->isHidden())
               tbDeletePlaylist->hide();
           d->tbRemoveFromList->setEnabled(FALSE);
           d->tbAddToList->setEnabled(TRUE);
       }
       break;
       case 3:
       {
           if( tbDeletePlaylist->isHidden())
               tbDeletePlaylist->show();
           playLists->reread();
       }
       break;
     };
 }
 
 void PlayListWidget::btnPlay(bool b) {
 
 //    mediaPlayerState->setPlaying(b);
     switch ( tabWidget->currentPageIndex()) {
     case 0:
       {
           mediaPlayerState->setPlaying(b);
       }
       break;
     case 1:
     {
         addToSelection( audioView->currentItem() );
         mediaPlayerState->setPlaying(b);
         d->selectedFiles->removeSelected( );
         tabWidget->setCurrentPage(1);
         d->selectedFiles->unSelect();
         insanityBool=FALSE;
     }//          audioView->clearSelection();
     break;
     case 2:
     {
         addToSelection( videoView->currentItem() );
         mediaPlayerState->setPlaying(b);
         qApp->processEvents();
         d->selectedFiles->removeSelected( );
         tabWidget->setCurrentPage(2);
         d->selectedFiles->unSelect();
         insanityBool=FALSE;
     }//          videoView->clearSelection();
     break;
     };
 
 }
 
 void PlayListWidget::deletePlaylist() {
     switch( QMessageBox::information( this, (tr("Remove Playlist?")),
                                       (tr("You really want to delete\nthis playlist?")),
                                       (tr("Yes")), (tr("No")), 0 )){
       case 0: // Yes clicked,
           QFile().remove(playLists->selected()->file());
           QFile().remove(playLists->selected()->linkFile());
           playLists->reread();
           break;
       case 1: // Cancel
           break;
     };
 }
 
 void PlayListWidget::viewPressed( int mouse, QListViewItem *, const QPoint& , int) {
     switch (mouse) {
       case 1:
           break;
       case 2:{
           QPopupMenu  m;
           m.insertItem( tr( "Play" ), this, SLOT( playSelected() ));
           m.insertItem( tr( "Add to Playlist" ), this, SLOT( addSelected() ));
           m.insertSeparator();
           m.insertItem( tr( "Properties" ), this, SLOT( listDelete() ));
           m.exec( QCursor::pos() );
       }
       break;
     };
 }
 
 void PlayListWidget::playSelected() {
     btnPlay( TRUE);
 }
 
 void PlayListWidget::playlistViewPressed( int mouse, QListViewItem *, const QPoint& , int ) {
     switch (mouse) {
       case 1:
 
           break;
       case 2:
       {
           QPopupMenu  m;
           m.insertItem( tr( "Play Selected" ), this, SLOT( playSelected() ));
           m.insertItem( tr( "Remove" ), this, SLOT( removeSelected() ));
           m.exec( QCursor::pos() );
       }
       break;
     };
 }
 
 void PlayListWidget::listDelete() {
     Config cfg( "OpiePlayer" );
     cfg.setGroup("PlayList");
     QString currentPlaylist = cfg.readEntry("CurrentPlaylist","");
     QString file;
 //    int noOfFiles = cfg.readNumEntry("NumberOfFiles", 0 );
     switch ( tabWidget->currentPageIndex()) {
       case 0:
           break;
       case 1:
       {
           file = audioView->currentItem()->text(0);
           QListIterator<DocLnk> Pdit( files.children() );
           for ( ; Pdit.current(); ++Pdit ) {
               if( Pdit.current()->name() == file) {
                   LnkProperties prop( Pdit.current() );
                   prop.showMaximized();
                   prop.exec();
               }
           }
           populateAudioView();
       }
       break;
       case 2:
       {
 
       }
       break;
     };
 }
 
 void PlayListWidget::scanForAudio() {
     qDebug("scan for audio");
     files.detachChildren();
     QListIterator<DocLnk> sdit( files.children() );
     for ( ; sdit.current(); ++sdit ) {
         delete sdit.current();
     }
     Global::findDocuments(&files, "audio/*");
     audioScan = TRUE;
 }
 void PlayListWidget::scanForVideo() {
     qDebug("scan for video");
     vFiles.detachChildren();
     QListIterator<DocLnk> sdit( vFiles.children() );
     for ( ; sdit.current(); ++sdit ) {
         delete sdit.current();
     }
     Global::findDocuments(&vFiles, "video/*");
     videoScan = TRUE;
 }
 
 void PlayListWidget::populateAudioView() {
 
     audioView->clear();
     StorageInfo storageInfo;
     const QList<FileSystem> &fs = storageInfo.fileSystems();
     if(!audioScan) scanForAudio();
 
     QListIterator<DocLnk> dit( files.children() );
     QListIterator<FileSystem> it ( fs );
 
     QString storage;
     for ( ; dit.current(); ++dit ) {
         for( ; it.current(); ++it ){
             const QString name = (*it)->name();
             const QString path = (*it)->path();
             if(dit.current()->file().find(path) != -1 ) storage=name;
         }
 
         QListViewItem * newItem;
         if ( QFile( dit.current()->file()).exists()  ) {
             // qDebug(dit.current()->name());
             newItem= /*(void)*/ new QListViewItem( audioView, dit.current()->name(),
                                                    QString::number( QFile( dit.current()->file()).size() ), storage);
             newItem->setPixmap(0, Resource::loadPixmap( "opieplayer2/musicfile" ));
         }
     }
 
 }
 
 void PlayListWidget::populateVideoView() {
     videoView->clear();
     StorageInfo storageInfo;
     const QList<FileSystem> &fs = storageInfo.fileSystems();
 
     if(!videoScan ) scanForVideo();
 
     QListIterator<DocLnk> Vdit( vFiles.children() );
     QListIterator<FileSystem> it ( fs );
     videoView->clear();
     QString storage;
     for ( ; Vdit.current(); ++Vdit ) {