author | simon <simon> | 2002-12-08 19:57:21 (UTC) |
---|---|---|
committer | simon <simon> | 2002-12-08 19:57:21 (UTC) |
commit | ce313e53a56591fd883348f5e265606865fdcb50 (patch) (unidiff) | |
tree | f7227b5ed4270b35c92e81545f0e067cf6da90c1 | |
parent | 77ab301a0ab41befda91e6a210c64a72f0d7c264 (diff) | |
download | opie-ce313e53a56591fd883348f5e265606865fdcb50.zip opie-ce313e53a56591fd883348f5e265606865fdcb50.tar.gz opie-ce313e53a56591fd883348f5e265606865fdcb50.tar.bz2 |
- when the file list view is visible only enable the play button if there
is something selected. one crash less ;)
-rw-r--r-- | noncore/multimedia/opieplayer2/playlistfileview.cpp | 17 | ||||
-rw-r--r-- | noncore/multimedia/opieplayer2/playlistfileview.h | 8 | ||||
-rw-r--r-- | noncore/multimedia/opieplayer2/playlistwidget.cpp | 15 |
3 files changed, 40 insertions, 0 deletions
diff --git a/noncore/multimedia/opieplayer2/playlistfileview.cpp b/noncore/multimedia/opieplayer2/playlistfileview.cpp index cb16415..3ef4d03 100644 --- a/noncore/multimedia/opieplayer2/playlistfileview.cpp +++ b/noncore/multimedia/opieplayer2/playlistfileview.cpp | |||
@@ -20,4 +20,7 @@ PlayListFileView::PlayListFileView( const QString &mimeTypePattern, const QStrin | |||
20 | setMultiSelection( TRUE ); | 20 | setMultiSelection( TRUE ); |
21 | setSelectionMode( QListView::Extended ); | 21 | setSelectionMode( QListView::Extended ); |
22 | |||
23 | connect( this, SIGNAL( selectionChanged() ), | ||
24 | this, SLOT( checkSelection() ) ); | ||
22 | } | 25 | } |
23 | 26 | ||
@@ -26,4 +29,13 @@ PlayListFileView::~PlayListFileView() | |||
26 | } | 29 | } |
27 | 30 | ||
31 | bool PlayListFileView::hasSelection() const | ||
32 | { | ||
33 | for ( QListViewItemIterator it( const_cast<PlayListFileView *>( this ) ); it.current(); ++it ) | ||
34 | if ( it.current()->isSelected() ) | ||
35 | return true; | ||
36 | |||
37 | return false; | ||
38 | } | ||
39 | |||
28 | void PlayListFileView::scanFiles() | 40 | void PlayListFileView::scanFiles() |
29 | { | 41 | { |
@@ -75,4 +87,9 @@ void PlayListFileView::populateView() | |||
75 | } | 87 | } |
76 | 88 | ||
89 | void PlayListFileView::checkSelection() | ||
90 | { | ||
91 | emit itemsSelected( hasSelection() ); | ||
92 | } | ||
93 | |||
77 | /* vim: et sw=4 ts=4 | 94 | /* vim: et sw=4 ts=4 |
78 | */ | 95 | */ |
diff --git a/noncore/multimedia/opieplayer2/playlistfileview.h b/noncore/multimedia/opieplayer2/playlistfileview.h index 6eea2fc..5b15526 100644 --- a/noncore/multimedia/opieplayer2/playlistfileview.h +++ b/noncore/multimedia/opieplayer2/playlistfileview.h | |||
@@ -13,8 +13,16 @@ public: | |||
13 | virtual ~PlayListFileView(); | 13 | virtual ~PlayListFileView(); |
14 | 14 | ||
15 | bool hasSelection() const; | ||
16 | |||
15 | public slots: | 17 | public slots: |
16 | void scanFiles(); | 18 | void scanFiles(); |
17 | void populateView(); | 19 | void populateView(); |
18 | 20 | ||
21 | signals: | ||
22 | void itemsSelected( bool selected ); | ||
23 | |||
24 | private slots: | ||
25 | void checkSelection(); | ||
26 | |||
19 | private: | 27 | private: |
20 | QString m_mimeTypePattern; | 28 | QString m_mimeTypePattern; |
diff --git a/noncore/multimedia/opieplayer2/playlistwidget.cpp b/noncore/multimedia/opieplayer2/playlistwidget.cpp index 2df7f27..c05096a 100644 --- a/noncore/multimedia/opieplayer2/playlistwidget.cpp +++ b/noncore/multimedia/opieplayer2/playlistwidget.cpp | |||
@@ -545,4 +545,9 @@ void PlayListWidget::tabChanged(QWidget *) { | |||
545 | d->tbPlay->setEnabled( true ); | 545 | d->tbPlay->setEnabled( true ); |
546 | 546 | ||
547 | disconnect( audioView, SIGNAL( itemsSelected( bool ) ), | ||
548 | d->tbPlay, SLOT( setEnabled( bool ) ) ); | ||
549 | disconnect( videoView, SIGNAL( itemsSelected( bool ) ), | ||
550 | d->tbPlay, SLOT( setEnabled( bool ) ) ); | ||
551 | |||
547 | switch ( currentTab() ) { | 552 | switch ( currentTab() ) { |
548 | case CurrentPlayList: | 553 | case CurrentPlayList: |
@@ -566,4 +571,9 @@ void PlayListWidget::tabChanged(QWidget *) { | |||
566 | d->tbRemoveFromList->setEnabled(FALSE); | 571 | d->tbRemoveFromList->setEnabled(FALSE); |
567 | d->tbAddToList->setEnabled(TRUE); | 572 | d->tbAddToList->setEnabled(TRUE); |
573 | |||
574 | connect( audioView, SIGNAL( itemsSelected( bool ) ), | ||
575 | d->tbPlay, SLOT( setEnabled( bool ) ) ); | ||
576 | |||
577 | d->tbPlay->setEnabled( audioView->hasSelection() ); | ||
568 | } | 578 | } |
569 | break; | 579 | break; |
@@ -576,4 +586,9 @@ void PlayListWidget::tabChanged(QWidget *) { | |||
576 | d->tbRemoveFromList->setEnabled(FALSE); | 586 | d->tbRemoveFromList->setEnabled(FALSE); |
577 | d->tbAddToList->setEnabled(TRUE); | 587 | d->tbAddToList->setEnabled(TRUE); |
588 | |||
589 | connect( videoView, SIGNAL( itemsSelected( bool ) ), | ||
590 | d->tbPlay, SLOT( setEnabled( bool ) ) ); | ||
591 | |||
592 | d->tbPlay->setEnabled( videoView->hasSelection() ); | ||
578 | } | 593 | } |
579 | break; | 594 | break; |