Draft: Use function-specific icons in the taskbar

This commit is contained in:
marioalexis
2021-02-01 00:22:25 -03:00
parent 52ae5f8d6c
commit 6969be3881
15 changed files with 20 additions and 23 deletions

View File

@@ -137,7 +137,6 @@ class DraftTool:
self.ui = Gui.draftToolBar
self.featureName = name
self.ui.sourceCmd = self
self.ui.setTitle(name)
self.ui.show()
if not noplanesetup:
App.DraftWorkingPlane.setup()
@@ -146,14 +145,12 @@ class DraftTool:
self.constrain = None
self.obj = None
self.extendedCopy = False
self.ui.setTitle(name)
self.planetrack = None
if utils.get_param("showPlaneTracker", False):
self.planetrack = trackers.PlaneTracker()
if hasattr(Gui, "Snapper"):
Gui.Snapper.setTrackers()
_log("GuiCommand: {}".format(self.featureName))
_msg("{}".format(16*"-"))
_msg("GuiCommand: {}".format(self.featureName))

View File

@@ -73,7 +73,8 @@ class BezCurve(gui_lines.Line):
Activate the specific bezier curve tracker.
"""
super(BezCurve, self).Activated(name=translate("draft", "BezCurve"))
super(BezCurve, self).Activated(name=translate("draft", "Bezier curve"),
icon="Draft_BezCurve")
if self.doc:
self.bezcurvetrack = trackers.bezcurveTracker()
@@ -257,7 +258,8 @@ class CubicBezCurve(gui_lines.Line):
Activate the specific BezCurve tracker.
"""
super(CubicBezCurve, self).Activated(name=translate("draft", "CubicBezCurve"))
super(CubicBezCurve, self).Activated(name=translate("draft", "Cubic Bezier curve"),
icon="Draft_CubicBezCurve")
if self.doc:
self.bezcurvetrack = trackers.bezcurveTracker()

View File

@@ -115,7 +115,7 @@ class Dimension(gui_base_original.Creator):
else:
super(Dimension, self).Activated(name)
if self.ui:
self.ui.pointUi(name)
self.ui.pointUi(title=name, icon="Draft_Dimension")
self.ui.continueCmd.show()
self.ui.selectButton.show()
self.altdown = False

View File

@@ -66,7 +66,7 @@ class Ellipse(gui_base_original.Creator):
super(Ellipse, self).Activated(name)
if self.ui:
self.refpoint = None
self.ui.pointUi(name)
self.ui.pointUi(title=name, icon="Draft_Ellipse")
self.ui.extUi()
self.call = self.view.addEventCallback("SoEvent", self.action)
self.rect = trackers.rectangleTracker()

View File

@@ -65,7 +65,7 @@ class Line(gui_base_original.Creator):
'MenuText': QT_TRANSLATE_NOOP("Draft_Line", "Line"),
'ToolTip': QT_TRANSLATE_NOOP("Draft_Line", _tip)}
def Activated(self, name=translate("draft", "Line")):
def Activated(self, name=translate("draft", "Line"), icon="Draft_Line"):
"""Execute when the command is called."""
super(Line, self).Activated(name)
@@ -74,11 +74,9 @@ class Line(gui_base_original.Creator):
self.obj = None # stores the temp shape
self.oldWP = None # stores the WP if we modify it
if self.isWire:
self.ui.wireUi(name)
self.ui.wireUi(title=name, icon=icon)
else:
self.ui.lineUi(name)
self.ui.setTitle(translate("draft", "Line"))
self.ui.lineUi(title=name, icon=icon)
if sys.version_info.major < 3:
if isinstance(self.featureName, unicode):
self.featureName = self.featureName.encode("utf8")
@@ -364,7 +362,8 @@ class Wire(Line):
# If there was no selection or the selection was just one object
# then we proceed with the normal line creation functions,
# only this time we will be able to input more than two points
super(Wire, self).Activated(name=translate("draft", "Polyline"))
super(Wire, self).Activated(name=translate("draft", "Polyline"),
icon="Draft_Wire")
Gui.addCommand('Draft_Wire', Wire())

View File

@@ -86,7 +86,7 @@ class Mirror(gui_base_original.Modifier):
self.view.removeEventCallback("SoEvent", self.call)
self.sel = Gui.Selection.getSelection()
self.ui.pointUi(self.name)
self.ui.pointUi(title=self.name, icon="Draft_Mirror")
self.ui.modUi()
self.ui.xValue.setFocus()
self.ui.xValue.selectAll()

View File

@@ -99,7 +99,7 @@ class Move(gui_base_original.Modifier):
spaces=True,
noarchchild=True)
self.selected_subelements = Gui.Selection.getSelectionEx()
self.ui.lineUi(self.name)
self.ui.lineUi(self.name, icon="Draft_Move")
self.ui.modUi()
if self.copymode:
self.ui.isCopy.setChecked(True)

View File

@@ -75,7 +75,7 @@ class Point(gui_base_original.Creator):
upv)
self.point = None
if self.ui:
self.ui.pointUi()
self.ui.pointUi(icon="Draft_Point")
self.ui.continueCmd.show()
# adding 2 callback functions
self.callbackClick = self.view.addEventCallbackPivy(coin.SoMouseButtonEvent.getClassTypeId(), self.click)

View File

@@ -71,7 +71,7 @@ class Polygon(gui_base_original.Creator):
self.rad = None
self.tangents = []
self.tanpoints = []
self.ui.pointUi(name)
self.ui.pointUi(title=name, icon="Draft_Polygon")
self.ui.extUi()
self.ui.numFaces.show()
self.ui.numFacesLabel.show()

View File

@@ -61,7 +61,7 @@ class Rectangle(gui_base_original.Creator):
super(Rectangle, self).Activated(name)
if self.ui:
self.refpoint = None
self.ui.pointUi(name)
self.ui.pointUi(title=name, icon="Draft_Rectangle")
self.ui.extUi()
if utils.getParam("UsePartPrimitives", False):
self.fillstate = self.ui.hasFill.isChecked()

View File

@@ -101,7 +101,6 @@ class Rotate(gui_base_original.Modifier):
self.center = None
self.ui.rotateSetCenterUi()
self.ui.modUi()
self.ui.setTitle(translate("draft", "Rotate"))
self.arctrack = trackers.arcTracker()
self.call = self.view.addEventCallback("SoEvent", self.action)
_msg(translate("draft", "Pick rotation center"))

View File

@@ -101,7 +101,7 @@ class Scale(gui_base_original.Modifier):
groups.get_group_contents(self.selected_objects)
self.selected_subelements = Gui.Selection.getSelectionEx()
self.refs = []
self.ui.pointUi(self.name)
self.ui.pointUi(title=self.name, icon="Draft_Scale")
self.ui.modUi()
self.ui.xValue.setFocus()
self.ui.xValue.selectAll()

View File

@@ -96,7 +96,7 @@ class ShapeString(gui_base_original.Creator):
self.dialog = None
self.text = ''
self.ui.sourceCmd = self
self.ui.pointUi(name)
self.ui.pointUi(title=name, icon="Draft_ShapeString")
self.active = True
self.call = self.view.addEventCallback("SoEvent", self.action)
self.ssBase = None

View File

@@ -67,7 +67,7 @@ class BSpline(gui_lines.Line):
Activate the specific BSpline tracker.
"""
super(BSpline, self).Activated(name=translate("draft", "BSpline"))
super(BSpline, self).Activated(name=translate("draft", "B-spline"), icon="Draft_BSpline")
if self.doc:
self.bsplinetrack = trackers.bsplineTracker()

View File

@@ -116,7 +116,7 @@ class Stretch(gui_base_original.Modifier):
if self.ui and self.sel:
self.step = 1
self.refpoint = None
self.ui.pointUi("Stretch")
self.ui.pointUi(title="Stretch", icon="Draft_Stretch")
self.ui.extUi()
self.call = self.view.addEventCallback("SoEvent", self.action)
self.rectracker = trackers.rectangleTracker(dotted=True,