fix stuff

5 files changed, 361 insertions, 376 deletions

diff --git a/noncore/apps/advancedfm/advancedfm.cpp b/noncore/apps/advancedfm/advancedfm.cpp
index 4de7d38..02898de 100644
--- a/noncore/apps/advancedfm/advancedfm.cpp
+++ b/noncore/apps/advancedfm/advancedfm.cpp
@@ -41,7 +41,7 @@ AdvancedFm::AdvancedFm(QWidget *,const char*, WFlags )
    init();
    renameBox = 0;
 
-   unknownXpm = Resource::loadImage(  "UnknownDocument" ).smoothScale( AppLnk::smallIconSize(),  AppLnk::smallIconSize() );
+   unknownXpm = Resource::loadImage("UnknownDocument").smoothScale(AppLnk::smallIconSize(),AppLnk::smallIconSize() );
 
 	 initConnections();
 
@@ -50,8 +50,7 @@ AdvancedFm::AdvancedFm(QWidget *,const char*, WFlags )
 //	 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&)) );
+	 connect(channel,SIGNAL(received(const QCString&,const QByteArray&)),this,SLOT(qcopReceive(const QCString&,const QByteArray&)));
 
 // 	 if( CurrentView() == Local_View)
 // 			 qDebug("LOCAL VIEW");
@@ -76,151 +75,150 @@ void AdvancedFm::cleanUp() {
 }
 
 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 ( 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();
-   }
-	 
+//		qDebug("tabChanged");
+ 		if(wd == tab) {
+				whichTab = 1;
+// 				qDebug("tabchanged: LOCAL VIEW SHOWN");
+		}
+ 		else if(wd == tab_2) {
+				whichTab = 2;
+// 				qDebug("tabchanged: REMOTE VIEW SHOWN");
+		}
+		qApp->processEvents();
+ 		QString path = CurrentDir()->canonicalPath();
+//		qDebug(path);
+ 		if ( TabWidget->currentWidget() == tab) {
+ 				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());
+ 		currentPathCombo->lineEdit()->setText(path);
 }
 
 
 void AdvancedFm::populateView() {
 
-        QPixmap pm;
-        QListView *thisView = CurrentView();
-        QDir *thisDir = CurrentDir();
-        QString path = thisDir->canonicalPath();
-
-        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() ) {
+		QPixmap pm;
+		QListView *thisView = CurrentView();
+		QDir *thisDir = CurrentDir();
+		QString path = thisDir->canonicalPath();
+
+		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" );
+								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);
+						}
+						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);
-                                }
-                        }
+								fileL.sprintf("%s", mydirent->d_name);
+								devT = buf.st_dev;
+								fileS.sprintf("%d, %d", (int) ( devT >>8) &0xFF, (int)devT &0xFF);
+								fileDate.sprintf("%s", ctime( &buf.st_mtime));
+								if( fileL.find(".") == -1 ) {
+										item= new QListViewItem( thisView, fileL, fileS, fileDate);
+										pm = unknownXpm;
+										item->setPixmap( 0,pm);
+								}
+						}
 
-                closedir(dir);
-        }
+				closedir(dir);
+		}
 
-        thisView->setSorting( 3,FALSE);
-        fillCombo( (const QString &) path );
+		thisView->setSorting( 3,FALSE);
+		fillCombo( (const QString &) path );
 }
 
 void AdvancedFm::rePopulate() {
-     populateView();
-     setOtherTabCurrent();
-     populateView();
+//		qDebug("repopulate views");
+		populateView();
+		setOtherTabCurrent();
+		populateView();
 
 //      int tmpTab = whichTab;
 // //  odebug << "" << tmpTab << "" << oendl;
@@ -233,39 +231,39 @@ void AdvancedFm::rePopulate() {
 }
 
 void AdvancedFm::ListClicked(QListViewItem *selectedItem) {
-	 if ( TabWidget->currentWidget() == tab)
-			 qDebug("XXXXXXXXXXXXXXXXXXXXXXXX ListClicked local");
-	 else
-			 qDebug("XXXXXXXXXXXXXXXXXXXXXXXX ListClicked remote");
+// 		if ( TabWidget->currentWidget() == tab)
+// 				qDebug("XXXXXXXXXXXXXXXXXXXXXXXX ListClicked local");
+// 		else
+// 				qDebug("XXXXXXXXXXXXXXXXXXXXXXXX ListClicked remote");
 			 
 
-			 if(selectedItem) {
-      QString strItem=selectedItem->text(0);
+		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;
-      }
+				QString strSize=selectedItem->text(1);
+				strSize=strSize.stripWhiteSpace();
+				bool isDirectory = false;
+				QString strItem2;
 
-      if( strItem.find(". .",0,TRUE) && strItem.find("/",0,TRUE)!=-1 ) {
+				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(QDir(strItem).exists())
-            isDirectory = true;
-      }
+				if( strItem.find(". .",0,TRUE) && strItem.find("/",0,TRUE)!=-1 ) {
 
-      if( isDirectory ) {
-         CurrentDir()->cd( strItem, TRUE);
-         populateView();
-         CurrentView()->ensureItemVisible( CurrentView()->firstChild());
-      }
-      chdir( strItem.latin1());
-   }
+						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 ) {
@@ -292,14 +290,18 @@ void AdvancedFm::refreshCurrentTab() {
 }
 
 void AdvancedFm::switchToLocalTab() {
+		qDebug("switchToLocal ");
    TabWidget->setCurrentWidget(0);
    Local_View->setFocus();
+	 whichTab = 1;
 	 
 }
 
 void AdvancedFm::switchToRemoteTab() {
+		qDebug("switchToRemoteTab() ");
    TabWidget->setCurrentWidget(1);
    Remote_View->setFocus();
+	 whichTab = 2;
 }
 
 void AdvancedFm::readConfig() {
@@ -398,10 +400,7 @@ void AdvancedFm::CFButtonPushed() {
 
 
 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"));
+   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) {
@@ -568,52 +567,51 @@ void AdvancedFm::showFileMenu() {
    QString curApp;
    curApp = CurrentView()->currentItem()->text(0);
 
-   MimeType mt( curApp );
+   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() ));
+   m->insertItem(tr("Show Hidden Files"),this,SLOT(showHidden()));
 
-   if ( QFileInfo(fi).isDir() ) {
+   if ( QFileInfo(fi).isDir()) {
       m->insertSeparator();
-      m->insertItem( tr( "Change Directory" ), this, SLOT( doDirChange() ));
+      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() ) );
+      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 Directory"),this,SLOT(makeDir()));
 
-   n->insertItem( tr( "Make Symlink" ), this, SLOT( mkSym() ));
+   n->insertItem(tr("Make Symlink"),this,SLOT(mkSym()));
 
    n->insertSeparator();
-   n->insertItem( tr( "Rename" ), this, SLOT( renameIt() ));
+   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->insertItem(tr("Copy"),this,SLOT(copyTimer()));
+   n->insertItem(tr("Copy As"),this,SLOT(copyAsTimer()));
+   n->insertItem(tr("Copy Same Dir"),this,SLOT(copySameDirTimer()));
+   n->insertItem(tr("Move"),this,SLOT(moveTimer()));
 
    n->insertSeparator();
-   n->insertItem( tr( "Delete" ), this, SLOT( doDelete() ));
-   m->insertItem( tr( "Add To Documents" ), this, SLOT( addToDocs() ));
+   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->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() ));
+   m->insertItem(tr("Set Permissions"),this,SLOT(filePerms()));
 
 #if defined(QT_QWS_OPIE)
-   m->insertItem( tr( "Properties" ), this, SLOT( doProperties() ));
+   m->insertItem(tr("Properties"),this,SLOT(doProperties()));
 #endif
    m->setCheckable(TRUE);
    if (!b)
@@ -622,10 +620,10 @@ void AdvancedFm::showFileMenu() {
       m->setItemChecked(m->idAt(0),FALSE);
 
    if(Ir::supported())
-      m->insertItem( tr( "Beam File" ), this, SLOT( doBeam() ));
+      m->insertItem(tr("Beam File"),this,SLOT(doBeam()));
    m->setFocus();
 
-   m->exec( QPoint( QCursor::pos().x(), QCursor::pos().y()) );
+   m->exec(QPoint(QCursor::pos().x(),QCursor::pos().y()));
 
    if(m) delete m;
 }
@@ -788,15 +786,11 @@ void AdvancedFm::gotoCustomDir(const QString &dir) {
 }
 
 QDir *AdvancedFm::CurrentDir() {
-
-	 if ( TabWidget->currentWidget() == tab)
-			 qDebug("CurrentTab is Local");
-	 else
-			 qDebug("CurrentTab is Remote");
-			 
    if ( whichTab == 1) {
+// 			 qDebug("CurrentTab is Local");
       return &currentDir;
    } else {
+// 			 qDebug("CurrentTab is Remote");
       return &currentRemoteDir;
    }
 }
@@ -811,14 +805,13 @@ QDir *AdvancedFm::OtherDir() {
 }
 
 QListView * AdvancedFm::CurrentView() {
-		if ( TabWidget->currentWidget() == tab) 
-      odebug << "CurrentView local" << oendl;
-		
 //	 if ( TabWidget->currentWidget() == tab) {
    if ( whichTab == 1) {
+//				qDebug("CurrentView: local");
       return Local_View;
    } else {
 //      owarn << "CurrentView Tab 2" << oendl;
+//				qDebug("CurrentView: remote");
       return Remote_View;
    }
 }
@@ -831,14 +824,14 @@ QListView * AdvancedFm::OtherView() {
 }
 
 void AdvancedFm::setOtherTabCurrent() {
-		qDebug("setOtherTabCurrent() %d",whichTab);
+//		qDebug("setOtherTabCurrent() %d",whichTab);
    if ( whichTab == 1) {
       TabWidget->setCurrentWidget(1);
    } else {
       TabWidget->setCurrentWidget(0);
    }
-   OtherView()->setFocus();
-   OtherView()->setSelected( CurrentView()->firstChild(), true);
+    OtherView()->setFocus();
+    OtherView()->setSelected( CurrentView()->firstChild(), true);
 }
 
 void AdvancedFm::qcopReceive(const QCString &msg, const QByteArray &data) {
@@ -858,7 +851,7 @@ void AdvancedFm::setDocument(const QString &file) {
 }
 
 void AdvancedFm::gotoDirectory(const QString &file) {
-   qDebug("goto dir "+file);
+//   qDebug("goto dir "+file);
    QString curDir = file;
    QDir *thisDir = CurrentDir();
    if(QDir( curDir).exists() )  {
@@ -893,8 +886,8 @@ void AdvancedFm::findFile(const QString &fileName) {
    }
 }
 
-void AdvancedFm::slotSwitchMenu(int ) {
-//   odebug << "Switch " << item << "" << oendl;
+void AdvancedFm::slotSwitchMenu(int item) {
+//		qDebug( "Switch %d",item);
    //   viewMenu->setItemChecked(item, true);
 }
 
diff --git a/noncore/apps/advancedfm/advancedfm.h b/noncore/apps/advancedfm/advancedfm.h
index def6fe2..2234b3c 100644
--- a/noncore/apps/advancedfm/advancedfm.h
+++ b/noncore/apps/advancedfm/advancedfm.h
@@ -57,38 +57,6 @@ 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();
-	 void refreshCurrentTab();
 protected:
 
    Opie::Ui::OSplitter *TabWidget;
@@ -130,7 +98,41 @@ protected:
    QListView *OtherView();
    void setOtherTabCurrent();
 
+//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 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();
+	 void refreshCurrentTab();
 
    void openSearch();
    void dirMenuSelected(int);
@@ -142,13 +144,19 @@ protected slots:
    void QPEButtonPushed();
    void upDir();
    void currentPathComboChanged();
+
    void copy();
+   void copyTimer();
    void copyAs();
+   void copyAsTimer();
    void copySameDir();
-   void currentPathComboActivated(const QString &);
+   void copySameDirTimer();
+   void move();
+   void moveTimer();
+
+	 void currentPathComboActivated(const QString &);
    void fillCombo(const QString &);
    bool copyFile( const QString & , const QString & );
-   void move();
    void fileStatus();
    void doAbout();
    void doBeam();
@@ -161,7 +169,7 @@ protected slots:
 
 private:
    MenuButton *menuButton;
-   QString oldName;
+   QString oldName, localViewDir, remoteViewDir;
    void startProcess(const QString &);
    bool eventFilter( QObject * , QEvent * );
    void cancelRename();
@@ -180,6 +188,7 @@ private slots:
    void gotoCustomDir(const QString &);
    void qcopReceive(const QCString&, const QByteArray&);
    void setDocument(const QString &);
+//	 void doMenu(int
 
 };
 
diff --git a/noncore/apps/advancedfm/advancedfm.pro b/noncore/apps/advancedfm/advancedfm.pro
index 0644edb..713f61c 100644
--- a/noncore/apps/advancedfm/advancedfm.pro
+++ b/noncore/apps/advancedfm/advancedfm.pro
@@ -1,5 +1,5 @@
 TEMPLATE  = app
-CONFIG    += qt warn_on quick-app
+CONFIG    += qte 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
diff --git a/noncore/apps/advancedfm/advancedfmData.cpp b/noncore/apps/advancedfm/advancedfmData.cpp
index 1802571..d2e1d8e 100644
--- a/noncore/apps/advancedfm/advancedfmData.cpp
+++ b/noncore/apps/advancedfm/advancedfmData.cpp
@@ -248,44 +248,28 @@ void AdvancedFm::init() {
 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->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(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->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)));
diff --git a/noncore/apps/advancedfm/advancedfmMenu.cpp b/noncore/apps/advancedfm/advancedfmMenu.cpp
index 8d04c68..5a46579 100644
--- a/noncore/apps/advancedfm/advancedfmMenu.cpp
+++ b/noncore/apps/advancedfm/advancedfmMenu.cpp
@@ -271,9 +271,12 @@ void AdvancedFm::upDir() {
   update();
 }
 
+void AdvancedFm::copyTimer() {
+		QTimer::singleShot(125,this,SLOT(copy()));
+}
+
 void AdvancedFm::copy() {
-   qApp->processEvents();
-   QStringList curFileList = getPath();
+ QStringList curFileList = getPath();
 
    QDir *thisDir = CurrentDir();
    QDir *thatDir = OtherDir();
@@ -312,8 +315,8 @@ void AdvancedFm::copy() {
          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) ) {
+                                             tr("<p>%1 already  exists. Ok to overwrite?</P>").arg(item),
+                                             tr("Yes"),tr("No"),0,0,1)) {
                case 1:
                   return;
                   break;
@@ -324,15 +327,18 @@ void AdvancedFm::copy() {
 
          if( !copyFile( curFile, destFile) )  {
             QMessageBox::message("AdvancedFm",
-                                 tr( "Could not copy %1 to %2").arg( curFile ).arg( destFile ) );
+                                 tr( "<P>Could not copy %1 to %2</P>").arg(curFile).arg(destFile));
             return;
          }
       }
-            setOtherTabCurrent();
-            rePopulate();
+			rePopulate();
    }
 }
 
+void AdvancedFm::copyAsTimer() {
+		QTimer::singleShot(125,this,SLOT(copyAs()));
+}
+
 void AdvancedFm::copyAs() {
 
    QStringList curFileList = getPath();
@@ -346,7 +352,7 @@ void AdvancedFm::copyAs() {
       QString destFile;
       item=(*it);
       curFile = thisDir->canonicalPath()+"/"+(*it);
-      fileDlg = new InputDialog( this, tr("Copy "+curFile+" As"), TRUE, 0);
+      fileDlg = new InputDialog( this, tr("Copy %1 As").arg(curFile), TRUE, 0);
 
       fileDlg->setInputText((const QString &) destFile );
       fileDlg->exec();
@@ -358,7 +364,7 @@ void AdvancedFm::copyAs() {
          QFile f( destFile);
          if( f.exists()) {
             switch (QMessageBox::warning(this,tr("File Exists!"),
-                                         item+tr("\nexists. Ok to overwrite?"),
+                                         tr("<P> %1 already exists. Ok to overwrite?</p>").arg(item),
                                          tr("Yes"),tr("No"),0,0,1) ) {
             case 0:
                f.remove();
@@ -369,8 +375,7 @@ void AdvancedFm::copyAs() {
             };
          }
          if( !copyFile( curFile, destFile) ) {
-            QMessageBox::message("AdvancedFm",tr("Could not copy\n")
-                                 +curFile +tr("to\n")+destFile);
+            QMessageBox::message("AdvancedFm",tr("<p>Could not copy %1 to %2</P>").arg(curFile).arg(destFile));
             return;
          }
       }
@@ -378,11 +383,15 @@ void AdvancedFm::copyAs() {
 
    }
 	 rePopulate();
-	 setOtherTabCurrent();
+//	 setOtherTabCurrent();
    qApp->processEvents();
 
 }
 
+void AdvancedFm::copySameDirTimer() {
+		QTimer::singleShot(125,this,SLOT(copySameDir()));
+}
+
 void AdvancedFm::copySameDir() {
   qApp->processEvents();
   QStringList curFileList = getPath();
@@ -407,7 +416,7 @@ void AdvancedFm::copySameDir() {
           QFile f(destFile);
           if( f.exists()) {
               switch (QMessageBox::warning(this,tr("Delete"),
-                                           destFile+tr(" already exists.\nDo you really want to delete it?"),
+                                           tr("<p> %1 already exists. Do you really want to delete it?</P>").arg(destFile),
                                            tr("Yes"),tr("No"),0,0,1) ) {
               case 0:
 
@@ -419,8 +428,7 @@ void AdvancedFm::copySameDir() {
               };
             }
           if(!copyFile( curFile,destFile) )  {
-              QMessageBox::message("AdvancedFm",tr("Could not copy\n")
-                                   +curFile +tr("to\n")+destFile);
+              QMessageBox::message("AdvancedFm",tr("<P>Could not copy %1 to %2</P>").arg(curFile).arg(destFile));
               return;
             }
 
@@ -431,8 +439,11 @@ void AdvancedFm::copySameDir() {
             rePopulate();
 }
 
+void AdvancedFm::moveTimer() {
+		QTimer::singleShot(125,this,SLOT(move()));
+}
+
 void AdvancedFm::move() {
-  qApp->processEvents();
 
   QStringList curFileList = getPath();
   if( curFileList.count() > 0) {
@@ -460,20 +471,19 @@ void AdvancedFm::move() {
                             rePopulate();
                             return;
           }
-
-                    QFile f( curFile);
+					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);
+									QFile::remove(curFile);
           }
             }
 
   }
-            rePopulate();
-            setOtherTabCurrent();
+	rePopulate();
+//	setOtherTabCurrent();
 }
 
 bool AdvancedFm::moveDirectory( const QString & src, const QString & dest ) {
@@ -506,67 +516,65 @@ bool AdvancedFm::copyDirectory( const QString & src, const QString & dest ) {
 
 
 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)) {
+		if(QFileInfo(src).isDir()) {
+				if( copyDirectory( src, dest )) {
+//						setOtherTabCurrent();
+						rePopulate();
+						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 ) ) {
+				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;
+						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 );
+						}
+				} 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;
+		return success;
 }
 
 void AdvancedFm::runCommand() {
@@ -708,11 +716,9 @@ 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(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)));
+  connect(process, SIGNAL( receivedStderr(Opie::Core::OProcess*,char*,int)), this, SLOT( oprocessStderr(Opie::Core::OProcess*,char*,int)));
 
   command << "/bin/sh";
   command << "-c";
@@ -754,13 +760,13 @@ bool AdvancedFm::eventFilter( QObject * o, QEvent * e ) {
     }
    if ( o->inherits( "QListView" ) ) {
        if ( e->type() == QEvent::FocusIn ) {
-           if( o == Local_View) { //keep track of which view
- 							qDebug("local view");
-              whichTab = 1;
-           } else {
-              whichTab = 2;
- 						 qDebug("remote view");
-           }
+//            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
      }
@@ -789,25 +795,18 @@ void AdvancedFm::doRename(QListView * view) {
     QRect r = view->itemRect( view->currentItem( ));
     r = QRect( view->viewportToContents( r.topLeft() ), r.size() );
     r.setX( view->contentsX() );
-
-        if ( r.width() > view->visibleWidth() )
+		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->resize( r.size() );
+		view->viewport()->setFocusProxy( renameBox );
+		renameBox->setFocus();
     renameBox->show();
 }