Diffstat (limited to 'core/multimedia/opieplayer/playlistwidget.cpp') (more/less context) (ignore whitespace changes)
-rw-r--r-- | core/multimedia/opieplayer/playlistwidget.cpp | 173 |
1 files changed, 124 insertions, 49 deletions
diff --git a/core/multimedia/opieplayer/playlistwidget.cpp b/core/multimedia/opieplayer/playlistwidget.cpp index 524747e..cf665c8 100644 --- a/core/multimedia/opieplayer/playlistwidget.cpp +++ b/core/multimedia/opieplayer/playlistwidget.cpp | |||
@@ -106,6 +106,7 @@ 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 | fromSetDocument = FALSE; |
109 | insanityBool=FALSE; | ||
109 | // menuTimer = new QTimer( this ,"menu timer"), | 110 | // menuTimer = new QTimer( this ,"menu timer"), |
110 | // connect( menuTimer, SIGNAL( timeout() ), SLOT( addSelected() ) ); | 111 | // connect( menuTimer, SIGNAL( timeout() ), SLOT( addSelected() ) ); |
111 | 112 | ||
@@ -206,9 +207,9 @@ PlayListWidget::PlayListWidget( QWidget* parent, const char* name, WFlags fl ) | |||
206 | aTab = new QWidget( tabWidget, "aTab" ); | 207 | aTab = new QWidget( tabWidget, "aTab" ); |
207 | audioView = new QListView( aTab, "Audioview" ); | 208 | audioView = new QListView( aTab, "Audioview" ); |
208 | audioView->setMinimumSize(233,260); | 209 | audioView->setMinimumSize(233,260); |
209 | audioView->addColumn( "Title",150); | 210 | audioView->addColumn( "Title",140); |
210 | audioView->addColumn("Size", 45); | 211 | audioView->addColumn("Size", -1); |
211 | audioView->addColumn("Media",35); | 212 | audioView->addColumn("Media",-1); |
212 | audioView->setColumnAlignment(1, Qt::AlignRight); | 213 | audioView->setColumnAlignment(1, Qt::AlignRight); |
213 | audioView->setColumnAlignment(2, Qt::AlignRight); | 214 | audioView->setColumnAlignment(2, Qt::AlignRight); |
214 | audioView->setAllColumnsShowFocus(TRUE); | 215 | audioView->setAllColumnsShowFocus(TRUE); |
@@ -241,9 +242,9 @@ PlayListWidget::PlayListWidget( QWidget* parent, const char* name, WFlags fl ) | |||
241 | videoView = new QListView( vTab, "Videoview" ); | 242 | videoView = new QListView( vTab, "Videoview" ); |
242 | videoView->setMinimumSize(233,260); | 243 | videoView->setMinimumSize(233,260); |
243 | 244 | ||
244 | videoView->addColumn("Title",150); | 245 | videoView->addColumn("Title",140); |
245 | videoView->addColumn("Size",45); | 246 | videoView->addColumn("Size",-1); |
246 | videoView->addColumn("Media",35); | 247 | videoView->addColumn("Media",-1); |
247 | videoView->setColumnAlignment(1, Qt::AlignRight); | 248 | videoView->setColumnAlignment(1, Qt::AlignRight); |
248 | videoView->setColumnAlignment(2, Qt::AlignRight); | 249 | videoView->setColumnAlignment(2, Qt::AlignRight); |
249 | videoView->setAllColumnsShowFocus(TRUE); | 250 | videoView->setAllColumnsShowFocus(TRUE); |
@@ -486,38 +487,50 @@ const DocLnk *PlayListWidget::current() { // this is fugly | |||
486 | // } | 487 | // } |
487 | // } | 488 | // } |
488 | // } else | 489 | // } else |
489 | switch (tabWidget->currentPageIndex()) { | 490 | // qDebug("current"); |
490 | case 0: //playlist | 491 | // switch (tabWidget->currentPageIndex()) { |
491 | { | 492 | // case 0: //playlist |
492 | if ( mediaPlayerState->playlist() ) { | 493 | // { |
493 | return d->selectedFiles->current(); | 494 | qDebug("playlist"); |
494 | } | 495 | if ( mediaPlayerState->playlist() ) { |
495 | else if ( d->setDocumentUsed && d->current ) { | 496 | return d->selectedFiles->current(); |
496 | return d->current; | ||
497 | } else { | ||
498 | return d->files->selected(); | ||
499 | } | ||
500 | } | 497 | } |
501 | break; | 498 | else if ( d->setDocumentUsed && d->current ) { |
502 | case 1: { //audio | 499 | return d->current; |
503 | Global::findDocuments(&files, "audio/*"); | 500 | } else { |
504 | QListIterator<DocLnk> dit( files.children() ); | 501 | return d->files->selected(); |
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 | } | 502 | } |
519 | break; | 503 | // } |
520 | }; | 504 | // break; |
505 | // case 1://audio | ||
506 | // { | ||
507 | // qDebug("audioView"); | ||
508 | // Global::findDocuments(&files, "audio/*"); | ||
509 | // QListIterator<DocLnk> dit( files.children() ); | ||
510 | // for ( ; dit.current(); ++dit ) { | ||
511 | // if( dit.current()->name() == audioView->currentItem()->text(0) && !insanityBool) { | ||
512 | // qDebug("here"); | ||
513 | // insanityBool=TRUE; | ||
514 | // return dit; | ||
515 | // } | ||
516 | // } | ||
517 | // } | ||
518 | // break; | ||
519 | // case 2: // video | ||
520 | // { | ||
521 | // qDebug("videoView"); | ||
522 | // Global::findDocuments(&vFiles, "video/*"); | ||
523 | // QListIterator<DocLnk> Vdit( vFiles.children() ); | ||
524 | // for ( ; Vdit.current(); ++Vdit ) { | ||
525 | // if( Vdit.current()->name() == videoView->currentItem()->text(0) && !insanityBool) { | ||
526 | // insanityBool=TRUE; | ||
527 | // return Vdit; | ||
528 | // } | ||
529 | // } | ||
530 | // } | ||
531 | // break; | ||
532 | // }; | ||
533 | // return 0; | ||
521 | } | 534 | } |
522 | 535 | ||
523 | bool PlayListWidget::prev() { | 536 | bool PlayListWidget::prev() { |
@@ -654,18 +667,49 @@ void PlayListWidget::setView( char view ) { | |||
654 | 667 | ||
655 | void PlayListWidget::addSelected() { | 668 | void PlayListWidget::addSelected() { |
656 | 669 | ||
657 | switch (tabWidget->currentPageIndex()) { | 670 | Config cfg( "MediaPlayer" ); |
658 | case 0: //playlist | 671 | cfg.setGroup("PlayList"); |
659 | break; | 672 | QString currentPlaylist = cfg.readEntry("CurrentPlaylist",""); |
660 | case 1: { //audio | 673 | int noOfFiles = cfg.readNumEntry("NumberOfFiles", 0 ); |
661 | addToSelection( audioView->selectedItem() ); | 674 | |
662 | } | 675 | switch (tabWidget->currentPageIndex()) { |
663 | break; | 676 | case 0: //playlist |
664 | case 2: { // video | 677 | break; |
665 | addToSelection( videoView->selectedItem() ); | 678 | case 1: { //audio |
666 | } | 679 | for ( int i = 0; i < noOfFiles; i++ ) { |
667 | break; | 680 | QString entryName; |
668 | }; | 681 | entryName.sprintf( "File%i", i + 1 ); |
682 | QString linkFile = cfg.readEntry( entryName ); | ||
683 | if( DocLnk( linkFile).name() == audioView->selectedItem()->text(0) ) { | ||
684 | int result= QMessageBox::warning(this,"OpiePlayer", | ||
685 | tr("This is all ready in your playlist.\nContinue?"), | ||
686 | tr("Yes"),tr("No"),0,0,1); | ||
687 | if (result !=0) | ||
688 | return; | ||
689 | } | ||
690 | } | ||
691 | addToSelection( audioView->selectedItem() ); | ||
692 | tabWidget->setCurrentPage(1); | ||
693 | } | ||
694 | break; | ||
695 | case 2: { // video | ||
696 | for ( int i = 0; i < noOfFiles; i++ ) { | ||
697 | QString entryName; | ||
698 | entryName.sprintf( "File%i", i + 1 ); | ||
699 | QString linkFile = cfg.readEntry( entryName ); | ||
700 | if( DocLnk( linkFile).name() == videoView->selectedItem()->text(0) ) { | ||
701 | int result= QMessageBox::warning(this,"OpiePlayer", | ||
702 | tr("This is all ready in your playlist.\nContinue?"), | ||
703 | tr("Yes"),tr("No"),0,0,1); | ||
704 | if (result !=0) | ||
705 | return; | ||
706 | } | ||
707 | } | ||
708 | addToSelection( videoView->selectedItem() ); | ||
709 | tabWidget->setCurrentPage(2); | ||
710 | } | ||
711 | break; | ||
712 | }; | ||
669 | } | 713 | } |
670 | 714 | ||
671 | void PlayListWidget::removeSelected() { | 715 | void PlayListWidget::removeSelected() { |
@@ -755,7 +799,38 @@ void PlayListWidget::tabChanged(QWidget *widg) { | |||
755 | /* | 799 | /* |
756 | play button is pressed*/ | 800 | play button is pressed*/ |
757 | void PlayListWidget::btnPlay(bool b) { | 801 | void PlayListWidget::btnPlay(bool b) { |
758 | mediaPlayerState->setPlaying(b); | 802 | // mediaPlayerState->setPlaying(b); |
803 | switch ( tabWidget->currentPageIndex()) { | ||
804 | case 0: | ||
805 | { | ||
806 | mediaPlayerState->setPlaying(b); | ||
807 | } | ||
808 | break; | ||
809 | case 1: | ||
810 | { | ||
811 | addToSelection( audioView->selectedItem() ); | ||
812 | mediaPlayerState->setPlaying(b); | ||
813 | // qApp->processEvents(); | ||
814 | d->selectedFiles->removeSelected( ); | ||
815 | tabWidget->setCurrentPage(1); | ||
816 | // mediaPlayerState->setPlaying(FALSE); | ||
817 | } | ||
818 | break; | ||
819 | case 2: | ||
820 | { | ||
821 | addToSelection( videoView->selectedItem() ); | ||
822 | mediaPlayerState->setPlaying(b); | ||
823 | qApp->processEvents(); | ||
824 | d->selectedFiles->removeSelected( ); | ||
825 | tabWidget->setCurrentPage(2); | ||
826 | // mediaPlayerState->setPlaying(FALSE); | ||
827 | } | ||
828 | break; | ||
829 | }; | ||
830 | |||
831 | |||
832 | |||
833 | |||
759 | } | 834 | } |
760 | 835 | ||
761 | void PlayListWidget::deletePlaylist() { | 836 | void PlayListWidget::deletePlaylist() { |