-rw-r--r-- | noncore/apps/advancedfm/advancedfmMenu.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/noncore/apps/advancedfm/advancedfmMenu.cpp b/noncore/apps/advancedfm/advancedfmMenu.cpp index bef701a..f89ad30 100644 --- a/noncore/apps/advancedfm/advancedfmMenu.cpp +++ b/noncore/apps/advancedfm/advancedfmMenu.cpp | |||
@@ -520,38 +520,39 @@ void AdvancedFm::copy() { | |||
520 | +curFile +tr("to\n")+destFile); | 520 | +curFile +tr("to\n")+destFile); |
521 | return; | 521 | return; |
522 | 522 | ||
523 | } | 523 | } |
524 | } | 524 | } |
525 | populateLocalView(); | 525 | populateLocalView(); |
526 | TabWidget->setCurrentTab(0); | 526 | TabWidget->setCurrentTab(0); |
527 | } | 527 | } |
528 | 528 | ||
529 | } | 529 | } |
530 | } | 530 | } |
531 | 531 | ||
532 | void AdvancedFm::copyAs() { | 532 | void AdvancedFm::copyAs() { |
533 | qApp->processEvents(); | 533 | qApp->processEvents(); |
534 | 534 | ||
535 | QStringList curFileList = getPath(); | 535 | QStringList curFileList = getPath(); |
536 | QString curFile; | 536 | QString curFile, item; |
537 | InputDialog *fileDlg; | 537 | InputDialog *fileDlg; |
538 | if (TabWidget->getCurrentTab() == 0) { | 538 | if (TabWidget->getCurrentTab() == 0) { |
539 | qDebug("tab 1"); | 539 | qDebug("tab 1"); |
540 | for ( QStringList::Iterator it = curFileList.begin(); it != curFileList.end(); ++it ) { | 540 | for ( QStringList::Iterator it = curFileList.begin(); it != curFileList.end(); ++it ) { |
541 | QString destFile; | 541 | QString destFile; |
542 | item=(*it); | ||
542 | curFile = currentDir.canonicalPath()+"/"+(*it); | 543 | curFile = currentDir.canonicalPath()+"/"+(*it); |
543 | fileDlg = new InputDialog( this,tr("Copy "+curFile+" As"), TRUE, 0); | 544 | fileDlg = new InputDialog( this,tr("Copy "+curFile+" As"), TRUE, 0); |
544 | 545 | ||
545 | fileDlg->setInputText((const QString &) destFile ); | 546 | fileDlg->setInputText((const QString &) destFile ); |
546 | fileDlg->exec(); | 547 | fileDlg->exec(); |
547 | 548 | ||
548 | if( fileDlg->result() == 1 ) { | 549 | if( fileDlg->result() == 1 ) { |
549 | QString filename = fileDlg->LineEdit1->text(); | 550 | QString filename = fileDlg->LineEdit1->text(); |
550 | destFile = currentRemoteDir.canonicalPath()+"/"+filename; | 551 | destFile = currentRemoteDir.canonicalPath()+"/"+filename; |
551 | 552 | ||
552 | QFile f(destFile); | 553 | QFile f(destFile); |
553 | if( f.exists()) { | 554 | if( f.exists()) { |
554 | switch (QMessageBox::warning(this,tr("File Exists!"), | 555 | switch (QMessageBox::warning(this,tr("File Exists!"), |
555 | item+tr("\nexists. Ok to overwrite?"), | 556 | item+tr("\nexists. Ok to overwrite?"), |
556 | tr("Yes"),tr("No"),0,0,1) ) { | 557 | tr("Yes"),tr("No"),0,0,1) ) { |
557 | case 0: | 558 | case 0: |
@@ -564,32 +565,33 @@ void AdvancedFm::copyAs() { | |||
564 | } | 565 | } |
565 | if(!copyFile(destFile, curFile) ) { | 566 | if(!copyFile(destFile, curFile) ) { |
566 | QMessageBox::message("AdvancedFm",tr("Could not copy\n") | 567 | QMessageBox::message("AdvancedFm",tr("Could not copy\n") |
567 | +curFile +tr("to\n")+destFile); | 568 | +curFile +tr("to\n")+destFile); |
568 | return; | 569 | return; |
569 | } | 570 | } |
570 | } | 571 | } |
571 | delete fileDlg; | 572 | delete fileDlg; |
572 | 573 | ||
573 | } | 574 | } |
574 | populateRemoteView(); | 575 | populateRemoteView(); |
575 | TabWidget->setCurrentTab(1); | 576 | TabWidget->setCurrentTab(1); |
576 | 577 | ||
577 | } else { | 578 | } else { |
578 | for ( QStringList::Iterator it = curFileList.begin(); it != curFileList.end(); ++it ) { | 579 | for ( QStringList::Iterator it = curFileList.begin(); it != curFileList.end(); ++it ) { |
579 | 580 | ||
581 | item=(*it); | ||
580 | curFile = currentRemoteDir.canonicalPath()+"/"+(*it); | 582 | curFile = currentRemoteDir.canonicalPath()+"/"+(*it); |
581 | fileDlg = new InputDialog( this,tr("Copy "+curFile+" As"), TRUE, 0); | 583 | fileDlg = new InputDialog( this,tr("Copy "+curFile+" As"), TRUE, 0); |
582 | 584 | ||
583 | QString destFile; | 585 | QString destFile; |
584 | fileDlg->setInputText((const QString &) destFile); | 586 | fileDlg->setInputText((const QString &) destFile); |
585 | fileDlg->exec(); | 587 | fileDlg->exec(); |
586 | 588 | ||
587 | if( fileDlg->result() == 1 ) { | 589 | if( fileDlg->result() == 1 ) { |
588 | QString filename = fileDlg->LineEdit1->text(); | 590 | QString filename = fileDlg->LineEdit1->text(); |
589 | destFile = currentDir.canonicalPath()+"/"+filename; | 591 | destFile = currentDir.canonicalPath()+"/"+filename; |
590 | 592 | ||
591 | QFile f( destFile); | 593 | QFile f( destFile); |
592 | if( f.exists()) { | 594 | if( f.exists()) { |
593 | switch ( QMessageBox::warning(this,tr("File Exists!"), | 595 | switch ( QMessageBox::warning(this,tr("File Exists!"), |
594 | item+tr("\nexists. Ok to overwrite?"), | 596 | item+tr("\nexists. Ok to overwrite?"), |
595 | tr("Yes"),tr("No"),0,0,1) ) { | 597 | tr("Yes"),tr("No"),0,0,1) ) { |