fix rename cancel.. hehehe

2 files changed, 45 insertions, 15 deletions

diff --git a/noncore/apps/advancedfm/advancedfm.cpp b/noncore/apps/advancedfm/advancedfm.cpp
index c653b90..9edf7c1 100644
--- a/noncore/apps/advancedfm/advancedfm.cpp
+++ b/noncore/apps/advancedfm/advancedfm.cpp
@@ -64,12 +64,14 @@
 #include <mntent.h>
 #include <sys/utsname.h>
 
 AdvancedFm::AdvancedFm( )
         : QMainWindow( ) {
     init();
+    renameBox = 0;
+
     initConnections();
     populateLocalView();
     populateRemoteView();
     currentPathCombo->setFocus();
 }
 
@@ -399,30 +401,45 @@ void AdvancedFm::remoteListClicked(QListViewItem *selectedItem) {
 
 
 void AdvancedFm::localListPressed( int mouse, QListViewItem *, const QPoint& , int ) {
 //  qDebug("list pressed");
   switch (mouse) {
   case 1:
+  {
+        if(renameBox != 0 )
+    {
+        qDebug("cancel rename");
+        cancelRename();
+    }
+
+  }
     break;
   case 2:
     menuTimer.start( 500, TRUE );
     qDebug("Start menu timer\n");
     break;
   };
 }
 
 void AdvancedFm::remoteListPressed( int mouse, QListViewItem*, const QPoint&, int ) {
 
-  switch (mouse) {
-  case 1:
-    break;
-  case 2:
-    menuTimer.start( 500, TRUE );
-    qDebug("Start menu timer");
-    break;
-  };
+    switch (mouse) {
+      case 1:
+      {
+          if(renameBox != 0 )
+            {
+                qDebug("cancel rename");
+                cancelRename();
+            }
+      }
+      break;
+      case 2:
+          menuTimer.start( 500, TRUE );
+          qDebug("Start menu timer");
+          break;
+    };
 }
 
 
 void AdvancedFm::switchToLocalTab() {
   TabWidget->setCurrentTab(0);
   Local_View->setFocus();
@@ -876,6 +893,7 @@ void AdvancedFm::addToDocs() {
                 f.setFile( curFile);
                 f.writeLink();
             }
         }
     }
 }
+
diff --git a/noncore/apps/advancedfm/advancedfmMenu.cpp b/noncore/apps/advancedfm/advancedfmMenu.cpp
index f067013..2ddcabc 100644
--- a/noncore/apps/advancedfm/advancedfmMenu.cpp
+++ b/noncore/apps/advancedfm/advancedfmMenu.cpp
@@ -1024,22 +1024,31 @@ bool AdvancedFm::eventFilter( QObject * o, QEvent * e ) {
             }
         } else if ( e->type() == QEvent::FocusOut ) {
             cancelRename();
             return true;
         }
     }
+    if ( o->inherits( "QListView" ) ) {
+        if ( e->type() == QEvent::FocusOut ) {
+            printf("focusIn\n");
+            
+        }
+    }   
+
     return QWidget::eventFilter( o, e );
 }
 
 
-void AdvancedFm::cancelRename() {
+void AdvancedFm::cancelRename()
+{
     qDebug("cancel rename");
     QListView * view;
-    if (TabWidget->getCurrentTab() == 0) {
-        view = Local_View;
-    }
+    if (TabWidget->getCurrentTab() == 0)
+      {
+          view = Local_View;
+      }
     else
       {
           view = Remote_View;
       }
 
     bool resetFocus = view->viewport()->focusProxy() == renameBox;
@@ -1048,13 +1057,14 @@ void AdvancedFm::cancelRename() {
     if ( resetFocus ) {
         view->viewport()->setFocusProxy( view);
         view->setFocus();
     }
 }
 
-void AdvancedFm::doRename(QListView * view) {
+void AdvancedFm::doRename(QListView * view)
+{
 
     QRect r = view->itemRect( view->currentItem( ));
     r = QRect( view->viewportToContents( r.topLeft() ), r.size() );
     r.setX( view->contentsX() );
     if ( r.width() > view->visibleWidth() )
         r.setWidth( view->visibleWidth() );
@@ -1072,26 +1082,28 @@ void AdvancedFm::doRename(QListView * view) {
     renameBox->setFocus();
     renameBox->show();
 
 }
 
 
-void AdvancedFm::localRename() {
+void AdvancedFm::localRename()
+{
     oldName = Local_View->currentItem()->text(0);
     doRename(Local_View );
     populateLocalView();
 }
 
 void AdvancedFm::remoteRename()
 {
     oldName = Remote_View->currentItem()->text(0);
     doRename(Local_View );
     populateRemoteView();
 }
 
-void AdvancedFm::okRename() {
+void AdvancedFm::okRename()
+{
     QString newName = renameBox->text();
     cancelRename();
     int tabs=0;
      QListView * view;
      tabs = TabWidget->getCurrentTab();
      if ( tabs == 0)