fix stuff, including #1404

4 files changed, 71 insertions, 42 deletions

diff --git a/noncore/apps/advancedfm/advancedfm.cpp b/noncore/apps/advancedfm/advancedfm.cpp
index afb44f5..b4461cb 100644
--- a/noncore/apps/advancedfm/advancedfm.cpp
+++ b/noncore/apps/advancedfm/advancedfm.cpp
@@ -1,872 +1,898 @@
 /***************************************************************************
    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.                                   *
     ***************************************************************************/
 #define DEVELOPERS_VERSION
 #include "advancedfm.h"
 
+#include <opie2/odebug.h>
 #include <qpe/qpeapplication.h>
 #include <qpe/config.h>
 #include <qpe/mimetype.h>
 #include <qpe/applnk.h>
 #include <qpe/resource.h>
 #include <qpe/menubutton.h>
 
 #include <qcombobox.h>
 #include <qpopupmenu.h>
 #include <qlistview.h>
 #include <qmessagebox.h>
 #include <qlineedit.h>
 
 
 #include <sys/stat.h>
 #include <time.h>
 #include <dirent.h>
 #include <fcntl.h>
 #include <sys/vfs.h>
 #include <mntent.h>
 
 using namespace Opie::Ui;
 
 AdvancedFm::AdvancedFm(QWidget *,const char*, WFlags )
    : QMainWindow( ) {
    init();
    renameBox = 0;
 
    unknownXpm = Resource::loadImage(  "UnknownDocument" ).smoothScale( AppLnk::smallIconSize(),  AppLnk::smallIconSize() );
 
-   initConnections();
-   whichTab=1;
-   rePopulate();
-   currentPathCombo->setFocus();
-   channel = new QCopChannel( "QPE/Application/advancedfm", this );
-   connect( channel, SIGNAL(received(const QCString&,const QByteArray&)),
-            this, SLOT( qcopReceive(const QCString&,const QByteArray&)) );
+         initConnections();
+
+         whichTab = 1;
+                 populateView();
+        // rePopulate();
+        // currentPathCombo->setFocus();
+         channel = new QCopChannel( "QPE/Application/advancedfm", this );
+         connect( channel, SIGNAL(received(const QCString&,const QByteArray&)),
+                                                this, SLOT( qcopReceive(const QCString&,const QByteArray&)) );
+
+        //  if( CurrentView() == Local_View)
+        //               qDebug("LOCAL VIEW");
+        //                               else
+        //                                               qDebug("REMOTE VIEW");
+                 switchToLocalTab(); 
 }
 
 AdvancedFm::~AdvancedFm() {
 }
 
 
 void AdvancedFm::cleanUp() {
    QString sfile=QDir::homeDirPath();
    if(sfile.right(1) != "/")
       sfile+="/._temp";
    else
       sfile+="._temp";
    QFile file( sfile);
    if(file.exists())
       file.remove();
 }
 
-void AdvancedFm::tabChanged(QWidget *) {
-//   owarn << "tab changed" << oendl;
-   QString path = CurrentDir()->canonicalPath();
+void AdvancedFm::tabChanged(QWidget *wd) {
+                if(wd == tab)
+                                odebug << "LOCAL VIEW SHOWN"<< oendl;
+                else if(wd == tab_2)
+                                odebug<< "REMOTE VIEW SHOWN"<< oendl;
+
+                QString path = CurrentDir()->canonicalPath();
    currentPathCombo->lineEdit()->setText( path );
 
-   if(whichTab == 1) {
+         if ( TabWidget->currentWidget() == tab) {
+//   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());
+   if( wd == Local_View) {
+      Remote_View->clearFocus();
+   } else {
+      Local_View->clearFocus();
+   }
+         
 }
 
 
 void AdvancedFm::populateView() {
 
-// owarn << "PopulateView" << oendl;
         QPixmap pm;
         QListView *thisView = CurrentView();
         QDir *thisDir = CurrentDir();
         QString path = thisDir->canonicalPath();
 
-//owarn << "path is "+path << oendl;
         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) {
                                     //  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() {
      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) {
-//owarn << "listclicked" << oendl;
-   if(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 ) {
-   dealWithSchmooSchmaa( item->listView());
+                Q_UNUSED(item);
    switch (mouse) {
    case 1:
    {
       if(renameBox != 0 ) {
          cancelRename();
       }
    }
    break;
+//    case 2:
+//       menuTimer.start( 50, TRUE );
+//       break;
    };
 }
 
 
 void AdvancedFm::switchToLocalTab() {
-//owarn << "switch to local view" << oendl;
    TabWidget->setCurrentWidget(0);
    Local_View->setFocus();
+         
 }
 
 void AdvancedFm::switchToRemoteTab() {
-//owarn << "switch to local view" << oendl;
    TabWidget->setCurrentWidget(1);
    Remote_View->setFocus();
 }
 
 void AdvancedFm::readConfig() {
    Config cfg("AdvancedFm");
 }
 
 void AdvancedFm::writeConfig() {
    Config cfg("AdvancedFm");
 }
 
 void  AdvancedFm::currentPathComboChanged() {
    if(QDir( currentPathCombo->lineEdit()->text()).exists()) {
       CurrentDir()->setPath( currentPathCombo->lineEdit()->text() );
       populateView();
    } else {
       QMessageBox::message(tr("Note"),tr("That directory does not exist"));
    }
 }
 
 void  AdvancedFm::fillCombo(const QString &currentPath) {
 
-   if ( whichTab == 1) {
+         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::homeButtonPushed() {
    QString current = QDir::homeDirPath();
    chdir( current.latin1() );
    CurrentDir()->cd(  current, TRUE);
    populateView();
    update();
 }
 
 void AdvancedFm::docButtonPushed() {
    QString current = QPEApplication::documentDir();
    chdir( current.latin1() );
    CurrentDir()->cd( current, TRUE);
    populateView();
    update();
 }
 
 void AdvancedFm::SDButtonPushed() {
    QString current = "/mnt/card";// this can change so fix
    chdir( current.latin1() );
    CurrentDir()->cd( current, TRUE);
    populateView();
    update();
 }
 
 void AdvancedFm::CFButtonPushed() {
    QString current;
    if(zaurusDevice)
       current= "/mnt/cf"; //zaurus
    else
       current = "/mnt/hda"; //ipaq
    chdir( current.latin1() );
    CurrentDir()->cd( current, TRUE);
    populateView();
    update();
 }
 
 
 void AdvancedFm::doAbout() {
    QMessageBox::message("AdvancedFm",tr("Advanced FileManager\n"
                                         "is copyright 2002-2003 by\n"
                                         "L.J.Potter<llornkcor@handhelds.org>\n"
                                         "and is licensed by the GPL"));
 }
 
 void AdvancedFm::keyPressEvent( QKeyEvent *e) {
 //   owarn << "key " << e->key() << "" << oendl;
 //   if( CurrentView()->hasFocus()  )
    {
       switch ( e->key() ) {
       case Key_Left:
          upDir();
          break;
       case Key_Next:
          break;
       case Key_Return:
       case Key_Enter:
          navigateToSelected();
          break;
       case Key_Tab: {
          setOtherTabCurrent();
       }
          break;
       case Key_Delete:
          del();
          break;
       case Key_A:
          copyAs();
          break;
       case Key_C:
          copy();
          break;
       case Key_E:
          runThis();
          break;
       case Key_G:
       {
          currentPathCombo->lineEdit()->setFocus();
       }
       break;
 
       case Key_H:
          showHidden();
          break;
       case Key_I:
          fileStatus();
          break;
       case Key_M:
          move();
          break;
       case Key_N:
          mkDir();
          break;
       case Key_P:
          filePerms();
          break;
       case Key_R:
          rn();
          break;
       case Key_U:
          upDir();
          break;
       case Key_1:
          switchToLocalTab();
          break;
       case Key_2:
          switchToRemoteTab();
          break;
       case Key_3:
          CFButtonPushed();
          break;
       case Key_4:
          SDButtonPushed();
          break;
       case Key_5:
          homeButtonPushed();
          break;
       case Key_6:
          docButtonPushed();
          break;
       case Key_7:
          break;
       case Key_8:
          break;
       case Key_9:
          break;
       case Key_0:
          break;
       };
       e->accept();
    }
 }
 
 void AdvancedFm::keyReleaseEvent( QKeyEvent *e) {
    if( CurrentView()->hasFocus() )
       e->ignore();
 }
 
 
 void AdvancedFm::QPEButtonPushed() {
    QString current = QPEApplication::qpeDir();
    chdir( current.latin1() );
    CurrentDir()->cd( current, TRUE);
    populateView();
    update();
 }
 
 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() ));
 
    n->insertSeparator();
    n->insertItem( tr( "Rename" ), this, SLOT( renameIt() ));
 
    n->insertItem( tr( "Copy" ), this, SLOT( copy() ));
    n->insertItem( tr( "Copy As" ), this, SLOT( copyAs() ));
    n->insertItem( tr( "Copy Same Dir" ), this, SLOT( copySameDir() ));
    n->insertItem( tr( "Move" ), this, SLOT( move() ));
 
    n->insertSeparator();
    n->insertItem( tr( "Delete" ), this, SLOT( doDelete() ));
    m->insertItem( tr( "Add To Documents" ), this, SLOT( addToDocs() ));
 
    m->insertItem( tr( "Run Command" ), this, SLOT( runCommand() ));
    m->insertItem( tr( "File Info" ), this, SLOT( fileStatus() ));
 
    m->insertSeparator();
    m->insertItem( tr( "Set Permissions" ), this, SLOT( filePerms() ));
 
 #if defined(QT_QWS_OPIE)
    m->insertItem( tr( "Properties" ), this, SLOT( doProperties() ));
 #endif
    m->setCheckable(TRUE);
    if (!b)
       m->setItemChecked(m->idAt(0),TRUE);
    else
       m->setItemChecked(m->idAt(0),FALSE);
 
    if(Ir::supported())
       m->insertItem( tr( "Beam File" ), this, SLOT( doBeam() ));
    m->setFocus();
 
    m->exec( QPoint( QCursor::pos().x(), QCursor::pos().y()) );
 
    if(m) delete m;
 }
 
 
 QString AdvancedFm::checkDiskSpace(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::addToDocs() {
    QStringList strListPaths = getPath();
    QDir *thisDir = CurrentDir();
 
    if( strListPaths.count() > 0) {
       QString curFile;
       for ( QStringList::Iterator it = strListPaths.begin(); it != strListPaths.end(); ++it ) {
          curFile = thisDir->canonicalPath()+"/"+(*it);
 //                odebug << curFile << oendl;
          QFileInfo fi(curFile);
          DocLnk f;
 //                curFile.replace(QRegExp("\\..*"),"");
          f.setName(fi.baseName() );
          f.setFile( curFile);
          f.writeLink();
       }
    }
 }
 
 
 void AdvancedFm::customDirsToMenu() {
 
    Config cfg("AdvancedFm");
    cfg.setGroup("Menu");
 
    QStringList list = cfg.readListEntry( "CustomDir", ',');
    menuButton->insertItems(list );
 
 //      for ( QStringList::Iterator it = list.begin(); it != list.end(); ++it )
 //        {
 //            customDirMenu->insertItem(*it );
 //        }
 }
 
 void AdvancedFm::dirMenuSelected(int item) {
    switch(item)
    {
 
    case -21:
    case 0:
       addCustomDir();
       break;
    case -22:
    case 1:
       removeCustomDir();
       break;
    default:
    {
 //            gotoCustomDir( menuButton->text(item));
 //            gotoCustomDir( customDirMenu->text(item));
    }
    break;
 
    };
 }
 
 void AdvancedFm::addCustomDir() {
    Config cfg("AdvancedFm");
    cfg.setGroup("Menu");
    QString dir;
    QStringList list = cfg.readListEntry( (const QString &)"CustomDir", (const QChar)',');
 
    dir =  CurrentDir()->canonicalPath();
 
    bool addIt=true;
    for ( QStringList::Iterator it = list.begin(); it != list.end(); ++it ) {
       if( dir == (*it)) {
          addIt=false;
       }
    }
    if(addIt) {
       menuButton->insertItem(dir);
 //          customDirMenu->insertItem(dir);
       list <<  dir;
    }
 
    cfg.writeEntry("CustomDir", list, ',');
    cfg.write();
 }
 
 void AdvancedFm::removeCustomDir() {
 //  odebug << "remove custom dir" << oendl;
    Config cfg("AdvancedFm");
    cfg.setGroup("Menu");
    QString dir;
    QStringList list = cfg.readListEntry( (const QString &)"CustomDir", (const QChar)',');
    QStringList list2;
    dir =  CurrentDir()->canonicalPath();
    int ramble=2;
 //  int ramble=-24;
 //first remove list
    if(list.grep(dir,true).isEmpty()) {
       QMessageBox::message(tr( "AdvancedFm" ),
                            tr("Cannot remove current directory\nfrom bookmarks.\nIt is not bookmarked!"));
    } else {
       for ( QStringList::Iterator it = list.begin(); it != list.end(); ++it ) {
          if((*it) != dir) {
 //current item is not our current dir, so add it to temp list
             list2 <<(*it);
          } else {
 //              customDirMenu->removeItem( ramble);
             menuButton->remove( ramble);
 
          }
          ramble++;
 //        ramble--;
       }
 
       cfg.writeEntry("CustomDir", list2, ',');
       cfg.write();
    }
 //    customDirsToMenu();
 
 }
 
 void AdvancedFm::gotoCustomDir(const QString &dir) {
 //     odebug << "gotoCustomDir(const QString &dir) " +dir << oendl;
 //  QString curDir = dir;
 //  QDir *thisDir = CurrentDir();
 //     if( curDir.isEmpty()) {
 //     }
    if( dir == s_addBookmark) {
       addCustomDir();
    }
    if( dir == s_removeBookmark) {
       removeCustomDir( );
    } else {
       gotoDirectory( dir);
 //       if(QDir( curDir).exists() )
 //         {
 //           thisDir->setPath( curDir );
 //           chdir( curDir.latin1() );
 //           thisDir->cd( curDir, TRUE);
 //           populateView();
 //         }
    }
 }
 
 QDir *AdvancedFm::CurrentDir() {
 
+         if ( TabWidget->currentWidget() == tab)
+                         qDebug("CurrentTab is Local");
+         else
+                         qDebug("CurrentTab is Remote");
+                         
    if ( whichTab == 1) {
       return &currentDir;
    } else {
       return &currentRemoteDir;
    }
 }
 
 QDir *AdvancedFm::OtherDir() {
+        // if ( TabWidget->currentWidget() == tab) {
    if ( whichTab == 1) {
       return &currentRemoteDir;
    } else {
       return &currentDir;
    }
 }
 
 QListView * AdvancedFm::CurrentView() {
+                if ( TabWidget->currentWidget() == tab) 
+      odebug << "CurrentView local" << oendl;
+                
+        // if ( TabWidget->currentWidget() == tab) {
    if ( whichTab == 1) {
-//      owarn << "CurrentView Tab 1" << oendl;
       return Local_View;
    } else {
 //      owarn << "CurrentView Tab 2" << oendl;
       return Remote_View;
    }
 }
 
 QListView * AdvancedFm::OtherView() {
    if ( whichTab == 1)
       return Remote_View;
    else
       return Local_View;
 }
 
 void AdvancedFm::setOtherTabCurrent() {
-//   owarn << "setOtherTabCurrent() " << whichTab << "" << oendl;
+                qDebug("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) {
 //   odebug << "qcop message "+msg << oendl;
    QDataStream stream ( data, IO_ReadOnly );
    if ( msg == "openDirectory(QString)" ) {
 //      odebug << "received" << oendl;
       QString file;
       stream >> file;
       gotoDirectory( (const QString &) file);
    }
 }
 
 void AdvancedFm::setDocument(const QString &file) {
    gotoDirectory( file);
 
 }
 
 void AdvancedFm::gotoDirectory(const QString &file) {
-//   owarn << "goto dir "+file << oendl;
+   qDebug("goto dir "+file);
    QString curDir = file;
    QDir *thisDir = CurrentDir();
    if(QDir( curDir).exists() )  {
       thisDir->setPath( curDir );
       chdir( curDir.latin1() );
       thisDir->cd( curDir, TRUE);
       populateView();
    }
    else if(QFileInfo(curDir).exists()) {
       QFileInfo fileInfo(curDir);
       curDir=fileInfo.dirPath();
       if(QDir( curDir).exists() )  {
          thisDir->setPath( curDir );
          chdir( curDir.latin1() );
          thisDir->cd( curDir, TRUE);
          populateView();
       }
       findFile(file);
    }
 
 }
 
 void AdvancedFm::findFile(const QString &fileName) {
    QFileInfo fi(fileName);
    QListView *thisView = CurrentView();
    QListViewItemIterator it( thisView );
    for ( ; it.current(); ++it ) {
       if(it.current()->text(0) == fi.fileName()) {
          it.current()->setSelected(true);
          thisView->ensureItemVisible(it.current());
       }
    }
 }
 
 void AdvancedFm::slotSwitchMenu(int ) {
 //   odebug << "Switch " << item << "" << oendl;
    //   viewMenu->setItemChecked(item, true);
 }
 
-void AdvancedFm::dealWithSchmooSchmaa(QWidget *w) {
-   tabChanged( w);
-   if( w == Local_View) {
-      Remote_View->clearFocus();
-   } else {
-      Local_View->clearFocus();
-   }
-}
-
 void AdvancedFm::navigateToSelected() {
    if( !CurrentView()->currentItem()) return;
    doDirChange();
 }
diff --git a/noncore/apps/advancedfm/advancedfm.h b/noncore/apps/advancedfm/advancedfm.h
index effda0b..e596977 100644
--- a/noncore/apps/advancedfm/advancedfm.h
+++ b/noncore/apps/advancedfm/advancedfm.h
@@ -1,185 +1,186 @@
 /***************************************************************************
    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 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 writeConfig();
    void readConfig();
    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();
 
 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 dealWithSchmooSchmaa(QWidget *);
 
 protected slots:
+
    void openSearch();
    void dirMenuSelected(int);
    void showFileMenu();   
    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;
    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(Opie::Core::OProcess *);
    void oprocessStderr(Opie::Core::OProcess *, char *, int);
    void gotoCustomDir(const QString &);
    void qcopReceive(const QCString&, const QByteArray&);
    void setDocument(const QString &);
 
 };
 
 #endif // ADVANCEDFM_H
diff --git a/noncore/apps/advancedfm/advancedfm.pro b/noncore/apps/advancedfm/advancedfm.pro
index f1c518e..0644edb 100644
--- a/noncore/apps/advancedfm/advancedfm.pro
+++ b/noncore/apps/advancedfm/advancedfm.pro
@@ -1,15 +1,15 @@
 TEMPLATE  = app
 CONFIG    += qt warn_on quick-app
 HEADERS   = advancedfm.h filePermissions.h output.h
 SOURCES   = advancedfm.cpp advancedfmData.cpp advancedfmMenu.cpp filePermissions.cpp output.cpp main.cpp
 TARGET    = advancedfm
 INCLUDEPATH += $(OPIEDIR)/include
 DEPENDPATH  += $(OPIEDIR)/include
-LIBS        += -lqpe -lopiecore2 -lopieui2
+LIBS        += -lqpe -lqte -lopiecore2 -lopieui2
 
 !contains(CONFIG,quick-app) {
  DESTDIR = $(OPIEDIR)/bin
  DEFINES += NOQUICKLAUNCH
 }
 
 include ( $(OPIEDIR)/include.pro )
diff --git a/noncore/apps/advancedfm/advancedfmMenu.cpp b/noncore/apps/advancedfm/advancedfmMenu.cpp
index 4628170..8d04c68 100644
--- a/noncore/apps/advancedfm/advancedfmMenu.cpp
+++ b/noncore/apps/advancedfm/advancedfmMenu.cpp
@@ -1,842 +1,844 @@
 /***************************************************************************
    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; 
       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);
     }
      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);
     }
          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);
 //      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();
 //          odebug << execStr << oendl; 
           if( execStr.isEmpty() ) {
             } else {
               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;
     }
 }
 
 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();
 }
 
 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();
             }
             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) {
 //               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();
 }
 
 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;
             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));
 
          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("%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;
          }
       }
             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();
+   qApp->processEvents();
+
 }
 
 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;
             }
 
 //          odebug << "copy "+curFile+" as "+destFile << oendl; 
         }
       delete fileDlg;
     }
             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;
 //          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( curFile);
           if( f.exists()) {
                             if( !copyFile(  curFile, destFile) )  {
                                     QMessageBox::message(tr("Note"),tr("Could not move\n")+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("Could not move\n") + 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( "Could not copy \n%1 \nto \n%2").arg( src ).arg( dest ) );
                 return false;
         }
 
         return true;
 }
 
 
 bool AdvancedFm::copyFile( const QString & src, const QString & dest ) {
 
 
         if(QFileInfo(src).isDir()) {
                 if( copyDirectory( src, dest )) {
                         setOtherTabCurrent();
                         populateView();
                         return true;
                 }
                 else
                         return false;
         }
 
 
         bool success = true;
         struct stat status;
         QFile srcFile(src);
         QFile destFile(dest);
         int err=0;
         int read_fd=0;
    int write_fd=0;
    struct stat stat_buf;
    off_t offset = 0;
       if(!srcFile.open( IO_ReadOnly|IO_Raw)) {
 //         owarn << "open failed" << oendl; 
          return success = false;
    }
    read_fd = srcFile.handle();
    if(read_fd != -1) {
       fstat (read_fd, &stat_buf);
       if( !destFile.open( IO_WriteOnly|IO_Raw ) ) {
 //       owarn << "destfile open failed" << oendl; 
        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.";
               };
               success = false;
 //              owarn << msg << oendl; 
          }
       } else {
          success = false;
       }
    } else {
       success = false;
    }
    srcFile.close();
    destFile.close();
     // Set file permissions
   if( stat( QFile::encodeName(src), &status ) == 0 )  {
       chmod( QFile::encodeName(dest), status.st_mode );
     }
 
   return success;
 }
 
 void AdvancedFm::runCommand() {
    if( !CurrentView()->currentItem()) return;
    QDir *thisDir = CurrentDir();
 
    QString curFile;
    curFile = thisDir->canonicalPath() +"/"+ CurrentView()->currentItem()->text(0);
 
    InputDialog *fileDlg;
    fileDlg = new InputDialog(this,tr("Run Command"),TRUE, 0);
    fileDlg->setInputText(curFile);
    fileDlg->exec();
    //QString command;
 
    if( fileDlg->result() == 1 ) {
 //      odebug << fileDlg->LineEdit1->text() << oendl; 
       QStringList command;
 
       command << "/bin/sh";
       command << "-c";
       command <<  fileDlg->LineEdit1->text();
       Output *outDlg;
       outDlg = new Output( command, this, tr("AdvancedFm Output"), true);
       QPEApplication::execDialog( outDlg );
       qApp->processEvents();
 
    }
 }
 
 void AdvancedFm::runCommandStd() {
    if( !CurrentView()->currentItem()) return;
    QString curFile;
    QDir *thisDir = CurrentDir();
    QListView *thisView = CurrentView();
    if( thisView->currentItem())
       curFile = thisDir->canonicalPath() +"/"+  thisView->currentItem()->text(0);
 
    InputDialog *fileDlg;
    fileDlg = new InputDialog(this,tr("Run Command"),TRUE, 0);
    fileDlg->setInputText(curFile);
    fileDlg->exec();
 
    if( fileDlg->result() == 1 ) {
       qApp->processEvents();
       startProcess( (const QString)fileDlg->LineEdit1->text().latin1());
    }
 }
 
 void AdvancedFm::fileStatus() {
    if( !CurrentView()->currentItem()) return;
    QString curFile;
    curFile = CurrentView()->currentItem()->text(0);
 
    QStringList command;
    command << "/bin/sh";
    command << "-c";
    command << "stat -l "+ curFile;
 
    Output *outDlg;
    outDlg = new Output( command, this, tr("AdvancedFm Output"), true);
    QPEApplication::execDialog( outDlg );
    qApp->processEvents();
 }
 
 
 void AdvancedFm::mkDir() {
     makeDir();
 }
 
 void AdvancedFm::rn() {
   renameIt();
 }
 
 void AdvancedFm::del() {
     doDelete();
 }
 
 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;
 //          odebug << cmd << oendl; 
           startProcess( (const QString)cmd );
         }
             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") );
 }
 
 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(Opie::Core::OProcess*)),
           this, SLOT( processEnded(Opie::Core::OProcess*)));
 
   connect(process, SIGNAL( receivedStderr(Opie::Core::OProcess*,char*,int)),
           this, SLOT( oprocessStderr(Opie::Core::OProcess*,char*,int)));
 
   command << "/bin/sh";
   command << "-c";
   command << cmd.latin1();
   *process << command;
   if(!process->start(OProcess::NotifyOnExit, OProcess::All) )
     odebug << "could not start process" << oendl; 
 }
 
 void AdvancedFm::processEnded(OProcess *) {
             rePopulate();
 }
 
 void AdvancedFm::oprocessStderr(OProcess*, char *buffer, int ) {
 //    owarn << "received stderrt " << buflen << " bytes" << oendl; 
 
     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 ) {
             cancelRename();
             return true;
           }
     }
    if ( o->inherits( "QListView" ) ) {
        if ( e->type() == QEvent::FocusIn ) {
-          if( o == Local_View) { //keep track of which view
-             whichTab=1;
-          }
-          else {
-             whichTab=2;
-          }
+           if( o == Local_View) { //keep track of which view
+                                                        qDebug("local view");
+              whichTab = 1;
+           } else {
+              whichTab = 2;
+                                                 qDebug("remote view");
+           }
        }
        OtherView()->setSelected( OtherView()->currentItem(), FALSE );//make sure there's correct selection
      }
 
   return QWidget::eventFilter( o, e );
 }
 
 
 void AdvancedFm::cancelRename() {
 //  odebug << "cancel rename" << oendl; 
   QListView * view;
   view = CurrentView();
 
   bool resetFocus = view->viewport()->focusProxy() == renameBox;
   delete renameBox;
   renameBox = 0;
   if ( resetFocus ) {
       view->viewport()->setFocusProxy( view);
       view->setFocus();
     }
 }
 
 void AdvancedFm::doRename(QListView * view) {
    if( !CurrentView()->currentItem()) return;
 
     QRect r = view->itemRect( view->currentItem( ));
     r = QRect( view->viewportToContents( r.topLeft() ), r.size() );
     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 );
 }
 
 void AdvancedFm::okRename() {
    if( !renameBox) 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 = "";
    QListViewItem *item = view->currentItem();
    view->takeItem( item );
    delete item;
      rePopulate();
 }
 
 void AdvancedFm::openSearch() {
     QMessageBox::message(tr("Note"),tr("Not Yet Implemented"));
 }