1 files changed, 188 insertions, 174 deletions

diff --git a/noncore/apps/advancedfm/advancedfm.cpp b/noncore/apps/advancedfm/advancedfm.cpp
index 818a281..b169a79 100644
--- a/noncore/apps/advancedfm/advancedfm.cpp
+++ b/noncore/apps/advancedfm/advancedfm.cpp
@@ -814,783 +814,797 @@ void AdvancedFm::remoteDelete()
           populateRemoteView();
         }
           break;
         case 1:
           // exit
           break;
         };
 
       } else {
         switch ( QMessageBox::warning(this,tr("Delete"),tr("Do you really want to delete\n")+f
                                       +" ?",tr("Yes"),tr("No"),0,0,1) ) {
         case 0: {
           QString cmd="rm "+f;
           QFile file(f);
           file.remove();
           //                   system( cmd.latin1());
           populateRemoteView();
         }
           break;
         case 1:
           // exit
           break;
         };
       }
     }
   }
 }
 
 void AdvancedFm::localRename()
 {
   QString curFile = Local_View->currentItem()->text(0);
   qDebug("currentItem "+curFile);
   if( curFile !="../") {
     InputDialog *fileDlg;
     fileDlg = new InputDialog(this,tr("Rename"),TRUE, 0);
     fileDlg->setInputText((const QString &)curFile);
     fileDlg->exec();
     if( fileDlg->result() == 1 ) {
       QString oldname = currentDir.canonicalPath() + "/" + curFile;
       QString newName = currentDir.canonicalPath() + "/" + fileDlg->LineEdit1->text();//+".playlist";
       if( rename(oldname.latin1(), newName.latin1())== -1)
         QMessageBox::message(tr("Note"),tr("Could not rename"));
     }
     populateLocalView();
   }
 }
 
 void AdvancedFm::remoteRename()
 {
   QString curFile = Remote_View->currentItem()->text(0);
   if( curFile !="../") {
     InputDialog *fileDlg;
     fileDlg = new InputDialog(this,tr("Rename"),TRUE, 0);
     fileDlg->setInputText((const QString &)curFile);
     fileDlg->exec();
     if( fileDlg->result() == 1 ) {
       QString oldname = currentRemoteDir.canonicalPath() + "/" + curFile;
       QString newName = currentRemoteDir.canonicalPath() + "/" + fileDlg->LineEdit1->text();//+".playlist";
       if( rename(oldname.latin1(), newName.latin1())== -1)
         QMessageBox::message(tr("Note"),tr("Could not rename"));
     }
     populateRemoteView();
   }
 }
 
 void AdvancedFm::switchToLocalTab()
 {
   TabWidget->setCurrentPage(0);
   Local_View->setFocus();
 }
 
 void AdvancedFm::switchToRemoteTab()
 {
   TabWidget->setCurrentPage(1);
   Remote_View->setFocus();
 }
 
 void AdvancedFm::readConfig()
 {
   Config cfg("AdvancedFm");
 }
 
 void AdvancedFm::writeConfig()
 {
   Config cfg("AdvancedFm");
 }
 
 void  AdvancedFm::currentPathComboChanged()
 {
   if (TabWidget->currentPageIndex() == 0) {
     if(QDir( currentPathCombo->lineEdit()->text()).exists()) {
       currentDir.setPath( currentPathCombo->lineEdit()->text() );
       populateLocalView();
     } else {
       QMessageBox::message(tr("Note"),tr("That directory does not exist"));
     }
   }
   if (TabWidget->currentPageIndex() == 0) {
     if(QDir( currentPathCombo->lineEdit()->text()).exists()) {
       currentRemoteDir.setPath( currentPathCombo->lineEdit()->text() );
       populateRemoteView();
     } else {
       QMessageBox::message(tr("Note"),tr("That directory does not exist"));
     }
   }
 }
 
 void  AdvancedFm::fillCombo(const QString &currentPath) {
 
   if (TabWidget->currentPageIndex() == 0) {
     currentPathCombo->lineEdit()->setText( currentPath);
     if( localDirPathStringList.grep(currentPath,TRUE).isEmpty() ) {
       currentPathCombo->clear();
       localDirPathStringList.prepend( currentPath );
       currentPathCombo->insertStringList( localDirPathStringList,-1);
     }
   } else {
     currentPathCombo->lineEdit()->setText( currentPath);
     if( remoteDirPathStringList.grep( currentPath,TRUE).isEmpty() ) {
       currentPathCombo->clear();
       remoteDirPathStringList.prepend( currentPath );
       currentPathCombo->insertStringList( remoteDirPathStringList,-1);
     }
   }
 }
 
 void AdvancedFm::currentPathComboActivated(const QString & currentPath) {
   if (TabWidget->currentPageIndex() == 0) {
     chdir( currentPath.latin1() );
     currentDir.cd( currentPath, TRUE);
     populateLocalView();
     update();
   } else {
     chdir( currentPath.latin1() );
     currentRemoteDir.cd( currentPath, TRUE);
     populateRemoteView();
     update();
   }
 }
 
 void AdvancedFm::filePerms() {
 
   QStringList curFileList = getPath();
   QString filePath;
 
   if (TabWidget->currentPageIndex() == 0) {
     filePath = currentDir.canonicalPath()+"/";
   } else {
     filePath= currentRemoteDir.canonicalPath()+"/";
   }
 
   for ( QStringList::Iterator it = curFileList.begin(); it != curFileList.end(); ++it ) {
     filePermissions *filePerm;
     filePerm = new filePermissions(this, "Permissions",true,0,(const QString &)(filePath+*it));
     filePerm->showMaximized();
     filePerm->exec();
     if( filePerm)
       delete  filePerm;
   }
   if (TabWidget->currentPageIndex() == 0) {
     populateLocalView();
   } else {
     populateRemoteView();
   }
 }
 
 void AdvancedFm::doProperties() {
   QStringList curFileList = getPath();
   QString filePath;
   if (TabWidget->currentPageIndex() == 0) {
     filePath = currentDir.canonicalPath()+"/";
   } else {
     filePath= currentRemoteDir.canonicalPath()+"/";
   }
   //    qDebug("%d",curFileList.count());
   for ( QStringList::Iterator it = curFileList.begin(); it != curFileList.end(); ++it ) {
     qDebug((filePath+*it));
     DocLnk lnk( (filePath+*it));
     LnkProperties prop( &lnk );
     prop.showMaximized();
     prop.exec();
   }
 }
 
 QStringList AdvancedFm::getPath() {
   QStringList strList;
   if (TabWidget->currentPageIndex() == 0) {
     QList<QListViewItem> * getSelectedItems( QListView * Local_View );
     QListViewItemIterator it( Local_View );
     for ( ; it.current(); ++it ) {
       if ( it.current()->isSelected() ) {
         strList <<  it.current()->text(0);
+        qDebug(it.current()->text(0));
       }
     }
     return strList;
   } else {
     QList<QListViewItem> * getSelectedItems( QListView * Remote_View );
     QListViewItemIterator it( Remote_View );
     for ( ; it.current(); ++it ) {
       if ( it.current()->isSelected() ) {
         strList << it.current()->text(0);
+        qDebug(it.current()->text(0));
       }
     }
     return strList;
   }
   return "";
 }
 
 void AdvancedFm::homeButtonPushed() {
   QString current = QDir::homeDirPath();
   chdir( current.latin1() );
   if (TabWidget->currentPageIndex() == 0) {
     currentDir.cd(  current, TRUE);
     populateLocalView();
   } else {
     currentRemoteDir.cd(  current, TRUE);
     populateRemoteView();
   }
   update();
 }
 
 void AdvancedFm::docButtonPushed() {
   QString current = QPEApplication::documentDir();
   chdir( current.latin1() );
   if (TabWidget->currentPageIndex() == 0) {
     currentDir.cd( current, TRUE);
     populateLocalView();
   } else {
     currentRemoteDir.cd( current, TRUE);
     populateRemoteView();
   }
   update();
 }
 
 void AdvancedFm::SDButtonPushed() {
   QString current = "/mnt/card";
   chdir( current.latin1() );
   if (TabWidget->currentPageIndex() == 0) {
     currentDir.cd( current, TRUE);
     populateLocalView();
   } else {
     currentRemoteDir.cd( current, TRUE);
     populateRemoteView();
   }
   update();
 
 }
 
 void AdvancedFm::CFButtonPushed() {
   QString current = "/mnt/cf";
   chdir( current.latin1() );
   if (TabWidget->currentPageIndex() == 0) {
     currentDir.cd( current, TRUE);
     populateLocalView();
   } else {
     currentRemoteDir.cd( current, TRUE);
     populateRemoteView();
   }
   update();
 
 }
 
 
 void AdvancedFm::upDir()
 {
   if (TabWidget->currentPageIndex() == 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();
   if( curFileList.count() > 0) {
     QString curFile;
     if (TabWidget->currentPageIndex() == 0) {
       for ( QStringList::Iterator it = curFileList.begin(); it != curFileList.end(); ++it ) {
 
         QString destFile = currentRemoteDir.canonicalPath()+"/"+(*it);
+        qDebug("Destination file is "+destFile);
+
         curFile = currentDir.canonicalPath()+"/"+(*it);
+        qDebug("CurrentFile file is " + curFile);
+
         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","Could not copy\n"+curFile +"to\n"+destFile);
           qWarning("nothin doing");
         }
       }
       populateRemoteView();
       TabWidget->setCurrentPage(1);
 
     } else {
       for ( QStringList::Iterator it = curFileList.begin(); it != curFileList.end(); ++it ) {
 
         QString destFile = currentDir.canonicalPath()+"/"+(*it);
+        qDebug("Destination file is "+destFile);
         curFile = currentRemoteDir.canonicalPath()+"/"+(*it);
+        qDebug("CurrentFile file is " + curFile);
 
         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);
 
           qWarning("nothin doing");
         }
       }
       populateLocalView();
       TabWidget->setCurrentPage(0);
     }
+
   }
 }
 
-void AdvancedFm::copyAs()
-{
+void AdvancedFm::copyAs() {
+  qApp->processEvents();
+
   QStringList curFileList = getPath();
-  if( curFileList.count() > 0) {
-    QString curFile;
-    InputDialog *fileDlg;
-    fileDlg = new InputDialog(this,tr("Copy As"),TRUE, 0);
+  QString curFile;
+  InputDialog *fileDlg;
+  if (TabWidget->currentPageIndex() == 0) {
+    qDebug("tab 1");
+    for ( QStringList::Iterator it = curFileList.begin(); it != curFileList.end(); ++it ) {
+      QString destFile;
+      curFile = currentDir.canonicalPath()+"/"+(*it);
+      fileDlg = new InputDialog( this,tr("Copy "+curFile+" As"), TRUE, 0);
 
-    if (TabWidget->currentPageIndex() == 0) {
-      for ( QStringList::Iterator it = curFileList.begin(); it != curFileList.end(); ++it ) {
-        QString destFile;
-        curFile = currentDir.canonicalPath()+"/"+(*it);
-        fileDlg->setInputText((const QString &) destFile );
-        fileDlg->exec();
-        if( fileDlg->result() == 1 ) {
-          QString  filename = fileDlg->LineEdit1->text();
-          destFile = currentRemoteDir.canonicalPath()+"/"+(*it);
-
-          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);
-            qWarning("nothin doing");
-          }
+      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);
+          qWarning("nothin doing");
         }
       }
-      populateRemoteView();
-      TabWidget->setCurrentPage(1);
-    } else {
-      if (TabWidget->currentPageIndex() == 0) {
-        for ( QStringList::Iterator it = curFileList.begin(); it != curFileList.end(); ++it ) {
+      delete fileDlg;
 
-          curFile = currentDir.canonicalPath()+"/"+(*it);
-          QString destFile;
-          fileDlg->setInputText((const QString &) destFile);
-          fileDlg->exec();
-          if( fileDlg->result() == 1 ) {
-            QString  filename = fileDlg->LineEdit1->text();
-            destFile = currentDir.canonicalPath()+"/"+(*it);
-
-            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);
-              qWarning("nothin doing");
-            }
-                        
-          }
+    }
+    populateRemoteView();
+    TabWidget->setCurrentPage(1);
+
+  } else {
+    for ( QStringList::Iterator it = curFileList.begin(); it != curFileList.end(); ++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("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;
+          };
         }
-        populateLocalView();
-        TabWidget->setCurrentPage(0);
+        if(!copyFile(destFile, curFile) ) {
+          QMessageBox::message("AdvancedFm",tr("Could not copy\n")+curFile +tr("to\n")+destFile);
+          qWarning("nothin doing");
+        }
+                        
       }
+      delete fileDlg;
+
     }
+    populateLocalView();
+    TabWidget->setCurrentPage(0);
   }
-
 }
 
 void AdvancedFm::copySameDir() {
+  qApp->processEvents();
   QStringList curFileList = getPath();
-  if( curFileList.count() > 0) {
-    QString curFile;
-    InputDialog *fileDlg;
+  QString curFile;
+  InputDialog *fileDlg;
 
-    if (TabWidget->currentPageIndex() == 0) {
-      for ( QStringList::Iterator it = curFileList.begin(); it != curFileList.end(); ++it ) {
-        QString destFile;
-        curFile = currentDir.canonicalPath()+"/"+(*it);
-        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:
-              qDebug("");
-              f.remove();
-              break;
-            case 1:
-              return;
-              break;
-            };
-          }
-          if(!copyFile(destFile, curFile) ) {
-            QMessageBox::message("AdvancedFm",tr("Could not copy\n")+curFile +tr("to\n")+destFile);
-            qWarning("nothin doing");
-          }
-                    
-          qDebug("copy "+curFile+" as "+destFile);
+  if (TabWidget->currentPageIndex() == 0) {
+
+    for ( QStringList::Iterator it = curFileList.begin(); it != curFileList.end(); ++it ) {
+
+      QString destFile;
+      curFile = currentDir.canonicalPath()+"/"+(*it);
+
+      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:
+            qDebug("");
+            f.remove();
+            break;
+          case 1:
+            return;
+            break;
+          };
         }
-        delete fileDlg;
+        if(!copyFile(destFile, curFile) ) {
+          QMessageBox::message("AdvancedFm",tr("Could not copy\n")+curFile +tr("to\n")+destFile);
+          qWarning("nothin doing");
+        }
+                    
+        qDebug("copy "+curFile+" as "+destFile);
       }
-      populateRemoteView();
-      TabWidget->setCurrentPage(1);
-    } else {
-      if (TabWidget->currentPageIndex() == 0) {
-        for ( QStringList::Iterator it = curFileList.begin(); it != curFileList.end(); ++it ) {
+      delete fileDlg;
+    }
+    populateLocalView();
 
-          curFile = currentRemoteDir.canonicalPath()+"/"+(*it);
-          fileDlg = new InputDialog(this,tr("Copy ")+curFile+tr(" 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("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);
-              qWarning("nothin doing");
-            }
-            qDebug("copy "+curFile+" as "+destFile);
-          }
-          delete fileDlg;
+  } else {
+    for ( QStringList::Iterator it = curFileList.begin(); it != curFileList.end(); ++it ) {
+
+      curFile = currentRemoteDir.canonicalPath()+"/"+(*it);
+
+      fileDlg = new InputDialog(this,tr("Copy ")+curFile+tr(" As"),TRUE, 0);
+      QString destFile;
+      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;
+          };
         }
-        populateLocalView();
-        TabWidget->setCurrentPage(0);
+        if(!copyFile(destFile, curFile) ) {
+          QMessageBox::message("AdvancedFm",tr("Could not copy\n")+curFile +tr("to\n")+destFile);
+          qWarning("nothin doing");
+        }
+        qDebug("copy "+curFile+" as "+destFile);
       }
+      delete fileDlg;
     }
+    populateRemoteView();
   }
-
 }
  
 void AdvancedFm::move() {
+  qApp->processEvents();
 
   QStringList curFileList = getPath();
   if( curFileList.count() > 0) {
     QString curFile;
-    //    qDebug(curFile);
     QString destFile;
 
     if (TabWidget->currentPageIndex() == 0) {
+
       for ( QStringList::Iterator it = curFileList.begin(); it != curFileList.end(); ++it ) {
+
         QString destFile =  currentRemoteDir.canonicalPath();
+
         if(destFile.right(1).find("/",0,TRUE) == -1)
           destFile+="/";
         destFile +=(*it);
         curFile = currentDir.canonicalPath();
+
         qDebug("Destination file is "+destFile);
+
         if(curFile.right(1).find("/",0,TRUE) == -1)
           curFile +="/";
+
         curFile+=(*it);
+        qDebug("CurrentFile file is " + curFile);
 
-        QFile f(destFile);
+        QFile f( curFile);
         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(tr("Note"),tr("Could not move\n")+curFile);
             return;
-          }
-          QFile::remove(curFile);
+          } else
+            QFile::remove(curFile);
         }
       }
+
       TabWidget->setCurrentPage(1);
-    } else {
+
+    } else { //view 2
+
       for ( QStringList::Iterator it = curFileList.begin(); it != curFileList.end(); ++it ) {
-        QString destFile = currentRemoteDir.canonicalPath();
+
+        QString destFile = currentDir.canonicalPath();
+
         if(destFile.right(1).find("/",0,TRUE) == -1)
           destFile+="/";
+
         destFile +=(*it);
+
         qDebug("Destination file is "+destFile);
-        curFile = currentDir.canonicalPath();
+
+        curFile = currentRemoteDir.canonicalPath();
+
         if(curFile.right(1).find("/",0,TRUE) == -1)
           curFile +="/";
         curFile+=(*it);
+        qDebug("CurrentFile file is " + curFile);
 
-        QFile f(destFile);
+        QFile f( curFile);
         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(tr("Note"),tr("Could not move\n")+curFile);
+          if(!copyFile( destFile, curFile) ) {
+            QMessageBox::message(tr("Note"),tr("Could not move\n") + curFile);
             return;
-          }
+          } else
+            QFile::remove( curFile);
         }
-        QFile::remove(curFile);
         TabWidget->setCurrentPage(0);
       }
     }
     populateRemoteView();
     populateLocalView();
   }
 }
 
-bool AdvancedFm::copyFile( const QString & dest, const QString & src )
-{
+bool AdvancedFm::copyFile( const QString & dest, const QString & src ) {
   char bf[ 50000 ];
   int  bytesRead;
   bool success = TRUE;
   struct stat status;
 
   QFile s( src );
   QFile d( dest );
 
   if( s.open( IO_ReadOnly | IO_Raw ) &&  d.open( IO_WriteOnly | IO_Raw ) )  {
     while( (bytesRead = s.readBlock( bf, sizeof( bf ) )) == sizeof( bf ) ) {
       if( d.writeBlock( bf, sizeof( bf ) ) != sizeof( bf ) ){
         success = FALSE;
         break;
       }
     }
     if( success && (bytesRead > 0) ){
       d.writeBlock( bf, bytesRead );
     }
   } else {
     success = FALSE;
   }
 
   // Set file permissions
   if( stat( (const char *) src, &status ) == 0 ){
     chmod( (const char *) dest, status.st_mode );
   }
 
   return success;
 }
 
 void AdvancedFm::runCommand() {
   QString curFile;
   if (TabWidget->currentPageIndex() == 0) {
     if( Local_View->currentItem())
       curFile = currentDir.canonicalPath() +"/"+ Local_View->currentItem()->text(0);
   } else {
     if(Remote_View->currentItem())
       curFile = currentRemoteDir.canonicalPath() + "/"+Remote_View->currentItem()->text(0);
   }
 
   InputDialog *fileDlg;
   fileDlg = new InputDialog(this,tr("Run Command"),TRUE, 0);
   fileDlg->setInputText(curFile);
   fileDlg->exec();
   QString command;
   if( fileDlg->result() == 1 ) {
     command = fileDlg->LineEdit1->text();
 
     Output *outDlg;
     outDlg = new Output(this, tr("AdvancedFm Output"),FALSE);
     outDlg->showMaximized();
     outDlg->show();
     qApp->processEvents();
     FILE *fp;
     char line[130];
     sleep(1);
     command +=" 2>&1";
     fp = popen(  (const char *) command, "r");
     if ( !fp ) {
       qDebug("Could not execute '" + command + "'! err=%d", fp);
       QMessageBox::warning( this, "AdvancedFm", tr("command failed!"), tr("&OK") );
       pclose(fp);
       return;
     } else {
       while ( fgets( line, sizeof line, fp)) {
         QString lineStr = line;
         lineStr=lineStr.left(lineStr.length()-1);
         outDlg->OutputEdit->append(lineStr);
         outDlg->OutputEdit->setCursorPosition(outDlg->OutputEdit->numLines() + 1,0,FALSE);
       }
     }
     pclose(fp);
 
   }
 }
 
 void AdvancedFm::runCommandStd() {
   QString curFile;
   if (TabWidget->currentPageIndex() == 0) {
     if( Local_View->currentItem())
       curFile = currentDir.canonicalPath() +"/"+  Local_View->currentItem()->text(0);
   } else {
     if(Remote_View->currentItem())
       curFile = currentRemoteDir.canonicalPath() +"/"+  Remote_View->currentItem()->text(0);
   }
 
   InputDialog *fileDlg;
   fileDlg = new InputDialog(this,tr("Run Command"),TRUE, 0);
   fileDlg->setInputText(curFile);
   fileDlg->exec();
   QString command;
   if( fileDlg->result() == 1 ) {
     qApp->processEvents();
     command = fileDlg->LineEdit1->text() + " &";
     system(command.latin1());
   }
 }
 
 void AdvancedFm::fileStatus() {
   QString curFile;
   if (TabWidget->currentPageIndex() == 0) {
     curFile = Local_View->currentItem()->text(0);
   } else {
     curFile = Remote_View->currentItem()->text(0);
   }
   QString command = " stat -l "+ curFile +" 2>&1";
   Output *outDlg;
   outDlg = new Output(this, tr("AdvancedFm Output"),FALSE);
   outDlg->showMaximized();
   outDlg->show();
   qApp->processEvents();
   FILE *fp;
   char line[130];
   sleep(1);
   fp = popen(  (const char *) command, "r");
   if ( !fp ) {
     qDebug("Could not execute '" + command + "'! err=%d", fp);
     QMessageBox::warning( this, "AdvancedFm", tr("command failed!"), tr("&OK") );
     pclose(fp);
     return;
   } else {
     while ( fgets( line, sizeof line, fp)) {
       outDlg->OutputEdit->append(line);
       outDlg->OutputEdit->setCursorPosition(outDlg->OutputEdit->numLines() + 1,0,FALSE);
 
     }
 
   }
   pclose(fp);
 }
 
 void AdvancedFm::mkDir() {
   if (TabWidget->currentPageIndex() == 0)
     localMakDir();
   else
     remoteMakDir();
 
 }
 
 void AdvancedFm::rn() {
   if (TabWidget->currentPageIndex() == 0)
     localRename();
   else
     remoteRename();
 
 }
 
 void AdvancedFm::del() {
   if (TabWidget->currentPageIndex() == 0)
     localDelete();
   else
     remoteDelete();
 }
 
 void AdvancedFm::doAbout() {
   QMessageBox::message("AdvancedFm",tr("Advanced FileManager\n"
                                        "is copyright 2002 by\n"
                                        "L.J.Potter<llornkcor@handhelds.org>\n"
                                        "and is licensed by the GPL"));
 }
 
 void AdvancedFm::keyReleaseEvent( QKeyEvent *e)
 {
   if( TabWidget->hasFocus()) 
     switch ( e->key() ) {
     case Key_Delete:
       del();
       break;
     case Key_H:
       showHidden();
       break;
     case Key_E:
       runThis();
       break;
     case Key_C:
       copy();
       break;
     case Key_A:
       copyAs();
       break;
     case Key_M:
       move();
       break;
     case Key_R:
       rn();
       break;
     case Key_I:
       fileStatus();
       break;
     case Key_U:
       upDir();
       break;