kindred/create
1
1
Fork 0
Code Issues 37 Pull Requests Actions Packages Projects 9 Releases 2 Wiki Activity

Draft: Change selectUi and makeDumbTask argument named 'callback' to 'on_close_call'

Browse Source 
Suggested by user @carlopav
This commit is contained in:
marioalexis
2021-02-07 19:50:49 -03:00
parent 7a54edb33a
commit 6795e0d7e6
16 changed files with 21 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/Mod/Draft/DraftGui.py
View File

@@ -1061,12 +1061,12 @@ class DraftToolBar:
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
@@ -1178,13 +1178,13 @@ class DraftToolBar:
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
self.callback = callback
def getStandardButtons(self):
return int(QtGui.QDialogButtonBox.Close)
def reject(self):
@@ -1192,7 +1192,7 @@ class DraftToolBar:
self.callback()
return True
FreeCADGui.Control.closeDialog()
panel = TaskPanel(extra,callback)
panel = TaskPanel(extra, on_close_call)
FreeCADGui.Control.showDialog(panel)

2
src/Mod/Draft/draftguitools/gui_clone.py
View File

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

2
src/Mod/Draft/draftguitools/gui_downgrade.py
View File

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

2
src/Mod/Draft/draftguitools/gui_draft2sketch.py
View File

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

2
src/Mod/Draft/draftguitools/gui_edit.py
View File

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

2
src/Mod/Draft/draftguitools/gui_facebinders.py
View File

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

2
src/Mod/Draft/draftguitools/gui_join.py
View File

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

2
src/Mod/Draft/draftguitools/gui_mirror.py
View File

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

2
src/Mod/Draft/draftguitools/gui_move.py
View File

@@ -78,7 +78,7 @@ class Move(gui_base_original.Modifier):
"""Get the object selection."""
if Gui.Selection.getSelectionEx():
return self.proceed()
self.ui.selectUi(callback=self.finish)
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)

2
src/Mod/Draft/draftguitools/gui_offset.py
View File

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

2
src/Mod/Draft/draftguitools/gui_rotate.py
View File

@@ -75,7 +75,7 @@ class Rotate(gui_base_original.Modifier):
"""Get the object selection."""
if Gui.Selection.getSelection():
return self.proceed()
self.ui.selectUi(callback=self.finish)
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)

2
src/Mod/Draft/draftguitools/gui_scale.py
View File

@@ -84,7 +84,7 @@ class Scale(gui_base_original.Modifier):
"""Get object selection and proceed if successful."""
if Gui.Selection.getSelection():
return self.proceed()
self.ui.selectUi(callback=self.finish)
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)

2
src/Mod/Draft/draftguitools/gui_shape2dview.py
View File

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

2
src/Mod/Draft/draftguitools/gui_stretch.py
View File

@@ -69,7 +69,7 @@ class Stretch(gui_base_original.Modifier):
super(Stretch, self).Activated(name=translate("draft","Stretch"))
if self.ui:
if not Gui.Selection.getSelection():
self.ui.selectUi(callback=self.finish)
self.ui.selectUi(on_close_call=self.finish)
_msg(translate("draft", "Select an object to stretch"))
self.call = \
self.view.addEventCallback("SoEvent",

2
src/Mod/Draft/draftguitools/gui_trimex.py
View File

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

2
src/Mod/Draft/draftguitools/gui_upgrade.py
View File

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