author | zecke <zecke> | 2005-02-06 11:41:25 (UTC) |
---|---|---|
committer | zecke <zecke> | 2005-02-06 11:41:25 (UTC) |
commit | 69d318d86a08c362e5ce66f12106689c58126be9 (patch) (side-by-side diff) | |
tree | 044c59aaf9797625b2ad0164f22d9cf351af4543 /libopie2/opieui/fileselector | |
parent | e29e3328f35e9d74e48d26b99f0e6e8d6dcdd33a (diff) | |
download | opie-69d318d86a08c362e5ce66f12106689c58126be9.zip opie-69d318d86a08c362e5ce66f12106689c58126be9.tar.gz opie-69d318d86a08c362e5ce66f12106689c58126be9.tar.bz2 |
Use the right parameters for the syntax.
Disconnect all slots in OFileDialog from the OFileSelector
Diffstat (limited to 'libopie2/opieui/fileselector') (more/less context) (ignore whitespace changes)
-rw-r--r-- | libopie2/opieui/fileselector/ofiledialog.cpp | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/libopie2/opieui/fileselector/ofiledialog.cpp b/libopie2/opieui/fileselector/ofiledialog.cpp index f2a0c7b..2d38961 100644 --- a/libopie2/opieui/fileselector/ofiledialog.cpp +++ b/libopie2/opieui/fileselector/ofiledialog.cpp @@ -151,98 +151,97 @@ DocLnk OFileDialog::selectedDocument()const QString OFileDialog::getOpenFileName(int selector, const QString &_startDir, const QString &file, const MimeTypes &mimes, QWidget *wid, const QString &caption ) { QString ret; QString startDir = _startDir; if (startDir.isEmpty() ) startDir = lastUsedDir( "FileDialog-OPEN" ); OFileDialog dlg( caption.isEmpty() ? tr("Open") : caption, wid, OFileSelector::Open, selector, startDir, file, mimes); if( QPEApplication::execDialog(&dlg ) ) { ret = dlg.fileName(); saveLastDir( "FileDialog-OPEN", ret ); } return ret; } /** * This opens up a file dialog in save mode * @see getOpenFileName */ QString OFileDialog::getSaveFileName(int selector, const QString &_startDir, const QString &file, const MimeTypes &mimes, QWidget *wid, const QString &caption ) { QString ret; QString startDir = _startDir; if (startDir.isEmpty() ) startDir = lastUsedDir( "FileDialog-SAVE" ); OFileDialog dlg( caption.isEmpty() ? tr("Save") : caption, wid, OFileSelector::Save, selector, startDir, file, mimes); /* * For the save mode we do not want a file to be written * if the user just clicked on it * #1522 */ - dlg.disconnect( dlg.file, SIGNAL(fileSelected(const QString&)) ); - dlg.disconnect( dlg.file, SIGNAL(ok()) ); + dlg.file->disconnect( &dlg ); if( QPEApplication::execDialog(&dlg) ) { ret = dlg.fileName(); saveLastDir( "FileDialog-SAVE", ret ); } return ret; } /** * This opens up a filedialog in select directory mode * * @param selector the Selector Mode * @param startDir Where to start from * @param wid the parent * @param caption of the dialog if QString::null tr("Open") will be used * @return the directoryName or QString::null */ QString OFileDialog::getDirectory(int selector, const QString &_startDir, QWidget *wid, const QString &caption ) { QString ret; QString startDir = _startDir; if ( startDir.isEmpty() ) startDir = lastUsedDir( "FileDialog-SELECTDIR" ); OFileDialog dlg( caption.isEmpty() ? tr( "Select Directory" ) : caption, wid, OFileSelector::DirectorySelector, selector, startDir ); if ( QPEApplication::execDialog(&dlg) ) { ret = dlg.fileName(); saveLastDir( "FileDialog-SELECTDIR", ret ); } return ret; } void OFileDialog::slotFileSelected(const QString & ) { accept(); } void OFileDialog::slotSelectorOk( ) { accept(); |