actionselect: bug#3437138

LibreCAD · Nov 14, 2011 · 2487aef · 2487aef
1 parent 6a7c951
commit 2487aef
Show file tree

Hide file tree

Showing 4 changed files with 38 additions and 8 deletions.
diff --git a/src/actions/rs_actionselect.cpp b/src/actions/rs_actionselect.cpp
@@ -37,16 +37,28 @@ RS_ActionSelect::RS_ActionSelect(RS_EntityContainer& container,
         :RS_ActionInterface("Select Entities", container, graphicView) {
 
     this->nextAction = nextAction;
+    selectSingle=true;
 }
 
 
 
 void RS_ActionSelect::init(int status) {
 	RS_ActionInterface::init(status);
 	graphicView->setCurrentAction(
-		new RS_ActionSelectSingle(*container, *graphicView));
+		new RS_ActionSelectSingle(*container, *graphicView,this));
 }
 
+
+void RS_ActionSelect::resume(){
+    RS_ActionInterface::resume();
+    if(selectSingle==false){
+        finish();
+    }
+}
+
+void RS_ActionSelect::requestFinish(){
+    selectSingle=false;
+}
 
 
 void RS_ActionSelect::mouseReleaseEvent(QMouseEvent* e) {
@@ -125,4 +137,13 @@ void RS_ActionSelect::updateMouseButtonHints() {
 }
 
 
+void RS_ActionSelect::updateMouseCursor() {
+    if(graphicView!=NULL){
+        if(isFinished()){
+            graphicView->setMouseCursor(RS2::ArrowCursor);
+        }else{
+            graphicView->setMouseCursor(RS2::SelectCursor);
+        }
+    }
+}
 // EOF
diff --git a/src/actions/rs_actionselect.h b/src/actions/rs_actionselect.h
@@ -43,14 +43,18 @@ class RS_ActionSelect : public RS_ActionInterface {
                     RS2::ActionType nextAction);
     ~RS_ActionSelect() {}
 
-    void init(int status);
+    virtual void init(int status);
+    virtual void resume();
     //virtual void keyPressEvent(QKeyEvent* e);
-    void mouseReleaseEvent(QMouseEvent* e);
-    void updateToolBar();
-    void updateMouseButtonHints();
+    virtual void mouseReleaseEvent(QMouseEvent* e);
+    virtual void updateToolBar();
+    virtual void updateMouseButtonHints();
+    virtual void updateMouseCursor();
+    void requestFinish();
 
 private:
     RS2::ActionType nextAction;
+    bool selectSingle;
 };
 
 #endif
diff --git a/src/actions/rs_actionselectsingle.cpp b/src/actions/rs_actionselectsingle.cpp
@@ -33,8 +33,9 @@
 
 
 RS_ActionSelectSingle::RS_ActionSelectSingle(RS_EntityContainer& container,
-        RS_GraphicView& graphicView)
-        :RS_ActionInterface("Select Entities", container, graphicView) {
+                                             RS_GraphicView& graphicView,RS_ActionSelect* actionSelect)
+    :RS_ActionInterface("Select Entities", container, graphicView) {
+    this->actionSelect=actionSelect;
 
     en = NULL;
 }
@@ -69,6 +70,8 @@ void RS_ActionSelectSingle::keyPressEvent(QKeyEvent* e) {
 
 void RS_ActionSelectSingle::mouseReleaseEvent(QMouseEvent* e) {
     if (e->button()==Qt::RightButton) {
+            //need to finish the parent RS_ActionSelect as well, bug#3437138
+        actionSelect->requestFinish();
         init(getStatus()-1);
     } else {
         en = catchEntity(e);

diff --git a/src/actions/rs_actionselectsingle.h b/src/actions/rs_actionselectsingle.h
@@ -28,6 +28,7 @@
 #define RS_ACTIONSELECTSINGLE_H
 
 #include "rs_actioninterface.h"
+#include "rs_actionselect.h"
 
 
 /**
@@ -39,7 +40,7 @@ class RS_ActionSelectSingle : public RS_ActionInterface {
 	Q_OBJECT
 public:
     RS_ActionSelectSingle(RS_EntityContainer& container,
-                          RS_GraphicView& graphicView);
+                          RS_GraphicView& graphicView,RS_ActionSelect* actionSelect=NULL);
     ~RS_ActionSelectSingle() {}
 
 	static QAction* createGUIAction(RS2::ActionType /*type*/, QObject* /*parent*/);
@@ -55,6 +56,7 @@ class RS_ActionSelectSingle : public RS_ActionInterface {
 
 private:
     RS_Entity* en;
+    RS_ActionSelect* actionSelect;
 };
 
 #endif