fix showhidden files handling

2 files changed, 12 insertions, 15 deletions

diff --git a/noncore/apps/advancedfm/advancedfm.cpp b/noncore/apps/advancedfm/advancedfm.cpp
index b6e7a30..f23fd86 100644
--- a/noncore/apps/advancedfm/advancedfm.cpp
+++ b/noncore/apps/advancedfm/advancedfm.cpp
@@ -536,325 +536,320 @@ void AdvancedFm::docButtonPushed() {
 }
 
 void AdvancedFm::SDButtonPushed() {
     QString current = "/mnt/card";// this can change so fix
   chdir( current.latin1() );
   if (TabWidget->currentPageIndex() == 0) {
     currentDir.cd( current, TRUE);
     populateLocalView();
   } else {
     currentRemoteDir.cd( current, TRUE);
     populateRemoteView();
   }
   update();
 
 }
 
 void AdvancedFm::CFButtonPushed() {
     QString current;
     if(zaurusDevice)
         current= "/mnt/cf"; //zaurus
     else
         current = "/mnt/hda"; //ipaq
      
     chdir( current.latin1() );
     if (TabWidget->currentPageIndex() == 0) {
         currentDir.cd( current, TRUE);
         populateLocalView();
     } else {
         currentRemoteDir.cd( current, TRUE);
         populateRemoteView();
     }
     update();
 }
 
 
 
 void AdvancedFm::doAbout() {
   QMessageBox::message("AdvancedFm",tr("Advanced FileManager\n"
                        "is copyright 2002 by\n"
                        "L.J.Potter<llornkcor@handhelds.org>\n"
                        "and is licensed by the GPL"));
 }
 
 void AdvancedFm::keyReleaseEvent( QKeyEvent *e) {
   if( TabWidget->hasFocus()) 
     switch ( e->key() ) {
     case Key_Delete:
       del();
       break;
     case Key_H:
       showHidden();
       break;
     case Key_E:
       runThis();
       break;
     case Key_C:
       copy();
       break;
     case Key_A:
       copyAs();
       break;
     case Key_M:
       move();
       break;
     case Key_R:
       rn();
       break;
     case Key_I:
       fileStatus();
       break;
     case Key_U:
       upDir();
       break;
     case Key_P:
       filePerms();
       break;
     case Key_N:
       mkDir();
       break;
     case Key_1:
       switchToLocalTab();
       break;
     case Key_2:
       switchToRemoteTab();
       break;
     case Key_3:
       CFButtonPushed();
       break;
     case Key_4:
       SDButtonPushed();
       break;
     case Key_5:
       homeButtonPushed();
       break;
     case Key_6:
       docButtonPushed();
       break;
     case Key_7:
       break;
     case Key_8:
       break;
     case Key_9:
       break;
     case Key_0:
       break;
     }
 }
 
 
 void AdvancedFm::QPEButtonPushed() {
   QString current = QPEApplication::qpeDir();
   chdir( current.latin1() );
   if (TabWidget->currentPageIndex() == 0) {
     currentDir.cd( current, TRUE);
     populateLocalView();
   } else {
     currentRemoteDir.cd( current, TRUE);
     populateRemoteView();
   }
   update();
 }
 
 void AdvancedFm::parsetab(const QString &fileName) {
 
   fileSystemTypeList.clear();
   fsList.clear();
   struct mntent *me;
   FILE *mntfp = setmntent( fileName.latin1(), "r" );
   if ( mntfp ) {
     while ( (me = getmntent( mntfp )) != 0 ) {
       QString deviceName = me->mnt_fsname;
       QString filesystemType = me->mnt_type;
       QString mountDir = me->mnt_dir;
       if(deviceName != "none") {
         if( fsList.contains(filesystemType) == 0
             & filesystemType.find("proc",0,TRUE) == -1
             & filesystemType.find("cramfs",0,TRUE) == -1
             & filesystemType.find("auto",0,TRUE) == -1)
           fsList << filesystemType;
         fileSystemTypeList << mountDir+"::"+filesystemType;
       }
     }
   }
   endmntent( mntfp );
 }
 
 QString  AdvancedFm::getFileSystemType(const QString &currentText) {
   parsetab("/etc/mtab"); //why did TT forget filesystem type?
   QString current = currentText;//.right( currentText.length()-1);
   QString baseFs;
   for ( QStringList::Iterator it = fileSystemTypeList.begin(); it != fileSystemTypeList.end(); ++it ) {
     QString temp = (*it);
     QString path = temp.left(temp.find("::",0,TRUE) );
     path = path.right( path.length()-1);
     if(path.isEmpty()) baseFs = temp.right( temp.length() - temp.find("::",0,TRUE) - 2);
     if( current.find( path,0,TRUE) != -1 && !path.isEmpty()) {
       return temp.right( temp.length() - temp.find("::",0,TRUE) - 2);
     }
   }
   return baseFs;
 }
 
 QString  AdvancedFm::getDiskSpace( const QString &path) {
    struct statfs fss;
    if ( !statfs( path.latin1(), &fss ) ) {
      int blkSize = fss.f_bsize;
  //    int totalBlks = fs.f_blocks;
      int availBlks = fss.f_bavail;
  
      long mult = blkSize / 1024;
      long div = 1024 / blkSize;
      if ( !mult ) mult = 1;
      if ( !div ) div = 1;
  
      return QString::number(availBlks * mult / div);
    }
    return "";
 }
 
 
 void AdvancedFm::showFileMenu() {
 
     QString curApp;
     bool isLocalView = false;
     if (TabWidget->currentPageIndex() == 0) {
         isLocalView = TRUE;
         curApp = Local_View->currentItem()->text(0);
     }   else {
         curApp = Remote_View->currentItem()->text(0);
     }
 
      MimeType mt( curApp );
-
      const AppLnk* app = mt.application();
-
      QFile fi(curApp);
-
      QPopupMenu *m = new QPopupMenu(0);
      QPopupMenu *n = new QPopupMenu(0);
      //    QPopupMenu *o = new QPopupMenu(0);
-
-     m->insertItem(  tr( "Show Hidden Files" ), this,  SLOT( showHidden() ));
+     m->insertItem(  tr( "Show Hidden Files" ), this,  SLOT( showMenuHidden() ));
     
      if ( QFileInfo(fi).isDir() ) {
        m->insertSeparator();
        m->insertItem( tr( "Change Directory" ), this, SLOT( doLocalCd() ));
      } 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( /*Resource::loadPixmap( app->name()),*/ tr( "Execute" ), this, SLOT( runThis() ) );
-
+         m->insertItem( tr( "Execute" ), this, SLOT( runThis() ) );
        m->insertItem( Resource::loadPixmap( "txt" ), tr( "Open as text" ),this, SLOT( runText() ) );
      }
 
      m->insertItem(tr("Actions"),n);
      if(isLocalView)
        n->insertItem( tr( "Make Directory" ), this, SLOT( localMakDir() ));
      else
        n->insertItem( tr( "Make Directory" ), this, SLOT( remoteMakDir() ));
 
      n->insertItem( tr( "Make Symlink" ), this, SLOT( mkSym() ));
 
     n->insertSeparator();
     
     
     if(isLocalView)
         n->insertItem( tr( "Rename" ), this, SLOT( localRename() ));
     else
         n->insertItem( tr( "Rename" ), this, SLOT( remoteRename() ));
 
     n->insertItem( tr( "Copy" ), this, SLOT( copy() ));
     n->insertItem( tr( "Copy As" ), this, SLOT( copyAs() ));
     n->insertItem( tr( "Copy Same Dir" ), this, SLOT( copySameDir() ));
     n->insertItem( tr( "Move" ), this, SLOT( move() ));
 
     n->insertSeparator();
 
     if(isLocalView)
         n->insertItem( tr( "Delete" ), this, SLOT( localDelete() ));
     else
         n->insertItem( tr( "Delete" ), this, SLOT( remoteDelete() ));
 
 
     m->insertItem( tr( "Add To Documents" ), this, SLOT( addToDocs() ));
 
     m->insertItem( tr( "Run Command" ), this, SLOT( runCommand() ));
     m->insertItem( tr( "File Info" ), this, SLOT( fileStatus() ));
 
     m->insertSeparator();
     m->insertItem( tr( "Set Permissions" ), this, SLOT( filePerms() ));
 
 #if defined(QT_QWS_OPIE)
     m->insertItem( tr( "Properties" ), this, SLOT( doProperties() ));
 #endif    
     m->setCheckable(TRUE);
     if (!b)
         m->setItemChecked(m->idAt(0),TRUE);
     else
         m->setItemChecked(m->idAt(0),FALSE);
 
     if(Ir::supported())
         m->insertItem( tr( "Beam File" ), this, SLOT( doBeam() ));
     m->setFocus();
     m->exec( QCursor::pos() );
     sleep(1);
     if(m) delete m;
 }
 
 
 void AdvancedFm::cancelMenuTimer() {
 
 //  qDebug("selectionChanged: cancel menu timer");
   if( menuTimer.isActive() )
     menuTimer.stop();
 }
 
 QString AdvancedFm::checkDiskSpace(const QString &path) {
   struct statfs fss;
   if ( !statfs( path.latin1(), &fss ) ) {
     int blkSize = fss.f_bsize;
 //    int totalBlks = fs.f_blocks;
     int availBlks = fss.f_bavail;
 
     long mult = blkSize / 1024;
     long div = 1024 / blkSize;
     if ( !mult ) mult = 1;
     if ( !div ) div = 1;
 
 
     return QString::number(availBlks * mult / div);
   }
   return "";
 }
 
 void AdvancedFm::addToDocs() {
     QStringList strListPaths = getPath();
     if( strListPaths.count() > 0) {
         QString curFile;
         if (TabWidget->currentPageIndex() == 0) {
             for ( QStringList::Iterator it = strListPaths.begin(); it != strListPaths.end(); ++it ) {
                 curFile = currentDir.canonicalPath()+"/"+(*it);
                 qDebug(curFile);
                 DocLnk f;
 //                curFile.replace(QRegExp("\\..*"),"");
                 f.setName((*it));
                 f.setFile( curFile);
                 f.writeLink();
             }
         } else {
             for ( QStringList::Iterator it = strListPaths.begin(); it != strListPaths.end(); ++it ) {
                 curFile =  currentRemoteDir.canonicalPath()+"/"+(*it);
                 qDebug(curFile);
 
                 DocLnk f;
 //                curFile.replace(QRegExp("\\..*"),"");
                 f.setName((*it));
                 f.setFile( curFile);
                 f.writeLink();
             }
         }
     }
 }
diff --git a/noncore/apps/advancedfm/advancedfmMenu.cpp b/noncore/apps/advancedfm/advancedfmMenu.cpp
index 6d37904..5fa8d0c 100644
--- a/noncore/apps/advancedfm/advancedfmMenu.cpp
+++ b/noncore/apps/advancedfm/advancedfmMenu.cpp
@@ -1,275 +1,277 @@
 /***************************************************************************
    AdvancedFm.cpp
   -------------------
   ** Created: Sat Mar 9 23:33:09 2002
     copyright            : (C) 2002 by ljp
     email                : ljp@llornkcor.com
     *   This program is free software; you can redistribute it and/or modify  *
     *   it under the terms of the GNU General Public License as published by  *
     *   the Free Software Foundation; either version 2 of the License, or     *
     *   (at your option) any later version.                                   *
     ***************************************************************************/
 #include "advancedfm.h"
 #include "inputDialog.h"
 #include "output.h"
 #include "filePermissions.h"
 
 #include <qpe/lnkproperties.h>
 #include <qpe/qpeapplication.h>
 #include <qpe/qpemenubar.h>
 #include <qpe/qpetoolbar.h>
 #include <qpe/resource.h>
 #include <qpe/qcopenvelope_qws.h>
 #include <qpe/applnk.h>
 #include <qpe/ir.h>
 
 #include <qmessagebox.h>
 #include <qmultilineedit.h>
 
 #include <qstring.h>
 
 #include <qlayout.h>
 #include <qpixmap.h>
 #include <qcombobox.h>
 #include <qpopupmenu.h>
 #include <qtabwidget.h>
 #include <qtoolbutton.h>
 #include <qtabwidget.h>
 #include <qlineedit.h>
 #include <qlistview.h>
 
 #include <stdlib.h>
 #include <unistd.h>
 #include <sys/stat.h>
 #include <dirent.h>
 
 
 void AdvancedFm::doLocalCd() {
   localListClicked( Local_View->currentItem());
 }
 
 void AdvancedFm::doRemoteCd() {
   localListClicked( Remote_View->currentItem());
 }
 
 void AdvancedFm::showMenuHidden() {
-    showHidden();
-    if(b) b= false; else b=true;
-    showRemoteHidden();
+    if(TabWidget->currentPageIndex() == 0)
+        showHidden();
+    else
+        showRemoteHidden();
+//    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;
+//    b=FALSE;
 
   }  else {
     currentDir.setFilter( QDir::Files | QDir::Dirs/* | QDir::Hidden*/ | QDir::All);
     fileMenu->setItemChecked( fileMenu->idAt(0),FALSE);
-    b=TRUE;
+//    b=TRUE;
   }
   populateLocalView();
-
 }
 
 void AdvancedFm::showRemoteHidden() {
   if (b) {
     currentRemoteDir.setFilter( QDir::Files | QDir::Dirs | QDir::Hidden | QDir::All);
-    b=TRUE;
+//    b=TRUE;
 
   }  else {
     currentRemoteDir.setFilter( QDir::Files | QDir::Dirs/* | QDir::Hidden*/ | QDir::All);
-    b=FALSE;
+//    b=FALSE;
   }
   populateRemoteView();
 }
 
 void AdvancedFm::runThis() {
   QString fs;
   if (TabWidget->currentPageIndex() == 0) {
     QString curFile = Local_View->currentItem()->text(0);
     if(curFile != "../") {
 
       fs= getFileSystemType((const QString &) currentDir.canonicalPath());
       QFileInfo fileInfo( currentDir.canonicalPath()+"/"+curFile);
       qDebug( fileInfo.owner());
       if( (fileInfo.permission( QFileInfo::ExeUser)
            | fileInfo.permission( QFileInfo::ExeGroup)
            | fileInfo.permission( QFileInfo::ExeOther)) // & fs.find("vfat",0,TRUE) == -1) {
           | fs == "vfat" && fileInfo.filePath().contains("/bin") ) {
         QCopEnvelope e("QPE/System", "execute(QString)" );
         e << curFile;
       } else {
         curFile =  currentDir.canonicalPath()+"/"+curFile;
         DocLnk nf(curFile);
         QString execStr = nf.exec();
         qDebug( execStr);
         if( execStr.isEmpty() ) {
         } else {
           nf.execute();
         }
       }
     }
   } else {
     QString curFile = Remote_View->currentItem()->text(0);
     if(curFile != "../") {
 
       fs= getFileSystemType((const QString &) currentRemoteDir.canonicalPath());
       qDebug("Filesystemtype is "+fs);
       QFileInfo fileInfo( currentRemoteDir.canonicalPath()+"/"+curFile);
       if( (fileInfo.permission( QFileInfo::ExeUser)
            | fileInfo.permission( QFileInfo::ExeGroup)
            | fileInfo.permission( QFileInfo::ExeOther)) // & fs.find("vfat",0,TRUE) == -1) {
           | fs == "vfat" && fileInfo.filePath().contains("/bin") ) {
         QCopEnvelope e("QPE/System", "execute(QString)" );
         e << curFile;
       } else {
         curFile =  currentRemoteDir.canonicalPath()+"/"+curFile;
         DocLnk nf(curFile);
         QString execStr = nf.exec();
         qDebug(execStr);
         if( execStr.isEmpty() ) {
         } else {
           nf.execute();
         }
       }
     }
   }
 }
 
 void AdvancedFm::runText() {
   if (TabWidget->currentPageIndex() == 0) {
     QString curFile = Local_View->currentItem()->text(0);
     if(curFile != "../") {
       curFile =  currentDir.canonicalPath()+"/"+curFile;
       QCopEnvelope e("QPE/Application/textedit", "setDocument(QString)" );
       e << curFile;
     }
   } else {
     QString curFile = Remote_View->currentItem()->text(0);
     if(curFile != "../") {
       curFile =  currentRemoteDir.canonicalPath()+"/"+curFile;
       DocLnk nf(curFile);
       QCopEnvelope e("QPE/Application/textedit", "setDocument(QString)" );
       e << curFile;
     }
   }
 }
 
 void AdvancedFm::localMakDir() {
   InputDialog *fileDlg;
   fileDlg = new InputDialog(this,tr("Make Directory"),TRUE, 0);
   fileDlg->exec();
   if( fileDlg->result() == 1 ) {
     QString  filename = fileDlg->LineEdit1->text();
     currentDir.mkdir( currentDir.canonicalPath()+"/"+filename);
   }
   populateLocalView();
 }
 
 void AdvancedFm::remoteMakDir() {
   InputDialog *fileDlg;
   fileDlg = new InputDialog(this,tr("Make Directory"),TRUE, 0);
   fileDlg->exec();
   if( fileDlg->result() == 1 ) {
     QString  filename = fileDlg->LineEdit1->text();
     currentRemoteDir.mkdir(  currentRemoteDir.canonicalPath()+"/"+filename);
   }
   populateRemoteView();
 }
 
 void AdvancedFm::localDelete() {
   QStringList curFileList = getPath();
   if(curFileList.count() > 0) {
     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"),tr("Do you really want to 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;
           system( cmd.latin1());
           populateLocalView();
         }
           break;
         case 1:
           // exit
           break;
         };
 
       } else {
         switch ( QMessageBox::warning(this,tr("Delete"),tr("Do you really want to delete\n")+f
                  +" ?",tr("Yes"),tr("No"),0,0,1) ) {
         case 0: {
           QString cmd="rm "+f;
           QFile file(f);
           file.remove();
           //                   system( cmd.latin1());
           populateLocalView();
         }
           break;
         case 1:
           // exit
           break;
         };
       }
     }
   }
 }
 
 void AdvancedFm::remoteDelete() {
   QStringList curFileList = getPath();
   if( curFileList.count() > 0) {
     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 = currentRemoteDir.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"),tr("Do you really want to 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;
           system( cmd.latin1());
           populateRemoteView();
         }
           break;
         case 1:
           // exit
           break;
         };
 
       } else {
         switch ( QMessageBox::warning(this,tr("Delete"),tr("Do you really want to delete\n")+f
                  +" ?",tr("Yes"),tr("No"),0,0,1) ) {
         case 0: {
           QString cmd="rm "+f;
           QFile file(f);
           file.remove();
           //                   system( cmd.latin1());
           populateRemoteView();
         }
           break;
         case 1:
           // exit
           break;
         };
       }