summaryrefslogtreecommitdiff
authorzecke <zecke>2005-02-06 11:15:32 (UTC)
committer zecke <zecke>2005-02-06 11:15:32 (UTC)
commitc1d8b585ac60438bfb237579da829b4110204009 (patch) (unidiff)
tree81848a11c6b006ed4b6ac5a036de8402dde8e25d
parent8e3d226f1ab8aea28b6100966f11adb97ee41659 (diff)
downloadopie-c1d8b585ac60438bfb237579da829b4110204009.zip
opie-c1d8b585ac60438bfb237579da829b4110204009.tar.gz
opie-c1d8b585ac60438bfb237579da829b4110204009.tar.bz2
Sorry lorn the patch is inapproriate.
1.) one click 'accept' is the wished feature and makes sense for opening files. 2.) Just uncommenting code that is not used is bad, we've cvs you can remove the lines Now I'll revert and afterwards I'll patch OFileDialog again and please tell me if that works for you as well.
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--libopie2/opieui/fileselector/ofiledialog.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/libopie2/opieui/fileselector/ofiledialog.cpp b/libopie2/opieui/fileselector/ofiledialog.cpp
index 6e9833e..e01fbe5 100644
--- a/libopie2/opieui/fileselector/ofiledialog.cpp
+++ b/libopie2/opieui/fileselector/ofiledialog.cpp
@@ -147,110 +147,110 @@ DocLnk OFileDialog::selectedDocument()const
147} 147}
148 148
149/** 149/**
150 * This opens up a filedialog in Open mode 150 * This opens up a filedialog in Open mode
151 * 151 *
152 * @param selector the Selector Mode 152 * @param selector the Selector Mode
153 * @param startDir Where to start from 153 * @param startDir Where to start from
154 * @param file A proposed filename 154 * @param file A proposed filename
155 * @param mimes A list of MimeTypes 155 * @param mimes A list of MimeTypes
156 * @param wid the parent 156 * @param wid the parent
157 * @param caption of the dialog if QString::null tr("Open") will be used 157 * @param caption of the dialog if QString::null tr("Open") will be used
158 * @return the fileName or QString::null 158 * @return the fileName or QString::null
159 */ 159 */
160QString OFileDialog::getOpenFileName(int selector, 160QString OFileDialog::getOpenFileName(int selector,
161 const QString &_startDir, 161 const QString &_startDir,
162 const QString &file, 162 const QString &file,
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 if( QPEApplication::execDialog(&dlg ) ) 175 if( QPEApplication::execDialog(&dlg ) )
176 { 176 {
177 ret = dlg.fileName(); 177 ret = dlg.fileName();
178 saveLastDir( "FileDialog-OPEN", ret ); 178 saveLastDir( "FileDialog-OPEN", ret );
179 } 179 }
180 180
181 return ret; 181 return ret;
182} 182}
183 183
184/** 184/**
185 * This opens up a file dialog in save mode 185 * This opens up a file dialog in save mode
186 * @see getOpenFileName 186 * @see getOpenFileName
187 */ 187 */
188QString OFileDialog::getSaveFileName(int selector, 188QString OFileDialog::getSaveFileName(int selector,
189 const QString &_startDir, 189 const QString &_startDir,
190 const QString &file, 190 const QString &file,
191 const MimeTypes &mimes, 191 const MimeTypes &mimes,
192 QWidget *wid, 192 QWidget *wid,
193 const QString &caption ) 193 const QString &caption )
194{ 194{
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 */
220QString OFileDialog::getDirectory(int selector, 220QString 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
241void OFileDialog::slotFileSelected(const QString & ) 241void OFileDialog::slotFileSelected(const QString & )
242{ 242{
243// accept(); 243 accept();
244} 244}
245 245
246void OFileDialog::slotSelectorOk( ) 246void OFileDialog::slotSelectorOk( )
247{ 247{
248// accept(); 248 accept();
249} 249}
250 250
251void OFileDialog::slotDirSelected(const QString &dir ) 251void 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}