Diffstat (limited to 'core/multimedia/opieplayer/playlistwidget.cpp') (more/less context) (show whitespace changes)
-rw-r--r-- | core/multimedia/opieplayer/playlistwidget.cpp | 180 |
1 files changed, 105 insertions, 75 deletions
diff --git a/core/multimedia/opieplayer/playlistwidget.cpp b/core/multimedia/opieplayer/playlistwidget.cpp index 9969526..524747e 100644 --- a/core/multimedia/opieplayer/playlistwidget.cpp +++ b/core/multimedia/opieplayer/playlistwidget.cpp | |||
@@ -106,4 +106,5 @@ PlayListWidget::PlayListWidget( QWidget* parent, const char* name, WFlags fl ) | |||
106 | d->setDocumentUsed = FALSE; | 106 | d->setDocumentUsed = FALSE; |
107 | d->current = NULL; | 107 | d->current = NULL; |
108 | fromSetDocument = FALSE; | ||
108 | // menuTimer = new QTimer( this ,"menu timer"), | 109 | // menuTimer = new QTimer( this ,"menu timer"), |
109 | // connect( menuTimer, SIGNAL( timeout() ), SLOT( addSelected() ) ); | 110 | // connect( menuTimer, SIGNAL( timeout() ), SLOT( addSelected() ) ); |
@@ -175,8 +176,9 @@ PlayListWidget::PlayListWidget( QWidget* parent, const char* name, WFlags fl ) | |||
175 | QWidget *pTab; | 176 | QWidget *pTab; |
176 | pTab = new QWidget( tabWidget, "pTab" ); | 177 | pTab = new QWidget( tabWidget, "pTab" ); |
177 | playlistView = new QListView( pTab, "Videoview" ); | 178 | // playlistView = new QListView( pTab, "playlistview" ); |
178 | playlistView->setMinimumSize(236,260); | 179 | // playlistView->setMinimumSize(236,260); |
179 | tabWidget->insertTab( pTab,"Playlist"); | 180 | tabWidget->insertTab( pTab,"Playlist"); |
180 | 181 | ||
182 | |||
181 | // Add the playlist area | 183 | // Add the playlist area |
182 | 184 | ||
@@ -190,4 +192,9 @@ PlayListWidget::PlayListWidget( QWidget* parent, const char* name, WFlags fl ) | |||
190 | QVBox *vbox1 = new QVBox( hbox2 ); vbox1->setBackgroundMode( PaletteButton ); | 192 | QVBox *vbox1 = new QVBox( hbox2 ); vbox1->setBackgroundMode( PaletteButton ); |
191 | 193 | ||
194 | QPEApplication::setStylusOperation( d->selectedFiles->viewport(),QPEApplication::RightOnHold); | ||
195 | connect( d->selectedFiles, SIGNAL( mouseButtonPressed( int, QListViewItem *, const QPoint&, int)), | ||
196 | this,SLOT( playlistViewPressed(int, QListViewItem *, const QPoint&, int)) ); | ||
197 | |||
198 | |||
192 | QVBox *stretch1 = new QVBox( vbox1 ); stretch1->setBackgroundMode( PaletteButton ); // add stretch | 199 | QVBox *stretch1 = new QVBox( vbox1 ); stretch1->setBackgroundMode( PaletteButton ); // add stretch |
193 | new ToolButton( vbox1, tr( "Move Up" ), "mpegplayer/up", d->selectedFiles, SLOT(moveSelectedUp()) ); | 200 | new ToolButton( vbox1, tr( "Move Up" ), "mpegplayer/up", d->selectedFiles, SLOT(moveSelectedUp()) ); |
@@ -205,5 +212,12 @@ PlayListWidget::PlayListWidget( QWidget* parent, const char* name, WFlags fl ) | |||
205 | audioView->setColumnAlignment(1, Qt::AlignRight); | 212 | audioView->setColumnAlignment(1, Qt::AlignRight); |
206 | audioView->setColumnAlignment(2, Qt::AlignRight); | 213 | audioView->setColumnAlignment(2, Qt::AlignRight); |
214 | audioView->setAllColumnsShowFocus(TRUE); | ||
207 | tabWidget->insertTab(aTab,"Audio"); | 215 | tabWidget->insertTab(aTab,"Audio"); |
216 | |||
217 | QPEApplication::setStylusOperation( audioView->viewport(),QPEApplication::RightOnHold); | ||
218 | connect( audioView, SIGNAL( mouseButtonPressed( int, QListViewItem *, const QPoint&, int)), | ||
219 | this,SLOT( viewPressed(int, QListViewItem *, const QPoint&, int)) ); | ||
220 | |||
221 | |||
208 | // audioView | 222 | // audioView |
209 | Global::findDocuments(&files, "audio/*"); | 223 | Global::findDocuments(&files, "audio/*"); |
@@ -233,4 +247,8 @@ PlayListWidget::PlayListWidget( QWidget* parent, const char* name, WFlags fl ) | |||
233 | videoView->setColumnAlignment(1, Qt::AlignRight); | 247 | videoView->setColumnAlignment(1, Qt::AlignRight); |
234 | videoView->setColumnAlignment(2, Qt::AlignRight); | 248 | videoView->setColumnAlignment(2, Qt::AlignRight); |
249 | videoView->setAllColumnsShowFocus(TRUE); | ||
250 | QPEApplication::setStylusOperation( videoView->viewport(),QPEApplication::RightOnHold); | ||
251 | connect( videoView, SIGNAL( mouseButtonPressed( int, QListViewItem *, const QPoint&, int)), | ||
252 | this,SLOT( viewPressed(int, QListViewItem *, const QPoint&, int)) ); | ||
235 | 253 | ||
236 | tabWidget->insertTab( vTab,"Video"); | 254 | tabWidget->insertTab( vTab,"Video"); |
@@ -262,6 +280,4 @@ PlayListWidget::PlayListWidget( QWidget* parent, const char* name, WFlags fl ) | |||
262 | 280 | ||
263 | // add the library area | 281 | // add the library area |
264 | QPEApplication::setStylusOperation( this, QPEApplication::RightOnHold ); | ||
265 | |||
266 | 282 | ||
267 | // connect( audioView, SIGNAL( rightButtonClicked( QListViewItem *, const QPoint &, int)), | 283 | // connect( audioView, SIGNAL( rightButtonClicked( QListViewItem *, const QPoint &, int)), |
@@ -420,23 +436,24 @@ void PlayListWidget::addAllVideoToList() { | |||
420 | 436 | ||
421 | void PlayListWidget::setDocument(const QString& fileref) { | 437 | void PlayListWidget::setDocument(const QString& fileref) { |
438 | fromSetDocument = TRUE; | ||
422 | if ( fileref.isNull() ) { | 439 | if ( fileref.isNull() ) { |
423 | QMessageBox::critical( 0, tr( "Invalid File" ), tr( "There was a problem in getting the file." ) ); | 440 | QMessageBox::critical( 0, tr( "Invalid File" ), tr( "There was a problem in getting the file." ) ); |
424 | return; | 441 | return; |
425 | } | 442 | } |
426 | // qDebug("setDocument"); | 443 | // qDebug("setDocument "+fileref); |
427 | if(fileref.find("playlist",0,TRUE) == -1) { | 444 | if(fileref.find("playlist",0,TRUE) == -1) { |
445 | clearList(); | ||
428 | addToSelection( DocLnk( fileref ) ); | 446 | addToSelection( DocLnk( fileref ) ); |
429 | d->setDocumentUsed = TRUE; | 447 | d->setDocumentUsed = TRUE; |
430 | qApp->processEvents(); | ||
431 | mediaPlayerState->setPlaying( FALSE ); | 448 | mediaPlayerState->setPlaying( FALSE ); |
432 | qApp->processEvents(); | 449 | qApp->processEvents(); |
433 | mediaPlayerState->setPlaying( TRUE ); | 450 | mediaPlayerState->setPlaying( TRUE ); |
434 | d->selectedFiles->removeSelected( ); | 451 | qApp->processEvents(); |
435 | } else { | 452 | setCaption("OpiePlayer"); |
453 | |||
454 | } else { //is playlist | ||
455 | clearList(); | ||
436 | loadList(DocLnk(fileref)); | 456 | loadList(DocLnk(fileref)); |
437 | d->selectedFiles->first(); | 457 | d->selectedFiles->first(); |
438 | // mediaPlayerState->setPlaying( TRUE ); | ||
439 | // mediaPlayerState->setPlaying( FALSE ); | ||
440 | |||
441 | } | 458 | } |
442 | } | 459 | } |
@@ -456,7 +473,21 @@ void PlayListWidget::useSelectedDocument() { | |||
456 | 473 | ||
457 | 474 | ||
458 | const DocLnk *PlayListWidget::current() { | 475 | const DocLnk *PlayListWidget::current() { // this is fugly |
459 | 476 | ||
460 | // qDebug("in Playlist widget ::current"); | 477 | // if( fromSetDocument) { |
478 | // qDebug("from setDoc"); | ||
479 | // DocLnkSet files; | ||
480 | // Global::findDocuments(&files, "video/*;audio/*"); | ||
481 | // QListIterator<DocLnk> dit( files.children() ); | ||
482 | // for ( ; dit.current(); ++dit ) { | ||
483 | // if(dit.current()->linkFile() == setDocFileRef) { | ||
484 | // qDebug(setDocFileRef); | ||
485 | // return dit; | ||
486 | // } | ||
487 | // } | ||
488 | // } else | ||
489 | switch (tabWidget->currentPageIndex()) { | ||
490 | case 0: //playlist | ||
491 | { | ||
461 | if ( mediaPlayerState->playlist() ) { | 492 | if ( mediaPlayerState->playlist() ) { |
462 | return d->selectedFiles->current(); | 493 | return d->selectedFiles->current(); |
@@ -468,5 +499,25 @@ const DocLnk *PlayListWidget::current() { | |||
468 | } | 499 | } |
469 | } | 500 | } |
470 | 501 | break; | |
502 | case 1: { //audio | ||
503 | Global::findDocuments(&files, "audio/*"); | ||
504 | QListIterator<DocLnk> dit( files.children() ); | ||
505 | for ( ; dit.current(); ++dit ) { | ||
506 | if( dit.current()->name() == audioView->currentItem()->text(0)) | ||
507 | return dit; | ||
508 | } | ||
509 | } | ||
510 | break; | ||
511 | case 2: { // video | ||
512 | Global::findDocuments(&vFiles, "video/*"); | ||
513 | QListIterator<DocLnk> Vdit( vFiles.children() ); | ||
514 | for ( ; Vdit.current(); ++Vdit ) { | ||
515 | if( Vdit.current()->name() == videoView->currentItem()->text(0)) | ||
516 | return Vdit; | ||
517 | } | ||
518 | } | ||
519 | break; | ||
520 | }; | ||
521 | } | ||
471 | 522 | ||
472 | bool PlayListWidget::prev() { | 523 | bool PlayListWidget::prev() { |
@@ -570,8 +621,6 @@ void PlayListWidget::saveList() { | |||
570 | if(fileDlg) | 621 | if(fileDlg) |
571 | delete fileDlg; | 622 | delete fileDlg; |
572 | |||
573 | } | 623 | } |
574 | 624 | ||
575 | |||
576 | void PlayListWidget::loadList( const DocLnk & lnk) { | 625 | void PlayListWidget::loadList( const DocLnk & lnk) { |
577 | QString name= lnk.name(); | 626 | QString name= lnk.name(); |
@@ -590,5 +639,4 @@ void PlayListWidget::loadList( const DocLnk & lnk) { | |||
590 | } | 639 | } |
591 | 640 | ||
592 | |||
593 | void PlayListWidget::setPlaylist( bool shown ) { | 641 | void PlayListWidget::setPlaylist( bool shown ) { |
594 | if ( shown ) | 642 | if ( shown ) |
@@ -598,5 +646,4 @@ void PlayListWidget::setPlaylist( bool shown ) { | |||
598 | } | 646 | } |
599 | 647 | ||
600 | |||
601 | void PlayListWidget::setView( char view ) { | 648 | void PlayListWidget::setView( char view ) { |
602 | if ( view == 'l' ) | 649 | if ( view == 'l' ) |
@@ -705,62 +752,38 @@ void PlayListWidget::tabChanged(QWidget *widg) { | |||
705 | } | 752 | } |
706 | 753 | ||
707 | /* | ||
708 | list is right clicked*/ | ||
709 | void PlayListWidget::fauxPlay(QListViewItem *it) { | ||
710 | 754 | ||
711 | switch (tabWidget->currentPageIndex()) { | 755 | /* |
712 | case 0: //playlist | 756 | play button is pressed*/ |
713 | break; | 757 | void PlayListWidget::btnPlay(bool b) { |
714 | case 1: { //audio | 758 | mediaPlayerState->setPlaying(b); |
715 | QListIterator<DocLnk> dit( files.children() ); | ||
716 | for ( ; dit.current(); ++dit ) { | ||
717 | // qDebug(dit.current()->name()); | ||
718 | if( dit.current()->name() == it->text(0)) { | ||
719 | d->selectedFiles->addToSelection( **dit ); | ||
720 | } | ||
721 | } | ||
722 | } | 759 | } |
760 | |||
761 | void PlayListWidget::deletePlaylist() { | ||
762 | switch( QMessageBox::information( this, (tr("Remove Playlist?")), | ||
763 | (tr("You really want to delete\nthis playlist?")), | ||
764 | (tr("Yes")), (tr("No")), 0 )){ | ||
765 | case 0: // Yes clicked, | ||
766 | QFile().remove(playLists->selected()->file()); | ||
767 | QFile().remove(playLists->selected()->linkFile()); | ||
768 | playLists->reread(); | ||
723 | break; | 769 | break; |
724 | case 2: { // video | 770 | case 1: // Cancel |
725 | QListIterator<DocLnk> dit( vFiles.children() ); | ||
726 | for ( ; dit.current(); ++dit ) { | ||
727 | // qDebug(dit.current()->name()); | ||
728 | if( dit.current()->name() == it->text(0)) { | ||
729 | d->selectedFiles->addToSelection( **dit ); | ||
730 | } | ||
731 | } | ||
732 | } | ||
733 | break; | 771 | break; |
734 | }; | 772 | }; |
735 | mediaPlayerState->setPlaying( TRUE ); | 773 | |
736 | // tabWidget->setCurrentPage(0); | ||
737 | d->selectedFiles->removeSelected(); | ||
738 | } | 774 | } |
739 | 775 | ||
740 | /* | 776 | void PlayListWidget::viewPressed( int mouse, QListViewItem *item, const QPoint& point, int i) |
741 | play button is pressed*/ | ||
742 | void PlayListWidget::btnPlay(bool b) { // this is fugly | ||
743 | switch ( tabWidget->currentPageIndex()) { | ||
744 | case 0: | ||
745 | { | 777 | { |
746 | mediaPlayerState->setPlaying(b); | 778 | switch (mouse) { |
747 | } | ||
748 | break; | ||
749 | case 1: | 779 | case 1: |
750 | { | ||
751 | addToSelection( audioView->selectedItem() ); | ||
752 | mediaPlayerState->setPlaying(b); | ||
753 | qApp->processEvents(); | ||
754 | d->selectedFiles->removeSelected( ); | ||
755 | tabWidget->setCurrentPage(1); | ||
756 | } | ||
757 | break; | 780 | break; |
758 | case 2: | 781 | case 2:{ |
759 | { | 782 | QPopupMenu m; |
760 | addToSelection( videoView->selectedItem() ); | 783 | m.insertItem( tr( "Play" ), this, SLOT( playSelected() )); |
761 | mediaPlayerState->setPlaying(b); | 784 | m.insertItem( tr( "Add to Playlist" ), this, SLOT( addSelected() )); |
762 | qApp->processEvents(); | 785 | // m.insertSeparator(); |
763 | d->selectedFiles->removeSelected( ); | 786 | // m.insertItem( tr( "Delete" ), this, SLOT( remoteDelete() )); |
764 | tabWidget->setCurrentPage(2); | 787 | m.exec( QCursor::pos() ); |
765 | } | 788 | } |
766 | break; | 789 | break; |
@@ -769,14 +792,21 @@ void PlayListWidget::btnPlay(bool b) { // this is fugly | |||
769 | } | 792 | } |
770 | 793 | ||
771 | void PlayListWidget::deletePlaylist() { | 794 | void PlayListWidget::playSelected() |
772 | switch( QMessageBox::information( this, (tr("Remove Playlist?")), | 795 | { |
773 | (tr("You really want to delete\nthis playlist?")), | 796 | btnPlay( TRUE); |
774 | (tr("Yes")), (tr("No")), 0 )){ | 797 | } |
775 | case 0: // Yes clicked, | 798 | |
776 | QFile().remove(playLists->selected()->file()); | 799 | void PlayListWidget::playlistViewPressed( int mouse, QListViewItem *item, const QPoint& point, int i) |
777 | QFile().remove(playLists->selected()->linkFile()); | 800 | { |
778 | playLists->reread(); | 801 | switch (mouse) { |
802 | case 1: | ||
779 | break; | 803 | break; |
780 | case 1: // Cancel | 804 | case 2:{ |
805 | QPopupMenu m; | ||
806 | m.insertItem( tr( "Play Selected" ), this, SLOT( playSelected() )); | ||
807 | m.insertItem( tr( "Remove" ), this, SLOT( removeSelected() )); | ||
808 | // m.insertSeparator(); | ||
809 | m.exec( QCursor::pos() ); | ||
810 | } | ||
781 | break; | 811 | break; |
782 | }; | 812 | }; |