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
@@ -408,300 +408,302 @@ void AdvancedFm::doProperties() {
    for ( QStringList::Iterator it = curFileList.begin(); it != curFileList.end(); ++it ) {
     qDebug((filePath+*it));
     DocLnk lnk( (filePath+*it));
     LnkProperties prop( &lnk );
     prop.showMaximized();
     prop.exec();
   }
 #endif    
   
 }
 
 void AdvancedFm::upDir() {
   if (TabWidget->getCurrentTab() == 0) {
     QString current = currentDir.canonicalPath();
     QDir dir(current);
     dir.cdUp();
     current = dir.canonicalPath();
     chdir( current.latin1() );
     currentDir.cd(  current, TRUE);
     populateLocalView();
     update();
   } else {
     QString current = currentRemoteDir.canonicalPath();
     QDir dir(current);
     dir.cdUp();
     current = dir.canonicalPath();
     chdir( current.latin1() );
     currentRemoteDir.cd(  current, TRUE);
     populateRemoteView();
     update();
   }
 }
 
 void AdvancedFm::copy() {
   qApp->processEvents();
   QStringList curFileList = getPath();
     bool doMsg=true;
     int count=curFileList.count();
     if( count > 0) {
         if(count > 1 ){
             QString msg;
             msg=tr("Really copy\n%1 files?").arg(count);
             switch ( QMessageBox::warning(this,tr("Delete"),msg
                                           ,tr("Yes"),tr("No"),0,0,1) ) {
               case 0:
                   doMsg=false;
                   break;
               case 1:
                   return;
                   break;
             };
         }
 
     QString curFile, item, destFile;
     if (TabWidget->getCurrentTab() == 0) {
         for ( QStringList::Iterator it = curFileList.begin(); it != curFileList.end(); ++it ) {
           item=(*it);
           if(item.find("->",0,TRUE)) //symlink
               item = item.left(item.find("->",0,TRUE));
 
           destFile = currentRemoteDir.canonicalPath()+"/"+ item;
           qDebug("Destination file is "+destFile);
 
           curFile = currentDir.canonicalPath()+"/"+ item;
           qDebug("CurrentFile file is " + curFile);
 
           QFile f(destFile);
           if( f.exists()) {
               if(doMsg) {
                   switch ( QMessageBox::warning(this,tr("File Exists!"),
                             item+tr("\nexists. Ok to overwrite?"),
                              tr("Yes"),tr("No"),0,0,1) ) {
                     case 1:
                         return;
                         break;
                   };
               }
               f.remove();                 
           }
           if(!copyFile(destFile, curFile) ) {
               QMessageBox::message("AdvancedFm","Could not copy\n"+curFile +"to\n"+destFile);
           return;
         }
       }
       populateRemoteView();
       TabWidget->setCurrentTab(1);
 
     } else {
       for ( QStringList::Iterator it = curFileList.begin(); it != curFileList.end(); ++it ) {
           item= (*it);
           if(item.find("->",0,TRUE)) //symlink
               item = item.left(item.find("->",0,TRUE));
 
           destFile = currentDir.canonicalPath()+"/"+ item;
           qDebug("Destination file is "+destFile);
 
           curFile = currentRemoteDir.canonicalPath()+"/"+ item;;
           qDebug("CurrentFile file is " + curFile);
 
           QFile f(destFile);
           if( f.exists()) {
               switch ( QMessageBox::warning(this,tr("File Exists!"),
                    item+tr("\nexists. Ok to overwrite?"),
                    tr("Yes"),tr("No"),0,0,1) ) {
           case 1:
             return;
             break;
           };
             f.remove();
         }
         if(!copyFile(destFile, curFile) ) {
           QMessageBox::message("AdvancedFm",tr("Could not copy\n")
                                +curFile +tr("to\n")+destFile);
           return;
 
         }
       }
       populateLocalView();
       TabWidget->setCurrentTab(0);
     }
 
   }
 }
 
 void AdvancedFm::copyAs() {
   qApp->processEvents();
 
   QStringList curFileList = getPath();
-  QString curFile;
+  QString curFile, item;
   InputDialog *fileDlg;
   if (TabWidget->getCurrentTab() == 0) {
     qDebug("tab 1");
     for ( QStringList::Iterator it = curFileList.begin(); it != curFileList.end(); ++it ) {
       QString destFile;
+      item=(*it);
       curFile = currentDir.canonicalPath()+"/"+(*it);
       fileDlg = new InputDialog( this,tr("Copy "+curFile+" As"), TRUE, 0);
 
       fileDlg->setInputText((const QString &) destFile );
       fileDlg->exec();
 
       if( fileDlg->result() == 1 ) {
         QString  filename = fileDlg->LineEdit1->text();
         destFile = currentRemoteDir.canonicalPath()+"/"+filename;
 
         QFile f(destFile);
         if( f.exists()) {
           switch (QMessageBox::warning(this,tr("File Exists!"),
                   item+tr("\nexists. Ok to overwrite?"),
                   tr("Yes"),tr("No"),0,0,1) ) {
           case 0: 
             f.remove();
             break;
           case 1:
             return;
             break;
           };
         }
         if(!copyFile(destFile, curFile) ) {
           QMessageBox::message("AdvancedFm",tr("Could not copy\n")
                                +curFile +tr("to\n")+destFile);
           return;
         }
       }
       delete fileDlg;
 
     }
     populateRemoteView();
     TabWidget->setCurrentTab(1);
 
   } else {
     for ( QStringList::Iterator it = curFileList.begin(); it != curFileList.end(); ++it ) {
 
+      item=(*it);
       curFile = currentRemoteDir.canonicalPath()+"/"+(*it);
       fileDlg = new InputDialog( this,tr("Copy "+curFile+" As"), TRUE, 0);
 
       QString destFile;
       fileDlg->setInputText((const QString &) destFile);
       fileDlg->exec();
 
       if( fileDlg->result() == 1 ) {
         QString  filename = fileDlg->LineEdit1->text();
         destFile = currentDir.canonicalPath()+"/"+filename;
 
         QFile f( destFile);
         if( f.exists()) {
           switch ( QMessageBox::warning(this,tr("File Exists!"),
                    item+tr("\nexists. Ok to overwrite?"),
                    tr("Yes"),tr("No"),0,0,1) ) {
           case 0: 
             f.remove();
             break;
           case 1:
             return;
             break;
           };
         }
         if(!copyFile(destFile, curFile) ) {
           QMessageBox::message("AdvancedFm",tr("Could not copy\n")
                                +curFile +tr("to\n")+destFile);
           return;
         }
                         
       }
       delete fileDlg;
 
     }
     populateLocalView();
     TabWidget->setCurrentTab(0);
   }
 }
 
 void AdvancedFm::copySameDir() {
   qApp->processEvents();
   QStringList curFileList = getPath();
   QString curFile, item, destFile;
   InputDialog *fileDlg;
 
   if (TabWidget->getCurrentTab() == 0) {
 
     for ( QStringList::Iterator it = curFileList.begin(); it != curFileList.end(); ++it ) {
         item=(*it);
       curFile = currentDir.canonicalPath()+"/"+ item;
 
       fileDlg = new InputDialog(this,tr("Copy ")+curFile+tr(" As"),TRUE, 0);
       fileDlg->setInputText((const QString &) destFile );
       fileDlg->exec();
 
       if( fileDlg->result() == 1 ) {
 
         QString filename = fileDlg->LineEdit1->text();
         destFile = currentDir.canonicalPath()+"/"+filename;
 
         QFile f(destFile);
         if( f.exists()) {
           switch (QMessageBox::warning(this,tr("Delete"),
                   destFile+tr(" already exists\nDo you really want to delete it?"),
                   tr("Yes"),tr("No"),0,0,1) ) {
           case 0:
 
             f.remove();
             break;
           case 1:
             return;
             break;
           };
         }
         if(!copyFile(destFile, curFile) ) {
           QMessageBox::message("AdvancedFm",tr("Could not copy\n")
                                +curFile +tr("to\n")+destFile);
           return;
         }
                     
         qDebug("copy "+curFile+" as "+destFile);
       }
       delete fileDlg;
     }
     populateLocalView();
 
   } else {
     for ( QStringList::Iterator it = curFileList.begin(); it != curFileList.end(); ++it ) {
         item=(*it);
       curFile = currentRemoteDir.canonicalPath()+"/"+ item;
 
       fileDlg = new InputDialog(this,tr("Copy ")+curFile+tr(" As"),TRUE, 0);
       fileDlg->setInputText((const QString &) destFile);
       fileDlg->exec();
       if( fileDlg->result() == 1 ) {
         QString  filename = fileDlg->LineEdit1->text();
 
         destFile = currentRemoteDir.canonicalPath()+"/"+filename;
 
         QFile f(destFile);
         if( f.exists()) {
           switch ( QMessageBox::warning(this,tr("Delete"),
                    destFile+tr(" already exists\nDo you really want to delete it?"),
                    tr("Yes"),tr("No"),0,0,1) ) {
           case 0: 
             f.remove();
             break;
           case 1:
             return;
             break;
           };
         }
         if(!copyFile(destFile, curFile) ) {
           QMessageBox::message("AdvancedFm",tr("Could not copy\n")
                                +curFile +tr("to\n")+destFile);
           return;
         }
         qDebug("copy "+curFile+" as "+destFile);
       }
       delete fileDlg;
     }
     populateRemoteView();
   }
 }
  
 void AdvancedFm::move() {
   qApp->processEvents();