author | llornkcor <llornkcor> | 2002-11-10 16:52:56 (UTC) |
---|---|---|
committer | llornkcor <llornkcor> | 2002-11-10 16:52:56 (UTC) |
commit | 81e63be3c1e21da2a2f97df1fc38417e7ca814e1 (patch) (side-by-side diff) | |
tree | 66b526df2913150cc67d0d2d8e4283c791ae891f /noncore/multimedia | |
parent | 5a8660a4089fa2160da47e2a4d63baea431b48b1 (diff) | |
download | opie-81e63be3c1e21da2a2f97df1fc38417e7ca814e1.zip opie-81e63be3c1e21da2a2f97df1fc38417e7ca814e1.tar.gz opie-81e63be3c1e21da2a2f97df1fc38417e7ca814e1.tar.bz2 |
fix file add slowdown, and make fileselector remember last directory
-rw-r--r-- | noncore/multimedia/opieplayer2/inputDialog.cpp | 15 | ||||
-rw-r--r-- | noncore/multimedia/opieplayer2/playlistwidget.cpp | 30 |
2 files changed, 29 insertions, 16 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 @@ #include <qpe/resource.h> - +#include <qpe/qpeapplication.h> +#include <qpe/config.h> #include <opie/ofiledialog.h> +#include <qfileinfo.h> #include <qlineedit.h> @@ -42,4 +44,5 @@ InputDialog::~InputDialog() { void InputDialog::browse() { - - MimeTypes types; + Config cfg( "OpiePlayer" ); + cfg.setGroup("Dialog"); + MimeTypes types; QStringList audio, video, all; @@ -58,4 +61,8 @@ void InputDialog::browse() { - QString str = OFileDialog::getOpenFileName( 1,"/","", types, 0 ); + QString str = OFileDialog::getOpenFileName( 1, + cfg.readEntry("LastDirectory",QPEApplication::documentDir()),"", + types, 0 ); + if(str.left(2) == "//") str=str.right(str.length()-1); LineEdit1->setText(str); + cfg.writeEntry("LastDirectory" ,QFileInfo(str).dirPath()); } 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 ) cfg.setGroup("PlayList"); - QString currentPlaylist = cfg.readEntry( "CurrentPlaylist", "" ); + QString currentPlaylist = cfg.readEntry( "CurrentPlaylist", "default"); loadList(DocLnk( currentPlaylist ) ); - setCaption( tr( "OpiePlayer: " ) + currentPlaylist ); + } @@ -742,3 +742,5 @@ void PlayListWidget::openFile() { lnk.setFile( filename ); //sets file name - lnk.setIcon("opieplayer2/musicfile"); + +// lnk.setIcon("opieplayer2/musicfile"); + d->selectedFiles->addToSelection( lnk ); @@ -752,3 +754,5 @@ void PlayListWidget::openFile() { } else { - d->selectedFiles->addToSelection( DocLnk(filename) ); + lnk.setName( QFileInfo(filename).baseName() ); //sets name + lnk.setFile( filename ); //sets file name + d->selectedFiles->addToSelection( lnk); writeCurrentM3u(); @@ -790,3 +794,4 @@ void PlayListWidget::readm3u( const QString &filename ) { lnk.setFile( QFileInfo(filename).dirPath()+"/"+s); - lnk.setIcon("SoundPlayer"); +// lnk.setIcon(MimeType(s).pixmap() ); +// lnk.setIcon("SoundPlayer"); } else { @@ -794,3 +799,4 @@ void PlayListWidget::readm3u( const QString &filename ) { lnk.setFile( s); - lnk.setIcon("SoundPlayer"); +// lnk.setIcon(MimeType(s).pixmap() ); +// lnk.setIcon("SoundPlayer"); } @@ -844,5 +850,5 @@ void PlayListWidget::readPls( const QString &filename ) { } else { //if its a url - if( name.right( 1 ).find( '/' ) == -1) { - s += "/"; - } +// if( name.right( 1 ).find( '/' ) == -1) { +// s += "/"; +// } lnk.setFile( s ); @@ -867,8 +873,8 @@ void PlayListWidget::writeCurrentM3u() { - if( d->selectedFiles->first()) { Om3u *m3uList; m3uList = new Om3u( currentPlaylist, IO_ReadWrite | IO_Truncate ); + if( d->selectedFiles->first()) { do { - qDebug( "writeCurrentM3u " +d->selectedFiles->current()->file()); + qDebug( "add writeCurrentM3u " +d->selectedFiles->current()->file()); m3uList->add( d->selectedFiles->current()->file() ); @@ -921,3 +927,3 @@ void PlayListWidget::writem3u() { lnk.setFile( filename); - lnk.setIcon("opieplayer2/playlist2"); +// lnk.setIcon("opieplayer2/playlist2"); lnk.setName( name); //sets file name |