author | llornkcor <llornkcor> | 2004-10-06 08:10:14 (UTC) |
---|---|---|
committer | llornkcor <llornkcor> | 2004-10-06 08:10:14 (UTC) |
commit | 14c237a2d5c60314935d51d9beea0527e337a9d8 (patch) (unidiff) | |
tree | aaa74a61444febeec1db1760b79e5a07f47e8fd9 /noncore/apps/advancedfm | |
parent | 637e5e26c5d30778234c03412f1bf44ed7b38a8e (diff) | |
download | opie-14c237a2d5c60314935d51d9beea0527e337a9d8.zip opie-14c237a2d5c60314935d51d9beea0527e337a9d8.tar.gz opie-14c237a2d5c60314935d51d9beea0527e337a9d8.tar.bz2 |
if user clicks dialog's X, dont go ahead and do the actions
-rw-r--r-- | noncore/apps/advancedfm/advancedfmMenu.cpp | 23 |
1 files changed, 23 insertions, 0 deletions
diff --git a/noncore/apps/advancedfm/advancedfmMenu.cpp b/noncore/apps/advancedfm/advancedfmMenu.cpp index 4802771..f25048a 100644 --- a/noncore/apps/advancedfm/advancedfmMenu.cpp +++ b/noncore/apps/advancedfm/advancedfmMenu.cpp | |||
@@ -154,12 +154,15 @@ void AdvancedFm::doDelete() { | |||
154 | case 0: | 154 | case 0: |
155 | doMsg=false; | 155 | doMsg=false; |
156 | break; | 156 | break; |
157 | case 1: | 157 | case 1: |
158 | return; | 158 | return; |
159 | break; | 159 | break; |
160 | default: | ||
161 | return; | ||
162 | break; | ||
160 | }; | 163 | }; |
161 | } | 164 | } |
162 | 165 | ||
163 | QString myFile; | 166 | QString myFile; |
164 | 167 | ||
165 | for ( QStringList::Iterator it = curFileList.begin(); it != curFileList.end(); ++it ) { | 168 | for ( QStringList::Iterator it = curFileList.begin(); it != curFileList.end(); ++it ) { |
@@ -185,22 +188,27 @@ void AdvancedFm::doDelete() { | |||
185 | populateView(); | 188 | populateView(); |
186 | } | 189 | } |
187 | break; | 190 | break; |
188 | case 1: | 191 | case 1: |
189 | // exit | 192 | // exit |
190 | break; | 193 | break; |
194 | default: | ||
195 | break; | ||
191 | }; | 196 | }; |
192 | 197 | ||
193 | } else { | 198 | } else { |
194 | if(doMsg) { | 199 | if(doMsg) { |
195 | switch ( QMessageBox::warning(this,tr("Delete"), | 200 | switch ( QMessageBox::warning(this,tr("Delete"), |
196 | tr("<p>Really delete %1?</p>").arg( myFile ), | 201 | tr("<p>Really delete %1?</p>").arg( myFile ), |
197 | tr("Yes"), tr("No"), 0, 0, 1) ) { | 202 | tr("Yes"), tr("No"), 0, 0, 1) ) { |
198 | case 1: | 203 | case 1: |
199 | return; | 204 | return; |
200 | break; | 205 | break; |
206 | default: | ||
207 | return; | ||
208 | break; | ||
201 | }; | 209 | }; |
202 | } | 210 | } |
203 | 211 | ||
204 | QString cmd="rm "+f; | 212 | QString cmd="rm "+f; |
205 | QFile file(f); | 213 | QFile file(f); |
206 | QFileInfo fi(myFile); | 214 | QFileInfo fi(myFile); |
@@ -287,12 +295,15 @@ void AdvancedFm::copy() { | |||
287 | case 0: | 295 | case 0: |
288 | doMsg=false; | 296 | doMsg=false; |
289 | break; | 297 | break; |
290 | case 1: | 298 | case 1: |
291 | return; | 299 | return; |
292 | break; | 300 | break; |
301 | default: | ||
302 | return; | ||
303 | break; | ||
293 | }; | 304 | }; |
294 | } | 305 | } |
295 | 306 | ||
296 | QString curFile, item, destFile; | 307 | QString curFile, item, destFile; |
297 | for ( QStringList::Iterator it = curFileList.begin(); it != curFileList.end(); ++it ) { | 308 | for ( QStringList::Iterator it = curFileList.begin(); it != curFileList.end(); ++it ) { |
298 | item=(*it); | 309 | item=(*it); |
@@ -311,12 +322,15 @@ void AdvancedFm::copy() { | |||
311 | switch ( QMessageBox::warning(this,tr("File Exists!"), | 322 | switch ( QMessageBox::warning(this,tr("File Exists!"), |
312 | tr("<p>%1 already exists. Ok to overwrite?</P>").arg(item), | 323 | tr("<p>%1 already exists. Ok to overwrite?</P>").arg(item), |
313 | tr("Yes"),tr("No"),0,0,1)) { | 324 | tr("Yes"),tr("No"),0,0,1)) { |
314 | case 1: | 325 | case 1: |
315 | return; | 326 | return; |
316 | break; | 327 | break; |
328 | default: | ||
329 | return; | ||
330 | break; | ||
317 | }; | 331 | }; |
318 | } | 332 | } |
319 | f.remove(); | 333 | f.remove(); |
320 | } | 334 | } |
321 | 335 | ||
322 | if( !copyFile( curFile, destFile) ) { | 336 | if( !copyFile( curFile, destFile) ) { |
@@ -363,12 +377,15 @@ void AdvancedFm::copyAs() { | |||
363 | case 0: | 377 | case 0: |
364 | f.remove(); | 378 | f.remove(); |
365 | break; | 379 | break; |
366 | case 1: | 380 | case 1: |
367 | return; | 381 | return; |
368 | break; | 382 | break; |
383 | default: | ||
384 | return; | ||
385 | break; | ||
369 | }; | 386 | }; |
370 | } | 387 | } |
371 | if( !copyFile( curFile, destFile) ) { | 388 | if( !copyFile( curFile, destFile) ) { |
372 | QMessageBox::message("AdvancedFm",tr("<p>Could not copy %1 to %2</P>").arg(curFile).arg(destFile)); | 389 | QMessageBox::message("AdvancedFm",tr("<p>Could not copy %1 to %2</P>").arg(curFile).arg(destFile)); |
373 | return; | 390 | return; |
374 | } | 391 | } |
@@ -416,12 +433,15 @@ void AdvancedFm::copySameDir() { | |||
416 | 433 | ||
417 | f.remove(); | 434 | f.remove(); |
418 | break; | 435 | break; |
419 | case 1: | 436 | case 1: |
420 | return; | 437 | return; |
421 | break; | 438 | break; |
439 | default: | ||
440 | return; | ||
441 | break; | ||
422 | }; | 442 | }; |
423 | } | 443 | } |
424 | if(!copyFile( curFile,destFile) ) { | 444 | if(!copyFile( curFile,destFile) ) { |
425 | QMessageBox::message("AdvancedFm",tr("<P>Could not copy %1 to %2</P>").arg(curFile).arg(destFile)); | 445 | QMessageBox::message("AdvancedFm",tr("<P>Could not copy %1 to %2</P>").arg(curFile).arg(destFile)); |
426 | return; | 446 | return; |
427 | } | 447 | } |
@@ -470,12 +490,15 @@ void AdvancedFm::move() { | |||
470 | switch ( QMessageBox::warning(this,tr("File Exists!"), | 490 | switch ( QMessageBox::warning(this,tr("File Exists!"), |
471 | tr("<p>%1 already exists. Ok to overwrite?</P>").arg(destFile), | 491 | tr("<p>%1 already exists. Ok to overwrite?</P>").arg(destFile), |
472 | tr("Yes"),tr("No"),0,0,1)) { | 492 | tr("Yes"),tr("No"),0,0,1)) { |
473 | case 1: | 493 | case 1: |
474 | return; | 494 | return; |
475 | break; | 495 | break; |
496 | default: | ||
497 | return; | ||
498 | break; | ||
476 | }; | 499 | }; |
477 | if( !copyFile( curFile, destFile) ) { | 500 | if( !copyFile( curFile, destFile) ) { |
478 | QMessageBox::message(tr("Note"),tr("<p>Could not move %1</p>").arg(curFile)); | 501 | QMessageBox::message(tr("Note"),tr("<p>Could not move %1</p>").arg(curFile)); |
479 | return; | 502 | return; |
480 | } else | 503 | } else |
481 | QFile::remove(curFile); | 504 | QFile::remove(curFile); |