giuliof
/
flatcam
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

- added formatting for some strings in the app strings, making the future translations easier

This commit is contained in:
Marius Stanciu 2019-09-02 13:24:04 +03:00
parent 7827cbfe6c
commit 4b7115ca59
8 changed files with 70 additions and 69 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
README.md
View File

@ -12,6 +12,7 @@ CAD program, and create G-Code for Isolation routing.
2.09.2019
- fixed issue in NCC Tool when using area option
- added formatting for some strings in the app strings, making the future translations easier
1.09.2019

34
flatcamEditors/FlatCAMExcEditor.py
View File

@ -1498,7 +1498,7 @@ class FlatCAMExcEditor(QtCore.QObject):
grid1 = QtWidgets.QGridLayout()
self.tools_box.addLayout(grid1)
addtool_entry_lbl = QtWidgets.QLabel(_('Tool Dia:'))
addtool_entry_lbl = QtWidgets.QLabel('%s:' % _('Tool Dia'))
addtool_entry_lbl.setToolTip(
_("Diameter for the new tool")
)
@ -1551,7 +1551,7 @@ class FlatCAMExcEditor(QtCore.QObject):
grid3 = QtWidgets.QGridLayout()
self.resize_box.addLayout(grid3)
res_entry_lbl = QtWidgets.QLabel(_('Resize Dia:'))
res_entry_lbl = QtWidgets.QLabel('%s:' % _('Resize Dia'))
res_entry_lbl.setToolTip(
_("Diameter to resize to.")
)
@ -1608,7 +1608,7 @@ class FlatCAMExcEditor(QtCore.QObject):
self.array_box.addLayout(self.array_form)
# Set the number of drill holes in the drill array
self.drill_array_size_label = QtWidgets.QLabel(_('Nr of drills:'))
self.drill_array_size_label = QtWidgets.QLabel('%s:' % _('Nr of drills'))
self.drill_array_size_label.setToolTip(_("Specify how many drills to be in the array."))
self.drill_array_size_label.setMinimumWidth(100)
@ -1626,7 +1626,7 @@ class FlatCAMExcEditor(QtCore.QObject):
self.linear_box.addLayout(self.linear_form)
# Linear Drill Array direction
self.drill_axis_label = QtWidgets.QLabel(_('Direction:'))
self.drill_axis_label = QtWidgets.QLabel('%s:'% _('Direction'))
self.drill_axis_label.setToolTip(
_("Direction on which the linear array is oriented:\n"
"- 'X' - horizontal axis \n"
@ -1641,7 +1641,7 @@ class FlatCAMExcEditor(QtCore.QObject):
self.linear_form.addRow(self.drill_axis_label, self.drill_axis_radio)
# Linear Drill Array pitch distance
self.drill_pitch_label = QtWidgets.QLabel(_('Pitch:'))
self.drill_pitch_label = QtWidgets.QLabel('%s:' % _('Pitch'))
self.drill_pitch_label.setToolTip(
_("Pitch = Distance between elements of the array.")
)
@ -1651,7 +1651,7 @@ class FlatCAMExcEditor(QtCore.QObject):
self.linear_form.addRow(self.drill_pitch_label, self.drill_pitch_entry)
# Linear Drill Array angle
self.linear_angle_label = QtWidgets.QLabel(_('Angle:'))
self.linear_angle_label = QtWidgets.QLabel('%s:' % _('Angle'))
self.linear_angle_label.setToolTip(
_("Angle at which the linear array is placed.\n"
"The precision is of max 2 decimals.\n"
@ -1673,7 +1673,7 @@ class FlatCAMExcEditor(QtCore.QObject):
self.circular_box.setContentsMargins(0, 0, 0, 0)
self.array_circular_frame.setLayout(self.circular_box)
self.drill_direction_label = QtWidgets.QLabel(_('Direction:'))
self.drill_direction_label = QtWidgets.QLabel('%s:' % _('Direction'))
self.drill_direction_label.setToolTip(_("Direction for circular array."
"Can be CW = clockwise or CCW = counter clockwise."))
self.drill_direction_label.setMinimumWidth(100)
@ -1685,7 +1685,7 @@ class FlatCAMExcEditor(QtCore.QObject):
{'label': _('CCW'), 'value': 'CCW'}])
self.circular_form.addRow(self.drill_direction_label, self.drill_direction_radio)
self.drill_angle_label = QtWidgets.QLabel(_('Angle:'))
self.drill_angle_label = QtWidgets.QLabel('%s:' % _('Angle'))
self.drill_angle_label.setToolTip(_("Angle at which each element in circular array is placed."))
self.drill_angle_label.setMinimumWidth(100)
@ -1727,7 +1727,7 @@ class FlatCAMExcEditor(QtCore.QObject):
self.slot_box.addLayout(self.slot_form)
# Slot length
self.slot_length_label = QtWidgets.QLabel(_('Length:'))
self.slot_length_label = QtWidgets.QLabel('%s:' % _('Length'))
self.slot_length_label.setToolTip(
_("Length = The length of the slot.")
)
@ -1737,7 +1737,7 @@ class FlatCAMExcEditor(QtCore.QObject):
self.slot_form.addRow(self.slot_length_label, self.slot_length_entry)
# Slot direction
self.slot_axis_label = QtWidgets.QLabel(_('Direction:'))
self.slot_axis_label = QtWidgets.QLabel('%s:' % _('Direction'))
self.slot_axis_label.setToolTip(
_("Direction on which the slot is oriented:\n"
"- 'X' - horizontal axis \n"
@ -1752,7 +1752,7 @@ class FlatCAMExcEditor(QtCore.QObject):
self.slot_form.addRow(self.slot_axis_label, self.slot_axis_radio)
# Slot custom angle
self.slot_angle_label = QtWidgets.QLabel(_('Angle:'))
self.slot_angle_label = QtWidgets.QLabel('%s:' % _('Angle'))
self.slot_angle_label.setToolTip(
_("Angle at which the slot is placed.\n"
"The precision is of max 2 decimals.\n"
@ -1810,7 +1810,7 @@ class FlatCAMExcEditor(QtCore.QObject):
self.slot_array_box.addLayout(self.slot_array_form)
# Set the number of slot holes in the slot array
self.slot_array_size_label = QtWidgets.QLabel(_('Nr of slots:'))
self.slot_array_size_label = QtWidgets.QLabel('%s:' % _('Nr of slots'))
self.slot_array_size_label.setToolTip(_("Specify how many slots to be in the array."))
self.slot_array_size_label.setMinimumWidth(100)
@ -1828,7 +1828,7 @@ class FlatCAMExcEditor(QtCore.QObject):
self.slot_array_linear_box.addLayout(self.slot_array_linear_form)
# Linear Slot Array direction
self.slot_array_axis_label = QtWidgets.QLabel(_('Direction:'))
self.slot_array_axis_label = QtWidgets.QLabel('%s:' % _('Direction'))
self.slot_array_axis_label.setToolTip(
_("Direction on which the linear array is oriented:\n"
"- 'X' - horizontal axis \n"
@ -1843,7 +1843,7 @@ class FlatCAMExcEditor(QtCore.QObject):
self.slot_array_linear_form.addRow(self.slot_array_axis_label, self.slot_array_axis_radio)
# Linear Slot Array pitch distance
self.slot_array_pitch_label = QtWidgets.QLabel(_('Pitch:'))
self.slot_array_pitch_label = QtWidgets.QLabel('%s:' % _('Pitch'))
self.slot_array_pitch_label.setToolTip(
_("Pitch = Distance between elements of the array.")
)
@ -1853,7 +1853,7 @@ class FlatCAMExcEditor(QtCore.QObject):
self.slot_array_linear_form.addRow(self.slot_array_pitch_label, self.slot_array_pitch_entry)
# Linear Slot Array angle
self.slot_array_linear_angle_label = QtWidgets.QLabel(_('Angle:'))
self.slot_array_linear_angle_label = QtWidgets.QLabel('%s:' % _('Angle'))
self.slot_array_linear_angle_label.setToolTip(
_("Angle at which the linear array is placed.\n"
"The precision is of max 2 decimals.\n"
@ -1875,7 +1875,7 @@ class FlatCAMExcEditor(QtCore.QObject):
self.slot_array_circular_box.setContentsMargins(0, 0, 0, 0)
self.slot_array_circular_frame.setLayout(self.slot_array_circular_box)
self.slot_array_direction_label = QtWidgets.QLabel(_('Direction:'))
self.slot_array_direction_label = QtWidgets.QLabel('%s:' % _('Direction'))
self.slot_array_direction_label.setToolTip(_("Direction for circular array."
"Can be CW = clockwise or CCW = counter clockwise."))
self.slot_array_direction_label.setMinimumWidth(100)
@ -1887,7 +1887,7 @@ class FlatCAMExcEditor(QtCore.QObject):
{'label': _('CCW'), 'value': 'CCW'}])
self.slot_array_circular_form.addRow(self.slot_array_direction_label, self.slot_array_direction_radio)
self.slot_array_angle_label = QtWidgets.QLabel(_('Angle:'))
self.slot_array_angle_label = QtWidgets.QLabel('%s:' % _('Angle'))
self.slot_array_angle_label.setToolTip(_("Angle at which each element in circular array is placed."))
self.slot_array_angle_label.setMinimumWidth(100)

18
flatcamEditors/FlatCAMGeoEditor.py
View File

@ -431,7 +431,7 @@ class PaintOptionsTool(FlatCAMTool):
self.layout.addLayout(grid)
# Tool dia
ptdlabel = QtWidgets.QLabel(_('Tool dia:'))
ptdlabel = QtWidgets.QLabel('%s:' % _('Tool dia'))
ptdlabel.setToolTip(
_("Diameter of the tool to\n"
"be used in the operation.")
@ -442,7 +442,7 @@ class PaintOptionsTool(FlatCAMTool):
grid.addWidget(self.painttooldia_entry, 0, 1)
# Overlap
ovlabel = QtWidgets.QLabel(_('Overlap Rate:'))
ovlabel = QtWidgets.QLabel('%s:' % _('Overlap Rate'))
ovlabel.setToolTip(
_("How much (fraction) of the tool width to overlap each tool pass.\n"
"Example:\n"
@ -460,7 +460,7 @@ class PaintOptionsTool(FlatCAMTool):
grid.addWidget(self.paintoverlap_entry, 1, 1)
# Margin
marginlabel = QtWidgets.QLabel(_('Margin:'))
marginlabel = QtWidgets.QLabel('%s:' % _('Margin'))
marginlabel.setToolTip(
_("Distance by which to avoid\n"
"the edges of the polygon to\n"
@ -471,7 +471,7 @@ class PaintOptionsTool(FlatCAMTool):
grid.addWidget(self.paintmargin_entry, 2, 1)
# Method
methodlabel = QtWidgets.QLabel(_('Method:'))
methodlabel = QtWidgets.QLabel('%s:' % _('Method'))
methodlabel.setToolTip(
_("Algorithm to paint the polygon:<BR>"
"<B>Standard</B>: Fixed step inwards.<BR>"
@ -1477,7 +1477,7 @@ class TransformEditorTool(FlatCAMTool):
def on_rotate_key(self):
val_box = FCInputDialog(title=_("Rotate ..."),
text=_('Enter an Angle Value (degrees):'),
text='%s:' % _('Enter an Angle Value (degrees)'),
min=-359.9999, max=360.0000, decimals=4,
init_val=float(self.app.defaults['tools_transform_rotate']))
val_box.setWindowIcon(QtGui.QIcon('share/rotate.png'))
@ -1498,7 +1498,7 @@ class TransformEditorTool(FlatCAMTool):
units = self.app.ui.general_defaults_form.general_app_group.units_radio.get_value().lower()
val_box = FCInputDialog(title=_("Offset on X axis ..."),
text=(_('Enter a distance Value (%s):') % str(units)),
text='%s: (%s)' % (_('Enter a distance Value'), str(units)),
min=-9999.9999, max=10000.0000, decimals=4,
init_val=float(self.app.defaults['tools_transform_offset_x']))
val_box.setWindowIcon(QtGui.QIcon('share/offsetx32.png'))
@ -1517,7 +1517,7 @@ class TransformEditorTool(FlatCAMTool):
units = self.app.ui.general_defaults_form.general_app_group.units_radio.get_value().lower()
val_box = FCInputDialog(title=_("Offset on Y axis ..."),
text=(_('Enter a distance Value (%s):') % str(units)),
text='%s: (%s)' % (_('Enter a distance Value'), str(units)),
min=-9999.9999, max=10000.0000, decimals=4,
init_val=float(self.app.defaults['tools_transform_offset_y']))
val_box.setWindowIcon(QtGui.QIcon('share/offsety32.png'))
@ -1534,7 +1534,7 @@ class TransformEditorTool(FlatCAMTool):
def on_skewx_key(self):
val_box = FCInputDialog(title=_("Skew on X axis ..."),
text=_('Enter an Angle Value (degrees):'),
text='%s:' % _('Enter an Angle Value (degrees)'),
min=-359.9999, max=360.0000, decimals=4,
init_val=float(self.app.defaults['tools_transform_skew_x']))
val_box.setWindowIcon(QtGui.QIcon('share/skewX.png'))
@ -1551,7 +1551,7 @@ class TransformEditorTool(FlatCAMTool):
def on_skewy_key(self):
val_box = FCInputDialog(title=_("Skew on Y axis ..."),
text=_('Enter an Angle Value (degrees):'),
text='%s:' % _('Enter an Angle Value (degrees)'),
min=-359.9999, max=360.0000, decimals=4,
init_val=float(self.app.defaults['tools_transform_skew_y']))
val_box.setWindowIcon(QtGui.QIcon('share/skewY.png'))

14
flatcamEditors/FlatCAMGrbEditor.py
View File

@ -2448,7 +2448,7 @@ class FlatCAMGrbEditor(QtCore.QObject):
self.apdim_entry = EvalEntry2()
grid1.addWidget(self.apdim_entry, 4, 1)
apadd_del_lbl = QtWidgets.QLabel('<b>%s</b>' % _('Add/Delete Aperture:'))
apadd_del_lbl = QtWidgets.QLabel('<b>%s:</b>' % _('Add/Delete Aperture'))
apadd_del_lbl.setToolTip(
_("Add/Delete an aperture in the aperture table")
)
@ -2481,7 +2481,7 @@ class FlatCAMGrbEditor(QtCore.QObject):
self.buffer_tool_frame.hide()
# Title
buf_title_lbl = QtWidgets.QLabel('<b>%s</b>' % _('Buffer Aperture:'))
buf_title_lbl = QtWidgets.QLabel('<b>%s:</b>' % _('Buffer Aperture'))
buf_title_lbl.setToolTip(
_("Buffer a aperture in the aperture list")
)
@ -5748,7 +5748,7 @@ class TransformEditorTool(FlatCAMTool):
def on_rotate_key(self):
val_box = FCInputDialog(title=_("Rotate ..."),
text=_('Enter an Angle Value (degrees):'),
text='%s:' % _('Enter an Angle Value (degrees)'),
min=-359.9999, max=360.0000, decimals=4,
init_val=float(self.app.defaults['tools_transform_rotate']))
val_box.setWindowIcon(QtGui.QIcon('share/rotate.png'))
@ -5769,7 +5769,7 @@ class TransformEditorTool(FlatCAMTool):
units = self.app.ui.general_defaults_form.general_app_group.units_radio.get_value().lower()
val_box = FCInputDialog(title=_("Offset on X axis ..."),
text=(_('Enter a distance Value (%s):') % str(units)),
text='%s: (%s)' % (_('Enter a distance Value'), str(units)),
min=-9999.9999, max=10000.0000, decimals=4,
init_val=float(self.app.defaults['tools_transform_offset_x']))
val_box.setWindowIcon(QtGui.QIcon('share/offsetx32.png'))
@ -5788,7 +5788,7 @@ class TransformEditorTool(FlatCAMTool):
units = self.app.ui.general_defaults_form.general_app_group.units_radio.get_value().lower()
val_box = FCInputDialog(title=_("Offset on Y axis ..."),
text=(_('Enter a distance Value (%s):') % str(units)),
text='%s: (%s)' % (_('Enter a distance Value'), str(units)),
min=-9999.9999, max=10000.0000, decimals=4,
init_val=float(self.app.defaults['tools_transform_offset_y']))
val_box.setWindowIcon(QtGui.QIcon('share/offsety32.png'))
@ -5805,7 +5805,7 @@ class TransformEditorTool(FlatCAMTool):
def on_skewx_key(self):
val_box = FCInputDialog(title=_("Skew on X axis ..."),
text=_('Enter an Angle Value (degrees):'),
text='%s:' % _('Enter an Angle Value (degrees)'),
min=-359.9999, max=360.0000, decimals=4,
init_val=float(self.app.defaults['tools_transform_skew_x']))
val_box.setWindowIcon(QtGui.QIcon('share/skewX.png'))
@ -5822,7 +5822,7 @@ class TransformEditorTool(FlatCAMTool):
def on_skewy_key(self):
val_box = FCInputDialog(title=_("Skew on Y axis ..."),
text=_('Enter an Angle Value (degrees):'),
text='%s:' % _('Enter an Angle Value (degrees)'),
min=-359.9999, max=360.0000, decimals=4,
init_val=float(self.app.defaults['tools_transform_skew_y']))
val_box.setWindowIcon(QtGui.QIcon('share/skewY.png'))

66
flatcamGUI/FlatCAMGUI.py
View File

@ -3135,7 +3135,7 @@ class FlatCAMGUI(QtWidgets.QMainWindow):
# ## Current application units in Upper Case
self.units = self.general_defaults_form.general_app_group.units_radio.get_value().upper()
tool_add_popup = FCInputDialog(title=_("New Tool ..."),
text=_('Enter a Tool Diameter:'),
text='%s:' % _('Enter a Tool Diameter'),
min=0.0000, max=99.9999, decimals=4)
tool_add_popup.setWindowIcon(QtGui.QIcon('share/letter_t_32.png'))
@ -3539,31 +3539,31 @@ class GeneralGUIPrefGroupUI(OptionsGroupUI):
self.form_box = QtWidgets.QFormLayout()
# Grid X Entry
self.gridx_label = QtWidgets.QLabel(_('Grid X value:'))
self.gridx_label = QtWidgets.QLabel('%s:' % _('Grid X value'))
self.gridx_label.setToolTip(
_("This is the Grid snap value on X axis.")
)
self.gridx_entry = FCEntry3()
# Grid Y Entry
self.gridy_label = QtWidgets.QLabel(_('Grid Y value:'))
self.gridy_label = QtWidgets.QLabel('%s:' % _('Grid Y value'))
self.gridy_label.setToolTip(
_("This is the Grid snap value on Y axis.")
)
self.gridy_entry = FCEntry3()
# Snap Max Entry
self.snap_max_label = QtWidgets.QLabel(_('Snap Max:'))
self.snap_max_label = QtWidgets.QLabel('%s:' % _('Snap Max'))
self.snap_max_label.setToolTip(_("Max. magnet distance"))
self.snap_max_dist_entry = FCEntry()
# Workspace
self.workspace_lbl = QtWidgets.QLabel(_('Workspace:'))
self.workspace_lbl = QtWidgets.QLabel('%s:' % _('Workspace'))
self.workspace_lbl.setToolTip(
_("Draw a delimiting rectangle on canvas.\n"
"The purpose is to illustrate the limits for our work.")
)
self.workspace_type_lbl = QtWidgets.QLabel(_('Wk. format:'))
self.workspace_type_lbl = QtWidgets.QLabel('%s:' % _('Wk. format'))
self.workspace_type_lbl.setToolTip(
_("Select the type of rectangle to be used on canvas,\n"
"as valid workspace.")
@ -3578,7 +3578,7 @@ class GeneralGUIPrefGroupUI(OptionsGroupUI):
self.wks = OptionalInputSection(self.workspace_cb, [self.workspace_type_lbl, self.wk_cb])
# Plot Fill Color
self.pf_color_label = QtWidgets.QLabel(_('Plot Fill:'))
self.pf_color_label = QtWidgets.QLabel('%s:' % _('Plot Fill'))
self.pf_color_label.setToolTip(
_("Set the fill color for plotted objects.\n"
"First 6 digits are the color and the last 2\n"
@ -3594,7 +3594,7 @@ class GeneralGUIPrefGroupUI(OptionsGroupUI):
self.form_box_child_1.setAlignment(QtCore.Qt.AlignLeft | QtCore.Qt.AlignVCenter)
# Plot Fill Transparency Level
self.pf_alpha_label = QtWidgets.QLabel(_('Alpha Level:'))
self.pf_alpha_label = QtWidgets.QLabel('%s:' % _('Alpha Level'))
self.pf_alpha_label.setToolTip(
_("Set the fill transparency for plotted objects.")
)
@ -3613,7 +3613,7 @@ class GeneralGUIPrefGroupUI(OptionsGroupUI):
self.form_box_child_2.addWidget(self.pf_color_alpha_spinner)
# Plot Line Color
self.pl_color_label = QtWidgets.QLabel(_('Plot Line:'))
self.pl_color_label = QtWidgets.QLabel('%s:' % _('Plot Line'))
self.pl_color_label.setToolTip(
_("Set the line color for plotted objects.")
)
@ -3627,7 +3627,7 @@ class GeneralGUIPrefGroupUI(OptionsGroupUI):
self.form_box_child_3.setAlignment(QtCore.Qt.AlignLeft | QtCore.Qt.AlignVCenter)
# Plot Selection (left - right) Fill Color
self.sf_color_label = QtWidgets.QLabel(_('Sel. Fill:'))
self.sf_color_label = QtWidgets.QLabel('%s:' % _('Sel. Fill'))
self.sf_color_label.setToolTip(
_("Set the fill color for the selection box\n"
"in case that the selection is done from left to right.\n"
@ -3644,7 +3644,7 @@ class GeneralGUIPrefGroupUI(OptionsGroupUI):
self.form_box_child_4.setAlignment(QtCore.Qt.AlignLeft | QtCore.Qt.AlignVCenter)
# Plot Selection (left - right) Fill Transparency Level
self.sf_alpha_label = QtWidgets.QLabel(_('Alpha Level:'))
self.sf_alpha_label = QtWidgets.QLabel('%s:' % _('Alpha Level'))
self.sf_alpha_label.setToolTip(
_("Set the fill transparency for the 'left to right' selection box.")
)
@ -3663,7 +3663,7 @@ class GeneralGUIPrefGroupUI(OptionsGroupUI):
self.form_box_child_5.addWidget(self.sf_color_alpha_spinner)
# Plot Selection (left - right) Line Color
self.sl_color_label = QtWidgets.QLabel(_('Sel. Line:'))
self.sl_color_label = QtWidgets.QLabel('%s:' % _('Sel. Line'))
self.sl_color_label.setToolTip(
_("Set the line color for the 'left to right' selection box.")
)
@ -3677,7 +3677,7 @@ class GeneralGUIPrefGroupUI(OptionsGroupUI):
self.form_box_child_6.setAlignment(QtCore.Qt.AlignLeft | QtCore.Qt.AlignVCenter)
# Plot Selection (right - left) Fill Color
self.alt_sf_color_label = QtWidgets.QLabel(_('Sel2. Fill:'))
self.alt_sf_color_label = QtWidgets.QLabel('%s:' % _('Sel2. Fill'))
self.alt_sf_color_label.setToolTip(
_("Set the fill color for the selection box\n"
"in case that the selection is done from right to left.\n"
@ -3694,7 +3694,7 @@ class GeneralGUIPrefGroupUI(OptionsGroupUI):
self.form_box_child_7.setAlignment(QtCore.Qt.AlignLeft | QtCore.Qt.AlignVCenter)
# Plot Selection (right - left) Fill Transparency Level
self.alt_sf_alpha_label = QtWidgets.QLabel(_('Alpha Level:'))
self.alt_sf_alpha_label = QtWidgets.QLabel('%s:' % _('Alpha Level'))
self.alt_sf_alpha_label.setToolTip(
_("Set the fill transparency for selection 'right to left' box.")
)
@ -3713,7 +3713,7 @@ class GeneralGUIPrefGroupUI(OptionsGroupUI):
self.form_box_child_8.addWidget(self.alt_sf_color_alpha_spinner)
# Plot Selection (right - left) Line Color
self.alt_sl_color_label = QtWidgets.QLabel(_('Sel2. Line:'))
self.alt_sl_color_label = QtWidgets.QLabel('%s:' % _('Sel2. Line'))
self.alt_sl_color_label.setToolTip(
_("Set the line color for the 'right to left' selection box.")
)
@ -3727,7 +3727,7 @@ class GeneralGUIPrefGroupUI(OptionsGroupUI):
self.form_box_child_9.setAlignment(QtCore.Qt.AlignLeft | QtCore.Qt.AlignVCenter)
# Editor Draw Color
self.draw_color_label = QtWidgets.QLabel(_('Editor Draw:'))
self.draw_color_label = QtWidgets.QLabel('%s:' % _('Editor Draw'))
self.alt_sf_color_label.setToolTip(
_("Set the color for the shape.")
)
@ -3741,7 +3741,7 @@ class GeneralGUIPrefGroupUI(OptionsGroupUI):
self.form_box_child_10.setAlignment(QtCore.Qt.AlignLeft | QtCore.Qt.AlignVCenter)
# Editor Draw Selection Color
self.sel_draw_color_label = QtWidgets.QLabel(_('Editor Draw Sel.:'))
self.sel_draw_color_label = QtWidgets.QLabel('%s:' % _('Editor Draw Sel.'))
self.sel_draw_color_label.setToolTip(
_("Set the color of the shape when selected.")
)
@ -3755,7 +3755,7 @@ class GeneralGUIPrefGroupUI(OptionsGroupUI):
self.form_box_child_11.setAlignment(QtCore.Qt.AlignLeft | QtCore.Qt.AlignVCenter)
# Project Tab items color
self.proj_color_label = QtWidgets.QLabel(_('Project Items:'))
self.proj_color_label = QtWidgets.QLabel('%s:' % _('Project Items'))
self.proj_color_label.setToolTip(
_("Set the color of the items in Project Tab Tree.")
)
@ -3768,7 +3768,7 @@ class GeneralGUIPrefGroupUI(OptionsGroupUI):
self.form_box_child_12.addWidget(self.proj_color_button)
self.form_box_child_12.setAlignment(QtCore.Qt.AlignLeft | QtCore.Qt.AlignVCenter)
self.proj_color_dis_label = QtWidgets.QLabel(_('Proj. Dis. Items:'))
self.proj_color_dis_label = QtWidgets.QLabel('%s:' % _('Proj. Dis. Items'))
self.proj_color_dis_label.setToolTip(
_("Set the color of the items in Project Tab Tree,\n"
"for the case when the items are disabled.")
@ -3827,7 +3827,7 @@ class GeneralGUISetGroupUI(OptionsGroupUI):
self.form_box = QtWidgets.QFormLayout()
# Layout selection
self.layout_label = QtWidgets.QLabel(_('Layout:'))
self.layout_label = QtWidgets.QLabel('%s:' % _('Layout'))
self.layout_label.setToolTip(
_("Select an layout for FlatCAM.\n"
"It is applied immediately.")
@ -3845,7 +3845,7 @@ class GeneralGUISetGroupUI(OptionsGroupUI):
self.layout_combo.setCurrentIndex(idx)
# Style selection
self.style_label = QtWidgets.QLabel(_('Style:'))
self.style_label = QtWidgets.QLabel('%s:' % _('Style'))
self.style_label.setToolTip(
_("Select an style for FlatCAM.\n"
"It will be applied at the next app start.")
@ -3858,7 +3858,7 @@ class GeneralGUISetGroupUI(OptionsGroupUI):
self.style_combo.activated[str].connect(self.handle_style)
# Enable High DPI Support
self.hdpi_label = QtWidgets.QLabel(_('HDPI Support:'))
self.hdpi_label = QtWidgets.QLabel('%s:' % _('HDPI Support'))
self.hdpi_label.setToolTip(
_("Enable High DPI support for FlatCAM.\n"
"It will be applied at the next app start.")
@ -3873,7 +3873,7 @@ class GeneralGUISetGroupUI(OptionsGroupUI):
self.hdpi_cb.stateChanged.connect(self.handle_hdpi)
# Clear Settings
self.clear_label = QtWidgets.QLabel(_('Clear GUI Settings:'))
self.clear_label = QtWidgets.QLabel('%s:' % _('Clear GUI Settings'))
self.clear_label.setToolTip(
_("Clear the GUI settings for FlatCAM,\n"
"such as: layout, gui state, style, hdpi support etc.")
@ -3882,7 +3882,7 @@ class GeneralGUISetGroupUI(OptionsGroupUI):
self.clear_btn.clicked.connect(self.handle_clear)
# Enable Hover box
self.hover_label = QtWidgets.QLabel(_('Hover Shape:'))
self.hover_label = QtWidgets.QLabel('%s:' % _('Hover Shape'))
self.hover_label.setToolTip(
_("Enable display of a hover shape for FlatCAM objects.\n"
"It is displayed whenever the mouse cursor is hovering\n"
@ -3891,7 +3891,7 @@ class GeneralGUISetGroupUI(OptionsGroupUI):
self.hover_cb = FCCheckBox()
# Enable Selection box
self.selection_label = QtWidgets.QLabel(_('Sel. Shape:'))
self.selection_label = QtWidgets.QLabel('%s:' % _('Sel. Shape'))
self.selection_label.setToolTip(
_("Enable the display of a selection shape for FlatCAM objects.\n"
"It is displayed whenever the mouse selects an object\n"
@ -3900,7 +3900,7 @@ class GeneralGUISetGroupUI(OptionsGroupUI):
)
self.selection_cb = FCCheckBox()
self.notebook_font_size_label = QtWidgets.QLabel(_('NB Font Size:'))
self.notebook_font_size_label = QtWidgets.QLabel('%s:' % _('NB Font Size'))
self.notebook_font_size_label.setToolTip(
_("This sets the font size for the elements found in the Notebook.\n"
"The notebook is the collapsible area in the left side of the GUI,\n"
@ -3917,7 +3917,7 @@ class GeneralGUISetGroupUI(OptionsGroupUI):
else:
self.notebook_font_size_spinner.set_value(12)
self.axis_font_size_label = QtWidgets.QLabel(_('Axis Font Size:'))
self.axis_font_size_label = QtWidgets.QLabel('%s:' % _('Axis Font Size'))
self.axis_font_size_label.setToolTip(
_("This sets the font size for canvas axis.")
)
@ -4086,7 +4086,7 @@ class GeneralAppPrefGroupUI(OptionsGroupUI):
{'label': _('RMB'), 'value': '2'}])
# Multiple Selection Modifier Key
self.mselectlabel = QtWidgets.QLabel('<b>%s:</b>' % _('Multiple Sel:'))
self.mselectlabel = QtWidgets.QLabel('<b>%s:</b>' % _('Multiple Sel'))
self.mselectlabel.setToolTip(_("Select the key used for multiple selection."))
self.mselect_radio = RadioSet([{'label': _('CTRL'), 'value': 'Control'},
{'label': _('SHIFT'), 'value': 'Shift'}])
@ -5088,7 +5088,7 @@ class ExcellonOptPrefGroupUI(OptionsGroupUI):
self.toolchangez_entry = LengthEntry()
grid2.addWidget(self.toolchangez_entry, 3, 1)
frlabel = QtWidgets.QLabel('%s:' % _('Feedrate (Plunge):'))
frlabel = QtWidgets.QLabel('%s:' % _('Feedrate (Plunge)'))
frlabel.setToolTip(
_("Tool speed while drilling\n"
"(in units per minute).\n"
@ -5128,7 +5128,7 @@ class ExcellonOptPrefGroupUI(OptionsGroupUI):
_("Pause to allow the spindle to reach its\n"
"speed before cutting.")
)
dwelltime = QtWidgets.QLabel(_('Duration:'))
dwelltime = QtWidgets.QLabel('%s:' % _('Duration'))
dwelltime.setToolTip(
_("Number of time units for spindle to dwell.")
)
@ -5293,7 +5293,7 @@ class ExcellonAdvOptPrefGroupUI(OptionsGroupUI):
self.feedrate_probe_entry = FCEntry()
grid1.addWidget(self.feedrate_probe_entry, 6, 1)
fplungelabel = QtWidgets.QLabel(_('Fast Plunge:'))
fplungelabel = QtWidgets.QLabel('%s:' % _('Fast Plunge'))
fplungelabel.setToolTip(
_("By checking this, the vertical move from\n"
"Z_Toolchange to Z_move is done with G0,\n"
@ -5529,7 +5529,7 @@ class ExcellonEditorPrefGroupUI(OptionsGroupUI):
grid0.addWidget(self.drill_array_linear_label, 3, 0, 1, 2)
# Linear Drill Array direction
self.drill_axis_label = QtWidgets.QLabel(_('Linear Dir.:'))
self.drill_axis_label = QtWidgets.QLabel('%s:' % _('Linear Dir.'))
self.drill_axis_label.setToolTip(
_("Direction on which the linear array is oriented:\n"
"- 'X' - horizontal axis \n"
@ -6851,7 +6851,7 @@ class ToolsFilmPrefGroupUI(OptionsGroupUI):
self.film_type_radio = RadioSet([{'label': 'Pos', 'value': 'pos'},
{'label': 'Neg', 'value': 'neg'}])
ftypelbl = QtWidgets.QLabel(_('Film Type:'))
ftypelbl = QtWidgets.QLabel('%s:' % _('Film Type'))
ftypelbl.setToolTip(
_("Generate a Positive black film or a Negative film.\n"
"Positive means that it will print the features\n"

2
flatcamGUI/ObjectUI.py
View File

@ -649,7 +649,7 @@ class ExcellonObjectUI(ObjectUI):
grid1.addWidget(self.eendz_entry, 5, 1)
# Excellon Feedrate
frlabel = QtWidgets.QLabel('%s:' % _('Feedrate (Plunge):'))
frlabel = QtWidgets.QLabel('%s:' % _('Feedrate (Plunge)'))
frlabel.setToolTip(
_("Tool speed while drilling\n"
"(in units per minute).\n"

2
flatcamGUI/PlotCanvas.py
View File

@ -34,7 +34,7 @@ class PlotCanvas(QtCore.QObject, VisPyCanvas):
"""
super(PlotCanvas, self).__init__()
VisPyCanvas.__init__(self)
# VisPyCanvas.__init__(self)
# VisPyCanvas does not allow new attributes. Override.
self.unfreeze()

2
flatcamTools/ToolNonCopperClear.py
View File

@ -204,7 +204,7 @@ class NonCopperClear(FlatCAMTool, Gerber):
e_lab_1 = QtWidgets.QLabel('<b>%s:</b>' % _("Parameters"))
grid3.addWidget(e_lab_1, 0, 0)
nccoverlabel = QtWidgets.QLabel(_('Overlap Rate:'))
nccoverlabel = QtWidgets.QLabel('%s:' % _('Overlap Rate'))
nccoverlabel.setToolTip(
_("How much (fraction) of the tool width to overlap each tool pass.\n"
"Example:\n"