- changed and added some icons

- fixed the Shortcuts Tab to reflect the actual current shortcut keys
- started to work on moving the Isolation Routing from the Gerber Object UI to it's own tool

AppGUI/MainGUI.py

@@ -915,6 +915,8 @@ class MainGUI(QtWidgets.QMainWindow):
             QtGui.QIcon(self.app.resource_location + '/ncc16.png'), _("NCC Tool"))
         self.paint_btn = self.toolbartools.addAction(
             QtGui.QIcon(self.app.resource_location + '/paint20_1.png'), _("Paint Tool"))
+        self.isolation_btn = self.toolbartools.addAction(
+            QtGui.QIcon(self.app.resource_location + '/iso_16.png'), _("Isolation Tool"))
         self.toolbartools.addSeparator()
 
         self.panelize_btn = self.toolbartools.addAction(
@@ -1908,6 +1910,8 @@ class MainGUI(QtWidgets.QMainWindow):
             QtGui.QIcon(self.app.resource_location + '/ncc16.png'), _("NCC Tool"))
         self.paint_btn = self.toolbartools.addAction(
             QtGui.QIcon(self.app.resource_location + '/paint20_1.png'), _("Paint Tool"))
+        self.isolation_btn = self.toolbartools.addAction(
+            QtGui.QIcon(self.app.resource_location + '/iso_16.png'), _("Isolation Tool"))
         self.toolbartools.addSeparator()
 
         self.panelize_btn = self.toolbartools.addAction(
@@ -2295,14 +2299,15 @@ class MainGUI(QtWidgets.QMainWindow):
                     self.app.dblsidedtool.run(toggle=True)
                     return
 
-                # Calibration  Tool
+                # Extract Drills  Tool
                 if key == QtCore.Qt.Key_E:
-                    self.app.cal_exc_tool.run(toggle=True)
+                    # self.app.cal_exc_tool.run(toggle=True)
+                    self.app.edrills_tool.run(toggle=True)
                     return
 
-                # Copper Thieving Tool
+                # Fiducials Tool
                 if key == QtCore.Qt.Key_F:
-                    self.app.copper_thieving_tool.run(toggle=True)
+                    self.app.fiducial_tool.run(toggle=True)
                     return
 
                 # Toggle Grid lines
@@ -2310,17 +2315,17 @@ class MainGUI(QtWidgets.QMainWindow):
                     self.app.on_toggle_grid_lines()
                     return
 
-                # Align in Object Tool
+                # Punch Gerber Tool
                 if key == QtCore.Qt.Key_H:
                     self.app.punch_tool.run(toggle=True)
 
-                # Extract Drills Tool
+                # Isolation Tool
                 if key == QtCore.Qt.Key_I:
-                    self.app.edrills_tool.run(toggle=True)
+                    self.app.isolation_tool.run(toggle=True)
 
-                # Fiducials Tool
+                # Copper Thieving Tool
                 if key == QtCore.Qt.Key_J:
-                    self.app.fiducial_tool.run(toggle=True)
+                    self.app.copper_thieving_tool.run(toggle=True)
                     return
 
                 # Solder Paste Dispensing Tool
@@ -3879,6 +3884,16 @@ class ShortcutsTab(QtWidgets.QWidget):
                         <td height="20"><strong>Alt+E</strong></td>
                         <td>&nbsp;%s</td>
                     </tr>
+                    </tr>
+                    <tr height="20">
+                        <td height="20"><strong>Alt+F</strong></td>
+                        <td>&nbsp;%s</td>
+                    </tr>
+                    </tr>
+                    <tr height="20">
+                        <td height="20"><strong>Alt+G</strong></td>
+                        <td>&nbsp;%s</td>
+                    </tr>
                     <tr height="20">
                         <td height="20"><strong>Alt+H</strong></td>
                         <td>&nbsp;%s</td>
@@ -3928,7 +3943,19 @@ class ShortcutsTab(QtWidgets.QWidget):
                         <td>&nbsp;%s</td>
                     </tr>
                     <tr height="20">
-                        <td height="20"><strong>Alt+U</strong></td>
+                        <td height="20"><strong>Alt+T</strong></td>
+                        <td>&nbsp;%s</td>
+                    </tr>
+                    <tr height="20">
+                        <td height="20"><strong>Alt+W</strong></td>
+                        <td>&nbsp;%s</td>
+                    </tr>
+                    <tr height="20">
+                        <td height="20"><strong>Alt+X</strong></td>
+                        <td>&nbsp;%s</td>
+                    </tr>
+                    <tr height="20">
+                        <td height="20"><strong>Alt+Z</strong></td>
                         <td>&nbsp;%s</td>
                     </tr>
                     <tr height="20">
@@ -4030,13 +4057,15 @@ class ShortcutsTab(QtWidgets.QWidget):
                 _("Skew on Y axis"),
 
                 # ALT section
-                _("Align Objects Tool"), _("Calculators Tool"), _("2-Sided PCB Tool"), _("Transformations Tool"),
+                _("Align Objects Tool"), _("Calculators Tool"), _("2-Sided PCB Tool"), _("Extract Drills Tool"),
-                _("Punch Gerber Tool"), _("Extract Drills Tool"), _("Fiducials Tool"),
+                _("Fiducials Tool"), _("Toggle Grid Lines"),
+                _("Punch Gerber Tool"), _("Isolation Tool"), _("Copper Thieving Tool"),
                 _("Solder Paste Dispensing Tool"),
                 _("Film PCB Tool"), _("Corner Markers Tool"), _("Non-Copper Clearing Tool"), _("Optimal Tool"),
                 _("Paint Area Tool"), _("QRCode Tool"), _("Rules Check Tool"),
-                _("View File Source"),
+                _("View File Source"), _("Transformations Tool"),
-                _("Cutout PCB Tool"), _("Enable all Plots"), _("Disable all Plots"), _("Disable Non-selected Plots"),
+                _("Subtract Tool"), _("Cutout PCB Tool"), _("Panelize PCB"),
+                _("Enable all Plots"), _("Disable all Plots"), _("Disable Non-selected Plots"),
                 _("Toggle Full Screen"),
 
                 # CTRL + ALT section

AppTools/ToolCopperThieving.py

@@ -568,7 +568,7 @@ class ToolCopperThieving(AppTool):
         self.app.ui.notebook.setTabText(2, _("Copper Thieving Tool"))
 
     def install(self, icon=None, separator=None, **kwargs):
-        AppTool.install(self, icon, separator, shortcut='Alt+F', **kwargs)
+        AppTool.install(self, icon, separator, shortcut='Alt+J', **kwargs)
 
     def set_tool_ui(self):
         self.units = self.app.defaults['units']

AppTools/ToolFiducials.py

@@ -396,7 +396,7 @@ class ToolFiducials(AppTool):
         self.app.ui.notebook.setTabText(2, _("Fiducials Tool"))
 
     def install(self, icon=None, separator=None, **kwargs):
-        AppTool.install(self, icon, separator, shortcut='Alt+J', **kwargs)
+        AppTool.install(self, icon, separator, shortcut='Alt+F', **kwargs)
 
     def set_tool_ui(self):
         self.units = self.app.defaults['units']

AppTools/__init__.py

@@ -1,7 +1,6 @@
 
 from AppTools.ToolCalculators import ToolCalculator
 from AppTools.ToolCalibration import ToolCalibration
-from AppTools.ToolCutOut import CutOut
 
 from AppTools.ToolDblSided import DblSidedTool
 from AppTools.ToolExtractDrills import ToolExtractDrills
@@ -16,8 +15,10 @@ from AppTools.ToolDistanceMin import DistanceMin
 
 from AppTools.ToolMove import ToolMove
 
+from AppTools.ToolCutOut import CutOut
 from AppTools.ToolNCC import NonCopperClear
 from AppTools.ToolPaint import ToolPaint
+from AppTools.ToolIsolation import ToolIsolation
 
 from AppTools.ToolOptimal import ToolOptimal
 

App_Main.py

@@ -1315,10 +1315,13 @@ class App(QtCore.QObject):
         self.rules_tool = None
         self.sub_tool = None
         self.move_tool = None
+
         self.cutout_tool = None
         self.ncclear_tool = None
-        self.optimal_tool = None
         self.paint_tool = None
+        self.isolation_tool = None
+
+        self.optimal_tool = None
         self.transform_tool = None
         self.properties_tool = None
         self.pdf_tool = None
@@ -1901,6 +1904,10 @@ class App(QtCore.QObject):
         self.paint_tool.install(icon=QtGui.QIcon(self.resource_location + '/paint16.png'), pos=self.ui.menutool,
                                 before=self.sub_tool.menuAction, separator=True)
 
+        self.isolation_tool = ToolIsolation(self)
+        self.isolation_tool.install(icon=QtGui.QIcon(self.resource_location + '/iso_16.png'), pos=self.ui.menutool,
+                                    before=self.sub_tool.menuAction, separator=True)
+
         self.copper_thieving_tool = ToolCopperThieving(self)
         self.copper_thieving_tool.install(icon=QtGui.QIcon(self.resource_location + '/copperfill32.png'),
                                           pos=self.ui.menutool)
@@ -2057,6 +2064,7 @@ class App(QtCore.QObject):
         self.ui.cutout_btn.triggered.connect(lambda: self.cutout_tool.run(toggle=True))
         self.ui.ncc_btn.triggered.connect(lambda: self.ncclear_tool.run(toggle=True))
         self.ui.paint_btn.triggered.connect(lambda: self.paint_tool.run(toggle=True))
+        self.ui.isolation_btn.triggered.connect(lambda: self.isolation_tool.run(toggle=True))
 
         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))

CHANGELOG.md

@@ -13,6 +13,9 @@ CHANGELOG for FlatCAM beta
 - modified the Etch Compensation Tool and added conversion utilities from Oz thickenss and mils to microns
 - added a Toggle All checkbox to Corner Markers Tool
 - added an Icon to the MessageBox that asks for saving if the user try to close the app and there is some unsaved work 
+- changed and added some icons
+- fixed the Shortcuts Tab to reflect the actual current shortcut keys
+- started to work on moving the Isolation Routing from the Gerber Object UI to it's own tool
 
 24.05.2020