-rw-r--r-- | noncore/multimedia/opieplayer2/playlistfileview.cpp | 13 | ||||
-rw-r--r-- | noncore/multimedia/opieplayer2/playlistfileview.h | 1 | ||||
-rw-r--r-- | noncore/multimedia/opieplayer2/playlistwidget.cpp | 56 | ||||
-rw-r--r-- | noncore/multimedia/opieplayer2/playlistwidget.h | 1 |
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 | |||
@@ -79,5 +79,7 @@ void PlayListFileView::populateView() | |||
79 | unsigned long size = QFile( dit.current()->file() ).size(); | 79 | unsigned long size = QFile( dit.current()->file() ).size(); |
80 | QString sizestr; | ||
81 | fileSize(size, sizestr); | ||
80 | 82 | ||
81 | newItem = new QListViewItem( this, dit.current()->name(), | 83 | newItem = new QListViewItem( this, dit.current()->name(), |
82 | QString::number( size ), "" /*storage*/, | 84 | sizestr, "" /*storage*/, |
83 | dit.current()->file() ); | 85 | dit.current()->file() ); |
@@ -93,2 +95,11 @@ void PlayListFileView::checkSelection() | |||
93 | 95 | ||
96 | void PlayListFileView::fileSize(unsigned long size, QString &str) { | ||
97 | if( size > 1048576 ) | ||
98 | str.sprintf( "%.0fM", size / 1048576.0 ); | ||
99 | else if( size > 1024 ) | ||
100 | str.sprintf( "%.0fK", size / 1024.0 ); | ||
101 | else | ||
102 | str.sprintf( "%d", size ); | ||
103 | } | ||
104 | |||
94 | /* vim: et sw=4 ts=4 | 105 | /* 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 | |||
@@ -27,2 +27,3 @@ private slots: | |||
27 | private: | 27 | private: |
28 | void fileSize(unsigned long size, QString &str); | ||
28 | QString m_mimeTypePattern; | 29 | QString m_mimeTypePattern; |
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 | |||
@@ -182,2 +182,34 @@ void PlayListWidget::initializeStates() { | |||
182 | 182 | ||
183 | void PlayListWidget::setButtons(void) { | ||
184 | bool hasitem; | ||
185 | |||
186 | switch ( currentTab() ) { | ||
187 | case CurrentPlayList: | ||
188 | { | ||
189 | hasitem = !d->selectedFiles->isEmpty(); | ||
190 | d->tbPlay->setEnabled( hasitem ); | ||
191 | d->tbRemoveFromList->setEnabled( hasitem ); | ||
192 | } | ||
193 | break; | ||
194 | case AudioFiles: | ||
195 | { | ||
196 | d->tbPlay->setEnabled( audioView->hasSelection() ); | ||
197 | d->tbRemoveFromList->setEnabled( false ); | ||
198 | } | ||
199 | break; | ||
200 | case VideoFiles: | ||
201 | { | ||
202 | d->tbPlay->setEnabled( videoView->hasSelection() ); | ||
203 | d->tbRemoveFromList->setEnabled( false ); | ||
204 | } | ||
205 | break; | ||
206 | case PlayLists: | ||
207 | { | ||
208 | d->tbPlay->setEnabled( false ); | ||
209 | d->tbRemoveFromList->setEnabled( false ); | ||
210 | } | ||
211 | break; | ||
212 | }; | ||
213 | } | ||
214 | |||
183 | void PlayListWidget::writeDefaultPlaylist() { | 215 | void PlayListWidget::writeDefaultPlaylist() { |
@@ -222,2 +254,3 @@ void PlayListWidget::clearList() { | |||
222 | setCaption("OpiePlayer"); | 254 | setCaption("OpiePlayer"); |
255 | setButtons(); | ||
223 | } | 256 | } |
@@ -286,2 +319,4 @@ void PlayListWidget::addAllToList() { | |||
286 | d->selectedFiles->first(); | 319 | d->selectedFiles->first(); |
320 | |||
321 | setButtons(); | ||
287 | } | 322 | } |
@@ -307,2 +342,4 @@ void PlayListWidget::addAllMusicToList() { | |||
307 | d->selectedFiles->first(); | 342 | d->selectedFiles->first(); |
343 | |||
344 | setButtons(); | ||
308 | } | 345 | } |
@@ -326,2 +363,4 @@ void PlayListWidget::addAllVideoToList() { | |||
326 | d->selectedFiles->first(); | 363 | d->selectedFiles->first(); |
364 | |||
365 | setButtons(); | ||
327 | } | 366 | } |
@@ -478,2 +517,3 @@ void PlayListWidget::removeSelected() { | |||
478 | writeCurrentM3u(); | 517 | writeCurrentM3u(); |
518 | setButtons(); | ||
479 | } | 519 | } |
@@ -512,4 +552,2 @@ void PlayListWidget::tabChanged(QWidget *) { | |||
512 | 552 | ||
513 | d->tbPlay->setEnabled( true ); | ||
514 | |||
515 | disconnect( audioView, SIGNAL( itemsSelected(bool) ), | 553 | disconnect( audioView, SIGNAL( itemsSelected(bool) ), |
@@ -527,6 +565,4 @@ void PlayListWidget::tabChanged(QWidget *) { | |||
527 | } | 565 | } |
528 | d->tbRemoveFromList->setEnabled(TRUE); | ||
529 | d->tbAddToList->setEnabled(FALSE); | 566 | d->tbAddToList->setEnabled(FALSE); |
530 | 567 | ||
531 | d->tbPlay->setEnabled( !d->selectedFiles->isEmpty() ); | ||
532 | } | 568 | } |
@@ -540,3 +576,2 @@ void PlayListWidget::tabChanged(QWidget *) { | |||
540 | } | 576 | } |
541 | d->tbRemoveFromList->setEnabled(FALSE); | ||
542 | d->tbAddToList->setEnabled(TRUE); | 577 | d->tbAddToList->setEnabled(TRUE); |
@@ -546,4 +581,2 @@ void PlayListWidget::tabChanged(QWidget *) { | |||
546 | 581 | ||
547 | d->tbPlay->setEnabled( audioView->hasSelection() ); | ||
548 | |||
549 | currentFileListView = audioView; | 582 | currentFileListView = audioView; |
@@ -557,3 +590,2 @@ void PlayListWidget::tabChanged(QWidget *) { | |||
557 | } | 590 | } |
558 | d->tbRemoveFromList->setEnabled(FALSE); | ||
559 | d->tbAddToList->setEnabled(TRUE); | 591 | d->tbAddToList->setEnabled(TRUE); |
@@ -563,4 +595,2 @@ void PlayListWidget::tabChanged(QWidget *) { | |||
563 | 595 | ||
564 | d->tbPlay->setEnabled( videoView->hasSelection() ); | ||
565 | |||
566 | currentFileListView = videoView; | 596 | currentFileListView = videoView; |
@@ -576,3 +606,2 @@ void PlayListWidget::tabChanged(QWidget *) { | |||
576 | 606 | ||
577 | d->tbPlay->setEnabled( false ); | ||
578 | } | 607 | } |
@@ -580,2 +609,4 @@ void PlayListWidget::tabChanged(QWidget *) { | |||
580 | }; | 609 | }; |
610 | |||
611 | setButtons(); | ||
581 | } | 612 | } |
@@ -712,2 +743,4 @@ void PlayListWidget::openFile() { | |||
712 | } | 743 | } |
744 | |||
745 | setButtons(); | ||
713 | } | 746 | } |
@@ -781,2 +814,3 @@ void PlayListWidget::readListFromFile( const QString &filename ) { | |||
781 | 814 | ||
815 | setButtons(); | ||
782 | } | 816 | } |
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 | |||
@@ -134,2 +134,3 @@ private: | |||
134 | DocLnk addFileToPlaylist(const QString& directory, const QString& name); | 134 | DocLnk addFileToPlaylist(const QString& directory, const QString& name); |
135 | void setButtons(void); | ||
135 | bool fromSetDocument; | 136 | bool fromSetDocument; |