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
@@ -284,3 +284,3 @@ void AdvancedFm::switchToLocalTab() {
 		TabWidget->setCurrentWidget(0);
-		Local_View->setFocus();
+//		Local_View->setFocus();
 		whichTab = 1;
@@ -290,3 +290,3 @@ void AdvancedFm::switchToRemoteTab() {
 		TabWidget->setCurrentWidget(1);
-		Remote_View->setFocus();
+//		Remote_View->setFocus();
 		whichTab = 2;
@@ -383,5 +383,9 @@ void AdvancedFm::keyPressEvent( QKeyEvent *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();
@@ -757,3 +761,3 @@ void AdvancedFm::setOtherTabCurrent() {
    }
-    OtherView()->setFocus();
+//    OtherView()->setFocus();
     OtherView()->setSelected( CurrentView()->firstChild(), true);
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
@@ -130,3 +130,3 @@ void AdvancedFm::init() {
 	 menuButton->insertSeparator();
-	 menuButton->setFocusPolicy(NoFocus);
+// menuButton->setFocusPolicy(NoFocus);
 	 CBHB->addWidget( menuButton );
@@ -138,3 +138,3 @@ void AdvancedFm::init() {
 	 currentPathCombo->lineEdit()->setText( currentDir.canonicalPath());
-	 currentPathCombo->setFocusPolicy(NoFocus);
+//	 currentPathCombo->setFocusPolicy(NoFocus);
 	 CBHB->addWidget( currentPathCombo );
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
@@ -47,3 +47,3 @@ void AdvancedFm::doDirChange() {
 //      owarn << pathItem << oendl; 
-      gotoDirectory( CurrentDir()->path()+"/"+pathItem.left( pathItem.length() - 1) );
+      changeTo( CurrentDir()->path()+"/"+pathItem.left( pathItem.length() - 1) );
    }
@@ -743,2 +743,3 @@ bool AdvancedFm::eventFilter( QObject * o, QEvent * e ) {
   if ( o->inherits( "QLineEdit" ) )  {
+				qDebug("QLineEdit event");
       if ( e->type() == QEvent::KeyPress ) {
@@ -760,3 +761,3 @@ bool AdvancedFm::eventFilter( QObject * o, QEvent * e ) {
     }
-   if ( o->inherits( "QListView" ) ) {
+/*   if ( o->inherits( "QListView" ) ) {
        if ( e->type() == QEvent::FocusIn ) {
@@ -772,3 +773,3 @@ bool AdvancedFm::eventFilter( QObject * o, QEvent * e ) {
      }
-
+*/
   return QWidget::eventFilter( o, e );
@@ -822,2 +823,3 @@ void AdvancedFm::renameIt() {
 void AdvancedFm::okRename() {
+		qDebug("okrename");
    if( !renameBox) return;