From 997b8eff5c43b1d36f36c037336bf9915d8a7377 Mon Sep 17 00:00:00 2001 From: Chris Hennes Date: Thu, 17 Aug 2023 09:01:15 -0500 Subject: [PATCH] Draft: Translate task titles for draft tools (#10227) --- src/Mod/Draft/draftguitools/gui_beziers.py | 6 ++++-- src/Mod/Draft/draftguitools/gui_ellipses.py | 2 +- src/Mod/Draft/draftguitools/gui_fillets.py | 2 +- src/Mod/Draft/draftguitools/gui_lines.py | 14 +++++++++----- src/Mod/Draft/draftguitools/gui_polygons.py | 2 +- src/Mod/Draft/draftguitools/gui_rectangles.py | 2 +- src/Mod/Draft/draftguitools/gui_splines.py | 2 +- 7 files changed, 18 insertions(+), 12 deletions(-) diff --git a/src/Mod/Draft/draftguitools/gui_beziers.py b/src/Mod/Draft/draftguitools/gui_beziers.py index 2cef26cdb3..c55f9e399c 100644 --- a/src/Mod/Draft/draftguitools/gui_beziers.py +++ b/src/Mod/Draft/draftguitools/gui_beziers.py @@ -71,7 +71,8 @@ class BezCurve(gui_lines.Line): Activate the specific Bézier curve tracker. """ super(BezCurve, self).Activated(name="BezCurve", - icon="Draft_BezCurve") + icon="Draft_BezCurve", + task_title=translate("draft","Bézier curve")) if self.doc: self.bezcurvetrack = trackers.bezcurveTracker() @@ -261,7 +262,8 @@ class CubicBezCurve(gui_lines.Line): param.SetBool("EnableSelection", False) super(CubicBezCurve, self).Activated(name="CubicBezCurve", - icon="Draft_CubicBezCurve") + icon="Draft_CubicBezCurve", + task_title=translate("draft","Cubic Bézier curve")) if self.doc: self.bezcurvetrack = trackers.bezcurveTracker() diff --git a/src/Mod/Draft/draftguitools/gui_ellipses.py b/src/Mod/Draft/draftguitools/gui_ellipses.py index 9411703294..0f96d40ccd 100644 --- a/src/Mod/Draft/draftguitools/gui_ellipses.py +++ b/src/Mod/Draft/draftguitools/gui_ellipses.py @@ -64,7 +64,7 @@ class Ellipse(gui_base_original.Creator): super(Ellipse, self).Activated(name="Ellipse") if self.ui: self.refpoint = None - self.ui.pointUi(title=translate("draft", self.featureName), icon="Draft_Ellipse") + self.ui.pointUi(title=translate("draft", "Ellipse"), 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_fillets.py b/src/Mod/Draft/draftguitools/gui_fillets.py index 32f2a0f70a..4b236e961c 100644 --- a/src/Mod/Draft/draftguitools/gui_fillets.py +++ b/src/Mod/Draft/draftguitools/gui_fillets.py @@ -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=translate("Draft", self.featureName), icon="Draft_Fillet") + self.ui.taskUi(title=translate("Draft", "Fillet"), icon="Draft_Fillet") self.ui.radiusUi() self.ui.sourceCmd = self self.ui.labelRadius.setText(label) diff --git a/src/Mod/Draft/draftguitools/gui_lines.py b/src/Mod/Draft/draftguitools/gui_lines.py index 274ccfe3b3..e0584c2c16 100644 --- a/src/Mod/Draft/draftguitools/gui_lines.py +++ b/src/Mod/Draft/draftguitools/gui_lines.py @@ -63,18 +63,21 @@ 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="Line", icon="Draft_Line"): + def Activated(self, name=QT_TRANSLATE_NOOP("draft","Line"), icon="Draft_Line", task_title=None): """Execute when the command is called.""" super(Line, self).Activated(name) - + if task_title is None: + title = translate("draft", name) + else: + title = task_title if not self.doc: return self.obj = None # stores the temp shape self.oldWP = None # stores the WP if we modify it if self.isWire: - self.ui.wireUi(title=translate("draft", self.featureName), icon=icon) + self.ui.wireUi(title=title, icon=icon) else: - self.ui.lineUi(title=translate("draft", self.featureName), icon=icon) + self.ui.lineUi(title=title, icon=icon) self.obj = self.doc.addObject("Part::Feature", self.featureName) gui_utils.format_object(self.obj) @@ -360,7 +363,8 @@ class Wire(Line): # 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="Polyline", - icon="Draft_Wire") + icon="Draft_Wire", + task_title=translate("draft","Polyline")) Gui.addCommand('Draft_Wire', Wire()) diff --git a/src/Mod/Draft/draftguitools/gui_polygons.py b/src/Mod/Draft/draftguitools/gui_polygons.py index 26e08c85b1..1757e6c633 100644 --- a/src/Mod/Draft/draftguitools/gui_polygons.py +++ b/src/Mod/Draft/draftguitools/gui_polygons.py @@ -66,7 +66,7 @@ class Polygon(gui_base_original.Creator): self.rad = None self.tangents = [] self.tanpoints = [] - self.ui.pointUi(title=translate("draft", self.featureName), icon="Draft_Polygon") + self.ui.pointUi(title=translate("draft", "Polygon"), icon="Draft_Polygon") self.ui.extUi() self.ui.isRelative.hide() self.ui.numFaces.show() diff --git a/src/Mod/Draft/draftguitools/gui_rectangles.py b/src/Mod/Draft/draftguitools/gui_rectangles.py index 39797030fc..227b2bde4d 100644 --- a/src/Mod/Draft/draftguitools/gui_rectangles.py +++ b/src/Mod/Draft/draftguitools/gui_rectangles.py @@ -59,7 +59,7 @@ class Rectangle(gui_base_original.Creator): super(Rectangle, self).Activated(name="Rectangle") if self.ui: self.refpoint = None - self.ui.pointUi(title=translate("draft", self.featureName), icon="Draft_Rectangle") + self.ui.pointUi(title=translate("draft", "Rectangle"), 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_splines.py b/src/Mod/Draft/draftguitools/gui_splines.py index 87e0a754d4..ab0dc36fd7 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="Bspline", icon="Draft_BSpline") + super(BSpline, self).Activated(name="Bspline", icon="Draft_BSpline", task_title=translate("draft","B-Spline")) if self.doc: self.bsplinetrack = trackers.bsplineTracker()