-rw-r--r-- | noncore/multimedia/opieplayer2/inputDialog.cpp | 13 | ||||
-rw-r--r-- | noncore/multimedia/opieplayer2/playlistwidget.cpp | 30 |
2 files changed, 28 insertions, 15 deletions
diff --git a/noncore/multimedia/opieplayer2/inputDialog.cpp b/noncore/multimedia/opieplayer2/inputDialog.cpp index 62240b2..2c4be1b 100644 --- a/noncore/multimedia/opieplayer2/inputDialog.cpp +++ b/noncore/multimedia/opieplayer2/inputDialog.cpp | |||
@@ -3,5 +3,7 @@ | |||
3 | #include <qpe/resource.h> | 3 | #include <qpe/resource.h> |
4 | 4 | #include <qpe/qpeapplication.h> | |
5 | #include <qpe/config.h> | ||
5 | #include <opie/ofiledialog.h> | 6 | #include <opie/ofiledialog.h> |
6 | 7 | ||
8 | #include <qfileinfo.h> | ||
7 | #include <qlineedit.h> | 9 | #include <qlineedit.h> |
@@ -42,3 +44,4 @@ InputDialog::~InputDialog() { | |||
42 | void InputDialog::browse() { | 44 | void InputDialog::browse() { |
43 | 45 | Config cfg( "OpiePlayer" ); | |
46 | cfg.setGroup("Dialog"); | ||
44 | MimeTypes types; | 47 | MimeTypes types; |
@@ -58,4 +61,8 @@ void InputDialog::browse() { | |||
58 | 61 | ||
59 | QString str = OFileDialog::getOpenFileName( 1,"/","", types, 0 ); | 62 | QString str = OFileDialog::getOpenFileName( 1, |
63 | cfg.readEntry("LastDirectory",QPEApplication::documentDir()),"", | ||
64 | types, 0 ); | ||
65 | if(str.left(2) == "//") str=str.right(str.length()-1); | ||
60 | LineEdit1->setText(str); | 66 | LineEdit1->setText(str); |
67 | cfg.writeEntry("LastDirectory" ,QFileInfo(str).dirPath()); | ||
61 | } | 68 | } |
diff --git a/noncore/multimedia/opieplayer2/playlistwidget.cpp b/noncore/multimedia/opieplayer2/playlistwidget.cpp index b15f95e..0825eed 100644 --- a/noncore/multimedia/opieplayer2/playlistwidget.cpp +++ b/noncore/multimedia/opieplayer2/playlistwidget.cpp | |||
@@ -159,5 +159,5 @@ PlayListWidget::PlayListWidget( QWidget* parent, const char* name, WFlags fl ) | |||
159 | cfg.setGroup("PlayList"); | 159 | cfg.setGroup("PlayList"); |
160 | QString currentPlaylist = cfg.readEntry( "CurrentPlaylist", "" ); | 160 | QString currentPlaylist = cfg.readEntry( "CurrentPlaylist", "default"); |
161 | loadList(DocLnk( currentPlaylist ) ); | 161 | loadList(DocLnk( currentPlaylist ) ); |
162 | setCaption( tr( "OpiePlayer: " ) + currentPlaylist ); | 162 | |
163 | } | 163 | } |
@@ -742,3 +742,5 @@ void PlayListWidget::openFile() { | |||
742 | lnk.setFile( filename ); //sets file name | 742 | lnk.setFile( filename ); //sets file name |
743 | lnk.setIcon("opieplayer2/musicfile"); | 743 | |
744 | // lnk.setIcon("opieplayer2/musicfile"); | ||
745 | |||
744 | d->selectedFiles->addToSelection( lnk ); | 746 | d->selectedFiles->addToSelection( lnk ); |
@@ -752,3 +754,5 @@ void PlayListWidget::openFile() { | |||
752 | } else { | 754 | } else { |
753 | d->selectedFiles->addToSelection( DocLnk(filename) ); | 755 | lnk.setName( QFileInfo(filename).baseName() ); //sets name |
756 | lnk.setFile( filename ); //sets file name | ||
757 | d->selectedFiles->addToSelection( lnk); | ||
754 | writeCurrentM3u(); | 758 | writeCurrentM3u(); |
@@ -790,3 +794,4 @@ void PlayListWidget::readm3u( const QString &filename ) { | |||
790 | lnk.setFile( QFileInfo(filename).dirPath()+"/"+s); | 794 | lnk.setFile( QFileInfo(filename).dirPath()+"/"+s); |
791 | lnk.setIcon("SoundPlayer"); | 795 | // lnk.setIcon(MimeType(s).pixmap() ); |
796 | // lnk.setIcon("SoundPlayer"); | ||
792 | } else { | 797 | } else { |
@@ -794,3 +799,4 @@ void PlayListWidget::readm3u( const QString &filename ) { | |||
794 | lnk.setFile( s); | 799 | lnk.setFile( s); |
795 | lnk.setIcon("SoundPlayer"); | 800 | // lnk.setIcon(MimeType(s).pixmap() ); |
801 | // lnk.setIcon("SoundPlayer"); | ||
796 | } | 802 | } |
@@ -844,5 +850,5 @@ void PlayListWidget::readPls( const QString &filename ) { | |||
844 | } else { //if its a url | 850 | } else { //if its a url |
845 | if( name.right( 1 ).find( '/' ) == -1) { | 851 | // if( name.right( 1 ).find( '/' ) == -1) { |
846 | s += "/"; | 852 | // s += "/"; |
847 | } | 853 | // } |
848 | lnk.setFile( s ); | 854 | lnk.setFile( s ); |
@@ -867,8 +873,8 @@ void PlayListWidget::writeCurrentM3u() { | |||
867 | 873 | ||
868 | if( d->selectedFiles->first()) { | ||
869 | Om3u *m3uList; | 874 | Om3u *m3uList; |
870 | m3uList = new Om3u( currentPlaylist, IO_ReadWrite | IO_Truncate ); | 875 | m3uList = new Om3u( currentPlaylist, IO_ReadWrite | IO_Truncate ); |
876 | if( d->selectedFiles->first()) { | ||
871 | 877 | ||
872 | do { | 878 | do { |
873 | qDebug( "writeCurrentM3u " +d->selectedFiles->current()->file()); | 879 | qDebug( "add writeCurrentM3u " +d->selectedFiles->current()->file()); |
874 | m3uList->add( d->selectedFiles->current()->file() ); | 880 | m3uList->add( d->selectedFiles->current()->file() ); |
@@ -921,3 +927,3 @@ void PlayListWidget::writem3u() { | |||
921 | lnk.setFile( filename); | 927 | lnk.setFile( filename); |
922 | lnk.setIcon("opieplayer2/playlist2"); | 928 | // lnk.setIcon("opieplayer2/playlist2"); |
923 | lnk.setName( name); //sets file name | 929 | lnk.setName( name); //sets file name |