- changed the Panelize tool icon
- corrected some strings
This commit is contained in:
parent
313acd0a25
commit
3a8799b859
|
@ -3065,7 +3065,7 @@ class App(QtCore.QObject):
|
|||
separator=True)
|
||||
|
||||
self.panelize_tool = Panelize(self)
|
||||
self.panelize_tool.install(icon=QtGui.QIcon('share/panel16.png'))
|
||||
self.panelize_tool.install(icon=QtGui.QIcon('share/panelize16.png'))
|
||||
|
||||
self.film_tool = Film(self)
|
||||
self.film_tool.install(icon=QtGui.QIcon('share/film16.png'))
|
||||
|
|
|
@ -17,6 +17,8 @@ CAD program, and create G-Code for Isolation routing.
|
|||
- removed the styling on the comboboxes cellWidget's in the Tool Tables
|
||||
- replaced some of the icons that did not looked Ok on the dark theme
|
||||
- added a new toolbar button for the Copy object functionality
|
||||
- changed the Panelize tool icon
|
||||
- corrected some strings
|
||||
|
||||
14.10.2019
|
||||
|
||||
|
|
|
@ -738,10 +738,10 @@ class FlatCAMGUI(QtWidgets.QMainWindow):
|
|||
self.paint_btn = self.toolbartools.addAction(QtGui.QIcon('share/paint20_1.png'), _("Paint Tool"))
|
||||
self.toolbartools.addSeparator()
|
||||
|
||||
self.panelize_btn = self.toolbartools.addAction(QtGui.QIcon('share/panel16.png'), _("Panel Tool"))
|
||||
self.panelize_btn = self.toolbartools.addAction(QtGui.QIcon('share/panelize32.png'), _("Panel Tool"))
|
||||
self.film_btn = self.toolbartools.addAction(QtGui.QIcon('share/film16.png'), _("Film Tool"))
|
||||
self.solder_btn = self.toolbartools.addAction(QtGui.QIcon('share/solderpastebis32.png'), _("SolderPaste Tool"))
|
||||
self.sub_btn = self.toolbartools.addAction(QtGui.QIcon('share/sub32.png'), _("Substract Tool"))
|
||||
self.sub_btn = self.toolbartools.addAction(QtGui.QIcon('share/sub32.png'), _("Subtract Tool"))
|
||||
self.rules_btn = self.toolbartools.addAction(QtGui.QIcon('share/rules32.png'), _("Rules Tool"))
|
||||
self.optimal_btn = self.toolbartools.addAction(QtGui.QIcon('share/open_excellon32.png'), _("Optimal Tool"))
|
||||
|
||||
|
@ -1873,7 +1873,7 @@ class FlatCAMGUI(QtWidgets.QMainWindow):
|
|||
|
||||
self.draw_union = self.g_editor_cmenu.addAction(QtGui.QIcon('share/union32.png'), _("Union"))
|
||||
self.draw_intersect = self.g_editor_cmenu.addAction(QtGui.QIcon('share/intersection32.png'), _("Intersection"))
|
||||
self.draw_substract = self.g_editor_cmenu.addAction(QtGui.QIcon('share/subtract32.png'), _("Substraction"))
|
||||
self.draw_substract = self.g_editor_cmenu.addAction(QtGui.QIcon('share/subtract32.png'), _("Subtraction"))
|
||||
self.draw_cut = self.g_editor_cmenu.addAction(QtGui.QIcon('share/cutpath32.png'), _("Cut"))
|
||||
self.draw_transform = self.g_editor_cmenu.addAction(QtGui.QIcon('share/transform.png'), _("Transformations"))
|
||||
|
||||
|
@ -2154,11 +2154,11 @@ class FlatCAMGUI(QtWidgets.QMainWindow):
|
|||
self.paint_btn = self.toolbartools.addAction(QtGui.QIcon('share/paint20_1.png'), _("Paint Tool"))
|
||||
self.toolbartools.addSeparator()
|
||||
|
||||
self.panelize_btn = self.toolbartools.addAction(QtGui.QIcon('share/panel16.png'), _("Panel Tool"))
|
||||
self.panelize_btn = self.toolbartools.addAction(QtGui.QIcon('share/panelize32.png'), _("Panel Tool"))
|
||||
self.film_btn = self.toolbartools.addAction(QtGui.QIcon('share/film16.png'), _("Film Tool"))
|
||||
self.solder_btn = self.toolbartools.addAction(QtGui.QIcon('share/solderpastebis32.png'),
|
||||
_("SolderPaste Tool"))
|
||||
self.sub_btn = self.toolbartools.addAction(QtGui.QIcon('share/sub32.png'), _("Substract Tool"))
|
||||
self.sub_btn = self.toolbartools.addAction(QtGui.QIcon('share/sub32.png'), _("Subtract Tool"))
|
||||
|
||||
self.toolbartools.addSeparator()
|
||||
|
||||
|
|
|
@ -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
|
||||
|
|
Binary file not shown.
After Width: | Height: | Size: 443 B |
Binary file not shown.
After Width: | Height: | Size: 553 B |
Loading…
Reference in New Issue