3 files changed, 3 insertions, 4 deletions

diff --git a/noncore/multimedia/opieplayer2/mediaplayer.cpp b/noncore/multimedia/opieplayer2/mediaplayer.cpp
index 6a48b82..0526c2a 100644
--- a/noncore/multimedia/opieplayer2/mediaplayer.cpp
+++ b/noncore/multimedia/opieplayer2/mediaplayer.cpp
@@ -168,132 +168,134 @@ void MediaPlayer::stopChangingVolume() {
         audioUI->repaint( (w - 200) / 2, h - yoff, 200 + 9, 70, FALSE );
     } else {
         w = videoUI->width();
         h = videoUI->height();
         videoUI->repaint( (w - 200) / 2, h - yoff, 200 + 9, 70, FALSE );
     }
 }
 
 
 void MediaPlayer::timerEvent( QTimerEvent * ) {
     if ( volumeDirection == +1 ) {
         volControl->incVol(2);
     }  else if ( volumeDirection == -1 ) {
         volControl->decVol(2);
     }
 
 
       // TODO FIXME
     unsigned int v= 0;
     v = volControl->volume();
     v = v / 10;
 
     if ( drawnOnScreenDisplay && onScreenDisplayVolume == v ) {
         return;
     }
 
     int w=0; int h=0;
     if( !xineControl->hasVideo()) {
         w = audioUI->width();
         h = audioUI->height();
 
         if ( drawnOnScreenDisplay ) {
             if ( onScreenDisplayVolume > v ) {
                 audioUI->repaint( (w - 200) / 2 + v * 20 + 0, h - yoff + 40, (onScreenDisplayVolume - v) * 20 + 9, 30, FALSE );
             }
         }
         drawnOnScreenDisplay = TRUE;
         onScreenDisplayVolume = v;
         QPainter p( audioUI );
         p.setPen( QColor( 0x10, 0xD0, 0x10 ) );
         p.setBrush( QColor( 0x10, 0xD0, 0x10 ) );
 
         QFont f;
         f.setPixelSize( 20 );
         f.setBold( TRUE );
         p.setFont( f );
         p.drawText( (w - 200) / 2, h - yoff + 20, tr("Volume") );
 
         for ( unsigned int i = 0; i < 10; i++ ) {
             if ( v > i ) {
                 p.drawRect( (w - 200) / 2 + i * 20 + 0, h - yoff + 40, 9, 30 );
             } else {
                 p.drawRect( (w - 200) / 2 + i * 20 + 3, h - yoff + 50, 3, 10 );
             }
         }
     } else {
         w = videoUI->width();
         h = videoUI->height();
 
         if ( drawnOnScreenDisplay ) {
             if ( onScreenDisplayVolume > v ) {
                 videoUI->repaint( (w - 200) / 2 + v * 20 + 0, h - yoff + 40, (onScreenDisplayVolume - v) * 20 + 9, 30, FALSE );
             }
         }
         drawnOnScreenDisplay = TRUE;
         onScreenDisplayVolume = v;
         QPainter p( videoUI );
         p.setPen( QColor( 0x10, 0xD0, 0x10 ) );
         p.setBrush( QColor( 0x10, 0xD0, 0x10 ) );
 
         QFont f;
         f.setPixelSize( 20 );
         f.setBold( TRUE );
         p.setFont( f );
         p.drawText( (w - 200) / 2, h - yoff + 20, tr("Volume") );
 
         for ( unsigned int i = 0; i < 10; i++ ) {
             if ( v > i ) {
                 p.drawRect( (w - 200) / 2 + i * 20 + 0, h - yoff + 40, 9, 30 );
             } else {
                 p.drawRect( (w - 200) / 2 + i * 20 + 3, h - yoff + 50, 3, 10 );
             }
         }
     }
 }
 
 
 void MediaPlayer::blank( bool b ) {
     fd=open("/dev/fb0",O_RDWR);
     if (fd != -1) {
         if ( b ) {
             qDebug("do blanking");
             ioctl( fd, FBIOBLANK, 3 );
             isBlanked = TRUE;
         } else {
             qDebug("do unblanking");
             ioctl( fd, FBIOBLANK, 0);
             isBlanked = FALSE;
         }
         close( fd );
     } else {
         qDebug("<< /dev/fb0 could not be opened  >>");
     }
 }
 
 void MediaPlayer::keyReleaseEvent( QKeyEvent *e) {
     switch ( e->key() ) {
 ////////////////////////////// Zaurus keys
       case Key_Home:
           break;
       case Key_F9: //activity
           break;
       case Key_F10: //contacts
           break;
       case Key_F11: //menu
           break;
       case Key_F12: //home
           qDebug("Blank here");
 //          mediaPlayerState->toggleBlank();
           break;
       case Key_F13: //mail
           qDebug("Blank here");
           //  mediaPlayerState->toggleBlank();
           break;
     }
 }
 
 void MediaPlayer::cleanUp() {// this happens on closing
+    Config cfg( "OpiePlayer" );
+    playList->writeConfig( cfg );
     
 //     QPEApplication::grabKeyboard();
 //     QPEApplication::ungrabKeyboard();
 }
diff --git a/noncore/multimedia/opieplayer2/playlistwidget.cpp b/noncore/multimedia/opieplayer2/playlistwidget.cpp
index 404e1fe..bc9b166 100644
--- a/noncore/multimedia/opieplayer2/playlistwidget.cpp
+++ b/noncore/multimedia/opieplayer2/playlistwidget.cpp
@@ -182,259 +182,256 @@ PlayListWidget::PlayListWidget( QWidget* parent, const char* name, WFlags fl )
   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;
 
   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
   (void)new ToolButton( vbox1, tr( "Move Up" ),   "opieplayer2/up",   d->selectedFiles, SLOT(moveSelectedUp()) );
   (void)new ToolButton( vbox1, tr( "Remove" ),    "opieplayer2/cut",  d->selectedFiles, SLOT(removeSelected()) );
   (void)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->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->setSorting(0,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->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->setSorting(0,TRUE);
 
   videoView->setMultiSelection( TRUE );
   videoView->setSelectionMode( QListView::Extended);
 
   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
   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);
diff --git a/noncore/multimedia/opieplayer2/playlistwidget.h b/noncore/multimedia/opieplayer2/playlistwidget.h
index 8076707..8710a99 100644
--- a/noncore/multimedia/opieplayer2/playlistwidget.h
+++ b/noncore/multimedia/opieplayer2/playlistwidget.h
@@ -1,111 +1,111 @@
 
 #ifndef PLAY_LIST_WIDGET_H
 #define PLAY_LIST_WIDGET_H
 
 #include <qmainwindow.h>
 #include <qpe/applnk.h>
 #include <qtabwidget.h>
 #include <qpe/fileselector.h>
 #include <qpushbutton.h>
 #include <qpopupmenu.h>
 
 /* #include <qtimer.h> */
 
 
 class PlayListWidgetPrivate;
 class Config;
 class QListViewItem;
 class QListView;
 class QPoint;
 class QAction;
 class QLabel;
 
 class PlayListWidget : public QMainWindow {
     Q_OBJECT
 public:
     PlayListWidget( QWidget* parent=0, const char* name=0, WFlags fl=0 );
     ~PlayListWidget();
     QTabWidget * tabWidget;
 //    MenuItem *fullScreenButton, *scaleButton;
 //    QAction *fullScreenButton, *scaleButton;
     DocLnkSet files;
     DocLnkSet vFiles;
     QListView *audioView, *videoView, *playlistView;
     QLabel *libString;
     QPopupMenu *pmView ;
     bool fromSetDocument;
     bool insanityBool;
     QString setDocFileRef;
     // retrieve the current playlist entry (media file link)
     const DocLnk *current();
     void useSelectedDocument();
 /*     QTimer    * menuTimer; */
     FileSelector*  playLists;
     QPushButton *tbDeletePlaylist;
     int selected;
 public slots:
     bool first();
     bool last();
     bool next();
     bool prev();
+    void writeConfig( Config& cfg ) const;
 /*     void setFullScreen(); */
 /*     void setScaled(); */
 protected:
 /*     void contentsMousePressEvent( QMouseEvent * e ); */
 /*     void contentsMouseReleaseEvent( QMouseEvent * e ); */
 void keyReleaseEvent( QKeyEvent *e);
 void keyPressEvent( QKeyEvent *e);
 private:
     int defaultSkinIndex;
     QPopupMenu *skinsMenu;
     bool audioScan, videoScan;
     void readm3u(const QString &);
     void readPls(const QString &);
 
     void initializeStates();
     void readConfig( Config& cfg );
-    void writeConfig( Config& cfg ) const;
     PlayListWidgetPrivate *d; // Private implementation data
     void populateAudioView();
     void populateVideoView();
 private slots:
     void populateSkinsMenu();
     void skinsMenuActivated(int);
     void pmViewActivated(int);
     void writem3u();
     void scanForAudio();
     void scanForVideo();
     void openFile();
     void setDocument( const QString& fileref );
     void addToSelection( const DocLnk& ); // Add a media file to the playlist
     void addToSelection( QListViewItem* ); // Add a media file to the playlist
     void setActiveWindow(); // need to handle this to show the right view
     void setPlaylist( bool ); // Show/Hide the playlist
     void setView( char );
     void clearList();
     void addAllToList();
     void addAllMusicToList();
     void addAllVideoToList();
     void saveList();  // Save the playlist
     void loadList( const DocLnk &);  // Load a playlist
     void playIt( QListViewItem *);
 
     void btnPlay(bool);
     void deletePlaylist();
     void addSelected();
     void removeSelected();
     void tabChanged(QWidget*);
     void viewPressed( int, QListViewItem *, const QPoint&, int);
     void playlistViewPressed( int, QListViewItem *, const QPoint&, int);
     void playSelected();
 
 protected slots:
 /*     void cancelMenuTimer(); */
 /*     void showFileMenu(); */
 
 
 };
 
 
 #endif // PLAY_LIST_WIDGET_H