change focus for edit

3 files changed, 17 insertions, 11 deletions

diff --git a/noncore/apps/advancedfm/advancedfm.cpp b/noncore/apps/advancedfm/advancedfm.cpp
index 3cd2067..8d07f69 100644
--- a/noncore/apps/advancedfm/advancedfm.cpp
+++ b/noncore/apps/advancedfm/advancedfm.cpp
@@ -279,19 +279,19 @@ void AdvancedFm::refreshCurrentTab() {
         // if ( TabWidget->currentWidget() == tab) {
                 
 }
 
 void AdvancedFm::switchToLocalTab() {
                 TabWidget->setCurrentWidget(0);
-                Local_View->setFocus();
+        //      Local_View->setFocus();
                 whichTab = 1;
 }
 
 void AdvancedFm::switchToRemoteTab() {
                 TabWidget->setCurrentWidget(1);
-                Remote_View->setFocus();
+        //      Remote_View->setFocus();
                 whichTab = 2;
 }
 
 void  AdvancedFm::currentPathComboChanged() {
    if(QDir( currentPathCombo->lineEdit()->text()).exists()) {
       CurrentDir()->setPath( currentPathCombo->lineEdit()->text() );
@@ -378,15 +378,19 @@ void AdvancedFm::doAbout() {
 
 void AdvancedFm::keyPressEvent( QKeyEvent *e) {
                 Q_UNUSED(e);
 }
 
 void AdvancedFm::keyReleaseEvent( QKeyEvent *e) {
-   if( CurrentView()->hasFocus() )
-      e->ignore();
-                if(  e->key() ==  Key_Left ) 
+//     if( CurrentView()->hasFocus() )
+//        e->ignore();
+                if( currentPathCombo->lineEdit()->hasFocus()) {
+        //                      qDebug("shout!");
+                }
+
+                                else if(  e->key() ==  Key_Left ) 
                                 upDir();
                 else if( e->key() == Key_Return || e->key() == Key_Enter)
                                 navigateToSelected();
                 else if( e->key() == Key_Tab)
                                 setOtherTabCurrent();
                 else if( e->key() == Key_Delete )
@@ -752,13 +756,13 @@ void AdvancedFm::setOtherTabCurrent() {
         //      qDebug("setOtherTabCurrent() %d",whichTab);
    if ( whichTab == 1) {
       TabWidget->setCurrentWidget(1);
    } else {
       TabWidget->setCurrentWidget(0);
    }
-    OtherView()->setFocus();
+//    OtherView()->setFocus();
     OtherView()->setSelected( CurrentView()->firstChild(), true);
 }
 
 void AdvancedFm::qcopReceive(const QCString &msg, const QByteArray &data) {
 //   odebug << "qcop message "+msg << oendl;
    QDataStream stream ( data, IO_ReadOnly );
diff --git a/noncore/apps/advancedfm/advancedfmData.cpp b/noncore/apps/advancedfm/advancedfmData.cpp
index d2e1d8e..fe565a0 100644
--- a/noncore/apps/advancedfm/advancedfmData.cpp
+++ b/noncore/apps/advancedfm/advancedfmData.cpp
@@ -125,21 +125,21 @@ void AdvancedFm::init() {
 
          menuButton->setUseLabel(false);
          menuButton->setMaximumWidth( 20 );
          menuButton->insertItem( s_addBookmark);
          menuButton->insertItem( s_removeBookmark);
          menuButton->insertSeparator();
-         menuButton->setFocusPolicy(NoFocus);
+// menuButton->setFocusPolicy(NoFocus);
          CBHB->addWidget( menuButton );
 
          customDirsToMenu();
 
          currentPathCombo = new QComboBox( FALSE, this, "currentPathCombo" );
          currentPathCombo->setEditable(TRUE);
          currentPathCombo->lineEdit()->setText( currentDir.canonicalPath());
-         currentPathCombo->setFocusPolicy(NoFocus);
+        // currentPathCombo->setFocusPolicy(NoFocus);
          CBHB->addWidget( currentPathCombo );
 
          layout->addLayout( CBHB );
 
          TabWidget = new OSplitter( Horizontal, this, "TabWidget" );
 //  TabWidget = new QTabWidget( this, "TabWidget" );
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() + "/";