1 files changed, 81 insertions, 33 deletions

diff --git a/noncore/apps/advancedfm/advancedfmMenu.cpp b/noncore/apps/advancedfm/advancedfmMenu.cpp
index c0be948..90c887f 100644
--- a/noncore/apps/advancedfm/advancedfmMenu.cpp
+++ b/noncore/apps/advancedfm/advancedfmMenu.cpp
@@ -65,25 +65,25 @@ void AdvancedFm::showMenuHidden() {
       fileMenu->setItemChecked( fileMenu->idAt(0),TRUE);
     } else {
       CurrentDir()->setFilter( QDir::Files | QDir::Dirs/* | QDir::Hidden*/ | QDir::All);
       OtherDir()->setFilter( QDir::Files | QDir::Dirs/* | QDir::Hidden*/ | QDir::All);
       fileMenu->setItemChecked( fileMenu->idAt(0),FALSE);
     }
-  rePopulate();
      b = !b;
+                 populateView();
 }
 
 void AdvancedFm::showHidden() {
   if (b) {
       CurrentDir()->setFilter( QDir::Files | QDir::Dirs | QDir::Hidden | QDir::All);
       OtherDir()->setFilter( QDir::Files | QDir::Dirs | QDir::Hidden | QDir::All);
     }  else {
       CurrentDir()->setFilter( QDir::Files | QDir::Dirs/* | QDir::Hidden*/ | QDir::All);
       OtherDir()->setFilter( QDir::Files | QDir::Dirs/* | QDir::Hidden*/ | QDir::All);
     }
-  rePopulate();
+                 populateView();
 }
 
 QString AdvancedFm::dealWithSymName(const QString &fileName) {
    QString strItem = fileName;
    return  strItem.right( (strItem.length() - strItem.find("->",0,TRUE)) - 4);
 }
@@ -143,13 +143,13 @@ void AdvancedFm::makeDir() {
   fileDlg->exec();
   if( fileDlg->result() == 1 ) {
       QDir *thisDir = CurrentDir();
       QString  filename = fileDlg->LineEdit1->text();
       thisDir->mkdir( thisDir->canonicalPath()+"/"+filename);
   }
-  populateView();
+        populateView();
 }
 
 void AdvancedFm::doDelete() {
    QStringList curFileList = getPath();
    bool doMsg=true;
    int count = curFileList.count();
@@ -188,13 +188,13 @@ void AdvancedFm::doDelete() {
                                            tr("Yes"), tr("No"), 0, 0, 1) ) {
             case 0:
             {
                f=f.left(f.length()-1);
                QString cmd="rm -rf "+f;
                startProcess( (const QString)cmd.latin1() );
-               populateView();
+                                                         populateView();
             }
             break;
             case 1:
                // exit
                break;
             };
@@ -225,13 +225,13 @@ void AdvancedFm::doDelete() {
                // delete lnk;
                file.remove();
             }
          }
       }
    }
-   populateView();
+        populateView();
 }
 
 void AdvancedFm::filePerms() {
    QStringList curFileList = getPath();
    QString filePath;
 
@@ -242,13 +242,13 @@ void AdvancedFm::filePerms() {
       filePerm = new filePermissions(this, "Permissions",true,0,(const QString &)(filePath+*it));
       filePerm->showMaximized();
       filePerm->exec();
       if( filePerm)
          delete  filePerm;
    }
-   populateView();
+        populateView();
 }
 
 void AdvancedFm::doProperties() {
 #if defined(QT_QWS_OPIE)
 
    QStringList curFileList = getPath();
@@ -275,13 +275,13 @@ void AdvancedFm::upDir() {
   QDir dir(current);
   dir.cdUp();
   current = dir.canonicalPath();
   chdir( current.latin1() );
   thisDir->cd(  current, TRUE);
 
-  populateView();
+        populateView();
   update();
 }
 
 void AdvancedFm::copy() {
    qApp->processEvents();
    QStringList curFileList = getPath();
@@ -336,14 +336,14 @@ void AdvancedFm::copy() {
          if( !copyFile( curFile, destFile) )  {
             QMessageBox::message("AdvancedFm",
                                  tr( "Could not copy %1 to %2").arg( curFile ).arg( destFile ) );
             return;
          }
       }
-      rePopulate();
-      setOtherTabCurrent();
+                        setOtherTabCurrent();
+                        rePopulate();
    }
 }
 
 void AdvancedFm::copyAs() {
    qApp->processEvents();
 
@@ -386,14 +386,14 @@ void AdvancedFm::copyAs() {
             return;
          }
       }
       delete fileDlg;
 
    }
-   rePopulate();
-   setOtherTabCurrent();
+                        rePopulate();
+                        setOtherTabCurrent();
 }
 
 void AdvancedFm::copySameDir() {
   qApp->processEvents();
   QStringList curFileList = getPath();
   QString curFile, item, destFile;
@@ -435,13 +435,13 @@ void AdvancedFm::copySameDir() {
             }
 
 //          qDebug("copy "+curFile+" as "+destFile);
         }
       delete fileDlg;
     }
-  populateView();
+                        rePopulate();
 }
 
 void AdvancedFm::move() {
   qApp->processEvents();
 
   QStringList curFileList = getPath();
@@ -458,38 +458,86 @@ void AdvancedFm::move() {
             destFile+="/";
           destFile += item;
 //          qDebug("Destination file is "+destFile);
 
           curFile = thisDir->canonicalPath();
           if(curFile.right(1).find("/",0,TRUE) == -1)
-            curFile +="/";
+                                                        curFile +="/";
           curFile+= item;
 //          qDebug("CurrentFile file is " + curFile);
 
-          QFile f( curFile);
+          if(QFileInfo(curFile).isDir()) {
+                                                        moveDirectory( curFile, destFile );
+                                                        rePopulate();
+                                                        return;
+          }
+
+                                        QFile f( curFile);
           if( f.exists()) {
-            if( !copyFile(  curFile, destFile) )  {
-                QMessageBox::message(tr("Note"),tr("Could not move\n")+curFile);
-                return;
+                                                        if( !copyFile(  curFile, destFile) )  {
+                                                                        QMessageBox::message(tr("Note"),tr("Could not move\n")+curFile);
+                                                                        return;
               } else
-                QFile::remove(curFile);
+                                                                        QFile::remove(curFile);
           }
-        }
+                        }
 
   }
-  rePopulate();
-  setOtherTabCurrent();
+                        rePopulate();
+                        setOtherTabCurrent();
+}
+
+bool AdvancedFm::moveDirectory( const QString & src, const QString & dest ) {
+                int err = 0;
+                if( copyDirectory( src, dest ) ) {      QString cmd = "rm -rf " + src;
+                err = system((const char*)cmd);
+                } else
+                                err = -1;
+   
+                if(err!=0) {
+                                QMessageBox::message(tr("Note"),tr("Could not move\n") + src);
+                                return false;
+                }
+                return true;
 }
 
+bool AdvancedFm::copyDirectory( const QString & src, const QString & dest ) {
+
+                        QStringcmd = "/bin/cp -fpR " + src + " " + dest;
+    qWarning(cmd);
+                        interr = system( (const char *) cmd );
+                if ( err != 0 ) {
+                                QMessageBox::message("AdvancedFm",
+                                                                                                                 tr( "Could not copy \n%1 \nto \n%2").arg( src ).arg( dest ) );
+                                return false;
+                }
+
+                return true;
+}
+ 
+
 bool AdvancedFm::copyFile( const QString & src, const QString & dest ) {
-   bool success = true;
-   struct stat status;
-   QFile srcFile(src);
-   QFile destFile(dest);
-   int err=0;   
-   int read_fd=0;
+
+                
+                if(QFileInfo(src).isDir()) {
+                                if( copyDirectory( src, dest )) {
+                                                setOtherTabCurrent();
+                                                populateView();
+                                                return true;
+                                }
+                                else
+                                                return false;
+                }
+
+
+                bool success = true;
+                struct stat status;
+                QFile srcFile(src);
+                QFile destFile(dest);
+                int err=0;   
+                int read_fd=0;
    int write_fd=0;
    struct stat stat_buf;
    off_t offset = 0;
       if(!srcFile.open( IO_ReadOnly|IO_Raw)) {
 //         qWarning("open failed");
          return success = false;
@@ -630,15 +678,15 @@ void AdvancedFm::mkSym() {
             }
 
           cmd = "ln -s "+curFile+" "+destName;
 //          qDebug(cmd);
           startProcess( (const QString)cmd );
         }
-      rePopulate();
-      setOtherTabCurrent();
-    }
+                        rePopulate();
+                        setOtherTabCurrent();
+        }
 }
 
 void AdvancedFm::doBeam() {
    Ir ir;
    if(!ir.supported())  {
    } else {
@@ -684,13 +732,13 @@ void AdvancedFm::startProcess(const QString & cmd) {
   *process << command;
   if(!process->start(OProcess::NotifyOnExit, OProcess::All) )
     qDebug("could not start process");
 }
 
 void AdvancedFm::processEnded(OProcess *) {
-  populateView();
+                        rePopulate();
 }
 
 void AdvancedFm::oprocessStderr(OProcess*, char *buffer, int ) {
 //    qWarning("received stderrt %d bytes", buflen);
 
     QString lineStr = buffer;
@@ -772,13 +820,13 @@ void AdvancedFm::doRename(QListView * view) {
 
 void AdvancedFm::renameIt() {
    if( !CurrentView()->currentItem()) return;
    QListView *thisView = CurrentView();
     oldName = thisView->currentItem()->text(0);
     doRename( thisView );
-    populateView();
+                        rePopulate();
 }
 
 void AdvancedFm::okRename() {
    if( !CurrentView()->currentItem()) return;
    QString newName = renameBox->text();
    cancelRename();
@@ -791,12 +839,12 @@ void AdvancedFm::okRename() {
       QMessageBox::message(tr("Note"),tr("Could not rename"));
    else
       oldName = "";
 
    view->takeItem( view->currentItem() );
    delete view->currentItem();
-   populateView();
+                        rePopulate();
 }
 
 void AdvancedFm::openSearch() {
     QMessageBox::message(tr("Note"),tr("Not Yet Implemented"));
 }