author | simon <simon> | 2002-12-02 15:11:50 (UTC) |
---|---|---|
committer | simon <simon> | 2002-12-02 15:11:50 (UTC) |
commit | 9f770813346acbe7817b20c5fe0fea03827fc41a (patch) (unidiff) | |
tree | 271e8091f19e5701576fa5f1503cca08f955a7b0 /noncore | |
parent | 5380767372ecf3ab22f799abda32f414b0cc7ede (diff) | |
download | opie-9f770813346acbe7817b20c5fe0fea03827fc41a.zip opie-9f770813346acbe7817b20c5fe0fea03827fc41a.tar.gz opie-9f770813346acbe7817b20c5fe0fea03827fc41a.tar.bz2 |
- removed whichList() alltogether
-rw-r--r-- | noncore/multimedia/opieplayer2/playlistwidget.cpp | 25 | ||||
-rw-r--r-- | noncore/multimedia/opieplayer2/playlistwidget.h | 4 |
2 files changed, 11 insertions, 18 deletions
diff --git a/noncore/multimedia/opieplayer2/playlistwidget.cpp b/noncore/multimedia/opieplayer2/playlistwidget.cpp index a8429e3..fd256b7 100644 --- a/noncore/multimedia/opieplayer2/playlistwidget.cpp +++ b/noncore/multimedia/opieplayer2/playlistwidget.cpp | |||
@@ -574,11 +574,8 @@ void PlayListWidget::addToSelection( QListViewItem *it) { | |||
574 | d->setDocumentUsed = FALSE; | 574 | d->setDocumentUsed = FALSE; |
575 | 575 | ||
576 | if(it) { | 576 | if(it) { |
577 | switch ( whichList()) { | 577 | if ( currentTab() == CurrentPlayList ) |
578 | case 0: //playlist | 578 | return; |
579 | return; | ||
580 | break; | ||
581 | }; | ||
582 | // case 1: { | 579 | // case 1: { |
583 | DocLnk lnk; | 580 | DocLnk lnk; |
584 | QString filename; | 581 | QString filename; |
@@ -597,8 +594,8 @@ void PlayListWidget::addToSelection( QListViewItem *it) { | |||
597 | 594 | ||
598 | void PlayListWidget::tabChanged(QWidget *) { | 595 | void PlayListWidget::tabChanged(QWidget *) { |
599 | 596 | ||
600 | switch ( whichList()) { | 597 | switch ( currentTab() ) { |
601 | case 0: | 598 | case CurrentPlayList: |
602 | { | 599 | { |
603 | if( !tbDeletePlaylist->isHidden() ) { | 600 | if( !tbDeletePlaylist->isHidden() ) { |
604 | tbDeletePlaylist->hide(); | 601 | tbDeletePlaylist->hide(); |
@@ -607,7 +604,7 @@ void PlayListWidget::tabChanged(QWidget *) { | |||
607 | d->tbAddToList->setEnabled(FALSE); | 604 | d->tbAddToList->setEnabled(FALSE); |
608 | } | 605 | } |
609 | break; | 606 | break; |
610 | case 1: | 607 | case AudioFiles: |
611 | { | 608 | { |
612 | // audioView->clear(); | 609 | // audioView->clear(); |
613 | if(!audioPopulated) populateAudioView(); | 610 | if(!audioPopulated) populateAudioView(); |
@@ -619,7 +616,7 @@ void PlayListWidget::tabChanged(QWidget *) { | |||
619 | d->tbAddToList->setEnabled(TRUE); | 616 | d->tbAddToList->setEnabled(TRUE); |
620 | } | 617 | } |
621 | break; | 618 | break; |
622 | case 2: | 619 | case VideoFiles: |
623 | { | 620 | { |
624 | // videoView->clear(); | 621 | // videoView->clear(); |
625 | if(!videoPopulated) populateVideoView(); | 622 | if(!videoPopulated) populateVideoView(); |
@@ -630,7 +627,7 @@ void PlayListWidget::tabChanged(QWidget *) { | |||
630 | d->tbAddToList->setEnabled(TRUE); | 627 | d->tbAddToList->setEnabled(TRUE); |
631 | } | 628 | } |
632 | break; | 629 | break; |
633 | case 3: | 630 | case PlayLists: |
634 | { | 631 | { |
635 | if( tbDeletePlaylist->isHidden() ) { | 632 | if( tbDeletePlaylist->isHidden() ) { |
636 | tbDeletePlaylist->show(); | 633 | tbDeletePlaylist->show(); |
@@ -1133,17 +1130,13 @@ void PlayListWidget::skinsMenuActivated( int item ) { | |||
1133 | tr( "You must <b>restart</b> Opieplayer<br>to see your changes." ) ); | 1130 | tr( "You must <b>restart</b> Opieplayer<br>to see your changes." ) ); |
1134 | } | 1131 | } |
1135 | 1132 | ||
1136 | int PlayListWidget::whichList() const { | ||
1137 | return tabWidget->currentPageIndex(); | ||
1138 | } | ||
1139 | |||
1140 | PlayListWidget::TabType PlayListWidget::currentTab() const | 1133 | PlayListWidget::TabType PlayListWidget::currentTab() const |
1141 | { | 1134 | { |
1142 | static const TabType indexToTabType[ NumTabTypes ] = | 1135 | static const TabType indexToTabType[ TabTypeCount ] = |
1143 | { CurrentPlayList, AudioFiles, VideoFiles, PlayLists }; | 1136 | { CurrentPlayList, AudioFiles, VideoFiles, PlayLists }; |
1144 | 1137 | ||
1145 | int index = tabWidget->currentPageIndex(); | 1138 | int index = tabWidget->currentPageIndex(); |
1146 | assert( index < NumTabTypes && index >= 0 ); | 1139 | assert( index < TabTypeCount && index >= 0 ); |
1147 | 1140 | ||
1148 | return indexToTabType[ index ]; | 1141 | return indexToTabType[ index ]; |
1149 | } | 1142 | } |
diff --git a/noncore/multimedia/opieplayer2/playlistwidget.h b/noncore/multimedia/opieplayer2/playlistwidget.h index 238a75c..2e2ff89 100644 --- a/noncore/multimedia/opieplayer2/playlistwidget.h +++ b/noncore/multimedia/opieplayer2/playlistwidget.h | |||
@@ -55,7 +55,8 @@ class QLabel; | |||
55 | class PlayListWidget : public PlayListWidgetGui { | 55 | class PlayListWidget : public PlayListWidgetGui { |
56 | Q_OBJECT | 56 | Q_OBJECT |
57 | public: | 57 | public: |
58 | enum TabType { CurrentPlayList, AudioFiles, VideoFiles, PlayLists, NumTabTypes = 4 }; | 58 | enum TabType { CurrentPlayList, AudioFiles, VideoFiles, PlayLists }; |
59 | enum { TabTypeCount = 4 }; | ||
59 | 60 | ||
60 | PlayListWidget( QWidget* parent=0, const char* name=0, WFlags fl=0 ); | 61 | PlayListWidget( QWidget* parent=0, const char* name=0, WFlags fl=0 ); |
61 | ~PlayListWidget(); | 62 | ~PlayListWidget(); |
@@ -68,7 +69,6 @@ public: | |||
68 | const DocLnk *current(); | 69 | const DocLnk *current(); |
69 | void useSelectedDocument(); | 70 | void useSelectedDocument(); |
70 | int selected; | 71 | int selected; |
71 | int whichList() const; | ||
72 | TabType currentTab() const; | 72 | TabType currentTab() const; |
73 | 73 | ||
74 | public slots: | 74 | public slots: |