- all kwy shortcuts work across the entire application; started to move all the shortcuts definitions in FlatCAMGUI.keyPressEvent()

FlatCAMGUI.py

@@ -10,6 +10,7 @@ from PyQt5 import QtGui, QtCore, QtWidgets
 from PyQt5.QtCore import Qt, QSettings
 from GUIElements import *
 import platform
+import webbrowser
 
 
 class FlatCAMGUI(QtWidgets.QMainWindow):
@@ -1498,31 +1499,244 @@ class FlatCAMGUI(QtWidgets.QMainWindow):
                 self.snap_magnet.setDisabled(True)
 
     def keyPressEvent(self, event):
+        modifiers = QtWidgets.QApplication.keyboardModifiers()
+        active = self.app.collection.get_active()
+        selected = self.app.collection.get_selected()
+
+        # events out of the self.app.collection view (it's about Project Tab) are of type int
+        if type(event) is int:
+            key = event
+        # events from the GUI are of type QKeyEvent
+        else:
+            key = event.key()
+
+        if modifiers == QtCore.Qt.ControlModifier:
+            if key == QtCore.Qt.Key_A:
+                self.app.on_selectall()
+
+            if key == QtCore.Qt.Key_C:
+                self.app.on_copy_object()
+
+            if key == QtCore.Qt.Key_E:
+                self.app.on_fileopenexcellon()
+
+            if key == QtCore.Qt.Key_G:
+                self.app.on_fileopengerber()
+
+            if key == QtCore.Qt.Key_N:
+                self.app.on_file_new_click()
+
+            if key == QtCore.Qt.Key_M:
+                self.app.measurement_tool.run()
+            if key == QtCore.Qt.Key_O:
+                self.app.on_file_openproject()
+
+            if key == QtCore.Qt.Key_S:
+                self.app.on_file_saveproject()
+
+            # Toggle Plot Area
+            if key == QtCore.Qt.Key_F10:
+                self.app.on_toggle_plotarea()
+
+            return
+        elif modifiers == QtCore.Qt.ShiftModifier:
+
+            # Copy Object Name
+            # Copy Object Name
+            if key == QtCore.Qt.Key_C:
+                self.app.on_copy_name()
+
+            # Toggle axis
+            if key == QtCore.Qt.Key_G:
+                if self.toggle_axis is False:
+                    self.app.plotcanvas.v_line.set_data(color=(0.70, 0.3, 0.3, 1.0))
+                    self.app.plotcanvas.h_line.set_data(color=(0.70, 0.3, 0.3, 1.0))
+                    self.app.plotcanvas.redraw()
+                    self.app.toggle_axis = True
+                else:
+                    self.app.plotcanvas.v_line.set_data(color=(0.0, 0.0, 0.0, 0.0))
+
+                    self.app.plotcanvas.h_line.set_data(color=(0.0, 0.0, 0.0, 0.0))
+                    self.appplotcanvas.redraw()
+                    self.app.toggle_axis = False
+
+            # Open Preferences Window
+            if key == QtCore.Qt.Key_P:
+                self.app.on_preferences()
+                return
+
+            # Rotate Object by 90 degree CCW
+            if key == QtCore.Qt.Key_R:
+                self.app.on_rotate(silent=True, preset=-90)
+                return
+
+            # Run a Script
+            if key == QtCore.Qt.Key_S:
+                self.app.on_filerunscript()
+                return
+
+            # Toggle Workspace
+            if key == QtCore.Qt.Key_W:
+                self.app.on_workspace_menu()
+                return
+
+            # Skew on X axis
+            if key == QtCore.Qt.Key_X:
+                self.app.on_skewx()
+                return
+
+            # Skew on Y axis
+            if key == QtCore.Qt.Key_Y:
+                self.app.on_skewy()
+                return
+
+        elif modifiers == QtCore.Qt.AltModifier:
+            # Eanble all plots
+            if key == Qt.Key_1:
+                self.app.enable_all_plots()
+
+            # Disable all plots
+            if key == Qt.Key_2:
+                self.app.disable_all_plots()
+
+            # Disable all other plots
+            if key == Qt.Key_3:
+                self.app.disable_other_plots()
+
+            # 2-Sided PCB Tool
+            if key == QtCore.Qt.Key_D:
+                self.app.dblsidedtool.run()
+                return
+
+            # Non-Copper Clear Tool
+            if key == QtCore.Qt.Key_N:
+                self.app.ncclear_tool.run()
+                return
+
+            # Transformation Tool
+            if key == QtCore.Qt.Key_R:
+                self.app.transform_tool.run()
+                return
+
+            # Cutout Tool
+            if key == QtCore.Qt.Key_U:
+                self.app.cutout_tool.run()
+                return
+
+        else:
+            # Open Manual
+            if key == QtCore.Qt.Key_F1:
+                webbrowser.open(self.app.manual_url)
+
+            # Open Video Help
+            if key == QtCore.Qt.Key_F2:
+                webbrowser.open(self.app.video_url)
+
+            # Switch to Project Tab
+            if key == QtCore.Qt.Key_1:
+                self.app.on_select_tab('project')
+
+            # Switch to Selected Tab
+            if key == QtCore.Qt.Key_2:
+                self.app.on_select_tab('selected')
+
+            # Switch to Tool Tab
+            if key == QtCore.Qt.Key_3:
+                self.app.on_select_tab('tool')
+
+            # Delete
+            if key == QtCore.Qt.Key_Delete and active:
+                # Delete via the application to
+                # ensure cleanup of the GUI
+                active.app.on_delete()
+
+            # Space = Toggle Active/Inactive
+            if key == QtCore.Qt.Key_Space:
+                for select in selected:
+                    select.ui.plot_cb.toggle()
+                self.app.delete_selection_shape()
+
+            # Copy Object Name
+            if key == QtCore.Qt.Key_E:
+                self.app.object2editor()
+
+            # Grid toggle
+            if key == QtCore.Qt.Key_G:
+                self.app.ui.grid_snap_btn.trigger()
+
+            # Jump to coords
+            if key == QtCore.Qt.Key_J:
+                self.app.on_jump_to()
+
+            # New Excellon
+            if key == QtCore.Qt.Key_L:
+                self.app.new_excellon_object()
+
+            # Move tool toggle
+            if key == QtCore.Qt.Key_M:
+                self.app.move_tool.toggle()
+
+            # New Geometry
+            if key == QtCore.Qt.Key_N:
+                self.app.on_new_geometry()
+
+            # Set Origin
+            if key == QtCore.Qt.Key_O:
+                self.app.on_set_origin()
+                return
+
+            # Set Origin
+            if key == QtCore.Qt.Key_P:
+                self.app.properties_tool.run()
+                return
+
+            # Change Units
+            if key == QtCore.Qt.Key_Q:
+                if self.app.options["units"] == 'MM':
+                    self.app.general_options_form.general_app_group.units_radio.set_value("IN")
+                else:
+                    self.app.general_options_form.general_app_group.units_radio.set_value("MM")
+                self.app.on_toggle_units()
+
+            # Rotate Object by 90 degree CW
+            if key == QtCore.Qt.Key_R:
+                self.app.on_rotate(silent=True, preset=90)
+
+            # Shell toggle
+            if key == QtCore.Qt.Key_S:
+                self.app.on_toggle_shell()
 
-        if event.key() == QtCore.Qt.Key_1:
-            self.app.on_select_tab('project')
+            # Transform Tool
+            if key == QtCore.Qt.Key_T:
+                self.app.transform_tool.run()
 
-        if event.key() == QtCore.Qt.Key_2:
-            self.app.on_select_tab('selected')
+            # Zoom Fit
+            if key == QtCore.Qt.Key_V:
+                self.app.on_zoom_fit(None)
 
-        if event.key() == QtCore.Qt.Key_3:
-            self.app.on_select_tab('tool')
+            # Mirror on X the selected object(s)
+            if key == QtCore.Qt.Key_X:
+                self.app.on_flipx()
 
-        if event.key() == QtCore.Qt.Key_G:
-            self.grid_snap_btn.trigger()
+            # Mirror on Y the selected object(s)
+            if key == QtCore.Qt.Key_Y:
+                self.app.on_flipy()
 
-        if event.key == QtCore.Qt.Key_Q:
-            self.app.on_toggle_units_click()
+            # Zoom In
+            if key == QtCore.Qt.Key_Equal:
+                self.app.plotcanvas.zoom(1 / self.app.defaults['zoom_ratio'], self.app.mouse)
 
-        if event.key() == QtCore.Qt.Key_S:
-            self.app.on_toggle_shell()
+            # Zoom Out
+            if key == QtCore.Qt.Key_Minus:
+                self.app.plotcanvas.zoom(self.app.defaults['zoom_ratio'], self.app.mouse)
 
-        # Show shortcut list
-        if event.key() == QtCore.Qt.Key_Ampersand:
-            self.app.on_shortcut_list()
+            # Show shortcut list
+            if key == QtCore.Qt.Key_Ampersand:
+                self.app.on_shortcut_list()
 
-        if event.key() == QtCore.Qt.Key_QuoteLeft:
-            self.app.on_shortcut_list()
+            if key == QtCore.Qt.Key_QuoteLeft:
+                self.app.on_shortcut_list()
+            return
 
     def dragEnterEvent(self, event):
         if event.mimeData().hasUrls:

ObjectCollection.py

@@ -12,7 +12,7 @@ import inspect  # TODO: Remove
 import FlatCAMApp
 from PyQt5 import QtGui, QtCore, QtWidgets
 from PyQt5.QtCore import Qt
-import webbrowser
+# import webbrowser
 
 
 class KeySensitiveListView(QtWidgets.QTreeView):
@@ -228,6 +228,8 @@ class ObjectCollection(QtCore.QAbstractItemModel):
         # tasks know that they have to wait until available.
         self.promises = set()
 
+        self.app = app
+
         ### View
         self.view = KeySensitiveListView(app)
         self.view.setModel(self)
@@ -247,7 +249,8 @@ class ObjectCollection(QtCore.QAbstractItemModel):
         ## GUI Events
         self.view.selectionModel().selectionChanged.connect(self.on_list_selection_change)
         self.view.activated.connect(self.on_item_activated)
-        self.view.keyPressed.connect(self.on_key)
+        # self.view.keyPressed.connect(self.on_key)
+        self.view.keyPressed.connect(self.app.ui.keyPressEvent)
         self.view.clicked.connect(self.on_mouse_down)
         self.view.customContextMenuRequested.connect(self.on_menu_request)
 
@@ -260,238 +263,238 @@ class ObjectCollection(QtCore.QAbstractItemModel):
     def has_promises(self):
         return len(self.promises) > 0
 
-    def on_key(self, key):
-        modifiers = QtWidgets.QApplication.keyboardModifiers()
-        active = self.get_active()
-        selected = self.get_selected()
-
-        if modifiers == QtCore.Qt.ControlModifier:
-            if key == QtCore.Qt.Key_A:
-                self.app.on_selectall()
-
-            if key == QtCore.Qt.Key_C:
-                self.app.on_copy_object()
-
-            if key == QtCore.Qt.Key_E:
-                self.app.on_fileopenexcellon()
-
-            if key == QtCore.Qt.Key_G:
-                self.app.on_fileopengerber()
-
-            if key == QtCore.Qt.Key_N:
-                self.app.on_file_new_click()
-
-            if key == QtCore.Qt.Key_M:
-                self.app.measurement_tool.run()
-            if key == QtCore.Qt.Key_O:
-                self.app.on_file_openproject()
-
-            if key == QtCore.Qt.Key_S:
-                self.app.on_file_saveproject()
-
-            # Toggle Plot Area
-            if key == QtCore.Qt.Key_F10:
-                self.app.on_toggle_plotarea()
-
-            return
-        elif modifiers == QtCore.Qt.ShiftModifier:
-
-            # Copy Object Name
-            # Copy Object Name
-            if key == QtCore.Qt.Key_C:
-                self.app.on_copy_name()
-
-            # Toggle axis
-            if key == QtCore.Qt.Key_G:
-                if self.toggle_axis is False:
-                    self.app.plotcanvas.v_line.set_data(color=(0.70, 0.3, 0.3, 1.0))
-                    self.app.plotcanvas.h_line.set_data(color=(0.70, 0.3, 0.3, 1.0))
-                    self.app.plotcanvas.redraw()
-                    self.app.toggle_axis = True
-                else:
-                    self.app.plotcanvas.v_line.set_data(color=(0.0, 0.0, 0.0, 0.0))
-
-                    self.app.plotcanvas.h_line.set_data(color=(0.0, 0.0, 0.0, 0.0))
-                    self.appplotcanvas.redraw()
-                    self.app.toggle_axis = False
-
-            # Open Preferences Window
-            if key == QtCore.Qt.Key_P:
-                self.app.on_preferences()
-                return
-
-            # Rotate Object by 90 degree CCW
-            if key == QtCore.Qt.Key_R:
-                self.app.on_rotate(silent=True, preset=-90)
-                return
-
-            # Run a Script
-            if key == QtCore.Qt.Key_S:
-                self.app.on_filerunscript()
-                return
-
-            # Toggle Workspace
-            if key == QtCore.Qt.Key_W:
-                self.app.on_workspace_menu()
-                return
-
-            # Skew on X axis
-            if key == QtCore.Qt.Key_X:
-                self.app.on_skewx()
-                return
-
-            # Skew on Y axis
-            if key == QtCore.Qt.Key_Y:
-                self.app.on_skewy()
-                return
-
-        elif modifiers == QtCore.Qt.AltModifier:
-            # Eanble all plots
-            if key == Qt.Key_1:
-                self.app.enable_all_plots()
-
-            # Disable all plots
-            if key == Qt.Key_2:
-                self.app.disable_all_plots()
-
-            # Disable all other plots
-            if key == Qt.Key_3:
-                self.app.disable_other_plots()
-
-            # 2-Sided PCB Tool
-            if key == QtCore.Qt.Key_D:
-                self.app.dblsidedtool.run()
-                return
-
-            # Non-Copper Clear Tool
-            if key == QtCore.Qt.Key_N:
-                self.app.ncclear_tool.run()
-                return
-
-            # Transformation Tool
-            if key == QtCore.Qt.Key_R:
-                self.app.transform_tool.run()
-                return
-
-            # Cutout Tool
-            if key == QtCore.Qt.Key_U:
-                self.app.cutout_tool.run()
-                return
-
-        else:
-            # Open Manual
-            if key == QtCore.Qt.Key_F1:
-                webbrowser.open(self.app.manual_url)
-
-            # Open Video Help
-            if key == QtCore.Qt.Key_F2:
-                webbrowser.open(self.app.video_url)
-
-            # Switch to Project Tab
-            if key == QtCore.Qt.Key_1:
-                self.app.on_select_tab('project')
-
-            # Switch to Selected Tab
-            if key == QtCore.Qt.Key_2:
-                self.app.on_select_tab('selected')
-
-            # Switch to Tool Tab
-            if key == QtCore.Qt.Key_3:
-                self.app.on_select_tab('tool')
-
-            # Delete
-            if key == QtCore.Qt.Key_Delete and active:
-                # Delete via the application to
-                # ensure cleanup of the GUI
-                active.app.on_delete()
-
-            # Space = Toggle Active/Inactive
-            if key == QtCore.Qt.Key_Space:
-                for select in selected:
-                    select.ui.plot_cb.toggle()
-                self.app.delete_selection_shape()
-
-            # Copy Object Name
-            if key == QtCore.Qt.Key_E:
-                self.app.object2editor()
-
-            # Grid toggle
-            if key == QtCore.Qt.Key_G:
-                self.app.ui.grid_snap_btn.trigger()
-
-            # Jump to coords
-            if key == QtCore.Qt.Key_J:
-                self.app.on_jump_to()
-
-            # New Excellon
-            if key == QtCore.Qt.Key_L:
-                self.app.new_excellon_object()
-
-            # Move tool toggle
-            if key == QtCore.Qt.Key_M:
-                self.app.move_tool.toggle()
-
-            # New Geometry
-            if key == QtCore.Qt.Key_N:
-                self.app.on_new_geometry()
-
-            # Set Origin
-            if key == QtCore.Qt.Key_O:
-                self.app.on_set_origin()
-                return
-
-            # Set Origin
-            if key == QtCore.Qt.Key_P:
-                self.app.properties_tool.run()
-                return
-
-            # Change Units
-            if key == QtCore.Qt.Key_Q:
-                if self.app.options["units"] == 'MM':
-                    self.app.general_options_form.general_app_group.units_radio.set_value("IN")
-                else:
-                    self.app.general_options_form.general_app_group.units_radio.set_value("MM")
-                self.app.on_toggle_units()
-
-            # Rotate Object by 90 degree CW
-            if key == QtCore.Qt.Key_R:
-                self.app.on_rotate(silent=True, preset=90)
-
-            # Shell toggle
-            if key == QtCore.Qt.Key_S:
-                self.app.on_toggle_shell()
-
-            # Transform Tool
-            if key == QtCore.Qt.Key_T:
-                self.app.transform_tool.run()
-
-            # Zoom Fit
-            if key == QtCore.Qt.Key_V:
-                self.app.on_zoom_fit(None)
-
-            # Mirror on X the selected object(s)
-            if key == QtCore.Qt.Key_X:
-                self.app.on_flipx()
-
-            # Mirror on Y the selected object(s)
-            if key == QtCore.Qt.Key_Y:
-                self.app.on_flipy()
-
-            # Zoom In
-            if key == QtCore.Qt.Key_Equal:
-                self.app.plotcanvas.zoom(1 / self.app.defaults['zoom_ratio'], self.app.mouse)
-
-            # Zoom Out
-            if key == QtCore.Qt.Key_Minus:
-                self.app.plotcanvas.zoom(self.app.defaults['zoom_ratio'], self.app.mouse)
-
-            # Show shortcut list
-            if key == QtCore.Qt.Key_Ampersand:
-                self.app.on_shortcut_list()
-
-            if key == QtCore.Qt.Key_QuoteLeft:
-                self.app.on_shortcut_list()
-            return
+    # def on_key(self, key):
+    #     modifiers = QtWidgets.QApplication.keyboardModifiers()
+    #     active = self.get_active()
+    #     selected = self.get_selected()
+    #
+    #     if modifiers == QtCore.Qt.ControlModifier:
+    #         if key == QtCore.Qt.Key_A:
+    #             self.app.on_selectall()
+    #
+    #         if key == QtCore.Qt.Key_C:
+    #             self.app.on_copy_object()
+    #
+    #         if key == QtCore.Qt.Key_E:
+    #             self.app.on_fileopenexcellon()
+    #
+    #         if key == QtCore.Qt.Key_G:
+    #             self.app.on_fileopengerber()
+    #
+    #         if key == QtCore.Qt.Key_N:
+    #             self.app.on_file_new_click()
+    #
+    #         if key == QtCore.Qt.Key_M:
+    #             self.app.measurement_tool.run()
+    #         if key == QtCore.Qt.Key_O:
+    #             self.app.on_file_openproject()
+    #
+    #         if key == QtCore.Qt.Key_S:
+    #             self.app.on_file_saveproject()
+    #
+    #         # Toggle Plot Area
+    #         if key == QtCore.Qt.Key_F10:
+    #             self.app.on_toggle_plotarea()
+    #
+    #         return
+    #     elif modifiers == QtCore.Qt.ShiftModifier:
+    #
+    #         # Copy Object Name
+    #         # Copy Object Name
+    #         if key == QtCore.Qt.Key_C:
+    #             self.app.on_copy_name()
+    #
+    #         # Toggle axis
+    #         if key == QtCore.Qt.Key_G:
+    #             if self.toggle_axis is False:
+    #                 self.app.plotcanvas.v_line.set_data(color=(0.70, 0.3, 0.3, 1.0))
+    #                 self.app.plotcanvas.h_line.set_data(color=(0.70, 0.3, 0.3, 1.0))
+    #                 self.app.plotcanvas.redraw()
+    #                 self.app.toggle_axis = True
+    #             else:
+    #                 self.app.plotcanvas.v_line.set_data(color=(0.0, 0.0, 0.0, 0.0))
+    #
+    #                 self.app.plotcanvas.h_line.set_data(color=(0.0, 0.0, 0.0, 0.0))
+    #                 self.appplotcanvas.redraw()
+    #                 self.app.toggle_axis = False
+    #
+    #         # Open Preferences Window
+    #         if key == QtCore.Qt.Key_P:
+    #             self.app.on_preferences()
+    #             return
+    #
+    #         # Rotate Object by 90 degree CCW
+    #         if key == QtCore.Qt.Key_R:
+    #             self.app.on_rotate(silent=True, preset=-90)
+    #             return
+    #
+    #         # Run a Script
+    #         if key == QtCore.Qt.Key_S:
+    #             self.app.on_filerunscript()
+    #             return
+    #
+    #         # Toggle Workspace
+    #         if key == QtCore.Qt.Key_W:
+    #             self.app.on_workspace_menu()
+    #             return
+    #
+    #         # Skew on X axis
+    #         if key == QtCore.Qt.Key_X:
+    #             self.app.on_skewx()
+    #             return
+    #
+    #         # Skew on Y axis
+    #         if key == QtCore.Qt.Key_Y:
+    #             self.app.on_skewy()
+    #             return
+    #
+    #     elif modifiers == QtCore.Qt.AltModifier:
+    #         # Eanble all plots
+    #         if key == Qt.Key_1:
+    #             self.app.enable_all_plots()
+    #
+    #         # Disable all plots
+    #         if key == Qt.Key_2:
+    #             self.app.disable_all_plots()
+    #
+    #         # Disable all other plots
+    #         if key == Qt.Key_3:
+    #             self.app.disable_other_plots()
+    #
+    #         # 2-Sided PCB Tool
+    #         if key == QtCore.Qt.Key_D:
+    #             self.app.dblsidedtool.run()
+    #             return
+    #
+    #         # Non-Copper Clear Tool
+    #         if key == QtCore.Qt.Key_N:
+    #             self.app.ncclear_tool.run()
+    #             return
+    #
+    #         # Transformation Tool
+    #         if key == QtCore.Qt.Key_R:
+    #             self.app.transform_tool.run()
+    #             return
+    #
+    #         # Cutout Tool
+    #         if key == QtCore.Qt.Key_U:
+    #             self.app.cutout_tool.run()
+    #             return
+    #
+    #     else:
+    #         # Open Manual
+    #         if key == QtCore.Qt.Key_F1:
+    #             webbrowser.open(self.app.manual_url)
+    #
+    #         # Open Video Help
+    #         if key == QtCore.Qt.Key_F2:
+    #             webbrowser.open(self.app.video_url)
+    #
+    #         # Switch to Project Tab
+    #         if key == QtCore.Qt.Key_1:
+    #             self.app.on_select_tab('project')
+    #
+    #         # Switch to Selected Tab
+    #         if key == QtCore.Qt.Key_2:
+    #             self.app.on_select_tab('selected')
+    #
+    #         # Switch to Tool Tab
+    #         if key == QtCore.Qt.Key_3:
+    #             self.app.on_select_tab('tool')
+    #
+    #         # Delete
+    #         if key == QtCore.Qt.Key_Delete and active:
+    #             # Delete via the application to
+    #             # ensure cleanup of the GUI
+    #             active.app.on_delete()
+    #
+    #         # Space = Toggle Active/Inactive
+    #         if key == QtCore.Qt.Key_Space:
+    #             for select in selected:
+    #                 select.ui.plot_cb.toggle()
+    #             self.app.delete_selection_shape()
+    #
+    #         # Copy Object Name
+    #         if key == QtCore.Qt.Key_E:
+    #             self.app.object2editor()
+    #
+    #         # Grid toggle
+    #         if key == QtCore.Qt.Key_G:
+    #             self.app.ui.grid_snap_btn.trigger()
+    #
+    #         # Jump to coords
+    #         if key == QtCore.Qt.Key_J:
+    #             self.app.on_jump_to()
+    #
+    #         # New Excellon
+    #         if key == QtCore.Qt.Key_L:
+    #             self.app.new_excellon_object()
+    #
+    #         # Move tool toggle
+    #         if key == QtCore.Qt.Key_M:
+    #             self.app.move_tool.toggle()
+    #
+    #         # New Geometry
+    #         if key == QtCore.Qt.Key_N:
+    #             self.app.on_new_geometry()
+    #
+    #         # Set Origin
+    #         if key == QtCore.Qt.Key_O:
+    #             self.app.on_set_origin()
+    #             return
+    #
+    #         # Set Origin
+    #         if key == QtCore.Qt.Key_P:
+    #             self.app.properties_tool.run()
+    #             return
+    #
+    #         # Change Units
+    #         if key == QtCore.Qt.Key_Q:
+    #             if self.app.options["units"] == 'MM':
+    #                 self.app.general_options_form.general_app_group.units_radio.set_value("IN")
+    #             else:
+    #                 self.app.general_options_form.general_app_group.units_radio.set_value("MM")
+    #             self.app.on_toggle_units()
+    #
+    #         # Rotate Object by 90 degree CW
+    #         if key == QtCore.Qt.Key_R:
+    #             self.app.on_rotate(silent=True, preset=90)
+    #
+    #         # Shell toggle
+    #         if key == QtCore.Qt.Key_S:
+    #             self.app.on_toggle_shell()
+    #
+    #         # Transform Tool
+    #         if key == QtCore.Qt.Key_T:
+    #             self.app.transform_tool.run()
+    #
+    #         # Zoom Fit
+    #         if key == QtCore.Qt.Key_V:
+    #             self.app.on_zoom_fit(None)
+    #
+    #         # Mirror on X the selected object(s)
+    #         if key == QtCore.Qt.Key_X:
+    #             self.app.on_flipx()
+    #
+    #         # Mirror on Y the selected object(s)
+    #         if key == QtCore.Qt.Key_Y:
+    #             self.app.on_flipy()
+    #
+    #         # Zoom In
+    #         if key == QtCore.Qt.Key_Equal:
+    #             self.app.plotcanvas.zoom(1 / self.app.defaults['zoom_ratio'], self.app.mouse)
+    #
+    #         # Zoom Out
+    #         if key == QtCore.Qt.Key_Minus:
+    #             self.app.plotcanvas.zoom(self.app.defaults['zoom_ratio'], self.app.mouse)
+    #
+    #         # Show shortcut list
+    #         if key == QtCore.Qt.Key_Ampersand:
+    #             self.app.on_shortcut_list()
+    #
+    #         if key == QtCore.Qt.Key_QuoteLeft:
+    #             self.app.on_shortcut_list()
+    #         return
 
     def on_mouse_down(self, event):
         FlatCAMApp.App.log.debug("Mouse button pressed on list")

README.md

@@ -18,8 +18,8 @@ CAD program, and create G-Code for Isolation routing.
 - fixed bug in Excellon Slots milling: a value of a dict key was a string instead to be an int. A cast to integer solved it.
 - fixed the name self-insert in save dialog file for GCode; added protection in case the save path is None
 - fixed FlatCAM crash when trying to make drills GCode out of a file that have only slots.
-- made the shell toggle shortcut key work when focused on Selected Tab; toggle units shortcut also
 - changed the messages for Units Conversion
+- all kwy shortcuts work across the entire application; started to move all the shortcuts definitions in FlatCAMGUI.keyPressEvent()
 
 5.02.3019