summaryrefslogtreecommitdiff
path: root/noncore/multimedia
Unidiff
Diffstat (limited to 'noncore/multimedia') (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/multimedia/opieplayer2/playlistwidget.cpp13
1 files changed, 7 insertions, 6 deletions
diff --git a/noncore/multimedia/opieplayer2/playlistwidget.cpp b/noncore/multimedia/opieplayer2/playlistwidget.cpp
index 27db464..2521906 100644
--- a/noncore/multimedia/opieplayer2/playlistwidget.cpp
+++ b/noncore/multimedia/opieplayer2/playlistwidget.cpp
@@ -608,132 +608,133 @@ void PlayListWidget::loadList( const DocLnk & lnk) {
608 } 608 }
609 609
610} 610}
611 611
612void PlayListWidget::setPlaylist( bool shown ) { 612void PlayListWidget::setPlaylist( bool shown ) {
613 if ( shown ) { 613 if ( shown ) {
614 d->playListFrame->show(); 614 d->playListFrame->show();
615 } else { 615 } else {
616 d->playListFrame->hide(); 616 d->playListFrame->hide();
617 } 617 }
618} 618}
619 619
620void PlayListWidget::setView( char view ) { 620void PlayListWidget::setView( char view ) {
621 if ( view == 'l' ) 621 if ( view == 'l' )
622 showMaximized(); 622 showMaximized();
623 else 623 else
624 hide(); 624 hide();
625} 625}
626 626
627void PlayListWidget::addSelected() { 627void PlayListWidget::addSelected() {
628 628
629 Config cfg( "OpiePlayer" ); 629 Config cfg( "OpiePlayer" );
630 cfg.setGroup("PlayList"); 630 cfg.setGroup("PlayList");
631 QString currentPlaylist = cfg.readEntry("CurrentPlaylist",""); 631 QString currentPlaylist = cfg.readEntry("CurrentPlaylist","");
632 int noOfFiles = cfg.readNumEntry("NumberOfFiles", 0 ); 632// int noOfFiles = cfg.readNumEntry("NumberOfFiles", 0 );
633 633
634 switch (tabWidget->currentPageIndex()) { 634 switch (tabWidget->currentPageIndex()) {
635 case 0: //playlist 635 case 0: //playlist
636 break; 636 break;
637 case 1: { //audio 637 case 1: { //audio
638 QListViewItemIterator it( audioView ); 638 QListViewItemIterator it( audioView );
639 // iterate through all items of the listview 639 // iterate through all items of the listview
640 for ( ; it.current(); ++it ) { 640 for ( ; it.current(); ++it ) {
641 if ( it.current()->isSelected() ) { 641 if ( it.current()->isSelected() ) {
642 QListIterator<DocLnk> dit( files.children() ); 642 QListIterator<DocLnk> dit( files.children() );
643 for ( ; dit.current(); ++dit ) { 643 for ( ; dit.current(); ++dit ) {
644 if( dit.current()->name() == it.current()->text(0) ) { 644 if( dit.current()->name() == it.current()->text(0) ) {
645 d->selectedFiles->addToSelection( **dit ); 645 d->selectedFiles->addToSelection( **dit );
646 } 646 }
647 } 647 }
648 audioView->setSelected( it.current(),FALSE); 648 audioView->setSelected( it.current(),FALSE);
649 } 649 }
650 } 650 }
651 tabWidget->setCurrentPage(0); 651 tabWidget->setCurrentPage(0);
652 } 652 }
653 break; 653 break;
654 case 2: { // video 654 case 2: { // video
655 QListViewItemIterator it( videoView ); 655 QListViewItemIterator it( videoView );
656 // iterate through all items of the listview 656 // iterate through all items of the listview
657 for ( ; it.current(); ++it ) { 657 for ( ; it.current(); ++it ) {
658 if ( it.current()->isSelected() ) { 658 if ( it.current()->isSelected() ) {
659 QListIterator<DocLnk> dit( vFiles.children() ); 659 QListIterator<DocLnk> dit( vFiles.children() );
660 for ( ; dit.current(); ++dit ) { 660 for ( ; dit.current(); ++dit ) {
661 if( dit.current()->name() == it.current()->text(0) ) { 661 if( dit.current()->name() == it.current()->text(0) ) {
662 d->selectedFiles->addToSelection( **dit ); 662 d->selectedFiles->addToSelection( **dit );
663 } 663 }
664 } 664 }
665 videoView->setSelected( it.current(),FALSE); 665 videoView->setSelected( it.current(),FALSE);
666 } 666 }
667 } 667 }
668 tabWidget->setCurrentPage(0); 668 tabWidget->setCurrentPage(0);
669 } 669 }
670 break; 670 break;
671 }; 671 };
672} 672}
673 673
674void PlayListWidget::removeSelected() { 674void PlayListWidget::removeSelected() {
675 d->selectedFiles->removeSelected( ); 675 d->selectedFiles->removeSelected( );
676} 676}
677 677
678void PlayListWidget::playIt( QListViewItem *it) { 678void PlayListWidget::playIt( QListViewItem *it) {
679 if(it==NULL) return;
679 qDebug("playIt"); 680 qDebug("playIt");
680 mediaPlayerState->setPlaying(FALSE); 681 mediaPlayerState->setPlaying(FALSE);
681 mediaPlayerState->setPlaying(TRUE); 682 mediaPlayerState->setPlaying(TRUE);
682 d->selectedFiles->unSelect(); 683 d->selectedFiles->unSelect();
683} 684}
684 685
685void PlayListWidget::addToSelection( QListViewItem *it) { 686void PlayListWidget::addToSelection( QListViewItem *it) {
686 d->setDocumentUsed = FALSE; 687 d->setDocumentUsed = FALSE;
687 688
688 if(it) { 689 if(it) {
689 switch (tabWidget->currentPageIndex()) { 690 switch (tabWidget->currentPageIndex()) {
690 case 1: { 691 case 1: {
691 QListIterator<DocLnk> dit( files.children() ); 692 QListIterator<DocLnk> dit( files.children() );
692 for ( ; dit.current(); ++dit ) { 693 for ( ; dit.current(); ++dit ) {
693 if( dit.current()->name() == it->text(0)) { 694 if( dit.current()->name() == it->text(0)) {
694 d->selectedFiles->addToSelection( **dit ); 695 d->selectedFiles->addToSelection( **dit );
695 } 696 }
696 } 697 }
697 } 698 }
698 break; 699 break;
699 case 2: { 700 case 2: {
700 QListIterator<DocLnk> dit( vFiles.children() ); 701 QListIterator<DocLnk> dit( vFiles.children() );
701 for ( ; dit.current(); ++dit ) { 702 for ( ; dit.current(); ++dit ) {
702 if( dit.current()->name() == it->text(0)) { 703 if( dit.current()->name() == it->text(0)) {
703 d->selectedFiles->addToSelection( **dit ); 704 d->selectedFiles->addToSelection( **dit );
704 } 705 }
705 } 706 }
706 } 707 }
707 break; 708 break;
708 case 0: 709 case 0:
709 break; 710 break;
710 }; 711 };
711 tabWidget->setCurrentPage(0); 712 tabWidget->setCurrentPage(0);
712 } 713 }
713} 714}
714 715
715void PlayListWidget::tabChanged(QWidget *widg) { 716void PlayListWidget::tabChanged(QWidget *) {
716 717
717 switch ( tabWidget->currentPageIndex()) { 718 switch ( tabWidget->currentPageIndex()) {
718 case 0: 719 case 0:
719 { 720 {
720 if( !tbDeletePlaylist->isHidden()) 721 if( !tbDeletePlaylist->isHidden())
721 tbDeletePlaylist->hide(); 722 tbDeletePlaylist->hide();
722 d->tbRemoveFromList->setEnabled(TRUE); 723 d->tbRemoveFromList->setEnabled(TRUE);
723 d->tbAddToList->setEnabled(FALSE); 724 d->tbAddToList->setEnabled(FALSE);
724 } 725 }
725 break; 726 break;
726 case 1: 727 case 1:
727 { 728 {
728 audioView->clear(); 729 audioView->clear();
729 populateAudioView(); 730 populateAudioView();
730 731
731 if( !tbDeletePlaylist->isHidden()) 732 if( !tbDeletePlaylist->isHidden())
732 tbDeletePlaylist->hide(); 733 tbDeletePlaylist->hide();
733 d->tbRemoveFromList->setEnabled(FALSE); 734 d->tbRemoveFromList->setEnabled(FALSE);
734 d->tbAddToList->setEnabled(TRUE); 735 d->tbAddToList->setEnabled(TRUE);
735 } 736 }
736 break; 737 break;
737 case 2: 738 case 2:
738 { 739 {
739 videoView->clear(); 740 videoView->clear();
@@ -781,90 +782,90 @@ void PlayListWidget::btnPlay(bool b) {
781 d->selectedFiles->removeSelected( ); 782 d->selectedFiles->removeSelected( );
782 tabWidget->setCurrentPage(2); 783 tabWidget->setCurrentPage(2);
783 d->selectedFiles->unSelect(); 784 d->selectedFiles->unSelect();
784 insanityBool=FALSE; 785 insanityBool=FALSE;
785 }// videoView->clearSelection(); 786 }// videoView->clearSelection();
786 break; 787 break;
787 }; 788 };
788 789
789} 790}
790 791
791void PlayListWidget::deletePlaylist() { 792void PlayListWidget::deletePlaylist() {
792 switch( QMessageBox::information( this, (tr("Remove Playlist?")), 793 switch( QMessageBox::information( this, (tr("Remove Playlist?")),
793 (tr("You really want to delete\nthis playlist?")), 794 (tr("You really want to delete\nthis playlist?")),
794 (tr("Yes")), (tr("No")), 0 )){ 795 (tr("Yes")), (tr("No")), 0 )){
795 case 0: // Yes clicked, 796 case 0: // Yes clicked,
796 QFile().remove(playLists->selected()->file()); 797 QFile().remove(playLists->selected()->file());
797 QFile().remove(playLists->selected()->linkFile()); 798 QFile().remove(playLists->selected()->linkFile());
798 playLists->reread(); 799 playLists->reread();
799 break; 800 break;
800 case 1: // Cancel 801 case 1: // Cancel
801 break; 802 break;
802 }; 803 };
803} 804}
804 805
805void PlayListWidget::viewPressed( int mouse, QListViewItem *item, const QPoint& point, int i) { 806void PlayListWidget::viewPressed( int mouse, QListViewItem *, const QPoint& , int) {
806 switch (mouse) { 807 switch (mouse) {
807 case 1: 808 case 1:
808 break; 809 break;
809 case 2:{ 810 case 2:{
810 QPopupMenu m; 811 QPopupMenu m;
811 m.insertItem( tr( "Play" ), this, SLOT( playSelected() )); 812 m.insertItem( tr( "Play" ), this, SLOT( playSelected() ));
812 m.insertItem( tr( "Add to Playlist" ), this, SLOT( addSelected() )); 813 m.insertItem( tr( "Add to Playlist" ), this, SLOT( addSelected() ));
813 m.insertSeparator(); 814 m.insertSeparator();
814 m.insertItem( tr( "Properties" ), this, SLOT( listDelete() )); 815 m.insertItem( tr( "Properties" ), this, SLOT( listDelete() ));
815 m.exec( QCursor::pos() ); 816 m.exec( QCursor::pos() );
816 } 817 }
817 break; 818 break;
818 }; 819 };
819} 820}
820 821
821void PlayListWidget::playSelected() { 822void PlayListWidget::playSelected() {
822 btnPlay( TRUE); 823 btnPlay( TRUE);
823} 824}
824 825
825void PlayListWidget::playlistViewPressed( int mouse, QListViewItem *item, const QPoint& point, int i) { 826void PlayListWidget::playlistViewPressed( int mouse, QListViewItem *, const QPoint& , int ) {
826 switch (mouse) { 827 switch (mouse) {
827 case 1: 828 case 1:
828 829
829 break; 830 break;
830 case 2: 831 case 2:
831 { 832 {
832 QPopupMenu m; 833 QPopupMenu m;
833 m.insertItem( tr( "Play Selected" ), this, SLOT( playSelected() )); 834 m.insertItem( tr( "Play Selected" ), this, SLOT( playSelected() ));
834 m.insertItem( tr( "Remove" ), this, SLOT( removeSelected() )); 835 m.insertItem( tr( "Remove" ), this, SLOT( removeSelected() ));
835 m.exec( QCursor::pos() ); 836 m.exec( QCursor::pos() );
836 } 837 }
837 break; 838 break;
838 }; 839 };
839} 840}
840 841
841void PlayListWidget::listDelete() { 842void PlayListWidget::listDelete() {
842 Config cfg( "OpiePlayer" ); 843 Config cfg( "OpiePlayer" );
843 cfg.setGroup("PlayList"); 844 cfg.setGroup("PlayList");
844 QString currentPlaylist = cfg.readEntry("CurrentPlaylist",""); 845 QString currentPlaylist = cfg.readEntry("CurrentPlaylist","");
845 QString file; 846 QString file;
846 int noOfFiles = cfg.readNumEntry("NumberOfFiles", 0 ); 847// int noOfFiles = cfg.readNumEntry("NumberOfFiles", 0 );
847 switch ( tabWidget->currentPageIndex()) { 848 switch ( tabWidget->currentPageIndex()) {
848 case 0: 849 case 0:
849 break; 850 break;
850 case 1: 851 case 1:
851 { 852 {
852 file = audioView->currentItem()->text(0); 853 file = audioView->currentItem()->text(0);
853 QListIterator<DocLnk> Pdit( files.children() ); 854 QListIterator<DocLnk> Pdit( files.children() );
854 for ( ; Pdit.current(); ++Pdit ) { 855 for ( ; Pdit.current(); ++Pdit ) {
855 if( Pdit.current()->name() == file) { 856 if( Pdit.current()->name() == file) {
856 LnkProperties prop( Pdit.current() ); 857 LnkProperties prop( Pdit.current() );
857 prop.showMaximized(); 858 prop.showMaximized();
858 prop.exec(); 859 prop.exec();
859 } 860 }
860 } 861 }
861 populateAudioView(); 862 populateAudioView();
862 } 863 }
863 break; 864 break;
864 case 2: 865 case 2:
865 { 866 {
866 867
867 } 868 }
868 break; 869 break;
869 }; 870 };
870} 871}
@@ -1019,49 +1020,49 @@ void PlayListWidget::keyReleaseEvent( QKeyEvent *e)
1019 break; 1020 break;
1020 case Key_2: 1021 case Key_2:
1021 tabWidget->setCurrentPage(1); 1022 tabWidget->setCurrentPage(1);
1022 break; 1023 break;
1023 case Key_3: 1024 case Key_3:
1024 tabWidget->setCurrentPage(2); 1025 tabWidget->setCurrentPage(2);
1025 break; 1026 break;
1026 case Key_4: 1027 case Key_4:
1027 tabWidget->setCurrentPage(3); 1028 tabWidget->setCurrentPage(3);
1028 break; 1029 break;
1029 case Key_Down: 1030 case Key_Down:
1030 if ( !d->selectedFiles->next() ) 1031 if ( !d->selectedFiles->next() )
1031 d->selectedFiles->first(); 1032 d->selectedFiles->first();
1032 1033
1033 break; 1034 break;
1034 case Key_Up: 1035 case Key_Up:
1035 if ( !d->selectedFiles->prev() ) 1036 if ( !d->selectedFiles->prev() )
1036 // d->selectedFiles->last(); 1037 // d->selectedFiles->last();
1037 1038
1038 break; 1039 break;
1039 1040
1040 } 1041 }
1041} 1042}
1042 1043
1043void PlayListWidget::keyPressEvent( QKeyEvent *e) 1044void PlayListWidget::keyPressEvent( QKeyEvent *)
1044{ 1045{
1045// qDebug("Key press"); 1046// qDebug("Key press");
1046// switch ( e->key() ) { 1047// switch ( e->key() ) {
1047// ////////////////////////////// Zaurus keys 1048// ////////////////////////////// Zaurus keys
1048// case Key_A: //add to playlist 1049// case Key_A: //add to playlist
1049// qDebug("Add"); 1050// qDebug("Add");
1050// addSelected(); 1051// addSelected();
1051// break; 1052// break;
1052// case Key_R: //remove from playlist 1053// case Key_R: //remove from playlist
1053// removeSelected(); 1054// removeSelected();
1054// break; 1055// break;
1055// case Key_P: //play 1056// case Key_P: //play
1056// qDebug("Play"); 1057// qDebug("Play");
1057// playSelected(); 1058// playSelected();
1058// break; 1059// break;
1059// case Key_Space: 1060// case Key_Space:
1060// qDebug("Play"); 1061// qDebug("Play");
1061// playSelected(); 1062// playSelected();
1062// break; 1063// break;
1063// } 1064// }
1064} 1065}
1065 1066
1066void PlayListWidget::doBlank() { 1067void PlayListWidget::doBlank() {
1067 qDebug("do blanking"); 1068 qDebug("do blanking");