author | llornkcor <llornkcor> | 2002-09-05 00:30:37 (UTC) |
---|---|---|
committer | llornkcor <llornkcor> | 2002-09-05 00:30:37 (UTC) |
commit | fd3239820e471044bf279a2964702573572859d6 (patch) (side-by-side diff) | |
tree | e18b8ccd8cf76fced4395950c27563f2251017be /noncore/multimedia/opieplayer2 | |
parent | 3f2a74813b552c6f7a4450ec6294bbbcc5b811c5 (diff) | |
download | opie-fd3239820e471044bf279a2964702573572859d6.zip opie-fd3239820e471044bf279a2964702573572859d6.tar.gz opie-fd3239820e471044bf279a2964702573572859d6.tar.bz2 |
remove unneeded code
Diffstat (limited to 'noncore/multimedia/opieplayer2') (more/less context) (ignore whitespace changes)
-rw-r--r-- | noncore/multimedia/opieplayer2/playlistwidget.cpp | 133 |
1 files changed, 55 insertions, 78 deletions
diff --git a/noncore/multimedia/opieplayer2/playlistwidget.cpp b/noncore/multimedia/opieplayer2/playlistwidget.cpp index 15c70c3..2b58402 100644 --- a/noncore/multimedia/opieplayer2/playlistwidget.cpp +++ b/noncore/multimedia/opieplayer2/playlistwidget.cpp @@ -231,3 +231,3 @@ void PlayListWidget::viewPressed( int mouse, QListViewItem *, const QPoint& , in QPopupMenu m; - m.insertItem( tr( "Play" ), this, SLOT( playSelected() )); + m.insertItem( tr( "Play Selected" ), this, SLOT( playSelected() )); m.insertItem( tr( "Add to Playlist" ), this, SLOT( addSelected() )); @@ -247,3 +247,3 @@ void PlayListWidget::playlistViewPressed( int mouse, QListViewItem *, const QPoi QPopupMenu m; - m.insertItem( tr( "Play Selected" ), this, SLOT( playSelected() )); + m.insertItem( tr( "Play" ), this, SLOT( playSelected() )); m.insertItem( tr( "Remove" ), this, SLOT( removeSelected() )); @@ -324,38 +324,14 @@ const DocLnk *PlayListWidget::current() { // this is fugly switch ( whichList() ) { - case 0: //playlist - { + case 0: //playlist + { // qDebug("playlist"); - if ( mediaPlayerState->playlist() ) { - return d->selectedFiles->current(); - } else if ( d->setDocumentUsed && d->current ) { - return d->current; - } else { - return d->files->selected(); - } - } - break; - case 1://audio - { -// qDebug("audioView"); - QListIterator<DocLnk> dit( files.children() ); - for ( ; dit.current(); ++dit ) { - if( dit.current()->name() == audioView->currentItem()->text( 0 ) && !insanityBool ) { - insanityBool = TRUE; - return dit; - } - } - } - break; - case 2: // video - { -// qDebug("videoView"); - QListIterator<DocLnk> Vdit( vFiles.children() ); - for ( ; Vdit.current(); ++Vdit ) { - if( Vdit.current()->name() == videoView->currentItem()->text( 0 ) && !insanityBool) { - insanityBool = TRUE; - return Vdit; - } - } - } - break; + if ( mediaPlayerState->playlist() ) { + return d->selectedFiles->current(); + } else if ( d->setDocumentUsed && d->current ) { + return d->current; + } else { + return d->files->selected(); + } + } + break; }; @@ -498,43 +474,43 @@ void PlayListWidget::addSelected() { QString currentPlaylist = cfg.readEntry("CurrentPlaylist",""); - // int noOfFiles = cfg.readNumEntry("NumberOfFiles", 0 ); + // int noOfFiles = cfg.readNumEntry("NumberOfFiles", 0 ); switch (whichList()) { - case 0: //playlist - break; - case 1: { //audio - QListViewItemIterator it( audioView ); - // iterate through all items of the listview - for ( ; it.current(); ++it ) { - if ( it.current()->isSelected() ) { - QListIterator<DocLnk> dit( files.children() ); - for ( ; dit.current(); ++dit ) { - if( dit.current()->name() == it.current()->text(0) ) { - if(QFileInfo( dit.current()->file()).exists()) - d->selectedFiles->addToSelection( **dit ); - } - } - audioView->setSelected( it.current(),FALSE); - } - } - tabWidget->setCurrentPage(0); - } - break; - case 2: { // video - QListViewItemIterator it( videoView ); - // iterate through all items of the listview - for ( ; it.current(); ++it ) { - if ( it.current()->isSelected() ) { - QListIterator<DocLnk> dit( vFiles.children() ); - for ( ; dit.current(); ++dit ) { - if( dit.current()->name() == it.current()->text(0) ) { - if(QFileInfo( dit.current()->file()).exists()) - d->selectedFiles->addToSelection( **dit ); - } - } - videoView->setSelected( it.current(),FALSE); - } - } - tabWidget->setCurrentPage(0); - } - break; + case 0: //playlist + break; + case 1: { //audio + QListViewItemIterator it( audioView ); + // iterate through all items of the listview + for ( ; it.current(); ++it ) { + if ( it.current()->isSelected() ) { + QListIterator<DocLnk> dit( files.children() ); + for ( ; dit.current(); ++dit ) { + if( dit.current()->name() == it.current()->text(0) ) { + if(QFileInfo( dit.current()->file()).exists()) + d->selectedFiles->addToSelection( **dit ); + } + } + audioView->setSelected( it.current(),FALSE); + } + } + tabWidget->setCurrentPage(0); + } + break; + case 2: { // video + QListViewItemIterator it( videoView ); + // iterate through all items of the listview + for ( ; it.current(); ++it ) { + if ( it.current()->isSelected() ) { + QListIterator<DocLnk> dit( vFiles.children() ); + for ( ; dit.current(); ++dit ) { + if( dit.current()->name() == it.current()->text(0) ) { + if(QFileInfo( dit.current()->file()).exists()) + d->selectedFiles->addToSelection( **dit ); + } + } + videoView->setSelected( it.current(),FALSE); + } + } + tabWidget->setCurrentPage(0); + } + break; }; @@ -637,2 +613,3 @@ void PlayListWidget::tabChanged(QWidget *) { void PlayListWidget::btnPlay(bool b) { +// mediaPlayerState->setPlaying(false); mediaPlayerState->setPlaying(b); @@ -1042,3 +1019,3 @@ void PlayListWidget::populateSkinsMenu() { skinName = fi->fileName(); - qDebug( fi->fileName() ); +// qDebug( fi->fileName() ); if( skinName != "." && skinName != ".." && skinName !="CVS" ) { @@ -1057,3 +1034,3 @@ void PlayListWidget::populateSkinsMenu() { void PlayListWidget::skinsMenuActivated( int item ) { - for( uint i = defaultSkinIndex; i > defaultSkinIndex - skinsMenu->count(); i-- ) { + for( int i = defaultSkinIndex; i > defaultSkinIndex - skinsMenu->count(); i-- ) { skinsMenu->setItemChecked( i, FALSE ); |