cleanup

3 files changed, 87 insertions, 221 deletions

diff --git a/noncore/apps/advancedfm/advancedfm.cpp b/noncore/apps/advancedfm/advancedfm.cpp
index 74654fc..fc6c3bf 100644
--- a/noncore/apps/advancedfm/advancedfm.cpp
+++ b/noncore/apps/advancedfm/advancedfm.cpp
@@ -53,358 +53,246 @@
 #include <qmessagebox.h>
 #include <qlineedit.h>
 #include <qregexp.h>
 
 #include <unistd.h>
 #include <stdlib.h>
 #include <sys/stat.h>
 #include <dirent.h>
 #include <stdio.h>
 #include <time.h>
 #include <fcntl.h>
 #include <mntent.h>
 #include <string.h>
 #include <errno.h>
 #include <sys/vfs.h>
 #include <mntent.h>
 #include <sys/utsname.h>
 
 AdvancedFm::AdvancedFm( )
 		: QMainWindow( ) {
 	init();
 	renameBox = 0;
 
 	initConnections();
-	populateLocalView();
-	populateRemoteView();
+	TabWidget->setCurrentTab(1);
+	populateView();
+	TabWidget->setCurrentTab(0);
+	populateView();
 	currentPathCombo->setFocus();
 }
 
 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 *w)
 {
 	if( w == tab)
 		whichTab = 1;
 	else
 		whichTab = 2;
 
 //	qDebug("tab changed %d", whichTab );
 
    QString path = CurrentDir()->canonicalPath();
 	currentPathCombo->lineEdit()->setText( path );
 
 	viewMenu->setItemChecked(viewMenu->idAt(0),TRUE);
 	viewMenu->setItemChecked(viewMenu->idAt(1),FALSE);
 
 	QString fs= getFileSystemType( (const QString &)  path);
 
 	setCaption("AdvancedFm :: "+fs+" :: "
 						 +checkDiskSpace( (const QString &) path )+ " kB free" );
 	chdir( path.latin1());
+//2	populateView();
 }
 
 
-void AdvancedFm::populateLocalView()
+void AdvancedFm::populateView()
 {
   QPixmap pm;
-  Local_View->clear();
-  currentDir.setSorting(/* QDir::Size*/ /*| QDir::Reversed | */QDir::DirsFirst);
-  currentDir.setMatchAllDirs(TRUE);
-  currentDir.setNameFilter(filterStr);
+	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 &) currentDir.canonicalPath());
+  QString fs= getFileSystemType((const QString &) path);
   setCaption("AdvancedFm :: "+fs+" :: "
-             +checkDiskSpace((const QString &) currentDir.canonicalPath())+" kB free" );
+             +checkDiskSpace((const QString &) path)+" kB free" );
   bool isDir=FALSE;
-  const QFileInfoList *list = currentDir.entryInfoList( /*QDir::All*/ /*, QDir::SortByMask*/);
+  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.sprintf( "%s ->  %s",  fi->fileName().data(),sym.filePath().data() );
 					fileDate = sym.lastModified().toString();
 				}
 			else
 				{
 					fileS.sprintf( "%10i", fi->size() );
 					fileL.sprintf( "%s",fi->fileName().data() );
 					fileDate= fi->lastModified().toString();
-					if( QDir(QDir::cleanDirPath( currentDir.canonicalPath()+"/"+fileL)).exists() )
+					if( QDir(QDir::cleanDirPath( path +"/"+fileL)).exists() )
 						{
 							fileL+="/";
 							isDir=TRUE;
 						}
 				}
-			QFileInfo fileInfo(  currentDir.canonicalPath()+"/"+fileL);
+
+			QFileInfo fileInfo(  path + "/" + fileL);
+
 			if(fileL !="./" && fi->exists())
 				{
-					item= new QListViewItem( Local_View, fileL, fileS , fileDate);
+					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 =  Resource::loadPixmap( "UnknownDocument-14" );
 					}
 					item->setPixmap( 0,pm);
 					if(  fi->isSymLink() && fileL.find("->",0,TRUE) != -1)
 						{
 								// overlay link image
 							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(currentDir.canonicalPath().find("dev",0,TRUE) != -1)
+  if( path.find("dev",0,TRUE) != -1)
 		{
 			struct stat buf;
 			dev_t devT;
 			DIR *dir;
 			struct dirent *mydirent;
 
-			if((dir = opendir( currentDir.canonicalPath().latin1())) != NULL)
+			if((dir = opendir( path.latin1())) != NULL)
 				while ((mydirent = readdir(dir)) != NULL)
 					{
 						lstat( mydirent->d_name, &buf);
 //        qDebug(mydirent->d_name);
 						fileL.sprintf("%s", mydirent->d_name);
 						devT = buf.st_dev;
 						fileS.sprintf("%d, %d", (int) ( devT >>8) &0xFF, (int)devT &0xFF);
 						fileDate.sprintf("%s", ctime( &buf.st_mtime));
 						if( fileL.find(".") == -1 )
 							{
-								item= new QListViewItem( Local_View, fileL, fileS, fileDate);
+								item= new QListViewItem( thisView, fileL, fileS, fileDate);
 								pm =  Resource::loadPixmap( "UnknownDocument-14" );
 								item->setPixmap( 0,pm);
 							}
 					}
 
 			closedir(dir);
 		}
 
-  Local_View->setSorting( 3,FALSE);
-  fillCombo( (const QString &) currentDir.canonicalPath());
+  thisView->setSorting( 3,FALSE);
+  fillCombo( (const QString &) path );
 }
 
 
-void AdvancedFm::populateRemoteView()
-{
-  QPixmap pm;
-  Remote_View->clear();
-  currentRemoteDir.setSorting(/* QDir::Size*/ /*| QDir::Reversed | */QDir::DirsFirst);
-  currentRemoteDir.setMatchAllDirs(TRUE);
-  currentRemoteDir.setNameFilter(filterStr);
-  QString fileL, fileS, fileDate;
-
-  QString fs= getFileSystemType((const QString &) currentRemoteDir.canonicalPath());
-  setCaption("AdvancedFm :: "+fs+" :: "
-             +checkDiskSpace((const QString &) currentRemoteDir.canonicalPath())+" kB free" );
-  bool isDir=FALSE;
-  const QFileInfoList *list = currentRemoteDir.entryInfoList( /*QDir::All*/ /*, QDir::SortByMask*/);
-  QFileInfoListIterator it(*list);
-  QFileInfo *fi;
-  while ( (fi=it.current()) )
-		{
-			if (fi->isSymLink() )
-				{
-					QString symLink=fi->readLink();
-						//         qDebug("Symlink detected "+symLink);
-					QFileInfo sym( symLink);
-					fileS.sprintf( "%10i", sym.size() );
-					fileL.sprintf( "%s ->  %s",  fi->fileName().data(),sym.filePath().data() );
-					fileDate = sym.lastModified().toString();
-				}
-			else
-				{
-						//        qDebug("Not a dir: "+currentDir.canonicalPath()+fileL);
-					fileS.sprintf( "%10i", fi->size() );
-					fileL.sprintf( "%s",fi->fileName().data() );
-					fileDate= fi->lastModified().toString();
-
-					if( QDir(QDir::cleanDirPath( currentRemoteDir.canonicalPath()+"/"+fileL)).exists() )
-						{
-							fileL+="/";
-							isDir=TRUE;
-								//     qDebug( fileL);
-						}
-				}
-
-			QFileInfo fileInfo(  currentRemoteDir.canonicalPath()+"/"+fileL);
-			if(fileL !="./" && fi->exists())
-				{
-					item= new QListViewItem( Remote_View, fileL, fileS, fileDate);
-					QPixmap pm;
-
-					if(isDir || fileL.find("/",0,TRUE) != -1)
-						{
-							if( !QDir( fi->filePath() ).isReadable())
-								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
-						{
-							MimeType mt(fi->filePath());
-							pm=mt.pixmap(); //sets the correct pixmap for mimetype
-							if(pm.isNull())
-								pm =  Resource::loadPixmap( "UnknownDocument-14" );
-						}
-					if(  fi->isSymLink() && fileL.find("->",0,TRUE) != -1)
-						{
-								// overlay link image
-							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(currentRemoteDir.canonicalPath().find("dev",0,TRUE) != -1)
-		{
-			struct stat buf;
-			DIR *dir;
-			struct dirent *mydirent;
-			if((dir = opendir( currentRemoteDir.canonicalPath().latin1())) != NULL)
-
-				while ((mydirent = readdir(dir)) != NULL)
-					{
-						lstat( mydirent->d_name, &buf);
-//        qDebug(mydirent->d_name);
-						fileL.sprintf("%s", mydirent->d_name);
-						fileS.sprintf("%d,%d", (int) (buf.st_dev>>8)&0xFF, (int) buf.st_dev &0xFF);
-						fileDate.sprintf("%s", ctime( &buf.st_mtime));
-
-						if( fileL.find(".") == -1 )
-							{
-								item= new QListViewItem( Remote_View, fileL, fileS, fileDate);
-								pm =  Resource::loadPixmap( "UnknownDocument-14" );
-								item->setPixmap( 0,pm);
-							}
-					}
-
-			closedir(dir);
-		}
-
-  Remote_View->setSorting( 3,FALSE);
-  fillCombo( (const QString &) currentRemoteDir.canonicalPath() );
-}
-
 void AdvancedFm::ListClicked(QListViewItem *selectedItem)
 {
   if(selectedItem)
 		{
 			QString strItem=selectedItem->text(0);
 			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();
+					populateView();
 					CurrentView()->ensureItemVisible( CurrentView()->firstChild());
 				}
 			chdir( strItem.latin1());
 		}
 }
 
 void AdvancedFm::ListPressed( int mouse, QListViewItem *, const QPoint& , int ) {
   switch (mouse) {
   case 1:
   {
 		if(renameBox != 0 )
 			{
         cancelRename();
 			}
 
   }
 	break;
   case 2:
     menuTimer.start( 500, TRUE );
     break;
   };
 }
 
 void AdvancedFm::switchToLocalTab()
@@ -413,145 +301,145 @@ void AdvancedFm::switchToLocalTab()
   Local_View->setFocus();
 }
 
 void AdvancedFm::switchToRemoteTab()
 {
   TabWidget->setCurrentTab(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();
+			populateView();
 		}
 	else
 		{
 			QMessageBox::message(tr("Note"),tr("That directory does not exist"));
 		}
 }
 
 void  AdvancedFm::fillCombo(const QString &currentPath)
 {
 //    qDebug("%d",TabWidget->getCurrentTab());
   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();
+    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);
 //        qDebug(it.current()->text(0));
 					}
 			}
     return strList;
 }
 
 void AdvancedFm::homeButtonPushed()
 {
   QString current = QDir::homeDirPath();
   chdir( current.latin1() );
 	CurrentDir()->cd(  current, TRUE);
-	PopulateView();
+	populateView();
   update();
 }
 
 void AdvancedFm::docButtonPushed()
 {
   QString current = QPEApplication::documentDir();
   chdir( current.latin1() );
 
     CurrentDir()->cd( current, TRUE);
-    PopulateView();
+    populateView();
   update();
 }
 
 void AdvancedFm::SDButtonPushed()
 {
 	QString current = "/mnt/card";// this can change so fix
   chdir( current.latin1() );
     CurrentDir()->cd( current, TRUE);
-    PopulateView();
+    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();
+	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)
 {
 //    e->accept();
   if( CurrentView()->hasFocus()  )
     {
 			switch ( e->key() ) {
 			case Key_Delete:
 				del();
 				break;
 			case Key_A:
 				copyAs();
 				break;
@@ -610,49 +498,49 @@ void AdvancedFm::keyPressEvent( QKeyEvent *e)
 				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();
+    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;
@@ -927,76 +815,76 @@ void AdvancedFm::removeCustomDir()
 }
 
 void AdvancedFm::gotoCustomDir(const QString &dir)
 {
 //     qDebug("gotoCustomDir(const QString &dir) " +dir );
 	QString curDir = dir;
 	QDir *thisDir = CurrentDir();
 //     if( curDir.isEmpty()) {
 //     }
 	if( curDir == s_addBookmark)
 		{
 			addCustomDir();
 		}
 	if( curDir == s_removeBookmark)
 		{
 			removeCustomDir( );
 		}
 	else
 		{
 			if(QDir( curDir).exists() )
 				{
 					thisDir->setPath( curDir );
 					chdir( curDir.latin1() );
 					thisDir->cd( curDir, TRUE);
-					PopulateView();
+					populateView();
 				}
 		}
 }
 
 QDir *AdvancedFm::CurrentDir()
 {
 	if ( whichTab == 1)
 		{
 		return &currentDir;
 		}
 	else
 		{
 		return &currentRemoteDir;
 		}
 }
 
 QDir *AdvancedFm::OtherDir()
 {
 	if ( whichTab == 1)
 		{
 		return &currentRemoteDir;
 		}
 	else
 		{
 		return &currentDir;
 		}
 }
 
-void AdvancedFm::PopulateView()
-{
-	if ( whichTab == 1)
-		populateLocalView();
-	else
-		populateRemoteView();
-}
-
 QListView * AdvancedFm::CurrentView()
 {
 	if ( whichTab == 1)
 		return Local_View;
 	else
 		return Remote_View;
 }
 
 QListView * AdvancedFm::OtherView()
 {
 	if ( whichTab == 1)
 		return Remote_View;
 	else
 		return Local_View;
 }
+
+void AdvancedFm::setOtherTabCurrent()
+{
+	if ( whichTab == 1)
+		TabWidget->setCurrentTab(1);
+	else
+		TabWidget->setCurrentTab(0);
+}
diff --git a/noncore/apps/advancedfm/advancedfm.h b/noncore/apps/advancedfm/advancedfm.h
index 8eec6ba..024ab29 100644
--- a/noncore/apps/advancedfm/advancedfm.h
+++ b/noncore/apps/advancedfm/advancedfm.h
@@ -42,53 +42,51 @@ class QPEToolBar;
 class QPEMenuBar;
 class QPopupMenu;
 class QFile;
 class QListViewItem;
 class QLineEdit;
 class MenuButton;
 
 //class QPushButton;
 class QToolButton;
 class Ir;
 
 class AdvancedFm : public QMainWindow
 {
   Q_OBJECT
 public:
   AdvancedFm();
   ~AdvancedFm();
 protected slots:
   void selectAll();
   void addToDocs();
   void doDirChange();
   void mkDir();
   void del();
   void rn();
-  void populateLocalView();
-  void populateRemoteView();
+  void populateView();
   void showHidden();
   void showMenuHidden();
-//  void showRemoteHidden();
   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:
 
   OTabWidget *TabWidget;
   int whichTab;
@@ -104,49 +102,49 @@ protected:
   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 PopulateView();
+  void setOtherTabCurrent();
 
 protected slots:
   void dirMenuSelected(int);
   void showFileMenu();
   void cancelMenuTimer();
   void homeButtonPushed();
   void docButtonPushed();
   void SDButtonPushed();
   void CFButtonPushed();
   void QPEButtonPushed();
   void upDir();
   void currentPathComboChanged();
   void copy();
   void copyAs();
   void copySameDir();
   void currentPathComboActivated(const QString &);
   void fillCombo(const QString &);
   bool copyFile( const QString & , const QString & );
   void move();
   void fileStatus();
   void doAbout();
   void doBeam();
   void fileBeamFinished( Ir *);
 
diff --git a/noncore/apps/advancedfm/advancedfmMenu.cpp b/noncore/apps/advancedfm/advancedfmMenu.cpp
index 13dad33..c553017 100644
--- a/noncore/apps/advancedfm/advancedfmMenu.cpp
+++ b/noncore/apps/advancedfm/advancedfmMenu.cpp
@@ -47,70 +47,70 @@
 
 
 void AdvancedFm::doDirChange()
 {
   ListClicked( CurrentView()->currentItem());
 }
 
 void AdvancedFm::showMenuHidden()
 {
   if (b)
 		{
     currentDir.setFilter( QDir::Files | QDir::Dirs | QDir::Hidden | QDir::All);
     currentRemoteDir.setFilter( QDir::Files | QDir::Dirs | QDir::Hidden | QDir::All);
     fileMenu->setItemChecked( fileMenu->idAt(0),TRUE);
 //    b=FALSE;
 
   }
 	else
 		{
     currentDir.setFilter( QDir::Files | QDir::Dirs/* | QDir::Hidden*/ | QDir::All);
     currentRemoteDir.setFilter( QDir::Files | QDir::Dirs/* | QDir::Hidden*/ | QDir::All);
     fileMenu->setItemChecked( fileMenu->idAt(0),FALSE);
 //    b=TRUE;
   }
-  populateLocalView();
-  populateRemoteView();
+  populateView();
+//  populateRemoteView();
 //    if(b) qDebug("<<<<<<<<<<<<<<<<<<<<<<<<<<<< true");
     if(b) b = false; else b = true;
 }
 
 void AdvancedFm::showHidden()
 {
   if (b)
 		{
 			CurrentDir()->setFilter( QDir::Files | QDir::Dirs | QDir::Hidden | QDir::All);
 //     fileMenu->setItemChecked( fileMenu->idAt(0),TRUE);
 //    b=FALSE;
 
 		}
 	else
 		{
 			CurrentDir()->setFilter( QDir::Files | QDir::Dirs/* | QDir::Hidden*/ | QDir::All);
 //     fileMenu->setItemChecked( fileMenu->idAt(0),FALSE);
 //    b=TRUE;
 		}
-  PopulateView();
+  populateView();
 }
 
 QString AdvancedFm::dealWithSymName(const QString &fileName)
 {
         QString strItem = fileName;
         return  strItem.right( (strItem.length() - strItem.find("->",0,TRUE)) - 4);
 }
 
 void AdvancedFm::runThis()
 {
 	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);
@@ -144,177 +144,177 @@ void AdvancedFm::runThis()
 void AdvancedFm::runText()
 {
 	QString curFile = CurrentView()->currentItem()->text(0);
 	if(curFile != "../")
 		{
 			if( curFile.find("@",0,TRUE) !=-1 || curFile.find("->",0,TRUE) !=-1 )  //if symlink
         curFile = dealWithSymName((const QString&)curFile);
       curFile =  CurrentDir()->canonicalPath()+"/"+curFile;
       QCopEnvelope e("QPE/Application/textedit", "setDocument(QString)" );
       e << curFile;
     }
 }
 
 void AdvancedFm::makeDir()
 {
   InputDialog *fileDlg;
   fileDlg = new InputDialog(this,tr("Make Directory"),TRUE, 0);
   fileDlg->exec();
   if( fileDlg->result() == 1 )
 		{
 			QDir *thisDir = CurrentDir();
 			QString  filename = fileDlg->LineEdit1->text();
 			thisDir->mkdir( thisDir->canonicalPath()+"/"+filename);
   }
-  PopulateView();
+  populateView();
 }
 
 void AdvancedFm::doDelete()
 {
 
   QStringList curFileList = getPath();
   bool doMsg=true;
   int count = curFileList.count();
   if( count > 0)
 		{
       if(count > 1 )
 				{
           QString msg;
           msg=tr("Really delete\n%1 files?").arg(count);
           switch ( QMessageBox::warning(this,tr("Delete"),msg
                                         ,tr("Yes"),tr("No"),0,0,1) )
 						{
             case 0:
                 doMsg=false;
                 break;
             case 1:
                 return;
                 break;
           };
       }
 
       QString myFile;
     for ( QStringList::Iterator it = curFileList.begin(); it != curFileList.end(); ++it )
 			{
       myFile = (*it);
       if( myFile.find(" -> ",0,TRUE) != -1)
         myFile = myFile.left( myFile.find(" -> ",0,TRUE));
 
       QString f = CurrentDir()->canonicalPath();
       if(f.right(1).find("/",0,TRUE) == -1)
         f += "/";
       f += myFile;
       if(QDir(f).exists() && !QFileInfo(f).isSymLink() )
 				{
         switch ( QMessageBox::warning( this, tr("Delete Directory?"), tr("Really delete\n") + f +
                                       "\nand all it's contents ?"
                                       ,tr("Yes"),tr("No"),0,0,1) )
 					{
         case 0:
 				{
           f=f.left(f.length()-1);
           QString cmd="rm -rf "+f;
           startProcess( (const QString)cmd.latin1() );
-          PopulateView();
+          populateView();
         }
           break;
         case 1:
           // exit
           break;
         };
 
       } else {
           if(doMsg) {
         switch ( QMessageBox::warning(this,tr("Delete"),tr("Really delete\n")+f
                  +" ?",tr("Yes"),tr("No"),0,0,1) ) {
           case 1:
               return;
               break;
         };
           }
         QString cmd="rm "+f;
         QFile file(f);
         if(QFileInfo(myFile).fileName().find("../",0,TRUE)==-1)
             file.remove();
       }
     }
   }
-  PopulateView();
+  populateView();
 }
 
 void AdvancedFm::filePerms()
 {
 	QStringList curFileList = getPath();
   QString filePath;
 
 	filePath = CurrentDir()->canonicalPath()+"/";
 
   for ( QStringList::Iterator it = curFileList.begin(); it != curFileList.end(); ++it )
 		{
 			filePermissions *filePerm;
 			filePerm = new filePermissions(this, "Permissions",true,0,(const QString &)(filePath+*it));
 			filePerm->showMaximized();
 			filePerm->exec();
 			if( filePerm)
 				delete  filePerm;
 		}
-	PopulateView();
+	populateView();
 }
 
 void AdvancedFm::doProperties()
 {
 #if defined(QT_QWS_OPIE)
 
   QStringList curFileList = getPath();
 
   QString filePath;
     filePath = CurrentDir()->canonicalPath()+"/";
 
 		qDebug("%d",curFileList.count());
 
    for ( QStringList::Iterator it = curFileList.begin(); it != curFileList.end(); ++it )
 		 {
     qDebug((filePath+*it));
     DocLnk lnk( (filePath+*it));
     LnkProperties prop( &lnk );
     prop.showMaximized();
     prop.exec();
   }
 #endif
 
 }
 
 void AdvancedFm::upDir()
 {
 	QDir *thisDir = CurrentDir();
 	QString current = thisDir->canonicalPath();
 	QDir dir(current);
 	dir.cdUp();
 	current = dir.canonicalPath();
 	chdir( current.latin1() );
   thisDir->cd(  current, TRUE);
 
-  PopulateView();
+  populateView();
 	update();
 }
 
 void AdvancedFm::copy()
 {
   qApp->processEvents();
   QStringList curFileList = getPath();
 
   QDir *thisDir = CurrentDir();
 	QDir *thatDir = OtherDir();
 
   bool doMsg=true;
 	int count=curFileList.count();
 	if( count > 0) {
 		if(count > 1 ){
 			QString msg;
 			msg=tr("Really copy\n%1 files?").arg(count);
 			switch ( QMessageBox::warning(this,tr("Delete"),msg
 																		,tr("Yes"),tr("No"),0,0,1) )
 				{
 				case 0:
 					doMsg=false;
 					break;
 				case 1:
@@ -339,51 +339,50 @@ void AdvancedFm::copy()
 				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;
 					}
       }
-
-		PopulateView();
-//		TabWidget->setCurrentTab(1);
+		setOtherTabCurrent();
+		populateView();
    }
 }
 
 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();
 
@@ -396,49 +395,50 @@ void AdvancedFm::copyAs()
 					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;
 
     }
-	PopulateView();
+		setOtherTabCurrent();
+	populateView();
 }
 
 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();
@@ -449,92 +449,93 @@ void AdvancedFm::copySameDir()
 						{
 							switch (QMessageBox::warning(this,tr("Delete"),
 																					 destFile+tr(" already exists.\nDo you really want to delete it?"),
 																					 tr("Yes"),tr("No"),0,0,1) ) {
 							case 0:
 
 								f.remove();
 								break;
 							case 1:
 								return;
 								break;
 							};
 						}
 					if(!copyFile( curFile,destFile) )
 						{
 							QMessageBox::message("AdvancedFm",tr("Could not copy\n")
 																	 +curFile +tr("to\n")+destFile);
 							return;
 						}
 
 					qDebug("copy "+curFile+" as "+destFile);
 				}
       delete fileDlg;
     }
-	PopulateView();
+	populateView();
 }
 
 void AdvancedFm::move()
 {
   qApp->processEvents();
 
   QStringList curFileList = getPath();
   if( curFileList.count() > 0)
 		{
 			QString curFile, destFile, item;
 
 			QDir *thisDir = CurrentDir();
 			QDir *thatDir = OtherDir();
 			for ( QStringList::Iterator it = curFileList.begin(); it != curFileList.end(); ++it )
 				{
 					item=(*it);
 					QString destFile =  thatDir->canonicalPath();
 
 					if(destFile.right(1).find("/",0,TRUE) == -1)
 						destFile+="/";
 					destFile += item;
 					qDebug("Destination file is "+destFile);
 
 					curFile = thisDir->canonicalPath();
 					if(curFile.right(1).find("/",0,TRUE) == -1)
 						curFile +="/";
 					curFile+= item;
 					qDebug("CurrentFile file is " + 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);
 					}
 				}
 
 		}
-			populateRemoteView();
-			populateLocalView();
+		setOtherTabCurrent();
+			populateView();
+//			populateLocalView();
 }
 
 bool AdvancedFm::copyFile( const QString & src, const QString & dest )
 {
   char bf[ 50000 ];
   int  bytesRead;
   bool success = TRUE;
   struct stat status;
 
   QFile s( src );
   QFile d( dest );
 
   if( s.open( IO_ReadOnly | IO_Raw ) &&  d.open( IO_WriteOnly | IO_Raw ) )
 		{
 			while( (bytesRead = s.readBlock( bf, sizeof( bf ) )) == sizeof( bf ) )
 				{
 				if( d.writeBlock( bf, sizeof( bf ) ) != sizeof( bf ) ){
 					success = FALSE;
 					break;
 				}
 			}
 			if( success && (bytesRead > 0) )
 				{
 					d.writeBlock( bf, bytesRead );
@@ -622,105 +623,84 @@ void AdvancedFm::fileStatus()
 }
 
 
 void AdvancedFm::mkDir()
 {
     makeDir();
 }
 
 void AdvancedFm::rn()
 {
 	renameIt();
 }
 
 void AdvancedFm::del()
 {
     doDelete();
 }
 
 void AdvancedFm::mkSym()
 {
 	QString cmd;
 	QStringList curFileList = getPath();
 	if( curFileList.count() > 0)
 		{
-			if ( whichTab == 1)
-				{
-					for ( QStringList::Iterator it = curFileList.begin(); it != curFileList.end(); ++it )
-						{
+			QDir *thisDir = CurrentDir();
+			QDir * thatDir = OtherDir();
 
-							QString destName = currentRemoteDir.canonicalPath()+"/"+(*it);
-							if(destName.right(1) == "/")
-								{
-									destName = destName.left( destName.length() -1);
-								}
-							QString curFile =  currentDir.canonicalPath()+"/"+(*it);
-							if( curFile.right(1) == "/")
-								{
-									curFile = curFile.left( curFile.length() -1);
-								}
-							cmd = "ln -s "+curFile+" "+destName;
-							qDebug(cmd);
-							startProcess( (const QString)cmd );
-            }
-					populateRemoteView();
-					TabWidget->setCurrentTab(1);
-        }
-			else
+			for ( QStringList::Iterator it = curFileList.begin(); it != curFileList.end(); ++it )
 				{
-					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 destName = currentDir.canonicalPath()+"/"+(*it);
-							if(destName.right(1) == "/")
-								{
-									destName = destName.left( destName.length() -1);
-								}
-							QString curFile =  currentRemoteDir.canonicalPath()+"/"+(*it);
-							if( curFile.right(1) == "/")
-								{
-									curFile = curFile.left( curFile.length() -1);
-								}
+					QString curFile =  thisDir->canonicalPath()+"/"+(*it);
 
-							cmd = "ln -s "+curFile+" "+destName;
-							qDebug(cmd);
-							startProcess( (const QString)cmd );
-            }
-					populateLocalView();
-					TabWidget->setCurrentTab(0);
-        }
-    }
+					if( curFile.right(1) == "/")
+						{
+							curFile = curFile.left( curFile.length() -1);
+						}
+
+					cmd = "ln -s "+curFile+" "+destName;
+					qDebug(cmd);
+					startProcess( (const QString)cmd );
+				}
+			setOtherTabCurrent();
+			populateView();
+		}
 }
 
 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 =  CurrentDir()->canonicalPath()+"/"+(*it);
 							if( curFile.right(1) == "/")
 								{
 									curFile = curFile.left( curFile.length() -1);
 								}
 							Ir *file = new Ir(this, "IR");
 							connect(file, SIGNAL(done(Ir*)), this, SLOT( fileBeamFinished( Ir * )));
 							file->send( curFile, curFile );
 						}
 				}
 		}
 
 }
 
 void AdvancedFm::fileBeamFinished( Ir *)
 {
   QMessageBox::message( tr("Advancedfm Beam out"), tr("Ir sent.") ,tr("Ok") );
 }
@@ -734,50 +714,50 @@ void AdvancedFm::selectAll()
 //     } else {
 //         Remote_View->selectAll(true);
 //         Remote_View->setSelected( Remote_View->firstChild(),false);
 //     }
 }
 
 void AdvancedFm::startProcess(const QString & cmd)
 {
 	QStringList command;
 	OProcess *process;
 	process = new OProcess();
 	connect(process, SIGNAL(processExited(OProcess *)),
 					this, SLOT( processEnded()));
 
 	command << "/bin/sh";
 	command << "-c";
 	command << cmd.latin1();
 	*process << command;
 	if(!process->start(OProcess::NotifyOnExit) )
 		qDebug("could not start process");
 }
 
 void AdvancedFm::processEnded()
 {
-  populateLocalView();
-  populateRemoteView();
+//  populateLocalView();
+  populateView();
 }
 
 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();
@@ -822,48 +802,48 @@ void AdvancedFm::doRename(QListView * view)
     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()
 {
 	QListView *thisView = CurrentView();
     oldName = thisView->currentItem()->text(0);
     doRename( thisView );
-    PopulateView();
+    populateView();
 }
 
 void AdvancedFm::okRename()
 {
 	QString newName = renameBox->text();
 	cancelRename();
 //	int tabs=0;
 	QListView * view = CurrentView();
 	QString path =  CurrentDir()->canonicalPath() + "/";
 	oldName = path + oldName;
 	newName = path + newName;
 
 	if(  view->currentItem() == NULL)
 		return;
 	if( rename( oldName.latin1(), newName.latin1())== -1)
 		QMessageBox::message(tr("Note"),tr("Could not rename"));
 	else
 		oldName = "";
 
 	view->takeItem( view->currentItem() );
 	delete view->currentItem();
-	PopulateView();
+	populateView();
 }