-rw-r--r-- | noncore/multimedia/opieplayer2/playlistwidget.cpp | 33 |
1 files changed, 5 insertions, 28 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 | |||
@@ -229,7 +229,7 @@ void PlayListWidget::viewPressed( int mouse, QListViewItem *, const QPoint& , in | |||
229 | case 2: | 229 | case 2: |
230 | { | 230 | { |
231 | QPopupMenu m; | 231 | QPopupMenu m; |
232 | m.insertItem( tr( "Play" ), this, SLOT( playSelected() )); | 232 | m.insertItem( tr( "Play Selected" ), this, SLOT( playSelected() )); |
233 | m.insertItem( tr( "Add to Playlist" ), this, SLOT( addSelected() )); | 233 | m.insertItem( tr( "Add to Playlist" ), this, SLOT( addSelected() )); |
234 | m.exec( QCursor::pos() ); | 234 | m.exec( QCursor::pos() ); |
235 | } | 235 | } |
@@ -245,7 +245,7 @@ void PlayListWidget::playlistViewPressed( int mouse, QListViewItem *, const QPoi | |||
245 | case 2: | 245 | case 2: |
246 | { | 246 | { |
247 | QPopupMenu m; | 247 | QPopupMenu m; |
248 | m.insertItem( tr( "Play Selected" ), this, SLOT( playSelected() )); | 248 | m.insertItem( tr( "Play" ), this, SLOT( playSelected() )); |
249 | m.insertItem( tr( "Remove" ), this, SLOT( removeSelected() )); | 249 | m.insertItem( tr( "Remove" ), this, SLOT( removeSelected() )); |
250 | m.exec( QCursor::pos() ); | 250 | m.exec( QCursor::pos() ); |
251 | } | 251 | } |
@@ -334,30 +334,6 @@ const DocLnk *PlayListWidget::current() { // this is fugly | |||
334 | } | 334 | } |
335 | } | 335 | } |
336 | break; | 336 | break; |
337 | case 1://audio | ||
338 | { | ||
339 | // qDebug("audioView"); | ||
340 | QListIterator<DocLnk> dit( files.children() ); | ||
341 | for ( ; dit.current(); ++dit ) { | ||
342 | if( dit.current()->name() == audioView->currentItem()->text( 0 ) && !insanityBool ) { | ||
343 | insanityBool = TRUE; | ||
344 | return dit; | ||
345 | } | ||
346 | } | ||
347 | } | ||
348 | break; | ||
349 | case 2: // video | ||
350 | { | ||
351 | // qDebug("videoView"); | ||
352 | QListIterator<DocLnk> Vdit( vFiles.children() ); | ||
353 | for ( ; Vdit.current(); ++Vdit ) { | ||
354 | if( Vdit.current()->name() == videoView->currentItem()->text( 0 ) && !insanityBool) { | ||
355 | insanityBool = TRUE; | ||
356 | return Vdit; | ||
357 | } | ||
358 | } | ||
359 | } | ||
360 | break; | ||
361 | }; | 337 | }; |
362 | return 0; | 338 | return 0; |
363 | } | 339 | } |
@@ -635,6 +611,7 @@ void PlayListWidget::tabChanged(QWidget *) { | |||
635 | 611 | ||
636 | 612 | ||
637 | void PlayListWidget::btnPlay(bool b) { | 613 | void PlayListWidget::btnPlay(bool b) { |
614 | // mediaPlayerState->setPlaying(false); | ||
638 | mediaPlayerState->setPlaying(b); | 615 | mediaPlayerState->setPlaying(b); |
639 | qApp->processEvents(); | 616 | qApp->processEvents(); |
640 | insanityBool=FALSE; | 617 | insanityBool=FALSE; |
@@ -1040,7 +1017,7 @@ void PlayListWidget::populateSkinsMenu() { | |||
1040 | QFileInfo *fi; | 1017 | QFileInfo *fi; |
1041 | while ( ( fi = it.current() ) ) { | 1018 | while ( ( fi = it.current() ) ) { |
1042 | skinName = fi->fileName(); | 1019 | skinName = fi->fileName(); |
1043 | qDebug( fi->fileName() ); | 1020 | // qDebug( fi->fileName() ); |
1044 | if( skinName != "." && skinName != ".." && skinName !="CVS" ) { | 1021 | if( skinName != "." && skinName != ".." && skinName !="CVS" ) { |
1045 | item = skinsMenu->insertItem( fi->fileName() ) ; | 1022 | item = skinsMenu->insertItem( fi->fileName() ) ; |
1046 | } | 1023 | } |
@@ -1055,7 +1032,7 @@ void PlayListWidget::populateSkinsMenu() { | |||
1055 | } | 1032 | } |
1056 | 1033 | ||
1057 | void PlayListWidget::skinsMenuActivated( int item ) { | 1034 | void PlayListWidget::skinsMenuActivated( int item ) { |
1058 | for( uint i = defaultSkinIndex; i > defaultSkinIndex - skinsMenu->count(); i-- ) { | 1035 | for( int i = defaultSkinIndex; i > defaultSkinIndex - skinsMenu->count(); i-- ) { |
1059 | skinsMenu->setItemChecked( i, FALSE ); | 1036 | skinsMenu->setItemChecked( i, FALSE ); |
1060 | } | 1037 | } |
1061 | skinsMenu->setItemChecked( item, TRUE ); | 1038 | skinsMenu->setItemChecked( item, TRUE ); |