1 files changed, 5 insertions, 3 deletions

diff --git a/noncore/apps/advancedfm/advancedfmMenu.cpp b/noncore/apps/advancedfm/advancedfmMenu.cpp
index 5a46579..2e6b0da 100644
--- a/noncore/apps/advancedfm/advancedfmMenu.cpp
+++ b/noncore/apps/advancedfm/advancedfmMenu.cpp
@@ -24,49 +24,49 @@ using namespace Opie::Core;
 /* QT*/
 
 #include <qmessagebox.h>
 #include <qpopupmenu.h>
 #include <qlistview.h>
 
 /* STD */
 
 #include <errno.h>
 #include <stdlib.h>
 #include <unistd.h>
 #include <sys/stat.h>
 #include <dirent.h>
 #include <sys/sendfile.h>
 #include <fcntl.h>
 
 void AdvancedFm::doDirChange() {
    QString pathItem = CurrentView()->currentItem()->text(0);
    if( pathItem == "../") {
       ListClicked( CurrentView()->currentItem());
    } else {
       if( pathItem.find(" -> ",0,TRUE) != -1)
          pathItem = dealWithSymName((const QString&)pathItem)+"/";
 //      owarn << pathItem << oendl; 
-      gotoDirectory( CurrentDir()->path()+"/"+pathItem.left( pathItem.length() - 1) );
+      changeTo( CurrentDir()->path()+"/"+pathItem.left( pathItem.length() - 1) );
    }
 }
 
 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);
     } 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 = !b;
          populateView();
 }
 
 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);
     }  else {
       CurrentDir()->setFilter( QDir::Files | QDir::Dirs/* | QDir::Hidden*/ | QDir::All);
       OtherDir()->setFilter( QDir::Files | QDir::Dirs/* | QDir::Hidden*/ | QDir::All);
@@ -720,78 +720,79 @@ void AdvancedFm::startProcess(const QString & cmd) {
 
   connect(process, SIGNAL( receivedStderr(Opie::Core::OProcess*,char*,int)), this, SLOT( oprocessStderr(Opie::Core::OProcess*,char*,int)));
 
   command << "/bin/sh";
   command << "-c";
   command << cmd.latin1();
   *process << command;
   if(!process->start(OProcess::NotifyOnExit, OProcess::All) )
     odebug << "could not start process" << oendl; 
 }
 
 void AdvancedFm::processEnded(OProcess *) {
             rePopulate();
 }
 
 void AdvancedFm::oprocessStderr(OProcess*, char *buffer, int ) {
 //    owarn << "received stderrt " << buflen << " bytes" << oendl; 
 
     QString lineStr = buffer;
     QMessageBox::warning( this, tr("Error"), lineStr ,tr("Ok") );
 }
 
 bool AdvancedFm::eventFilter( QObject * o, QEvent * e ) {
   if ( o->inherits( "QLineEdit" ) )  {
+                                qDebug("QLineEdit event");
       if ( e->type() == QEvent::KeyPress ) {
           QKeyEvent *ke = (QKeyEvent*)e;
           if ( ke->key() == Key_Return ||
                ke->key() == Key_Enter )  {
               okRename();
               return true;
             }
           else if ( ke->key() == Key_Escape ) {
                 cancelRename();
                 return true;
               }
         }
       else if ( e->type() == QEvent::FocusOut ) {
             cancelRename();
             return true;
           }
     }
-   if ( o->inherits( "QListView" ) ) {
+/*   if ( o->inherits( "QListView" ) ) {
        if ( e->type() == QEvent::FocusIn ) {
 //            if( o == Local_View) { //keep track of which view
         //                                              qDebug("local view");
 //               whichTab = 1;
 //            } else {
 //               whichTab = 2;
         //                                       qDebug("remote view");
 //            }
        }
        OtherView()->setSelected( OtherView()->currentItem(), FALSE );//make sure there's correct selection
      }
-
+*/
   return QWidget::eventFilter( o, e );
 }
 
 
 void AdvancedFm::cancelRename() {
 //  odebug << "cancel rename" << oendl; 
   QListView * view;
   view = CurrentView();
 
   bool resetFocus = view->viewport()->focusProxy() == renameBox;
   delete renameBox;
   renameBox = 0;
   if ( resetFocus ) {
       view->viewport()->setFocusProxy( view);
       view->setFocus();
     }
 }
 
 void AdvancedFm::doRename(QListView * view) {
    if( !CurrentView()->currentItem()) return;
 
     QRect r = view->itemRect( view->currentItem( ));
     r = QRect( view->viewportToContents( r.topLeft() ), r.size() );
     r.setX( view->contentsX() );
@@ -799,45 +800,46 @@ void AdvancedFm::doRename(QListView * view) {
         r.setWidth( view->visibleWidth() );
 
     renameBox = new QLineEdit( view->viewport(), "qt_renamebox" );
     renameBox->setFrame(true);
     renameBox->setText(  view->currentItem()->text(0) );
     renameBox->selectAll();
     renameBox->installEventFilter( this );
     view->addChild( renameBox, r.x(), r.y() );
                 renameBox->resize( r.size() );
                 view->viewport()->setFocusProxy( renameBox );
                 renameBox->setFocus();
     renameBox->show();
 }
 
 
 void AdvancedFm::renameIt() {
         if( !CurrentView()->currentItem()) return;
 
         QListView *thisView = CurrentView();
     oldName = thisView->currentItem()->text(0);
     doRename( thisView );
 }
 
 void AdvancedFm::okRename() {
+                qDebug("okrename");
    if( !renameBox) return;
 
    QString newName = renameBox->text();
      cancelRename();
      QListView * view = CurrentView();
    QString path =  CurrentDir()->canonicalPath() + "/";
    oldName = path + oldName;
    newName = path + newName;
    if( rename( oldName.latin1(), newName.latin1())== -1)
       QMessageBox::message(tr("Note"),tr("Could not rename"));
    else
       oldName = "";
    QListViewItem *item = view->currentItem();
    view->takeItem( item );
    delete item;
      rePopulate();
 }
 
 void AdvancedFm::openSearch() {
     QMessageBox::message(tr("Note"),tr("Not Yet Implemented"));
 }