send Key_Escape to actions, issue#285

LibreCAD · Feb 8, 2012 · 7cdc72e · 7cdc72e
1 parent 3724dfd
commit 7cdc72e
Show file tree

Hide file tree

Showing 4 changed files with 38 additions and 39 deletions.
diff --git a/src/actions/rs_actiondefault.cpp b/src/actions/rs_actiondefault.cpp
@@ -63,7 +63,10 @@ QAction* RS_ActionDefault::createGUIAction(RS2::ActionType /*type*/,
 
 void RS_ActionDefault::init(int status) {
         RS_DEBUG->print("RS_ActionDefault::init");
-
+if(status==Neutral){
+    deletePreview();
+    deleteSnapper();
+}
         RS_PreviewActionInterface::init(status);
     v1 = v2 = RS_Vector(false);
 //    snapMode.clear();
@@ -82,15 +85,29 @@ void RS_ActionDefault::trigger() {
 }
 
 void RS_ActionDefault::keyPressEvent(QKeyEvent* e) {
-        if (e->key()==Qt::Key_Shift) {
-                restrBak = snapMode.restriction;
-                setSnapRestriction(RS2::RestrictOrthogonal);
-        }
+//        std::cout<<"RS_ActionDefault::keyPressEvent(): begin"<<std::endl;
+    switch(e->key()){
+    case Qt::Key_Shift:
+        restrBak = snapMode.restriction;
+        setSnapRestriction(RS2::RestrictOrthogonal);
+        e->accept();
+        //cleanup default action, issue#285
+    case Qt::Key_Escape:
+//        std::cout<<"RS_ActionDefault::keyPressEvent(): Qt::Key_Escape"<<std::endl;
+        deletePreview();
+        deleteSnapper();
+        setStatus(Neutral);
+        e->accept();
+    default:
+        e->ignore();
+    }
+
 }
 
 void RS_ActionDefault::keyReleaseEvent(QKeyEvent* e) {
         if (e->key()==Qt::Key_Shift) {
                 setSnapRestriction(restrBak);
+                e->accept();
         }
 }
 
@@ -247,7 +264,8 @@ void RS_ActionDefault::mousePressEvent(QMouseEvent* e) {
         }
     } else if (e->button()==Qt::RightButton) {
         //cleanup
-        cleanUpAction(e);
+        setStatus(Neutral);
+        e->accept();
     }
 }
 
@@ -309,27 +327,8 @@ void RS_ActionDefault::mouseReleaseEvent(QMouseEvent* e) {
         }
     } else if (e->button()==Qt::RightButton) {
         //cleanup
-        cleanUpAction(e);
-    }
-}
-
- // cancel the current action and cleanup
-void RS_ActionDefault::cleanUpAction(QMouseEvent* e){
-    switch (getStatus()) {
-    case SetCorner2:
-    case Moving:
-    case MovingRef:
-        deletePreview();
-        deleteSnapper();
         setStatus(Neutral);
-        RS_DIALOGFACTORY->requestToolBar(RS2::ToolBarMain);
         e->accept();
-        break;
-
-    default:
-        RS_DIALOGFACTORY->requestPreviousMenu();
-        e->accept();
-        break;
     }
 }
 

diff --git a/src/actions/rs_actiondefault.h b/src/actions/rs_actiondefault.h
@@ -85,8 +85,6 @@ class RS_ActionDefault : public RS_PreviewActionInterface {
     RS_Vector v1;
     RS_Vector v2;
     RS2::SnapRestriction restrBak;
-private:
-    void  cleanUpAction(QMouseEvent* e); // cancel the current action and cleanup
 
 };
 

diff --git a/src/lib/gui/rs_eventhandler.cpp b/src/lib/gui/rs_eventhandler.cpp
@@ -529,7 +529,11 @@ void RS_EventHandler::killAllActions() {
         if(currentActions.size()==0) return;
         delete currentActions.takeFirst();
     }
-    //cleanUp();
+//    if(defaultAction->rtti() == RS2::ActionDefault){
+
+//    }
+    //cleanup default action, issue#285
+    defaultAction->init(0);
 }
 
 

diff --git a/src/main/qc_applicationwindow.cpp b/src/main/qc_applicationwindow.cpp
@@ -4664,25 +4664,23 @@ void QC_ApplicationWindow::keyPressEvent(QKeyEvent* e) {
     if (actionProcessed==false) {
         // single key codes:
         switch (e->key()) {
+        //need to pass Escape to actions, issue#285
+        case Qt::Key_Escape:
+            slotBack();
         case Qt::Key_Shift:
         case Qt::Key_Control:
         case Qt::Key_Meta:
         case Qt::Key_Alt:
         case Qt::Key_CapsLock: {
-                QMainWindow::keyPressEvent(e);
+            QMainWindow::keyPressEvent(e);
 
-                // forward to actions:
-                RS_GraphicView* graphicView = getGraphicView();
-                if (graphicView!=NULL) {
-                    graphicView->keyPressEvent(e);
-                }
-                e->accept();
+            // forward to actions:
+            RS_GraphicView* graphicView = getGraphicView();
+            if (graphicView!=NULL) {
+                graphicView->keyPressEvent(e);
             }
-            break;
-
-        case Qt::Key_Escape:
-            slotBack();
             e->accept();
+        }
             break;
 
         case Qt::Key_Return: