fix hidden again

3 files changed, 17 insertions, 8 deletions

diff --git a/noncore/apps/advancedfm/advancedfm.cpp b/noncore/apps/advancedfm/advancedfm.cpp
index d56e746..bb7f346 100644
--- a/noncore/apps/advancedfm/advancedfm.cpp
+++ b/noncore/apps/advancedfm/advancedfm.cpp
@@ -53,92 +53,89 @@
 #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();
-	TabWidget->setCurrentTab(1);
-	populateView();
-	TabWidget->setCurrentTab(0);
-	populateView();
+	whichTab=1;
+	rePopulate();
 	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::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("AdvancedFm :: "+fs+" :: "
              +checkDiskSpace((const QString &) path)+" kB free" );
   bool isDir=FALSE;
   const QFileInfoList *list = thisDir->entryInfoList( /*QDir::All*/ /*, QDir::SortByMask*/);
   QFileInfoListIterator it(*list);
   QFileInfo *fi;
   while ( (fi=it.current()) )
 		{
@@ -222,48 +219,60 @@ void AdvancedFm::populateView()
 			if((dir = opendir( path.latin1())) != NULL)
 				while ((mydirent = readdir(dir)) != NULL)
 					{
 						lstat( mydirent->d_name, &buf);
 //        qDebug(mydirent->d_name);
 						fileL.sprintf("%s", mydirent->d_name);
 						devT = buf.st_dev;
 						fileS.sprintf("%d, %d", (int) ( devT >>8) &0xFF, (int)devT &0xFF);
 						fileDate.sprintf("%s", ctime( &buf.st_mtime));
 						if( fileL.find(".") == -1 )
 							{
 								item= new QListViewItem( thisView, fileL, fileS, fileDate);
 								pm =  Resource::loadPixmap( "UnknownDocument-14" );
 								item->setPixmap( 0,pm);
 							}
 					}
 
 			closedir(dir);
 		}
 
   thisView->setSorting( 3,FALSE);
   fillCombo( (const QString &) path );
 }
 
+void AdvancedFm::rePopulate()
+{
+	int tmpTab = whichTab;
+	qDebug("%d", tmpTab);
+
+	for(int i =1; i < 3; i++)
+		{
+			TabWidget->setCurrentTab(i - 1);
+			populateView();
+		}
+	TabWidget->setCurrentTab( tmpTab - 1);
+}
 
 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;
 				}
diff --git a/noncore/apps/advancedfm/advancedfm.h b/noncore/apps/advancedfm/advancedfm.h
index 024ab29..3250a66 100644
--- a/noncore/apps/advancedfm/advancedfm.h
+++ b/noncore/apps/advancedfm/advancedfm.h
@@ -43,48 +43,49 @@ 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 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:
 
diff --git a/noncore/apps/advancedfm/advancedfmMenu.cpp b/noncore/apps/advancedfm/advancedfmMenu.cpp
index f46503c..a82d69a 100644
--- a/noncore/apps/advancedfm/advancedfmMenu.cpp
+++ b/noncore/apps/advancedfm/advancedfmMenu.cpp
@@ -47,72 +47,71 @@
 
 
 void AdvancedFm::doDirChange()
 {
   ListClicked( CurrentView()->currentItem());
 }
 
 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);
 //    b=FALSE;
 
 		}
 	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=TRUE;
 		}
-  populateView();
-//  populateRemoteView();
+  rePopulate();
 //    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);
 			OtherDir()->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);
 			OtherDir()->setFilter( QDir::Files | QDir::Dirs/* | QDir::Hidden*/ | QDir::All);
 //     fileMenu->setItemChecked( fileMenu->idAt(0),FALSE);
 //    b=TRUE;
 		}
-  populateView();
+  rePopulate();
 }
 
 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);