fix hidden again

3 files changed, 18 insertions, 9 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
@@ -61,36 +61,34 @@
 #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())
@@ -104,33 +102,32 @@ void AdvancedFm::tabChanged(QWidget *w)
         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());
-        //2populateView();
 }
 
 
 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);
@@ -230,32 +227,44 @@ void AdvancedFm::populateView()
                                                 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;
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
@@ -51,32 +51,33 @@ 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();
@@ -107,33 +108,33 @@ protected:
   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(); 
+  QDir *OtherDir();
   QListView *CurrentView();
   QListView *OtherView();
   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();
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
@@ -55,56 +55,55 @@ 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();