author | llornkcor <llornkcor> | 2005-03-06 04:52:03 (UTC) |
---|---|---|
committer | llornkcor <llornkcor> | 2005-03-06 04:52:03 (UTC) |
commit | b9360499c5f84ab53e080861e0292a70e446f5e4 (patch) (unidiff) | |
tree | 97cbc739073f03296bd9dc39b4ada35f1123baad | |
parent | 7e44f77d3749db2f43a1313d835a06684ecc1cd6 (diff) | |
download | opie-b9360499c5f84ab53e080861e0292a70e446f5e4.zip opie-b9360499c5f84ab53e080861e0292a70e446f5e4.tar.gz opie-b9360499c5f84ab53e080861e0292a70e446f5e4.tar.bz2 |
patches from Paul, human readable sizes and play button #1216
-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 | |||
@@ -78,7 +78,9 @@ void PlayListFileView::populateView() | |||
78 | 78 | ||
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() ); |
84 | newItem->setPixmap( 0, Resource::loadPixmap( m_itemPixmapName ) ); | 86 | newItem->setPixmap( 0, Resource::loadPixmap( m_itemPixmapName ) ); |
@@ -92,4 +94,13 @@ void PlayListFileView::checkSelection() | |||
92 | } | 94 | } |
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 |
95 | */ | 106 | */ |
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 | |||
@@ -26,4 +26,5 @@ private slots: | |||
26 | 26 | ||
27 | private: | 27 | private: |
28 | void fileSize(unsigned long size, QString &str); | ||
28 | QString m_mimeTypePattern; | 29 | QString m_mimeTypePattern; |
29 | QString m_itemPixmapName; | 30 | QString m_itemPixmapName; |
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 | |||
@@ -181,4 +181,36 @@ void PlayListWidget::initializeStates() { | |||
181 | } | 181 | } |
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() { |
184 | 216 | ||
@@ -221,4 +253,5 @@ void PlayListWidget::clearList() { | |||
221 | cfg.writeEntry("CurrentPlaylist","default"); | 253 | cfg.writeEntry("CurrentPlaylist","default"); |
222 | setCaption("OpiePlayer"); | 254 | setCaption("OpiePlayer"); |
255 | setButtons(); | ||
223 | } | 256 | } |
224 | 257 | ||
@@ -285,4 +318,6 @@ void PlayListWidget::addAllToList() { | |||
285 | writeCurrentM3u(); | 318 | writeCurrentM3u(); |
286 | d->selectedFiles->first(); | 319 | d->selectedFiles->first(); |
320 | |||
321 | setButtons(); | ||
287 | } | 322 | } |
288 | 323 | ||
@@ -306,4 +341,6 @@ void PlayListWidget::addAllMusicToList() { | |||
306 | writeCurrentM3u(); | 341 | writeCurrentM3u(); |
307 | d->selectedFiles->first(); | 342 | d->selectedFiles->first(); |
343 | |||
344 | setButtons(); | ||
308 | } | 345 | } |
309 | 346 | ||
@@ -325,4 +362,6 @@ void PlayListWidget::addAllVideoToList() { | |||
325 | writeCurrentM3u(); | 362 | writeCurrentM3u(); |
326 | d->selectedFiles->first(); | 363 | d->selectedFiles->first(); |
364 | |||
365 | setButtons(); | ||
327 | } | 366 | } |
328 | 367 | ||
@@ -477,4 +516,5 @@ void PlayListWidget::removeSelected() { | |||
477 | d->selectedFiles->removeSelected( ); | 516 | d->selectedFiles->removeSelected( ); |
478 | writeCurrentM3u(); | 517 | writeCurrentM3u(); |
518 | setButtons(); | ||
479 | } | 519 | } |
480 | 520 | ||
@@ -511,6 +551,4 @@ void PlayListWidget::addToSelection( QListViewItem *it) { | |||
511 | void PlayListWidget::tabChanged(QWidget *) { | 551 | void PlayListWidget::tabChanged(QWidget *) { |
512 | 552 | ||
513 | d->tbPlay->setEnabled( true ); | ||
514 | |||
515 | disconnect( audioView, SIGNAL( itemsSelected(bool) ), | 553 | disconnect( audioView, SIGNAL( itemsSelected(bool) ), |
516 | d->tbPlay, SLOT( setEnabled(bool) ) ); | 554 | d->tbPlay, SLOT( setEnabled(bool) ) ); |
@@ -526,8 +564,6 @@ void PlayListWidget::tabChanged(QWidget *) { | |||
526 | tbDeletePlaylist->hide(); | 564 | tbDeletePlaylist->hide(); |
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 | } |
533 | break; | 569 | break; |
@@ -539,5 +575,4 @@ void PlayListWidget::tabChanged(QWidget *) { | |||
539 | tbDeletePlaylist->hide(); | 575 | tbDeletePlaylist->hide(); |
540 | } | 576 | } |
541 | d->tbRemoveFromList->setEnabled(FALSE); | ||
542 | d->tbAddToList->setEnabled(TRUE); | 577 | d->tbAddToList->setEnabled(TRUE); |
543 | 578 | ||
@@ -545,6 +580,4 @@ void PlayListWidget::tabChanged(QWidget *) { | |||
545 | d->tbPlay, SLOT( setEnabled(bool) ) ); | 580 | d->tbPlay, SLOT( setEnabled(bool) ) ); |
546 | 581 | ||
547 | d->tbPlay->setEnabled( audioView->hasSelection() ); | ||
548 | |||
549 | currentFileListView = audioView; | 582 | currentFileListView = audioView; |
550 | } | 583 | } |
@@ -556,5 +589,4 @@ void PlayListWidget::tabChanged(QWidget *) { | |||
556 | tbDeletePlaylist->hide(); | 589 | tbDeletePlaylist->hide(); |
557 | } | 590 | } |
558 | d->tbRemoveFromList->setEnabled(FALSE); | ||
559 | d->tbAddToList->setEnabled(TRUE); | 591 | d->tbAddToList->setEnabled(TRUE); |
560 | 592 | ||
@@ -562,6 +594,4 @@ void PlayListWidget::tabChanged(QWidget *) { | |||
562 | d->tbPlay, SLOT( setEnabled(bool) ) ); | 594 | d->tbPlay, SLOT( setEnabled(bool) ) ); |
563 | 595 | ||
564 | d->tbPlay->setEnabled( videoView->hasSelection() ); | ||
565 | |||
566 | currentFileListView = videoView; | 596 | currentFileListView = videoView; |
567 | } | 597 | } |
@@ -575,8 +605,9 @@ void PlayListWidget::tabChanged(QWidget *) { | |||
575 | d->tbAddToList->setEnabled(FALSE); | 605 | d->tbAddToList->setEnabled(FALSE); |
576 | 606 | ||
577 | d->tbPlay->setEnabled( false ); | ||
578 | } | 607 | } |
579 | break; | 608 | break; |
580 | }; | 609 | }; |
610 | |||
611 | setButtons(); | ||
581 | } | 612 | } |
582 | 613 | ||
@@ -711,4 +742,6 @@ void PlayListWidget::openFile() { | |||
711 | d->selectedFiles->setSelectedItem( lnk.name() ); | 742 | d->selectedFiles->setSelectedItem( lnk.name() ); |
712 | } | 743 | } |
744 | |||
745 | setButtons(); | ||
713 | } | 746 | } |
714 | 747 | ||
@@ -780,4 +813,5 @@ void PlayListWidget::readListFromFile( const QString &filename ) { | |||
780 | setCaption(tr("OpiePlayer: ")+ QFileInfo(filename).baseName()); | 813 | setCaption(tr("OpiePlayer: ")+ QFileInfo(filename).baseName()); |
781 | 814 | ||
815 | setButtons(); | ||
782 | } | 816 | } |
783 | 817 | ||
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 | |||
@@ -133,4 +133,5 @@ private slots: | |||
133 | private: | 133 | 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; |
136 | bool insanityBool; | 137 | bool insanityBool; |