Merge pull request #4389 from marioalexis84/draft-close_button

[0.20] [Draft] Call finish method if Close button is pressed in dumb taskdialog

src/Mod/Draft/DraftGui.py

@@ -1179,12 +1179,12 @@ def setTitle(self,title,icon="Draft_Draft"):
         else: # self.taskmode == 0  Draft toolbar is obsolete and has been disabled (February 2020)
             self.cmdlabel.setText(title)
 
-    def selectUi(self,extra=None,callback=None):
+    def selectUi(self,extra=None, on_close_call=None):
         if not self.taskmode:
              # self.taskmode == 0  Draft toolbar is obsolete and has been disabled (February 2020)
             self.labelx.setText(translate("draft", "Pick Object"))
             self.labelx.show()
-        self.makeDumbTask(extra,callback)
+        self.makeDumbTask(extra, on_close_call)
 
     def editUi(self, mode=None):
         self.lastMode=mode
@@ -1306,20 +1306,21 @@ def relocate(self):
         else:
             self.layout.setDirection(QtGui.QBoxLayout.LeftToRight)
 
-    def makeDumbTask(self,extra=None,callback=None):
+    def makeDumbTask(self, extra=None, on_close_call=None):
         """create a dumb taskdialog to prevent deleting the temp object"""
         class TaskPanel:
-            def __init__(self,extra=None,callback=None):
+            def __init__(self, extra=None, callback=None):
                 if extra:
                     self.form = [extra]
+                self.callback = callback
             def getStandardButtons(self):
                 return int(QtGui.QDialogButtonBox.Close)
             def reject(self):
-                if callback:
-                    callback()
+                if self.callback:
+                    self.callback()
                 return True
         FreeCADGui.Control.closeDialog()
-        panel = TaskPanel(extra,callback)
+        panel = TaskPanel(extra, on_close_call)
         FreeCADGui.Control.showDialog(panel)
 
 

src/Mod/Draft/draftguitools/gui_clone.py

@@ -75,7 +75,7 @@ def Activated(self):
         super(Clone, self).Activated(name=translate("draft","Clone"))
         if not Gui.Selection.getSelection():
             if self.ui:
-                self.ui.selectUi()
+                self.ui.selectUi(on_close_call=self.finish)
                 _msg(translate("draft", "Select an object to clone"))
                 self.call = self.view.addEventCallback(
                     "SoEvent",

src/Mod/Draft/draftguitools/gui_downgrade.py

@@ -63,7 +63,7 @@ def Activated(self):
         super(Downgrade, self).Activated(name=translate("draft","Downgrade"))
         if self.ui:
             if not Gui.Selection.getSelection():
-                self.ui.selectUi()
+                self.ui.selectUi(on_close_call=self.finish)
                 _msg(translate("draft", "Select an object to upgrade"))
                 self.call = self.view.addEventCallback(
                     "SoEvent",

src/Mod/Draft/draftguitools/gui_draft2sketch.py

@@ -62,7 +62,7 @@ def Activated(self):
         super(Draft2Sketch, self).Activated(name=translate("draft","Convert Draft/Sketch"))
         if not Gui.Selection.getSelection():
             if self.ui:
-                self.ui.selectUi()
+                self.ui.selectUi(on_close_call=self.finish)
                 _msg(translate("draft", "Select an object to convert."))
                 self.call = self.view.addEventCallback(
                     "SoEvent",

src/Mod/Draft/draftguitools/gui_edit.py

@@ -300,7 +300,7 @@ def Activated(self):
         if Gui.Selection.getSelection():
             self.proceed()
         else:
-            self.ui.selectUi()
+            self.ui.selectUi(on_close_call=self.finish)
             App.Console.PrintMessage(translate("draft", 
                                                "Select a Draft object to edit")
                                                + "\n")

src/Mod/Draft/draftguitools/gui_facebinders.py

@@ -67,7 +67,7 @@ def Activated(self):
 
         if not Gui.Selection.getSelection():
             if self.ui:
-                self.ui.selectUi()
+                self.ui.selectUi(on_close_call=self.finish)
                 _msg(translate("draft", "Select faces from existing objects"))
                 self.call = self.view.addEventCallback(
                     "SoEvent",

src/Mod/Draft/draftguitools/gui_join.py

@@ -72,7 +72,7 @@ def Activated(self):
         if not self.ui:
             return
         if not Gui.Selection.getSelection():
-            self.ui.selectUi()
+            self.ui.selectUi(on_close_call=self.finish)
             _msg(translate("draft", "Select an object to join"))
             self.call = self.view.addEventCallback(
                 "SoEvent",

src/Mod/Draft/draftguitools/gui_mirror.py

@@ -70,7 +70,7 @@ def Activated(self):
         self.ghost = None
         if self.ui:
             if not Gui.Selection.getSelection():
-                self.ui.selectUi()
+                self.ui.selectUi(on_close_call=self.finish)
                 _msg(translate("draft", "Select an object to mirror"))
                 self.call = \
                     self.view.addEventCallback("SoEvent",

src/Mod/Draft/draftguitools/gui_move.py

@@ -78,7 +78,7 @@ def get_object_selection(self):
         """Get the object selection."""
         if Gui.Selection.getSelectionEx():
             return self.proceed()
-        self.ui.selectUi()
+        self.ui.selectUi(on_close_call=self.finish)
         _msg(translate("draft", "Select an object to move"))
         self.call = \
             self.view.addEventCallback("SoEvent", gui_tool_utils.selectObject)

src/Mod/Draft/draftguitools/gui_offset.py

@@ -72,7 +72,7 @@ def Activated(self):
         self.arctrack = None
         if self.ui:
             if not Gui.Selection.getSelection():
-                self.ui.selectUi()
+                self.ui.selectUi(on_close_call=self.finish)
                 _msg(translate("draft", "Select an object to offset"))
                 self.call = self.view.addEventCallback(
                     "SoEvent",

src/Mod/Draft/draftguitools/gui_rotate.py

@@ -75,7 +75,7 @@ def get_object_selection(self):
         """Get the object selection."""
         if Gui.Selection.getSelection():
             return self.proceed()
-        self.ui.selectUi()
+        self.ui.selectUi(on_close_call=self.finish)
         _msg(translate("draft", "Select an object to rotate"))
         self.call = \
             self.view.addEventCallback("SoEvent", gui_tool_utils.selectObject)

src/Mod/Draft/draftguitools/gui_scale.py

@@ -84,7 +84,7 @@ def get_object_selection(self):
         """Get object selection and proceed if successful."""
         if Gui.Selection.getSelection():
             return self.proceed()
-        self.ui.selectUi()
+        self.ui.selectUi(on_close_call=self.finish)
         _msg(translate("draft", "Select an object to scale"))
         self.call = self.view.addEventCallback("SoEvent",
                                                gui_tool_utils.selectObject)

src/Mod/Draft/draftguitools/gui_selectplane.py

@@ -91,6 +91,7 @@ def Activated(self):
         # Create task panel
         FreeCADGui.Control.closeDialog()
         self.taskd = task_selectplane.SelectPlaneTaskPanel()
+        self.taskd.reject = self.reject
 
         # Fill values
         self.taskd.form.checkCenter.setChecked(self.param.GetBool("CenterPlaneOnView", False))

src/Mod/Draft/draftguitools/gui_shape2dview.py

@@ -64,7 +64,7 @@ def Activated(self):
         super(Shape2DView, self).Activated(name=translate("draft","Project 2D view"))
         if not Gui.Selection.getSelection():
             if self.ui:
-                self.ui.selectUi()
+                self.ui.selectUi(on_close_call=self.finish)
                 _msg(translate("draft", "Select an object to project"))
                 self.call = self.view.addEventCallback(
                     "SoEvent",

src/Mod/Draft/draftguitools/gui_stretch.py

@@ -67,9 +67,11 @@ def GetResources(self):
     def Activated(self):
         """Execute when the command is called."""
         super(Stretch, self).Activated(name=translate("draft","Stretch"))
+        self.rectracker = None
+        self.nodetracker = None
         if self.ui:
             if not Gui.Selection.getSelection():
-                self.ui.selectUi()
+                self.ui.selectUi(on_close_call=self.finish)
                 _msg(translate("draft", "Select an object to stretch"))
                 self.call = \
                     self.view.addEventCallback("SoEvent",
@@ -251,9 +253,9 @@ def numericInput(self, numx, numy, numz):
 
     def finish(self, closed=False):
         """Terminate the operation of the command. and clean up."""
-        if hasattr(self, "rectracker") and self.rectracker:
+        if self.rectracker:
             self.rectracker.finalize()
-        if hasattr(self, "nodetracker") and self.nodetracker:
+        if self.nodetracker:
             for n in self.nodetracker:
                 n.finalize()
         super(Stretch, self).finish()

src/Mod/Draft/draftguitools/gui_trimex.py

@@ -87,7 +87,7 @@ def Activated(self):
         self.width = None
         if self.ui:
             if not Gui.Selection.getSelection():
-                self.ui.selectUi()
+                self.ui.selectUi(on_close_call=self.finish)
                 _msg(translate("draft", "Select objects to trim or extend"))
                 self.call = \
                     self.view.addEventCallback("SoEvent",

src/Mod/Draft/draftguitools/gui_upgrade.py

@@ -63,7 +63,7 @@ def Activated(self):
         super(Upgrade, self).Activated(name=translate("draft","Upgrade"))
         if self.ui:
             if not Gui.Selection.getSelection():
-                self.ui.selectUi()
+                self.ui.selectUi(on_close_call=self.finish)
                 _msg(translate("draft", "Select an object to upgrade"))
                 self.call = self.view.addEventCallback(
                     "SoEvent",