author | simon <simon> | 2002-12-04 11:40:01 (UTC) |
---|---|---|
committer | simon <simon> | 2002-12-04 11:40:01 (UTC) |
commit | 6a11cf48019e28006172cfb9a61e865816c3657e (patch) (unidiff) | |
tree | 45634eded135f17fcdba8e4cb706e87f47f6d5f0 /noncore/multimedia/opieplayer2/playlistwidget.cpp | |
parent | 84d5ca934e9cb8950d1efdb90ac3b00ce6d44e95 (diff) | |
download | opie-6a11cf48019e28006172cfb9a61e865816c3657e.zip opie-6a11cf48019e28006172cfb9a61e865816c3657e.tar.gz opie-6a11cf48019e28006172cfb9a61e865816c3657e.tar.bz2 |
- move more view population logic into PlayListFileView
Diffstat (limited to 'noncore/multimedia/opieplayer2/playlistwidget.cpp') (more/less context) (ignore whitespace changes)
-rw-r--r-- | noncore/multimedia/opieplayer2/playlistwidget.cpp | 30 |
1 files changed, 6 insertions, 24 deletions
diff --git a/noncore/multimedia/opieplayer2/playlistwidget.cpp b/noncore/multimedia/opieplayer2/playlistwidget.cpp index 460a0bf..eb0606d 100644 --- a/noncore/multimedia/opieplayer2/playlistwidget.cpp +++ b/noncore/multimedia/opieplayer2/playlistwidget.cpp | |||
@@ -151,8 +151,6 @@ PlayListWidget::PlayListWidget( MediaPlayerState &mediaPlayerState, QWidget* par | |||
151 | &mediaPlayerState, SLOT( setVideoGamma( int ) ) ); | 151 | &mediaPlayerState, SLOT( setVideoGamma( int ) ) ); |
152 | 152 | ||
153 | // see which skins are installed | 153 | // see which skins are installed |
154 | audioPopulated=false; | ||
155 | videoPopulated=false; | ||
156 | populateSkinsMenu(); | 154 | populateSkinsMenu(); |
157 | initializeStates(); | 155 | initializeStates(); |
158 | 156 | ||
@@ -254,7 +252,7 @@ void PlayListWidget::addAllToList() { | |||
254 | 252 | ||
255 | if(!audioView->scannedFiles()) { | 253 | if(!audioView->scannedFiles()) { |
256 | if(audioView->childCount() < 1) | 254 | if(audioView->childCount() < 1) |
257 | populateAudioView(); | 255 | audioView->populateView(); |
258 | } | 256 | } |
259 | 257 | ||
260 | QListViewItemIterator audioIt( audioView ); | 258 | QListViewItemIterator audioIt( audioView ); |
@@ -270,7 +268,7 @@ void PlayListWidget::addAllToList() { | |||
270 | 268 | ||
271 | if(!videoView->scannedFiles()) { | 269 | if(!videoView->scannedFiles()) { |
272 | if(videoView->childCount() < 1) | 270 | if(videoView->childCount() < 1) |
273 | populateVideoView(); | 271 | videoView->populateView(); |
274 | } | 272 | } |
275 | 273 | ||
276 | QListViewItemIterator videoIt( videoView ); | 274 | QListViewItemIterator videoIt( videoView ); |
@@ -314,7 +312,7 @@ void PlayListWidget::addAllMusicToList() { | |||
314 | 312 | ||
315 | if(!audioView->scannedFiles()) { | 313 | if(!audioView->scannedFiles()) { |
316 | if(audioView->childCount() < 1) | 314 | if(audioView->childCount() < 1) |
317 | populateAudioView(); | 315 | audioView->populateView(); |
318 | } | 316 | } |
319 | 317 | ||
320 | QListViewItemIterator audioIt( audioView ); | 318 | QListViewItemIterator audioIt( audioView ); |
@@ -347,7 +345,7 @@ void PlayListWidget::addAllVideoToList() { | |||
347 | 345 | ||
348 | if(!videoView->scannedFiles()) { | 346 | if(!videoView->scannedFiles()) { |
349 | if(videoView->childCount() < 1) | 347 | if(videoView->childCount() < 1) |
350 | populateVideoView(); | 348 | videoView->populateView(); |
351 | } | 349 | } |
352 | 350 | ||
353 | QListViewItemIterator videoIt( videoView ); | 351 | QListViewItemIterator videoIt( videoView ); |
@@ -572,8 +570,7 @@ void PlayListWidget::tabChanged(QWidget *) { | |||
572 | break; | 570 | break; |
573 | case AudioFiles: | 571 | case AudioFiles: |
574 | { | 572 | { |
575 | // audioView->clear(); | 573 | audioView->populateView(); |
576 | if(!audioPopulated) populateAudioView(); | ||
577 | 574 | ||
578 | if( !tbDeletePlaylist->isHidden() ) { | 575 | if( !tbDeletePlaylist->isHidden() ) { |
579 | tbDeletePlaylist->hide(); | 576 | tbDeletePlaylist->hide(); |
@@ -584,8 +581,7 @@ void PlayListWidget::tabChanged(QWidget *) { | |||
584 | break; | 581 | break; |
585 | case VideoFiles: | 582 | case VideoFiles: |
586 | { | 583 | { |
587 | // videoView->clear(); | 584 | videoView->populateView(); |
588 | if(!videoPopulated) populateVideoView(); | ||
589 | if( !tbDeletePlaylist->isHidden() ) { | 585 | if( !tbDeletePlaylist->isHidden() ) { |
590 | tbDeletePlaylist->hide(); | 586 | tbDeletePlaylist->hide(); |
591 | } | 587 | } |
@@ -636,24 +632,10 @@ void PlayListWidget::playSelected() { | |||
636 | 632 | ||
637 | void PlayListWidget::scanForAudio() { | 633 | void PlayListWidget::scanForAudio() { |
638 | audioView->scanFiles(); | 634 | audioView->scanFiles(); |
639 | audioView->scannedFiles() = true; | ||
640 | populateAudioView(); | ||
641 | } | 635 | } |
642 | 636 | ||
643 | void PlayListWidget::scanForVideo() { | 637 | void PlayListWidget::scanForVideo() { |
644 | videoView->scanFiles(); | 638 | videoView->scanFiles(); |
645 | videoView->scannedFiles() = true; | ||
646 | populateVideoView(); | ||
647 | } | ||
648 | |||
649 | void PlayListWidget::populateAudioView() { | ||
650 | audioView->populateView(); | ||
651 | audioPopulated = true; | ||
652 | } | ||
653 | |||
654 | void PlayListWidget::populateVideoView() { | ||
655 | videoView->populateView(); | ||
656 | videoPopulated=true; | ||
657 | } | 639 | } |
658 | 640 | ||
659 | QListView *PlayListWidget::currentFileListView() const | 641 | QListView *PlayListWidget::currentFileListView() const |