author | zecke <zecke> | 2004-09-24 16:18:42 (UTC) |
---|---|---|
committer | zecke <zecke> | 2004-09-24 16:18:42 (UTC) |
commit | f248057ae7b1a958a725a4d21b06df1fee264265 (patch) (unidiff) | |
tree | 9fb25b4fd547d18221d6d3f9c36c3127a772e8df /libopie2/opieui/fileselector/ofiledialog.cpp | |
parent | 9930748d049a5c4ffe1f4b39ee341b634e1177f4 (diff) | |
download | opie-f248057ae7b1a958a725a4d21b06df1fee264265.zip opie-f248057ae7b1a958a725a4d21b06df1fee264265.tar.gz opie-f248057ae7b1a958a725a4d21b06df1fee264265.tar.bz2 |
use QPEApplication::execDialog instead of showMaximized/execDialog
Diffstat (limited to 'libopie2/opieui/fileselector/ofiledialog.cpp') (more/less context) (ignore whitespace changes)
-rw-r--r-- | libopie2/opieui/fileselector/ofiledialog.cpp | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/libopie2/opieui/fileselector/ofiledialog.cpp b/libopie2/opieui/fileselector/ofiledialog.cpp index 4c6b800..e01fbe5 100644 --- a/libopie2/opieui/fileselector/ofiledialog.cpp +++ b/libopie2/opieui/fileselector/ofiledialog.cpp | |||
@@ -163,26 +163,25 @@ QString OFileDialog::getOpenFileName(int selector, | |||
163 | const MimeTypes &mimes, | 163 | const MimeTypes &mimes, |
164 | QWidget *wid, | 164 | QWidget *wid, |
165 | const QString &caption ) | 165 | const QString &caption ) |
166 | { | 166 | { |
167 | QString ret; | 167 | QString ret; |
168 | QString startDir = _startDir; | 168 | QString startDir = _startDir; |
169 | if (startDir.isEmpty() ) | 169 | if (startDir.isEmpty() ) |
170 | startDir = lastUsedDir( "FileDialog-OPEN" ); | 170 | startDir = lastUsedDir( "FileDialog-OPEN" ); |
171 | 171 | ||
172 | 172 | ||
173 | OFileDialog dlg( caption.isEmpty() ? tr("Open") : caption, | 173 | OFileDialog dlg( caption.isEmpty() ? tr("Open") : caption, |
174 | wid, OFileSelector::Open, selector, startDir, file, mimes); | 174 | wid, OFileSelector::Open, selector, startDir, file, mimes); |
175 | dlg.showMaximized(); | 175 | if( QPEApplication::execDialog(&dlg ) ) |
176 | if( dlg.exec() ) | ||
177 | { | 176 | { |
178 | ret = dlg.fileName(); | 177 | ret = dlg.fileName(); |
179 | saveLastDir( "FileDialog-OPEN", ret ); | 178 | saveLastDir( "FileDialog-OPEN", ret ); |
180 | } | 179 | } |
181 | 180 | ||
182 | return ret; | 181 | return ret; |
183 | } | 182 | } |
184 | 183 | ||
185 | /** | 184 | /** |
186 | * This opens up a file dialog in save mode | 185 | * This opens up a file dialog in save mode |
187 | * @see getOpenFileName | 186 | * @see getOpenFileName |
188 | */ | 187 | */ |
@@ -191,26 +190,25 @@ QString OFileDialog::getSaveFileName(int selector, | |||
191 | const QString &file, | 190 | const QString &file, |
192 | const MimeTypes &mimes, | 191 | const MimeTypes &mimes, |
193 | QWidget *wid, | 192 | QWidget *wid, |
194 | const QString &caption ) | 193 | const QString &caption ) |
195 | { | 194 | { |
196 | QString ret; | 195 | QString ret; |
197 | QString startDir = _startDir; | 196 | QString startDir = _startDir; |
198 | if (startDir.isEmpty() ) | 197 | if (startDir.isEmpty() ) |
199 | startDir = lastUsedDir( "FileDialog-SAVE" ); | 198 | startDir = lastUsedDir( "FileDialog-SAVE" ); |
200 | 199 | ||
201 | OFileDialog dlg( caption.isEmpty() ? tr("Save") : caption, | 200 | OFileDialog dlg( caption.isEmpty() ? tr("Save") : caption, |
202 | wid, OFileSelector::Save, selector, startDir, file, mimes); | 201 | wid, OFileSelector::Save, selector, startDir, file, mimes); |
203 | dlg.showMaximized(); | 202 | if( QPEApplication::execDialog(&dlg) ) |
204 | if( dlg.exec() ) | ||
205 | { | 203 | { |
206 | ret = dlg.fileName(); | 204 | ret = dlg.fileName(); |
207 | saveLastDir( "FileDialog-SAVE", ret ); | 205 | saveLastDir( "FileDialog-SAVE", ret ); |
208 | } | 206 | } |
209 | 207 | ||
210 | return ret; | 208 | return ret; |
211 | } | 209 | } |
212 | 210 | ||
213 | /** | 211 | /** |
214 | * This opens up a filedialog in select directory mode | 212 | * This opens up a filedialog in select directory mode |
215 | * | 213 | * |
216 | * @param selector the Selector Mode | 214 | * @param selector the Selector Mode |
@@ -222,26 +220,26 @@ QString OFileDialog::getSaveFileName(int selector, | |||
222 | QString OFileDialog::getDirectory(int selector, | 220 | QString OFileDialog::getDirectory(int selector, |
223 | const QString &_startDir, | 221 | const QString &_startDir, |
224 | QWidget *wid, | 222 | QWidget *wid, |
225 | const QString &caption ) | 223 | const QString &caption ) |
226 | { | 224 | { |
227 | QString ret; | 225 | QString ret; |
228 | QString startDir = _startDir; | 226 | QString startDir = _startDir; |
229 | if ( startDir.isEmpty() ) | 227 | if ( startDir.isEmpty() ) |
230 | startDir = lastUsedDir( "FileDialog-SELECTDIR" ); | 228 | startDir = lastUsedDir( "FileDialog-SELECTDIR" ); |
231 | 229 | ||
232 | OFileDialog dlg( caption.isEmpty() ? tr( "Select Directory" ) : caption, | 230 | OFileDialog dlg( caption.isEmpty() ? tr( "Select Directory" ) : caption, |
233 | wid, OFileSelector::DirectorySelector, selector, startDir ); | 231 | wid, OFileSelector::DirectorySelector, selector, startDir ); |
234 | dlg.showMaximized(); | 232 | |
235 | if ( dlg.exec() ) | 233 | if ( QPEApplication::execDialog(&dlg) ) |
236 | { | 234 | { |
237 | ret = dlg.fileName(); | 235 | ret = dlg.fileName(); |
238 | saveLastDir( "FileDialog-SELECTDIR", ret ); | 236 | saveLastDir( "FileDialog-SELECTDIR", ret ); |
239 | } | 237 | } |
240 | return ret; | 238 | return ret; |
241 | } | 239 | } |
242 | 240 | ||
243 | void OFileDialog::slotFileSelected(const QString & ) | 241 | void OFileDialog::slotFileSelected(const QString & ) |
244 | { | 242 | { |
245 | accept(); | 243 | accept(); |
246 | } | 244 | } |
247 | 245 | ||