summaryrefslogtreecommitdiff
Side-by-side diff
Diffstat (more/less context) (show whitespace changes)
-rw-r--r--noncore/multimedia/opieplayer2/playlistwidget.cpp33
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
case 2:
{
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() ));
m.exec( QCursor::pos() );
}
@@ -245,7 +245,7 @@ void PlayListWidget::playlistViewPressed( int mouse, QListViewItem *, const QPoi
case 2:
{
QPopupMenu m;
- m.insertItem( tr( "Play Selected" ), this, SLOT( playSelected() ));
+ m.insertItem( tr( "Play" ), this, SLOT( playSelected() ));
m.insertItem( tr( "Remove" ), this, SLOT( removeSelected() ));
m.exec( QCursor::pos() );
}
@@ -334,30 +334,6 @@ const DocLnk *PlayListWidget::current() { // this is fugly
}
}
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;
};
return 0;
}
@@ -635,6 +611,7 @@ void PlayListWidget::tabChanged(QWidget *) {
void PlayListWidget::btnPlay(bool b) {
+// mediaPlayerState->setPlaying(false);
mediaPlayerState->setPlaying(b);
qApp->processEvents();
insanityBool=FALSE;
@@ -1040,7 +1017,7 @@ void PlayListWidget::populateSkinsMenu() {
QFileInfo *fi;
while ( ( fi = it.current() ) ) {
skinName = fi->fileName();
- qDebug( fi->fileName() );
+// qDebug( fi->fileName() );
if( skinName != "." && skinName != ".." && skinName !="CVS" ) {
item = skinsMenu->insertItem( fi->fileName() ) ;
}
@@ -1055,7 +1032,7 @@ 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 );
}
skinsMenu->setItemChecked( item, TRUE );