bartool/flatcam-wsl
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

- changed the Panelize tool icon

Browse Source 
- corrected some strings
This commit is contained in:
Marius Stanciu
2019-10-16 04:24:02 +03:00
committed by Marius
parent 313acd0a25
commit 3a8799b859
6 changed files with 24 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
flatcamTools/ToolSub.py
View File

@@ -32,7 +32,7 @@ class ToolSub(FlatCAMTool):
job_finished = QtCore.pyqtSignal(bool)
toolName = _("Substract Tool")
toolName = _("Subtract Tool")
def __init__(self, app):
self.app = app
@@ -72,8 +72,8 @@ class ToolSub(FlatCAMTool):
self.target_gerber_label = QtWidgets.QLabel('%s:' % _("Target"))
self.target_gerber_label.setToolTip(
_("Gerber object from which to substract\n"
"the substractor Gerber object.")
_("Gerber object from which to subtract\n"
"the subtractor Gerber object.")
)
form_layout.addRow(self.target_gerber_label, self.target_gerber_combo)
@@ -84,9 +84,9 @@ class ToolSub(FlatCAMTool):
self.sub_gerber_combo.setRootModelIndex(self.app.collection.index(0, 0, QtCore.QModelIndex()))
self.sub_gerber_combo.setCurrentIndex(1)
self.sub_gerber_label = QtWidgets.QLabel('%s:' % _("Substractor"))
self.sub_gerber_label = QtWidgets.QLabel('%s:' % _("Subtractor"))
self.sub_gerber_label.setToolTip(
_("Gerber object that will be substracted\n"
_("Gerber object that will be subtracted\n"
"from the target Gerber object.")
)
e_lab_1 = QtWidgets.QLabel('')
@@ -95,7 +95,7 @@ class ToolSub(FlatCAMTool):
self.intersect_btn = FCButton(_('Substract Gerber'))
self.intersect_btn.setToolTip(
_("Will remove the area occupied by the substractor\n"
_("Will remove the area occupied by the subtractor\n"
"Gerber from the Target Gerber.\n"
"Can be used to remove the overlapping silkscreen\n"
"over the soldermask.")
@@ -118,8 +118,8 @@ class ToolSub(FlatCAMTool):
self.target_geo_label = QtWidgets.QLabel('%s:' % _("Target"))
self.target_geo_label.setToolTip(
_("Geometry object from which to substract\n"
"the substractor Geometry object.")
_("Geometry object from which to subtract\n"
"the subtractor Geometry object.")
)
form_geo_layout.addRow(self.target_geo_label, self.target_geo_combo)
@@ -130,9 +130,9 @@ class ToolSub(FlatCAMTool):
self.sub_geo_combo.setRootModelIndex(self.app.collection.index(2, 0, QtCore.QModelIndex()))
self.sub_geo_combo.setCurrentIndex(1)
self.sub_geo_label = QtWidgets.QLabel('%s:' % _("Substractor"))
self.sub_geo_label = QtWidgets.QLabel('%s:' % _("Subtractor"))
self.sub_geo_label.setToolTip(
_("Geometry object that will be substracted\n"
_("Geometry object that will be subtracted\n"
"from the target Geometry object.")
)
e_lab_1 = QtWidgets.QLabel('')
@@ -140,12 +140,12 @@ class ToolSub(FlatCAMTool):
form_geo_layout.addRow(self.sub_geo_label, self.sub_geo_combo)
self.close_paths_cb = FCCheckBox(_("Close paths"))
self.close_paths_cb.setToolTip(_("Checking this will close the paths cut by the Geometry substractor object."))
self.close_paths_cb.setToolTip(_("Checking this will close the paths cut by the Geometry subtractor object."))
self.tools_box.addWidget(self.close_paths_cb)
self.intersect_geo_btn = FCButton(_('Substract Geometry'))
self.intersect_geo_btn = FCButton(_('Subtract Geometry'))
self.intersect_geo_btn.setToolTip(
_("Will remove the area occupied by the substractor\n"
_("Will remove the area occupied by the subtractor\n"
"Geometry from the Target Geometry.")
)
self.tools_box.addWidget(self.intersect_geo_btn)
@@ -264,7 +264,7 @@ class ToolSub(FlatCAMTool):
self.sub_grb_obj_name = self.sub_gerber_combo.currentText()
if self.sub_grb_obj_name == '':
self.app.inform.emit('[ERROR_NOTCL] %s' %
_("No Substractor object loaded."))
_("No Subtractor object loaded."))
return
# Get substractor object.
@@ -466,7 +466,7 @@ class ToolSub(FlatCAMTool):
self.sub_geo_obj_name = self.sub_geo_combo.currentText()
if self.sub_geo_obj_name == '':
self.app.inform.emit('[ERROR_NOTCL] %s' %
_("No Substractor object loaded."))
_("No Subtractor object loaded."))
return
# Get substractor object.
@@ -480,7 +480,7 @@ class ToolSub(FlatCAMTool):
if self.sub_geo_obj.multigeo:
self.app.inform.emit('[ERROR_NOTCL] %s' %
_("Currently, the Substractor geometry cannot be of type Multigeo."))
_("Currently, the Subtractor geometry cannot be of type Multigeo."))
return
# create the target_options obj