Diffstat (limited to 'core/multimedia/opieplayer/playlistwidget.cpp') (more/less context) (ignore whitespace changes)
-rw-r--r-- | core/multimedia/opieplayer/playlistwidget.cpp | 22 |
1 files changed, 15 insertions, 7 deletions
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 | |||
@@ -259,6 +259,7 @@ PlayListWidget::PlayListWidget( QWidget* parent, const char* name, WFlags fl ) | |||
259 | 259 | ||
260 | audioView->setMultiSelection( TRUE ); | 260 | audioView->setMultiSelection( TRUE ); |
261 | audioView->setSelectionMode( QListView::Extended); | 261 | audioView->setSelectionMode( QListView::Extended); |
262 | audioView->setSorting( 3, TRUE ); | ||
262 | 263 | ||
263 | tabWidget->insertTab(aTab,tr("Audio")); | 264 | tabWidget->insertTab(aTab,tr("Audio")); |
264 | 265 | ||
@@ -300,6 +301,8 @@ PlayListWidget::PlayListWidget( QWidget* parent, const char* name, WFlags fl ) | |||
300 | connect( d->selectedFiles, SIGNAL( mouseButtonPressed( int, QListViewItem *, const QPoint&, int)), | 301 | connect( d->selectedFiles, SIGNAL( mouseButtonPressed( int, QListViewItem *, const QPoint&, int)), |
301 | this,SLOT( playlistViewPressed(int, QListViewItem *, const QPoint&, int)) ); | 302 | this,SLOT( playlistViewPressed(int, QListViewItem *, const QPoint&, int)) ); |
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)), |
304 | this,SLOT( viewPressed(int, QListViewItem *, const QPoint&, int)) ); | 307 | this,SLOT( viewPressed(int, QListViewItem *, const QPoint&, int)) ); |
305 | 308 | ||
@@ -307,12 +310,16 @@ PlayListWidget::PlayListWidget( QWidget* parent, const char* name, WFlags fl ) | |||
307 | this,SLOT( playIt( QListViewItem *)) ); | 310 | this,SLOT( playIt( QListViewItem *)) ); |
308 | connect( audioView, SIGNAL( doubleClicked( QListViewItem *) ), this, SLOT( addToSelection( QListViewItem *) ) ); | 311 | connect( audioView, SIGNAL( doubleClicked( QListViewItem *) ), this, SLOT( addToSelection( QListViewItem *) ) ); |
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)), |
311 | this,SLOT( viewPressed(int, QListViewItem *, const QPoint&, int)) ); | 316 | this,SLOT( viewPressed(int, QListViewItem *, const QPoint&, int)) ); |
312 | connect( videoView, SIGNAL( returnPressed( QListViewItem *)), | 317 | connect( videoView, SIGNAL( returnPressed( QListViewItem *)), |
313 | this,SLOT( playIt( QListViewItem *)) ); | 318 | this,SLOT( playIt( QListViewItem *)) ); |
314 | connect( videoView, SIGNAL( doubleClicked( QListViewItem *) ), this, SLOT( addToSelection( QListViewItem *) ) ); | 319 | connect( videoView, SIGNAL( doubleClicked( QListViewItem *) ), this, SLOT( addToSelection( QListViewItem *) ) ); |
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 & ) ) ); |
317 | 324 | ||
318 | 325 | ||
@@ -807,11 +814,12 @@ void PlayListWidget::btnPlay(bool b) { | |||
807 | case 1: | 814 | case 1: |
808 | { | 815 | { |
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; |
816 | }// audioView->clearSelection(); | 824 | }// audioView->clearSelection(); |
817 | break; | 825 | break; |
@@ -820,11 +828,11 @@ void PlayListWidget::btnPlay(bool b) { | |||
820 | qDebug("3"); | 828 | qDebug("3"); |
821 | 829 | ||
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; |
829 | }// videoView->clearSelection(); | 837 | }// videoView->clearSelection(); |
830 | break; | 838 | break; |