| -rw-r--r-- | noncore/apps/advancedfm/advancedfmMenu.cpp | 29 |
1 files changed, 16 insertions, 13 deletions
diff --git a/noncore/apps/advancedfm/advancedfmMenu.cpp b/noncore/apps/advancedfm/advancedfmMenu.cpp index 8b98898..e770304 100644 --- a/noncore/apps/advancedfm/advancedfmMenu.cpp +++ b/noncore/apps/advancedfm/advancedfmMenu.cpp | |||
| @@ -193,24 +193,26 @@ void AdvancedFm::doDelete() { | |||
| 193 | break; | 193 | break; |
| 194 | default: | 194 | default: |
| 195 | break; | 195 | break; |
| 196 | }; | 196 | }; |
| 197 | 197 | ||
| 198 | } else { | 198 | } else { |
| 199 | if(doMsg) { | 199 | if(doMsg) { |
| 200 | switch ( QMessageBox::warning(this,tr("Delete"), | 200 | switch ( QMessageBox::warning(this,tr("Delete"), |
| 201 | tr("<p>Really delete %1?</p>").arg( myFile ), | 201 | tr("<p>Really delete %1?</p>").arg( myFile ), |
| 202 | tr("Yes"), tr("No"), 0, 0, 1) ) { | 202 | tr("Yes"), tr("No"), 0, 0, 1) ) { |
| 203 | case 1: | 203 | case 0; |
| 204 | return; | 204 | break; |
| 205 | break; | 205 | case 1: |
| 206 | default: | 206 | return; |
| 207 | return; | 207 | break; |
| 208 | break; | 208 | default: |
| 209 | }; | 209 | return; |
| 210 | } | 210 | break; |
| 211 | }; | ||
| 212 | } | ||
| 211 | 213 | ||
| 212 | QString cmd="rm "+f; | 214 | QString cmd="rm "+f; |
| 213 | QFile file(f); | 215 | QFile file(f); |
| 214 | QFileInfo fi(myFile); | 216 | QFileInfo fi(myFile); |
| 215 | if( fi.fileName().find("../",0,TRUE)==-1) { | 217 | if( fi.fileName().find("../",0,TRUE)==-1) { |
| 216 | // odebug << "remove link files "+myFile << oendl; | 218 | // odebug << "remove link files "+myFile << oendl; |
| @@ -319,12 +321,14 @@ void AdvancedFm::copy() { | |||
| 319 | QFile f(destFile); | 321 | QFile f(destFile); |
| 320 | if( f.exists()) { | 322 | if( f.exists()) { |
| 321 | if(doMsg) { | 323 | if(doMsg) { |
| 322 | switch ( QMessageBox::warning(this,tr("File Exists!"), | 324 | switch ( QMessageBox::warning(this,tr("File Exists!"), |
| 323 | tr("<p>%1 already exists. Ok to overwrite?</P>").arg(item), | 325 | tr("<p>%1 already exists. Ok to overwrite?</P>").arg(item), |
| 324 | tr("Yes"),tr("No"),0,0,1)) { | 326 | tr("Yes"),tr("No"),0,0,1)) { |
| 327 | case 0; | ||
| 328 | break; | ||
| 325 | case 1: | 329 | case 1: |
| 326 | return; | 330 | return; |
| 327 | break; | 331 | break; |
| 328 | default: | 332 | default: |
| 329 | return; | 333 | return; |
| 330 | break; | 334 | break; |
| @@ -427,13 +431,12 @@ void AdvancedFm::copySameDir() { | |||
| 427 | QFile f(destFile); | 431 | QFile f(destFile); |
| 428 | if( f.exists()) { | 432 | if( f.exists()) { |
| 429 | switch (QMessageBox::warning(this,tr("Delete"), | 433 | switch (QMessageBox::warning(this,tr("Delete"), |
| 430 | tr("<p> %1 already exists. Do you really want to delete it?</P>").arg(destFile), | 434 | tr("<p> %1 already exists. Do you really want to delete it?</P>").arg(destFile), |
| 431 | tr("Yes"),tr("No"),0,0,1) ) { | 435 | tr("Yes"),tr("No"),0,0,1) ) { |
| 432 | case 0: | 436 | case 0: |
| 433 | |||
| 434 | f.remove(); | 437 | f.remove(); |
| 435 | break; | 438 | break; |
| 436 | case 1: | 439 | case 1: |
| 437 | return; | 440 | return; |
| 438 | break; | 441 | break; |
| 439 | default: | 442 | default: |