author | llornkcor <llornkcor> | 2003-01-19 23:11:02 (UTC) |
---|---|---|
committer | llornkcor <llornkcor> | 2003-01-19 23:11:02 (UTC) |
commit | 512e600c777643230a032e89f7446b4099f54a86 (patch) (unidiff) | |
tree | 0a19e567b5acc6f44c5d5957fcaf097350f84a03 /core/multimedia | |
parent | 4e9ddbd0da3de7d0d03d7a39f05643dec07cc2cf (diff) | |
download | opie-512e600c777643230a032e89f7446b4099f54a86.zip opie-512e600c777643230a032e89f7446b4099f54a86.tar.gz opie-512e600c777643230a032e89f7446b4099f54a86.tar.bz2 |
partly fix playing from audio and video views
-rw-r--r-- | core/multimedia/opieplayer/playlistselection.cpp | 11 | ||||
-rw-r--r-- | core/multimedia/opieplayer/playlistwidget.cpp | 22 |
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 | |||
@@ -60,13 +60,14 @@ PlayListSelection::PlayListSelection( QWidget *parent, const char *name ) | |||
60 | // setBackgroundPixmap( Resource::loadPixmap( "launcher/opielogo" ) ); | 60 | // setBackgroundPixmap( Resource::loadPixmap( "launcher/opielogo" ) ); |
61 | // #endif | 61 | // #endif |
62 | // addColumn("Title",236); | 62 | // addColumn("Title",236); |
63 | // setAllColumnsShowFocus( TRUE ); | 63 | // setAllColumnsShowFocus( TRUE ); |
64 | addColumn( tr( "Playlist Selection" ) ); | 64 | addColumn( tr( "Playlist Selection" ) ); |
65 | header()->hide(); | 65 | header()->hide(); |
66 | setSorting( -1, FALSE ); | 66 | // setSorting( -1, FALSE ); |
67 | // FIXME | ||
67 | } | 68 | } |
68 | 69 | ||
69 | 70 | ||
70 | PlayListSelection::~PlayListSelection() { | 71 | PlayListSelection::~PlayListSelection() { |
71 | } | 72 | } |
72 | 73 | ||
@@ -101,17 +102,17 @@ const DocLnk *PlayListSelection::current() { | |||
101 | return NULL; | 102 | return NULL; |
102 | } | 103 | } |
103 | 104 | ||
104 | 105 | ||
105 | void PlayListSelection::addToSelection( const DocLnk &lnk ) { | 106 | 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 | } |
113 | 114 | ||
114 | 115 | ||
115 | void PlayListSelection::removeSelected() { | 116 | void PlayListSelection::removeSelected() { |
116 | QListViewItem *item = selectedItem(); | 117 | QListViewItem *item = selectedItem(); |
117 | if ( item ) | 118 | if ( item ) |
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 | |||
@@ -256,12 +256,13 @@ PlayListWidget::PlayListWidget( QWidget* parent, const char* name, WFlags fl ) | |||
256 | audioView->setColumnAlignment(1, Qt::AlignRight); | 256 | audioView->setColumnAlignment(1, Qt::AlignRight); |
257 | audioView->setColumnAlignment(2, Qt::AlignRight); | 257 | audioView->setColumnAlignment(2, Qt::AlignRight); |
258 | audioView->setAllColumnsShowFocus(TRUE); | 258 | audioView->setAllColumnsShowFocus(TRUE); |
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 | ||
265 | QPEApplication::setStylusOperation( audioView->viewport(),QPEApplication::RightOnHold); | 266 | QPEApplication::setStylusOperation( audioView->viewport(),QPEApplication::RightOnHold); |
266 | 267 | ||
267 | // audioView | 268 | // audioView |
@@ -297,25 +298,31 @@ PlayListWidget::PlayListWidget( QWidget* parent, const char* name, WFlags fl ) | |||
297 | connect( fullScreenButton, SIGNAL(activated()), mediaPlayerState, SLOT(toggleFullscreen()) ); | 298 | connect( fullScreenButton, SIGNAL(activated()), mediaPlayerState, SLOT(toggleFullscreen()) ); |
298 | connect( scaleButton, SIGNAL(activated()), mediaPlayerState, SLOT(toggleScaled()) ); | 299 | connect( scaleButton, SIGNAL(activated()), mediaPlayerState, SLOT(toggleScaled()) ); |
299 | 300 | ||
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 | ||
306 | connect( audioView, SIGNAL( returnPressed( QListViewItem *)), | 309 | connect( audioView, SIGNAL( returnPressed( QListViewItem *)), |
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 | ||
319 | connect( tabWidget, SIGNAL (currentChanged(QWidget*)),this,SLOT(tabChanged(QWidget*))); | 326 | connect( tabWidget, SIGNAL (currentChanged(QWidget*)),this,SLOT(tabChanged(QWidget*))); |
320 | 327 | ||
321 | // connect( mediaPlayerState, SIGNAL( playingToggled( bool ) ), d->tbPlay, SLOT( setOn( bool ) ) ); | 328 | // connect( mediaPlayerState, SIGNAL( playingToggled( bool ) ), d->tbPlay, SLOT( setOn( bool ) ) ); |
@@ -804,30 +811,31 @@ void PlayListWidget::btnPlay(bool b) { | |||
804 | // } | 811 | // } |
805 | } | 812 | } |
806 | break; | 813 | break; |
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; |
818 | case 2: | 826 | case 2: |
819 | { | 827 | { |
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; |
831 | }; | 839 | }; |
832 | 840 | ||
833 | } | 841 | } |