- updated the Edit -> Preferences to include also the Gerber Editor complete Preferences

- started to update the app strings to make it easier for future translations
This commit is contained in:
Marius Stanciu 2019-08-19 17:24:56 +03:00
parent c2563b4857
commit 5cc16a03db
18 changed files with 749 additions and 537 deletions

View File

@ -422,6 +422,21 @@ class App(QtCore.QObject):
# Gerber Editor # Gerber Editor
"gerber_editor_sel_limit": self.ui.gerber_defaults_form.gerber_editor_group.sel_limit_entry, "gerber_editor_sel_limit": self.ui.gerber_defaults_form.gerber_editor_group.sel_limit_entry,
"gerber_editor_newcode": self.ui.gerber_defaults_form.gerber_editor_group.addcode_entry,
"gerber_editor_newsize": self.ui.gerber_defaults_form.gerber_editor_group.addsize_entry,
"gerber_editor_newtype": self.ui.gerber_defaults_form.gerber_editor_group.addtype_combo,
"gerber_editor_newdim": self.ui.gerber_defaults_form.gerber_editor_group.adddim_entry,
"gerber_editor_array_size": self.ui.gerber_defaults_form.gerber_editor_group.grb_array_size_entry,
"gerber_editor_lin_axis": self.ui.gerber_defaults_form.gerber_editor_group.grb_axis_radio,
"gerber_editor_lin_pitch": self.ui.gerber_defaults_form.gerber_editor_group.grb_pitch_entry,
"gerber_editor_lin_angle": self.ui.gerber_defaults_form.gerber_editor_group.grb_angle_entry,
"gerber_editor_circ_dir": self.ui.gerber_defaults_form.gerber_editor_group.grb_circular_dir_radio,
"gerber_editor_circ_angle":
self.ui.gerber_defaults_form.gerber_editor_group.grb_circular_angle_entry,
"gerber_editor_scale_f": self.ui.gerber_defaults_form.gerber_editor_group.grb_scale_entry,
"gerber_editor_buff_f": self.ui.gerber_defaults_form.gerber_editor_group.grb_buff_entry,
"gerber_editor_ma_low": self.ui.gerber_defaults_form.gerber_editor_group.grb_ma_low_entry,
"gerber_editor_ma_high": self.ui.gerber_defaults_form.gerber_editor_group.grb_ma_high_entry,
# Excellon General # Excellon General
"excellon_plot": self.ui.excellon_defaults_form.excellon_gen_group.plot_cb, "excellon_plot": self.ui.excellon_defaults_form.excellon_gen_group.plot_cb,
@ -794,6 +809,20 @@ class App(QtCore.QObject):
# Gerber Editor # Gerber Editor
"gerber_editor_sel_limit": 30, "gerber_editor_sel_limit": 30,
"gerber_editor_newcode": 10,
"gerber_editor_newsize": 0.8,
"gerber_editor_newtype": 'C',
"gerber_editor_newdim": "0.5, 0.5",
"gerber_editor_array_size": 5,
"gerber_editor_lin_axis": 'X',
"gerber_editor_lin_pitch": 1,
"gerber_editor_lin_angle": 0.0,
"gerber_editor_circ_dir": 'CW',
"gerber_editor_circ_angle": 0.0,
"gerber_editor_scale_f": 1.0,
"gerber_editor_buff_f": 0.1,
"gerber_editor_ma_low": 0.0,
"gerber_editor_ma_high": 1.0,
# Excellon General # Excellon General
"excellon_plot": True, "excellon_plot": True,

View File

@ -9,6 +9,12 @@ CAD program, and create G-Code for Isolation routing.
================================================= =================================================
19.08.2019
- updated the Edit -> Preferences to include also the Gerber Editor complete Preferences
- started to update the app strings to make it easier for future translations
18.08.2019 18.08.2019
- made the exported preferences formatted therefore more easily read - made the exported preferences formatted therefore more easily read

View File

@ -2202,6 +2202,7 @@ class FCApertureSelect(DrawTool):
self.grb_editor_app.hide_tool('all') self.grb_editor_app.hide_tool('all')
self.grb_editor_app.hide_tool('select') self.grb_editor_app.hide_tool('select')
self.grb_editor_app.array_frame.hide()
try: try:
QtGui.QGuiApplication.restoreOverrideCursor() QtGui.QGuiApplication.restoreOverrideCursor()
@ -2345,7 +2346,7 @@ class FlatCAMGrbEditor(QtCore.QObject):
# ######################### # #########################
# ### Gerber Apertures #### # ### Gerber Apertures ####
# ######################### # #########################
self.apertures_table_label = QtWidgets.QLabel(_('<b>Apertures:</b>')) self.apertures_table_label = QtWidgets.QLabel('<b>%s:</b>' % _('Apertures'))
self.apertures_table_label.setToolTip( self.apertures_table_label.setToolTip(
_("Apertures Table for the Gerber Object.") _("Apertures Table for the Gerber Object.")
) )
@ -2391,7 +2392,7 @@ class FlatCAMGrbEditor(QtCore.QObject):
grid1 = QtWidgets.QGridLayout() grid1 = QtWidgets.QGridLayout()
self.apertures_box.addLayout(grid1) self.apertures_box.addLayout(grid1)
apcode_lbl = QtWidgets.QLabel(_('Aperture Code:')) apcode_lbl = QtWidgets.QLabel('%s:' % _('Aperture Code'))
apcode_lbl.setToolTip( apcode_lbl.setToolTip(
_("Code for the new aperture") _("Code for the new aperture")
) )
@ -2401,7 +2402,7 @@ class FlatCAMGrbEditor(QtCore.QObject):
self.apcode_entry.setValidator(QtGui.QIntValidator(0, 999)) self.apcode_entry.setValidator(QtGui.QIntValidator(0, 999))
grid1.addWidget(self.apcode_entry, 1, 1) grid1.addWidget(self.apcode_entry, 1, 1)
apsize_lbl = QtWidgets.QLabel(_('Aperture Size:')) apsize_lbl = QtWidgets.QLabel('%s:' % _('Aperture Size'))
apsize_lbl.setToolTip( apsize_lbl.setToolTip(
_("Size for the new aperture.\n" _("Size for the new aperture.\n"
"If aperture type is 'R' or 'O' then\n" "If aperture type is 'R' or 'O' then\n"
@ -2415,7 +2416,7 @@ class FlatCAMGrbEditor(QtCore.QObject):
self.apsize_entry.setValidator(QtGui.QDoubleValidator(0.0001, 99.9999, 4)) self.apsize_entry.setValidator(QtGui.QDoubleValidator(0.0001, 99.9999, 4))
grid1.addWidget(self.apsize_entry, 2, 1) grid1.addWidget(self.apsize_entry, 2, 1)
aptype_lbl = QtWidgets.QLabel(_('Aperture Type:')) aptype_lbl = QtWidgets.QLabel('%s:' % _('Aperture Type'))
aptype_lbl.setToolTip( aptype_lbl.setToolTip(
_("Select the type of new aperture. Can be:\n" _("Select the type of new aperture. Can be:\n"
"C = circular\n" "C = circular\n"
@ -2428,7 +2429,7 @@ class FlatCAMGrbEditor(QtCore.QObject):
self.aptype_cb.addItems(['C', 'R', 'O']) self.aptype_cb.addItems(['C', 'R', 'O'])
grid1.addWidget(self.aptype_cb, 3, 1) grid1.addWidget(self.aptype_cb, 3, 1)
self.apdim_lbl = QtWidgets.QLabel(_('Aperture Dim:')) self.apdim_lbl = QtWidgets.QLabel('%s:' % _('Aperture Dim'))
self.apdim_lbl.setToolTip( self.apdim_lbl.setToolTip(
_("Dimensions for the new aperture.\n" _("Dimensions for the new aperture.\n"
"Active only for rectangular apertures (type R).\n" "Active only for rectangular apertures (type R).\n"
@ -2484,8 +2485,8 @@ class FlatCAMGrbEditor(QtCore.QObject):
# Buffer distance # Buffer distance
self.buffer_distance_entry = FCEntry() self.buffer_distance_entry = FCEntry()
buf_form_layout.addRow(_("Buffer distance:"), self.buffer_distance_entry) buf_form_layout.addRow('%s:' % _("Buffer distance"), self.buffer_distance_entry)
self.buffer_corner_lbl = QtWidgets.QLabel(_("Buffer corner:")) self.buffer_corner_lbl = QtWidgets.QLabel('%s:' % _("Buffer corner"))
self.buffer_corner_lbl.setToolTip( self.buffer_corner_lbl.setToolTip(
_("There are 3 types of corners:\n" _("There are 3 types of corners:\n"
" - 'Round': the corner is rounded.\n" " - 'Round': the corner is rounded.\n"
@ -2517,7 +2518,7 @@ class FlatCAMGrbEditor(QtCore.QObject):
self.scale_tool_frame.hide() self.scale_tool_frame.hide()
# Title # Title
scale_title_lbl = QtWidgets.QLabel('<b>%s</b>' % _('Scale Aperture:')) scale_title_lbl = QtWidgets.QLabel('<b>%s:</b>' % _('Scale Aperture'))
scale_title_lbl.setToolTip( scale_title_lbl.setToolTip(
_("Scale a aperture in the aperture list") _("Scale a aperture in the aperture list")
) )
@ -2527,7 +2528,7 @@ class FlatCAMGrbEditor(QtCore.QObject):
scale_form_layout = QtWidgets.QFormLayout() scale_form_layout = QtWidgets.QFormLayout()
self.scale_tools_box.addLayout(scale_form_layout) self.scale_tools_box.addLayout(scale_form_layout)
self.scale_factor_lbl = QtWidgets.QLabel(_("Scale factor:")) self.scale_factor_lbl = QtWidgets.QLabel('%s:' % _("Scale factor"))
self.scale_factor_lbl.setToolTip( self.scale_factor_lbl.setToolTip(
_("The factor by which to scale the selected aperture.\n" _("The factor by which to scale the selected aperture.\n"
"Values can be between 0.0000 and 999.9999") "Values can be between 0.0000 and 999.9999")
@ -2555,7 +2556,7 @@ class FlatCAMGrbEditor(QtCore.QObject):
self.ma_tool_frame.hide() self.ma_tool_frame.hide()
# Title # Title
ma_title_lbl = QtWidgets.QLabel('<b>%s</b>' % _('Mark polygon areas:')) ma_title_lbl = QtWidgets.QLabel('<b>%s:</b>' % _('Mark polygon areas'))
ma_title_lbl.setToolTip( ma_title_lbl.setToolTip(
_("Mark the polygon areas.") _("Mark the polygon areas.")
) )
@ -2565,7 +2566,7 @@ class FlatCAMGrbEditor(QtCore.QObject):
ma_form_layout = QtWidgets.QFormLayout() ma_form_layout = QtWidgets.QFormLayout()
self.ma_tools_box.addLayout(ma_form_layout) self.ma_tools_box.addLayout(ma_form_layout)
self.ma_upper_threshold_lbl = QtWidgets.QLabel(_("Area UPPER threshold:")) self.ma_upper_threshold_lbl = QtWidgets.QLabel('%s:' % _("Area UPPER threshold"))
self.ma_upper_threshold_lbl.setToolTip( self.ma_upper_threshold_lbl.setToolTip(
_("The threshold value, all areas less than this are marked.\n" _("The threshold value, all areas less than this are marked.\n"
"Can have a value between 0.0000 and 9999.9999") "Can have a value between 0.0000 and 9999.9999")
@ -2573,7 +2574,7 @@ class FlatCAMGrbEditor(QtCore.QObject):
self.ma_upper_threshold_entry = FCEntry() self.ma_upper_threshold_entry = FCEntry()
self.ma_upper_threshold_entry.setValidator(QtGui.QDoubleValidator(0.0000, 9999.9999, 4)) self.ma_upper_threshold_entry.setValidator(QtGui.QDoubleValidator(0.0000, 9999.9999, 4))
self.ma_lower_threshold_lbl = QtWidgets.QLabel(_("Area LOWER threshold:")) self.ma_lower_threshold_lbl = QtWidgets.QLabel('%s:' % _("Area LOWER threshold"))
self.ma_lower_threshold_lbl.setToolTip( self.ma_lower_threshold_lbl.setToolTip(
_("The threshold value, all areas more than this are marked.\n" _("The threshold value, all areas more than this are marked.\n"
"Can have a value between 0.0000 and 9999.9999") "Can have a value between 0.0000 and 9999.9999")
@ -2594,7 +2595,6 @@ class FlatCAMGrbEditor(QtCore.QObject):
# ###################### # ######################
# ### Add Pad Array #### # ### Add Pad Array ####
# ###################### # ######################
# add a frame and inside add a vertical box layout. Inside this vbox layout I add # add a frame and inside add a vertical box layout. Inside this vbox layout I add
# all the add Pad array widgets # all the add Pad array widgets
# this way I can hide/show the frame # this way I can hide/show the frame
@ -2627,7 +2627,7 @@ class FlatCAMGrbEditor(QtCore.QObject):
self.array_form = QtWidgets.QFormLayout() self.array_form = QtWidgets.QFormLayout()
self.array_box.addLayout(self.array_form) self.array_box.addLayout(self.array_form)
self.pad_array_size_label = QtWidgets.QLabel(_('Nr of pads:')) self.pad_array_size_label = QtWidgets.QLabel('%s:' % _('Nr of pads'))
self.pad_array_size_label.setToolTip( self.pad_array_size_label.setToolTip(
_("Specify how many pads to be in the array.") _("Specify how many pads to be in the array.")
) )
@ -2646,7 +2646,7 @@ class FlatCAMGrbEditor(QtCore.QObject):
self.linear_form = QtWidgets.QFormLayout() self.linear_form = QtWidgets.QFormLayout()
self.linear_box.addLayout(self.linear_form) self.linear_box.addLayout(self.linear_form)
self.pad_axis_label = QtWidgets.QLabel(_('Direction:')) self.pad_axis_label = QtWidgets.QLabel('%s:' % _('Direction'))
self.pad_axis_label.setToolTip( self.pad_axis_label.setToolTip(
_("Direction on which the linear array is oriented:\n" _("Direction on which the linear array is oriented:\n"
"- 'X' - horizontal axis \n" "- 'X' - horizontal axis \n"
@ -2661,7 +2661,7 @@ class FlatCAMGrbEditor(QtCore.QObject):
self.pad_axis_radio.set_value('X') self.pad_axis_radio.set_value('X')
self.linear_form.addRow(self.pad_axis_label, self.pad_axis_radio) self.linear_form.addRow(self.pad_axis_label, self.pad_axis_radio)
self.pad_pitch_label = QtWidgets.QLabel(_('Pitch:')) self.pad_pitch_label = QtWidgets.QLabel('%s:' % _('Pitch'))
self.pad_pitch_label.setToolTip( self.pad_pitch_label.setToolTip(
_("Pitch = Distance between elements of the array.") _("Pitch = Distance between elements of the array.")
) )
@ -2670,7 +2670,7 @@ class FlatCAMGrbEditor(QtCore.QObject):
self.pad_pitch_entry = LengthEntry() self.pad_pitch_entry = LengthEntry()
self.linear_form.addRow(self.pad_pitch_label, self.pad_pitch_entry) self.linear_form.addRow(self.pad_pitch_label, self.pad_pitch_entry)
self.linear_angle_label = QtWidgets.QLabel(_('Angle:')) self.linear_angle_label = QtWidgets.QLabel('%s:' % _('Angle'))
self.linear_angle_label.setToolTip( self.linear_angle_label.setToolTip(
_( "Angle at which the linear array is placed.\n" _( "Angle at which the linear array is placed.\n"
"The precision is of max 2 decimals.\n" "The precision is of max 2 decimals.\n"
@ -2691,7 +2691,7 @@ class FlatCAMGrbEditor(QtCore.QObject):
self.circular_box.setContentsMargins(0, 0, 0, 0) self.circular_box.setContentsMargins(0, 0, 0, 0)
self.array_circular_frame.setLayout(self.circular_box) self.array_circular_frame.setLayout(self.circular_box)
self.pad_direction_label = QtWidgets.QLabel(_('Direction:')) self.pad_direction_label = QtWidgets.QLabel('%s:' % _('Direction'))
self.pad_direction_label.setToolTip( self.pad_direction_label.setToolTip(
_("Direction for circular array." _("Direction for circular array."
"Can be CW = clockwise or CCW = counter clockwise.") "Can be CW = clockwise or CCW = counter clockwise.")
@ -2706,7 +2706,7 @@ class FlatCAMGrbEditor(QtCore.QObject):
self.pad_direction_radio.set_value('CW') self.pad_direction_radio.set_value('CW')
self.circular_form.addRow(self.pad_direction_label, self.pad_direction_radio) self.circular_form.addRow(self.pad_direction_label, self.pad_direction_radio)
self.pad_angle_label = QtWidgets.QLabel(_('Angle:')) self.pad_angle_label = QtWidgets.QLabel('%s:' % _('Angle'))
self.pad_angle_label.setToolTip( self.pad_angle_label.setToolTip(
_("Angle at which each element in circular array is placed.") _("Angle at which each element in circular array is placed.")
) )
@ -2944,23 +2944,24 @@ class FlatCAMGrbEditor(QtCore.QObject):
self.tool2tooldia[i + 1] = tt_aperture self.tool2tooldia[i + 1] = tt_aperture
# Init GUI # Init GUI
if self.units == 'MM':
self.buffer_distance_entry.set_value(0.01)
self.scale_factor_entry.set_value(1.0)
self.ma_upper_threshold_entry.set_value(1.0)
self.apsize_entry.set_value(1.00)
else:
self.buffer_distance_entry.set_value(0.0003937)
self.scale_factor_entry.set_value(0.03937)
self.ma_upper_threshold_entry.set_value(0.00155)
self.apsize_entry.set_value(0.039)
self.ma_lower_threshold_entry.set_value(0.0)
self.pad_array_size_entry.set_value(5) self.buffer_distance_entry.set_value(self.app.defaults["gerber_editor_buff_f"])
self.pad_pitch_entry.set_value(2.54) self.scale_factor_entry.set_value(self.app.defaults["gerber_editor_scale_f"])
self.pad_angle_entry.set_value(12) self.ma_upper_threshold_entry.set_value(self.app.defaults["gerber_editor_ma_low"])
self.pad_direction_radio.set_value('CW') self.ma_lower_threshold_entry.set_value(self.app.defaults["gerber_editor_ma_high"])
self.pad_axis_radio.set_value('X')
self.apsize_entry.set_value(self.app.defaults["gerber_editor_newsize"])
self.aptype_cb.set_value(self.app.defaults["gerber_editor_newtype"])
self.apdim_entry.set_value(self.app.defaults["gerber_editor_newdim"])
self.pad_array_size_entry.set_value(self.app.defaults["gerber_editor_array_size"])
# linear array
self.pad_axis_radio.set_value(self.app.defaults["gerber_editor_lin_axis"])
self.pad_pitch_entry.set_value(self.app.defaults["gerber_editor_lin_pitch"])
self.linear_angle_spinner.set_value(self.app.defaults["gerber_editor_lin_angle"])
# circular array
self.pad_direction_radio.set_value(self.app.defaults["gerber_editor_circ_dir"])
self.pad_angle_entry.set_value(self.app.defaults["gerber_editor_circ_angle"])
def build_ui(self, first_run=None): def build_ui(self, first_run=None):
@ -3113,7 +3114,7 @@ class FlatCAMGrbEditor(QtCore.QObject):
self.apcode_entry.set_value(max(self.tool2tooldia.values()) + 1) self.apcode_entry.set_value(max(self.tool2tooldia.values()) + 1)
except ValueError: except ValueError:
# this means that the edited object has no apertures so we start with 10 (Gerber specifications) # this means that the edited object has no apertures so we start with 10 (Gerber specifications)
self.apcode_entry.set_value(10) self.apcode_entry.set_value(self.app.defaults["gerber_editor_newcode"])
def on_aperture_add(self, apid=None): def on_aperture_add(self, apid=None):
self.is_modified = True self.is_modified = True

File diff suppressed because it is too large Load Diff

View File

@ -76,7 +76,7 @@ class ObjectUI(QtWidgets.QWidget):
# ########################### # ###########################
# ### Scale #### # ### Scale ####
self.scale_label = QtWidgets.QLabel(_('<b>Scale:</b>')) self.scale_label = QtWidgets.QLabel('<b>%s:</b>' % _('Scale'))
self.scale_label.setToolTip( self.scale_label.setToolTip(
_("Change the size of the object.") _("Change the size of the object.")
) )
@ -86,7 +86,7 @@ class ObjectUI(QtWidgets.QWidget):
layout.addLayout(self.scale_grid) layout.addLayout(self.scale_grid)
# Factor # Factor
faclabel = QtWidgets.QLabel(_('Factor:')) faclabel = QtWidgets.QLabel('%s:' % _('Factor'))
faclabel.setToolTip( faclabel.setToolTip(
_("Factor by which to multiply\n" _("Factor by which to multiply\n"
"geometric features of this object.") "geometric features of this object.")
@ -105,7 +105,7 @@ class ObjectUI(QtWidgets.QWidget):
self.scale_grid.addWidget(self.scale_button, 0, 2) self.scale_grid.addWidget(self.scale_button, 0, 2)
# ### Offset #### # ### Offset ####
self.offset_label = QtWidgets.QLabel(_('<b>Offset:</b>')) self.offset_label = QtWidgets.QLabel('<b>%s:</b>' % _('Offset'))
self.offset_label.setToolTip( self.offset_label.setToolTip(
_("Change the position of this object.") _("Change the position of this object.")
) )
@ -114,7 +114,7 @@ class ObjectUI(QtWidgets.QWidget):
self.offset_grid = QtWidgets.QGridLayout() self.offset_grid = QtWidgets.QGridLayout()
layout.addLayout(self.offset_grid) layout.addLayout(self.offset_grid)
self.offset_vectorlabel = QtWidgets.QLabel(_('Vector:')) self.offset_vectorlabel = QtWidgets.QLabel('%s:' % _('Vector'))
self.offset_vectorlabel.setToolTip( self.offset_vectorlabel.setToolTip(
_("Amount by which to move the object\n" _("Amount by which to move the object\n"
"in the x and y axes in (x, y) format.") "in the x and y axes in (x, y) format.")
@ -189,7 +189,7 @@ class GerberObjectUI(ObjectUI):
self.custom_box.addLayout(hlay_plot) self.custom_box.addLayout(hlay_plot)
# ### Gerber Apertures #### # ### Gerber Apertures ####
self.apertures_table_label = QtWidgets.QLabel(_('<b>Apertures:</b>')) self.apertures_table_label = QtWidgets.QLabel('<b>%s:</b>' % _('Apertures'))
self.apertures_table_label.setToolTip( self.apertures_table_label.setToolTip(
_("Apertures Table for the Gerber Object.") _("Apertures Table for the Gerber Object.")
) )
@ -256,7 +256,7 @@ class GerberObjectUI(ObjectUI):
grid1 = QtWidgets.QGridLayout() grid1 = QtWidgets.QGridLayout()
self.custom_box.addLayout(grid1) self.custom_box.addLayout(grid1)
tdlabel = QtWidgets.QLabel(_('Tool dia:')) tdlabel = QtWidgets.QLabel('%s:' % _('Tool dia'))
tdlabel.setToolTip( tdlabel.setToolTip(
_("Diameter of the cutting tool.\n" _("Diameter of the cutting tool.\n"
"If you want to have an isolation path\n" "If you want to have an isolation path\n"
@ -269,7 +269,7 @@ class GerberObjectUI(ObjectUI):
self.iso_tool_dia_entry = LengthEntry() self.iso_tool_dia_entry = LengthEntry()
grid1.addWidget(self.iso_tool_dia_entry, 0, 1) grid1.addWidget(self.iso_tool_dia_entry, 0, 1)
passlabel = QtWidgets.QLabel(_('Passes:')) passlabel = QtWidgets.QLabel('%s:' % _('# Passes'))
passlabel.setToolTip( passlabel.setToolTip(
_("Width of the isolation gap in\n" _("Width of the isolation gap in\n"
"number (integer) of tool widths.") "number (integer) of tool widths.")
@ -280,7 +280,7 @@ class GerberObjectUI(ObjectUI):
self.iso_width_entry.setRange(1, 999) self.iso_width_entry.setRange(1, 999)
grid1.addWidget(self.iso_width_entry, 1, 1) grid1.addWidget(self.iso_width_entry, 1, 1)
overlabel = QtWidgets.QLabel(_('Pass overlap:')) overlabel = QtWidgets.QLabel('%s:' % _('Pass overlap'))
overlabel.setToolTip( overlabel.setToolTip(
_("How much (fraction) of the tool width to overlap each tool pass.\n" _("How much (fraction) of the tool width to overlap each tool pass.\n"
"Example:\n" "Example:\n"
@ -292,7 +292,7 @@ class GerberObjectUI(ObjectUI):
grid1.addWidget(self.iso_overlap_entry, 2, 1) grid1.addWidget(self.iso_overlap_entry, 2, 1)
# Milling Type Radio Button # Milling Type Radio Button
self.milling_type_label = QtWidgets.QLabel(_('Milling Type:')) self.milling_type_label = QtWidgets.QLabel('%s:' % _('Milling Type'))
self.milling_type_label.setToolTip( self.milling_type_label.setToolTip(
_("Milling type:\n" _("Milling type:\n"
"- climb / best for precision milling and to reduce tool usage\n" "- climb / best for precision milling and to reduce tool usage\n"
@ -304,7 +304,7 @@ class GerberObjectUI(ObjectUI):
grid1.addWidget(self.milling_type_radio, 3, 1) grid1.addWidget(self.milling_type_radio, 3, 1)
# combine all passes CB # combine all passes CB
self.combine_passes_cb = FCCheckBox(label=_('Combine')) self.combine_passes_cb = FCCheckBox(label=_('Combine Passes'))
self.combine_passes_cb.setToolTip( self.combine_passes_cb.setToolTip(
_("Combine all passes into one object") _("Combine all passes into one object")
) )
@ -425,7 +425,7 @@ class GerberObjectUI(ObjectUI):
self.custom_box.addLayout(grid4) self.custom_box.addLayout(grid4)
# Margin # Margin
bmlabel = QtWidgets.QLabel(_('Boundary Margin:')) bmlabel = QtWidgets.QLabel('%s:' % _('Boundary Margin'))
bmlabel.setToolTip( bmlabel.setToolTip(
_("Specify the edge of the PCB\n" _("Specify the edge of the PCB\n"
"by drawing a box around all\n" "by drawing a box around all\n"
@ -449,7 +449,7 @@ class GerberObjectUI(ObjectUI):
grid4.addWidget(self.generate_noncopper_button, 1, 1) grid4.addWidget(self.generate_noncopper_button, 1, 1)
# ## Bounding box # ## Bounding box
self.boundingbox_label = QtWidgets.QLabel(_('<b>Bounding Box:</b>')) self.boundingbox_label = QtWidgets.QLabel('<b>%s:</b>' % _('Bounding Box'))
self.boundingbox_label.setToolTip( self.boundingbox_label.setToolTip(
_("Create a geometry surrounding the Gerber object.\n" _("Create a geometry surrounding the Gerber object.\n"
"Square shape.") "Square shape.")
@ -459,7 +459,7 @@ class GerberObjectUI(ObjectUI):
grid5 = QtWidgets.QGridLayout() grid5 = QtWidgets.QGridLayout()
self.custom_box.addLayout(grid5) self.custom_box.addLayout(grid5)
bbmargin = QtWidgets.QLabel(_('Boundary Margin:')) bbmargin = QtWidgets.QLabel('%s:' % _('Boundary Margin'))
bbmargin.setToolTip( bbmargin.setToolTip(
_("Distance of the edges of the box\n" _("Distance of the edges of the box\n"
"to the nearest polygon.") "to the nearest polygon.")
@ -531,7 +531,7 @@ class ExcellonObjectUI(ObjectUI):
self.tools_box.addLayout(hlay_plot) self.tools_box.addLayout(hlay_plot)
# ### Tools Drills #### # ### Tools Drills ####
self.tools_table_label = QtWidgets.QLabel(_('<b>Tools Table</b>')) self.tools_table_label = QtWidgets.QLabel('<b>%s:</b>' % _('Tools Table'))
self.tools_table_label.setToolTip( self.tools_table_label.setToolTip(
_("Tools in this Excellon object\n" _("Tools in this Excellon object\n"
"when are used for drilling.") "when are used for drilling.")
@ -539,7 +539,7 @@ class ExcellonObjectUI(ObjectUI):
hlay_plot.addWidget(self.tools_table_label) hlay_plot.addWidget(self.tools_table_label)
# Plot CB # Plot CB
self.plot_cb = FCCheckBox(_('Plot Object')) self.plot_cb = FCCheckBox(_('Plot'))
self.plot_cb.setToolTip( self.plot_cb.setToolTip(
_("Plot (show) this object.") _("Plot (show) this object.")
) )
@ -579,7 +579,7 @@ class ExcellonObjectUI(ObjectUI):
self.tools_box.addWidget(self.empty_label) self.tools_box.addWidget(self.empty_label)
# ### Create CNC Job #### # ### Create CNC Job ####
self.cncjob_label = QtWidgets.QLabel(_('<b>Create CNC Job</b>')) self.cncjob_label = QtWidgets.QLabel('<b>%s</b>' % _('Create CNC Job'))
self.cncjob_label.setToolTip( self.cncjob_label.setToolTip(
_("Create a CNC Job object\n" _("Create a CNC Job object\n"
"for this drill object.") "for this drill object.")
@ -590,7 +590,7 @@ class ExcellonObjectUI(ObjectUI):
self.tools_box.addLayout(grid1) self.tools_box.addLayout(grid1)
# Cut Z # Cut Z
cutzlabel = QtWidgets.QLabel(_('Cut Z:')) cutzlabel = QtWidgets.QLabel('%s:' % _('Cut Z'))
cutzlabel.setToolTip( cutzlabel.setToolTip(
_("Drill depth (negative)\n" _("Drill depth (negative)\n"
"below the copper surface.") "below the copper surface.")
@ -600,7 +600,7 @@ class ExcellonObjectUI(ObjectUI):
grid1.addWidget(self.cutz_entry, 0, 1) grid1.addWidget(self.cutz_entry, 0, 1)
# Travel Z (z_move) # Travel Z (z_move)
travelzlabel = QtWidgets.QLabel(_('Travel Z:')) travelzlabel = QtWidgets.QLabel('%s:' % _('Travel Z'))
travelzlabel.setToolTip( travelzlabel.setToolTip(
_("Tool height when travelling\n" _("Tool height when travelling\n"
"across the XY plane.") "across the XY plane.")
@ -610,7 +610,7 @@ class ExcellonObjectUI(ObjectUI):
grid1.addWidget(self.travelz_entry, 1, 1) grid1.addWidget(self.travelz_entry, 1, 1)
# Tool change: # Tool change:
self.toolchange_cb = FCCheckBox(_("Tool change")) self.toolchange_cb = FCCheckBox('%s:' % _("Tool change"))
self.toolchange_cb.setToolTip( self.toolchange_cb.setToolTip(
_("Include tool-change sequence\n" _("Include tool-change sequence\n"
"in G-Code (Pause for tool change).") "in G-Code (Pause for tool change).")
@ -618,7 +618,7 @@ class ExcellonObjectUI(ObjectUI):
grid1.addWidget(self.toolchange_cb, 2, 0) grid1.addWidget(self.toolchange_cb, 2, 0)
# Tool change Z: # Tool change Z:
toolchzlabel = QtWidgets.QLabel(_("Tool change Z:")) toolchzlabel = QtWidgets.QLabel('%s:' % _("Tool change Z"))
toolchzlabel.setToolTip( toolchzlabel.setToolTip(
_("Z-axis position (height) for\n" _("Z-axis position (height) for\n"
"tool change.") "tool change.")
@ -629,9 +629,9 @@ class ExcellonObjectUI(ObjectUI):
self.ois_tcz_e = OptionalInputSection(self.toolchange_cb, [self.toolchangez_entry]) self.ois_tcz_e = OptionalInputSection(self.toolchange_cb, [self.toolchangez_entry])
# Start move Z: # Start move Z:
self.estartz_label = QtWidgets.QLabel(_("Start move Z:")) self.estartz_label = QtWidgets.QLabel('%s:' % _("Start move Z"))
self.estartz_label.setToolTip( self.estartz_label.setToolTip(
_("Tool height just before starting the work.\n" _("Height of the tool just after start.\n"
"Delete the value if you don't need this feature.") "Delete the value if you don't need this feature.")
) )
grid1.addWidget(self.estartz_label, 4, 0) grid1.addWidget(self.estartz_label, 4, 0)
@ -639,17 +639,17 @@ class ExcellonObjectUI(ObjectUI):
grid1.addWidget(self.estartz_entry, 4, 1) grid1.addWidget(self.estartz_entry, 4, 1)
# End move Z: # End move Z:
self.eendz_label = QtWidgets.QLabel(_("End move Z:")) self.eendz_label = QtWidgets.QLabel('%s:' % _("End move Z"))
self.eendz_label.setToolTip( self.eendz_label.setToolTip(
_("Z-axis position (height) for\n" _("Height of the tool after\n"
"the last move.") "the last move at the end of the job.")
) )
grid1.addWidget(self.eendz_label, 5, 0) grid1.addWidget(self.eendz_label, 5, 0)
self.eendz_entry = LengthEntry() self.eendz_entry = LengthEntry()
grid1.addWidget(self.eendz_entry, 5, 1) grid1.addWidget(self.eendz_entry, 5, 1)
# Excellon Feedrate # Excellon Feedrate
frlabel = QtWidgets.QLabel(_('Feedrate (Plunge):')) frlabel = QtWidgets.QLabel('%s:' % _('Feedrate (Plunge):'))
frlabel.setToolTip( frlabel.setToolTip(
_("Tool speed while drilling\n" _("Tool speed while drilling\n"
"(in units per minute).\n" "(in units per minute).\n"
@ -660,14 +660,13 @@ class ExcellonObjectUI(ObjectUI):
grid1.addWidget(self.feedrate_entry, 6, 1) grid1.addWidget(self.feedrate_entry, 6, 1)
# Excellon Rapid Feedrate # Excellon Rapid Feedrate
self.feedrate_rapid_label = QtWidgets.QLabel(_('Feedrate Rapids:')) self.feedrate_rapid_label = QtWidgets.QLabel('%s:' % _('Feedrate Rapids'))
self.feedrate_rapid_label.setToolTip( self.feedrate_rapid_label.setToolTip(
_("Tool speed while drilling\n" _("Tool speed while drilling\n"
"(in units per minute).\n" "(in units per minute).\n"
"This is for the rapid move G00.\n" "This is for the rapid move G00.\n"
"It is useful only for Marlin,\n" "It is useful only for Marlin,\n"
"ignore for any other cases." "ignore for any other cases.")
)
) )
grid1.addWidget(self.feedrate_rapid_label, 7, 0) grid1.addWidget(self.feedrate_rapid_label, 7, 0)
self.feedrate_rapid_entry = LengthEntry() self.feedrate_rapid_entry = LengthEntry()
@ -677,7 +676,7 @@ class ExcellonObjectUI(ObjectUI):
self.feedrate_rapid_entry.hide() self.feedrate_rapid_entry.hide()
# Spindlespeed # Spindlespeed
spdlabel = QtWidgets.QLabel(_('Spindle speed:')) spdlabel = QtWidgets.QLabel('%s:' % _('Spindle speed'))
spdlabel.setToolTip( spdlabel.setToolTip(
_("Speed of the spindle\n" _("Speed of the spindle\n"
"in RPM (optional)") "in RPM (optional)")
@ -687,14 +686,14 @@ class ExcellonObjectUI(ObjectUI):
grid1.addWidget(self.spindlespeed_entry, 8, 1) grid1.addWidget(self.spindlespeed_entry, 8, 1)
# Dwell # Dwell
self.dwell_cb = FCCheckBox(_('Dwell:')) self.dwell_cb = FCCheckBox('%s:' % _('Dwell'))
self.dwell_cb.setToolTip( self.dwell_cb.setToolTip(
_("Pause to allow the spindle to reach its\n" _("Pause to allow the spindle to reach its\n"
"speed before cutting.") "speed before cutting.")
) )
self.dwelltime_entry = FCEntry() self.dwelltime_entry = FCEntry()
self.dwelltime_entry.setToolTip( self.dwelltime_entry.setToolTip(
_("Number of milliseconds for spindle to dwell.") _("Number of time units for spindle to dwell.")
) )
grid1.addWidget(self.dwell_cb, 9, 0) grid1.addWidget(self.dwell_cb, 9, 0)
grid1.addWidget(self.dwelltime_entry, 9, 1) grid1.addWidget(self.dwelltime_entry, 9, 1)
@ -702,10 +701,10 @@ class ExcellonObjectUI(ObjectUI):
self.ois_dwell = OptionalInputSection(self.dwell_cb, [self.dwelltime_entry]) self.ois_dwell = OptionalInputSection(self.dwell_cb, [self.dwelltime_entry])
# postprocessor selection # postprocessor selection
pp_excellon_label = QtWidgets.QLabel(_("Postprocessor:")) pp_excellon_label = QtWidgets.QLabel('%s:' % _("Postprocessor"))
pp_excellon_label.setToolTip( pp_excellon_label.setToolTip(
_("The json file that dictates\n" _("The postprocessor JSON file that dictates\n"
"gcode output.") "Gcode output.")
) )
self.pp_excellon_name_cb = FCComboBox() self.pp_excellon_name_cb = FCComboBox()
self.pp_excellon_name_cb.setFocusPolicy(QtCore.Qt.StrongFocus) self.pp_excellon_name_cb.setFocusPolicy(QtCore.Qt.StrongFocus)
@ -713,7 +712,7 @@ class ExcellonObjectUI(ObjectUI):
grid1.addWidget(self.pp_excellon_name_cb, 10, 1) grid1.addWidget(self.pp_excellon_name_cb, 10, 1)
# Probe depth # Probe depth
self.pdepth_label = QtWidgets.QLabel(_("Probe Z depth:")) self.pdepth_label = QtWidgets.QLabel('%s:' % _("Probe Z depth"))
self.pdepth_label.setToolTip( self.pdepth_label.setToolTip(
_("The maximum depth that the probe is allowed\n" _("The maximum depth that the probe is allowed\n"
"to probe. Negative value, in current units.") "to probe. Negative value, in current units.")
@ -725,7 +724,7 @@ class ExcellonObjectUI(ObjectUI):
self.pdepth_entry.setVisible(False) self.pdepth_entry.setVisible(False)
# Probe feedrate # Probe feedrate
self.feedrate_probe_label = QtWidgets.QLabel(_("Feedrate Probe:")) self.feedrate_probe_label = QtWidgets.QLabel('%s:' % _("Feedrate Probe"))
self.feedrate_probe_label.setToolTip( self.feedrate_probe_label.setToolTip(
_("The feedrate used while the probe is probing.") _("The feedrate used while the probe is probing.")
) )
@ -743,7 +742,7 @@ class ExcellonObjectUI(ObjectUI):
# ### Choose what to use for Gcode creation: Drills, Slots or Both # ### Choose what to use for Gcode creation: Drills, Slots or Both
gcode_box = QtWidgets.QFormLayout() gcode_box = QtWidgets.QFormLayout()
gcode_type_label = QtWidgets.QLabel(_('<b>Type: </b>')) gcode_type_label = QtWidgets.QLabel('<b>%s</b>' % _('Gcode'))
gcode_type_label.setToolTip( gcode_type_label.setToolTip(
_("Choose what to use for GCode generation:\n" _("Choose what to use for GCode generation:\n"
"'Drills', 'Slots' or 'Both'.\n" "'Drills', 'Slots' or 'Both'.\n"
@ -767,7 +766,7 @@ class ExcellonObjectUI(ObjectUI):
self.tools_box.addWidget(self.generate_cnc_button) self.tools_box.addWidget(self.generate_cnc_button)
# ### Milling Holes Drills #### # ### Milling Holes Drills ####
self.mill_hole_label = QtWidgets.QLabel(_('<b>Mill Holes</b>')) self.mill_hole_label = QtWidgets.QLabel('<b>%s</b>' % _('Mill Holes'))
self.mill_hole_label.setToolTip( self.mill_hole_label.setToolTip(
_("Create Geometry for milling holes.") _("Create Geometry for milling holes.")
) )
@ -781,7 +780,7 @@ class ExcellonObjectUI(ObjectUI):
grid2 = QtWidgets.QGridLayout() grid2 = QtWidgets.QGridLayout()
self.tools_box.addLayout(grid2) self.tools_box.addLayout(grid2)
self.tdlabel = QtWidgets.QLabel(_('Drills Tool dia:')) self.tdlabel = QtWidgets.QLabel('%s:' % _('Drill Tool dia'))
self.tdlabel.setToolTip( self.tdlabel.setToolTip(
_("Diameter of the cutting tool.") _("Diameter of the cutting tool.")
) )
@ -797,9 +796,10 @@ class ExcellonObjectUI(ObjectUI):
grid3 = QtWidgets.QGridLayout() grid3 = QtWidgets.QGridLayout()
self.custom_box.addLayout(grid3) self.custom_box.addLayout(grid3)
self.stdlabel = QtWidgets.QLabel(_('Slots Tool dia:')) self.stdlabel = QtWidgets.QLabel('%s:' % _('Slot Tool dia'))
self.stdlabel.setToolTip( self.stdlabel.setToolTip(
_("Diameter of the cutting tool.") _("Diameter of the cutting tool\n"
"when milling slots.")
) )
grid3.addWidget(self.stdlabel, 0, 0) grid3.addWidget(self.stdlabel, 0, 0)
self.slot_tooldia_entry = LengthEntry() self.slot_tooldia_entry = LengthEntry()
@ -853,7 +853,7 @@ class GeometryObjectUI(ObjectUI):
self.geo_tools_box.addLayout(hlay_plot) self.geo_tools_box.addLayout(hlay_plot)
# ### Tools #### # ### Tools ####
self.tools_table_label = QtWidgets.QLabel(_('<b>Tools Table</b>')) self.tools_table_label = QtWidgets.QLabel('<b>%s:</b>' % _('Tools Table'))
self.tools_table_label.setToolTip( self.tools_table_label.setToolTip(
_("Tools in this Geometry object used for cutting.\n" _("Tools in this Geometry object used for cutting.\n"
"The 'Offset' entry will set an offset for the cut.\n" "The 'Offset' entry will set an offset for the cut.\n"
@ -945,7 +945,7 @@ class GeometryObjectUI(ObjectUI):
self.grid1 = QtWidgets.QGridLayout() self.grid1 = QtWidgets.QGridLayout()
self.geo_tools_box.addLayout(self.grid1) self.geo_tools_box.addLayout(self.grid1)
self.tool_offset_lbl = QtWidgets.QLabel(_('Tool Offset:')) self.tool_offset_lbl = QtWidgets.QLabel('%s:' % _('Tool Offset'))
self.tool_offset_lbl.setToolTip( self.tool_offset_lbl.setToolTip(
_( _(
"The value to offset the cut when \n" "The value to offset the cut when \n"
@ -971,7 +971,7 @@ class GeometryObjectUI(ObjectUI):
# self.addtool_label.setToolTip( # self.addtool_label.setToolTip(
# "Add/Copy/Delete a tool to the tool list." # "Add/Copy/Delete a tool to the tool list."
# ) # )
self.addtool_entry_lbl = QtWidgets.QLabel(_('<b>Tool Dia:</b>')) self.addtool_entry_lbl = QtWidgets.QLabel('<b>%s:</b>' % _('Tool Dia'))
self.addtool_entry_lbl.setToolTip( self.addtool_entry_lbl.setToolTip(
_( _(
"Diameter for the new tool" "Diameter for the new tool"
@ -1022,7 +1022,7 @@ class GeometryObjectUI(ObjectUI):
# Create CNC Job ### # Create CNC Job ###
# ################## # ##################
# ### Tools Data ## ## # ### Tools Data ## ##
self.tool_data_label = QtWidgets.QLabel(_('<b>Tool Data</b>')) self.tool_data_label = QtWidgets.QLabel('<b>%s</b>' % _('Tool Data'))
self.tool_data_label.setToolTip( self.tool_data_label.setToolTip(
_( _(
"The data used for creating GCode.\n" "The data used for creating GCode.\n"
@ -1043,7 +1043,7 @@ class GeometryObjectUI(ObjectUI):
self.geo_param_box.addLayout(self.grid3) self.geo_param_box.addLayout(self.grid3)
# Tip Dia # Tip Dia
self.tipdialabel = QtWidgets.QLabel(_('V-Tip Dia:')) self.tipdialabel = QtWidgets.QLabel('%s:' % _('V-Tip Dia'))
self.tipdialabel.setToolTip( self.tipdialabel.setToolTip(
_( _(
"The tip diameter for V-Shape Tool" "The tip diameter for V-Shape Tool"
@ -1054,7 +1054,7 @@ class GeometryObjectUI(ObjectUI):
self.grid3.addWidget(self.tipdia_entry, 1, 1) self.grid3.addWidget(self.tipdia_entry, 1, 1)
# Tip Angle # Tip Angle
self.tipanglelabel = QtWidgets.QLabel(_('V-Tip Angle:')) self.tipanglelabel = QtWidgets.QLabel('%s:' % _('V-Tip Angle'))
self.tipanglelabel.setToolTip( self.tipanglelabel.setToolTip(
_( _(
"The tip angle for V-Shape Tool.\n" "The tip angle for V-Shape Tool.\n"
@ -1066,7 +1066,7 @@ class GeometryObjectUI(ObjectUI):
self.grid3.addWidget(self.tipangle_entry, 2, 1) self.grid3.addWidget(self.tipangle_entry, 2, 1)
# Cut Z # Cut Z
cutzlabel = QtWidgets.QLabel(_('Cut Z:')) cutzlabel = QtWidgets.QLabel('%s:' % _('Cut Z'))
cutzlabel.setToolTip( cutzlabel.setToolTip(
_( _(
"Cutting depth (negative)\n" "Cutting depth (negative)\n"
@ -1078,15 +1078,13 @@ class GeometryObjectUI(ObjectUI):
self.grid3.addWidget(self.cutz_entry, 3, 1) self.grid3.addWidget(self.cutz_entry, 3, 1)
# Multi-pass # Multi-pass
self.mpass_cb = FCCheckBox(_("Multi-Depth:")) self.mpass_cb = FCCheckBox('%s:' % _("Multi-Depth"))
self.mpass_cb.setToolTip( self.mpass_cb.setToolTip(
_( _(
"Use multiple passes to limit\n" "Use multiple passes to limit\n"
"the cut depth in each pass. Will\n" "the cut depth in each pass. Will\n"
"cut multiple times until Cut Z is\n" "cut multiple times until Cut Z is\n"
"reached.\n" "reached."
"To the right, input the depth of \n"
"each pass (positive value)."
) )
) )
self.grid3.addWidget(self.mpass_cb, 4, 0) self.grid3.addWidget(self.mpass_cb, 4, 0)
@ -1102,12 +1100,10 @@ class GeometryObjectUI(ObjectUI):
self.ois_mpass_geo = OptionalInputSection(self.mpass_cb, [self.maxdepth_entry]) self.ois_mpass_geo = OptionalInputSection(self.mpass_cb, [self.maxdepth_entry])
# Travel Z # Travel Z
travelzlabel = QtWidgets.QLabel(_('Travel Z:')) travelzlabel = QtWidgets.QLabel('%s:' % _('Travel Z'))
travelzlabel.setToolTip( travelzlabel.setToolTip(
_( _("Height of the tool when\n"
"Height of the tool when\n" "moving without cutting.")
"moving without cutting."
)
) )
self.grid3.addWidget(travelzlabel, 5, 0) self.grid3.addWidget(travelzlabel, 5, 0)
self.travelz_entry = FloatEntry() self.travelz_entry = FloatEntry()
@ -1115,14 +1111,14 @@ class GeometryObjectUI(ObjectUI):
# Tool change: # Tool change:
self.toolchzlabel = QtWidgets.QLabel(_("Tool change Z:")) self.toolchzlabel = QtWidgets.QLabel('%s:' %_("Tool change Z"))
self.toolchzlabel.setToolTip( self.toolchzlabel.setToolTip(
_( _(
"Z-axis position (height) for\n" "Z-axis position (height) for\n"
"tool change." "tool change."
) )
) )
self.toolchangeg_cb = FCCheckBox(_("Tool change")) self.toolchangeg_cb = FCCheckBox('%s:' % _("Tool change"))
self.toolchangeg_cb.setToolTip( self.toolchangeg_cb.setToolTip(
_( _(
"Include tool-change sequence\n" "Include tool-change sequence\n"
@ -1148,52 +1144,44 @@ class GeometryObjectUI(ObjectUI):
# self.grid3.addWidget(self.gstartz_entry, 8, 1) # self.grid3.addWidget(self.gstartz_entry, 8, 1)
# The Z value for the end move # The Z value for the end move
self.endzlabel = QtWidgets.QLabel(_('End move Z:')) self.endzlabel = QtWidgets.QLabel('%s:' % _('End move Z'))
self.endzlabel.setToolTip( self.endzlabel.setToolTip(
_( _("Height of the tool after\n"
"This is the height (Z) at which the CNC\n" "the last move at the end of the job.")
"will go as the last move."
)
) )
self.grid3.addWidget(self.endzlabel, 9, 0) self.grid3.addWidget(self.endzlabel, 9, 0)
self.gendz_entry = FloatEntry() self.gendz_entry = FloatEntry()
self.grid3.addWidget(self.gendz_entry, 9, 1) self.grid3.addWidget(self.gendz_entry, 9, 1)
# Feedrate X-Y # Feedrate X-Y
frlabel = QtWidgets.QLabel(_('Feed Rate X-Y:')) frlabel = QtWidgets.QLabel('%s:' % _('Feed Rate X-Y'))
frlabel.setToolTip( frlabel.setToolTip(
_( _("Cutting speed in the XY\n"
"Cutting speed in the XY\n" "plane in units per minute")
"plane in units per minute"
)
) )
self.grid3.addWidget(frlabel, 10, 0) self.grid3.addWidget(frlabel, 10, 0)
self.cncfeedrate_entry = FloatEntry() self.cncfeedrate_entry = FloatEntry()
self.grid3.addWidget(self.cncfeedrate_entry, 10, 1) self.grid3.addWidget(self.cncfeedrate_entry, 10, 1)
# Feedrate Z (Plunge) # Feedrate Z (Plunge)
frzlabel = QtWidgets.QLabel(_('Feed Rate Z (Plunge):')) frzlabel = QtWidgets.QLabel('%s:' % _('Feed Rate Z'))
frzlabel.setToolTip( frzlabel.setToolTip(
_( _("Cutting speed in the XY\n"
"Cutting speed in the Z\n" "plane in units per minute.\n"
"plane in units per minute" "It is called also Plunge.")
)
) )
self.grid3.addWidget(frzlabel, 11, 0) self.grid3.addWidget(frzlabel, 11, 0)
self.cncplunge_entry = FloatEntry() self.cncplunge_entry = FloatEntry()
self.grid3.addWidget(self.cncplunge_entry, 11, 1) self.grid3.addWidget(self.cncplunge_entry, 11, 1)
# Feedrate rapids # Feedrate rapids
self.fr_rapidlabel = QtWidgets.QLabel(_('Feed Rate Rapids:')) self.fr_rapidlabel = QtWidgets.QLabel('%s:' % _('Feed Rate Rapids'))
self.fr_rapidlabel.setToolTip( self.fr_rapidlabel.setToolTip(
_( _("Cutting speed in the XY plane\n"
"Cutting speed in the XY\n"
"plane in units per minute\n"
"(in units per minute).\n" "(in units per minute).\n"
"This is for the rapid move G00.\n" "This is for the rapid move G00.\n"
"It is useful only for Marlin,\n" "It is useful only for Marlin,\n"
"ignore for any other cases." "ignore for any other cases.")
)
) )
self.grid3.addWidget(self.fr_rapidlabel, 12, 0) self.grid3.addWidget(self.fr_rapidlabel, 12, 0)
self.cncfeedrate_rapid_entry = FloatEntry() self.cncfeedrate_rapid_entry = FloatEntry()
@ -1203,19 +1191,17 @@ class GeometryObjectUI(ObjectUI):
self.cncfeedrate_rapid_entry.hide() self.cncfeedrate_rapid_entry.hide()
# Cut over 1st point in path # Cut over 1st point in path
self.extracut_cb = FCCheckBox(_('Cut over 1st pt')) self.extracut_cb = FCCheckBox('%s' % _('Re-cut 1st pt.'))
self.extracut_cb.setToolTip( self.extracut_cb.setToolTip(
_( _("In order to remove possible\n"
"In order to remove possible\n" "copper leftovers where first cut\n"
"copper leftovers where first cut\n" "meet with last cut, we generate an\n"
"meet with last cut, we generate an\n" "extended cut over the first cut section.")
"extended cut over the first cut section."
)
) )
self.grid3.addWidget(self.extracut_cb, 13, 0) self.grid3.addWidget(self.extracut_cb, 13, 0)
# Spindlespeed # Spindlespeed
spdlabel = QtWidgets.QLabel(_('Spindle speed:')) spdlabel = QtWidgets.QLabel('%s:' % _('Spindle speed'))
spdlabel.setToolTip( spdlabel.setToolTip(
_( _(
"Speed of the spindle in RPM (optional).\n" "Speed of the spindle in RPM (optional).\n"
@ -1228,7 +1214,7 @@ class GeometryObjectUI(ObjectUI):
self.grid3.addWidget(self.cncspindlespeed_entry, 14, 1) self.grid3.addWidget(self.cncspindlespeed_entry, 14, 1)
# Dwell # Dwell
self.dwell_cb = FCCheckBox(_('Dwell:')) self.dwell_cb = FCCheckBox('%s:' % _('Dwell'))
self.dwell_cb.setToolTip( self.dwell_cb.setToolTip(
_( _(
"Pause to allow the spindle to reach its\n" "Pause to allow the spindle to reach its\n"
@ -1237,9 +1223,7 @@ class GeometryObjectUI(ObjectUI):
) )
self.dwelltime_entry = FloatEntry() self.dwelltime_entry = FloatEntry()
self.dwelltime_entry.setToolTip( self.dwelltime_entry.setToolTip(
_( _("Number of time units for spindle to dwell.")
"Number of milliseconds for spindle to dwell."
)
) )
self.grid3.addWidget(self.dwell_cb, 15, 0) self.grid3.addWidget(self.dwell_cb, 15, 0)
self.grid3.addWidget(self.dwelltime_entry, 15, 1) self.grid3.addWidget(self.dwelltime_entry, 15, 1)
@ -1247,12 +1231,10 @@ class GeometryObjectUI(ObjectUI):
self.ois_dwell_geo = OptionalInputSection(self.dwell_cb, [self.dwelltime_entry]) self.ois_dwell_geo = OptionalInputSection(self.dwell_cb, [self.dwelltime_entry])
# postprocessor selection # postprocessor selection
pp_label = QtWidgets.QLabel(_("PostProcessor:")) pp_label = QtWidgets.QLabel('%s:' % _("PostProcessor"))
pp_label.setToolTip( pp_label.setToolTip(
_( _("The Postprocessor file that dictates\n"
"The Postprocessor file that dictates\n" "the Machine Code (like GCode, RML, HPGL) output.")
"the Machine Code (like GCode, RML, HPGL) output."
)
) )
self.grid3.addWidget(pp_label, 16, 0) self.grid3.addWidget(pp_label, 16, 0)
self.pp_geometry_name_cb = FCComboBox() self.pp_geometry_name_cb = FCComboBox()
@ -1260,12 +1242,10 @@ class GeometryObjectUI(ObjectUI):
self.grid3.addWidget(self.pp_geometry_name_cb, 16, 1) self.grid3.addWidget(self.pp_geometry_name_cb, 16, 1)
# Probe depth # Probe depth
self.pdepth_label = QtWidgets.QLabel(_("Probe Z depth:")) self.pdepth_label = QtWidgets.QLabel('%s:' % _("Probe Z depth"))
self.pdepth_label.setToolTip( self.pdepth_label.setToolTip(
_( _("The maximum depth that the probe is allowed\n"
"The maximum depth that the probe is allowed\n" "to probe. Negative value, in current units.")
"to probe. Negative value, in current units."
)
) )
self.grid3.addWidget(self.pdepth_label, 17, 0) self.grid3.addWidget(self.pdepth_label, 17, 0)
self.pdepth_entry = FCEntry() self.pdepth_entry = FCEntry()
@ -1274,11 +1254,9 @@ class GeometryObjectUI(ObjectUI):
self.pdepth_entry.setVisible(False) self.pdepth_entry.setVisible(False)
# Probe feedrate # Probe feedrate
self.feedrate_probe_label = QtWidgets.QLabel(_("Feedrate Probe:")) self.feedrate_probe_label = QtWidgets.QLabel('%s:' % _("Feedrate Probe"))
self.feedrate_probe_label.setToolTip( self.feedrate_probe_label.setToolTip(
_( _("The feedrate used while the probe is probing.")
"The feedrate used while the probe is probing."
)
) )
self.grid3.addWidget(self.feedrate_probe_label, 18, 0) self.grid3.addWidget(self.feedrate_probe_label, 18, 0)
self.feedrate_probe_entry = FCEntry() self.feedrate_probe_entry = FCEntry()
@ -1297,16 +1275,14 @@ class GeometryObjectUI(ObjectUI):
# Button # Button
self.generate_cnc_button = QtWidgets.QPushButton(_('Generate')) self.generate_cnc_button = QtWidgets.QPushButton(_('Generate'))
self.generate_cnc_button.setToolTip( self.generate_cnc_button.setToolTip(
_( _("Generate the CNC Job object.")
"Generate the CNC Job object."
)
) )
self.geo_param_box.addWidget(self.generate_cnc_button) self.geo_param_box.addWidget(self.generate_cnc_button)
# ############## # ##############
# Paint area ## # Paint area ##
# ############## # ##############
self.paint_label = QtWidgets.QLabel(_('<b>Paint Area:</b>')) self.paint_label = QtWidgets.QLabel('<b>%s</b>' % _('Paint Area'))
self.paint_label.setToolTip( self.paint_label.setToolTip(
_( _(
"Creates tool paths to cover the\n" "Creates tool paths to cover the\n"
@ -1320,9 +1296,7 @@ class GeometryObjectUI(ObjectUI):
# GO Button # GO Button
self.paint_tool_button = QtWidgets.QPushButton(_('Paint Tool')) self.paint_tool_button = QtWidgets.QPushButton(_('Paint Tool'))
self.paint_tool_button.setToolTip( self.paint_tool_button.setToolTip(
_( _("Launch Paint Tool in Tools Tab.")
"Launch Paint Tool in Tools Tab."
)
) )
self.geo_tools_box.addWidget(self.paint_tool_button) self.geo_tools_box.addWidget(self.paint_tool_button)
@ -1444,7 +1418,7 @@ class CNCObjectUI(ObjectUI):
self.custom_box.addLayout(hlay) self.custom_box.addLayout(hlay)
# CNC Tools Table for plot # CNC Tools Table for plot
self.cnc_tools_table_label = QtWidgets.QLabel(_('<b>CNC Tools Table</b>')) self.cnc_tools_table_label = QtWidgets.QLabel('<b>%s</b>' % _('CNC Tools Table'))
self.cnc_tools_table_label.setToolTip( self.cnc_tools_table_label.setToolTip(
_( _(
"Tools in this CNCJob object used for cutting.\n" "Tools in this CNCJob object used for cutting.\n"
@ -1464,9 +1438,7 @@ class CNCObjectUI(ObjectUI):
# self.plot_cb = QtWidgets.QCheckBox('Plot') # self.plot_cb = QtWidgets.QCheckBox('Plot')
self.plot_cb = FCCheckBox(_('Plot Object')) self.plot_cb = FCCheckBox(_('Plot Object'))
self.plot_cb.setToolTip( self.plot_cb.setToolTip(
_( _("Plot (show) this object.")
"Plot (show) this object."
)
) )
self.plot_cb.setLayoutDirection(QtCore.Qt.RightToLeft) self.plot_cb.setLayoutDirection(QtCore.Qt.RightToLeft)
hlay.addStretch() hlay.addStretch()
@ -1499,17 +1471,15 @@ class CNCObjectUI(ObjectUI):
self.export_gcode_label = QtWidgets.QLabel("<b>%s:</b>" % _("Export CNC Code")) self.export_gcode_label = QtWidgets.QLabel("<b>%s:</b>" % _("Export CNC Code"))
self.export_gcode_label.setToolTip( self.export_gcode_label.setToolTip(
_("Export and save G-Code to\n" _("Export and save G-Code to\n"
"make this object to a file.") "make this object to a file.")
) )
self.custom_box.addWidget(self.export_gcode_label) self.custom_box.addWidget(self.export_gcode_label)
# Prepend text to GCode # Prepend text to GCode
prependlabel = QtWidgets.QLabel(_('Prepend to CNC Code:')) prependlabel = QtWidgets.QLabel('%s:' % _('Prepend to CNC Code'))
prependlabel.setToolTip( prependlabel.setToolTip(
_( _("Type here any G-Code commands you would\n"
"Type here any G-Code commands you would\n" "like to add at the beginning of the G-Code file.")
"like to add to the beginning of the generated file."
)
) )
self.custom_box.addWidget(prependlabel) self.custom_box.addWidget(prependlabel)
@ -1517,13 +1487,11 @@ class CNCObjectUI(ObjectUI):
self.custom_box.addWidget(self.prepend_text) self.custom_box.addWidget(self.prepend_text)
# Append text to GCode # Append text to GCode
appendlabel = QtWidgets.QLabel(_('Append to CNC Code:')) appendlabel = QtWidgets.QLabel('%s:' % _('Append to CNC Code'))
appendlabel.setToolTip( appendlabel.setToolTip(
_( _("Type here any G-Code commands you would\n"
"Type here any G-Code commands you would\n" "like to append to the generated file.\n"
"like to append to the generated file.\n" "I.e.: M2 (End of program)")
"I.e.: M2 (End of program)"
)
) )
self.custom_box.addWidget(appendlabel) self.custom_box.addWidget(appendlabel)
@ -1538,7 +1506,7 @@ class CNCObjectUI(ObjectUI):
self.cnc_frame.setLayout(self.cnc_box) self.cnc_frame.setLayout(self.cnc_box)
# Toolchange Custom G-Code # Toolchange Custom G-Code
self.toolchangelabel = QtWidgets.QLabel(_('Toolchange G-Code:')) self.toolchangelabel = QtWidgets.QLabel('%s:' % _('Toolchange G-Code'))
self.toolchangelabel.setToolTip( self.toolchangelabel.setToolTip(
_( _(
"Type here any G-Code commands you would\n" "Type here any G-Code commands you would\n"
@ -1560,12 +1528,10 @@ class CNCObjectUI(ObjectUI):
self.cnc_box.addLayout(cnclay) self.cnc_box.addLayout(cnclay)
# Toolchange Replacement Enable # Toolchange Replacement Enable
self.toolchange_cb = FCCheckBox(label=_('Use Toolchange Macro')) self.toolchange_cb = FCCheckBox(label='%s' % _('Use Toolchange Macro'))
self.toolchange_cb.setToolTip( self.toolchange_cb.setToolTip(
_( _("Check this box if you want to use\n"
"Check this box if you want to use\n" "a Custom Toolchange GCode (macro).")
"a Custom Toolchange GCode (macro)."
)
) )
# Variable list # Variable list
@ -1611,19 +1577,15 @@ class CNCObjectUI(ObjectUI):
# Edit GCode Button # Edit GCode Button
self.modify_gcode_button = QtWidgets.QPushButton(_('View CNC Code')) self.modify_gcode_button = QtWidgets.QPushButton(_('View CNC Code'))
self.modify_gcode_button.setToolTip( self.modify_gcode_button.setToolTip(
_( _("Opens TAB to view/modify/print G-Code\n"
"Opens TAB to view/modify/print G-Code\n" "file.")
"file."
)
) )
# GO Button # GO Button
self.export_gcode_button = QtWidgets.QPushButton(_('Save CNC Code')) self.export_gcode_button = QtWidgets.QPushButton(_('Save CNC Code'))
self.export_gcode_button.setToolTip( self.export_gcode_button.setToolTip(
_( _("Opens dialog to save G-Code\n"
"Opens dialog to save G-Code\n" "file.")
"file."
)
) )
h_lay.addWidget(self.modify_gcode_button) h_lay.addWidget(self.modify_gcode_button)

View File

@ -89,28 +89,29 @@ class ToolCalculator(FlatCAMTool):
form_layout = QtWidgets.QFormLayout() form_layout = QtWidgets.QFormLayout()
self.layout.addLayout(form_layout) self.layout.addLayout(form_layout)
self.tipDia_label = QtWidgets.QLabel(_("Tip Diameter:")) self.tipDia_label = QtWidgets.QLabel('%s:' % _("Tip Diameter"))
self.tipDia_entry = FCEntry() self.tipDia_entry = FCEntry()
# self.tipDia_entry.setFixedWidth(70) # self.tipDia_entry.setFixedWidth(70)
self.tipDia_entry.setAlignment(QtCore.Qt.AlignRight | QtCore.Qt.AlignVCenter) self.tipDia_entry.setAlignment(QtCore.Qt.AlignRight | QtCore.Qt.AlignVCenter)
self.tipDia_label.setToolTip(_('This is the diameter of the tool tip.\n' self.tipDia_label.setToolTip(
'The manufacturer specifies it.')) _("This is the tool tip diameter.\n"
"It is specified by manufacturer.")
self.tipAngle_label = QtWidgets.QLabel(_("Tip Angle:")) )
self.tipAngle_label = QtWidgets.QLabel('%s:' % _("Tip Angle"))
self.tipAngle_entry = FCEntry() self.tipAngle_entry = FCEntry()
# self.tipAngle_entry.setFixedWidth(70) # self.tipAngle_entry.setFixedWidth(70)
self.tipAngle_entry.setAlignment(QtCore.Qt.AlignRight | QtCore.Qt.AlignVCenter) self.tipAngle_entry.setAlignment(QtCore.Qt.AlignRight | QtCore.Qt.AlignVCenter)
self.tipAngle_label.setToolTip(_("This is the angle of the tip of the tool.\n" self.tipAngle_label.setToolTip(_("This is the angle of the tip of the tool.\n"
"It is specified by manufacturer.")) "It is specified by manufacturer."))
self.cutDepth_label = QtWidgets.QLabel(_("Cut Z:")) self.cutDepth_label = QtWidgets.QLabel('%s:' % _("Cut Z"))
self.cutDepth_entry = FCEntry() self.cutDepth_entry = FCEntry()
# self.cutDepth_entry.setFixedWidth(70) # self.cutDepth_entry.setFixedWidth(70)
self.cutDepth_entry.setAlignment(QtCore.Qt.AlignRight | QtCore.Qt.AlignVCenter) self.cutDepth_entry.setAlignment(QtCore.Qt.AlignRight | QtCore.Qt.AlignVCenter)
self.cutDepth_label.setToolTip(_("This is the depth to cut into the material.\n" self.cutDepth_label.setToolTip(_("This is the depth to cut into the material.\n"
"In the CNCJob is the CutZ parameter.")) "In the CNCJob is the CutZ parameter."))
self.effectiveToolDia_label = QtWidgets.QLabel(_("Tool Diameter:")) self.effectiveToolDia_label = QtWidgets.QLabel('%s:' % _("Tool Diameter"))
self.effectiveToolDia_entry = FCEntry() self.effectiveToolDia_entry = FCEntry()
# self.effectiveToolDia_entry.setFixedWidth(70) # self.effectiveToolDia_entry.setFixedWidth(70)
self.effectiveToolDia_entry.setAlignment(QtCore.Qt.AlignRight | QtCore.Qt.AlignVCenter) self.effectiveToolDia_entry.setAlignment(QtCore.Qt.AlignRight | QtCore.Qt.AlignVCenter)
@ -154,26 +155,26 @@ class ToolCalculator(FlatCAMTool):
plate_form_layout = QtWidgets.QFormLayout() plate_form_layout = QtWidgets.QFormLayout()
self.layout.addLayout(plate_form_layout) self.layout.addLayout(plate_form_layout)
self.pcblengthlabel = QtWidgets.QLabel(_("Board Length:")) self.pcblengthlabel = QtWidgets.QLabel('%s:' % _("Board Length"))
self.pcblength_entry = FCEntry() self.pcblength_entry = FCEntry()
# self.pcblengthlabel.setFixedWidth(70) # self.pcblengthlabel.setFixedWidth(70)
self.pcblength_entry.setAlignment(QtCore.Qt.AlignRight | QtCore.Qt.AlignVCenter) self.pcblength_entry.setAlignment(QtCore.Qt.AlignRight | QtCore.Qt.AlignVCenter)
self.pcblengthlabel.setToolTip(_('This is the board length. In centimeters.')) self.pcblengthlabel.setToolTip(_('This is the board length. In centimeters.'))
self.pcbwidthlabel = QtWidgets.QLabel(_("Board Width:")) self.pcbwidthlabel = QtWidgets.QLabel('%s:' % _("Board Width"))
self.pcbwidth_entry = FCEntry() self.pcbwidth_entry = FCEntry()
# self.pcbwidthlabel.setFixedWidth(70) # self.pcbwidthlabel.setFixedWidth(70)
self.pcbwidth_entry.setAlignment(QtCore.Qt.AlignRight | QtCore.Qt.AlignVCenter) self.pcbwidth_entry.setAlignment(QtCore.Qt.AlignRight | QtCore.Qt.AlignVCenter)
self.pcbwidthlabel.setToolTip(_('This is the board width.In centimeters.')) self.pcbwidthlabel.setToolTip(_('This is the board width.In centimeters.'))
self.cdensity_label = QtWidgets.QLabel(_("Current Density:")) self.cdensity_label = QtWidgets.QLabel('%s:' % _("Current Density"))
self.cdensity_entry = FCEntry() self.cdensity_entry = FCEntry()
# self.cdensity_entry.setFixedWidth(70) # self.cdensity_entry.setFixedWidth(70)
self.cdensity_entry.setAlignment(QtCore.Qt.AlignRight | QtCore.Qt.AlignVCenter) self.cdensity_entry.setAlignment(QtCore.Qt.AlignRight | QtCore.Qt.AlignVCenter)
self.cdensity_label.setToolTip(_("Current density to pass through the board. \n" self.cdensity_label.setToolTip(_("Current density to pass through the board. \n"
"In Amps per Square Feet ASF.")) "In Amps per Square Feet ASF."))
self.growth_label = QtWidgets.QLabel(_("Copper Growth:")) self.growth_label = QtWidgets.QLabel('%s:' % _("Copper Growth"))
self.growth_entry = FCEntry() self.growth_entry = FCEntry()
# self.growth_entry.setFixedWidth(70) # self.growth_entry.setFixedWidth(70)
self.growth_entry.setAlignment(QtCore.Qt.AlignRight | QtCore.Qt.AlignVCenter) self.growth_entry.setAlignment(QtCore.Qt.AlignRight | QtCore.Qt.AlignVCenter)
@ -182,7 +183,7 @@ class ToolCalculator(FlatCAMTool):
# self.growth_entry.setEnabled(False) # self.growth_entry.setEnabled(False)
self.cvaluelabel = QtWidgets.QLabel(_("Current Value:")) self.cvaluelabel = QtWidgets.QLabel('%s:' % _("Current Value"))
self.cvalue_entry = FCEntry() self.cvalue_entry = FCEntry()
# self.cvaluelabel.setFixedWidth(70) # self.cvaluelabel.setFixedWidth(70)
self.cvalue_entry.setAlignment(QtCore.Qt.AlignRight | QtCore.Qt.AlignVCenter) self.cvalue_entry.setAlignment(QtCore.Qt.AlignRight | QtCore.Qt.AlignVCenter)
@ -190,7 +191,7 @@ class ToolCalculator(FlatCAMTool):
'to be set on the Power Supply. In Amps.')) 'to be set on the Power Supply. In Amps.'))
self.cvalue_entry.setDisabled(True) self.cvalue_entry.setDisabled(True)
self.timelabel = QtWidgets.QLabel(_("Time:")) self.timelabel = QtWidgets.QLabel('%s:' % _("Time"))
self.time_entry = FCEntry() self.time_entry = FCEntry()
# self.timelabel.setFixedWidth(70) # self.timelabel.setFixedWidth(70)
self.time_entry.setAlignment(QtCore.Qt.AlignRight | QtCore.Qt.AlignVCenter) self.time_entry.setAlignment(QtCore.Qt.AlignRight | QtCore.Qt.AlignVCenter)

View File

@ -51,7 +51,7 @@ class CutOut(FlatCAMTool):
# self.type_obj_combo.setItemIcon(1, QtGui.QIcon("share/drill16.png")) # self.type_obj_combo.setItemIcon(1, QtGui.QIcon("share/drill16.png"))
self.type_obj_combo.setItemIcon(2, QtGui.QIcon("share/geometry16.png")) self.type_obj_combo.setItemIcon(2, QtGui.QIcon("share/geometry16.png"))
self.type_obj_combo_label = QtWidgets.QLabel(_("Obj Type:")) self.type_obj_combo_label = QtWidgets.QLabel('%s:' % _("Obj Type"))
self.type_obj_combo_label.setToolTip( self.type_obj_combo_label.setToolTip(
_("Specify the type of object to be cutout.\n" _("Specify the type of object to be cutout.\n"
"It can be of type: Gerber or Geometry.\n" "It can be of type: Gerber or Geometry.\n"
@ -67,14 +67,14 @@ class CutOut(FlatCAMTool):
self.obj_combo.setRootModelIndex(self.app.collection.index(0, 0, QtCore.QModelIndex())) self.obj_combo.setRootModelIndex(self.app.collection.index(0, 0, QtCore.QModelIndex()))
self.obj_combo.setCurrentIndex(1) self.obj_combo.setCurrentIndex(1)
self.object_label = QtWidgets.QLabel(_("Object:")) self.object_label = QtWidgets.QLabel('%s:' % _("Object"))
self.object_label.setToolTip( self.object_label.setToolTip(
_("Object to be cutout. ") _("Object to be cutout. ")
) )
form_layout.addRow(self.object_label, self.obj_combo) form_layout.addRow(self.object_label, self.obj_combo)
# Object kind # Object kind
self.kindlabel = QtWidgets.QLabel(_('Obj kind:')) self.kindlabel = QtWidgets.QLabel('%s:' % _('Obj kind'))
self.kindlabel.setToolTip( self.kindlabel.setToolTip(
_("Choice of what kind the object we want to cutout is.<BR>" _("Choice of what kind the object we want to cutout is.<BR>"
"- <B>Single</B>: contain a single PCB Gerber outline object.<BR>" "- <B>Single</B>: contain a single PCB Gerber outline object.<BR>"
@ -89,7 +89,7 @@ class CutOut(FlatCAMTool):
# Tool Diameter # Tool Diameter
self.dia = FCEntry() self.dia = FCEntry()
self.dia_label = QtWidgets.QLabel(_("Tool Dia:")) self.dia_label = QtWidgets.QLabel('%s:' % _("Tool dia"))
self.dia_label.setToolTip( self.dia_label.setToolTip(
_("Diameter of the tool used to cutout\n" _("Diameter of the tool used to cutout\n"
"the PCB shape out of the surrounding material.") "the PCB shape out of the surrounding material.")
@ -98,7 +98,7 @@ class CutOut(FlatCAMTool):
# Margin # Margin
self.margin = FCEntry() self.margin = FCEntry()
self.margin_label = QtWidgets.QLabel(_("Margin:")) self.margin_label = QtWidgets.QLabel('%s:' % _("Margin:"))
self.margin_label.setToolTip( self.margin_label.setToolTip(
_("Margin over bounds. A positive value here\n" _("Margin over bounds. A positive value here\n"
"will make the cutout of the PCB further from\n" "will make the cutout of the PCB further from\n"
@ -108,7 +108,7 @@ class CutOut(FlatCAMTool):
# Gapsize # Gapsize
self.gapsize = FCEntry() self.gapsize = FCEntry()
self.gapsize_label = QtWidgets.QLabel(_("Gap size:")) self.gapsize_label = QtWidgets.QLabel('%s:' % _("Gap size:"))
self.gapsize_label.setToolTip( self.gapsize_label.setToolTip(
_("The size of the bridge gaps in the cutout\n" _("The size of the bridge gaps in the cutout\n"
"used to keep the board connected to\n" "used to keep the board connected to\n"
@ -127,7 +127,7 @@ class CutOut(FlatCAMTool):
# Surrounding convex box shape # Surrounding convex box shape
self.convex_box = FCCheckBox() self.convex_box = FCCheckBox()
self.convex_box_label = QtWidgets.QLabel(_("Convex Sh.:")) self.convex_box_label = QtWidgets.QLabel('%s:' % _("Convex Sh."))
self.convex_box_label.setToolTip( self.convex_box_label.setToolTip(
_("Create a convex shape surrounding the entire PCB.\n" _("Create a convex shape surrounding the entire PCB.\n"
"Used only if the source object type is Gerber.") "Used only if the source object type is Gerber.")
@ -146,7 +146,7 @@ class CutOut(FlatCAMTool):
self.layout.addLayout(form_layout_2) self.layout.addLayout(form_layout_2)
# Gaps # Gaps
gaps_label = QtWidgets.QLabel(_('Gaps:')) gaps_label = QtWidgets.QLabel('%s:' % _('Gaps'))
gaps_label.setToolTip( gaps_label.setToolTip(
_("Number of gaps used for the Automatic cutout.\n" _("Number of gaps used for the Automatic cutout.\n"
"There can be maximum 8 bridges/gaps.\n" "There can be maximum 8 bridges/gaps.\n"
@ -171,7 +171,7 @@ class CutOut(FlatCAMTool):
hlay = QtWidgets.QHBoxLayout() hlay = QtWidgets.QHBoxLayout()
self.layout.addLayout(hlay) self.layout.addLayout(hlay)
title_ff_label = QtWidgets.QLabel("<b>%s</b>" % _('FreeForm:')) title_ff_label = QtWidgets.QLabel("<b>%s:</b>" % _('FreeForm'))
title_ff_label.setToolTip( title_ff_label.setToolTip(
_("The cutout shape can be of ny shape.\n" _("The cutout shape can be of ny shape.\n"
"Useful when the PCB has a non-rectangular shape.") "Useful when the PCB has a non-rectangular shape.")
@ -191,7 +191,7 @@ class CutOut(FlatCAMTool):
hlay2 = QtWidgets.QHBoxLayout() hlay2 = QtWidgets.QHBoxLayout()
self.layout.addLayout(hlay2) self.layout.addLayout(hlay2)
title_rct_label = QtWidgets.QLabel("<b>%s</b>" % _('Rectangular:')) title_rct_label = QtWidgets.QLabel("<b>%s:</b>" % _('Rectangular'))
title_rct_label.setToolTip( title_rct_label.setToolTip(
_("The resulting cutout shape is\n" _("The resulting cutout shape is\n"
"always a rectangle shape and it will be\n" "always a rectangle shape and it will be\n"
@ -228,7 +228,7 @@ class CutOut(FlatCAMTool):
self.man_object_combo.setRootModelIndex(self.app.collection.index(2, 0, QtCore.QModelIndex())) self.man_object_combo.setRootModelIndex(self.app.collection.index(2, 0, QtCore.QModelIndex()))
self.man_object_combo.setCurrentIndex(1) self.man_object_combo.setCurrentIndex(1)
self.man_object_label = QtWidgets.QLabel(_("Geo Obj:")) self.man_object_label = QtWidgets.QLabel('%s:' % _("Geo Obj"))
self.man_object_label.setToolTip( self.man_object_label.setToolTip(
_("Geometry object used to create the manual cutout.") _("Geometry object used to create the manual cutout.")
) )
@ -241,7 +241,7 @@ class CutOut(FlatCAMTool):
hlay3 = QtWidgets.QHBoxLayout() hlay3 = QtWidgets.QHBoxLayout()
self.layout.addLayout(hlay3) self.layout.addLayout(hlay3)
self.man_geo_label = QtWidgets.QLabel(_("Manual Geo:")) self.man_geo_label = QtWidgets.QLabel('%s:' % _("Manual Geo"))
self.man_geo_label.setToolTip( self.man_geo_label.setToolTip(
_("If the object to be cutout is a Gerber\n" _("If the object to be cutout is a Gerber\n"
"first create a Geometry that surrounds it,\n" "first create a Geometry that surrounds it,\n"
@ -263,7 +263,7 @@ class CutOut(FlatCAMTool):
hlay4 = QtWidgets.QHBoxLayout() hlay4 = QtWidgets.QHBoxLayout()
self.layout.addLayout(hlay4) self.layout.addLayout(hlay4)
self.man_bridge_gaps_label = QtWidgets.QLabel(_("Manual Add Bridge Gaps:")) self.man_bridge_gaps_label = QtWidgets.QLabel('%s:' % _("Manual Add Bridge Gaps"))
self.man_bridge_gaps_label.setToolTip( self.man_bridge_gaps_label.setToolTip(
_("Use the left mouse button (LMB) click\n" _("Use the left mouse button (LMB) click\n"
"to create a bridge gap to separate the PCB from\n" "to create a bridge gap to separate the PCB from\n"

View File

@ -149,7 +149,7 @@ class DblSidedTool(FlatCAMTool):
# ## Point/Box # ## Point/Box
self.point_box_container = QtWidgets.QVBoxLayout() self.point_box_container = QtWidgets.QVBoxLayout()
self.pb_label = QtWidgets.QLabel("<b>%s</b>" % _('Point/Box Reference:')) self.pb_label = QtWidgets.QLabel("<b>%s:</b>" % _('Point/Box Reference'))
self.pb_label.setToolTip( self.pb_label.setToolTip(
_("If 'Point' is selected above it store the coordinates (x, y) through which\n" _("If 'Point' is selected above it store the coordinates (x, y) through which\n"
"the mirroring axis passes.\n" "the mirroring axis passes.\n"
@ -189,7 +189,7 @@ class DblSidedTool(FlatCAMTool):
self.box_combo_type.hide() self.box_combo_type.hide()
# ## Alignment holes # ## Alignment holes
self.ah_label = QtWidgets.QLabel("<b>%s</b>" % _('Alignment Drill Coordinates:')) self.ah_label = QtWidgets.QLabel("<b>%s:</b>" % _('Alignment Drill Coordinates'))
self.ah_label.setToolTip( self.ah_label.setToolTip(
_("Alignment holes (x1, y1), (x2, y2), ... " _("Alignment holes (x1, y1), (x2, y2), ... "
"on one side of the mirror axis. For each set of (x, y) coordinates\n" "on one side of the mirror axis. For each set of (x, y) coordinates\n"
@ -220,7 +220,7 @@ class DblSidedTool(FlatCAMTool):
grid_lay3.addWidget(self.add_drill_point_button, 0, 1) grid_lay3.addWidget(self.add_drill_point_button, 0, 1)
# ## Drill diameter for alignment holes # ## Drill diameter for alignment holes
self.dt_label = QtWidgets.QLabel("<b>%s</b>:" % _('Alignment Drill Diameter')) self.dt_label = QtWidgets.QLabel("<b>%s:</b>" % _('Alignment Drill Diameter'))
self.dt_label.setToolTip( self.dt_label.setToolTip(
_("Diameter of the drill for the " _("Diameter of the drill for the "
"alignment holes.") "alignment holes.")
@ -231,7 +231,7 @@ class DblSidedTool(FlatCAMTool):
self.layout.addLayout(hlay) self.layout.addLayout(hlay)
self.drill_dia = FCEntry() self.drill_dia = FCEntry()
self.dd_label = QtWidgets.QLabel(_("Drill diam.:")) self.dd_label = QtWidgets.QLabel('%s:' % _("Drill dia"))
self.dd_label.setToolTip( self.dd_label.setToolTip(
_("Diameter of the drill for the " _("Diameter of the drill for the "
"alignment holes.") "alignment holes.")

View File

@ -53,7 +53,7 @@ class Film(FlatCAMTool):
self.tf_type_obj_combo.setItemIcon(0, QtGui.QIcon("share/flatcam_icon16.png")) self.tf_type_obj_combo.setItemIcon(0, QtGui.QIcon("share/flatcam_icon16.png"))
self.tf_type_obj_combo.setItemIcon(2, QtGui.QIcon("share/geometry16.png")) self.tf_type_obj_combo.setItemIcon(2, QtGui.QIcon("share/geometry16.png"))
self.tf_type_obj_combo_label = QtWidgets.QLabel(_("Object Type:")) self.tf_type_obj_combo_label = QtWidgets.QLabel('%s:' % _("Object Type"))
self.tf_type_obj_combo_label.setToolTip( self.tf_type_obj_combo_label.setToolTip(
_("Specify the type of object for which to create the film.\n" _("Specify the type of object for which to create the film.\n"
"The object can be of type: Gerber or Geometry.\n" "The object can be of type: Gerber or Geometry.\n"
@ -68,7 +68,7 @@ class Film(FlatCAMTool):
self.tf_object_combo.setRootModelIndex(self.app.collection.index(0, 0, QtCore.QModelIndex())) self.tf_object_combo.setRootModelIndex(self.app.collection.index(0, 0, QtCore.QModelIndex()))
self.tf_object_combo.setCurrentIndex(1) self.tf_object_combo.setCurrentIndex(1)
self.tf_object_label = QtWidgets.QLabel(_("Film Object:")) self.tf_object_label = QtWidgets.QLabel('%s:' % _("Film Object"))
self.tf_object_label.setToolTip( self.tf_object_label.setToolTip(
_("Object for which to create the film.") _("Object for which to create the film.")
) )
@ -101,7 +101,7 @@ class Film(FlatCAMTool):
self.tf_box_combo.setRootModelIndex(self.app.collection.index(0, 0, QtCore.QModelIndex())) self.tf_box_combo.setRootModelIndex(self.app.collection.index(0, 0, QtCore.QModelIndex()))
self.tf_box_combo.setCurrentIndex(1) self.tf_box_combo.setCurrentIndex(1)
self.tf_box_combo_label = QtWidgets.QLabel(_("Box Object:")) self.tf_box_combo_label = QtWidgets.QLabel('%s:' % _("Box Object"))
self.tf_box_combo_label.setToolTip( self.tf_box_combo_label.setToolTip(
_("The actual object that is used a container for the\n " _("The actual object that is used a container for the\n "
"selected object for which we create the film.\n" "selected object for which we create the film.\n"
@ -127,7 +127,7 @@ class Film(FlatCAMTool):
# Boundary for negative film generation # Boundary for negative film generation
self.boundary_entry = FCEntry() self.boundary_entry = FCEntry()
self.boundary_label = QtWidgets.QLabel(_("Border:")) self.boundary_label = QtWidgets.QLabel('%s:' % _("Border"))
self.boundary_label.setToolTip( self.boundary_label.setToolTip(
_("Specify a border around the object.\n" _("Specify a border around the object.\n"
"Only for negative film.\n" "Only for negative film.\n"
@ -141,7 +141,7 @@ class Film(FlatCAMTool):
tf_form_layout.addRow(self.boundary_label, self.boundary_entry) tf_form_layout.addRow(self.boundary_label, self.boundary_entry)
self.film_scale_entry = FCEntry() self.film_scale_entry = FCEntry()
self.film_scale_label = QtWidgets.QLabel(_("Scale Stroke:")) self.film_scale_label = QtWidgets.QLabel('%s:' % _("Scale Stroke"))
self.film_scale_label.setToolTip( self.film_scale_label.setToolTip(
_("Scale the line stroke thickness of each feature in the SVG file.\n" _("Scale the line stroke thickness of each feature in the SVG file.\n"
"It means that the line that envelope each SVG feature will be thicker or thinner,\n" "It means that the line that envelope each SVG feature will be thicker or thinner,\n"

View File

@ -50,7 +50,7 @@ class ToolImage(FlatCAMTool):
self.tf_type_obj_combo.setItemIcon(0, QtGui.QIcon("share/flatcam_icon16.png")) self.tf_type_obj_combo.setItemIcon(0, QtGui.QIcon("share/flatcam_icon16.png"))
self.tf_type_obj_combo.setItemIcon(1, QtGui.QIcon("share/geometry16.png")) self.tf_type_obj_combo.setItemIcon(1, QtGui.QIcon("share/geometry16.png"))
self.tf_type_obj_combo_label = QtWidgets.QLabel(_("Object Type:")) self.tf_type_obj_combo_label = QtWidgets.QLabel('%s:' % _("Object Type"))
self.tf_type_obj_combo_label.setToolTip( self.tf_type_obj_combo_label.setToolTip(
_("Specify the type of object to create from the image.\n" _("Specify the type of object to create from the image.\n"
"It can be of type: Gerber or Geometry.") "It can be of type: Gerber or Geometry.")
@ -60,7 +60,7 @@ class ToolImage(FlatCAMTool):
# DPI value of the imported image # DPI value of the imported image
self.dpi_entry = IntEntry() self.dpi_entry = IntEntry()
self.dpi_label = QtWidgets.QLabel(_("DPI value:")) self.dpi_label = QtWidgets.QLabel('%s:' % _("DPI value"))
self.dpi_label.setToolTip( self.dpi_label.setToolTip(
_("Specify a DPI value for the image.") _("Specify a DPI value for the image.")
) )

View File

@ -40,7 +40,7 @@ class Measurement(FlatCAMTool):
form_layout = QtWidgets.QFormLayout() form_layout = QtWidgets.QFormLayout()
self.layout.addLayout(form_layout) self.layout.addLayout(form_layout)
self.units_label = QtWidgets.QLabel(_("Units:")) self.units_label = QtWidgets.QLabel('%s:' % _("Units"))
self.units_label.setToolTip(_("Those are the units in which the distance is measured.")) self.units_label.setToolTip(_("Those are the units in which the distance is measured."))
self.units_value = QtWidgets.QLabel("%s" % str({'mm': _("METRIC (mm)"), 'in': _("INCH (in)")}[self.units])) self.units_value = QtWidgets.QLabel("%s" % str({'mm': _("METRIC (mm)"), 'in': _("INCH (in)")}[self.units]))
self.units_value.setDisabled(True) self.units_value.setDisabled(True)
@ -51,10 +51,10 @@ class Measurement(FlatCAMTool):
self.stop_label = QtWidgets.QLabel("<b>%s</b> %s:" % (_('Stop'), _('Coords'))) self.stop_label = QtWidgets.QLabel("<b>%s</b> %s:" % (_('Stop'), _('Coords')))
self.stop_label.setToolTip(_("This is the measuring Stop point coordinates.")) self.stop_label.setToolTip(_("This is the measuring Stop point coordinates."))
self.distance_x_label = QtWidgets.QLabel(_("Dx:")) self.distance_x_label = QtWidgets.QLabel('%s:' % _("Dx"))
self.distance_x_label.setToolTip(_("This is the distance measured over the X axis.")) self.distance_x_label.setToolTip(_("This is the distance measured over the X axis."))
self.distance_y_label = QtWidgets.QLabel(_("Dy:")) self.distance_y_label = QtWidgets.QLabel('%s:' % _("Dy"))
self.distance_y_label.setToolTip(_("This is the distance measured over the Y axis.")) self.distance_y_label.setToolTip(_("This is the distance measured over the Y axis."))
self.total_distance_label = QtWidgets.QLabel("<b>%s:</b>" % _('DISTANCE')) self.total_distance_label = QtWidgets.QLabel("<b>%s:</b>" % _('DISTANCE'))

View File

@ -192,7 +192,7 @@ class NonCopperClear(FlatCAMTool, Gerber):
self.ncc_overlap_entry = FCEntry() self.ncc_overlap_entry = FCEntry()
grid3.addWidget(self.ncc_overlap_entry, 1, 1) grid3.addWidget(self.ncc_overlap_entry, 1, 1)
nccmarginlabel = QtWidgets.QLabel(_('Margin:')) nccmarginlabel = QtWidgets.QLabel('%s:' % _('Margin'))
nccmarginlabel.setToolTip( nccmarginlabel.setToolTip(
_("Bounding box margin.") _("Bounding box margin.")
) )
@ -201,7 +201,7 @@ class NonCopperClear(FlatCAMTool, Gerber):
grid3.addWidget(self.ncc_margin_entry, 2, 1) grid3.addWidget(self.ncc_margin_entry, 2, 1)
# Method # Method
methodlabel = QtWidgets.QLabel(_('Method:')) methodlabel = QtWidgets.QLabel('%s:' % _('Method'))
methodlabel.setToolTip( methodlabel.setToolTip(
_("Algorithm for non-copper clearing:<BR>" _("Algorithm for non-copper clearing:<BR>"
"<B>Standard</B>: Fixed step inwards.<BR>" "<B>Standard</B>: Fixed step inwards.<BR>"
@ -217,7 +217,7 @@ class NonCopperClear(FlatCAMTool, Gerber):
grid3.addWidget(self.ncc_method_radio, 3, 1) grid3.addWidget(self.ncc_method_radio, 3, 1)
# Connect lines # Connect lines
pathconnectlabel = QtWidgets.QLabel(_("Connect:")) pathconnectlabel = QtWidgets.QLabel('%s:' % _("Connect"))
pathconnectlabel.setToolTip( pathconnectlabel.setToolTip(
_("Draw lines between resulting\n" _("Draw lines between resulting\n"
"segments to minimize tool lifts.") "segments to minimize tool lifts.")
@ -226,7 +226,7 @@ class NonCopperClear(FlatCAMTool, Gerber):
self.ncc_connect_cb = FCCheckBox() self.ncc_connect_cb = FCCheckBox()
grid3.addWidget(self.ncc_connect_cb, 4, 1) grid3.addWidget(self.ncc_connect_cb, 4, 1)
contourlabel = QtWidgets.QLabel(_("Contour:")) contourlabel = QtWidgets.QLabel('%s:' % _("Contour"))
contourlabel.setToolTip( contourlabel.setToolTip(
_("Cut around the perimeter of the polygon\n" _("Cut around the perimeter of the polygon\n"
"to trim rough edges.") "to trim rough edges.")
@ -235,7 +235,7 @@ class NonCopperClear(FlatCAMTool, Gerber):
self.ncc_contour_cb = FCCheckBox() self.ncc_contour_cb = FCCheckBox()
grid3.addWidget(self.ncc_contour_cb, 5, 1) grid3.addWidget(self.ncc_contour_cb, 5, 1)
restlabel = QtWidgets.QLabel(_("Rest M.:")) restlabel = QtWidgets.QLabel('%s:' % _("Rest M."))
restlabel.setToolTip( restlabel.setToolTip(
_("If checked, use 'rest machining'.\n" _("If checked, use 'rest machining'.\n"
"Basically it will clear copper outside PCB features,\n" "Basically it will clear copper outside PCB features,\n"
@ -250,7 +250,7 @@ class NonCopperClear(FlatCAMTool, Gerber):
grid3.addWidget(self.ncc_rest_cb, 6, 1) grid3.addWidget(self.ncc_rest_cb, 6, 1)
# ## NCC Offset choice # ## NCC Offset choice
self.ncc_offset_choice_label = QtWidgets.QLabel(_("Offset:")) self.ncc_offset_choice_label = QtWidgets.QLabel('%s:' % _("Offset"))
self.ncc_offset_choice_label.setToolTip( self.ncc_offset_choice_label.setToolTip(
_("If used, it will add an offset to the copper features.\n" _("If used, it will add an offset to the copper features.\n"
"The copper clearing will finish to a distance\n" "The copper clearing will finish to a distance\n"
@ -262,7 +262,7 @@ class NonCopperClear(FlatCAMTool, Gerber):
grid3.addWidget(self.ncc_choice_offset_cb, 7, 1) grid3.addWidget(self.ncc_choice_offset_cb, 7, 1)
# ## NCC Offset value # ## NCC Offset value
self.ncc_offset_label = QtWidgets.QLabel(_("Offset value:")) self.ncc_offset_label = QtWidgets.QLabel('%s:' % _("Offset value"))
self.ncc_offset_label.setToolTip( self.ncc_offset_label.setToolTip(
_("If used, it will add an offset to the copper features.\n" _("If used, it will add an offset to the copper features.\n"
"The copper clearing will finish to a distance\n" "The copper clearing will finish to a distance\n"
@ -291,10 +291,10 @@ class NonCopperClear(FlatCAMTool, Gerber):
{'label': _('Box'), 'value': 'box'}]) {'label': _('Box'), 'value': 'box'}])
self.reference_label = QtWidgets.QLabel(_("Reference:")) self.reference_label = QtWidgets.QLabel(_("Reference:"))
self.reference_label.setToolTip( self.reference_label.setToolTip(
_("- 'Itself': the non copper clearing extent\n" _("When choosing the 'Itself' option the non copper clearing extent\n"
"is based on the object that is copper cleared.\n " "is based on the object that is copper cleared.\n "
"- 'Box': will do non copper clearing within the box\n" "Choosing the 'Box' option will do non copper clearing within the box\n"
"specified by the object selected in the Ref. Object combobox.") "specified by another object different than the one that is copper cleared.")
) )
grid3.addWidget(self.reference_label, 9, 0) grid3.addWidget(self.reference_label, 9, 0)
grid3.addWidget(self.reference_radio, 9, 1) grid3.addWidget(self.reference_radio, 9, 1)
@ -302,7 +302,7 @@ class NonCopperClear(FlatCAMTool, Gerber):
grid4 = QtWidgets.QGridLayout() grid4 = QtWidgets.QGridLayout()
self.tools_box.addLayout(grid4) self.tools_box.addLayout(grid4)
self.box_combo_type_label = QtWidgets.QLabel(_("Ref. Type:")) self.box_combo_type_label = QtWidgets.QLabel('%s:' % _("Ref. Type"))
self.box_combo_type_label.setToolTip( self.box_combo_type_label.setToolTip(
_("The type of FlatCAM object to be used as non copper clearing reference.\n" _("The type of FlatCAM object to be used as non copper clearing reference.\n"
"It can be Gerber, Excellon or Geometry.") "It can be Gerber, Excellon or Geometry.")
@ -315,7 +315,7 @@ class NonCopperClear(FlatCAMTool, Gerber):
grid4.addWidget(self.box_combo_type_label, 0, 0) grid4.addWidget(self.box_combo_type_label, 0, 0)
grid4.addWidget(self.box_combo_type, 0, 1) grid4.addWidget(self.box_combo_type, 0, 1)
self.box_combo_label = QtWidgets.QLabel(_("Ref. Object:")) self.box_combo_label = QtWidgets.QLabel('%s:' % _("Ref. Object"))
self.box_combo_label.setToolTip( self.box_combo_label.setToolTip(
_("The FlatCAM object to be used as non copper clearing reference.") _("The FlatCAM object to be used as non copper clearing reference.")
) )

View File

@ -58,7 +58,7 @@ class ToolPaint(FlatCAMTool, Gerber):
self.object_combo.setRootModelIndex(self.app.collection.index(2, 0, QtCore.QModelIndex())) self.object_combo.setRootModelIndex(self.app.collection.index(2, 0, QtCore.QModelIndex()))
self.object_combo.setCurrentIndex(1) self.object_combo.setCurrentIndex(1)
self.object_label = QtWidgets.QLabel(_("Geometry:")) self.object_label = QtWidgets.QLabel('%s:' % _("Geometry"))
self.object_label.setToolTip( self.object_label.setToolTip(
_("Geometry object to be painted. ") _("Geometry object to be painted. ")
) )
@ -158,7 +158,7 @@ class ToolPaint(FlatCAMTool, Gerber):
self.tools_box.addLayout(grid3) self.tools_box.addLayout(grid3)
# Overlap # Overlap
ovlabel = QtWidgets.QLabel(_('Overlap Rate:')) ovlabel = QtWidgets.QLabel('%s:' % _('Overlap Rate'))
ovlabel.setToolTip( ovlabel.setToolTip(
_("How much (fraction) of the tool width to overlap each tool pass.\n" _("How much (fraction) of the tool width to overlap each tool pass.\n"
"Example:\n" "Example:\n"
@ -175,7 +175,7 @@ class ToolPaint(FlatCAMTool, Gerber):
grid3.addWidget(self.paintoverlap_entry, 1, 1) grid3.addWidget(self.paintoverlap_entry, 1, 1)
# Margin # Margin
marginlabel = QtWidgets.QLabel(_('Margin:')) marginlabel = QtWidgets.QLabel('%s:' % _('Margin'))
marginlabel.setToolTip( marginlabel.setToolTip(
_("Distance by which to avoid\n" _("Distance by which to avoid\n"
"the edges of the polygon to\n" "the edges of the polygon to\n"
@ -186,7 +186,7 @@ class ToolPaint(FlatCAMTool, Gerber):
grid3.addWidget(self.paintmargin_entry, 2, 1) grid3.addWidget(self.paintmargin_entry, 2, 1)
# Method # Method
methodlabel = QtWidgets.QLabel(_('Method:')) methodlabel = QtWidgets.QLabel('%s:' % _('Method'))
methodlabel.setToolTip( methodlabel.setToolTip(
_("Algorithm for non-copper clearing:<BR>" _("Algorithm for non-copper clearing:<BR>"
"<B>Standard</B>: Fixed step inwards.<BR>" "<B>Standard</B>: Fixed step inwards.<BR>"
@ -202,7 +202,7 @@ class ToolPaint(FlatCAMTool, Gerber):
grid3.addWidget(self.paintmethod_combo, 3, 1) grid3.addWidget(self.paintmethod_combo, 3, 1)
# Connect lines # Connect lines
pathconnectlabel = QtWidgets.QLabel(_("Connect:")) pathconnectlabel = QtWidgets.QLabel('%s:' % _("Connect"))
pathconnectlabel.setToolTip( pathconnectlabel.setToolTip(
_("Draw lines between resulting\n" _("Draw lines between resulting\n"
"segments to minimize tool lifts.") "segments to minimize tool lifts.")
@ -211,7 +211,7 @@ class ToolPaint(FlatCAMTool, Gerber):
self.pathconnect_cb = FCCheckBox() self.pathconnect_cb = FCCheckBox()
grid3.addWidget(self.pathconnect_cb, 4, 1) grid3.addWidget(self.pathconnect_cb, 4, 1)
contourlabel = QtWidgets.QLabel(_("Contour:")) contourlabel = QtWidgets.QLabel('%s:' % _("Contour"))
contourlabel.setToolTip( contourlabel.setToolTip(
_("Cut around the perimeter of the polygon\n" _("Cut around the perimeter of the polygon\n"
"to trim rough edges.") "to trim rough edges.")
@ -220,7 +220,7 @@ class ToolPaint(FlatCAMTool, Gerber):
self.paintcontour_cb = FCCheckBox() self.paintcontour_cb = FCCheckBox()
grid3.addWidget(self.paintcontour_cb, 5, 1) grid3.addWidget(self.paintcontour_cb, 5, 1)
restlabel = QtWidgets.QLabel(_("Rest M.:")) restlabel = QtWidgets.QLabel('%s:' % _("Rest M."))
restlabel.setToolTip( restlabel.setToolTip(
_("If checked, use 'rest machining'.\n" _("If checked, use 'rest machining'.\n"
"Basically it will clear copper outside PCB features,\n" "Basically it will clear copper outside PCB features,\n"
@ -235,7 +235,7 @@ class ToolPaint(FlatCAMTool, Gerber):
grid3.addWidget(self.rest_cb, 6, 1) grid3.addWidget(self.rest_cb, 6, 1)
# Polygon selection # Polygon selection
selectlabel = QtWidgets.QLabel(_('Selection:')) selectlabel = QtWidgets.QLabel('%s:' % _('Selection'))
selectlabel.setToolTip( selectlabel.setToolTip(
_("How to select the polygons to paint.<BR>" _("How to select the polygons to paint.<BR>"
"Options:<BR>" "Options:<BR>"
@ -265,7 +265,7 @@ class ToolPaint(FlatCAMTool, Gerber):
grid4 = QtWidgets.QGridLayout() grid4 = QtWidgets.QGridLayout()
self.tools_box.addLayout(grid4) self.tools_box.addLayout(grid4)
self.box_combo_type_label = QtWidgets.QLabel(_("Ref. Type:")) self.box_combo_type_label = QtWidgets.QLabel('%s:' % _("Ref. Type"))
self.box_combo_type_label.setToolTip( self.box_combo_type_label.setToolTip(
_("The type of FlatCAM object to be used as paint reference.\n" _("The type of FlatCAM object to be used as paint reference.\n"
"It can be Gerber, Excellon or Geometry.") "It can be Gerber, Excellon or Geometry.")
@ -278,7 +278,7 @@ class ToolPaint(FlatCAMTool, Gerber):
grid4.addWidget(self.box_combo_type_label, 0, 0) grid4.addWidget(self.box_combo_type_label, 0, 0)
grid4.addWidget(self.box_combo_type, 0, 1) grid4.addWidget(self.box_combo_type, 0, 1)
self.box_combo_label = QtWidgets.QLabel(_("Ref. Object:")) self.box_combo_label = QtWidgets.QLabel('%s:' % _("Ref. Object"))
self.box_combo_label.setToolTip( self.box_combo_label.setToolTip(
_("The FlatCAM object to be used as non copper clearing reference.") _("The FlatCAM object to be used as non copper clearing reference.")
) )

View File

@ -53,7 +53,7 @@ class Panelize(FlatCAMTool):
self.type_obj_combo.setItemIcon(1, QtGui.QIcon("share/drill16.png")) self.type_obj_combo.setItemIcon(1, QtGui.QIcon("share/drill16.png"))
self.type_obj_combo.setItemIcon(2, QtGui.QIcon("share/geometry16.png")) self.type_obj_combo.setItemIcon(2, QtGui.QIcon("share/geometry16.png"))
self.type_obj_combo_label = QtWidgets.QLabel(_("Object Type:")) self.type_obj_combo_label = QtWidgets.QLabel('%s:' % _("Object Type"))
self.type_obj_combo_label.setToolTip( self.type_obj_combo_label.setToolTip(
_("Specify the type of object to be panelized\n" _("Specify the type of object to be panelized\n"
"It can be of type: Gerber, Excellon or Geometry.\n" "It can be of type: Gerber, Excellon or Geometry.\n"
@ -68,7 +68,7 @@ class Panelize(FlatCAMTool):
self.object_combo.setRootModelIndex(self.app.collection.index(0, 0, QtCore.QModelIndex())) self.object_combo.setRootModelIndex(self.app.collection.index(0, 0, QtCore.QModelIndex()))
self.object_combo.setCurrentIndex(1) self.object_combo.setCurrentIndex(1)
self.object_label = QtWidgets.QLabel(_("Object:")) self.object_label = QtWidgets.QLabel('%s:' % _("Object"))
self.object_label.setToolTip( self.object_label.setToolTip(
_("Object to be panelized. This means that it will\n" _("Object to be panelized. This means that it will\n"
"be duplicated in an array of rows and columns.") "be duplicated in an array of rows and columns.")
@ -108,7 +108,7 @@ class Panelize(FlatCAMTool):
self.type_box_combo.setItemIcon(0, QtGui.QIcon("share/flatcam_icon16.png")) self.type_box_combo.setItemIcon(0, QtGui.QIcon("share/flatcam_icon16.png"))
self.type_box_combo.setItemIcon(2, QtGui.QIcon("share/geometry16.png")) self.type_box_combo.setItemIcon(2, QtGui.QIcon("share/geometry16.png"))
self.type_box_combo_label = QtWidgets.QLabel(_("Box Type:")) self.type_box_combo_label = QtWidgets.QLabel('%s:' % _("Box Type"))
self.type_box_combo_label.setToolTip( self.type_box_combo_label.setToolTip(
_("Specify the type of object to be used as an container for\n" _("Specify the type of object to be used as an container for\n"
"panelization. It can be: Gerber or Geometry type.\n" "panelization. It can be: Gerber or Geometry type.\n"
@ -123,7 +123,7 @@ class Panelize(FlatCAMTool):
self.box_combo.setRootModelIndex(self.app.collection.index(0, 0, QtCore.QModelIndex())) self.box_combo.setRootModelIndex(self.app.collection.index(0, 0, QtCore.QModelIndex()))
self.box_combo.setCurrentIndex(1) self.box_combo.setCurrentIndex(1)
self.box_combo_label = QtWidgets.QLabel(_("Box Object:")) self.box_combo_label = QtWidgets.QLabel('%s:' % _("Box Object"))
self.box_combo_label.setToolTip( self.box_combo_label.setToolTip(
_("The actual object that is used a container for the\n " _("The actual object that is used a container for the\n "
"selected object that is to be panelized.") "selected object that is to be panelized.")
@ -144,7 +144,7 @@ class Panelize(FlatCAMTool):
# Spacing Columns # Spacing Columns
self.spacing_columns = FCEntry() self.spacing_columns = FCEntry()
self.spacing_columns_label = QtWidgets.QLabel(_("Spacing cols:")) self.spacing_columns_label = QtWidgets.QLabel('%s:' % _("Spacing cols"))
self.spacing_columns_label.setToolTip( self.spacing_columns_label.setToolTip(
_("Spacing between columns of the desired panel.\n" _("Spacing between columns of the desired panel.\n"
"In current units.") "In current units.")
@ -153,7 +153,7 @@ class Panelize(FlatCAMTool):
# Spacing Rows # Spacing Rows
self.spacing_rows = FCEntry() self.spacing_rows = FCEntry()
self.spacing_rows_label = QtWidgets.QLabel(_("Spacing rows:")) self.spacing_rows_label = QtWidgets.QLabel('%s:' % _("Spacing rows"))
self.spacing_rows_label.setToolTip( self.spacing_rows_label.setToolTip(
_("Spacing between rows of the desired panel.\n" _("Spacing between rows of the desired panel.\n"
"In current units.") "In current units.")
@ -162,7 +162,7 @@ class Panelize(FlatCAMTool):
# Columns # Columns
self.columns = FCEntry() self.columns = FCEntry()
self.columns_label = QtWidgets.QLabel(_("Columns:")) self.columns_label = QtWidgets.QLabel('%s:' % _("Columns"))
self.columns_label.setToolTip( self.columns_label.setToolTip(
_("Number of columns of the desired panel") _("Number of columns of the desired panel")
) )
@ -170,7 +170,7 @@ class Panelize(FlatCAMTool):
# Rows # Rows
self.rows = FCEntry() self.rows = FCEntry()
self.rows_label = QtWidgets.QLabel(_("Rows:")) self.rows_label = QtWidgets.QLabel('%s:' % _("Rows"))
self.rows_label.setToolTip( self.rows_label.setToolTip(
_("Number of rows of the desired panel") _("Number of rows of the desired panel")
) )
@ -190,7 +190,7 @@ class Panelize(FlatCAMTool):
form_layout.addRow(self.panel_type_radio) form_layout.addRow(self.panel_type_radio)
# Constrains # Constrains
self.constrain_cb = FCCheckBox(_("Constrain panel within:")) self.constrain_cb = FCCheckBox('%s:' % _("Constrain panel within"))
self.constrain_cb.setToolTip( self.constrain_cb.setToolTip(
_("Area define by DX and DY within to constrain the panel.\n" _("Area define by DX and DY within to constrain the panel.\n"
"DX and DY values are in current units.\n" "DX and DY values are in current units.\n"
@ -201,7 +201,7 @@ class Panelize(FlatCAMTool):
form_layout.addRow(self.constrain_cb) form_layout.addRow(self.constrain_cb)
self.x_width_entry = FCEntry() self.x_width_entry = FCEntry()
self.x_width_lbl = QtWidgets.QLabel(_("Width (DX):")) self.x_width_lbl = QtWidgets.QLabel('%s:' % _("Width (DX)"))
self.x_width_lbl.setToolTip( self.x_width_lbl.setToolTip(
_("The width (DX) within which the panel must fit.\n" _("The width (DX) within which the panel must fit.\n"
"In current units.") "In current units.")
@ -209,7 +209,7 @@ class Panelize(FlatCAMTool):
form_layout.addRow(self.x_width_lbl, self.x_width_entry) form_layout.addRow(self.x_width_lbl, self.x_width_entry)
self.y_height_entry = FCEntry() self.y_height_entry = FCEntry()
self.y_height_lbl = QtWidgets.QLabel(_("Height (DY):")) self.y_height_lbl = QtWidgets.QLabel('%s:' % _("Height (DY)"))
self.y_height_lbl.setToolTip( self.y_height_lbl.setToolTip(
_("The height (DY)within which the panel must fit.\n" _("The height (DY)within which the panel must fit.\n"
"In current units.") "In current units.")

View File

@ -54,7 +54,7 @@ class PcbWizard(FlatCAMTool):
form_layout = QtWidgets.QFormLayout() form_layout = QtWidgets.QFormLayout()
self.layout.addLayout(form_layout) self.layout.addLayout(form_layout)
self.excellon_label = QtWidgets.QLabel(_("Excellon file:")) self.excellon_label = QtWidgets.QLabel('%s:' % _("Excellon file"))
self.excellon_label.setToolTip( self.excellon_label.setToolTip(
_("Load the Excellon file.\n" _("Load the Excellon file.\n"
"Usually it has a .DRL extension") "Usually it has a .DRL extension")
@ -62,7 +62,7 @@ class PcbWizard(FlatCAMTool):
self.excellon_brn = FCButton(_("Open")) self.excellon_brn = FCButton(_("Open"))
form_layout.addRow(self.excellon_label, self.excellon_brn) form_layout.addRow(self.excellon_label, self.excellon_brn)
self.inf_label = QtWidgets.QLabel(_("INF file:")) self.inf_label = QtWidgets.QLabel('%s:' % _("INF file"))
self.inf_label.setToolTip( self.inf_label.setToolTip(
_("Load the INF file.") _("Load the INF file.")
) )
@ -92,7 +92,7 @@ class PcbWizard(FlatCAMTool):
# Integral part of the coordinates # Integral part of the coordinates
self.int_entry = FCSpinner() self.int_entry = FCSpinner()
self.int_entry.set_range(1, 10) self.int_entry.set_range(1, 10)
self.int_label = QtWidgets.QLabel(_("Int. digits:")) self.int_label = QtWidgets.QLabel('%s:' % _("Int. digits"))
self.int_label.setToolTip( self.int_label.setToolTip(
_("The number of digits for the integral part of the coordinates.") _("The number of digits for the integral part of the coordinates.")
) )
@ -101,7 +101,7 @@ class PcbWizard(FlatCAMTool):
# Fractional part of the coordinates # Fractional part of the coordinates
self.frac_entry = FCSpinner() self.frac_entry = FCSpinner()
self.frac_entry.set_range(1, 10) self.frac_entry.set_range(1, 10)
self.frac_label = QtWidgets.QLabel(_("Frac. digits:")) self.frac_label = QtWidgets.QLabel('%s:' % _("Frac. digits"))
self.frac_label.setToolTip( self.frac_label.setToolTip(
_("The number of digits for the fractional part of the coordinates.") _("The number of digits for the fractional part of the coordinates.")
) )
@ -111,7 +111,7 @@ class PcbWizard(FlatCAMTool):
self.zeros_radio = RadioSet([{'label': _('LZ'), 'value': 'LZ'}, self.zeros_radio = RadioSet([{'label': _('LZ'), 'value': 'LZ'},
{'label': _('TZ'), 'value': 'TZ'}, {'label': _('TZ'), 'value': 'TZ'},
{'label': _('No Suppression'), 'value': 'D'}]) {'label': _('No Suppression'), 'value': 'D'}])
self.zeros_label = QtWidgets.QLabel(_("Zeros supp.:")) self.zeros_label = QtWidgets.QLabel('%s:' % _("Zeros supp."))
self.zeros_label.setToolTip( self.zeros_label.setToolTip(
_("The type of zeros suppression used.\n" _("The type of zeros suppression used.\n"
"Can be of type:\n" "Can be of type:\n"

View File

@ -139,7 +139,7 @@ class SolderPaste(FlatCAMTool):
grid0_1 = QtWidgets.QGridLayout() grid0_1 = QtWidgets.QGridLayout()
self.layout.addLayout(grid0_1) self.layout.addLayout(grid0_1)
step1_lbl = QtWidgets.QLabel("<b>%s:</b>" % _('STEP 1:')) step1_lbl = QtWidgets.QLabel("<b>%s:</b>" % _('STEP 1'))
step1_lbl.setToolTip( step1_lbl.setToolTip(
_("First step is to select a number of nozzle tools for usage\n" _("First step is to select a number of nozzle tools for usage\n"
"and then optionally modify the GCode parameters bellow.") "and then optionally modify the GCode parameters bellow.")
@ -163,7 +163,7 @@ class SolderPaste(FlatCAMTool):
# Z dispense start # Z dispense start
self.z_start_entry = FCEntry() self.z_start_entry = FCEntry()
self.z_start_label = QtWidgets.QLabel(_("Z Dispense Start:")) self.z_start_label = QtWidgets.QLabel('%s:' % _("Z Dispense Start"))
self.z_start_label.setToolTip( self.z_start_label.setToolTip(
_("The height (Z) when solder paste dispensing starts.") _("The height (Z) when solder paste dispensing starts.")
) )
@ -171,7 +171,7 @@ class SolderPaste(FlatCAMTool):
# Z dispense # Z dispense
self.z_dispense_entry = FCEntry() self.z_dispense_entry = FCEntry()
self.z_dispense_label = QtWidgets.QLabel(_("Z Dispense:")) self.z_dispense_label = QtWidgets.QLabel('%s:' % _("Z Dispense"))
self.z_dispense_label.setToolTip( self.z_dispense_label.setToolTip(
_("The height (Z) when doing solder paste dispensing.") _("The height (Z) when doing solder paste dispensing.")
) )
@ -179,7 +179,7 @@ class SolderPaste(FlatCAMTool):
# Z dispense stop # Z dispense stop
self.z_stop_entry = FCEntry() self.z_stop_entry = FCEntry()
self.z_stop_label = QtWidgets.QLabel(_("Z Dispense Stop:")) self.z_stop_label = QtWidgets.QLabel('%s:' % _("Z Dispense Stop"))
self.z_stop_label.setToolTip( self.z_stop_label.setToolTip(
_("The height (Z) when solder paste dispensing stops.") _("The height (Z) when solder paste dispensing stops.")
) )
@ -187,7 +187,7 @@ class SolderPaste(FlatCAMTool):
# Z travel # Z travel
self.z_travel_entry = FCEntry() self.z_travel_entry = FCEntry()
self.z_travel_label = QtWidgets.QLabel(_("Z Travel:")) self.z_travel_label = QtWidgets.QLabel('%s:' % _("Z Travel"))
self.z_travel_label.setToolTip( self.z_travel_label.setToolTip(
_("The height (Z) for travel between pads\n" _("The height (Z) for travel between pads\n"
"(without dispensing solder paste).") "(without dispensing solder paste).")
@ -196,7 +196,7 @@ class SolderPaste(FlatCAMTool):
# Z toolchange location # Z toolchange location
self.z_toolchange_entry = FCEntry() self.z_toolchange_entry = FCEntry()
self.z_toolchange_label = QtWidgets.QLabel(_("Z Toolchange:")) self.z_toolchange_label = QtWidgets.QLabel('%s:' % _("Z Toolchange"))
self.z_toolchange_label.setToolTip( self.z_toolchange_label.setToolTip(
_("The height (Z) for tool (nozzle) change.") _("The height (Z) for tool (nozzle) change.")
) )
@ -204,7 +204,7 @@ class SolderPaste(FlatCAMTool):
# X,Y Toolchange location # X,Y Toolchange location
self.xy_toolchange_entry = FCEntry() self.xy_toolchange_entry = FCEntry()
self.xy_toolchange_label = QtWidgets.QLabel(_("XY Toolchange:")) self.xy_toolchange_label = QtWidgets.QLabel('%s:' % _("Toolchange X-Y"))
self.xy_toolchange_label.setToolTip( self.xy_toolchange_label.setToolTip(
_("The X,Y location for tool (nozzle) change.\n" _("The X,Y location for tool (nozzle) change.\n"
"The format is (x, y) where x and y are real numbers.") "The format is (x, y) where x and y are real numbers.")
@ -213,7 +213,7 @@ class SolderPaste(FlatCAMTool):
# Feedrate X-Y # Feedrate X-Y
self.frxy_entry = FCEntry() self.frxy_entry = FCEntry()
self.frxy_label = QtWidgets.QLabel(_("Feedrate X-Y:")) self.frxy_label = QtWidgets.QLabel('%s:' % _("Feedrate X-Y"))
self.frxy_label.setToolTip( self.frxy_label.setToolTip(
_("Feedrate (speed) while moving on the X-Y plane.") _("Feedrate (speed) while moving on the X-Y plane.")
) )
@ -221,7 +221,7 @@ class SolderPaste(FlatCAMTool):
# Feedrate Z # Feedrate Z
self.frz_entry = FCEntry() self.frz_entry = FCEntry()
self.frz_label = QtWidgets.QLabel(_("Feedrate Z:")) self.frz_label = QtWidgets.QLabel('%s:' % _("Feedrate Z"))
self.frz_label.setToolTip( self.frz_label.setToolTip(
_("Feedrate (speed) while moving vertically\n" _("Feedrate (speed) while moving vertically\n"
"(on Z plane).") "(on Z plane).")
@ -230,7 +230,7 @@ class SolderPaste(FlatCAMTool):
# Feedrate Z Dispense # Feedrate Z Dispense
self.frz_dispense_entry = FCEntry() self.frz_dispense_entry = FCEntry()
self.frz_dispense_label = QtWidgets.QLabel(_("Feedrate Z Dispense:")) self.frz_dispense_label = QtWidgets.QLabel('%s:' % _("Feedrate Z Dispense"))
self.frz_dispense_label.setToolTip( self.frz_dispense_label.setToolTip(
_("Feedrate (speed) while moving up vertically\n" _("Feedrate (speed) while moving up vertically\n"
" to Dispense position (on Z plane).") " to Dispense position (on Z plane).")
@ -239,7 +239,7 @@ class SolderPaste(FlatCAMTool):
# Spindle Speed Forward # Spindle Speed Forward
self.speedfwd_entry = FCEntry() self.speedfwd_entry = FCEntry()
self.speedfwd_label = QtWidgets.QLabel(_("Spindle Speed FWD:")) self.speedfwd_label = QtWidgets.QLabel('%s:' % _("Spindle Speed FWD"))
self.speedfwd_label.setToolTip( self.speedfwd_label.setToolTip(
_("The dispenser speed while pushing solder paste\n" _("The dispenser speed while pushing solder paste\n"
"through the dispenser nozzle.") "through the dispenser nozzle.")
@ -248,7 +248,7 @@ class SolderPaste(FlatCAMTool):
# Dwell Forward # Dwell Forward
self.dwellfwd_entry = FCEntry() self.dwellfwd_entry = FCEntry()
self.dwellfwd_label = QtWidgets.QLabel(_("Dwell FWD:")) self.dwellfwd_label = QtWidgets.QLabel('%s:' % _("Dwell FWD"))
self.dwellfwd_label.setToolTip( self.dwellfwd_label.setToolTip(
_("Pause after solder dispensing.") _("Pause after solder dispensing.")
) )
@ -256,7 +256,7 @@ class SolderPaste(FlatCAMTool):
# Spindle Speed Reverse # Spindle Speed Reverse
self.speedrev_entry = FCEntry() self.speedrev_entry = FCEntry()
self.speedrev_label = QtWidgets.QLabel(_("Spindle Speed REV:")) self.speedrev_label = QtWidgets.QLabel('%s:' % _("Spindle Speed REV"))
self.speedrev_label.setToolTip( self.speedrev_label.setToolTip(
_("The dispenser speed while retracting solder paste\n" _("The dispenser speed while retracting solder paste\n"
"through the dispenser nozzle.") "through the dispenser nozzle.")
@ -265,7 +265,7 @@ class SolderPaste(FlatCAMTool):
# Dwell Reverse # Dwell Reverse
self.dwellrev_entry = FCEntry() self.dwellrev_entry = FCEntry()
self.dwellrev_label = QtWidgets.QLabel(_("Dwell REV:")) self.dwellrev_label = QtWidgets.QLabel('%s:' % _("Dwell REV"))
self.dwellrev_label.setToolTip( self.dwellrev_label.setToolTip(
_("Pause after solder paste dispenser retracted,\n" _("Pause after solder paste dispenser retracted,\n"
"to allow pressure equilibrium.") "to allow pressure equilibrium.")
@ -273,7 +273,7 @@ class SolderPaste(FlatCAMTool):
self.gcode_form_layout.addRow(self.dwellrev_label, self.dwellrev_entry) self.gcode_form_layout.addRow(self.dwellrev_label, self.dwellrev_entry)
# Postprocessors # Postprocessors
pp_label = QtWidgets.QLabel(_('PostProcessors:')) pp_label = QtWidgets.QLabel('%s:' % _('PostProcessor'))
pp_label.setToolTip( pp_label.setToolTip(
_("Files that control the GCode generation.") _("Files that control the GCode generation.")
) )
@ -303,7 +303,7 @@ class SolderPaste(FlatCAMTool):
grid2 = QtWidgets.QGridLayout() grid2 = QtWidgets.QGridLayout()
self.generation_box.addLayout(grid2) self.generation_box.addLayout(grid2)
step2_lbl = QtWidgets.QLabel("<b>%s</b>" % _('STEP 2:')) step2_lbl = QtWidgets.QLabel("<b>%s:</b>" % _('STEP 2'))
step2_lbl.setToolTip( step2_lbl.setToolTip(
_("Second step is to create a solder paste dispensing\n" _("Second step is to create a solder paste dispensing\n"
"geometry out of an Solder Paste Mask Gerber file.") "geometry out of an Solder Paste Mask Gerber file.")
@ -321,7 +321,7 @@ class SolderPaste(FlatCAMTool):
self.geo_obj_combo.setRootModelIndex(self.app.collection.index(2, 0, QtCore.QModelIndex())) self.geo_obj_combo.setRootModelIndex(self.app.collection.index(2, 0, QtCore.QModelIndex()))
self.geo_obj_combo.setCurrentIndex(1) self.geo_obj_combo.setCurrentIndex(1)
self.geo_object_label = QtWidgets.QLabel(_("Geo Result:")) self.geo_object_label = QtWidgets.QLabel('%s:' % _("Geo Result"))
self.geo_object_label.setToolTip( self.geo_object_label.setToolTip(
_("Geometry Solder Paste object.\n" _("Geometry Solder Paste object.\n"
"The name of the object has to end in:\n" "The name of the object has to end in:\n"
@ -332,7 +332,7 @@ class SolderPaste(FlatCAMTool):
grid3 = QtWidgets.QGridLayout() grid3 = QtWidgets.QGridLayout()
self.generation_box.addLayout(grid3) self.generation_box.addLayout(grid3)
step3_lbl = QtWidgets.QLabel("<b>%s</b>" % _('STEP 3:')) step3_lbl = QtWidgets.QLabel("<b>%s:</b>" % _('STEP 3'))
step3_lbl.setToolTip( step3_lbl.setToolTip(
_("Third step is to select a solder paste dispensing geometry,\n" _("Third step is to select a solder paste dispensing geometry,\n"
"and then generate a CNCJob object.\n\n" "and then generate a CNCJob object.\n\n"
@ -354,7 +354,7 @@ class SolderPaste(FlatCAMTool):
self.cnc_obj_combo.setRootModelIndex(self.app.collection.index(3, 0, QtCore.QModelIndex())) self.cnc_obj_combo.setRootModelIndex(self.app.collection.index(3, 0, QtCore.QModelIndex()))
self.cnc_obj_combo.setCurrentIndex(1) self.cnc_obj_combo.setCurrentIndex(1)
self.cnc_object_label = QtWidgets.QLabel(_("CNC Result:")) self.cnc_object_label = QtWidgets.QLabel('%s:' % _("CNC Result"))
self.cnc_object_label.setToolTip( self.cnc_object_label.setToolTip(
_("CNCJob Solder paste object.\n" _("CNCJob Solder paste object.\n"
"In order to enable the GCode save section,\n" "In order to enable the GCode save section,\n"
@ -378,7 +378,7 @@ class SolderPaste(FlatCAMTool):
"on PCB pads, to a file.") "on PCB pads, to a file.")
) )
step4_lbl = QtWidgets.QLabel("<b>%s</b>" % _('STEP 4:')) step4_lbl = QtWidgets.QLabel("<b>%s:</b>" % _('STEP 4'))
step4_lbl.setToolTip( step4_lbl.setToolTip(
_("Fourth step (and last) is to select a CNCJob made from \n" _("Fourth step (and last) is to select a CNCJob made from \n"
"a solder paste dispensing geometry, and then view/save it's GCode.") "a solder paste dispensing geometry, and then view/save it's GCode.")

View File

@ -61,7 +61,7 @@ class ToolSub(FlatCAMTool):
self.target_gerber_combo.setRootModelIndex(self.app.collection.index(0, 0, QtCore.QModelIndex())) self.target_gerber_combo.setRootModelIndex(self.app.collection.index(0, 0, QtCore.QModelIndex()))
self.target_gerber_combo.setCurrentIndex(1) self.target_gerber_combo.setCurrentIndex(1)
self.target_gerber_label = QtWidgets.QLabel(_("Target:")) self.target_gerber_label = QtWidgets.QLabel('%s:' % _("Target"))
self.target_gerber_label.setToolTip( self.target_gerber_label.setToolTip(
_("Gerber object from which to substract\n" _("Gerber object from which to substract\n"
"the substractor Gerber object.") "the substractor Gerber object.")
@ -75,7 +75,7 @@ class ToolSub(FlatCAMTool):
self.sub_gerber_combo.setRootModelIndex(self.app.collection.index(0, 0, QtCore.QModelIndex())) self.sub_gerber_combo.setRootModelIndex(self.app.collection.index(0, 0, QtCore.QModelIndex()))
self.sub_gerber_combo.setCurrentIndex(1) self.sub_gerber_combo.setCurrentIndex(1)
self.sub_gerber_label = QtWidgets.QLabel(_("Substractor:")) self.sub_gerber_label = QtWidgets.QLabel('%s:' % _("Substractor"))
self.sub_gerber_label.setToolTip( self.sub_gerber_label.setToolTip(
_("Gerber object that will be substracted\n" _("Gerber object that will be substracted\n"
"from the target Gerber object.") "from the target Gerber object.")
@ -107,7 +107,7 @@ class ToolSub(FlatCAMTool):
self.target_geo_combo.setRootModelIndex(self.app.collection.index(2, 0, QtCore.QModelIndex())) self.target_geo_combo.setRootModelIndex(self.app.collection.index(2, 0, QtCore.QModelIndex()))
self.target_geo_combo.setCurrentIndex(1) self.target_geo_combo.setCurrentIndex(1)
self.target_geo_label = QtWidgets.QLabel(_("Target:")) self.target_geo_label = QtWidgets.QLabel('%s:' % _("Target"))
self.target_geo_label.setToolTip( self.target_geo_label.setToolTip(
_("Geometry object from which to substract\n" _("Geometry object from which to substract\n"
"the substractor Geometry object.") "the substractor Geometry object.")
@ -121,7 +121,7 @@ class ToolSub(FlatCAMTool):
self.sub_geo_combo.setRootModelIndex(self.app.collection.index(2, 0, QtCore.QModelIndex())) self.sub_geo_combo.setRootModelIndex(self.app.collection.index(2, 0, QtCore.QModelIndex()))
self.sub_geo_combo.setCurrentIndex(1) self.sub_geo_combo.setCurrentIndex(1)
self.sub_geo_label = QtWidgets.QLabel(_("Substractor:")) self.sub_geo_label = QtWidgets.QLabel('%s:' % _("Substractor"))
self.sub_geo_label.setToolTip( self.sub_geo_label.setToolTip(
_("Geometry object that will be substracted\n" _("Geometry object that will be substracted\n"
"from the target Geometry object.") "from the target Geometry object.")

View File

@ -65,7 +65,7 @@ class ToolTransform(FlatCAMTool):
self.transform_lay.addLayout(form_layout) self.transform_lay.addLayout(form_layout)
form_child = QtWidgets.QHBoxLayout() form_child = QtWidgets.QHBoxLayout()
self.rotate_label = QtWidgets.QLabel(_("Angle:")) self.rotate_label = QtWidgets.QLabel('%s:' % _("Angle"))
self.rotate_label.setToolTip( self.rotate_label.setToolTip(
_("Angle for Rotation action, in degrees.\n" _("Angle for Rotation action, in degrees.\n"
"Float number between -360 and 359.\n" "Float number between -360 and 359.\n"
@ -104,7 +104,7 @@ class ToolTransform(FlatCAMTool):
form1_child_1 = QtWidgets.QHBoxLayout() form1_child_1 = QtWidgets.QHBoxLayout()
form1_child_2 = QtWidgets.QHBoxLayout() form1_child_2 = QtWidgets.QHBoxLayout()
self.skewx_label = QtWidgets.QLabel(_("Angle X:")) self.skewx_label = QtWidgets.QLabel('%s:' % _("Skew_X angle"))
self.skewx_label.setToolTip( self.skewx_label.setToolTip(
_("Angle for Skew action, in degrees.\n" _("Angle for Skew action, in degrees.\n"
"Float number between -360 and 359.") "Float number between -360 and 359.")
@ -122,7 +122,7 @@ class ToolTransform(FlatCAMTool):
"the bounding box for all selected objects.")) "the bounding box for all selected objects."))
self.skewx_button.setMinimumWidth(90) self.skewx_button.setMinimumWidth(90)
self.skewy_label = QtWidgets.QLabel(_("Angle Y:")) self.skewy_label = QtWidgets.QLabel('%s:' % _("Skew_Y angle"))
self.skewy_label.setToolTip( self.skewy_label.setToolTip(
_("Angle for Skew action, in degrees.\n" _("Angle for Skew action, in degrees.\n"
"Float number between -360 and 359.") "Float number between -360 and 359.")
@ -161,9 +161,9 @@ class ToolTransform(FlatCAMTool):
form2_child_1 = QtWidgets.QHBoxLayout() form2_child_1 = QtWidgets.QHBoxLayout()
form2_child_2 = QtWidgets.QHBoxLayout() form2_child_2 = QtWidgets.QHBoxLayout()
self.scalex_label = QtWidgets.QLabel(_("Factor X:")) self.scalex_label = QtWidgets.QLabel('%s:' % _("Scale_X factor"))
self.scalex_label.setToolTip( self.scalex_label.setToolTip(
_("Factor for Scale action over X axis.") _("Factor for scaling on X axis.")
) )
self.scalex_label.setMinimumWidth(70) self.scalex_label.setMinimumWidth(70)
self.scalex_entry = FCEntry() self.scalex_entry = FCEntry()
@ -178,9 +178,9 @@ class ToolTransform(FlatCAMTool):
"the Scale reference checkbox state.")) "the Scale reference checkbox state."))
self.scalex_button.setMinimumWidth(90) self.scalex_button.setMinimumWidth(90)
self.scaley_label = QtWidgets.QLabel(_("Factor Y:")) self.scaley_label = QtWidgets.QLabel('%s:' % _("Scale_Y factor"))
self.scaley_label.setToolTip( self.scaley_label.setToolTip(
_("Factor for Scale action over Y axis.") _("Factor for scaling on Y axis.")
) )
self.scaley_label.setMinimumWidth(70) self.scaley_label.setMinimumWidth(70)
self.scaley_entry = FCEntry() self.scaley_entry = FCEntry()
@ -200,12 +200,13 @@ class ToolTransform(FlatCAMTool):
self.scale_link_cb.setText(_("Link")) self.scale_link_cb.setText(_("Link"))
self.scale_link_cb.setToolTip( self.scale_link_cb.setToolTip(
_("Scale the selected object(s)\n" _("Scale the selected object(s)\n"
"using the Scale Factor X for both axis.")) "using the Scale_X factor for both axis.")
)
self.scale_link_cb.setMinimumWidth(70) self.scale_link_cb.setMinimumWidth(70)
self.scale_zero_ref_cb = FCCheckBox() self.scale_zero_ref_cb = FCCheckBox()
self.scale_zero_ref_cb.set_value(True) self.scale_zero_ref_cb.set_value(True)
self.scale_zero_ref_cb.setText(_("Scale Reference")) self.scale_zero_ref_cb.setText('%s' % _("Scale Reference"))
self.scale_zero_ref_cb.setToolTip( self.scale_zero_ref_cb.setToolTip(
_("Scale the selected object(s)\n" _("Scale the selected object(s)\n"
"using the origin reference when checked,\n" "using the origin reference when checked,\n"
@ -235,9 +236,9 @@ class ToolTransform(FlatCAMTool):
form3_child_1 = QtWidgets.QHBoxLayout() form3_child_1 = QtWidgets.QHBoxLayout()
form3_child_2 = QtWidgets.QHBoxLayout() form3_child_2 = QtWidgets.QHBoxLayout()
self.offx_label = QtWidgets.QLabel(_("Value X:")) self.offx_label = QtWidgets.QLabel('%s:' % _("Offset_X val"))
self.offx_label.setToolTip( self.offx_label.setToolTip(
_("Value for Offset action on X axis.") _("Distance to offset on X axis. In current units.")
) )
self.offx_label.setMinimumWidth(70) self.offx_label.setMinimumWidth(70)
self.offx_entry = FCEntry() self.offx_entry = FCEntry()
@ -252,9 +253,9 @@ class ToolTransform(FlatCAMTool):
"the bounding box for all selected objects.\n")) "the bounding box for all selected objects.\n"))
self.offx_button.setMinimumWidth(90) self.offx_button.setMinimumWidth(90)
self.offy_label = QtWidgets.QLabel(_("Value Y:")) self.offy_label = QtWidgets.QLabel('%s:' % _("Offset_Y val"))
self.offy_label.setToolTip( self.offy_label.setToolTip(
_("Value for Offset action on Y axis.") _("Distance to offset on Y axis. In current units.")
) )
self.offy_label.setMinimumWidth(70) self.offy_label.setMinimumWidth(70)
self.offy_entry = FCEntry() self.offy_entry = FCEntry()
@ -309,7 +310,7 @@ class ToolTransform(FlatCAMTool):
self.flip_ref_cb = FCCheckBox() self.flip_ref_cb = FCCheckBox()
self.flip_ref_cb.set_value(True) self.flip_ref_cb.set_value(True)
self.flip_ref_cb.setText(_("Ref Pt")) self.flip_ref_cb.setText('%s' % _("Mirror Reference"))
self.flip_ref_cb.setToolTip( self.flip_ref_cb.setToolTip(
_("Flip the selected object(s)\n" _("Flip the selected object(s)\n"
"around the point in Point Entry Field.\n" "around the point in Point Entry Field.\n"
@ -322,7 +323,7 @@ class ToolTransform(FlatCAMTool):
"Point Entry field and click Flip on X(Y)")) "Point Entry field and click Flip on X(Y)"))
self.flip_ref_cb.setMinimumWidth(70) self.flip_ref_cb.setMinimumWidth(70)
self.flip_ref_label = QtWidgets.QLabel(_("Point:")) self.flip_ref_label = QtWidgets.QLabel('%s:' % _(" Mirror Ref. Point"))
self.flip_ref_label.setToolTip( self.flip_ref_label.setToolTip(
_("Coordinates in format (x, y) used as reference for mirroring.\n" _("Coordinates in format (x, y) used as reference for mirroring.\n"
"The 'x' in (x, y) will be used when using Flip on X and\n" "The 'x' in (x, y) will be used when using Flip on X and\n"