from 1.0, needs fix

3 files changed, 63 insertions, 10 deletions

diff --git a/noncore/apps/advancedfm/advancedfm.cpp b/noncore/apps/advancedfm/advancedfm.cpp
index 2fc4b49..ecf471d 100644
--- a/noncore/apps/advancedfm/advancedfm.cpp
+++ b/noncore/apps/advancedfm/advancedfm.cpp
@@ -99,17 +99,20 @@ void AdvancedFm::tabChanged(QWidget *) {
               +checkDiskSpace( (const QString &) path )+ tr(" kB free") );
    chdir( path.latin1());
 }
 
 
 void AdvancedFm::populateView() {
+
+qWarning("PopulateView");
    QPixmap pm;
    QListView *thisView = CurrentView();
    QDir *thisDir = CurrentDir();
    QString path = thisDir->canonicalPath();
-//   qWarning("path is "+path);
+
+qWarning("path is "+path);
    thisView->clear();
    thisDir->setSorting(/* QDir::Size*/ /*| QDir::Reversed | */QDir::DirsFirst);
    thisDir->setMatchAllDirs(TRUE);
    thisDir->setNameFilter(filterStr);
    QString fileL, fileS, fileDate;
    QString fs= getFileSystemType((const QString &) path);
@@ -806,13 +809,13 @@ QListView * AdvancedFm::OtherView() {
       return Remote_View;
    else
       return Local_View;
 }
 
 void AdvancedFm::setOtherTabCurrent() {
-//   qWarning("setOtherTabCurrent()");
+   qWarning("setOtherTabCurrent() %d", whichTab);
    if ( whichTab == 1) {
       TabWidget->setCurrentWidget(1);
    } else {
       TabWidget->setCurrentWidget(0);
    }
    OtherView()->setFocus();
diff --git a/noncore/apps/advancedfm/advancedfm.h b/noncore/apps/advancedfm/advancedfm.h
index 5f6eabb..be574c4 100644
--- a/noncore/apps/advancedfm/advancedfm.h
+++ b/noncore/apps/advancedfm/advancedfm.h
@@ -151,13 +151,15 @@ protected slots:
    bool copyFile( const QString & , const QString & );
    void move();
    void fileStatus();
    void doAbout();
    void doBeam();
    void fileBeamFinished( Ir *);
-
+   bool copyDirectory( const QString & , const QString & );
+//   void navigateToSelected();
+           bool moveDirectory( const QString & , const QString & ); 
 //   void slotSwitchtoLocal(int);
 
 private:
    MenuButton *menuButton;
    QString oldName;
    QTimer menuTimer;
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);
 }
@@ -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();
+                        rePopulate();
    }
 }
 
 void AdvancedFm::copyAs() {
    qApp->processEvents();
 
@@ -435,13 +435,13 @@ void AdvancedFm::copySameDir() {
             }
 
 //          qDebug("copy "+curFile+" as "+destFile);
         }
       delete fileDlg;
     }
-  populateView();
+                        rePopulate();
 }
 
 void AdvancedFm::move() {
   qApp->processEvents();
 
   QStringList curFileList = getPath();
@@ -462,12 +462,18 @@ void AdvancedFm::move() {
           curFile = thisDir->canonicalPath();
           if(curFile.right(1).find("/",0,TRUE) == -1)
             curFile +="/";
           curFile+= item;
 //          qDebug("CurrentFile file is " + 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;
               } else
@@ -477,13 +483,55 @@ void AdvancedFm::move() {
 
   }
   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 ) {
+
+                
+                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;
@@ -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"));
 }