diff --git a/src/Mod/Draft/InitGui.py b/src/Mod/Draft/InitGui.py index 316209d798..8802be6af4 100644 --- a/src/Mod/Draft/InitGui.py +++ b/src/Mod/Draft/InitGui.py @@ -155,12 +155,12 @@ class DraftWorkbench(FreeCADGui.Workbench): else: self.appendContextMenu("Draft", self.drawing_commands) else: - if FreeCAD.activeDraftCommand.featureName in (translate("draft", "Line"), - translate("draft", "Wire"), - translate("draft", "Polyline"), - translate("draft", "BSpline"), - translate("draft", "BezCurve"), - translate("draft", "CubicBezCurve")): + if FreeCAD.activeDraftCommand.featureName in ("Line", + "Wire", + "Polyline", + "BSpline", + "BezCurve", + "CubicBezCurve"): self.appendContextMenu("", self.line_commands) else: if FreeCADGui.Selection.getSelection(): diff --git a/src/Mod/Draft/draftguitools/gui_arcs.py b/src/Mod/Draft/draftguitools/gui_arcs.py index b7d92aeb7a..1eee4672c6 100644 --- a/src/Mod/Draft/draftguitools/gui_arcs.py +++ b/src/Mod/Draft/draftguitools/gui_arcs.py @@ -69,7 +69,7 @@ class Arc(gui_base_original.Creator): def Activated(self): """Execute when the command is called.""" - super(Arc, self).Activated(name=translate("draft","Arc")) + super(Arc, self).Activated(name=self.featureName) if self.ui: self.step = 0 self.center = None @@ -479,7 +479,7 @@ class Arc_3Points(gui_base.GuiCommandSimplest): """GuiCommand for the Draft_Arc_3Points tool.""" def __init__(self): - super(Arc_3Points, self).__init__(name=translate("draft","Arc by 3 points")) + super(Arc_3Points, self).__init__(name="Arc by 3 points") def GetResources(self): """Set icon, menu and tooltip.""" @@ -510,7 +510,8 @@ class Arc_3Points(gui_base.GuiCommandSimplest): App.DraftWorkingPlane.setup() Gui.Snapper.getPoint(callback=self.getPoint, - movecallback=self.drawArc) + movecallback=self.drawArc, + title=translate("draft","Arc by 3 points")) def getPoint(self, point, info): """Get the point by clicking on the 3D view. diff --git a/src/Mod/Draft/draftguitools/gui_array_simple.py b/src/Mod/Draft/draftguitools/gui_array_simple.py index 248d287bff..9c3906194e 100644 --- a/src/Mod/Draft/draftguitools/gui_array_simple.py +++ b/src/Mod/Draft/draftguitools/gui_array_simple.py @@ -68,7 +68,7 @@ class Array(gui_base_original.Modifier): 'MenuText': QT_TRANSLATE_NOOP("Draft_Array", "Array"), 'ToolTip': QT_TRANSLATE_NOOP("Draft_Array", "Creates an array from a selected object.\nBy default, it is a 2x2 orthogonal array.\nOnce the array is created its type can be changed\nto polar or circular, and its properties can be modified.")} - def Activated(self, name=translate("draft","Array")): + def Activated(self, name="Array"): """Execute when the command is called.""" super(Array, self).Activated(name=name) if not Gui.Selection.getSelection(): @@ -121,7 +121,7 @@ class LinkArray(Array): def Activated(self): """Execute when the command is called.""" - super(LinkArray, self).Activated(name=translate("draft","Link array")) + super(LinkArray, self).Activated(name="Link array") Gui.addCommand('Draft_LinkArray', LinkArray()) diff --git a/src/Mod/Draft/draftguitools/gui_beziers.py b/src/Mod/Draft/draftguitools/gui_beziers.py index 4c127c8e82..b5d3c14bf6 100644 --- a/src/Mod/Draft/draftguitools/gui_beziers.py +++ b/src/Mod/Draft/draftguitools/gui_beziers.py @@ -69,7 +69,7 @@ class BezCurve(gui_lines.Line): Activate the specific bezier curve tracker. """ - super(BezCurve, self).Activated(name=translate("draft", "Bezier curve"), + super(BezCurve, self).Activated(name="BezCurve", icon="Draft_BezCurve") if self.doc: self.bezcurvetrack = trackers.bezcurveTracker() @@ -247,7 +247,7 @@ class CubicBezCurve(gui_lines.Line): Activate the specific BezCurve tracker. """ - super(CubicBezCurve, self).Activated(name=translate("draft", "Cubic Bezier curve"), + super(CubicBezCurve, self).Activated(name="CubicBezCurve", icon="Draft_CubicBezCurve") if self.doc: self.bezcurvetrack = trackers.bezcurveTracker() diff --git a/src/Mod/Draft/draftguitools/gui_clone.py b/src/Mod/Draft/draftguitools/gui_clone.py index 26797cefd3..b33363d96c 100644 --- a/src/Mod/Draft/draftguitools/gui_clone.py +++ b/src/Mod/Draft/draftguitools/gui_clone.py @@ -72,7 +72,7 @@ class Clone(gui_base_original.Modifier): def Activated(self): """Execute when the command is called.""" - super(Clone, self).Activated(name=translate("draft","Clone")) + super(Clone, self).Activated(name="Clone") if not Gui.Selection.getSelection(): if self.ui: self.ui.selectUi() diff --git a/src/Mod/Draft/draftguitools/gui_dimensions.py b/src/Mod/Draft/draftguitools/gui_dimensions.py index bfe3fc39ad..2d5130e806 100644 --- a/src/Mod/Draft/draftguitools/gui_dimensions.py +++ b/src/Mod/Draft/draftguitools/gui_dimensions.py @@ -86,19 +86,18 @@ class Dimension(gui_base_original.Creator): def Activated(self): """Execute when the command is called.""" - name = translate("draft", "Dimension") if self.cont: self.finish() elif self.selected_app_measure(): - super(Dimension, self).Activated(name) + super(Dimension, self).Activated(name="Dimension") self.dimtrack = trackers.dimTracker() self.arctrack = trackers.arcTracker() self.create_with_app_measure() self.finish() else: - super(Dimension, self).Activated(name) + super(Dimension, self).Activated(name="Dimension") if self.ui: - self.ui.pointUi(title=name, icon="Draft_Dimension") + self.ui.pointUi(title=translate("draft", self.featureName), icon="Draft_Dimension") self.ui.continueCmd.show() self.ui.selectButton.show() self.altdown = False diff --git a/src/Mod/Draft/draftguitools/gui_downgrade.py b/src/Mod/Draft/draftguitools/gui_downgrade.py index 015717681d..84ad5b08bc 100644 --- a/src/Mod/Draft/draftguitools/gui_downgrade.py +++ b/src/Mod/Draft/draftguitools/gui_downgrade.py @@ -60,7 +60,7 @@ class Downgrade(gui_base_original.Modifier): def Activated(self): """Execute when the command is called.""" - super(Downgrade, self).Activated(name=translate("draft","Downgrade")) + super(Downgrade, self).Activated(name="Downgrade") if self.ui: if not Gui.Selection.getSelection(): self.ui.selectUi() diff --git a/src/Mod/Draft/draftguitools/gui_draft2sketch.py b/src/Mod/Draft/draftguitools/gui_draft2sketch.py index 2759e6e0ff..cd516165ba 100644 --- a/src/Mod/Draft/draftguitools/gui_draft2sketch.py +++ b/src/Mod/Draft/draftguitools/gui_draft2sketch.py @@ -59,7 +59,7 @@ class Draft2Sketch(gui_base_original.Modifier): def Activated(self): """Execute when the command is called.""" - super(Draft2Sketch, self).Activated(name=translate("draft","Convert Draft/Sketch")) + super(Draft2Sketch, self).Activated(name="Convert Draft/Sketch") if not Gui.Selection.getSelection(): if self.ui: self.ui.selectUi() diff --git a/src/Mod/Draft/draftguitools/gui_drawing.py b/src/Mod/Draft/draftguitools/gui_drawing.py index d34e3ee4e2..49864823c4 100644 --- a/src/Mod/Draft/draftguitools/gui_drawing.py +++ b/src/Mod/Draft/draftguitools/gui_drawing.py @@ -73,7 +73,7 @@ class Drawing(gui_base_original.Modifier): def Activated(self): """Execute when the command is called.""" - super(Drawing, self).Activated(name=translate("draft","Drawing")) + super(Drawing, self).Activated(name="Drawing") _wrn(translate("draft","The Drawing Workbench is obsolete since 0.17, consider using the TechDraw Workbench instead.")) if not Gui.Selection.getSelection(): self.ghost = None diff --git a/src/Mod/Draft/draftguitools/gui_ellipses.py b/src/Mod/Draft/draftguitools/gui_ellipses.py index 3c77fd24f3..e7a8844c6a 100644 --- a/src/Mod/Draft/draftguitools/gui_ellipses.py +++ b/src/Mod/Draft/draftguitools/gui_ellipses.py @@ -61,11 +61,10 @@ class Ellipse(gui_base_original.Creator): def Activated(self): """Execute when the command is called.""" - name = translate("draft", "Ellipse") - super(Ellipse, self).Activated(name) + super(Ellipse, self).Activated(name="Ellipse") if self.ui: self.refpoint = None - self.ui.pointUi(title=name, icon="Draft_Ellipse") + self.ui.pointUi(title=translate("draft", self.featureName), icon="Draft_Ellipse") self.ui.extUi() self.call = self.view.addEventCallback("SoEvent", self.action) self.rect = trackers.rectangleTracker() diff --git a/src/Mod/Draft/draftguitools/gui_facebinders.py b/src/Mod/Draft/draftguitools/gui_facebinders.py index 7a8bf83f0c..22eeb855a0 100644 --- a/src/Mod/Draft/draftguitools/gui_facebinders.py +++ b/src/Mod/Draft/draftguitools/gui_facebinders.py @@ -63,7 +63,7 @@ class Facebinder(gui_base_original.Creator): def Activated(self): """Execute when the command is called.""" - super(Facebinder, self).Activated(name=translate("draft","Facebinder")) + super(Facebinder, self).Activated(name="Facebinder") if not Gui.Selection.getSelection(): if self.ui: diff --git a/src/Mod/Draft/draftguitools/gui_fillets.py b/src/Mod/Draft/draftguitools/gui_fillets.py index c4a13b0f81..e6ee92b9c3 100644 --- a/src/Mod/Draft/draftguitools/gui_fillets.py +++ b/src/Mod/Draft/draftguitools/gui_fillets.py @@ -64,7 +64,7 @@ class Fillet(gui_base_original.Creator): 'MenuText': QT_TRANSLATE_NOOP("Draft", "Fillet"), 'ToolTip': QT_TRANSLATE_NOOP("Draft", "Creates a fillet between two selected wires or edges.")} - def Activated(self, name=translate("Draft", "Fillet")): + def Activated(self, name="Fillet"): """Execute when the command is called.""" super(Fillet, self).Activated(name=name) @@ -76,7 +76,7 @@ class Fillet(gui_base_original.Creator): tooltip = translate("draft", "Radius of fillet") # Call the task panel defined in DraftGui to enter a radius. - self.ui.taskUi(title=name, icon="Draft_Fillet") + self.ui.taskUi(title=translate("Draft", self.featureName), icon="Draft_Fillet") self.ui.radiusUi() self.ui.sourceCmd = self self.ui.labelRadius.setText(label) diff --git a/src/Mod/Draft/draftguitools/gui_join.py b/src/Mod/Draft/draftguitools/gui_join.py index ce2b6a4119..20e62a9b06 100644 --- a/src/Mod/Draft/draftguitools/gui_join.py +++ b/src/Mod/Draft/draftguitools/gui_join.py @@ -68,7 +68,7 @@ class Join(gui_base_original.Modifier): def Activated(self): """Execute when the command is called.""" - super(Join, self).Activated(name=translate("draft","Join")) + super(Join, self).Activated(name="Join") if not self.ui: return if not Gui.Selection.getSelection(): diff --git a/src/Mod/Draft/draftguitools/gui_labels.py b/src/Mod/Draft/draftguitools/gui_labels.py index 0e6145a71c..3c9aa1c088 100644 --- a/src/Mod/Draft/draftguitools/gui_labels.py +++ b/src/Mod/Draft/draftguitools/gui_labels.py @@ -66,14 +66,13 @@ class Label(gui_base_original.Creator): def Activated(self): """Execute when the command is called.""" - self.name = translate("draft", "Label") - super(Label, self).Activated(self.name, noplanesetup=True) + super(Label, self).Activated(name="Label", noplanesetup=True) self.ghost = None self.labeltype = utils.getParam("labeltype", "Custom") self.sel = Gui.Selection.getSelectionEx() if self.sel: self.sel = self.sel[0] - self.ui.labelUi(self.name, callback=self.setmode) + self.ui.labelUi(title=translate("draft",self.featureName), callback=self.setmode) self.ui.xValue.setFocus() self.ui.xValue.selectAll() self.ghost = trackers.lineTracker() diff --git a/src/Mod/Draft/draftguitools/gui_lines.py b/src/Mod/Draft/draftguitools/gui_lines.py index d2c1a8e368..a870f2e8db 100644 --- a/src/Mod/Draft/draftguitools/gui_lines.py +++ b/src/Mod/Draft/draftguitools/gui_lines.py @@ -64,7 +64,7 @@ class Line(gui_base_original.Creator): 'MenuText': QT_TRANSLATE_NOOP("Draft_Line", "Line"), 'ToolTip': QT_TRANSLATE_NOOP("Draft_Line", "Creates a 2-point line. CTRL to snap, SHIFT to constrain.")} - def Activated(self, name=translate("draft", "Line"), icon="Draft_Line"): + def Activated(self, name="Line", icon="Draft_Line"): """Execute when the command is called.""" super(Line, self).Activated(name) @@ -73,9 +73,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(title=name, icon=icon) + self.ui.wireUi(title=translate("draft", self.featureName), icon=icon) else: - self.ui.lineUi(title=name, icon=icon) + self.ui.lineUi(title=translate("draft", self.featureName), icon=icon) if sys.version_info.major < 3: if isinstance(self.featureName, unicode): self.featureName = self.featureName.encode("utf8") @@ -359,7 +359,7 @@ 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="Polyline", icon="Draft_Wire") diff --git a/src/Mod/Draft/draftguitools/gui_mirror.py b/src/Mod/Draft/draftguitools/gui_mirror.py index 01e7d3f581..b3e08be4df 100644 --- a/src/Mod/Draft/draftguitools/gui_mirror.py +++ b/src/Mod/Draft/draftguitools/gui_mirror.py @@ -65,8 +65,7 @@ class Mirror(gui_base_original.Modifier): def Activated(self): """Execute when the command is called.""" - self.name = translate("draft", "Mirror") - super(Mirror, self).Activated(name=self.name) + super(Mirror, self).Activated(name="Mirror") self.ghost = None if self.ui: if not Gui.Selection.getSelection(): @@ -84,7 +83,7 @@ class Mirror(gui_base_original.Modifier): self.view.removeEventCallback("SoEvent", self.call) self.sel = Gui.Selection.getSelection() - self.ui.pointUi(title=self.name, icon="Draft_Mirror") + self.ui.pointUi(title=translate("draft", self.featureName), icon="Draft_Mirror") self.ui.modUi() self.ui.xValue.setFocus() self.ui.xValue.selectAll() diff --git a/src/Mod/Draft/draftguitools/gui_move.py b/src/Mod/Draft/draftguitools/gui_move.py index d12f32278f..1fa92cfc7b 100644 --- a/src/Mod/Draft/draftguitools/gui_move.py +++ b/src/Mod/Draft/draftguitools/gui_move.py @@ -65,8 +65,7 @@ class Move(gui_base_original.Modifier): def Activated(self): """Execute when the command is called.""" - self.name = translate("draft", "Move") - super(Move, self).Activated(self.name, + super(Move, self).Activated(name="Move", is_subtool=isinstance(App.activeDraftCommand, SubelementHighlight)) if not self.ui: @@ -94,7 +93,7 @@ class Move(gui_base_original.Modifier): spaces=True, noarchchild=True) self.selected_subelements = Gui.Selection.getSelectionEx() - self.ui.lineUi(self.name, icon="Draft_Move") + self.ui.lineUi(title=translate("draft", self.featureName), icon="Draft_Move") self.ui.modUi() if self.copymode: self.ui.isCopy.setChecked(True) diff --git a/src/Mod/Draft/draftguitools/gui_offset.py b/src/Mod/Draft/draftguitools/gui_offset.py index 50f8c928f4..6d1158d233 100644 --- a/src/Mod/Draft/draftguitools/gui_offset.py +++ b/src/Mod/Draft/draftguitools/gui_offset.py @@ -66,7 +66,7 @@ class Offset(gui_base_original.Modifier): def Activated(self): """Execute when the command is called.""" self.running = False - super(Offset, self).Activated(name=translate("draft","Offset")) + super(Offset, self).Activated(name="Offset") self.ghost = None self.linetrack = None self.arctrack = None diff --git a/src/Mod/Draft/draftguitools/gui_patharray.py b/src/Mod/Draft/draftguitools/gui_patharray.py index 3c061832ef..858cc98142 100644 --- a/src/Mod/Draft/draftguitools/gui_patharray.py +++ b/src/Mod/Draft/draftguitools/gui_patharray.py @@ -73,7 +73,7 @@ class PathArray(gui_base_original.Modifier): 'MenuText': QT_TRANSLATE_NOOP("Draft_PathArray", "Path array"), 'ToolTip': QT_TRANSLATE_NOOP("Draft_PathArray", "Creates copies of the selected object along a selected path.\nFirst select the object, and then select the path.\nThe path can be a polyline, B-spline, Bezier curve, or even edges from other objects.")} - def Activated(self, name=translate("draft","Path array")): + def Activated(self, name="Path array"): """Execute when the command is called.""" super(PathArray, self).Activated(name=name) self.name = name @@ -165,7 +165,7 @@ class PathLinkArray(PathArray): def Activated(self): """Execute when the command is called.""" - super(PathLinkArray, self).Activated(name=translate("draft","Path link array")) + super(PathLinkArray, self).Activated(name="Path link array") Gui.addCommand('Draft_PathLinkArray', PathLinkArray()) diff --git a/src/Mod/Draft/draftguitools/gui_pathtwistedarray.py b/src/Mod/Draft/draftguitools/gui_pathtwistedarray.py index 27d0943a7b..76555cd6b0 100644 --- a/src/Mod/Draft/draftguitools/gui_pathtwistedarray.py +++ b/src/Mod/Draft/draftguitools/gui_pathtwistedarray.py @@ -66,7 +66,7 @@ class PathTwistedArray(gui_base_original.Modifier): 'MenuText': QT_TRANSLATE_NOOP("Draft_PathTwistedArray", "Path twisted array"), 'ToolTip': QT_TRANSLATE_NOOP("Draft_PathTwistedArray", "Creates copies of the selected object along a selected path, and twists the copies.\nFirst select the object, and then select the path.\nThe path can be a polyline, B-spline, Bezier curve, or even edges from other objects.")} - def Activated(self, name=translate("draft","Path twisted array")): + def Activated(self, name="Path twisted array"): """Execute when the command is called.""" super(PathTwistedArray, self).Activated(name=name) self.name = name @@ -124,7 +124,7 @@ class PathTwistedLinkArray(PathTwistedArray): def Activated(self): """Execute when the command is called.""" super(PathTwistedLinkArray, - self).Activated(name=translate("draft","Path twisted link array")) + self).Activated(name="Path twisted link array") Gui.addCommand('Draft_PathTwistedLinkArray', PathTwistedLinkArray()) diff --git a/src/Mod/Draft/draftguitools/gui_pointarray.py b/src/Mod/Draft/draftguitools/gui_pointarray.py index c6488f623c..bb47f0b4c0 100644 --- a/src/Mod/Draft/draftguitools/gui_pointarray.py +++ b/src/Mod/Draft/draftguitools/gui_pointarray.py @@ -78,8 +78,7 @@ class PointArray(gui_base_original.Modifier): def Activated(self, name="Point array"): """Execute when the command is called.""" - self.name = name - super(PointArray, self).Activated(name=translate("draft","Point array")) + super(PointArray, self).Activated(name=name) # This was deactivated because it doesn't work correctly; # the selection needs to be made on two objects, but currently # it only selects one. diff --git a/src/Mod/Draft/draftguitools/gui_points.py b/src/Mod/Draft/draftguitools/gui_points.py index 6fbfb92b33..bb9ee3cf61 100644 --- a/src/Mod/Draft/draftguitools/gui_points.py +++ b/src/Mod/Draft/draftguitools/gui_points.py @@ -64,7 +64,7 @@ class Point(gui_base_original.Creator): def Activated(self): """Execute when the command is called.""" - super(Point, self).Activated(name=translate("draft","Point")) + super(Point, self).Activated(name="Point") self.view = gui_utils.get3DView() self.stack = [] rot = self.view.getCameraNode().getField("orientation").getValue() @@ -74,7 +74,7 @@ class Point(gui_base_original.Creator): upv) self.point = None if self.ui: - self.ui.pointUi(icon="Draft_Point") + self.ui.pointUi(title=translate("draft", self.featureName), icon="Draft_Point") self.ui.continueCmd.show() # adding 2 callback functions self.callbackClick = self.view.addEventCallbackPivy(coin.SoMouseButtonEvent.getClassTypeId(), self.click) diff --git a/src/Mod/Draft/draftguitools/gui_polygons.py b/src/Mod/Draft/draftguitools/gui_polygons.py index 769f1d7c5a..20589b88a6 100644 --- a/src/Mod/Draft/draftguitools/gui_polygons.py +++ b/src/Mod/Draft/draftguitools/gui_polygons.py @@ -59,15 +59,14 @@ class Polygon(gui_base_original.Creator): def Activated(self): """Execute when the command is called.""" - name = translate("draft", "Polygon") - super(Polygon, self).Activated(name) + super(Polygon, self).Activated(name="Polygon") if self.ui: self.step = 0 self.center = None self.rad = None self.tangents = [] self.tanpoints = [] - self.ui.pointUi(title=name, icon="Draft_Polygon") + self.ui.pointUi(title=translate("draft", self.featureName), icon="Draft_Polygon") self.ui.extUi() self.ui.numFaces.show() self.ui.numFacesLabel.show() diff --git a/src/Mod/Draft/draftguitools/gui_rectangles.py b/src/Mod/Draft/draftguitools/gui_rectangles.py index 4346704a38..9831700112 100644 --- a/src/Mod/Draft/draftguitools/gui_rectangles.py +++ b/src/Mod/Draft/draftguitools/gui_rectangles.py @@ -56,11 +56,10 @@ class Rectangle(gui_base_original.Creator): def Activated(self): """Execute when the command is called.""" - name = translate("draft", "Rectangle") - super(Rectangle, self).Activated(name) + super(Rectangle, self).Activated(name="Rectangle") if self.ui: self.refpoint = None - self.ui.pointUi(title=name, icon="Draft_Rectangle") + self.ui.pointUi(title=translate("draft", self.featureName), icon="Draft_Rectangle") self.ui.extUi() if utils.getParam("UsePartPrimitives", False): self.fillstate = self.ui.hasFill.isChecked() diff --git a/src/Mod/Draft/draftguitools/gui_rotate.py b/src/Mod/Draft/draftguitools/gui_rotate.py index bc71deb783..e091aabe5f 100644 --- a/src/Mod/Draft/draftguitools/gui_rotate.py +++ b/src/Mod/Draft/draftguitools/gui_rotate.py @@ -64,7 +64,7 @@ class Rotate(gui_base_original.Modifier): def Activated(self): """Execute when the command is called.""" - super(Rotate, self).Activated(name=translate("draft","Rotate")) + super(Rotate, self).Activated(name="Rotate") if not self.ui: return self.ghosts = [] diff --git a/src/Mod/Draft/draftguitools/gui_scale.py b/src/Mod/Draft/draftguitools/gui_scale.py index 30914c05b1..0df4043e05 100644 --- a/src/Mod/Draft/draftguitools/gui_scale.py +++ b/src/Mod/Draft/draftguitools/gui_scale.py @@ -73,8 +73,7 @@ class Scale(gui_base_original.Modifier): def Activated(self): """Execute when the command is called.""" - self.name = translate("draft", "Scale") - super(Scale, self).Activated(name=self.name) + super(Scale, self).Activated(name="Scale") if not self.ui: return self.ghosts = [] @@ -99,7 +98,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(title=self.name, icon="Draft_Scale") + self.ui.pointUi(title=translate("draft",self.featureName), icon="Draft_Scale") self.ui.modUi() self.ui.xValue.setFocus() self.ui.xValue.selectAll() diff --git a/src/Mod/Draft/draftguitools/gui_shape2dview.py b/src/Mod/Draft/draftguitools/gui_shape2dview.py index 52ea98e5bb..77a2f5c49f 100644 --- a/src/Mod/Draft/draftguitools/gui_shape2dview.py +++ b/src/Mod/Draft/draftguitools/gui_shape2dview.py @@ -61,7 +61,7 @@ class Shape2DView(gui_base_original.Modifier): def Activated(self): """Execute when the command is called.""" - super(Shape2DView, self).Activated(name=translate("draft","Project 2D view")) + super(Shape2DView, self).Activated(name="Project 2D view") if not Gui.Selection.getSelection(): if self.ui: self.ui.selectUi() diff --git a/src/Mod/Draft/draftguitools/gui_shapestrings.py b/src/Mod/Draft/draftguitools/gui_shapestrings.py index 7355bb4459..c8ff4528be 100644 --- a/src/Mod/Draft/draftguitools/gui_shapestrings.py +++ b/src/Mod/Draft/draftguitools/gui_shapestrings.py @@ -71,8 +71,7 @@ class ShapeString(gui_base_original.Creator): def Activated(self): """Execute when the command is called.""" - name = translate("draft", "ShapeString") - super(ShapeString, self).Activated(name) + super(ShapeString, self).Activated(name="ShapeString") self.creator = gui_base_original.Creator if self.ui: self.ui.sourceCmd = self @@ -91,7 +90,8 @@ class ShapeString(gui_base_original.Creator): self.dialog = None self.text = '' self.ui.sourceCmd = self - self.ui.pointUi(title=name, icon="Draft_ShapeString") + self.ui.pointUi(title=translate("draft",self.featureName), + icon="Draft_ShapeString") self.active = True self.call = self.view.addEventCallback("SoEvent", self.action) self.ssBase = None diff --git a/src/Mod/Draft/draftguitools/gui_splines.py b/src/Mod/Draft/draftguitools/gui_splines.py index 59dd8d15d2..51b9a3d235 100644 --- a/src/Mod/Draft/draftguitools/gui_splines.py +++ b/src/Mod/Draft/draftguitools/gui_splines.py @@ -65,7 +65,7 @@ class BSpline(gui_lines.Line): Activate the specific BSpline tracker. """ - super(BSpline, self).Activated(name=translate("draft", "B-spline"), icon="Draft_BSpline") + super(BSpline, self).Activated(name="Bspline", icon="Draft_BSpline") if self.doc: self.bsplinetrack = trackers.bsplineTracker() diff --git a/src/Mod/Draft/draftguitools/gui_split.py b/src/Mod/Draft/draftguitools/gui_split.py index 09e3f35f52..0e29bdc605 100644 --- a/src/Mod/Draft/draftguitools/gui_split.py +++ b/src/Mod/Draft/draftguitools/gui_split.py @@ -58,7 +58,7 @@ class Split(gui_base_original.Modifier): def Activated(self): """Execute when the command is called.""" - super(Split, self).Activated(name=translate("draft","Split")) + super(Split, self).Activated(name="Split") if not self.ui: return _msg(translate("draft", "Click anywhere on a line to split it.")) diff --git a/src/Mod/Draft/draftguitools/gui_stretch.py b/src/Mod/Draft/draftguitools/gui_stretch.py index 4ea78d2982..ac5872309c 100644 --- a/src/Mod/Draft/draftguitools/gui_stretch.py +++ b/src/Mod/Draft/draftguitools/gui_stretch.py @@ -66,7 +66,7 @@ class Stretch(gui_base_original.Modifier): def Activated(self): """Execute when the command is called.""" - super(Stretch, self).Activated(name=translate("draft","Stretch")) + super(Stretch, self).Activated(name="Stretch") if self.ui: if not Gui.Selection.getSelection(): self.ui.selectUi() @@ -111,7 +111,7 @@ class Stretch(gui_base_original.Modifier): if self.ui and self.sel: self.step = 1 self.refpoint = None - self.ui.pointUi(title="Stretch", icon="Draft_Stretch") + self.ui.pointUi(title=translate("draft", self.featureName), icon="Draft_Stretch") self.ui.extUi() self.call = self.view.addEventCallback("SoEvent", self.action) self.rectracker = trackers.rectangleTracker(dotted=True, diff --git a/src/Mod/Draft/draftguitools/gui_styles.py b/src/Mod/Draft/draftguitools/gui_styles.py index 0c54884014..0636cd01f8 100644 --- a/src/Mod/Draft/draftguitools/gui_styles.py +++ b/src/Mod/Draft/draftguitools/gui_styles.py @@ -52,7 +52,7 @@ class ApplyStyle(gui_base_original.Modifier): Activate the specific BSpline tracker. """ - super(ApplyStyle, self).Activated(name=translate("draft","Apply style")) + super(ApplyStyle, self).Activated(name="Apply style") if self.ui: self.sel = Gui.Selection.getSelection() if len(self.sel) > 0: diff --git a/src/Mod/Draft/draftguitools/gui_subelements.py b/src/Mod/Draft/draftguitools/gui_subelements.py index 785fa929f7..d1a32f3d5d 100644 --- a/src/Mod/Draft/draftguitools/gui_subelements.py +++ b/src/Mod/Draft/draftguitools/gui_subelements.py @@ -66,7 +66,7 @@ class SubelementHighlight(gui_base_original.Modifier): if self.is_running: return self.finish() self.is_running = True - super(SubelementHighlight, self).Activated(name=translate("draft","Subelement highlight")) + super(SubelementHighlight, self).Activated(name="Subelement highlight") self.get_selection() def proceed(self): diff --git a/src/Mod/Draft/draftguitools/gui_texts.py b/src/Mod/Draft/draftguitools/gui_texts.py index 32523e04c8..06ec46c812 100644 --- a/src/Mod/Draft/draftguitools/gui_texts.py +++ b/src/Mod/Draft/draftguitools/gui_texts.py @@ -62,13 +62,12 @@ class Text(gui_base_original.Creator): def Activated(self): """Execute when the command is called.""" - name = translate("draft", "Text") - super(Text, self).Activated(name) + super(Text, self).Activated(name="Text") if self.ui: self.dialog = None self.text = '' self.ui.sourceCmd = self - self.ui.pointUi(name) + self.ui.pointUi(title=translate("draft", self.featureName), icon="Draft_Text") self.call = self.view.addEventCallback("SoEvent", self.action) self.active = True self.ui.xValue.setFocus() diff --git a/src/Mod/Draft/draftguitools/gui_trimex.py b/src/Mod/Draft/draftguitools/gui_trimex.py index 88546b0716..07d3ff1a92 100644 --- a/src/Mod/Draft/draftguitools/gui_trimex.py +++ b/src/Mod/Draft/draftguitools/gui_trimex.py @@ -78,7 +78,7 @@ class Trimex(gui_base_original.Modifier): def Activated(self): """Execute when the command is called.""" - super(Trimex, self).Activated(name=translate("draft","Trimex")) + super(Trimex, self).Activated(name="Trimex") self.edges = [] self.placement = None self.ghost = [] @@ -105,7 +105,7 @@ class Trimex(gui_base_original.Modifier): self.finish() return self.obj = sel[0] - self.ui.trimUi() + self.ui.trimUi(title=translate("draft",self.featureName)) self.linetrack = trackers.lineTracker() import DraftGeomUtils diff --git a/src/Mod/Draft/draftguitools/gui_upgrade.py b/src/Mod/Draft/draftguitools/gui_upgrade.py index fbab4fa431..d4ecbc267f 100644 --- a/src/Mod/Draft/draftguitools/gui_upgrade.py +++ b/src/Mod/Draft/draftguitools/gui_upgrade.py @@ -60,7 +60,7 @@ class Upgrade(gui_base_original.Modifier): def Activated(self): """Execute when the command is called.""" - super(Upgrade, self).Activated(name=translate("draft","Upgrade")) + super(Upgrade, self).Activated(name="Upgrade") if self.ui: if not Gui.Selection.getSelection(): self.ui.selectUi() diff --git a/src/Mod/Draft/draftguitools/gui_wire2spline.py b/src/Mod/Draft/draftguitools/gui_wire2spline.py index f4d8c234ee..2c77f246c3 100644 --- a/src/Mod/Draft/draftguitools/gui_wire2spline.py +++ b/src/Mod/Draft/draftguitools/gui_wire2spline.py @@ -77,7 +77,7 @@ class WireToBSpline(gui_base_original.Modifier): selection = Gui.Selection.getSelection() if selection: if utils.getType(selection[0]) in ['Wire', 'BSpline']: - super(WireToBSpline, self).Activated(name=translate("draft","Convert polyline/B-spline")) + super(WireToBSpline, self).Activated(name="Convert polyline/B-spline") if self.doc: self.obj = Gui.Selection.getSelection() if self.obj: