remove

4 files changed, 108 insertions, 122 deletions

diff --git a/noncore/apps/advancedfm/advancedfm.cpp b/noncore/apps/advancedfm/advancedfm.cpp
index 9721f84..6f017b4 100644
--- a/noncore/apps/advancedfm/advancedfm.cpp
+++ b/noncore/apps/advancedfm/advancedfm.cpp
@@ -132,391 +132,384 @@ void AdvancedFm::populateView() {
                                                 }
                                 }
                                 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) {
                                                                         //  odebug << " overlay link image" << oendl;
                                                                 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);
 //        odebug << mydirent->d_name << oendl;
                                                                 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);
                 }
 
                 thisView->setSorting( 3,FALSE);
                 fillCombo( (const QString &) path );
 }
 
 void AdvancedFm::rePopulate() {
         //      qDebug("repopulate views");
                 populateView();
                 setOtherTabCurrent();
                 populateView();
 
 //      int tmpTab = whichTab;
 // //  odebug << "" << tmpTab << "" << oendl;
 
 //    for(int i =1; i < 3; i++) {
 //       TabWidget->setCurrentWidget(i - 1);
 //       populateView();
 //    }
 //    TabWidget->setCurrentWidget( tmpTab - 1);
 }
 
 void AdvancedFm::ListClicked(QListViewItem *selectedItem) {
         //      if ( TabWidget->currentWidget() == tab)
         //                      qDebug("XXXXXXXXXXXXXXXXXXXXXXXX ListClicked local");
         //      else
         //                      qDebug("XXXXXXXXXXXXXXXXXXXXXXXX ListClicked remote");
                          
 
                 if(selectedItem) {
                                 QString strItem=selectedItem->text(0);
 //      owarn << strItem << oendl;
                                 QString strSize=selectedItem->text(1);
                                 strSize=strSize.stripWhiteSpace();
                                 bool isDirectory = false;
                                 QString strItem2;
 
                                 if(strItem.find("@",0,TRUE) !=-1 || strItem.find("->",0,TRUE) !=-1 ) {//if symlink
                                                 strItem2 = dealWithSymName((const QString&)strItem);
                                                 if(QDir(strItem2).exists() )
                                                                 strItem = strItem2;
                                 }
 
                                 if( strItem.find(". .",0,TRUE) && strItem.find("/",0,TRUE)!=-1 ) {
 
                                                 if(QDir(strItem).exists())
                                                                 isDirectory = true;
                                 }
 
                                 if( isDirectory ) {
                                                 CurrentDir()->cd( strItem, TRUE);
                                                 populateView();
                                                 CurrentView()->ensureItemVisible( CurrentView()->firstChild());
                                 }
                                 chdir( strItem.latin1());
                 }
 }
 
 void AdvancedFm::ListPressed( int mouse, QListViewItem *item, const QPoint& , int ) {
                 Q_UNUSED(item);
    switch (mouse) {
    case 1:
    {
       if(renameBox != 0 ) {
          cancelRename();
       }
    }
    break;
 //    case 2:
 //       menuTimer.start( 50, TRUE );
 //       break;
    };
 }
 
 
 void AdvancedFm::refreshCurrentTab() {
      populateView();
         // if ( TabWidget->currentWidget() == tab) {
                 
 }
 
 void AdvancedFm::switchToLocalTab() {
                 TabWidget->setCurrentWidget(0);
         //      Local_View->setFocus();
                 whichTab = 1;
 }
 
 void AdvancedFm::switchToRemoteTab() {
                 TabWidget->setCurrentWidget(1);
         //      Remote_View->setFocus();
                 whichTab = 2;
 }
 
 void  AdvancedFm::currentPathComboChanged() {
    if(QDir( currentPathCombo->lineEdit()->text()).exists()) {
       CurrentDir()->setPath( currentPathCombo->lineEdit()->text() );
       populateView();
    } else {
       QMessageBox::message(tr("Note"),tr("<p>That directory does not exist</p>"));
    }
 }
 
 void  AdvancedFm::fillCombo(const QString &currentPath) {
 
          if ( TabWidget->currentWidget() == tab) {
 //   if ( whichTab == 1) {
       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) {
-   chdir( currentPath.latin1() );
-   CurrentDir()->cd( currentPath, TRUE);
-   populateView();
-   update();
-}
-
 QStringList AdvancedFm::getPath() {
    QStringList strList;
    QListView *thisView=CurrentView();
    QList<QListViewItem> * getSelectedItems( QListView * thisView );
    QListViewItemIterator it( thisView );
    for ( ; it.current(); ++it ) {
       if ( it.current()->isSelected() ) {
          strList <<  it.current()->text(0);
 //        odebug << it.current()->text(0) << oendl;
       }
    }
    return strList;
 }
 
 void AdvancedFm::changeTo(const QString dir) {
    chdir( dir.latin1());
    CurrentDir()->cd(dir, TRUE);
    populateView();
    update();
 }
 
 void AdvancedFm::homeButtonPushed() {
  changeTo(QDir::homeDirPath());
 }
 
 void AdvancedFm::docButtonPushed() {
    changeTo(QPEApplication::documentDir());
 }
 
 void AdvancedFm::SDButtonPushed() {
    changeTo("/mnt/card");// this can change so fix
 }
 
 void AdvancedFm::CFButtonPushed() {
    if(zaurusDevice)
                          changeTo("/mnt/cf"); //zaurus
    else
                          changeTo("/mnt/hda"); //ipaq
 }
 
 void AdvancedFm::QPEButtonPushed() {
                 changeTo(QPEApplication::qpeDir());
 }
 
 void AdvancedFm::doAbout() {
    QMessageBox::message("AdvancedFm",tr("<P>Advanced FileManager is copyright 2002-2003 by L.J.Potter<llornkcor@handhelds.org> and is licensed by the GPL</P>"));
 }
 
 void AdvancedFm::keyPressEvent( QKeyEvent *e) {
                 Q_UNUSED(e);
 }
 
 void AdvancedFm::keyReleaseEvent( QKeyEvent *e) {
 //     if( CurrentView()->hasFocus() )
 //        e->ignore();
                 if( currentPathCombo->lineEdit()->hasFocus()) {
         //                      qDebug("shout!");
                 }
 
                                 else if(  e->key() ==  Key_Left ) 
                                 upDir();
                 else if( e->key() == Key_Return || e->key() == Key_Enter)
                                 navigateToSelected();
                 else if( e->key() == Key_Tab)
                                 setOtherTabCurrent();
                 else if( e->key() == Key_Delete )
                                 del();
                 else if( e->key() ==  Key_A)
                                 copyAs();
                 else if( e->key() ==  Key_C)
                                 copy();
                 else if( e->key() ==  Key_E)
                                 runThis();
                 else if( e->key() ==  Key_G)
                                 currentPathCombo->lineEdit()->setFocus();
                 else if( e->key() == Key_H )
                                 showHidden();
                 else if( e->key() == Key_I)
                                 fileStatus();
                 else if( e->key() == Key_M)
                                 move();
                 else if( e->key() == Key_N )
                                 mkDir();
                 else if( e->key() ==  Key_P)
                                 filePerms();
                 else if( e->key() ==  Key_R )
                                 rn();
                 else if( e->key() ==  Key_U )
                                 upDir();
                 else if( e->key() ==  Key_1)
                                 switchToLocalTab();
                 else if( e->key() == Key_2)
                                 switchToRemoteTab();
                 else if( e->key() ==  Key_3)
                                 CFButtonPushed();
                 else if( e->key() == Key_4)
                                 SDButtonPushed();
                 else if( e->key() == Key_5 )
                                 homeButtonPushed();
                 else if( e->key() ==  Key_6 )
                                 docButtonPushed();
                 else
                                 e->accept();
 }
 
 
 void AdvancedFm::parsetab(const QString &fileName) {
 
    fileSystemTypeList.clear();
    fsList.clear();
    struct mntent *me;
    FILE *mntfp = setmntent( fileName.latin1(), "r" );
    if ( mntfp ) {
       while ( (me = getmntent( mntfp )) != 0 ) {
          QString deviceName = me->mnt_fsname;
          QString filesystemType = me->mnt_type;
          QString mountDir = me->mnt_dir;
          if(deviceName != "none") {
             if( fsList.contains(filesystemType) == 0
                 & filesystemType.find("proc",0,TRUE) == -1
                 & filesystemType.find("cramfs",0,TRUE) == -1
                 & filesystemType.find("auto",0,TRUE) == -1)
                fsList << filesystemType;
             fileSystemTypeList << mountDir+"::"+filesystemType;
          }
       }
    }
    endmntent( mntfp );
 }
 
 QString  AdvancedFm::getFileSystemType(const QString &currentText) {
    parsetab("/etc/mtab"); //why did TT forget filesystem type?
    QString current = currentText;//.right( currentText.length()-1);
    QString baseFs;
    for ( QStringList::Iterator it = fileSystemTypeList.begin(); it != fileSystemTypeList.end(); ++it ) {
       QString temp = (*it);
       QString path = temp.left(temp.find("::",0,TRUE) );
       path = path.right( path.length()-1);
       if(path.isEmpty()) baseFs = temp.right( temp.length() - temp.find("::",0,TRUE) - 2);
       if( current.find( path,0,TRUE) != -1 && !path.isEmpty()) {
          return temp.right( temp.length() - temp.find("::",0,TRUE) - 2);
       }
    }
    return baseFs;
 }
 
 QString  AdvancedFm::getDiskSpace( const QString &path) {
    struct statfs fss;
    if ( !statfs( path.latin1(), &fss ) ) {
       int blkSize = fss.f_bsize;
       //    int totalBlks = fs.f_blocks;
       int availBlks = fss.f_bavail;
 
       long mult = blkSize / 1024;
       long div = 1024 / blkSize;
       if ( !mult ) mult = 1;
       if ( !div ) div = 1;
 
       return QString::number(availBlks * mult / div);
    }
    return "";
 }
 
 
 void AdvancedFm::showFileMenu() {
    QString curApp;
    curApp = CurrentView()->currentItem()->text(0);
 
    MimeType mt(curApp);
    const AppLnk* app = mt.application();
    QFile fi(curApp);
    QPopupMenu *m = new QPopupMenu(0);
    QPopupMenu *n = new QPopupMenu(0);
    //    QPopupMenu *o = new QPopupMenu(0);
    m->insertItem(tr("Show Hidden Files"),this,SLOT(showHidden()));
 
    if ( QFileInfo(fi).isDir()) {
       m->insertSeparator();
       m->insertItem(tr("Change Directory"),this,SLOT(doDirChange()));
    } else {
 
       if (app)
          m->insertItem(app->pixmap(),tr("Open in " + app->name()),this,SLOT(runThis()));
       else if(QFileInfo(fi).isExecutable() ) //damn opie doesnt like this
          m->insertItem(tr("Execute"),this,SLOT(runThis()));
       m->insertItem(Resource::loadPixmap("txt"),tr("Open as text"),this,SLOT(runText()));
    }
 
    m->insertItem(tr("Actions"),n);
    n->insertItem(tr("Make Directory"),this,SLOT(makeDir()));
 
    n->insertItem(tr("Make Symlink"),this,SLOT(mkSym()));
diff --git a/noncore/apps/advancedfm/advancedfm.h b/noncore/apps/advancedfm/advancedfm.h
index 00ab909..6f7eb96 100644
--- a/noncore/apps/advancedfm/advancedfm.h
+++ b/noncore/apps/advancedfm/advancedfm.h
@@ -1,193 +1,192 @@
 /***************************************************************************
    advancedfm.h
                              -------------------
                              ** Created: Sat Mar 9 23:33:09 2002
     copyright            : (C) 2002 by ljp
     email                : ljp@llornkcor.com
     *   This program is free software; you can redistribute it and/or modify  *
     *   it under the terms of the GNU General Public License as published by  *
     *   the Free Software Foundation; either version 2 of the License, or     *
     *   (at your option) any later version.                                   *
     ***************************************************************************/
 #ifndef ADVANCEDFM_H
 #define ADVANCEDFM_H
 #define QTOPIA_INTERNAL_FSLP // to get access to fileproperties
 #define QT_QWS_OPIE
 
 #include <opie2/oprocess.h>
 #include <opie2/osplitter.h>
 
 #include <qpe/ir.h>
 #include <qpe/qcopenvelope_qws.h>
 
 #include <qvariant.h>
 #include <qdialog.h>
 #include <qmainwindow.h>
 #include <qstringlist.h>
 #include <qdir.h>
 #include <qstring.h>
 #include <qpoint.h>
 #include <qtimer.h>
 #include <qpixmap.h>
 
 
 class QVBoxLayout;
 class QHBoxLayout;
 class QGridLayout;
 class QComboBox;
 class QListView;
 class QListviewItem;
 class QLabel;
 class QProgressBar;
 class QSpinBox;
 class QWidget;
 class QPopupMenu;
 class QFile;
 class QListViewItem;
 class QLineEdit;
 class MenuButton;
 
 class QToolButton;
 class Ir;
 
 class AdvancedFm : public QMainWindow
 {
     Q_OBJECT
 public:
     static QString appName() { return QString::fromLatin1("advancedfm"); }
    AdvancedFm(QWidget *p = 0, const char* name = 0, WFlags fl = 0);
    ~AdvancedFm();
 protected:
 
    Opie::Ui::OSplitter *TabWidget;
    QCopChannel * channel;
    QPixmap unknownXpm;
    int whichTab;
 //    QTabWidget *TabWidget;
    QWidget *tab, *tab_2, *tab_3;
    QListView *Local_View, *Remote_View;
 
    QLineEdit *currentPathEdit;
    QPopupMenu *fileMenu, *localMenu, *remoteMenu, *viewMenu /*, *customDirMenu*/;
    QToolButton  *homeButton, *docButton, *cdUpButton, *sdButton, *cfButton, *qpeDirButton;
 //    QPushButton  *homeButton, *docButton, *cdUpButton, *sdButton, *cfButton, *qpeDirButton;
    QDir currentDir, currentRemoteDir;
    QComboBox *currentPathCombo;
    QString filterStr, s_addBookmark, s_removeBookmark;
    QListViewItem * item;
    bool b;
    QStringList fileSystemTypeList, fsList;
    int currentServerConfig;
    bool zaurusDevice;
    QGridLayout *tabLayout, *tabLayout_2, *tabLayout_3;
    QStringList remoteDirPathStringList, localDirPathStringList;
    QLineEdit *renameBox;
 
    void init();
    void initConnections();
    void keyReleaseEvent( QKeyEvent *);
    void keyPressEvent( QKeyEvent *);
    QString getFileSystemType(const QString &);
    QString getDiskSpace(const QString &);
    void parsetab(const QString &fileName);
    QString checkDiskSpace(const QString &);
    QString dealWithSymName(const QString &);
    QDir *CurrentDir();
    QDir *OtherDir();
    QListView *CurrentView();
    QListView *OtherView();
    void setOtherTabCurrent();
          void changeTo(const QString dir);
 
 //protected signals:
         //      void newPath(QString);
     
 protected slots:
    void slotSwitchMenu(int);
    void selectAll();
    void addToDocs();
    void doDirChange();
    void mkDir();
    void del();
    void rn();
    void populateView();
    void rePopulate();
    void showHidden();
    void showMenuHidden();
    void ListClicked(QListViewItem *);
    void ListPressed( int, QListViewItem *, const QPoint&, int);
    void makeDir();
    void doDelete();
    void tabChanged(QWidget*);
    void cleanUp();
    void renameIt();
    void runThis();
    void runText();
    void filePerms();
    void doProperties();
    void runCommand();
    void runCommandStd();
    QStringList getPath();
    void mkSym();
    void switchToLocalTab();
    void switchToRemoteTab();
          void refreshCurrentTab();
 
    void openSearch();
    void dirMenuSelected(int);
    void showFileMenu();   
    void homeButtonPushed();
    void docButtonPushed();
    void SDButtonPushed();
    void CFButtonPushed();
    void QPEButtonPushed();
    void upDir();
    void currentPathComboChanged();
 
    void copy();
    void copyTimer();
    void copyAs();
    void copyAsTimer();
    void copySameDir();
    void copySameDirTimer();
    void move();
    void moveTimer();
 
-         void currentPathComboActivated(const QString &);
    void fillCombo(const QString &);
    bool copyFile( const QString & , const QString & );
    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, localViewDir, remoteViewDir;
    void startProcess(const QString &);
    bool eventFilter( QObject * , QEvent * );
    void cancelRename();
    void doRename(QListView *);
    void okRename();
    void customDirsToMenu();
    void addCustomDir();
    void removeCustomDir();
    void navigateToSelected();
    void findFile(const QString &);
 
 private slots:
    void processEnded(Opie::Core::OProcess *);
    void oprocessStderr(Opie::Core::OProcess *, char *, int);
    void gotoCustomDir(const QString &);
    void qcopReceive(const QCString&, const QByteArray&);
    void setDocument(const QString &);
         // void doMenu(int
 
 };
 
 #endif // ADVANCEDFM_H
diff --git a/noncore/apps/advancedfm/advancedfmData.cpp b/noncore/apps/advancedfm/advancedfmData.cpp
index fe565a0..1047c5a 100644
--- a/noncore/apps/advancedfm/advancedfmData.cpp
+++ b/noncore/apps/advancedfm/advancedfmData.cpp
@@ -66,215 +66,215 @@ void AdvancedFm::init() {
          cfButton = new QToolButton( 0, "CFButton");
          cfButton->setPixmap(Resource::loadPixmap("cardmon/pcmcia"));
          cfButton->setAutoRaise( true );
          menuBar->insertItem( cfButton );
 
          sdButton = new QToolButton( 0, "SDButton");
          sdButton->setPixmap(Resource::loadPixmap("advancedfm/sdcard"));
          sdButton->setAutoRaise( true );
          menuBar->insertItem( sdButton );
 
          docButton = new QToolButton( 0,"docsButton");
          docButton->setPixmap(Resource::loadPixmap("DocsIcon"));
          docButton->setAutoRaise( true );
          menuBar->insertItem( docButton );
 
          homeButton = new QToolButton( 0, "homeButton");
          homeButton->setPixmap(Resource::loadPixmap("home"));
          homeButton->setAutoRaise( true );
          menuBar->insertItem( homeButton );
 
          fileMenu->insertItem( tr( "Show Hidden Files" ), this,  SLOT( showMenuHidden() ));
          fileMenu->setItemChecked( fileMenu->idAt(0),TRUE);
          fileMenu->insertSeparator();
          fileMenu->insertItem( tr( "File Search" ), this, SLOT( openSearch() ));
          fileMenu->insertSeparator();
          fileMenu->insertItem( tr( "Make Directory" ), this, SLOT( mkDir() ));
          fileMenu->insertItem( tr( "Rename" ), this, SLOT( rn() ));
          fileMenu->insertItem( tr( "Run Command" ), this, SLOT( runCommandStd() ));
          fileMenu->insertItem( tr( "Run Command with Output" ), this, SLOT( runCommand() ));
          fileMenu->insertSeparator();
          fileMenu->insertItem( tr( "Make Symlink" ), this, SLOT( mkSym() ));
          fileMenu->insertItem( tr( "Select All" ), this, SLOT( selectAll() ));
          fileMenu->insertItem( tr( "Add To Documents" ), this, SLOT( addToDocs() ));
          fileMenu->insertItem( tr( "Delete" ), this, SLOT( del() ));
          fileMenu->setCheckable(TRUE);
 
          viewMenu->insertItem( tr( "Switch to View 1" ), this, SLOT( switchToLocalTab()));
          viewMenu->insertItem( tr( "Switch to View 2" ), this, SLOT( switchToRemoteTab()));
          viewMenu->insertItem( tr( "Refresh" ), this, SLOT( refreshCurrentTab()));
 //     viewMenu->insertSeparator();
 //     viewMenu->insertItem( tr( "About" ), this, SLOT( doAbout() ));
          viewMenu->setCheckable(true);
          viewMenu->setItemChecked( viewMenu->idAt(0), true);
          viewMenu->setItemChecked( viewMenu->idAt(1), false);
 
          s_addBookmark = tr("Bookmark Directory");
          s_removeBookmark = tr("Remove Current Directory from Bookmarks");
 
 //    menuButton->insertItem("");
 
 //     customDirMenu->insertItem(tr("Add This Directory"));
 //     customDirMenu->insertItem(tr("Remove This Directory"));
 //     customDirMenu->insertSeparator();
 
          QHBoxLayout *CBHB = new QHBoxLayout(); // parent layout will be set later
          CBHB->setMargin( 0 );
          CBHB->setSpacing( 1 );
 
          menuButton = new MenuButton( this );
 
          menuButton->setUseLabel(false);
          menuButton->setMaximumWidth( 20 );
          menuButton->insertItem( s_addBookmark);
          menuButton->insertItem( s_removeBookmark);
          menuButton->insertSeparator();
 // menuButton->setFocusPolicy(NoFocus);
          CBHB->addWidget( menuButton );
 
          customDirsToMenu();
 
          currentPathCombo = new QComboBox( FALSE, this, "currentPathCombo" );
          currentPathCombo->setEditable(TRUE);
          currentPathCombo->lineEdit()->setText( currentDir.canonicalPath());
         // currentPathCombo->setFocusPolicy(NoFocus);
          CBHB->addWidget( currentPathCombo );
 
          layout->addLayout( CBHB );
 
          TabWidget = new OSplitter( Horizontal, this, "TabWidget" );
 //  TabWidget = new QTabWidget( this, "TabWidget" );
          layout->addWidget( TabWidget, 4 );
 
          tab = new QWidget( TabWidget, "tab" );
          tabLayout = new QGridLayout( tab );
          tabLayout->setSpacing( 2);
          tabLayout->setMargin( 2);
 
          Local_View = new QListView( tab, "Local_View" );
          Local_View->addColumn( tr("File"),130);
          Local_View->addColumn( tr("Size"),-1);
          Local_View->setColumnAlignment(1,QListView::AlignRight);
          Local_View->addColumn( tr("Date"),-1);
          Local_View->setColumnAlignment(2,QListView::AlignRight);
          Local_View->setAllColumnsShowFocus(TRUE);
          Local_View->setMultiSelection( TRUE );
          Local_View->setSelectionMode(QListView::Extended);
          Local_View->setFocusPolicy(StrongFocus);
          Local_View->installEventFilter( this );
 
          QPEApplication::setStylusOperation( Local_View->viewport() , QPEApplication::RightOnHold);
 
          tabLayout->addWidget( Local_View, 0, 0 );
 
          TabWidget->addWidget( tab,"advancedfm/smFileBrowser.png", tr("1"));
 //  TabWidget->insertTab( tab, tr("1"));
 
          tab_2 = new QWidget( TabWidget, "tab_2" );
          tabLayout_2 = new QGridLayout( tab_2 );
          tabLayout_2->setSpacing( 2);
          tabLayout_2->setMargin( 2);
 
          Remote_View = new QListView( tab_2, "Remote_View" );
          Remote_View->addColumn( tr("File"),130);
          Remote_View->addColumn( tr("Size"),-1);
          Remote_View->setColumnAlignment(1,QListView::AlignRight);
          Remote_View->addColumn( tr("Date"),-1);
          Remote_View->setColumnAlignment(2,QListView::AlignRight);
          Remote_View->setAllColumnsShowFocus(TRUE);
          Remote_View->setMultiSelection( TRUE );
          Remote_View->setSelectionMode(QListView::Extended);
          Remote_View->setFocusPolicy(StrongFocus);
          Remote_View->installEventFilter( this );
 
          QPEApplication::setStylusOperation( Remote_View->viewport(), QPEApplication::RightOnHold);
 
          tabLayout_2->addWidget( Remote_View, 0, 0 );
 
          TabWidget->addWidget( tab_2, "advancedfm/smFileBrowser.png",tr( "2"));
          TabWidget->setSizeChange( 370 );
 //  TabWidget->insertTab( tab_2, tr( "2"));
 
          /*     tab_3 = new QWidget( TabWidget, "tab_3" );
                                         tabLayout_3 = new QGridLayout( tab_3 );
                                         tabLayout_3->setSpacing( 2);
                                         tabLayout_3->setMargin( 2);
 
 
                                         //     OFileDialog fileDialog;
                                         // fileDialog;
                                         //    fileSelector = new FileSelector( "*",tab_3, "fileselector" , FALSE, FALSE); //buggy
                                         //     fileDialog = new OFileDialog("bangalow", tab_3, 4, 2, "Bungalow");
                                         //      OFileSelector fileDialog = new OFileSelector( tab_3, 4, 2,"/");
 
                                         QListView *fileTree;
                                         fileTree = new QListView( tab_3, "tree" );
 
 
                                         tabLayout_3->addMultiCellWidget( fileTree, 0, 0, 0, 3 );
 
                                         TabWidget->insertTab( tab_3, tr( "Remote" ) );
          */
 
          ///////////////
 
          if ( QFile::exists ( "/dev/sharp_buz" ) || QFile::exists ( "/dev/sharp_led" ))
                         zaurusDevice=TRUE;
          else
                         zaurusDevice=FALSE;
 
 
          if( !StorageInfo::hasSd() || !StorageInfo::hasMmc()) {
                         odebug << "not have sd" << oendl;
                         sdButton->hide();
          }
          if( !StorageInfo::hasCf() ) {
                         odebug << "not have cf" << oendl;
                         cfButton->hide();
          }
          currentDir.setFilter( QDir::Files | QDir::Dirs | QDir::Hidden | QDir::All);
          currentDir.setPath( QDir::currentDirPath());
 
          currentRemoteDir.setFilter( QDir::Files | QDir::Dirs | QDir::Hidden | QDir::All);
          currentRemoteDir.setPath( QDir::currentDirPath());
 
          //  b = TRUE;
 
          filterStr="*";
          showMenuHidden();
          TabWidget->setCurrentWidget(0);
 
 }
 
 void AdvancedFm::initConnections()
 {
 
   connect(qApp,SIGNAL(aboutToQuit()),this,SLOT(cleanUp()));
   connect( qpeDirButton ,SIGNAL(released()),this,SLOT( QPEButtonPushed()) );
   connect( cfButton ,SIGNAL(released()), this,SLOT( CFButtonPushed()) );
   connect( sdButton ,SIGNAL(released()), this,SLOT( SDButtonPushed()) );
   connect( cdUpButton ,SIGNAL(released()), this,SLOT( upDir()) );
   connect( docButton,SIGNAL(released()), this,SLOT( docButtonPushed()) );
   connect( homeButton,SIGNAL(released()), this,SLOT( homeButtonPushed()) );
-  connect( currentPathCombo, SIGNAL( activated(const QString&) ), this, SLOT( currentPathComboActivated(const QString&) ) );
+  connect( currentPathCombo, SIGNAL( activated(const QString&) ), this, SLOT( changeTo(const QString&) ) );
 
   connect( currentPathCombo->lineEdit(),SIGNAL(returnPressed()), this,SLOT(currentPathComboChanged()));
 
   connect( Local_View, SIGNAL( clicked(QListViewItem*)), this,SLOT( ListClicked(QListViewItem*)) );
 
   connect( Local_View, SIGNAL( mouseButtonPressed(int,QListViewItem*,const QPoint&,int)), this,SLOT( ListPressed(int,QListViewItem*,const QPoint&,int)) );
 
   connect( Remote_View, SIGNAL( clicked(QListViewItem*)), this,SLOT( ListClicked(QListViewItem*)) );
   connect( Remote_View, SIGNAL( mouseButtonPressed(int,QListViewItem*,const QPoint&,int)), this,SLOT( ListPressed(int,QListViewItem*,const QPoint&,int)) );
 
   connect( TabWidget,SIGNAL(currentChanged(QWidget*)), this,SLOT(tabChanged(QWidget*)));
 
   connect( Remote_View, SIGNAL(rightButtonPressed(QListViewItem*, const QPoint&, int)), this, SLOT(showFileMenu()));
   connect( Local_View, SIGNAL(rightButtonPressed(QListViewItem*, const QPoint&,int)), this, SLOT(showFileMenu()));
 
   connect( menuButton, SIGNAL( selected(const QString&)), SLOT(gotoCustomDir(const QString&)));
 //  connect( menuButton, SIGNAL( selected(int)), SLOT( dirMenuSelected(int)));
   connect( viewMenu, SIGNAL( activated(int)), this, SLOT(slotSwitchMenu(int)));
 //  connect( customDirMenu, SIGNAL( activated(int)), this, SLOT( dirMenuSelected(int)));
 
 }
 
diff --git a/noncore/apps/advancedfm/advancedfmMenu.cpp b/noncore/apps/advancedfm/advancedfmMenu.cpp
index 706658e..7b3dcf6 100644
--- a/noncore/apps/advancedfm/advancedfmMenu.cpp
+++ b/noncore/apps/advancedfm/advancedfmMenu.cpp
@@ -1,527 +1,521 @@
 /***************************************************************************
    AdvancedFm.cpp
   -------------------
   ** Created: Sat Mar 9 23:33:09 2002
     copyright            : (C) 2002 by ljp
     email               : ljp@llornkcor.com
     *   This program is free software; you can redistribute it and/or modify  *
     *   it under the terms of the GNU General Public License as published by  *
     *   the Free Software Foundation; either version 2 of the License, or     *
     *   (at your option) any later version.                                   *
     ***************************************************************************/
 
 #include "advancedfm.h"
 #include "output.h"
 #include "filePermissions.h"
 
 /* OPIE */
 #include <opie2/odebug.h>
 #include <qpe/lnkproperties.h>
 #include <qpe/qpeapplication.h>
 #include <qpe/applnk.h>
 using namespace Opie::Core;
 
 /* QT*/
 
 #include <qmessagebox.h>
 #include <qpopupmenu.h>
 #include <qlistview.h>
 
 /* STD */
 
 #include <errno.h>
 #include <stdlib.h>
 #include <unistd.h>
 #include <sys/stat.h>
 #include <dirent.h>
 #include <sys/sendfile.h>
 #include <fcntl.h>
 
 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)+"/";
 //      owarn << pathItem << oendl; 
       changeTo( 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);
+                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);
+                                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);
     }
-     b = !b;
-         populateView();
+                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);
+                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);
+                                CurrentDir()->setFilter( QDir::Files | QDir::Dirs/* | QDir::Hidden*/ | QDir::All);
+                                OtherDir()->setFilter( QDir::Files | QDir::Dirs/* | QDir::Hidden*/ | QDir::All);
     }
-         populateView();
+                populateView();
 }
 
 QString AdvancedFm::dealWithSymName(const QString &fileName) {
-   QString strItem = fileName;
-   return  strItem.right( (strItem.length() - strItem.find("->",0,TRUE)) - 4);
+                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();
+                if( !CurrentView()->currentItem()) return;
+                QString fs;
+                QDir *thisDir = CurrentDir();
 
-  QString curFile = CurrentView()->currentItem()->text(0);
-  QString path = thisDir->canonicalPath();
+                QString curFile = CurrentView()->currentItem()->text(0);
+                QString path = thisDir->canonicalPath();
 
-  if( curFile.find("@",0,TRUE) !=-1 || curFile.find("->",0,TRUE) !=-1 )  //if symlink
+                if( curFile.find("@",0,TRUE) !=-1 || curFile.find("->",0,TRUE) !=-1 )  //if symlink
 
-    curFile = dealWithSymName((const QString&)curFile);
+                                curFile = dealWithSymName((const QString&)curFile);
 
-  if(curFile != "../") {
+                if(curFile != "../") {
 
-      fs = getFileSystemType((const QString &) path);
-      QFileInfo fileInfo( path  + "/" + curFile);
+                                fs = getFileSystemType((const QString &) path);
+                                QFileInfo fileInfo( path  + "/" + curFile);
 //      odebug << fileInfo.owner() << oendl; 
 
-      if( (fileInfo.permission( QFileInfo::ExeUser)
-           | fileInfo.permission( QFileInfo::ExeGroup)
-           | fileInfo.permission( QFileInfo::ExeOther)) // & fs.find("vfat",0,TRUE) == -1) {
-          | fs == "vfat" && fileInfo.filePath().contains("/bin") ) {
-        QCopEnvelope e("QPE/System", "execute(QString)" );
-        e << curFile;
-      } else {
-          curFile =  path + "/" + curFile;
-          DocLnk nf(curFile);
-          QString execStr = nf.exec();
+                                if( (fileInfo.permission( QFileInfo::ExeUser)
+                                                 | fileInfo.permission( QFileInfo::ExeGroup)
+                                                 | fileInfo.permission( QFileInfo::ExeOther)) // & fs.find("vfat",0,TRUE) == -1) {
+                                                | fs == "vfat" && fileInfo.filePath().contains("/bin") ) {
+                                                QCopEnvelope e("QPE/System", "execute(QString)" );
+                                                e << curFile;
+                                } else {
+                                                curFile =  path + "/" + curFile;
+                                                DocLnk nf(curFile);
+                                                QString execStr = nf.exec();
 //          odebug << execStr << oendl; 
-          if( execStr.isEmpty() ) {
+                                                if( execStr.isEmpty() ) {
             } else {
-              nf.execute();
+                                                                nf.execute();
             }
         }
     }
 }
 
 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;
+                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);
-  }
+                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();
 }
 
 void AdvancedFm::doDelete() {
    QStringList curFileList = getPath();
    bool doMsg=true;
    int count = curFileList.count();
    if( count > 0)  {
       if(count > 1 ) {
          QString msg;
          msg=tr("<p>Really delete %1 files?</p>").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("<p>Really delete %1 and all it's contents?</p>" ).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();
             }
             break;
             case 1:
                // exit
                break;
             };
 
          } else {
             if(doMsg) {
                switch ( QMessageBox::warning(this,tr("Delete"),
                                              tr("<p>Really delete %1?</p>").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) {
 //               odebug << "remove link files "+myFile << oendl; 
 
 //               DocLnk lnk(f);
                  DocLnk *lnk;
                  lnk = new DocLnk(f);
 //                 odebug << "Deleting doclnk " + lnk->linkFile() << oendl; 
                  if(lnk->isValid())
                     lnk->removeLinkFile();
                // delete lnk;
                file.remove();
             }
          }
       }
    }
     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));
       QPEApplication::execDialog( filePerm );
       if( filePerm )
          delete  filePerm;
    }
     populateView();
 }
 
 void AdvancedFm::doProperties() {
 #if defined(QT_QWS_OPIE)
 
    QStringList curFileList = getPath();
 
    QString filePath;
    filePath = CurrentDir()->canonicalPath()+"/";
 
 //   odebug << "" << curFileList.count() << "" << oendl; 
 
    for ( QStringList::Iterator it = curFileList.begin(); it != curFileList.end(); ++it ) {
 //      odebug << (filePath+*it) << oendl; 
       DocLnk lnk( (filePath+*it));
       LnkProperties prop( &lnk );
       QPEApplication::execDialog( &prop );
    }
 #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();
-  update();
+  QDir dir( CurrentDir()->canonicalPath());
+  dir.cdUp();
+        changeTo(dir.canonicalPath());
 }
 
 void AdvancedFm::copyTimer() {
                 QTimer::singleShot(125,this,SLOT(copy()));
 }
 
 void AdvancedFm::copy() {
- QStringList curFileList = getPath();
-
-   QDir *thisDir = CurrentDir();
-   QDir *thatDir = OtherDir();
+                QStringList curFileList = getPath();
 
-   bool doMsg=true;
-   int count=curFileList.count();
-   if( count > 0) {
-      if(count > 1 ){
-         QString msg;
-         msg=tr("<p>Really copy %1 files?</p>").arg(count);
-         switch ( QMessageBox::warning(this,tr("Copy"),msg
-                                       ,tr("Yes"),tr("No"),0,0,1) )
-         {
-         case 0:
-            doMsg=false;
-            break;
-         case 1:
-            return;
-            break;
-         };
-      }
+                QDir *thisDir = CurrentDir();
+                QDir *thatDir = OtherDir();
+
+                bool doMsg = true;
+                int count = curFileList.count();
+                if( count > 0) {
+                                if(count > 1 ){
+                                                QString msg;
+                                                msg=tr("<p>Really copy %1 files?</p>").arg(count);
+                                                switch ( QMessageBox::warning(this,tr("Copy"),msg
+                                                                                                                                                                        ,tr("Yes"),tr("No"),0,0,1) )
+                                                        {
+                                                                case 0:
+                                                                                doMsg=false;
+                                                                                break;
+                                                                case 1:
+                                                                                return;
+                                                                                break;
+                                                        };
+                                }
 
-      QString curFile, item, destFile;
-      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));
+                                QString curFile, item, destFile;
+                                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));
 
-         curFile = thisDir->canonicalPath()+"/"+ item;
-         destFile = thatDir->canonicalPath()+"/"+ item;
+                                                curFile = thisDir->canonicalPath()+"/"+ item;
+                                                destFile = thatDir->canonicalPath()+"/"+ item;
 
 //          odebug << "Destination file is "+destFile << oendl; 
 //          odebug << "CurrentFile file is " + curFile << oendl; 
 
-         QFile f(destFile);
-         if( f.exists()) {
-            if(doMsg) {
-               switch ( QMessageBox::warning(this,tr("File Exists!"),
-                                             tr("<p>%1 already  exists. Ok to overwrite?</P>").arg(item),
-                                             tr("Yes"),tr("No"),0,0,1)) {
-               case 1:
-                  return;
-                  break;
-               };
-            }
-            f.remove();
-         }
+                                                QFile f(destFile);
+                                                if( f.exists()) {
+                                                                if(doMsg) {
+                                                                                switch ( QMessageBox::warning(this,tr("File Exists!"),
+                                                                                                                                                                                                        tr("<p>%1 already  exists. Ok to overwrite?</P>").arg(item),
+                                                                                                                                                                                                        tr("Yes"),tr("No"),0,0,1)) {
+                                                                                        case 1:
+                                                                                                        return;
+                                                                                                        break;
+                                                                                };
+                                                                }
+                                                                f.remove();
+                                                }
 
-         if( !copyFile( curFile, destFile) )  {
-            QMessageBox::message("AdvancedFm",
-                                 tr( "<P>Could not copy %1 to %2</P>").arg(curFile).arg(destFile));
-            return;
-         }
-      }
-                        rePopulate();
-   }
+                                                if( !copyFile( curFile, destFile) )  {
+                                                                QMessageBox::message("AdvancedFm",
+                                                                                                                                                 tr( "<P>Could not copy %1 to %2</P>").arg(curFile).arg(destFile));
+                                                                return;
+                                                }
+                                }
+                                rePopulate();
+                }
 }
 
 void AdvancedFm::copyAsTimer() {
                 QTimer::singleShot(125,this,SLOT(copyAs()));
 }
 
 void AdvancedFm::copyAs() {
 
    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 %1 As").arg(curFile), 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!"),
                                          tr("<P> %1 already exists. Ok to overwrite?</p>").arg(item),
                                          tr("Yes"),tr("No"),0,0,1) ) {
             case 0:
                f.remove();
                break;
             case 1:
                return;
                break;
             };
          }
          if( !copyFile( curFile, destFile) ) {
             QMessageBox::message("AdvancedFm",tr("<p>Could not copy %1 to %2</P>").arg(curFile).arg(destFile));
             return;
          }
       }
       delete fileDlg;
 
    }
          rePopulate();
         // setOtherTabCurrent();
    qApp->processEvents();
 
 }
 
 void AdvancedFm::copySameDirTimer() {
                 QTimer::singleShot(125,this,SLOT(copySameDir()));
 }
 
 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"),
                                            tr("<p> %1 already exists. Do you really want to delete it?</P>").arg(destFile),
                                            tr("Yes"),tr("No"),0,0,1) ) {
               case 0:
 
                 f.remove();
                 break;
               case 1:
                 return;
                 break;
               };
             }
           if(!copyFile( curFile,destFile) )  {
               QMessageBox::message("AdvancedFm",tr("<P>Could not copy %1 to %2</P>").arg(curFile).arg(destFile));
               return;
             }
 
 //          odebug << "copy "+curFile+" as "+destFile << oendl; 
         }
       delete fileDlg;
     }
             rePopulate();
 }
 
 void AdvancedFm::moveTimer() {
                 QTimer::singleShot(125,this,SLOT(move()));
 }
 
 void AdvancedFm::move() {
 
                 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;
 //          odebug << "Destination file is "+destFile << oendl; 
 
                                                 curFile = thisDir->canonicalPath();
                                                 if(curFile.right(1).find("/",0,TRUE) == -1)
                                                                 curFile +="/";
                                                 curFile+= item;
 //           odebug << "CurrentFile file is " + curFile << oendl; 
 
                                                 if(QFileInfo(curFile).isDir()) {
                                                                 moveDirectory( curFile, destFile );
                                                                 rePopulate();
                                                                 return;
                                                 }
                                                 QFile f( destFile);
                                                 if( f.exists()) {
                                                                 switch ( QMessageBox::warning(this,tr("File Exists!"),
                                                                                                                                                                                         tr("<p>%1 already  exists. Ok to overwrite?</P>").arg(destFile),
                                                                                                                                                                                         tr("Yes"),tr("No"),0,0,1)) {
                                                                         case 1:
                                                                                         return;
                                                                                         break;
                                                                 };
                                                                 if( !copyFile( curFile, destFile) )  {
                                                                                 QMessageBox::message(tr("Note"),tr("<p>Could not move %1</p>").arg(curFile));
                                                                                 return;
                                                                 } else
                                                                                 QFile::remove(curFile);
                                                 }
                                 }
                 }
                 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("<p>Could not move %1</p>").arg( src));
                                 return false;
                 }
                 return true;
 }
 
 bool AdvancedFm::copyDirectory( const QString & src, const QString & dest ) {
 
                 QString cmd = "/bin/cp -fpR " + src + " " + dest;
     owarn << cmd << oendl; 
                 int    err = system( (const char *) cmd );
                 if ( err != 0 ) {
                                 QMessageBox::message("AdvancedFm", tr( "<p>Could not copy %1 to %2</p>").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();