4 files changed, 59 insertions, 12 deletions

diff --git a/noncore/multimedia/opieplayer2/playlistfileview.cpp b/noncore/multimedia/opieplayer2/playlistfileview.cpp
index 3ef4d03..3094876 100644
--- a/noncore/multimedia/opieplayer2/playlistfileview.cpp
+++ b/noncore/multimedia/opieplayer2/playlistfileview.cpp
@@ -76,11 +76,13 @@ void PlayListFileView::populateView()
         if ( QFile::exists( dit.current()->file() ) ||
              dit.current()->file().left( 4 ) == "http" ) {
 
             unsigned long size = QFile( dit.current()->file() ).size();
+            QString sizestr;
+            fileSize(size, sizestr);
 
             newItem = new QListViewItem( this, dit.current()->name(),
-                                               QString::number( size ), "" /*storage*/,
+                                               sizestr, "" /*storage*/,
                                                dit.current()->file() );
             newItem->setPixmap( 0, Resource::loadPixmap( m_itemPixmapName ) );
         }
     }
@@ -90,6 +92,15 @@ void PlayListFileView::checkSelection()
 {
     emit itemsSelected( hasSelection() );
 }
 
+void PlayListFileView::fileSize(unsigned long size, QString &str) {
+    if( size > 1048576 )
+        str.sprintf( "%.0fM", size / 1048576.0 );
+    else if( size > 1024 )
+        str.sprintf( "%.0fK", size / 1024.0 );
+    else
+        str.sprintf( "%d", size );
+}
+
 /* vim: et sw=4 ts=4
  */
diff --git a/noncore/multimedia/opieplayer2/playlistfileview.h b/noncore/multimedia/opieplayer2/playlistfileview.h
index 5b15526..d92f258 100644
--- a/noncore/multimedia/opieplayer2/playlistfileview.h
+++ b/noncore/multimedia/opieplayer2/playlistfileview.h
@@ -24,8 +24,9 @@ signals:
 private slots:
     void checkSelection();
 
 private:
+    void fileSize(unsigned long size, QString &str);
     QString m_mimeTypePattern;
     QString m_itemPixmapName;
     DocLnkSet m_files;
     bool m_scannedFiles;
diff --git a/noncore/multimedia/opieplayer2/playlistwidget.cpp b/noncore/multimedia/opieplayer2/playlistwidget.cpp
index 5f4159c..83eb83b 100644
--- a/noncore/multimedia/opieplayer2/playlistwidget.cpp
+++ b/noncore/multimedia/opieplayer2/playlistwidget.cpp
@@ -179,8 +179,40 @@ void PlayListWidget::initializeStates() {
     d->tbShuffle->setOn( mediaPlayerState->isShuffled() );
     d->playListFrame->show();
 }
 
+void PlayListWidget::setButtons(void) {
+    bool hasitem;
+
+    switch ( currentTab() ) {
+    case CurrentPlayList:
+    {
+        hasitem = !d->selectedFiles->isEmpty();
+        d->tbPlay->setEnabled( hasitem );
+        d->tbRemoveFromList->setEnabled( hasitem );
+    }
+    break;
+    case AudioFiles:
+    {
+        d->tbPlay->setEnabled( audioView->hasSelection() );
+        d->tbRemoveFromList->setEnabled( false );
+    }
+    break;
+    case VideoFiles:
+    {
+        d->tbPlay->setEnabled( videoView->hasSelection() );
+        d->tbRemoveFromList->setEnabled( false );
+    }
+    break;
+    case PlayLists:
+    {
+        d->tbPlay->setEnabled( false );
+        d->tbRemoveFromList->setEnabled( false );
+    }
+    break;
+    };
+}
+
 void PlayListWidget::writeDefaultPlaylist() {
 
     Config config( "OpiePlayer" );
     config.setGroup( "PlayList" );
@@ -219,8 +251,9 @@ void PlayListWidget::clearList() {
   Config cfg( "OpiePlayer" );
   cfg.setGroup("PlayList");
   cfg.writeEntry("CurrentPlaylist","default");
   setCaption("OpiePlayer");
+  setButtons();
 }
 
 void PlayListWidget::viewPressed( int mouse, QListViewItem *, const QPoint& , int) {
     switch (mouse) {
@@ -283,8 +316,10 @@ void PlayListWidget::addAllToList() {
     tabWidget->setCurrentPage(0);
 
     writeCurrentM3u();
     d->selectedFiles->first();
+
+  setButtons();
 }
 
 
 void PlayListWidget::addAllMusicToList() {
@@ -304,8 +339,10 @@ void PlayListWidget::addAllMusicToList() {
 
     tabWidget->setCurrentPage(0);
     writeCurrentM3u();
     d->selectedFiles->first();
+
+  setButtons();
 }
 
 
 void PlayListWidget::addAllVideoToList() {
@@ -323,8 +360,10 @@ void PlayListWidget::addAllVideoToList() {
   }
     tabWidget->setCurrentPage(0);
     writeCurrentM3u();
     d->selectedFiles->first();
+
+  setButtons();
 }
 
 
 void PlayListWidget::setDocument( const QString& _fileref ) {
@@ -475,8 +514,9 @@ void PlayListWidget::addSelected() {
 
 void PlayListWidget::removeSelected() {
     d->selectedFiles->removeSelected( );
     writeCurrentM3u();
+    setButtons();
 }
 
 
 void PlayListWidget::playIt( QListViewItem *it) {
@@ -509,10 +549,8 @@ void PlayListWidget::addToSelection( QListViewItem *it) {
 
 
 void PlayListWidget::tabChanged(QWidget *) {
 
-    d->tbPlay->setEnabled( true );
-
     disconnect( audioView, SIGNAL( itemsSelected(bool) ),
                 d->tbPlay, SLOT( setEnabled(bool) ) );
     disconnect( videoView, SIGNAL( itemsSelected(bool) ),
                 d->tbPlay, SLOT( setEnabled(bool) ) );
@@ -524,12 +562,10 @@ void PlayListWidget::tabChanged(QWidget *) {
     {
         if( !tbDeletePlaylist->isHidden() )  {
             tbDeletePlaylist->hide();
         }
-        d->tbRemoveFromList->setEnabled(TRUE);
         d->tbAddToList->setEnabled(FALSE);
 
-        d->tbPlay->setEnabled( !d->selectedFiles->isEmpty() );
     }
     break;
     case AudioFiles:
     {
@@ -537,16 +573,13 @@ void PlayListWidget::tabChanged(QWidget *) {
 
         if( !tbDeletePlaylist->isHidden() ) {
             tbDeletePlaylist->hide();
         }
-        d->tbRemoveFromList->setEnabled(FALSE);
         d->tbAddToList->setEnabled(TRUE);
 
         connect( audioView, SIGNAL( itemsSelected(bool) ),
                  d->tbPlay, SLOT( setEnabled(bool) ) );
 
-        d->tbPlay->setEnabled( audioView->hasSelection() );
-
         currentFileListView = audioView;
     }
     break;
     case VideoFiles:
@@ -554,16 +587,13 @@ void PlayListWidget::tabChanged(QWidget *) {
         videoView->populateView();
         if( !tbDeletePlaylist->isHidden() ) {
             tbDeletePlaylist->hide();
         }
-        d->tbRemoveFromList->setEnabled(FALSE);
         d->tbAddToList->setEnabled(TRUE);
 
         connect( videoView, SIGNAL( itemsSelected(bool) ),
                  d->tbPlay, SLOT( setEnabled(bool) ) );
 
-        d->tbPlay->setEnabled( videoView->hasSelection() );
-
         currentFileListView = videoView;
     }
     break;
     case PlayLists:
@@ -573,12 +603,13 @@ void PlayListWidget::tabChanged(QWidget *) {
         }
         playLists->reread();
         d->tbAddToList->setEnabled(FALSE);
 
-        d->tbPlay->setEnabled( false );
     }
     break;
     };
+
+    setButtons();
 }
 
 
 void PlayListWidget::btnPlay(bool b) {
@@ -709,8 +740,10 @@ void PlayListWidget::openFile() {
         QFileInfo info( str );
         DocLnk lnk = addFileToPlaylist( str, info.baseName() );
         d->selectedFiles->setSelectedItem( lnk.name() );
     }
+
+    setButtons();
 }
 
 void PlayListWidget::openDirectory() {
     QString str = OFileDialog::getDirectory( OFileSelector::DirectorySelector,
@@ -778,8 +811,9 @@ void PlayListWidget::readListFromFile( const QString &filename ) {
 
     d->selectedFiles->setSelectedItem( s);
     setCaption(tr("OpiePlayer: ")+ QFileInfo(filename).baseName());
 
+    setButtons();
 }
 
 //  writes current playlist to current m3u file */
  void PlayListWidget::writeCurrentM3u() {
diff --git a/noncore/multimedia/opieplayer2/playlistwidget.h b/noncore/multimedia/opieplayer2/playlistwidget.h
index 1f5ba92..7db0029 100644
--- a/noncore/multimedia/opieplayer2/playlistwidget.h
+++ b/noncore/multimedia/opieplayer2/playlistwidget.h
@@ -131,8 +131,9 @@ private slots:
     void playSelected();
 
 private:
     DocLnk addFileToPlaylist(const QString& directory, const QString& name);
+    void setButtons(void);
     bool fromSetDocument;
     bool insanityBool;
     QString setDocFileRef, currentPlayList;
     int selected;