Diffstat (limited to 'noncore/multimedia/opieplayer2/playlistwidget.cpp') (more/less context) (ignore whitespace changes)
-rw-r--r-- | noncore/multimedia/opieplayer2/playlistwidget.cpp | 46 |
1 files changed, 35 insertions, 11 deletions
diff --git a/noncore/multimedia/opieplayer2/playlistwidget.cpp b/noncore/multimedia/opieplayer2/playlistwidget.cpp index 4e31670..4ee784e 100644 --- a/noncore/multimedia/opieplayer2/playlistwidget.cpp +++ b/noncore/multimedia/opieplayer2/playlistwidget.cpp | |||
@@ -83,16 +83,14 @@ PlayListWidget::PlayListWidget( MediaPlayerState &mediaPlayerState, QWidget* par | |||
83 | (void)new MenuItem( pmPlayList, tr( "Add all files" ), | 83 | (void)new MenuItem( pmPlayList, tr( "Add all files" ), |
84 | this, SLOT( addAllToList() ) ); | 84 | this, SLOT( addAllToList() ) ); |
85 | pmPlayList->insertSeparator(-1); | 85 | pmPlayList->insertSeparator(-1); |
86 | // (void)new MenuItem( pmPlayList, tr( "Save PlayList" ), | ||
87 | // this, SLOT( saveList() ) ); | ||
88 | (void)new MenuItem( pmPlayList, tr( "Save Playlist" ), | ||
89 | this, SLOT(writem3u() ) ); | ||
90 | pmPlayList->insertSeparator(-1); | ||
91 | (void)new MenuItem( pmPlayList, tr( "Add File" ), | 86 | (void)new MenuItem( pmPlayList, tr( "Add File" ), |
92 | this,SLOT( openFile() ) ); | 87 | this,SLOT( openFile() ) ); |
93 | (void)new MenuItem( pmPlayList, tr("Add URL"), | 88 | (void)new MenuItem( pmPlayList, tr("Add URL"), |
94 | this,SLOT( openURL() ) ); | 89 | this,SLOT( openURL() ) ); |
95 | pmPlayList->insertSeparator(-1); | 90 | pmPlayList->insertSeparator(-1); |
91 | (void)new MenuItem( pmPlayList, tr( "Save Playlist" ), | ||
92 | this, SLOT(writem3u() ) ); | ||
93 | pmPlayList->insertSeparator(-1); | ||
96 | (void)new MenuItem( pmPlayList, tr( "Rescan for Audio Files" ), | 94 | (void)new MenuItem( pmPlayList, tr( "Rescan for Audio Files" ), |
97 | audioView, SLOT( scanFiles() ) ); | 95 | audioView, SLOT( scanFiles() ) ); |
98 | (void)new MenuItem( pmPlayList, tr( "Rescan for Video Files" ), | 96 | (void)new MenuItem( pmPlayList, tr( "Rescan for Video Files" ), |
@@ -780,14 +778,40 @@ void PlayListWidget::readListFromFile( const QString &filename ) { | |||
780 | /* | 778 | /* |
781 | writes current playlist to m3u file */ | 779 | writes current playlist to m3u file */ |
782 | void PlayListWidget::writem3u() { | 780 | void PlayListWidget::writem3u() { |
783 | InputDialog *fileDlg; | 781 | //InputDilog *fileDlg; |
784 | fileDlg = new InputDialog( this, tr( "Save m3u Playlist " ), TRUE, 0); | 782 | //fileDlg = new InputDialog( this, tr( "Save m3u Playlist " ), TRUE, 0); |
785 | fileDlg->exec(); | 783 | //fileDlg->exec(); |
784 | |||
785 | Config cfg( "OpiePlayer" ); | ||
786 | cfg.setGroup("Dialog"); | ||
787 | MimeTypes types; | ||
788 | QStringList audio, video, all; | ||
789 | audio << "audio/*"; | ||
790 | audio << "playlist/plain"; | ||
791 | audio << "audio/x-mpegurl"; | ||
792 | |||
793 | video << "video/*"; | ||
794 | video << "playlist/plain"; | ||
795 | |||
796 | all += audio; | ||
797 | all += video; | ||
798 | types.insert("All Media Files", all ); | ||
799 | types.insert("Audio", audio ); | ||
800 | types.insert("Video", video ); | ||
801 | |||
802 | QString str = OFileDialog::getOpenFileName( 1, | ||
803 | cfg.readEntry("LastDirectory",QPEApplication::documentDir()),"", | ||
804 | types, 0 ); | ||
805 | if(str.left(2) == "//") str=str.right(str.length()-1); | ||
806 | cfg.writeEntry("LastDirectory" ,QFileInfo(str).dirPath()); | ||
807 | |||
808 | |||
786 | QString name, filename, list; | 809 | QString name, filename, list; |
787 | Om3u *m3uList; | 810 | Om3u *m3uList; |
788 | 811 | ||
789 | if( fileDlg->result() == 1 ) { | 812 | if( !str.isEmpty() ) { |
790 | name = fileDlg->text(); | 813 | name = str; |
814 | // name = fileDlg->text(); | ||
791 | // qDebug( filename ); | 815 | // qDebug( filename ); |
792 | if( name.find("/",0,true) != -1) {// assume they specify a file path | 816 | if( name.find("/",0,true) != -1) {// assume they specify a file path |
793 | filename = name; | 817 | filename = name; |
@@ -811,7 +835,7 @@ void PlayListWidget::writem3u() { | |||
811 | m3uList->close(); | 835 | m3uList->close(); |
812 | delete m3uList; | 836 | delete m3uList; |
813 | 837 | ||
814 | delete fileDlg; | 838 | //delete fileDlg; |
815 | 839 | ||
816 | DocLnk lnk; | 840 | DocLnk lnk; |
817 | lnk.setFile( filename); | 841 | lnk.setFile( filename); |