3 files changed, 186 insertions, 133 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
@@ -81,154 +81,157 @@ void AdvancedFm::cleanUp() {
 }
 
 void AdvancedFm::tabChanged(QWidget *) {
 //   qWarning("tab changed");
    QString path = CurrentDir()->canonicalPath();
    currentPathCombo->lineEdit()->setText( path );
 
    if(whichTab == 1) {
       viewMenu->setItemChecked(viewMenu->idAt(0), true);
       viewMenu->setItemChecked(viewMenu->idAt(1), false);
    } else {
       viewMenu->setItemChecked(viewMenu->idAt(0), false);
       viewMenu->setItemChecked(viewMenu->idAt(1), true);
    }
 
    QString fs= getFileSystemType( (const QString &)  path);
 
    setCaption(tr("AdvancedFm :: ")+fs+" :: "
               +checkDiskSpace( (const QString &) path )+ tr(" kB free") );
    chdir( path.latin1());
 }
 
 
 void AdvancedFm::populateView() {
-   QPixmap pm;
-   QListView *thisView = CurrentView();
-   QDir *thisDir = CurrentDir();
-   QString path = thisDir->canonicalPath();
-//   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);
-   setCaption(tr("AdvancedFm :: ")+fs+" :: "
-              +checkDiskSpace((const QString &) path)+ tr(" kB free") );
-   bool isDir=FALSE;
-   const QFileInfoList *list = thisDir->entryInfoList( /*QDir::All*/ /*, QDir::SortByMask*/);
-   QFileInfoListIterator it(*list);
-   QFileInfo *fi;
-   while ( (fi=it.current()) ) {
-      if (fi->isSymLink() )  {
-         QString symLink=fi->readLink();
-         QFileInfo sym( symLink);
-         fileS.sprintf( "%10i", sym.size() );
-         fileL =  fi->fileName() +" ->  " + sym.filePath().data();
-         fileDate = sym.lastModified().toString();
-      }  else  {
-         fileS.sprintf( "%10i", fi->size() );
-         fileL = fi->fileName();
-         fileDate= fi->lastModified().toString();
-         if( QDir(QDir::cleanDirPath( path +"/"+fileL)).exists() ) {
-//           if(fileL == "..")
-            fileL += "/";
-            isDir=TRUE;
-         }
-      }
-      QFileInfo fileInfo(  path + "/" + fileL);
 
-      if(fileL !="./" && fi->exists())  {
-         item = new QListViewItem( thisView, fileL, fileS , fileDate);
-
-         if(isDir || fileL.find("/",0,TRUE) != -1) {
-
-            if( !QDir( fi->filePath() ).isReadable()) //is directory
-               pm = Resource::loadPixmap( "lockedfolder" );
-            else
-               pm= Resource::loadPixmap( "folder" );
-         }
-         else if ( fs == "vfat" && fileInfo.filePath().contains("/bin") ) {
-            pm = Resource::loadPixmap( "exec");
-         }
-         else if( (fileInfo.permission( QFileInfo::ExeUser)
-                   | fileInfo.permission( QFileInfo::ExeGroup)
-                   | fileInfo.permission( QFileInfo::ExeOther)) && fs != "vfat" ) {
-            pm = Resource::loadPixmap( "exec");
-         }
-         else if( !fi->isReadable() )  {
-            pm = Resource::loadPixmap( "locked" );
-         }
-         else { //everything else goes by mimetype
-            MimeType mt(fi->filePath());
-            pm=mt.pixmap(); //sets the correct pixmap for mimetype
-            if(pm.isNull()) {
-               pm = unknownXpm;
-            }
-         }
-         if(  fi->isSymLink() || fileL.find("->",0,TRUE) != -1) {
-            //  qDebug(" overlay link image");
-            pm= Resource::loadPixmap( "advancedfm/symlink" );
-            //              pm= Resource::loadPixmap( "folder" );
+qWarning("PopulateView");
+                QPixmap pm;
+                QListView *thisView = CurrentView();
+                QDir *thisDir = CurrentDir();
+                QString path = thisDir->canonicalPath();
+
+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);
+                setCaption(tr("AdvancedFm :: ")+fs+" :: "
+                                                         +checkDiskSpace((const QString &) path)+ tr(" kB free") );
+                bool isDir=FALSE;
+                const QFileInfoList *list = thisDir->entryInfoList( /*QDir::All*/ /*, QDir::SortByMask*/);
+                QFileInfoListIterator it(*list);
+                QFileInfo *fi;
+                while ( (fi=it.current()) ) {
+                                if (fi->isSymLink() )  {
+                                                QString symLink=fi->readLink();
+                                                QFileInfo sym( symLink);
+                                                fileS.sprintf( "%10i", sym.size() );
+                                                fileL =  fi->fileName() +" ->  " + sym.filePath().data();
+                                                fileDate = sym.lastModified().toString();
+                                }  else  {
+                                                fileS.sprintf( "%10i", fi->size() );
+                                                fileL = fi->fileName();
+                                                fileDate= fi->lastModified().toString();
+                                                if( QDir(QDir::cleanDirPath( path +"/"+fileL)).exists() ) {
+//           if(fileL == "..")
+                                                                fileL += "/";
+                                                                isDir=TRUE;
+                                                }
+                                }
+                                QFileInfo fileInfo(  path + "/" + fileL);
+
+                                if(fileL !="./" && fi->exists())  {
+                                                item = new QListViewItem( thisView, fileL, fileS , fileDate);
+
+                                                if(isDir || fileL.find("/",0,TRUE) != -1) {
+
+                                                                if( !QDir( fi->filePath() ).isReadable()) //is directory
+                                                                                pm = Resource::loadPixmap( "lockedfolder" );
+                                                                else
+                                                                                pm= Resource::loadPixmap( "folder" );
+                                                }
+                                                else if ( fs == "vfat" && fileInfo.filePath().contains("/bin") ) {
+                                                                pm = Resource::loadPixmap( "exec");
+                                                }
+                                                else if( (fileInfo.permission( QFileInfo::ExeUser)
+                                                                                        | fileInfo.permission( QFileInfo::ExeGroup)
+                                                                                        | fileInfo.permission( QFileInfo::ExeOther)) && fs != "vfat" ) {
+                                                                pm = Resource::loadPixmap( "exec");
+                                                }
+                                                else if( !fi->isReadable() )  {
+                                                                pm = Resource::loadPixmap( "locked" );
+                                                }
+                                                else { //everything else goes by mimetype
+                                                                MimeType mt(fi->filePath());
+                                                                pm=mt.pixmap(); //sets the correct pixmap for mimetype
+                                                                if(pm.isNull()) {
+                                                                                pm = unknownXpm;
+                                                                }
+                                                }
+                                                if(  fi->isSymLink() || fileL.find("->",0,TRUE) != -1) {
+                                                                        //  qDebug(" overlay link image");
+                                                                pm= Resource::loadPixmap( "advancedfm/symlink" );
+                                                                        //              pm= Resource::loadPixmap( "folder" );
 //                QPixmap lnk = Resource::loadPixmap( "opie/symlink" );
 //                QPainter painter( &pm );
 //                painter.drawPixmap( pm.width()-lnk.width(), pm.height()-lnk.height(), lnk );
 //                pm.setMask( pm.createHeuristicMask( FALSE ) );
-         }
-         item->setPixmap( 0,pm);
-
-      }
-      isDir=FALSE;
-      ++it;
-   }
-
-   if( path.find("dev",0,TRUE) != -1) {
-      struct stat buf;
-      dev_t devT;
-      DIR *dir;
-      struct dirent *mydirent;
-
-      if((dir = opendir( path.latin1())) != NULL)
-         while ((mydirent = readdir(dir)) != NULL) {
-            lstat( mydirent->d_name, &buf);
+                                                }
+                                                item->setPixmap( 0,pm);
+
+                                }
+                                isDir=FALSE;
+                                ++it;
+                }
+
+                if( path.find("dev",0,TRUE) != -1) {
+                                struct stat buf;
+                                dev_t devT;
+                                DIR *dir;
+                                struct dirent *mydirent;
+
+                                if((dir = opendir( path.latin1())) != NULL)
+                                                while ((mydirent = readdir(dir)) != NULL) {
+                                                                lstat( mydirent->d_name, &buf);
 //        qDebug(mydirent->d_name);
-            fileL.sprintf("%s", mydirent->d_name);
-            devT = buf.st_dev;
-            fileS.sprintf("%d, %d", (int) ( devT >>8) &0xFF, (int)devT &0xFF);
-            fileDate.sprintf("%s", ctime( &buf.st_mtime));
-            if( fileL.find(".") == -1 ) {
-               item= new QListViewItem( thisView, fileL, fileS, fileDate);
-               pm = unknownXpm;
-               item->setPixmap( 0,pm);
-            }
-         }
+                                                                fileL.sprintf("%s", mydirent->d_name);
+                                                                devT = buf.st_dev;
+                                                                fileS.sprintf("%d, %d", (int) ( devT >>8) &0xFF, (int)devT &0xFF);
+                                                                fileDate.sprintf("%s", ctime( &buf.st_mtime));
+                                                                if( fileL.find(".") == -1 ) {
+                                                                                item= new QListViewItem( thisView, fileL, fileS, fileDate);
+                                                                                pm = unknownXpm;
+                                                                                item->setPixmap( 0,pm);
+                                                                }
+                                                }
 
-      closedir(dir);
-   }
+                                closedir(dir);
+                }
 
-   thisView->setSorting( 3,FALSE);
-   fillCombo( (const QString &) path );
+                thisView->setSorting( 3,FALSE);
+                fillCombo( (const QString &) path );
 }
 
 void AdvancedFm::rePopulate() {
      populateView();
      setOtherTabCurrent();
      populateView();
 
 //      int tmpTab = whichTab;
 // //  qDebug("%d", tmpTab);
 
 //    for(int i =1; i < 3; i++) {
 //       TabWidget->setCurrentWidget(i - 1);
 //       populateView();
 //    }
 //    TabWidget->setCurrentWidget( tmpTab - 1);
 }
 
 void AdvancedFm::ListClicked(QListViewItem *selectedItem) {
 //qWarning("listclicked");
    if(selectedItem) {
       QString strItem=selectedItem->text(0);
 //      qWarning(strItem);
       QString strSize=selectedItem->text(1);
       strSize=strSize.stripWhiteSpace();
@@ -788,49 +791,49 @@ QDir *AdvancedFm::OtherDir() {
       return &currentRemoteDir;
    } else {
       return &currentDir;
    }
 }
 
 QListView * AdvancedFm::CurrentView() {
    if ( whichTab == 1) {
 //      qWarning("CurrentView Tab 1");
       return Local_View;
    } else {
 //      qWarning("CurrentView Tab 2");
       return Remote_View;
    }
 }
 
 QListView * AdvancedFm::OtherView() {
    if ( whichTab == 1)
       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();
    OtherView()->setSelected( CurrentView()->firstChild(), true);      
 }
 
 void AdvancedFm::qcopReceive(const QCString &msg, const QByteArray &data) {
 //   qDebug("qcop message "+msg );
    QDataStream stream ( data, IO_ReadOnly );
    if ( msg == "openDirectory(QString)" ) {
 //      qDebug("received");
       QString file;
       stream >> file;
       gotoDirectory( (const QString &) file);
    }
 }
 
 void AdvancedFm::setDocument(const QString &file) {
    gotoDirectory( file);
 
 }
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
@@ -133,49 +133,51 @@ protected:
 
 protected slots:
    void openSearch();
    void dirMenuSelected(int);
    void showFileMenu();
    void cancelMenuTimer();
    void homeButtonPushed();
    void docButtonPushed();
    void SDButtonPushed();
    void CFButtonPushed();
    void QPEButtonPushed();
    void upDir();
    void currentPathComboChanged();
    void copy();
    void copyAs();
    void copySameDir();
    void currentPathComboActivated(const QString &);
    void fillCombo(const QString &);
    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;
    void startProcess(const QString &);
    bool eventFilter( QObject * , QEvent * );
    void cancelRename();
    void doRename(QListView *);
    void okRename();
    void customDirsToMenu();
    void addCustomDir();
    void removeCustomDir();
    void gotoDirectory(const QString &);
    void navigateToSelected();
    void findFile(const QString &);
 
 private slots:
    void processEnded(OProcess *);
    void oprocessStderr(OProcess *, char *, int);
    void gotoCustomDir(const QString &);
    void qcopReceive(const QCString&, const QByteArray&);
    void setDocument(const QString &);
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
@@ -47,61 +47,61 @@
 
 
 void AdvancedFm::doDirChange() {
    QString pathItem = CurrentView()->currentItem()->text(0);
    if( pathItem == "../") {
       ListClicked( CurrentView()->currentItem());
    } else {
       if( pathItem.find(" -> ",0,TRUE) != -1)
          pathItem = dealWithSymName((const QString&)pathItem)+"/";
 //      qWarning(pathItem);
       gotoDirectory( CurrentDir()->path()+"/"+pathItem.left( pathItem.length() - 1) );
    }
 }
 
 void AdvancedFm::showMenuHidden() {
   if (b) {
       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),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);
 }
 
 void AdvancedFm::runThis() {
    if( !CurrentView()->currentItem()) return;
   QString fs;
   QDir *thisDir = CurrentDir();
 
   QString curFile = CurrentView()->currentItem()->text(0);
   QString path = thisDir->canonicalPath();
 
   if( curFile.find("@",0,TRUE) !=-1 || curFile.find("->",0,TRUE) !=-1 )  //if symlink
 
     curFile = dealWithSymName((const QString&)curFile);
 
   if(curFile != "../") {
 
       fs = getFileSystemType((const QString &) path);
       QFileInfo fileInfo( path  + "/" + curFile);
 //      qDebug( fileInfo.owner());
@@ -125,181 +125,181 @@ void AdvancedFm::runThis() {
     }
 }
 
 void AdvancedFm::runText() {
    if( !CurrentView()->currentItem()) return;
   QString curFile = CurrentView()->currentItem()->text(0);
   if(curFile != "../") {
       if( curFile.find("@",0,TRUE) !=-1 || curFile.find("->",0,TRUE) !=-1 )  //if symlink
         curFile = dealWithSymName((const QString&)curFile);
       curFile =  CurrentDir()->canonicalPath()+"/"+curFile;
       QCopEnvelope e("QPE/Application/textedit", "setDocument(QString)" );
       e << curFile;
     }
 }
 
 void AdvancedFm::makeDir() {
   InputDialog *fileDlg;
   fileDlg = new InputDialog(this,tr("Make Directory"),TRUE, 0);
   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();
    if( count > 0)  {
       if(count > 1 ) {
          QString msg;
          msg=tr("Really delete\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 myFile;
 
       for ( QStringList::Iterator it = curFileList.begin(); it != curFileList.end(); ++it ) {
          myFile = (*it);
          if( myFile.find(" -> ",0,TRUE) != -1)
             myFile = myFile.left( myFile.find(" -> ",0,TRUE));
 
          QString f = CurrentDir()->canonicalPath();
          if(f.right(1).find("/",0,TRUE) == -1)
             f += "/";
          f += myFile;
          if(QDir(f).exists() && !QFileInfo(f).isSymLink() ) {
             //if file is a directory
 
             switch ( QMessageBox::warning( this, tr("Delete Directory?"), 
                                            tr("Really delete %1\nand all it's contents ?" ).arg( f ) ,
                                            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;
             };
 
          } else {
             if(doMsg) {
                switch ( QMessageBox::warning(this,tr("Delete"),
                                              tr("Really delete\n%1?").arg( myFile ),
                                              tr("Yes"), tr("No"), 0, 0, 1) ) {
                case 1:
                   return;
                   break;
                };
             }
       
             QString cmd="rm "+f;
             QFile file(f);
             QFileInfo fi(myFile);
             if( fi.fileName().find("../",0,TRUE)==-1) {
 //               qDebug("remove link files "+myFile);
                
 //               DocLnk lnk(f);
                  DocLnk *lnk;
                  lnk = new DocLnk(f);
 //                 qDebug("Deleting doclnk " + lnk->linkFile());
                  if(lnk->isValid())
                     lnk->removeLinkFile();
                // delete lnk;
                file.remove();
             }
          }
       }
    }
-   populateView();
+        populateView();
 }
 
 void AdvancedFm::filePerms() {
    QStringList curFileList = getPath();
    QString filePath;
 
    filePath = CurrentDir()->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;
    }
-   populateView();
+        populateView();
 }
 
 void AdvancedFm::doProperties() {
 #if defined(QT_QWS_OPIE)
 
    QStringList curFileList = getPath();
 
    QString filePath;
    filePath = CurrentDir()->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();
    }
 #endif
 
 }
 
 void AdvancedFm::upDir() {
   QDir *thisDir = CurrentDir();
   QString current = thisDir->canonicalPath();
   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();
 
    QDir *thisDir = CurrentDir();
    QDir *thatDir = OtherDir();
 
    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("Copy"),msg
                                        ,tr("Yes"),tr("No"),0,0,1) )
          {
          case 0:
             doMsg=false;
             break;
          case 1:
             return;
@@ -318,196 +318,244 @@ void AdvancedFm::copy() {
 
 //          qDebug("Destination file is "+destFile);
 //          qDebug("CurrentFile file is " + curFile);
 
          QFile f(destFile);
          if( f.exists()) {
             if(doMsg) {
                switch ( QMessageBox::warning(this,tr("File Exists!"),
                                              tr("%1 exists. Ok to overwrite?").arg( item ),
                                              tr("Yes"),tr("No"),0,0,1) ) {
                case 1:
                   return;
                   break;
                };
             }
             f.remove();
          }
 
          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();
 
    QStringList curFileList = getPath();
    QString curFile, item;
    InputDialog *fileDlg;
 
    QDir *thisDir = CurrentDir();
    QDir *thatDir = OtherDir();
 
    for ( QStringList::Iterator it = curFileList.begin(); it != curFileList.end(); ++it ) {
       QString destFile;
       item=(*it);
       curFile = thisDir->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 = thatDir->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( curFile, destFile) ) {
             QMessageBox::message("AdvancedFm",tr("Could not copy\n")
                                  +curFile +tr("to\n")+destFile);
             return;
          }
       }
       delete fileDlg;
 
    }
-   rePopulate();
-   setOtherTabCurrent();
+                        rePopulate();
+                        setOtherTabCurrent();
 }
 
 void AdvancedFm::copySameDir() {
   qApp->processEvents();
   QStringList curFileList = getPath();
   QString curFile, item, destFile;
   InputDialog *fileDlg;
 
   QDir *thisDir = CurrentDir();
 
   for ( QStringList::Iterator it = curFileList.begin(); it != curFileList.end(); ++it ) {
       item=(*it);
       curFile = thisDir->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 = thisDir->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( curFile,destFile) )  {
               QMessageBox::message("AdvancedFm",tr("Could not copy\n")
                                    +curFile +tr("to\n")+destFile);
               return;
             }
 
 //          qDebug("copy "+curFile+" as "+destFile);
         }
       delete fileDlg;
     }
-  populateView();
+                        rePopulate();
 }
 
 void AdvancedFm::move() {
   qApp->processEvents();
 
   QStringList curFileList = getPath();
   if( curFileList.count() > 0) {
       QString curFile, destFile, item;
 
       QDir *thisDir = CurrentDir();
       QDir *thatDir = OtherDir();
       for ( QStringList::Iterator it = curFileList.begin(); it != curFileList.end(); ++it ) {
           item=(*it);
           QString destFile =  thatDir->canonicalPath();
 
           if(destFile.right(1).find("/",0,TRUE) == -1)
             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;
    }
    read_fd = srcFile.handle();
    if(read_fd != -1) {
       fstat (read_fd, &stat_buf);
       if( !destFile.open( IO_WriteOnly|IO_Raw ) ) {
 //       qWarning("destfile open failed");
        return success = false;
       }
       write_fd = destFile.handle(); 
       if(write_fd != -1) {
          err = sendfile(write_fd, read_fd, &offset, stat_buf.st_size);
            if( err == -1) {
               QString msg;
               switch(err) {
               case EBADF : msg = "The input file was not opened for reading or the output file was not opened for writing. ";
               case EINVAL: msg = "Descriptor is not valid or locked. ";
               case ENOMEM: msg = "Insufficient memory to read from in_fd.";
               case EIO: msg = "Unspecified error while reading from in_fd.";
@@ -612,51 +660,51 @@ void AdvancedFm::del() {
 void AdvancedFm::mkSym() {
   QString cmd;
   QStringList curFileList = getPath();
   if( curFileList.count() > 0) {
       QDir *thisDir = CurrentDir();
       QDir * thatDir = OtherDir();
 
       for ( QStringList::Iterator it = curFileList.begin(); it != curFileList.end(); ++it ) {
 
           QString destName = thatDir->canonicalPath()+"/"+(*it);
           if(destName.right(1) == "/") {
               destName = destName.left( destName.length() -1);
             }
 
           QString curFile =  thisDir->canonicalPath()+"/"+(*it);
 
           if( curFile.right(1) == "/") {
               curFile = curFile.left( curFile.length() -1);
             }
 
           cmd = "ln -s "+curFile+" "+destName;
 //          qDebug(cmd);
           startProcess( (const QString)cmd );
         }
-      rePopulate();
-      setOtherTabCurrent();
-    }
+                        rePopulate();
+                        setOtherTabCurrent();
+        }
 }
 
 void AdvancedFm::doBeam() {
    Ir ir;
    if(!ir.supported())  {
    } else {
       QStringList curFileList = getPath();
       if( curFileList.count() > 0)  {
          for ( QStringList::Iterator it = curFileList.begin(); it != curFileList.end(); ++it ) {
             QString curFile = (*it);
             QString curFilePath =  CurrentDir()->canonicalPath()+"/"+curFile;
             if( curFilePath.right(1) == "/") {
                curFilePath = curFilePath.left( curFilePath.length() -1);
             }
             Ir *file = new Ir(this, "IR");
             connect(file, SIGNAL(done(Ir*)), this, SLOT( fileBeamFinished( Ir * )));
             file->send( curFilePath, curFile );
          }
       }
    }
 }
 
 void AdvancedFm::fileBeamFinished( Ir *) {
   QMessageBox::message( tr("Advancedfm Beam out"), tr("Ir sent.") ,tr("Ok") );
@@ -666,49 +714,49 @@ void AdvancedFm::selectAll() {
   QListView *thisView = CurrentView();
   thisView->selectAll(true);
   thisView->setSelected( thisView->firstChild(),false);
 }
 
 void AdvancedFm::startProcess(const QString & cmd) {
   QStringList command;
   OProcess *process;
   process = new OProcess();
   connect(process, SIGNAL(processExited(OProcess *)),
           this, SLOT( processEnded(OProcess *)));
 
   connect(process, SIGNAL( receivedStderr(OProcess *, char *, int)),
             this, SLOT( oprocessStderr(OProcess *, char *, int)));
 
   command << "/bin/sh";
   command << "-c";
   command << cmd.latin1();
   *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;
     QMessageBox::warning( this, tr("Error"), lineStr ,tr("Ok") );
 }
 
 bool AdvancedFm::eventFilter( QObject * o, QEvent * e ) {
   if ( o->inherits( "QLineEdit" ) )  {
       if ( e->type() == QEvent::KeyPress ) {
           QKeyEvent *ke = (QKeyEvent*)e;
           if ( ke->key() == Key_Return ||
                ke->key() == Key_Enter )  {
               okRename();
               return true;
             }
           else if ( ke->key() == Key_Escape ) {
                 cancelRename();
                 return true;
               }
         }
       else if ( e->type() == QEvent::FocusOut ) {
@@ -754,49 +802,49 @@ void AdvancedFm::doRename(QListView * view) {
     r.setX( view->contentsX() );
     if ( r.width() > view->visibleWidth() )
         r.setWidth( view->visibleWidth() );
 
     renameBox = new QLineEdit( view->viewport(), "qt_renamebox" );
     renameBox->setFrame(true);
 
     renameBox->setText(  view->currentItem()->text(0) );
 
     renameBox->selectAll();
     renameBox->installEventFilter( this );
     view->addChild( renameBox, r.x(), r.y() );
     renameBox->resize( r.size() );
     view->viewport()->setFocusProxy( renameBox );
     renameBox->setFocus();
     renameBox->show();
 }
 
 
 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();
    QListView * view = CurrentView();
    QString path =  CurrentDir()->canonicalPath() + "/";
    oldName = path + oldName;
    newName = path + newName;
 
    if( rename( oldName.latin1(), newName.latin1())== -1)
       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"));
 }