remove

4 files changed, 4 insertions, 18 deletions

diff --git a/noncore/apps/advancedfm/advancedfm.cpp b/noncore/apps/advancedfm/advancedfm.cpp
index 9721f84..6f017b4 100644
--- a/noncore/apps/advancedfm/advancedfm.cpp
+++ b/noncore/apps/advancedfm/advancedfm.cpp
@@ -300,55 +300,48 @@ void  AdvancedFm::currentPathComboChanged() {
       QMessageBox::message(tr("Note"),tr("<p>That directory does not exist</p>"));
    }
 }
 
 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::changeTo(const QString dir) {
    chdir( dir.latin1());
    CurrentDir()->cd(dir, TRUE);
    populateView();
    update();
 }
 
 void AdvancedFm::homeButtonPushed() {
  changeTo(QDir::homeDirPath());
 }
diff --git a/noncore/apps/advancedfm/advancedfm.h b/noncore/apps/advancedfm/advancedfm.h
index 00ab909..6f7eb96 100644
--- a/noncore/apps/advancedfm/advancedfm.h
+++ b/noncore/apps/advancedfm/advancedfm.h
@@ -132,49 +132,48 @@ protected slots:
    void switchToLocalTab();
    void switchToRemoteTab();
 	 void refreshCurrentTab();
 
    void openSearch();
    void dirMenuSelected(int);
    void showFileMenu();   
    void homeButtonPushed();
    void docButtonPushed();
    void SDButtonPushed();
    void CFButtonPushed();
    void QPEButtonPushed();
    void upDir();
    void currentPathComboChanged();
 
    void copy();
    void copyTimer();
    void copyAs();
    void copyAsTimer();
    void copySameDir();
    void copySameDirTimer();
    void move();
    void moveTimer();
 
-	 void currentPathComboActivated(const QString &);
    void fillCombo(const QString &);
    bool copyFile( const QString & , const QString & );
    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, localViewDir, remoteViewDir;
    void startProcess(const QString &);
    bool eventFilter( QObject * , QEvent * );
    void cancelRename();
    void doRename(QListView *);
    void okRename();
    void customDirsToMenu();
    void addCustomDir();
    void removeCustomDir();
    void navigateToSelected();
diff --git a/noncore/apps/advancedfm/advancedfmData.cpp b/noncore/apps/advancedfm/advancedfmData.cpp
index fe565a0..1047c5a 100644
--- a/noncore/apps/advancedfm/advancedfmData.cpp
+++ b/noncore/apps/advancedfm/advancedfmData.cpp
@@ -234,47 +234,47 @@ void AdvancedFm::init() {
 	 currentDir.setFilter( QDir::Files | QDir::Dirs | QDir::Hidden | QDir::All);
 	 currentDir.setPath( QDir::currentDirPath());
 
 	 currentRemoteDir.setFilter( QDir::Files | QDir::Dirs | QDir::Hidden | QDir::All);
 	 currentRemoteDir.setPath( QDir::currentDirPath());
 
 	 //  b = TRUE;
 
 	 filterStr="*";
 	 showMenuHidden();
 	 TabWidget->setCurrentWidget(0);
 
 }
 
 void AdvancedFm::initConnections()
 {
 
   connect(qApp,SIGNAL(aboutToQuit()),this,SLOT(cleanUp()));
   connect( qpeDirButton ,SIGNAL(released()),this,SLOT( QPEButtonPushed()) );
   connect( cfButton ,SIGNAL(released()), this,SLOT( CFButtonPushed()) );
   connect( sdButton ,SIGNAL(released()), this,SLOT( SDButtonPushed()) );
   connect( cdUpButton ,SIGNAL(released()), this,SLOT( upDir()) );
   connect( docButton,SIGNAL(released()), this,SLOT( docButtonPushed()) );
   connect( homeButton,SIGNAL(released()), this,SLOT( homeButtonPushed()) );
-  connect( currentPathCombo, SIGNAL( activated(const QString&) ), this, SLOT( currentPathComboActivated(const QString&) ) );
+  connect( currentPathCombo, SIGNAL( activated(const QString&) ), this, SLOT( changeTo(const QString&) ) );
 
   connect( currentPathCombo->lineEdit(),SIGNAL(returnPressed()), this,SLOT(currentPathComboChanged()));
 
   connect( Local_View, SIGNAL( clicked(QListViewItem*)), this,SLOT( ListClicked(QListViewItem*)) );
 
   connect( Local_View, SIGNAL( mouseButtonPressed(int,QListViewItem*,const QPoint&,int)), this,SLOT( ListPressed(int,QListViewItem*,const QPoint&,int)) );
 
   connect( Remote_View, SIGNAL( clicked(QListViewItem*)), this,SLOT( ListClicked(QListViewItem*)) );
   connect( Remote_View, SIGNAL( mouseButtonPressed(int,QListViewItem*,const QPoint&,int)), this,SLOT( ListPressed(int,QListViewItem*,const QPoint&,int)) );
 
   connect( TabWidget,SIGNAL(currentChanged(QWidget*)), this,SLOT(tabChanged(QWidget*)));
 
   connect( Remote_View, SIGNAL(rightButtonPressed(QListViewItem*, const QPoint&, int)), this, SLOT(showFileMenu()));
   connect( Local_View, SIGNAL(rightButtonPressed(QListViewItem*, const QPoint&,int)), this, SLOT(showFileMenu()));
 
   connect( menuButton, SIGNAL( selected(const QString&)), SLOT(gotoCustomDir(const QString&)));
 //  connect( menuButton, SIGNAL( selected(int)), SLOT( dirMenuSelected(int)));
   connect( viewMenu, SIGNAL( activated(int)), this, SLOT(slotSwitchMenu(int)));
 //  connect( customDirMenu, SIGNAL( activated(int)), this, SLOT( dirMenuSelected(int)));
 
 }
 
diff --git a/noncore/apps/advancedfm/advancedfmMenu.cpp b/noncore/apps/advancedfm/advancedfmMenu.cpp
index 706658e..7b3dcf6 100644
--- a/noncore/apps/advancedfm/advancedfmMenu.cpp
+++ b/noncore/apps/advancedfm/advancedfmMenu.cpp
@@ -238,58 +238,52 @@ void AdvancedFm::filePerms() {
     populateView();
 }
 
 void AdvancedFm::doProperties() {
 #if defined(QT_QWS_OPIE)
 
    QStringList curFileList = getPath();
 
    QString filePath;
    filePath = CurrentDir()->canonicalPath()+"/";
 
 //   odebug << "" << curFileList.count() << "" << oendl; 
 
    for ( QStringList::Iterator it = curFileList.begin(); it != curFileList.end(); ++it ) {
 //      odebug << (filePath+*it) << oendl; 
       DocLnk lnk( (filePath+*it));
       LnkProperties prop( &lnk );
       QPEApplication::execDialog( &prop );
    }
 #endif
 
 }
 
 void AdvancedFm::upDir() {
-  QDir *thisDir = CurrentDir();
-  QString current = thisDir->canonicalPath();
-  QDir dir(current);
-  dir.cdUp();
-  current = dir.canonicalPath();
-  chdir( current.latin1() );
-  thisDir->cd(  current, TRUE);
 
-    populateView();
-  update();
+  QDir dir( CurrentDir()->canonicalPath());
+  dir.cdUp();
+	changeTo(dir.canonicalPath());
 }
 
 void AdvancedFm::copyTimer() {
 		QTimer::singleShot(125,this,SLOT(copy()));
 }
 
 void AdvancedFm::copy() {
  QStringList curFileList = getPath();
 
    QDir *thisDir = CurrentDir();
    QDir *thatDir = OtherDir();
 
    bool doMsg=true;
    int count=curFileList.count();
    if( count > 0) {
       if(count > 1 ){
          QString msg;
          msg=tr("<p>Really copy %1 files?</p>").arg(count);
          switch ( QMessageBox::warning(this,tr("Copy"),msg
                                        ,tr("Yes"),tr("No"),0,0,1) )
          {
          case 0:
             doMsg=false;
             break;