change focus for edit

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
@@ -42,13 +42,13 @@ void AdvancedFm::doDirChange() {
    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);
@@ -738,12 +738,13 @@ void AdvancedFm::oprocessStderr(OProcess*, char *buffer, int ) {
     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;
@@ -755,25 +756,25 @@ bool AdvancedFm::eventFilter( QObject * o, QEvent * e ) {
         }
       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; 
@@ -817,12 +818,13 @@ void AdvancedFm::renameIt() {
         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() + "/";