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
@@ -13,297 +13,306 @@
 #include "advancedfm.h"
 
 #include <opie/otabwidget.h>
 //  #include <opie/ofileselector.h>
 //  #include <opie/ofiledialog.h>
 
 #include <qpe/config.h>
 #include <qpe/filemanager.h>
 #include <qpe/qcopenvelope_qws.h>
 #include <qpe/qpemenubar.h>
 #include <qpe/qpetoolbar.h>
 #include <qpe/qpeapplication.h>
 #include <qpe/qcopenvelope_qws.h>
 #include <qpe/config.h>
 #include <qpe/mimetype.h>
 #include <qpe/applnk.h>
 #include <qpe/ir.h>
 #include <qpe/resource.h>
 #include <qpe/menubutton.h>
 
 
 #include <qregexp.h>
 #include <qtabwidget.h>
 #include <qtextstream.h>
 #include <qpushbutton.h>
 #include <qdatetime.h>
 #include <qdir.h>
 #include <qfile.h>
 #include <qstring.h>
 #include <qcombobox.h>
 #include <qpopupmenu.h>
 #include <qlistview.h>
 #include <qmainwindow.h>
 #include <qlabel.h>
 #include <qprogressbar.h>
 #include <qspinbox.h>
 #include <qwidget.h>
 #include <qlayout.h>
 #include <qimage.h>
 #include <qpixmap.h>
 #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());
-        //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);
   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()) )
                 {
                         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( path +"/"+fileL)).exists() )
                                                 {
                                                         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 =  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( 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);
 //        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;
                                 }
 
                         if( isDirectory )
                                 {
                                         CurrentDir()->cd( strItem, TRUE);
                                         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()
 {
   TabWidget->setCurrentTab(0);
   Local_View->setFocus();
 }
 
 void AdvancedFm::switchToRemoteTab()
 {
   TabWidget->setCurrentTab(1);
   Remote_View->setFocus();
 }
 
 void AdvancedFm::readConfig()
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
@@ -3,167 +3,168 @@
                              -------------------
                              ** 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.                                   *
     ***************************************************************************/
 #ifndef ADVANCEDFM_H
 #define ADVANCEDFM_H
 #define QTOPIA_INTERNAL_FSLP // to get access to fileproperties
 #define QT_QWS_OPIE
 
 //#include <opie/otabwidget.h>
 #include <qpe/ir.h>
 
 #include <qvariant.h>
 #include <qdialog.h>
 #include <qmainwindow.h>
 #include <qstringlist.h>
 #include <qdir.h>
 #include <qstring.h>
 #include <qpoint.h>
 #include <qtimer.h>
 
 class OTabWidget;
 class QVBoxLayout;
 class QHBoxLayout;
 class QGridLayout;
 class QComboBox;
 class QListView;
 class QListviewItem;
 class QLabel;
 class QProgressBar;
 class QSpinBox;
 class QTabWidget;
 class QWidget;
 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 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:
 
   OTabWidget *TabWidget;
   int whichTab;
 //    QTabWidget *TabWidget;
   QWidget *tab, *tab_2, *tab_3;
   QListView *Local_View, *Remote_View;
 
   QLineEdit *currentPathEdit;
   QPopupMenu *fileMenu, *localMenu, *remoteMenu, *viewMenu /*, *customDirMenu*/;
   QToolButton  *homeButton, *docButton, *cdUpButton, *sdButton, *cfButton, *qpeDirButton;
 //    QPushButton  *homeButton, *docButton, *cdUpButton, *sdButton, *cfButton, *qpeDirButton;
   QDir currentDir, currentRemoteDir;
   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(); 
+  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();
   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 *);
 
 private:
   MenuButton *menuButton;
   QString oldName;
   QTimer menuTimer;
   void startProcess(const QString &);
   bool eventFilter( QObject * , QEvent * );
   void cancelRename();
   void doRename(QListView *);
   void okRename();
   void customDirsToMenu();
   void addCustomDir();
   void removeCustomDir();
 
 private slots:
   void processEnded();
   void gotoCustomDir(const QString &);
 };
 
 #endif // ADVANCEDFM_H
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
@@ -7,152 +7,151 @@
     *   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 "output.h"
 #include "filePermissions.h"
 
 #include <opie/otabwidget.h>
 #include <opie/oprocess.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::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);
                         QFileInfo fileInfo( path  + "/" + 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 =  path + "/" + curFile;
                                         DocLnk nf(curFile);
                                         QString execStr = nf.exec();
                                         qDebug( execStr);
                                         if( execStr.isEmpty() )
                                                 {
                                                 }
                                         else
                                                 {
                                                         nf.execute();
                                                 }
                                 }
                 }
 }
 
 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;
     }
 }