summaryrefslogtreecommitdiff
Unidiff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--libopie2/opieui/fileselector/ofiledialog.cpp10
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
@@ -167,18 +167,17 @@ QString OFileDialog::getOpenFileName(int selector,
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
@@ -195,18 +194,17 @@ QString OFileDialog::getSaveFileName(int selector,
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
@@ -226,18 +224,18 @@ QString OFileDialog::getDirectory(int selector,
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
243void OFileDialog::slotFileSelected(const QString & ) 241void OFileDialog::slotFileSelected(const QString & )