author | llornkcor <llornkcor> | 2002-10-09 23:36:52 (UTC) |
---|---|---|
committer | llornkcor <llornkcor> | 2002-10-09 23:36:52 (UTC) |
commit | 4c7d8f663ee98751da0f8264ea1d49799463f0bf (patch) (unidiff) | |
tree | b2fd7207dd9b59643b144aca03098e7b10550c5c | |
parent | d624bf47913f76c881f28c6498cec4ad3c007a9b (diff) | |
download | opie-4c7d8f663ee98751da0f8264ea1d49799463f0bf.zip opie-4c7d8f663ee98751da0f8264ea1d49799463f0bf.tar.gz opie-4c7d8f663ee98751da0f8264ea1d49799463f0bf.tar.bz2 |
remove op2 crash feature when cancelling playlist save
-rw-r--r-- | noncore/multimedia/opieplayer2/playlistwidget.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/noncore/multimedia/opieplayer2/playlistwidget.cpp b/noncore/multimedia/opieplayer2/playlistwidget.cpp index d53c423..e28efd0 100644 --- a/noncore/multimedia/opieplayer2/playlistwidget.cpp +++ b/noncore/multimedia/opieplayer2/playlistwidget.cpp | |||
@@ -856,118 +856,119 @@ void PlayListWidget::writeCurrentM3u() { | |||
856 | Om3u *m3uList; | 856 | Om3u *m3uList; |
857 | m3uList = new Om3u( currentPlaylist, IO_ReadWrite | IO_Truncate ); | 857 | m3uList = new Om3u( currentPlaylist, IO_ReadWrite | IO_Truncate ); |
858 | d->selectedFiles->first(); | 858 | d->selectedFiles->first(); |
859 | qDebug( d->selectedFiles->current()->file()); | 859 | qDebug( d->selectedFiles->current()->file()); |
860 | do { | 860 | do { |
861 | qDebug( d->selectedFiles->current()->file()); | 861 | qDebug( d->selectedFiles->current()->file()); |
862 | m3uList->add( d->selectedFiles->current()->file() ); | 862 | m3uList->add( d->selectedFiles->current()->file() ); |
863 | } | 863 | } |
864 | while ( d->selectedFiles->next() ); | 864 | while ( d->selectedFiles->next() ); |
865 | qDebug( "<<<<<<<<<<<<>>>>>>>>>>>>>>>>>" ); | 865 | qDebug( "<<<<<<<<<<<<>>>>>>>>>>>>>>>>>" ); |
866 | m3uList->write(); | 866 | m3uList->write(); |
867 | m3uList->close(); | 867 | m3uList->close(); |
868 | 868 | ||
869 | if(m3uList) delete m3uList; | 869 | if(m3uList) delete m3uList; |
870 | } | 870 | } |
871 | 871 | ||
872 | /* | 872 | /* |
873 | writes current playlist to m3u file */ | 873 | writes current playlist to m3u file */ |
874 | void PlayListWidget::writem3u() { | 874 | void PlayListWidget::writem3u() { |
875 | InputDialog *fileDlg; | 875 | InputDialog *fileDlg; |
876 | fileDlg = new InputDialog( this, tr( "Save m3u Playlist " ), TRUE, 0); | 876 | fileDlg = new InputDialog( this, tr( "Save m3u Playlist " ), TRUE, 0); |
877 | fileDlg->exec(); | 877 | fileDlg->exec(); |
878 | QString name, filename, list; | 878 | QString name, filename, list; |
879 | Om3u *m3uList; | 879 | Om3u *m3uList; |
880 | 880 | ||
881 | if( fileDlg->result() == 1 ) { | 881 | if( fileDlg->result() == 1 ) { |
882 | name = fileDlg->text(); | 882 | name = fileDlg->text(); |
883 | // qDebug( filename ); | 883 | // qDebug( filename ); |
884 | 884 | ||
885 | if( name.left( 1) != "/" ) { | 885 | if( name.left( 1) != "/" ) { |
886 | filename = QPEApplication::documentDir() + "/" + name; | 886 | filename = QPEApplication::documentDir() + "/" + name; |
887 | } | 887 | } |
888 | 888 | ||
889 | if( name.right( 3 ) != "m3u" ) { | 889 | if( name.right( 3 ) != "m3u" ) { |
890 | filename = QPEApplication::documentDir() + "/" +name+".m3u"; | 890 | filename = QPEApplication::documentDir() + "/" +name+".m3u"; |
891 | } | 891 | } |
892 | 892 | ||
893 | m3uList = new Om3u(filename, IO_ReadWrite); | 893 | m3uList = new Om3u(filename, IO_ReadWrite); |
894 | 894 | ||
895 | d->selectedFiles->first(); | 895 | d->selectedFiles->first(); |
896 | 896 | ||
897 | do { | 897 | do { |
898 | m3uList->add( d->selectedFiles->current()->file()); | 898 | m3uList->add( d->selectedFiles->current()->file()); |
899 | } | 899 | } |
900 | while ( d->selectedFiles->next() ); | 900 | while ( d->selectedFiles->next() ); |
901 | // qDebug( list ); | 901 | // qDebug( list ); |
902 | m3uList->write(); | 902 | m3uList->write(); |
903 | m3uList->close(); | 903 | m3uList->close(); |
904 | |||
905 | } | ||
906 | if(m3uList) delete m3uList; | 904 | if(m3uList) delete m3uList; |
905 | |||
907 | if(fileDlg) delete fileDlg; | 906 | if(fileDlg) delete fileDlg; |
908 | 907 | ||
909 | DocLnk lnk; | 908 | DocLnk lnk; |
910 | lnk.setFile( filename); | 909 | lnk.setFile( filename); |
911 | lnk.setIcon("opieplayer2/playlist2"); | 910 | lnk.setIcon("opieplayer2/playlist2"); |
912 | lnk.setName( name); //sets file name | 911 | lnk.setName( name); //sets file name |
913 | 912 | ||
914 | // qDebug(filename); | 913 | // qDebug(filename); |
915 | Config config( "OpiePlayer" ); | 914 | Config config( "OpiePlayer" ); |
916 | config.setGroup( "PlayList" ); | 915 | config.setGroup( "PlayList" ); |
917 | 916 | ||
918 | config.writeEntry("CurrentPlaylist",filename); | 917 | config.writeEntry("CurrentPlaylist",filename); |
919 | currentPlayList=filename; | 918 | currentPlayList=filename; |
920 | 919 | ||
921 | if(!lnk.writeLink()) { | 920 | if(!lnk.writeLink()) { |
922 | qDebug("Writing doclink did not work"); | 921 | qDebug("Writing doclink did not work"); |
923 | } | 922 | } |
924 | 923 | ||
925 | setCaption(tr("OpiePlayer: ") + name); | 924 | setCaption(tr("OpiePlayer: ") + name); |
925 | } | ||
926 | |||
926 | } | 927 | } |
927 | 928 | ||
928 | void PlayListWidget::keyReleaseEvent( QKeyEvent *e ) { | 929 | void PlayListWidget::keyReleaseEvent( QKeyEvent *e ) { |
929 | switch ( e->key() ) { | 930 | switch ( e->key() ) { |
930 | ////////////////////////////// Zaurus keys | 931 | ////////////////////////////// Zaurus keys |
931 | case Key_F9: //activity | 932 | case Key_F9: //activity |
932 | // if(audioUI->isHidden()) | 933 | // if(audioUI->isHidden()) |
933 | // audioUI->showMaximized(); | 934 | // audioUI->showMaximized(); |
934 | break; | 935 | break; |
935 | case Key_F10: //contacts | 936 | case Key_F10: //contacts |
936 | // if( videoUI->isHidden()) | 937 | // if( videoUI->isHidden()) |
937 | // videoUI->showMaximized(); | 938 | // videoUI->showMaximized(); |
938 | break; | 939 | break; |
939 | case Key_F11: //menu | 940 | case Key_F11: //menu |
940 | break; | 941 | break; |
941 | case Key_F12: //home | 942 | case Key_F12: //home |
942 | // doBlank(); | 943 | // doBlank(); |
943 | break; | 944 | break; |
944 | case Key_F13: //mail | 945 | case Key_F13: //mail |
945 | // doUnblank(); | 946 | // doUnblank(); |
946 | break; | 947 | break; |
947 | case Key_Q: //add to playlist | 948 | case Key_Q: //add to playlist |
948 | addSelected(); | 949 | addSelected(); |
949 | break; | 950 | break; |
950 | case Key_R: //remove from playlist | 951 | case Key_R: //remove from playlist |
951 | removeSelected(); | 952 | removeSelected(); |
952 | break; | 953 | break; |
953 | // case Key_P: //play | 954 | // case Key_P: //play |
954 | // qDebug("Play"); | 955 | // qDebug("Play"); |
955 | // playSelected(); | 956 | // playSelected(); |
956 | // break; | 957 | // break; |
957 | case Key_Space: | 958 | case Key_Space: |
958 | // playSelected(); puh | 959 | // playSelected(); puh |
959 | break; | 960 | break; |
960 | case Key_1: | 961 | case Key_1: |
961 | tabWidget->setCurrentPage( 0 ); | 962 | tabWidget->setCurrentPage( 0 ); |
962 | break; | 963 | break; |
963 | case Key_2: | 964 | case Key_2: |
964 | tabWidget->setCurrentPage( 1 ); | 965 | tabWidget->setCurrentPage( 1 ); |
965 | break; | 966 | break; |
966 | case Key_3: | 967 | case Key_3: |
967 | tabWidget->setCurrentPage( 2 ); | 968 | tabWidget->setCurrentPage( 2 ); |
968 | break; | 969 | break; |
969 | case Key_4: | 970 | case Key_4: |
970 | tabWidget->setCurrentPage( 3 ); | 971 | tabWidget->setCurrentPage( 3 ); |
971 | break; | 972 | break; |
972 | case Key_Down: | 973 | case Key_Down: |
973 | if ( !d->selectedFiles->next() ) | 974 | if ( !d->selectedFiles->next() ) |