-rw-r--r-- | noncore/multimedia/opieplayer2/playlistwidget.cpp | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/noncore/multimedia/opieplayer2/playlistwidget.cpp b/noncore/multimedia/opieplayer2/playlistwidget.cpp index 9373f6b..cd53748 100644 --- a/noncore/multimedia/opieplayer2/playlistwidget.cpp +++ b/noncore/multimedia/opieplayer2/playlistwidget.cpp | |||
@@ -926,70 +926,65 @@ void PlayListWidget::populateVideoView() { | |||
926 | for( ; it.current(); ++it ){ | 926 | for( ; it.current(); ++it ){ |
927 | const QString name = (*it)->name(); | 927 | const QString name = (*it)->name(); |
928 | const QString path = (*it)->path(); | 928 | const QString path = (*it)->path(); |
929 | if( Vdit.current()->file().find(path) != -1 ) storage=name; | 929 | if( Vdit.current()->file().find(path) != -1 ) storage=name; |
930 | } | 930 | } |
931 | 931 | ||
932 | QListViewItem * newItem; | 932 | QListViewItem * newItem; |
933 | if ( QFile( Vdit.current()->file()).exists() ) { | 933 | if ( QFile( Vdit.current()->file()).exists() ) { |
934 | newItem= /*(void)*/ new QListViewItem( videoView, Vdit.current()->name(), | 934 | newItem= /*(void)*/ new QListViewItem( videoView, Vdit.current()->name(), |
935 | QString::number( QFile( Vdit.current()->file()).size() ), storage); | 935 | QString::number( QFile( Vdit.current()->file()).size() ), storage); |
936 | newItem->setPixmap(0, Resource::loadPixmap( "opieplayer/videofile" )); | 936 | newItem->setPixmap(0, Resource::loadPixmap( "opieplayer/videofile" )); |
937 | } | 937 | } |
938 | } | 938 | } |
939 | } | 939 | } |
940 | 940 | ||
941 | void PlayListWidget::openFile() { | 941 | void PlayListWidget::openFile() { |
942 | QString filename, name; | 942 | QString filename, name; |
943 | InputDialog *fileDlg; | 943 | InputDialog *fileDlg; |
944 | fileDlg = new InputDialog(this,tr("Open file or URL"),TRUE, 0); | 944 | fileDlg = new InputDialog(this,tr("Open file or URL"),TRUE, 0); |
945 | fileDlg->exec(); | 945 | fileDlg->exec(); |
946 | if( fileDlg->result() == 1 ) { | 946 | if( fileDlg->result() == 1 ) { |
947 | filename = fileDlg->LineEdit1->text(); | 947 | filename = fileDlg->LineEdit1->text(); |
948 | 948 | ||
949 | qDebug("Selected filename is "+filename); | 949 | qDebug("Selected filename is "+filename); |
950 | if(filename.right(3) == "m3u") { | 950 | if(filename.right(3) == "m3u") { |
951 | readm3u( filename ); | 951 | readm3u( filename ); |
952 | } else if(filename.right(3) == "pls") { | 952 | } else if(filename.right(3) == "pls") { |
953 | readPls( filename ); | 953 | readPls( filename ); |
954 | } else { | 954 | } else { |
955 | DocLnk lnk; | 955 | DocLnk lnk; |
956 | 956 | ||
957 | lnk.setName(filename); //sets file name | 957 | lnk.setName(filename); //sets file name |
958 | // probably not needed anymore either | ||
959 | if(filename.right(1) != "/" && filename.right(3) != "mp3" && filename.right(3) != "MP3") { | ||
960 | filename += "/"; | ||
961 | } | ||
962 | lnk.setFile(filename); //sets File property | 958 | lnk.setFile(filename); //sets File property |
963 | |||
964 | lnk.setType("audio/x-mpegurl"); | 959 | lnk.setType("audio/x-mpegurl"); |
965 | lnk.setExec("opieplayer"); | 960 | lnk.setExec("opieplayer"); |
966 | lnk.setIcon("opieplayer/MPEGPlayer"); | 961 | lnk.setIcon("opieplayer/MPEGPlayer"); |
967 | 962 | ||
968 | if(!lnk.writeLink()) { | 963 | if(!lnk.writeLink()) { |
969 | qDebug("Writing doclink did not work"); | 964 | qDebug("Writing doclink did not work"); |
970 | } | 965 | } |
971 | d->selectedFiles->addToSelection( lnk); | 966 | d->selectedFiles->addToSelection( lnk); |
972 | } | 967 | } |
973 | } | 968 | } |
974 | if(fileDlg) { | 969 | if(fileDlg) { |
975 | delete fileDlg; | 970 | delete fileDlg; |
976 | } | 971 | } |
977 | } | 972 | } |
978 | 973 | ||
979 | void PlayListWidget::keyReleaseEvent( QKeyEvent *e) | 974 | void PlayListWidget::keyReleaseEvent( QKeyEvent *e) |
980 | { | 975 | { |
981 | switch ( e->key() ) { | 976 | switch ( e->key() ) { |
982 | ////////////////////////////// Zaurus keys | 977 | ////////////////////////////// Zaurus keys |
983 | case Key_F9: //activity | 978 | case Key_F9: //activity |
984 | // if(audioUI->isHidden()) | 979 | // if(audioUI->isHidden()) |
985 | // audioUI->showMaximized(); | 980 | // audioUI->showMaximized(); |
986 | break; | 981 | break; |
987 | case Key_F10: //contacts | 982 | case Key_F10: //contacts |
988 | // if( videoUI->isHidden()) | 983 | // if( videoUI->isHidden()) |
989 | // videoUI->showMaximized(); | 984 | // videoUI->showMaximized(); |
990 | break; | 985 | break; |
991 | case Key_F11: //menu | 986 | case Key_F11: //menu |
992 | break; | 987 | break; |
993 | case Key_F12: //home | 988 | case Key_F12: //home |
994 | // doBlank(); | 989 | // doBlank(); |
995 | break; | 990 | break; |