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

Draft: Update UI strings for consistency (#22331)

Browse Source 
* Draft: Update UI strings for consistency

* Apply suggestions from code review

* Apply suggestions from code review

Co-authored-by: Ryan K <114723629+ryankembrey@users.noreply.github.com>

* Apply suggestions from code review

Co-authored-by: Ryan K <114723629+ryankembrey@users.noreply.github.com>

* Apply suggestions from code review

* Apply suggestions from code review

* Apply suggestions from code review

Co-authored-by: Roy-043 <70520633+Roy-043@users.noreply.github.com>

* Apply suggestions from code review

* Apply suggestions from code review

Co-authored-by: Roy-043 <70520633+Roy-043@users.noreply.github.com>

* Apply suggestions from code review

Co-authored-by: Roy-043 <70520633+Roy-043@users.noreply.github.com>

* Apply suggestions from code review

---------

Co-authored-by: Ryan K <114723629+ryankembrey@users.noreply.github.com>
Co-authored-by: Roy-043 <70520633+Roy-043@users.noreply.github.com>
This commit is contained in:
Max Wilfinger
2025-08-06 23:02:16 +02:00
committed by GitHub
parent f1032b47d4
commit a9cd5a4982
89 changed files with 415 additions and 420 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/Mod/Draft/drafttaskpanels/task_circulararray.py
View File

@@ -80,7 +80,7 @@ class TaskPanelCircularArray:
def __init__(self):
self.form = Gui.PySideUic.loadUi(":/ui/TaskPanel_CircularArray.ui")
self.form.setWindowTitle(translate("draft", "Circular array"))
self.form.setWindowTitle(translate("draft", "Circular Array"))
self.form.setWindowIcon(QtGui.QIcon(":/icons/Draft_CircularArray.svg"))
# -------------------------------------------------------------------
@@ -172,18 +172,18 @@ class TaskPanelCircularArray:
the interface may not allow one to input wrong data.
"""
if not selection:
_err(translate("draft","At least one element must be selected."))
_err(translate("draft","At least 1 element must be selected"))
return False
if number < 2:
_err(translate("draft","Number of layers must be at least 2."))
_err(translate("draft","Number of layers must be at least 2"))
return False
# TODO: this should handle multiple objects.
# Each of the elements of the selection should be tested.
obj = selection[0]
if obj.isDerivedFrom("App::FeaturePython"):
_err(translate("draft","Selection is not suitable for array."))
_err(translate("draft","Selection is not suitable for array"))
_err(translate("draft","Object:") + " {}".format(selection[0].Label))
return False
@@ -194,7 +194,7 @@ class TaskPanelCircularArray:
self.r_distance = abs(r_distance)
if tan_distance == 0:
_err(translate("draft","Tangential distance cannot be zero."))
_err(translate("draft","Tangential distance cannot be 0"))
return False
elif tan_distance < 0:
_wrn(translate("draft","Tangential distance is negative. It is made positive to proceed."))
@@ -254,7 +254,7 @@ class TaskPanelCircularArray:
"App.ActiveDocument.recompute()"]
# We commit the command list through the parent command
self.source_command.commit(translate("draft","Circular array"), _cmd_list)
self.source_command.commit(translate("draft","Create Circular Array"), _cmd_list)
def get_distances(self):
"""Get the distance parameters from the widgets."""

18
src/Mod/Draft/drafttaskpanels/task_orthoarray.py
View File

@@ -80,7 +80,7 @@ class TaskPanelOrthoArray:
def __init__(self):
self.form = Gui.PySideUic.loadUi(":/ui/TaskPanel_OrthoArray.ui")
self.form.setWindowTitle(translate("draft", "Orthogonal array"))
self.form.setWindowTitle(translate("draft", "Orthogonal Array"))
self.form.setWindowIcon(QtGui.QIcon(":/icons/Draft_Array.svg"))
# -------------------------------------------------------------------
@@ -211,18 +211,18 @@ class TaskPanelOrthoArray:
the interface may not allow one to input wrong data.
"""
if not selection:
_err(translate("draft","At least one element must be selected."))
_err(translate("draft","At least 1 element must be selected"))
return False
if n_x < 1 or n_y < 1 or n_z < 1:
_err(translate("draft","Number of elements must be at least 1."))
_err(translate("draft","Number of elements must be at least 1"))
return False
# TODO: this should handle multiple objects.
# Each of the elements of the selection should be tested.
obj = selection[0]
if obj.isDerivedFrom("App::FeaturePython"):
_err(translate("draft","Selection is not suitable for array."))
_err(translate("draft","Selection is not suitable for array"))
_err(translate("draft","Object:") + " {0} ({1})".format(obj.Label, obj.TypeId))
return False
@@ -231,7 +231,7 @@ class TaskPanelOrthoArray:
if not (self.form.radiobutton_x_axis.isChecked() or
self.form.radiobutton_y_axis.isChecked() or
self.form.radiobutton_z_axis.isChecked()):
_err(translate("draft","In Linear mode, at least one axis must be selected."))
_err(translate("draft","In linear mode, at least 1 axis must be selected"))
return False
# The other arguments are not tested but they should be present.
@@ -301,7 +301,7 @@ class TaskPanelOrthoArray:
"App.ActiveDocument.recompute()"]
# We commit the command list through the parent command
self.source_command.commit(translate("draft","Orthogonal array"), _cmd_list)
self.source_command.commit(translate("draft","Create Orthogonal Array"), _cmd_list)
def get_numbers(self):
"""Get the number of elements from the widgets."""
@@ -377,7 +377,7 @@ class TaskPanelOrthoArray:
state = self.tr_true
else:
state = self.tr_false
_msg(translate("draft","Create Link array:") + " {}".format(state))
_msg(translate("draft","Create link array:") + " {}".format(state))
def set_link(self):
"""Execute as a callback when the link checkbox changes."""
@@ -424,7 +424,7 @@ class TaskPanelOrthoArray:
params.set_param("LinearModeOn" , self.linear_mode, "Mod/Draft/OrthoArrayLinearMode")
if self.linear_mode:
self.form.button_linear_mode.setText(translate("draft", "Switch to ortho mode"))
self.form.button_linear_mode.setText(translate("draft", "Switch to Ortho Mode"))
# check radiobutton based on current cfg
self.update_axis_ui()
@@ -440,7 +440,7 @@ class TaskPanelOrthoArray:
self.form.group_linearmode.show()
self.form.group_linearmode.setTitle(f"{self.active_axis} Axis")
else: # ortho mode
self.form.button_linear_mode.setText(translate("draft", "Switch to linear mode"))
self.form.button_linear_mode.setText(translate("draft", "Switch to Linear Mode"))
# For ortho mode we're showing back default groupboxes and we reparent everything
# back to them, as we reuse spinboxes in both modes

12
src/Mod/Draft/drafttaskpanels/task_polararray.py
View File

@@ -80,7 +80,7 @@ class TaskPanelPolarArray:
def __init__(self):
self.form = Gui.PySideUic.loadUi(":/ui/TaskPanel_PolarArray.ui")
self.form.setWindowTitle(translate("draft", "Polar array"))
self.form.setWindowTitle(translate("draft", "Polar Array"))
self.form.setWindowIcon(QtGui.QIcon(":/icons/Draft_PolarArray.svg"))
# -------------------------------------------------------------------
@@ -157,19 +157,19 @@ class TaskPanelPolarArray:
the interface may not allow one to input wrong data.
"""
if not selection:
_err(translate("draft","At least one element must be selected."))
_err(translate("draft","At least 1 element must be selected"))
return False
# TODO: this should handle multiple objects.
# Each of the elements of the selection should be tested.
obj = selection[0]
if obj.isDerivedFrom("App::FeaturePython"):
_err(translate("draft","Selection is not suitable for array."))
_err(translate("draft","Selection is not suitable for array"))
_err(translate("draft","Object:") + " {}".format(selection[0].Label))
return False
if number < 2:
_err(translate("draft","Number of elements must be at least 2."))
_err(translate("draft","Number of elements must be at least 2"))
return False
if angle > 360:
@@ -228,7 +228,7 @@ class TaskPanelPolarArray:
"App.ActiveDocument.recompute()"]
# We commit the command list through the parent command
self.source_command.commit(translate("draft","Polar array"), _cmd_list)
self.source_command.commit(translate("draft","Create Polar Array"), _cmd_list)
def get_number_angle(self):
"""Get the number and angle parameters from the widgets."""
@@ -275,7 +275,7 @@ class TaskPanelPolarArray:
state = self.tr_true
else:
state = self.tr_false
_msg(translate("draft","Create Link array:") + " {}".format(state))
_msg(translate("draft","Create link array:") + " {}".format(state))
def set_link(self):
"""Execute as a callback when the link checkbox changes."""

10
src/Mod/Draft/drafttaskpanels/task_scale.py
View File

@@ -51,7 +51,7 @@ class ScaleTaskPanel:
self.form.setWindowIcon(QtGui.QIcon(":/icons/Draft_Scale.svg"))
layout = QtWidgets.QGridLayout(self.form)
self.xLabel = QtWidgets.QLabel()
self.xLabel.setText(translate("Draft", "X factor"))
self.xLabel.setText(translate("Draft", "X-factor"))
layout.addWidget(self.xLabel, 0, 0, 1, 1)
self.xValue = QtWidgets.QDoubleSpinBox()
self.xValue.setRange(-1000000.0, 1000000.0)
@@ -59,7 +59,7 @@ class ScaleTaskPanel:
self.xValue.setValue(1)
layout.addWidget(self.xValue,0,1,1,1)
self.yLabel = QtWidgets.QLabel()
self.yLabel.setText(translate("Draft", "Y factor"))
self.yLabel.setText(translate("Draft", "Y-factor"))
layout.addWidget(self.yLabel,1,0,1,1)
self.yValue = QtWidgets.QDoubleSpinBox()
self.yValue.setRange(-1000000.0, 1000000.0)
@@ -67,7 +67,7 @@ class ScaleTaskPanel:
self.yValue.setValue(1)
layout.addWidget(self.yValue,1,1,1,1)
self.zLabel = QtWidgets.QLabel()
self.zLabel.setText(translate("Draft", "Z factor"))
self.zLabel.setText(translate("Draft", "Z-factor"))
layout.addWidget(self.zLabel,2,0,1,1)
self.zValue = QtWidgets.QDoubleSpinBox()
self.zValue.setRange(-1000000.0, 1000000.0)
@@ -102,7 +102,7 @@ class ScaleTaskPanel:
self.isClone.setChecked(params.get_param("ScaleClone"))
layout.addWidget(self.isClone,7,0,1,2)
self.pickrefButton = QtWidgets.QPushButton()
self.pickrefButton.setText(translate("Draft", "Pick from/to points"))
self.pickrefButton.setText(translate("Draft", "Pick From/To Points"))
layout.addWidget(self.pickrefButton,8,0,1,2)
QtCore.QObject.connect(self.relative,QtCore.SIGNAL("toggled(bool)"),self.setRelative)
@@ -192,7 +192,7 @@ class ScaleTaskPanelEdit(ScaleTaskPanel):
self.selection = Gui.Selection.getSelectionEx("", 0)
self.obj = obj
self.obj_x, self.obj_y, self.obj_z = self.obj.Scale
self.form.setWindowTitle(translate("Draft", "Edit scale"))
self.form.setWindowTitle(translate("Draft", "Edit Scale"))
self.form.setWindowIcon(QtGui.QIcon(":/icons/Draft_Clone.svg"))
self.xValue.setValue(self.obj_x)
self.yValue.setValue(self.obj_y)