author | llornkcor <llornkcor> | 2005-02-06 04:52:25 (UTC) |
---|---|---|
committer | llornkcor <llornkcor> | 2005-02-06 04:52:25 (UTC) |
commit | 8e3d226f1ab8aea28b6100966f11adb97ee41659 (patch) (unidiff) | |
tree | 8a3fd2418ad3dd83f226c0e198e5fe03d9c36f1c | |
parent | 60a856903eb688b56c61fa787ac26b6be9f6d6c4 (diff) | |
download | opie-8e3d226f1ab8aea28b6100966f11adb97ee41659.zip opie-8e3d226f1ab8aea28b6100966f11adb97ee41659.tar.gz opie-8e3d226f1ab8aea28b6100966f11adb97ee41659.tar.bz2 |
fixes #1522 - where fileselector is automatically selected when only clicking on filename.
-rw-r--r-- | libopie2/opieui/fileselector/ofiledialog.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libopie2/opieui/fileselector/ofiledialog.cpp b/libopie2/opieui/fileselector/ofiledialog.cpp index e01fbe5..6e9833e 100644 --- a/libopie2/opieui/fileselector/ofiledialog.cpp +++ b/libopie2/opieui/fileselector/ofiledialog.cpp | |||
@@ -195,62 +195,62 @@ QString OFileDialog::getSaveFileName(int selector, | |||
195 | QString ret; | 195 | QString ret; |
196 | QString startDir = _startDir; | 196 | QString startDir = _startDir; |
197 | if (startDir.isEmpty() ) | 197 | if (startDir.isEmpty() ) |
198 | startDir = lastUsedDir( "FileDialog-SAVE" ); | 198 | startDir = lastUsedDir( "FileDialog-SAVE" ); |
199 | 199 | ||
200 | OFileDialog dlg( caption.isEmpty() ? tr("Save") : caption, | 200 | OFileDialog dlg( caption.isEmpty() ? tr("Save") : caption, |
201 | wid, OFileSelector::Save, selector, startDir, file, mimes); | 201 | wid, OFileSelector::Save, selector, startDir, file, mimes); |
202 | if( QPEApplication::execDialog(&dlg) ) | 202 | if( QPEApplication::execDialog(&dlg) ) |
203 | { | 203 | { |
204 | ret = dlg.fileName(); | 204 | ret = dlg.fileName(); |
205 | saveLastDir( "FileDialog-SAVE", ret ); | 205 | saveLastDir( "FileDialog-SAVE", ret ); |
206 | } | 206 | } |
207 | 207 | ||
208 | return ret; | 208 | return ret; |
209 | } | 209 | } |
210 | 210 | ||
211 | /** | 211 | /** |
212 | * This opens up a filedialog in select directory mode | 212 | * This opens up a filedialog in select directory mode |
213 | * | 213 | * |
214 | * @param selector the Selector Mode | 214 | * @param selector the Selector Mode |
215 | * @param startDir Where to start from | 215 | * @param startDir Where to start from |
216 | * @param wid the parent | 216 | * @param wid the parent |
217 | * @param caption of the dialog if QString::null tr("Open") will be used | 217 | * @param caption of the dialog if QString::null tr("Open") will be used |
218 | * @return the directoryName or QString::null | 218 | * @return the directoryName or QString::null |
219 | */ | 219 | */ |
220 | QString OFileDialog::getDirectory(int selector, | 220 | QString OFileDialog::getDirectory(int selector, |
221 | const QString &_startDir, | 221 | const QString &_startDir, |
222 | QWidget *wid, | 222 | QWidget *wid, |
223 | const QString &caption ) | 223 | const QString &caption ) |
224 | { | 224 | { |
225 | QString ret; | 225 | QString ret; |
226 | QString startDir = _startDir; | 226 | QString startDir = _startDir; |
227 | if ( startDir.isEmpty() ) | 227 | if ( startDir.isEmpty() ) |
228 | startDir = lastUsedDir( "FileDialog-SELECTDIR" ); | 228 | startDir = lastUsedDir( "FileDialog-SELECTDIR" ); |
229 | 229 | ||
230 | OFileDialog dlg( caption.isEmpty() ? tr( "Select Directory" ) : caption, | 230 | OFileDialog dlg( caption.isEmpty() ? tr( "Select Directory" ) : caption, |
231 | wid, OFileSelector::DirectorySelector, selector, startDir ); | 231 | wid, OFileSelector::DirectorySelector, selector, startDir ); |
232 | 232 | ||
233 | if ( QPEApplication::execDialog(&dlg) ) | 233 | if ( QPEApplication::execDialog(&dlg) ) |
234 | { | 234 | { |
235 | ret = dlg.fileName(); | 235 | ret = dlg.fileName(); |
236 | saveLastDir( "FileDialog-SELECTDIR", ret ); | 236 | saveLastDir( "FileDialog-SELECTDIR", ret ); |
237 | } | 237 | } |
238 | return ret; | 238 | return ret; |
239 | } | 239 | } |
240 | 240 | ||
241 | void OFileDialog::slotFileSelected(const QString & ) | 241 | void OFileDialog::slotFileSelected(const QString & ) |
242 | { | 242 | { |
243 | accept(); | 243 | // accept(); |
244 | } | 244 | } |
245 | 245 | ||
246 | void OFileDialog::slotSelectorOk( ) | 246 | void OFileDialog::slotSelectorOk( ) |
247 | { | 247 | { |
248 | accept(); | 248 | // accept(); |
249 | } | 249 | } |
250 | 250 | ||
251 | void OFileDialog::slotDirSelected(const QString &dir ) | 251 | void OFileDialog::slotDirSelected(const QString &dir ) |
252 | { | 252 | { |
253 | setCaption( dir ); | 253 | setCaption( dir ); |
254 | // if mode | 254 | // if mode |
255 | //accept(); | 255 | //accept(); |
256 | } | 256 | } |