opti function and fix

2 files changed, 24 insertions, 65 deletions

diff --git a/noncore/apps/advancedfm/advancedfm.cpp b/noncore/apps/advancedfm/advancedfm.cpp
index fec320d..73d0d57 100644
--- a/noncore/apps/advancedfm/advancedfm.cpp
+++ b/noncore/apps/advancedfm/advancedfm.cpp
@@ -35,25 +35,25 @@
 #include <mntent.h>
 
 using namespace Opie::Ui;
 
 AdvancedFm::AdvancedFm(QWidget *,const char*, WFlags )
    : QMainWindow( ) {
    init();
    renameBox = 0;
 
    unknownXpm = Resource::loadImage("UnknownDocument").smoothScale(AppLnk::smallIconSize(),AppLnk::smallIconSize() );
 
 	 initConnections();
-	 populateView();
+	 rePopulate();
 	 channel = new QCopChannel( "QPE/Application/advancedfm", this );
 	 connect(channel,SIGNAL(received(const QCString&,const QByteArray&)),this,SLOT(qcopReceive(const QCString&,const QByteArray&)));
 	 switchToLocalTab();	 
 }
 
 AdvancedFm::~AdvancedFm() {
 }
 
 
 void AdvancedFm::cleanUp() {
    QString sfile=QDir::homeDirPath();
    if(sfile.right(1) != "/")
@@ -365,110 +365,69 @@ void AdvancedFm::CFButtonPushed() {
    if(zaurusDevice)
 			 changeTo("/mnt/cf"); //zaurus
    else
 			 changeTo("/mnt/hda"); //ipaq
 }
 
 
 void AdvancedFm::doAbout() {
    QMessageBox::message("AdvancedFm",tr("<P>Advanced FileManager is copyright 2002-2003 by L.J.Potter<llornkcor@handhelds.org> and is licensed by the GPL</P>"));
 }
 
 void AdvancedFm::keyPressEvent( QKeyEvent *e) {
-//   owarn << "key " << e->key() << "" << oendl;
-//   if( CurrentView()->hasFocus()  )
-   {
-      switch ( e->key() ) {
-      case Key_Left:
+		if(  e->key() ==  Key_Left ) 
          upDir();
-         break;
-      case Key_Next:
-         break;
-      case Key_Return:
-      case Key_Enter:
+		else if( e->key() == Key_Return || e->key() == Key_Enter)
          navigateToSelected();
-         break;
-      case Key_Tab: {
+		else if( e->key() == Key_Tab)
          setOtherTabCurrent();
-      }
-         break;
-      case Key_Delete:
+		else if( e->key() == Key_Delete )
          del();
-         break;
-      case Key_A:
+		else if( e->key() ==  Key_A)
          copyAs();
-         break;
-      case Key_C:
+		else if( e->key() ==  Key_C)
          copy();
-         break;
-      case Key_E:
+		else if( e->key() ==  Key_E)
          runThis();
-         break;
-      case Key_G:
-      {
+		else if( e->key() ==  Key_G)
          currentPathCombo->lineEdit()->setFocus();
-      }
-      break;
-
-      case Key_H:
+		else if( e->key() == Key_H )
          showHidden();
-         break;
-      case Key_I:
+		else if( e->key() == Key_I)
          fileStatus();
-         break;
-      case Key_M:
+		else if( e->key() == Key_M)
          move();
-         break;
-      case Key_N:
+		else if( e->key() == Key_N )
          mkDir();
-         break;
-      case Key_P:
+		else if( e->key() ==  Key_P)
          filePerms();
-         break;
-      case Key_R:
+		else if( e->key() ==  Key_R )
          rn();
-         break;
-      case Key_U:
+		else if( e->key() ==  Key_U )
          upDir();
-         break;
-      case Key_1:
+		else if( e->key() ==  Key_1)
          switchToLocalTab();
-         break;
-      case Key_2:
+		else if( e->key() == Key_2)
          switchToRemoteTab();
-         break;
-      case Key_3:
+		else if( e->key() ==  Key_3)
          CFButtonPushed();
-         break;
-      case Key_4:
+		else if( e->key() == Key_4)
          SDButtonPushed();
-         break;
-      case Key_5:
+		else if( e->key() == Key_5 )
          homeButtonPushed();
-         break;
-      case Key_6:
+		else if( e->key() ==  Key_6 )
          docButtonPushed();
-         break;
-      case Key_7:
-         break;
-      case Key_8:
-         break;
-      case Key_9:
-         break;
-      case Key_0:
-         break;
-      };
+		else
       e->accept();
    }
-}
 
 void AdvancedFm::keyReleaseEvent( QKeyEvent *e) {
    if( CurrentView()->hasFocus() )
       e->ignore();
 }
 
 
 void AdvancedFm::QPEButtonPushed() {
    QString current = QPEApplication::qpeDir();
    chdir( current.latin1() );
    CurrentDir()->cd( current, TRUE);
    populateView();
diff --git a/noncore/apps/advancedfm/advancedfm.h b/noncore/apps/advancedfm/advancedfm.h
index c52b853..b109364 100644
--- a/noncore/apps/advancedfm/advancedfm.h
+++ b/noncore/apps/advancedfm/advancedfm.h
@@ -88,25 +88,25 @@ protected:
    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();
-	 void changeTo(QString & dir);
+	 void changeTo(QString dir);
 
 //protected signals:
 //		void newPath(QString);
     
 protected slots:
    void slotSwitchMenu(int);
    void selectAll();
    void addToDocs();
    void doDirChange();
    void mkDir();
    void del();
    void rn();