summaryrefslogtreecommitdiff
authorsimon <simon>2002-12-02 15:11:50 (UTC)
committer simon <simon>2002-12-02 15:11:50 (UTC)
commit9f770813346acbe7817b20c5fe0fea03827fc41a (patch) (side-by-side diff)
tree271e8091f19e5701576fa5f1503cca08f955a7b0
parent5380767372ecf3ab22f799abda32f414b0cc7ede (diff)
downloadopie-9f770813346acbe7817b20c5fe0fea03827fc41a.zip
opie-9f770813346acbe7817b20c5fe0fea03827fc41a.tar.gz
opie-9f770813346acbe7817b20c5fe0fea03827fc41a.tar.bz2
- removed whichList() alltogether
Diffstat (more/less context) (show whitespace changes)
-rw-r--r--noncore/multimedia/opieplayer2/playlistwidget.cpp23
-rw-r--r--noncore/multimedia/opieplayer2/playlistwidget.h4
2 files changed, 10 insertions, 17 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
@@ -565,81 +565,78 @@ void PlayListWidget::removeSelected() {
void PlayListWidget::playIt( QListViewItem *it) {
if(!it) return;
mediaPlayerState->setPlaying(FALSE);
mediaPlayerState->setPlaying(TRUE);
d->selectedFiles->unSelect();
}
void PlayListWidget::addToSelection( QListViewItem *it) {
d->setDocumentUsed = FALSE;
if(it) {
- switch ( whichList()) {
- case 0: //playlist
+ if ( currentTab() == CurrentPlayList )
return;
- break;
- };
// case 1: {
DocLnk lnk;
QString filename;
filename=it->text(3);
lnk.setName( QFileInfo(filename).baseName() ); //sets name
lnk.setFile( filename ); //sets file name
d->selectedFiles->addToSelection( lnk);
writeCurrentM3u();
tabWidget->setCurrentPage(0);
}
}
void PlayListWidget::tabChanged(QWidget *) {
- switch ( whichList()) {
- case 0:
+ switch ( currentTab() ) {
+ case CurrentPlayList:
{
if( !tbDeletePlaylist->isHidden() ) {
tbDeletePlaylist->hide();
}
d->tbRemoveFromList->setEnabled(TRUE);
d->tbAddToList->setEnabled(FALSE);
}
break;
- case 1:
+ case AudioFiles:
{
// audioView->clear();
if(!audioPopulated) populateAudioView();
if( !tbDeletePlaylist->isHidden() ) {
tbDeletePlaylist->hide();
}
d->tbRemoveFromList->setEnabled(FALSE);
d->tbAddToList->setEnabled(TRUE);
}
break;
- case 2:
+ case VideoFiles:
{
// videoView->clear();
if(!videoPopulated) populateVideoView();
if( !tbDeletePlaylist->isHidden() ) {
tbDeletePlaylist->hide();
}
d->tbRemoveFromList->setEnabled(FALSE);
d->tbAddToList->setEnabled(TRUE);
}
break;
- case 3:
+ case PlayLists:
{
if( tbDeletePlaylist->isHidden() ) {
tbDeletePlaylist->show();
}
playLists->reread();
d->tbAddToList->setEnabled(FALSE);
}
break;
};
}
@@ -1124,30 +1121,26 @@ void PlayListWidget::skinsMenuActivated( int item ) {
for(unsigned int i = defaultSkinIndex; i > defaultSkinIndex - skinsMenu->count(); i-- ) {
skinsMenu->setItemChecked( i, FALSE );
}
skinsMenu->setItemChecked( item, TRUE );
Config cfg( "OpiePlayer" );
cfg.setGroup("Options");
cfg.writeEntry("Skin", skinsMenu->text( item ) );
QMessageBox::warning( this, tr( "OpiePlayer" ),
tr( "You must <b>restart</b> Opieplayer<br>to see your changes." ) );
}
-int PlayListWidget::whichList() const {
- return tabWidget->currentPageIndex();
-}
-
PlayListWidget::TabType PlayListWidget::currentTab() const
{
- static const TabType indexToTabType[ NumTabTypes ] =
+ static const TabType indexToTabType[ TabTypeCount ] =
{ CurrentPlayList, AudioFiles, VideoFiles, PlayLists };
int index = tabWidget->currentPageIndex();
- assert( index < NumTabTypes && index >= 0 );
+ assert( index < TabTypeCount && index >= 0 );
return indexToTabType[ index ];
}
QString PlayListWidget::currentFileListPathName() const {
return currentFileListView()->currentItem()->text( 3 );
}
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
@@ -46,38 +46,38 @@
//class PlayListWidgetPrivate;
class Config;
class QListViewItem;
class QListView;
class QPoint;
class QAction;
class QLabel;
class PlayListWidget : public PlayListWidgetGui {
Q_OBJECT
public:
- enum TabType { CurrentPlayList, AudioFiles, VideoFiles, PlayLists, NumTabTypes = 4 };
+ enum TabType { CurrentPlayList, AudioFiles, VideoFiles, PlayLists };
+ enum { TabTypeCount = 4 };
PlayListWidget( QWidget* parent=0, const char* name=0, WFlags fl=0 );
~PlayListWidget();
DocLnkSet files;
DocLnkSet vFiles;
bool fromSetDocument;
bool insanityBool;
QString setDocFileRef, currentPlayList;
// retrieve the current playlist entry (media file link)
const DocLnk *current();
void useSelectedDocument();
int selected;
- int whichList() const;
TabType currentTab() const;
public slots:
bool first();
bool last();
bool next();
bool prev();
void writeDefaultPlaylist( );
QString currentFileListPathName() const;
protected:
void keyReleaseEvent( QKeyEvent *e);