3 files changed, 8 insertions, 1 deletions

diff --git a/noncore/apps/advancedfm/advancedfm.cpp b/noncore/apps/advancedfm/advancedfm.cpp
index b4461cb..4de7d38 100644
--- a/noncore/apps/advancedfm/advancedfm.cpp
+++ b/noncore/apps/advancedfm/advancedfm.cpp
@@ -192,192 +192,198 @@ void AdvancedFm::populateView() {
         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);
 //        odebug << mydirent->d_name << oendl;
                                 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 = unknownXpm;
                                         item->setPixmap( 0,pm);
                                 }
                         }
 
                 closedir(dir);
         }
 
         thisView->setSorting( 3,FALSE);
         fillCombo( (const QString &) path );
 }
 
 void AdvancedFm::rePopulate() {
      populateView();
      setOtherTabCurrent();
      populateView();
 
 //      int tmpTab = whichTab;
 // //  odebug << "" << tmpTab << "" << oendl;
 
 //    for(int i =1; i < 3; i++) {
 //       TabWidget->setCurrentWidget(i - 1);
 //       populateView();
 //    }
 //    TabWidget->setCurrentWidget( tmpTab - 1);
 }
 
 void AdvancedFm::ListClicked(QListViewItem *selectedItem) {
          if ( TabWidget->currentWidget() == tab)
                          qDebug("XXXXXXXXXXXXXXXXXXXXXXXX ListClicked local");
          else
                          qDebug("XXXXXXXXXXXXXXXXXXXXXXXX ListClicked remote");
                          
 
                          if(selectedItem) {
       QString strItem=selectedItem->text(0);
 //      owarn << strItem << oendl;
       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 *item, const QPoint& , int ) {
                 Q_UNUSED(item);
    switch (mouse) {
    case 1:
    {
       if(renameBox != 0 ) {
          cancelRename();
       }
    }
    break;
 //    case 2:
 //       menuTimer.start( 50, TRUE );
 //       break;
    };
 }
 
 
+void AdvancedFm::refreshCurrentTab() {
+     populateView();
+        // if ( TabWidget->currentWidget() == tab) {
+                
+}
+
 void AdvancedFm::switchToLocalTab() {
    TabWidget->setCurrentWidget(0);
    Local_View->setFocus();
          
 }
 
 void AdvancedFm::switchToRemoteTab() {
    TabWidget->setCurrentWidget(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();
    } else {
       QMessageBox::message(tr("Note"),tr("That directory does not exist"));
    }
 }
 
 void  AdvancedFm::fillCombo(const QString &currentPath) {
 
          if ( TabWidget->currentWidget() == tab) {
 //   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();
    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);
 //        odebug << it.current()->text(0) << oendl;
       }
    }
    return strList;
 }
 
 void AdvancedFm::homeButtonPushed() {
    QString current = QDir::homeDirPath();
    chdir( current.latin1() );
    CurrentDir()->cd(  current, TRUE);
    populateView();
    update();
 }
 
 void AdvancedFm::docButtonPushed() {
    QString current = QPEApplication::documentDir();
    chdir( current.latin1() );
    CurrentDir()->cd( current, TRUE);
    populateView();
    update();
 }
 
 void AdvancedFm::SDButtonPushed() {
    QString current = "/mnt/card";// this can change so fix
    chdir( current.latin1() );
    CurrentDir()->cd( current, TRUE);
    populateView();
    update();
 }
 
 void AdvancedFm::CFButtonPushed() {
    QString current;
    if(zaurusDevice)
diff --git a/noncore/apps/advancedfm/advancedfm.h b/noncore/apps/advancedfm/advancedfm.h
index e596977..def6fe2 100644
--- a/noncore/apps/advancedfm/advancedfm.h
+++ b/noncore/apps/advancedfm/advancedfm.h
@@ -1,186 +1,186 @@
 /***************************************************************************
    advancedfm.h
                              -------------------
                              ** 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 <opie2/oprocess.h>
 #include <opie2/osplitter.h>
 
 #include <qpe/ir.h>
 #include <qpe/qcopenvelope_qws.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>
 #include <qpixmap.h>
 
 
 class QVBoxLayout;
 class QHBoxLayout;
 class QGridLayout;
 class QComboBox;
 class QListView;
 class QListviewItem;
 class QLabel;
 class QProgressBar;
 class QSpinBox;
 class QWidget;
 class QPopupMenu;
 class QFile;
 class QListViewItem;
 class QLineEdit;
 class MenuButton;
 
 class QToolButton;
 class Ir;
 
 class AdvancedFm : public QMainWindow
 {
     Q_OBJECT
 public:
     static QString appName() { return QString::fromLatin1("advancedfm"); }
    AdvancedFm(QWidget *p = 0, const char* name = 0, WFlags fl = 0);
    ~AdvancedFm();
 protected slots:
    void slotSwitchMenu(int);
    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();
-
+         void refreshCurrentTab();
 protected:
 
    Opie::Ui::OSplitter *TabWidget;
    QCopChannel * channel;
    QPixmap unknownXpm;
    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();
    QListView *CurrentView();
    QListView *OtherView();
    void setOtherTabCurrent();
 
 protected slots:
 
    void openSearch();
    void dirMenuSelected(int);
    void showFileMenu();   
    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 *);
    bool copyDirectory( const QString & , const QString & );
 //   void navigateToSelected();
    bool moveDirectory( const QString & , const QString & );
          
 //   void slotSwitchtoLocal(int);
 
 private:
    MenuButton *menuButton;
    QString oldName;
    void startProcess(const QString &);
    bool eventFilter( QObject * , QEvent * );
    void cancelRename();
    void doRename(QListView *);
    void okRename();
    void customDirsToMenu();
    void addCustomDir();
    void removeCustomDir();
    void gotoDirectory(const QString &);
    void navigateToSelected();
    void findFile(const QString &);
 
 private slots:
    void processEnded(Opie::Core::OProcess *);
    void oprocessStderr(Opie::Core::OProcess *, char *, int);
    void gotoCustomDir(const QString &);
    void qcopReceive(const QCString&, const QByteArray&);
    void setDocument(const QString &);
 
 };
 
 #endif // ADVANCEDFM_H
diff --git a/noncore/apps/advancedfm/advancedfmData.cpp b/noncore/apps/advancedfm/advancedfmData.cpp
index dc7e8e1..1802571 100644
--- a/noncore/apps/advancedfm/advancedfmData.cpp
+++ b/noncore/apps/advancedfm/advancedfmData.cpp
@@ -8,192 +8,193 @@
  *   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"
 
 /* OPIE */
 #include <opie2/odebug.h>
 #include <qpe/storage.h>
 #include <qpe/qpeapplication.h>
 #include <qpe/resource.h>
 #include <qpe/menubutton.h>
 using namespace Opie::Core;
 using namespace Opie::Ui;
 
 /* QT */
 #include <qlayout.h>
 #include <qhbox.h>
 #include <qmenubar.h>
 #include <qcombobox.h>
 #include <qtoolbutton.h>
 #include <qlineedit.h>
 #include <qlistview.h>
 
 /* STD */
 #include <sys/utsname.h>
 
 void AdvancedFm::init() {
          b = false;
          setCaption( tr( "AdvancedFm" ) );
 
          QVBoxLayout *layout = new QVBoxLayout( this );
          layout->setSpacing( 2);
          layout->setMargin( 0); // squeeze
 
          QMenuBar *menuBar = new QMenuBar(this);
          menuBar->setMargin( 0 ); // squeeze
          fileMenu = new QPopupMenu( this );
          viewMenu  = new QPopupMenu( this );
 //  customDirMenu  = new QPopupMenu( this );
 
          layout->addWidget( menuBar );
 
          menuBar->insertItem( tr( "File" ), fileMenu);
          menuBar->insertItem( tr( "View" ), viewMenu);
 
          cdUpButton = new QToolButton( 0,"cdUpButton");
          cdUpButton->setPixmap(Resource::loadPixmap("up"));
          cdUpButton->setAutoRaise( true );
          menuBar->insertItem( cdUpButton );
 
 
 
          qpeDirButton= new QToolButton( 0,"QPEButton");
          qpeDirButton->setPixmap( Resource::loadPixmap("launcher/opielogo16x16"));//,"",this,"QPEButton");
          qpeDirButton->setAutoRaise( true );
          menuBar->insertItem( qpeDirButton );
 
          cfButton = new QToolButton( 0, "CFButton");
          cfButton->setPixmap(Resource::loadPixmap("cardmon/pcmcia"));
          cfButton->setAutoRaise( true );
          menuBar->insertItem( cfButton );
 
          sdButton = new QToolButton( 0, "SDButton");
          sdButton->setPixmap(Resource::loadPixmap("advancedfm/sdcard"));
          sdButton->setAutoRaise( true );
          menuBar->insertItem( sdButton );
 
          docButton = new QToolButton( 0,"docsButton");
          docButton->setPixmap(Resource::loadPixmap("DocsIcon"));
          docButton->setAutoRaise( true );
          menuBar->insertItem( docButton );
 
          homeButton = new QToolButton( 0, "homeButton");
          homeButton->setPixmap(Resource::loadPixmap("home"));
          homeButton->setAutoRaise( true );
          menuBar->insertItem( homeButton );
 
          fileMenu->insertItem( tr( "Show Hidden Files" ), this,  SLOT( showMenuHidden() ));
          fileMenu->setItemChecked( fileMenu->idAt(0),TRUE);
          fileMenu->insertSeparator();
          fileMenu->insertItem( tr( "File Search" ), this, SLOT( openSearch() ));
          fileMenu->insertSeparator();
          fileMenu->insertItem( tr( "Make Directory" ), this, SLOT( mkDir() ));
          fileMenu->insertItem( tr( "Rename" ), this, SLOT( rn() ));
          fileMenu->insertItem( tr( "Run Command" ), this, SLOT( runCommandStd() ));
          fileMenu->insertItem( tr( "Run Command with Output" ), this, SLOT( runCommand() ));
          fileMenu->insertSeparator();
          fileMenu->insertItem( tr( "Make Symlink" ), this, SLOT( mkSym() ));
          fileMenu->insertItem( tr( "Select All" ), this, SLOT( selectAll() ));
          fileMenu->insertItem( tr( "Add To Documents" ), this, SLOT( addToDocs() ));
          fileMenu->insertItem( tr( "Delete" ), this, SLOT( del() ));
          fileMenu->setCheckable(TRUE);
 
          viewMenu->insertItem( tr( "Switch to View 1" ), this, SLOT( switchToLocalTab()));
          viewMenu->insertItem( tr( "Switch to View 2" ), this, SLOT( switchToRemoteTab()));
+         viewMenu->insertItem( tr( "Refresh" ), this, SLOT( refreshCurrentTab()));
 //     viewMenu->insertSeparator();
 //     viewMenu->insertItem( tr( "About" ), this, SLOT( doAbout() ));
          viewMenu->setCheckable(true);
          viewMenu->setItemChecked( viewMenu->idAt(0), true);
          viewMenu->setItemChecked( viewMenu->idAt(1), false);
 
          s_addBookmark = tr("Bookmark Directory");
          s_removeBookmark = tr("Remove Current Directory from Bookmarks");
 
 //    menuButton->insertItem("");
 
 //     customDirMenu->insertItem(tr("Add This Directory"));
 //     customDirMenu->insertItem(tr("Remove This Directory"));
 //     customDirMenu->insertSeparator();
 
          QHBoxLayout *CBHB = new QHBoxLayout(); // parent layout will be set later
          CBHB->setMargin( 0 );
          CBHB->setSpacing( 1 );
 
          menuButton = new MenuButton( this );
 
          menuButton->setUseLabel(false);
          menuButton->setMaximumWidth( 20 );
          menuButton->insertItem( s_addBookmark);
          menuButton->insertItem( s_removeBookmark);
          menuButton->insertSeparator();
          menuButton->setFocusPolicy(NoFocus);
          CBHB->addWidget( menuButton );
 
          customDirsToMenu();
 
          currentPathCombo = new QComboBox( FALSE, this, "currentPathCombo" );
          currentPathCombo->setEditable(TRUE);
          currentPathCombo->lineEdit()->setText( currentDir.canonicalPath());
          currentPathCombo->setFocusPolicy(NoFocus);
          CBHB->addWidget( currentPathCombo );
 
          layout->addLayout( CBHB );
 
          TabWidget = new OSplitter( Horizontal, this, "TabWidget" );
 //  TabWidget = new QTabWidget( this, "TabWidget" );
          layout->addWidget( TabWidget, 4 );
 
          tab = new QWidget( TabWidget, "tab" );
          tabLayout = new QGridLayout( tab );
          tabLayout->setSpacing( 2);
          tabLayout->setMargin( 2);
 
          Local_View = new QListView( tab, "Local_View" );
          Local_View->addColumn( tr("File"),130);
          Local_View->addColumn( tr("Size"),-1);
          Local_View->setColumnAlignment(1,QListView::AlignRight);
          Local_View->addColumn( tr("Date"),-1);
          Local_View->setColumnAlignment(2,QListView::AlignRight);
          Local_View->setAllColumnsShowFocus(TRUE);
          Local_View->setMultiSelection( TRUE );
          Local_View->setSelectionMode(QListView::Extended);
          Local_View->setFocusPolicy(StrongFocus);
          Local_View->installEventFilter( this );
 
          QPEApplication::setStylusOperation( Local_View->viewport() , QPEApplication::RightOnHold);
 
          tabLayout->addWidget( Local_View, 0, 0 );
 
          TabWidget->addWidget( tab,"advancedfm/smFileBrowser.png", tr("1"));
 //  TabWidget->insertTab( tab, tr("1"));
 
          tab_2 = new QWidget( TabWidget, "tab_2" );
          tabLayout_2 = new QGridLayout( tab_2 );
          tabLayout_2->setSpacing( 2);
          tabLayout_2->setMargin( 2);
 
          Remote_View = new QListView( tab_2, "Remote_View" );
          Remote_View->addColumn( tr("File"),130);
          Remote_View->addColumn( tr("Size"),-1);
          Remote_View->setColumnAlignment(1,QListView::AlignRight);
          Remote_View->addColumn( tr("Date"),-1);
          Remote_View->setColumnAlignment(2,QListView::AlignRight);
          Remote_View->setAllColumnsShowFocus(TRUE);
          Remote_View->setMultiSelection( TRUE );
          Remote_View->setSelectionMode(QListView::Extended);
          Remote_View->setFocusPolicy(StrongFocus);
          Remote_View->installEventFilter( this );
 
          QPEApplication::setStylusOperation( Remote_View->viewport(), QPEApplication::RightOnHold);
 
          tabLayout_2->addWidget( Remote_View, 0, 0 );
 
          TabWidget->addWidget( tab_2, "advancedfm/smFileBrowser.png",tr( "2"));
          TabWidget->setSizeChange( 370 );
 //  TabWidget->insertTab( tab_2, tr( "2"));
 
          /*     tab_3 = new QWidget( TabWidget, "tab_3" );
                                         tabLayout_3 = new QGridLayout( tab_3 );
                                         tabLayout_3->setSpacing( 2);
                                         tabLayout_3->setMargin( 2);