summaryrefslogtreecommitdiff
Unidiff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--core/multimedia/opieplayer/playlistselection.cpp11
-rw-r--r--core/multimedia/opieplayer/playlistwidget.cpp22
2 files changed, 21 insertions, 12 deletions
diff --git a/core/multimedia/opieplayer/playlistselection.cpp b/core/multimedia/opieplayer/playlistselection.cpp
index 85228a9..67187f8 100644
--- a/core/multimedia/opieplayer/playlistselection.cpp
+++ b/core/multimedia/opieplayer/playlistselection.cpp
@@ -65,3 +65,4 @@ PlayListSelection::PlayListSelection( QWidget *parent, const char *name )
65 header()->hide(); 65 header()->hide();
66 setSorting( -1, FALSE ); 66// setSorting( -1, FALSE );
67 // FIXME
67} 68}
@@ -106,7 +107,7 @@ void PlayListSelection::addToSelection( const DocLnk &lnk ) {
106 PlayListSelectionItem *item = new PlayListSelectionItem( this, new DocLnk( lnk ) ); 107 PlayListSelectionItem *item = new PlayListSelectionItem( this, new DocLnk( lnk ) );
107 QListViewItem *current = selectedItem(); 108 QListViewItem *current = selectedItem();
108 if ( current ) 109 if ( current )
109 item->moveItem( current ); 110 item->moveItem( current );
110 setSelected( item, TRUE ); 111 setSelected( item, TRUE );
111 ensureItemVisible( selectedItem() ); 112 ensureItemVisible( item);
112} 113}
diff --git a/core/multimedia/opieplayer/playlistwidget.cpp b/core/multimedia/opieplayer/playlistwidget.cpp
index 395037f..19c8056 100644
--- a/core/multimedia/opieplayer/playlistwidget.cpp
+++ b/core/multimedia/opieplayer/playlistwidget.cpp
@@ -261,2 +261,3 @@ PlayListWidget::PlayListWidget( QWidget* parent, const char* name, WFlags fl )
261 audioView->setSelectionMode( QListView::Extended); 261 audioView->setSelectionMode( QListView::Extended);
262 audioView->setSorting( 3, TRUE );
262 263
@@ -302,2 +303,4 @@ PlayListWidget::PlayListWidget( QWidget* parent, const char* name, WFlags fl )
302 303
304
305///audioView
303 connect( audioView, SIGNAL( mouseButtonPressed( int, QListViewItem *, const QPoint&, int)), 306 connect( audioView, SIGNAL( mouseButtonPressed( int, QListViewItem *, const QPoint&, int)),
@@ -309,2 +312,4 @@ PlayListWidget::PlayListWidget( QWidget* parent, const char* name, WFlags fl )
309 312
313
314//videoView
310 connect( videoView, SIGNAL( mouseButtonPressed( int, QListViewItem *, const QPoint&, int)), 315 connect( videoView, SIGNAL( mouseButtonPressed( int, QListViewItem *, const QPoint&, int)),
@@ -315,2 +320,4 @@ PlayListWidget::PlayListWidget( QWidget* parent, const char* name, WFlags fl )
315 320
321
322//playlists
316 connect( playLists, SIGNAL( fileSelected( const DocLnk &) ), this, SLOT( loadList( const DocLnk & ) ) ); 323 connect( playLists, SIGNAL( fileSelected( const DocLnk &) ), this, SLOT( loadList( const DocLnk & ) ) );
@@ -809,7 +816,8 @@ void PlayListWidget::btnPlay(bool b) {
809 qDebug("2"); 816 qDebug("2");
817// d->selectedFiles->unSelect();
810 addToSelection( audioView->currentItem() ); 818 addToSelection( audioView->currentItem() );
811 mediaPlayerState->setPlaying(b); 819 mediaPlayerState->setPlaying(true);
812 d->selectedFiles->removeSelected( ); 820 d->selectedFiles->removeSelected( );
813 tabWidget->setCurrentPage(1); 821 d->selectedFiles->unSelect();
814 d->selectedFiles->unSelect(); 822 tabWidget->setCurrentPage(1);
815 insanityBool=FALSE; 823 insanityBool=FALSE;
@@ -822,7 +830,7 @@ void PlayListWidget::btnPlay(bool b) {
822 addToSelection( videoView->currentItem() ); 830 addToSelection( videoView->currentItem() );
823 mediaPlayerState->setPlaying(b); 831 mediaPlayerState->setPlaying(true);
824 qApp->processEvents(); 832// qApp->processEvents();
825 d->selectedFiles->removeSelected( ); 833 d->selectedFiles->removeSelected( );
826 tabWidget->setCurrentPage(2);
827 d->selectedFiles->unSelect(); 834 d->selectedFiles->unSelect();
835 tabWidget->setCurrentPage(2);
828 insanityBool=FALSE; 836 insanityBool=FALSE;