diff --git a/FlatCAMApp.py b/FlatCAMApp.py index 8cbbc58c..310b2a08 100644 --- a/FlatCAMApp.py +++ b/FlatCAMApp.py @@ -1960,12 +1960,14 @@ class App(QtCore.QObject): self.paste_tool = SolderPaste(self) self.paste_tool.install(icon=QtGui.QIcon('share/solderpastebis32.png')) - self.silk_tool = ToolSilk(self) - self.silk_tool.install(icon=QtGui.QIcon('share/silk32.png'), separator=True) - self.calculator_tool = ToolCalculator(self) self.calculator_tool.install(icon=QtGui.QIcon('share/calculator24.png')) + + self.sub_tool = ToolSub(self) + self.sub_tool.install(icon=QtGui.QIcon('share/sub32.png'), pos=self.ui.menuedit_convert, + before=self.ui.menuedit_convert_sg2mg) + self.move_tool = ToolMove(self) self.move_tool.install(icon=QtGui.QIcon('share/move16.png'), pos=self.ui.menuedit, before=self.ui.menueditorigin) @@ -2065,7 +2067,7 @@ class App(QtCore.QObject): self.ui.panelize_btn.triggered.connect(lambda: self.panelize_tool.run(toggle=True)) self.ui.film_btn.triggered.connect(lambda: self.film_tool.run(toggle=True)) self.ui.solder_btn.triggered.connect(lambda: self.paste_tool.run(toggle=True)) - self.ui.silk_btn.triggered.connect(lambda: self.silk_tool.run(toggle=True)) + self.ui.silk_btn.triggered.connect(lambda: self.sub_tool.run(toggle=True)) self.ui.calculators_btn.triggered.connect(lambda: self.calculator_tool.run(toggle=True)) self.ui.transform_btn.triggered.connect(lambda: self.transform_tool.run(toggle=True)) diff --git a/README.md b/README.md index 8bb159af..ff79060a 100644 --- a/README.md +++ b/README.md @@ -12,7 +12,8 @@ CAD program, and create G-Code for Isolation routing. 30.04.2019 - in ObjectCollection class, made sure that renaming an object in Project View does not result in an empty name. If new name is blank the rename is cancelled. -- made ObjectCOllection.TreeItem() inherit KeySensitiveListVIew and implicitly QTreeView (in the hope that the theme applied on app will be applied on the tree items, too (for MacOs new DarkUI theme) +- made ObjectCollection.TreeItem() inherit KeySensitiveListVIew and implicitly QTreeView (in the hope that the theme applied on app will be applied on the tree items, too (for MacOs new DarkUI theme) +- renamed SilkScreen Tool to Substract Tool and move it's menu location in Edit -> Conversion 29.04.2019 @@ -35,7 +36,7 @@ CAD program, and create G-Code for Isolation routing. 25.04.2019 - Geometry Editor: modified the intersection (if the selected shapes don't intersects preserve them) and substract functions (delete all shapes that were used in the process) -- work in the ToolSilk +- work in the ToolSub - for all objects, if in Selected the object name is changed to the same name, the rename is not done (because there is nothing changed) - fixed Edit -> Copy as Geom function handler to work for Excellon objects, too - made sure that the mouse pointer is restored to default on Editor exit diff --git a/flatcamGUI/FlatCAMGUI.py b/flatcamGUI/FlatCAMGUI.py index 695807e3..27af8cbf 100644 --- a/flatcamGUI/FlatCAMGUI.py +++ b/flatcamGUI/FlatCAMGUI.py @@ -638,7 +638,7 @@ class FlatCAMGUI(QtWidgets.QMainWindow): self.panelize_btn = self.toolbartools.addAction(QtGui.QIcon('share/panel16.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.silk_btn = self.toolbartools.addAction(QtGui.QIcon('share/silk32.png'), _("Silkscreen Tool")) + self.silk_btn = self.toolbartools.addAction(QtGui.QIcon('share/sub32.png'), _("Substract Tool")) self.toolbartools.addSeparator() @@ -1855,7 +1855,7 @@ class FlatCAMGUI(QtWidgets.QMainWindow): 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.silk_btn = self.toolbartools.addAction(QtGui.QIcon('share/silk32.png'), _("Silkscreen Tool")) + self.silk_btn = self.toolbartools.addAction(QtGui.QIcon('share/sub32.png'), _("Substract Tool")) self.toolbartools.addSeparator() @@ -2124,11 +2124,6 @@ class FlatCAMGUI(QtWidgets.QMainWindow): self.app.dblsidedtool.run(toggle=True) return - # Silkscreen Tool - if key == QtCore.Qt.Key_E: - self.app.silk_tool.run(toggle=True) - return - # Solder Paste Dispensing Tool if key == QtCore.Qt.Key_K: self.app.paste_tool.run(toggle=True) @@ -2169,6 +2164,11 @@ class FlatCAMGUI(QtWidgets.QMainWindow): self.app.cutout_tool.run(toggle=True) return + # Substract Tool + if key == QtCore.Qt.Key_W: + self.app.sub_tool.run(toggle=True) + return + # Panelize Tool if key == QtCore.Qt.Key_Z: self.app.panelize_tool.run(toggle=True) diff --git a/flatcamTools/ToolSilk.py b/flatcamTools/ToolSub.py similarity index 98% rename from flatcamTools/ToolSilk.py rename to flatcamTools/ToolSub.py index 3cc67a50..0af91183 100644 --- a/flatcamTools/ToolSilk.py +++ b/flatcamTools/ToolSub.py @@ -21,9 +21,9 @@ if '_' not in builtins.__dict__: _ = gettext.gettext -class ToolSilk(FlatCAMTool): +class ToolSub(FlatCAMTool): - toolName = _("Silkscreen Tool") + toolName = _("Substract Tool") def __init__(self, app): self.app = app @@ -118,7 +118,7 @@ class ToolSilk(FlatCAMTool): self.intersect_btn.clicked.connect(self.on_intersection_click) def install(self, icon=None, separator=None, **kwargs): - FlatCAMTool.install(self, icon, separator, shortcut='ALT+N', **kwargs) + FlatCAMTool.install(self, icon, separator, shortcut='ALT+W', **kwargs) def run(self, toggle=True): self.app.report_usage("ToolNonCopperClear()") @@ -239,7 +239,7 @@ class ToolSilk(FlatCAMTool): :return: """ - log.debug("ToolSilk --> Periodic Check started.") + log.debug("ToolSub --> Periodic Check started.") try: self.check_thread.stop() @@ -272,7 +272,7 @@ class ToolSilk(FlatCAMTool): self.app.worker_task.emit({'fcn': self.new_silkscreen_object, 'params': [outname]}) - log.debug("ToolSilk --> Periodic check finished.") + log.debug("ToolSub --> Periodic check finished.") except Exception: traceback.print_exc() diff --git a/flatcamTools/__init__.py b/flatcamTools/__init__.py index abbbee0e..ff3ef650 100644 --- a/flatcamTools/__init__.py +++ b/flatcamTools/__init__.py @@ -16,7 +16,7 @@ from flatcamTools.ToolTransform import ToolTransform from flatcamTools.ToolSolderPaste import SolderPaste from flatcamTools.ToolPcbWizard import PcbWizard from flatcamTools.ToolPDF import ToolPDF -from flatcamTools.ToolSilk import ToolSilk +from flatcamTools.ToolSub import ToolSub from flatcamTools.ToolShell import FCShell diff --git a/share/silk32.png b/share/sub32.png similarity index 100% rename from share/silk32.png rename to share/sub32.png