- moved all shortcut keys handlers from Editors to the keyPressEvent() handler from FLatCAMGUI

FlatCAMEditor.py

@@ -2135,7 +2135,6 @@ class FlatCAMGeoEditor(QtCore.QObject):
         # make sure that the shortcuts key and mouse events will no longer be linked to the methods from FlatCAMApp
         # but those from FlatCAMGeoEditor
 
-        self.app.plotcanvas.vis_disconnect('key_press', self.app.ui.keyPressEvent)
         self.app.plotcanvas.vis_disconnect('mouse_press', self.app.on_mouse_click_over_plot)
         self.app.plotcanvas.vis_disconnect('mouse_move', self.app.on_mouse_move_over_plot)
         self.app.plotcanvas.vis_disconnect('mouse_release', self.app.on_mouse_click_release_over_plot)
@@ -2146,7 +2145,6 @@ class FlatCAMGeoEditor(QtCore.QObject):
         self.canvas.vis_connect('mouse_press', self.on_canvas_click)
         self.canvas.vis_connect('mouse_move', self.on_canvas_move)
         self.canvas.vis_connect('mouse_release', self.on_canvas_click_release)
-        self.canvas.vis_connect('key_press', self.on_canvas_key)
 
 
     def disconnect_canvas_event_handlers(self):
@@ -2154,11 +2152,8 @@ class FlatCAMGeoEditor(QtCore.QObject):
         self.canvas.vis_disconnect('mouse_press', self.on_canvas_click)
         self.canvas.vis_disconnect('mouse_move', self.on_canvas_move)
         self.canvas.vis_disconnect('mouse_release', self.on_canvas_click_release)
-        self.canvas.vis_disconnect('key_press', self.on_canvas_key)
-
 
         # we restore the key and mouse control to FlatCAMApp method
-        self.app.plotcanvas.vis_connect('key_press', self.app.ui.keyPressEvent)
         self.app.plotcanvas.vis_connect('mouse_press', self.app.on_mouse_click_over_plot)
         self.app.plotcanvas.vis_connect('mouse_move', self.app.on_mouse_move_over_plot)
         self.app.plotcanvas.vis_connect('mouse_release', self.app.on_mouse_click_release_over_plot)
@@ -2572,211 +2567,6 @@ class FlatCAMGeoEditor(QtCore.QObject):
 
             self.tool_shape.redraw()
 
-    def on_canvas_key(self, event):
-        """
-        event.key has the key.
-
-        :param event:
-        :return:
-        """
-        self.key = event.key.name
-        self.geo_key_modifiers = QtWidgets.QApplication.keyboardModifiers()
-
-        if self.geo_key_modifiers == Qt.ControlModifier:
-            # save (update) the current geometry and return to the App
-            if self.key == 'S':
-                self.app.editor2object()
-                return
-
-            # toggle the measurement tool
-            if self.key == 'M':
-                self.app.measurement_tool.run()
-                return
-
-        # Finish the current action. Use with tools that do not
-        # complete automatically, like a polygon or path.
-        if event.key.name == 'Enter':
-            if isinstance(self.active_tool, FCShapeTool):
-                self.active_tool.click(self.snap(self.x, self.y))
-                self.active_tool.make()
-                if self.active_tool.complete:
-                    self.on_shape_complete()
-                    self.app.inform.emit("[success]Done.")
-                # automatically make the selection tool active after completing current action
-                self.select_tool('select')
-            return
-
-        # Abort the current action
-        if event.key.name == 'Escape':
-            # TODO: ...?
-            # self.on_tool_select("select")
-            self.app.inform.emit("[WARNING_NOTCL]Cancelled.")
-
-            self.delete_utility_geometry()
-
-            self.replot()
-            # self.select_btn.setChecked(True)
-            # self.on_tool_select('select')
-            self.select_tool('select')
-            return
-
-        # Delete selected object
-        if event.key.name == 'Delete':
-            self.delete_selected()
-            self.replot()
-
-        # Move
-        if event.key.name == 'Space':
-            self.app.ui.geo_rotate_btn.setChecked(True)
-            self.on_tool_select('rotate')
-            self.active_tool.set_origin(self.snap(self.x, self.y))
-
-        if event.key == '1':
-            self.app.on_zoom_fit(None)
-
-        if event.key == '2':
-            self.app.plotcanvas.zoom(1 / self.app.defaults['zoom_ratio'], [self.snap_x, self.snap_y])
-
-        if event.key == '3':
-            self.app.plotcanvas.zoom(self.app.defaults['zoom_ratio'], [self.snap_x, self.snap_y])
-
-        # Arc Tool
-        if event.key.name == 'A':
-            self.select_tool('arc')
-
-        # Buffer
-        if event.key.name == 'B':
-            self.select_tool('buffer')
-
-        # Copy
-        if event.key.name == 'C':
-            self.app.ui.geo_copy_btn.setChecked(True)
-            self.on_tool_select('copy')
-            self.active_tool.set_origin(self.snap(self.x, self.y))
-            self.app.inform.emit("Click on target point.")
-
-        # Substract Tool
-        if event.key.name == 'E':
-            if self.get_selected() is not None:
-                self.intersection()
-            else:
-                msg = "Please select geometry items \n" \
-                      "on which to perform Intersection Tool."
-
-                messagebox =QtWidgets.QMessageBox()
-                messagebox.setText(msg)
-                messagebox.setWindowTitle("Warning")
-                messagebox.setWindowIcon(QtGui.QIcon('share/warning.png'))
-                messagebox.setStandardButtons(QtWidgets.QMessageBox.Ok)
-                messagebox.setDefaultButton(QtWidgets.QMessageBox.Ok)
-                messagebox.exec_()
-
-        # Grid Snap
-        if event.key.name == 'G':
-            self.app.ui.grid_snap_btn.trigger()
-
-            # make sure that the cursor shape is enabled/disabled, too
-            if self.options['grid_snap'] is True:
-                self.app.app_cursor.enabled = True
-            else:
-                self.app.app_cursor.enabled = False
-
-        # Paint
-        if event.key.name == 'I':
-            self.select_tool('paint')
-
-        # Corner Snap
-        if event.key.name == 'K':
-            self.on_corner_snap()
-
-        # Move
-        if event.key.name == 'M':
-            self.on_move_click()
-
-        # Polygon Tool
-        if event.key.name == 'N':
-            self.select_tool('polygon')
-
-        # Circle Tool
-        if event.key.name == 'O':
-            self.select_tool('circle')
-
-        # Path Tool
-        if event.key.name == 'P':
-            self.select_tool('path')
-
-        # Rectangle Tool
-        if event.key.name == 'R':
-            self.select_tool('rectangle')
-
-        # Substract Tool
-        if event.key.name == 'S':
-            if self.get_selected() is not None:
-                self.subtract()
-            else:
-                msg = "Please select geometry items \n" \
-                      "on which to perform Substraction Tool."
-
-                messagebox =QtWidgets.QMessageBox()
-                messagebox.setText(msg)
-                messagebox.setWindowTitle("Warning")
-                messagebox.setWindowIcon(QtGui.QIcon('share/warning.png'))
-                messagebox.setStandardButtons(QtWidgets.QMessageBox.Ok)
-                messagebox.setDefaultButton(QtWidgets.QMessageBox.Ok)
-                messagebox.exec_()
-
-        # Add Text Tool
-        if event.key.name == 'T':
-            self.select_tool('text')
-
-        # Substract Tool
-        if event.key.name == 'U':
-            if self.get_selected() is not None:
-                self.union()
-            else:
-                msg = "Please select geometry items \n" \
-                      "on which to perform union."
-
-                messagebox =QtWidgets.QMessageBox()
-                messagebox.setText(msg)
-                messagebox.setWindowTitle("Warning")
-                messagebox.setWindowIcon(QtGui.QIcon('share/warning.png'))
-                messagebox.setStandardButtons(QtWidgets.QMessageBox.Ok)
-                messagebox.setDefaultButton(QtWidgets.QMessageBox.Ok)
-                messagebox.exec_()
-
-        # Cut Action Tool
-        if event.key.name == 'X':
-            if self.get_selected() is not None:
-                self.cutpath()
-            else:
-                msg = 'Please first select a geometry item to be cutted\n' \
-                      'then select the geometry item that will be cutted\n' \
-                      'out of the first item. In the end press ~X~ key or\n' \
-                      'the toolbar button.' \
-
-                messagebox =QtWidgets.QMessageBox()
-                messagebox.setText(msg)
-                messagebox.setWindowTitle("Warning")
-                messagebox.setWindowIcon(QtGui.QIcon('share/warning.png'))
-                messagebox.setStandardButtons(QtWidgets.QMessageBox.Ok)
-                messagebox.setDefaultButton(QtWidgets.QMessageBox.Ok)
-                messagebox.exec_()
-
-        # Propagate to tool
-        response = None
-        if self.active_tool is not None:
-            response = self.active_tool.on_key(event.key)
-        if response is not None:
-            self.app.inform.emit(response)
-
-        # Show Shortcut list
-        if event.key.name == '`':
-            self.app.on_shortcut_list()
-
-    def on_canvas_key_release(self, event):
-        self.key = None
-
     def on_delete_btn(self):
         self.delete_selected()
         self.replot()
@@ -4277,34 +4067,27 @@ class FlatCAMExcEditor(QtCore.QObject):
 
         # make sure that the shortcuts key and mouse events will no longer be linked to the methods from FlatCAMApp
         # but those from FlatCAMGeoEditor
-        self.app.plotcanvas.vis_disconnect('key_press', self.app.ui.keyPressEvent)
+
         self.app.plotcanvas.vis_disconnect('mouse_press', self.app.on_mouse_click_over_plot)
         self.app.plotcanvas.vis_disconnect('mouse_move', self.app.on_mouse_move_over_plot)
         self.app.plotcanvas.vis_disconnect('mouse_release', self.app.on_mouse_click_release_over_plot)
         self.app.plotcanvas.vis_disconnect('mouse_double_click', self.app.on_double_click_over_plot)
-        self.app.collection.view.keyPressed.disconnect()
         self.app.collection.view.clicked.disconnect()
 
         self.canvas.vis_connect('mouse_press', self.on_canvas_click)
         self.canvas.vis_connect('mouse_move', self.on_canvas_move)
         self.canvas.vis_connect('mouse_release', self.on_canvas_click_release)
-        self.canvas.vis_connect('key_press', self.on_canvas_key)
-
 
     def disconnect_canvas_event_handlers(self):
         self.canvas.vis_disconnect('mouse_press', self.on_canvas_click)
         self.canvas.vis_disconnect('mouse_move', self.on_canvas_move)
         self.canvas.vis_disconnect('mouse_release', self.on_canvas_click_release)
-        self.canvas.vis_disconnect('key_press', self.on_canvas_key)
-        self.canvas.vis_disconnect('key_release', self.on_canvas_key_release)
 
         # we restore the key and mouse control to FlatCAMApp method
-        self.app.plotcanvas.vis_connect('key_press', self.app.ui.keyPressEvent)
         self.app.plotcanvas.vis_connect('mouse_press', self.app.on_mouse_click_over_plot)
         self.app.plotcanvas.vis_connect('mouse_move', self.app.on_mouse_move_over_plot)
         self.app.plotcanvas.vis_connect('mouse_release', self.app.on_mouse_click_release_over_plot)
         self.app.plotcanvas.vis_connect('mouse_double_click', self.app.on_double_click_over_plot)
-
         self.app.collection.view.clicked.connect(self.app.collection.on_mouse_down)
 
     def clear(self):
@@ -4870,145 +4653,6 @@ class FlatCAMExcEditor(QtCore.QObject):
         # Update cursor
         self.app.app_cursor.set_data(np.asarray([(x, y)]), symbol='++', edge_color='black', size=20)
 
-
-    def on_canvas_key(self, event):
-        """
-        event.key has the key.
-
-        :param event:
-        :return:
-        """
-        self.key = event.key.name
-        self.modifiers = QtWidgets.QApplication.keyboardModifiers()
-
-        if self.modifiers == Qt.ControlModifier:
-            # save (update) the current geometry and return to the App
-            if self.key == 'S':
-                self.app.editor2object()
-                return
-
-            # toggle the measurement tool
-            if self.key == 'M':
-                self.app.measurement_tool.run()
-                return
-
-        # Abort the current action
-        if event.key.name == 'Escape':
-            # TODO: ...?
-            # self.on_tool_select("select")
-            self.app.inform.emit("[WARNING_NOTCL]Cancelled.")
-
-            self.delete_utility_geometry()
-
-            self.replot()
-            # self.select_btn.setChecked(True)
-            # self.on_tool_select('select')
-            self.select_tool('select')
-            return
-
-        # Delete selected object
-        if event.key.name == 'Delete':
-            self.launched_from_shortcuts = True
-            if self.selected:
-                self.delete_selected()
-                self.replot()
-            else:
-                self.app.inform.emit("[WARNING_NOTCL]Cancelled. Nothing selected to delete.")
-            return
-
-        if event.key == '1':
-            self.launched_from_shortcuts = True
-            self.app.on_zoom_fit(None)
-
-        if event.key == '2':
-            self.launched_from_shortcuts = True
-            self.app.plotcanvas.zoom(1 / self.app.defaults['zoom_ratio'], [self.snap_x, self.snap_y])
-
-        if event.key == '3':
-            self.launched_from_shortcuts = True
-            self.app.plotcanvas.zoom(self.app.defaults['zoom_ratio'], [self.snap_x, self.snap_y])
-
-        # Add Array of Drill Hole Tool
-        if event.key.name == 'A':
-            self.launched_from_shortcuts = True
-            self.app.inform.emit("Click on target point.")
-            self.app.ui.add_drill_array_btn.setChecked(True)
-            self.select_tool('add_array')
-            return
-
-        # Copy
-        if event.key.name == 'C':
-            self.launched_from_shortcuts = True
-            if self.selected:
-                self.app.inform.emit("Click on target point.")
-                self.app.ui.copy_drill_btn.setChecked(True)
-                self.on_tool_select('copy')
-                self.active_tool.set_origin((self.snap_x, self.snap_y))
-            else:
-                self.app.inform.emit("[WARNING_NOTCL]Cancelled. Nothing selected to copy.")
-            return
-
-        # Add Drill Hole Tool
-        if event.key.name == 'D':
-            self.launched_from_shortcuts = True
-            self.app.inform.emit("Click on target point.")
-            self.app.ui.add_drill_btn.setChecked(True)
-            self.select_tool('add')
-            return
-
-        # Grid Snap
-        if event.key.name == 'G':
-            self.launched_from_shortcuts = True
-            # make sure that the cursor shape is enabled/disabled, too
-            if self.options['grid_snap'] is True:
-                self.app.app_cursor.enabled = False
-            else:
-                self.app.app_cursor.enabled = True
-            self.app.ui.grid_snap_btn.trigger()
-            return
-
-        # Corner Snap
-        if event.key.name == 'K':
-            self.launched_from_shortcuts = True
-            self.app.ui.corner_snap_btn.trigger()
-            return
-
-        # Move
-        if event.key.name == 'M':
-            self.launched_from_shortcuts = True
-            if self.selected:
-                self.app.inform.emit("Click on target point.")
-                self.app.ui.move_drill_btn.setChecked(True)
-                self.on_tool_select('move')
-                self.active_tool.set_origin((self.snap_x, self.snap_y))
-            else:
-                self.app.inform.emit("[WARNING_NOTCL]Cancelled. Nothing selected to move.")
-            return
-
-        # Resize Tool
-        if event.key.name == 'R':
-            self.launched_from_shortcuts = True
-            self.select_tool('resize')
-            return
-
-        # Select Tool
-        if event.key.name == 'S':
-            self.launched_from_shortcuts = True
-            self.select_tool('select')
-            return
-
-        # Propagate to tool
-        response = None
-        if self.active_tool is not None:
-            response = self.active_tool.on_key(event.key)
-        if response is not None:
-            self.app.inform.emit(response)
-
-        # Show Shortcut list
-        if event.key.name == '`':
-            self.app.on_shortcut_list()
-            return
-
     def on_canvas_key_release(self, event):
         self.key = None
 

FlatCAMGUI.py

@@ -12,6 +12,8 @@ from GUIElements import *
 import platform
 import webbrowser
 
+from FlatCAMEditor import FCShapeTool
+
 
 class FlatCAMGUI(QtWidgets.QMainWindow):
     # Emitted when persistent window geometry needs to be retained
@@ -1522,266 +1524,593 @@ class FlatCAMGUI(QtWidgets.QMainWindow):
         # events from Vispy are of type KeyEvent
         else:
             key = event.key
+        if self.app.call_source == 'app':
+            if modifiers == QtCore.Qt.ControlModifier:
+                if key == QtCore.Qt.Key_A:
+                    self.app.on_selectall()
 
-        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_C:
+                    self.app.on_copy_object()
 
-            if key == QtCore.Qt.Key_O:
-                self.app.on_file_openproject()
+                if key == QtCore.Qt.Key_E:
+                    self.app.on_fileopenexcellon()
 
-            if key == QtCore.Qt.Key_S:
-                self.app.on_file_saveproject()
+                if key == QtCore.Qt.Key_G:
+                    self.app.on_fileopengerber()
 
-            # Toggle Plot Area
-            if key == QtCore.Qt.Key_F10 or key == 'F10':
-                self.app.on_toggle_plotarea()
+                if key == QtCore.Qt.Key_N:
+                    self.app.on_file_new_click()
 
-            return
-        elif modifiers == QtCore.Qt.ShiftModifier:
+                if key == QtCore.Qt.Key_M:
+                    self.app.measurement_tool.run()
 
-            # Copy Object Name
-            # Copy Object Name
-            if key == QtCore.Qt.Key_C:
-                self.app.on_copy_name()
+                if key == QtCore.Qt.Key_O:
+                    self.app.on_file_openproject()
 
-            # Toggle axis
-            if key == QtCore.Qt.Key_G:
-                if self.app.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.app.plotcanvas.redraw()
-                    self.app.toggle_axis = False
-
-            # Open Preferences Window
-            if key == QtCore.Qt.Key_P:
-                self.app.on_preferences()
-                return
+                if key == QtCore.Qt.Key_S:
+                    self.app.on_file_saveproject()
 
-            # Rotate Object by 90 degree CCW
-            if key == QtCore.Qt.Key_R:
-                self.app.on_rotate(silent=True, preset=-90)
-                return
+                # Toggle Plot Area
+                if key == QtCore.Qt.Key_F10 or key == 'F10':
+                    self.app.on_toggle_plotarea()
 
-            # 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
+            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.app.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.app.plotcanvas.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()
+
+                # Calculator Tool
+                if key == QtCore.Qt.Key_C:
+                    self.app.calculator_tool.run()
+
+                # 2-Sided PCB Tool
+                if key == QtCore.Qt.Key_D:
+                    self.app.dblsidedtool.run()
+                    return
+
+                # Film Tool
+                if key == QtCore.Qt.Key_L:
+                    self.app.film_tool.run()
+                    return
+
+                # Non-Copper Clear Tool
+                if key == QtCore.Qt.Key_N:
+                    self.app.ncclear_tool.run()
+                    return
+
+                # Paint Tool
+                if key == QtCore.Qt.Key_P:
+                    self.app.paint_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
+
+                # Panelize Tool
+                if key == QtCore.Qt.Key_Z:
+                    self.app.panelize_tool.run()
+                    return
+
+                # Toggle Fullscreen
+                if key == QtCore.Qt.Key_F10 or key == 'F10':
+                    self.app.on_fullscreen()
+                    return
+            else:
+                # Open Manual
+                if key == QtCore.Qt.Key_F1 or key == 'F1':
+                    webbrowser.open(self.app.manual_url)
+
+                # Open Video Help
+                if key == QtCore.Qt.Key_F2 or key == 'F2':
+                    webbrowser.open(self.app.video_url)
+
+                # Show shortcut list
+                if key == QtCore.Qt.Key_F3 or key == 'F3':
+                    self.app.on_shortcut_list()
+
+                # 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 or key == 'Delete':
+                    if active:
+                        # Delete via the application to
+                        # ensure cleanup of the GUI
+                        active.app.on_delete()
+
+                # Escape = Deselect All
+                if key == QtCore.Qt.Key_Escape or key == 'Escape':
+                    self.app.on_deselect_all()
+                    self.app.inform.emit("")
+
+                # 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()
 
-            # Skew on X axis
-            if key == QtCore.Qt.Key_X:
-                self.app.on_skewx()
-                return
+                # Rotate Object by 90 degree CW
+                if key == QtCore.Qt.Key_R:
+                    self.app.on_rotate(silent=True, preset=90)
 
-            # Skew on Y axis
-            if key == QtCore.Qt.Key_Y:
-                self.app.on_skewy()
-                return
+                # Shell toggle
+                if key == QtCore.Qt.Key_S:
+                    self.app.on_toggle_shell()
 
-        elif modifiers == QtCore.Qt.AltModifier:
-            # Eanble all plots
-            if key == Qt.Key_1:
-                self.app.enable_all_plots()
+                # Transform Tool
+                if key == QtCore.Qt.Key_T:
+                    self.app.transform_tool.run()
 
-            # Disable all plots
-            if key == Qt.Key_2:
-                self.app.disable_all_plots()
+                # Zoom Fit
+                if key == QtCore.Qt.Key_V:
+                    self.app.on_zoom_fit(None)
 
-            # Disable all other plots
-            if key == Qt.Key_3:
-                self.app.disable_other_plots()
+                # Mirror on X the selected object(s)
+                if key == QtCore.Qt.Key_X:
+                    self.app.on_flipx()
 
-            # Calculator Tool
-            if key == QtCore.Qt.Key_C:
-                self.app.calculator_tool.run()
+                # Mirror on Y the selected object(s)
+                if key == QtCore.Qt.Key_Y:
+                    self.app.on_flipy()
 
-            # 2-Sided PCB Tool
-            if key == QtCore.Qt.Key_D:
-                self.app.dblsidedtool.run()
-                return
+                # Zoom In
+                if key == QtCore.Qt.Key_Equal:
+                    self.app.plotcanvas.zoom(1 / self.app.defaults['zoom_ratio'], self.app.mouse)
 
-            # Film Tool
-            if key == QtCore.Qt.Key_L:
-                self.app.film_tool.run()
-                return
+                # Zoom Out
+                if key == QtCore.Qt.Key_Minus:
+                    self.app.plotcanvas.zoom(self.app.defaults['zoom_ratio'], self.app.mouse)
 
-            # Non-Copper Clear Tool
-            if key == QtCore.Qt.Key_N:
-                self.app.ncclear_tool.run()
-                return
+                # toggle display of Notebook area
+                if key == QtCore.Qt.Key_QuoteLeft:
+                    self.app.on_toggle_notebook()
 
-            # Paint Tool
-            if key == QtCore.Qt.Key_P:
-                self.app.paint_tool.run()
                 return
+        elif self.app.call_source == 'geo_editor':
+            if modifiers == QtCore.Qt.ControlModifier:
+                # save (update) the current geometry and return to the App
+                if key == QtCore.Qt.Key_S or key == 'S':
+                    self.app.editor2object()
+                    return
+
+                # toggle the measurement tool
+                if key == QtCore.Qt.Key_M or key == 'M':
+                    self.app.measurement_tool.run()
+                    return
+
+            elif modifiers == QtCore.Qt.ShiftModifier:
+                pass
+            elif modifiers == QtCore.Qt.AltModifier:
+                pass
+            else:
+                # Finish the current action. Use with tools that do not
+                # complete automatically, like a polygon or path.
+                if key == QtCore.Qt.Key_Enter or key == 'Enter':
+                    if isinstance(self.app.geo_editor.active_tool, FCShapeTool):
+                        self.app.geo_editor.active_tool.click(
+                            self.app.geo_editor.snap(self.app.geo_editor.x, self.app.geo_editor.y))
+                        self.app.geo_editor.active_tool.make()
+                        if self.app.geo_editor.active_tool.complete:
+                            self.app.geo_editor.on_shape_complete()
+                            self.app.inform.emit("[success]Done.")
+                        # automatically make the selection tool active after completing current action
+                        self.app.geo_editor.select_tool('select')
+                    return
+
+                # Abort the current action
+                if key == QtCore.Qt.Key_Escape or key == 'Escape':
+                    # TODO: ...?
+                    # self.on_tool_select("select")
+                    self.app.inform.emit("[WARNING_NOTCL]Cancelled.")
+
+                    self.app.geo_editor.delete_utility_geometry()
+                    self.app.geo_editor.replot()
+                    # self.select_btn.setChecked(True)
+                    # self.on_tool_select('select')
+                    self.app.geo_editor.select_tool('select')
+                    return
+
+                # Delete selected object
+                if key == QtCore.Qt.Key_Delete or key == 'Delete':
+                    self.app.geo_editor.delete_selected()
+                    self.app.geo_editor.replot()
+
+                # Move
+                if key == QtCore.Qt.Key_Space or key == 'Space':
+                    self.app.ui.geo_rotate_btn.setChecked(True)
+                    self.app.geo_editor.on_tool_select('rotate')
+                    self.app.geo_editor.active_tool.set_origin(
+                        self.app.geo_editor.snap(self.app.geo_editor.x, self.app.geo_editor.y))
+
+                if key == QtCore.Qt.Key_1 or key== '1':
+                    self.app.on_zoom_fit(None)
+
+                if key == QtCore.Qt.Key_2 or key == '2':
+                    self.app.plotcanvas.zoom(1 / self.app.defaults['zoom_ratio'], [self.snap_x, self.snap_y])
+
+                if key == QtCore.Qt.Key_3 or key == '3':
+                    self.app.plotcanvas.zoom(self.app.defaults['zoom_ratio'], [self.snap_x, self.snap_y])
+
+                # Arc Tool
+                if key == QtCore.Qt.Key_A or key == 'A':
+                    self.app.geo_editor.select_tool('arc')
+
+                # Buffer
+                if key == QtCore.Qt.Key_B or key == 'B':
+                    self.app.geo_editor.select_tool('buffer')
+
+                # Copy
+                if key == QtCore.Qt.Key_C or key == 'C':
+                    self.app.ui.geo_copy_btn.setChecked(True)
+                    self.app.geo_editor.on_tool_select('copy')
+                    self.app.geo_editor.active_tool.set_origin(self.snap(self.x, self.y))
+                    self.app.inform.emit("Click on target point.")
+
+                # Substract Tool
+                if key == QtCore.Qt.Key_E or key == 'E':
+                    if self.app.geo_editor.get_selected() is not None:
+                        self.app.geo_editor.intersection()
+                    else:
+                        msg = "Please select geometry items \n" \
+                              "on which to perform Intersection Tool."
+
+                        messagebox = QtWidgets.QMessageBox()
+                        messagebox.setText(msg)
+                        messagebox.setWindowTitle("Warning")
+                        messagebox.setWindowIcon(QtGui.QIcon('share/warning.png'))
+                        messagebox.setStandardButtons(QtWidgets.QMessageBox.Ok)
+                        messagebox.setDefaultButton(QtWidgets.QMessageBox.Ok)
+                        messagebox.exec_()
+
+                # Grid Snap
+                if key == QtCore.Qt.Key_G or key == 'G':
+                    self.app.ui.grid_snap_btn.trigger()
+
+                    # make sure that the cursor shape is enabled/disabled, too
+                    if self.app.geo_editor.options['grid_snap'] is True:
+                        self.app.app_cursor.enabled = True
+                    else:
+                        self.app.app_cursor.enabled = False
 
-            # 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
-
-            # Panelize Tool
-            if key == QtCore.Qt.Key_Z:
-                self.app.panelize_tool.run()
-                return
-
-            # Toggle Fullscreen
-            if key == QtCore.Qt.Key_F10 or key == 'F10':
-                self.app.on_fullscreen()
-                return
-        else:
-            # Open Manual
-            if key == QtCore.Qt.Key_F1 or key == 'F1':
-                webbrowser.open(self.app.manual_url)
-
-            # Open Video Help
-            if key == QtCore.Qt.Key_F2 or key == 'F2':
-                webbrowser.open(self.app.video_url)
-
-            # Show shortcut list
-            if key == QtCore.Qt.Key_F3 or key == 'F3':
-                self.app.on_shortcut_list()
-
-            # 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 or key == 'Delete':
-                if active:
-                    # Delete via the application to
-                    # ensure cleanup of the GUI
-                    active.app.on_delete()
-
-            # Escape = Deselect All
-            if key == QtCore.Qt.Key_Escape or key == 'Escape':
-                self.app.on_deselect_all()
-                self.app.inform.emit("")
-
-            # 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()
+                # Paint
+                if key == QtCore.Qt.Key_I or key == 'I':
+                    self.app.geo_editor.select_tool('paint')
 
-            # Zoom Fit
-            if key == QtCore.Qt.Key_V:
-                self.app.on_zoom_fit(None)
+                # Corner Snap
+                if key == QtCore.Qt.Key_K or key == 'K':
+                    self.app.geo_editor.on_corner_snap()
 
-            # Mirror on X the selected object(s)
-            if key == QtCore.Qt.Key_X:
-                self.app.on_flipx()
+                # Move
+                if key == QtCore.Qt.Key_M or key == 'M':
+                    self.app.geo_editor.on_move_click()
 
-            # Mirror on Y the selected object(s)
-            if key == QtCore.Qt.Key_Y:
-                self.app.on_flipy()
+                # Polygon Tool
+                if key == QtCore.Qt.Key_N or key == 'N':
+                    self.app.geo_editor.select_tool('polygon')
 
-            # Zoom In
-            if key == QtCore.Qt.Key_Equal:
-                self.app.plotcanvas.zoom(1 / self.app.defaults['zoom_ratio'], self.app.mouse)
+                # Circle Tool
+                if key == QtCore.Qt.Key_O or key == 'O':
+                    self.app.geo_editor.select_tool('circle')
 
-            # Zoom Out
-            if key == QtCore.Qt.Key_Minus:
-                self.app.plotcanvas.zoom(self.app.defaults['zoom_ratio'], self.app.mouse)
+                # Path Tool
+                if key == QtCore.Qt.Key_P or key == 'P':
+                    self.app.geo_editor.select_tool('path')
 
-            # toggle display of Notebook area
-            if key == QtCore.Qt.Key_QuoteLeft:
-                self.app.on_toggle_notebook()
+                # Rectangle Tool
+                if key == QtCore.Qt.Key_R or key == 'R':
+                    self.app.geo_editor.select_tool('rectangle')
 
-            return
+                # Substract Tool
+                if key == QtCore.Qt.Key_S or key == 'S':
+                    if self.app.geo_editor.get_selected() is not None:
+                        self.app.geo_editor.subtract()
+                    else:
+                        msg = "Please select geometry items \n" \
+                              "on which to perform Substraction Tool."
+
+                        messagebox = QtWidgets.QMessageBox()
+                        messagebox.setText(msg)
+                        messagebox.setWindowTitle("Warning")
+                        messagebox.setWindowIcon(QtGui.QIcon('share/warning.png'))
+                        messagebox.setStandardButtons(QtWidgets.QMessageBox.Ok)
+                        messagebox.setDefaultButton(QtWidgets.QMessageBox.Ok)
+                        messagebox.exec_()
+
+                # Add Text Tool
+                if key == QtCore.Qt.Key_T or key == 'T':
+                    self.app.geo_editor.select_tool('text')
+
+                # Substract Tool
+                if key == QtCore.Qt.Key_U or key == 'U':
+                    if self.app.geo_editor.get_selected() is not None:
+                        self.app.geo_editor.union()
+                    else:
+                        msg = "Please select geometry items \n" \
+                              "on which to perform union."
+
+                        messagebox = QtWidgets.QMessageBox()
+                        messagebox.setText(msg)
+                        messagebox.setWindowTitle("Warning")
+                        messagebox.setWindowIcon(QtGui.QIcon('share/warning.png'))
+                        messagebox.setStandardButtons(QtWidgets.QMessageBox.Ok)
+                        messagebox.setDefaultButton(QtWidgets.QMessageBox.Ok)
+                        messagebox.exec_()
+
+                # Cut Action Tool
+                if key == QtCore.Qt.Key_X or key == 'X':
+                    if self.app.geo_editor.get_selected() is not None:
+                        self.app.geo_editor.cutpath()
+                    else:
+                        msg = 'Please first select a geometry item to be cutted\n' \
+                              'then select the geometry item that will be cutted\n' \
+                              'out of the first item. In the end press ~X~ key or\n' \
+                              'the toolbar button.' \
+
+                        messagebox = QtWidgets.QMessageBox()
+                        messagebox.setText(msg)
+                        messagebox.setWindowTitle("Warning")
+                        messagebox.setWindowIcon(QtGui.QIcon('share/warning.png'))
+                        messagebox.setStandardButtons(QtWidgets.QMessageBox.Ok)
+                        messagebox.setDefaultButton(QtWidgets.QMessageBox.Ok)
+                        messagebox.exec_()
+
+                # Propagate to tool
+                response = None
+                if self.app.geo_editor.active_tool is not None:
+                    response = self.app.geo_editor.active_tool.on_key(event.key)
+                if response is not None:
+                    self.app.inform.emit(response)
+
+                # Show Shortcut list
+                if key == 'F3':
+                    self.app.on_shortcut_list()
+
+        elif self.app.call_source == 'exc_editor':
+            if modifiers == QtCore.Qt.ControlModifier:
+                # save (update) the current geometry and return to the App
+                if key == QtCore.Qt.Key_S or key == 'S':
+                    self.app.editor2object()
+                    return
+
+                # toggle the measurement tool
+                if key == QtCore.Qt.Key_M or key == 'M':
+                    self.app.measurement_tool.run()
+                    return
+
+            elif modifiers == QtCore.Qt.ShiftModifier:
+                pass
+            elif modifiers == QtCore.Qt.AltModifier:
+                pass
+            else:
+                # Abort the current action
+                if key == QtCore.Qt.Key_Escape or key == 'Escape':
+                    # TODO: ...?
+                    # self.on_tool_select("select")
+                    self.app.inform.emit("[WARNING_NOTCL]Cancelled.")
+
+                    self.app.exc_editor.delete_utility_geometry()
+
+                    self.app.exc_editor.replot()
+                    # self.select_btn.setChecked(True)
+                    # self.on_tool_select('select')
+                    self.app.exc_editor.select_tool('select')
+                    return
+
+                # Delete selected object
+                if key == QtCore.Qt.Key_Delete or key == 'Delete':
+                    self.app.exc_editor.launched_from_shortcuts = True
+                    if self.app.exc_editor.selected:
+                        self.app.exc_editor.delete_selected()
+                        self.app.exc_editor.replot()
+                    else:
+                        self.app.inform.emit("[WARNING_NOTCL]Cancelled. Nothing selected to delete.")
+                    return
+
+                if key == QtCore.Qt.Key_1 or key == '1':
+                    self.app.exc_editor.launched_from_shortcuts = True
+                    self.app.on_zoom_fit(None)
+
+                if key == QtCore.Qt.Key_2 or key == '2':
+                    self.app.exc_editor.launched_from_shortcuts = True
+                    self.app.plotcanvas.zoom(1 / self.app.defaults['zoom_ratio'], [self.snap_x, self.snap_y])
+
+                if key == QtCore.Qt.Key_3 or key == '3':
+                    self.app.exc_editor.launched_from_shortcuts = True
+                    self.app.plotcanvas.zoom(self.app.defaults['zoom_ratio'], [self.snap_x, self.snap_y])
+
+                # Add Array of Drill Hole Tool
+                if key == QtCore.Qt.Key_A or key == 'A':
+                    self.app.exc_editor.launched_from_shortcuts = True
+                    self.app.inform.emit("Click on target point.")
+                    self.app.ui.add_drill_array_btn.setChecked(True)
+                    self.app.exc_editor.select_tool('add_array')
+                    return
+
+                # Copy
+                if key == QtCore.Qt.Key_C or key == 'C':
+                    self.app.exc_editor.launched_from_shortcuts = True
+                    if self.app.exc_editor.selected:
+                        self.app.inform.emit("Click on target point.")
+                        self.app.ui.copy_drill_btn.setChecked(True)
+                        self.app.exc_editor.on_tool_select('copy')
+                        self.app.exc_editor.active_tool.set_origin(
+                            (self.app.exc_editor.snap_x, self.app.exc_editor.snap_y))
+                    else:
+                        self.app.inform.emit("[WARNING_NOTCL]Cancelled. Nothing selected to copy.")
+                    return
+
+                # Add Drill Hole Tool
+                if key == QtCore.Qt.Key_D or key == 'D':
+                    self.app.exc_editor.launched_from_shortcuts = True
+                    self.app.inform.emit("Click on target point.")
+                    self.app.ui.add_drill_btn.setChecked(True)
+                    self.app.exc_editor.select_tool('add')
+                    return
+
+                # Grid Snap
+                if key == QtCore.Qt.Key_G or key == 'G':
+                    self.app.exc_editor.launched_from_shortcuts = True
+                    # make sure that the cursor shape is enabled/disabled, too
+                    if self.app.exc_editor.options['grid_snap'] is True:
+                        self.app.app_cursor.enabled = False
+                    else:
+                        self.app.app_cursor.enabled = True
+                    self.app.ui.grid_snap_btn.trigger()
+                    return
+
+                # Corner Snap
+                if key == QtCore.Qt.Key_K or key == 'K':
+                    self.app.exc_editor.launched_from_shortcuts = True
+                    self.app.ui.corner_snap_btn.trigger()
+                    return
+
+                # Move
+                if key == QtCore.Qt.Key_M or key == 'M':
+                    self.app.exc_editor.launched_from_shortcuts = True
+                    if self.app.exc_editor.selected:
+                        self.app.inform.emit("Click on target point.")
+                        self.app.ui.move_drill_btn.setChecked(True)
+                        self.app.exc_editor.on_tool_select('move')
+                        self.app.exc_editor.active_tool.set_origin((self.snap_x, self.snap_y))
+                    else:
+                        self.app.inform.emit("[WARNING_NOTCL]Cancelled. Nothing selected to move.")
+                    return
+
+                # Resize Tool
+                if key == QtCore.Qt.Key_R or key == 'R':
+                    self.app.exc_editor.launched_from_shortcuts = True
+                    self.app.exc_editor.select_tool('resize')
+                    return
+
+                # Propagate to tool
+                response = None
+                if self.app.exc_editor.active_tool is not None:
+                    response = self.app.exc_editor.active_tool.on_key(event.key)
+                if response is not None:
+                    self.app.inform.emit(response)
+
+                # Show Shortcut list
+                if key == QtCore.Qt.Key_F3 or key == 'F3':
+                    self.app.on_shortcut_list()
+                    return
 
     def dragEnterEvent(self, event):
         if event.mimeData().hasUrls:

README.md

@@ -15,6 +15,7 @@ CAD program, and create G-Code for Isolation routing.
 - changed the menu entry Toggle Grid name to Toggle Grid Snap
 - fixed errors in Toggle Axis
 - fixed error with shortcut key triggering twice the keyPressEvent when in the Project List View
+- moved all shortcut keys handlers from Editors to the keyPressEvent() handler from FLatCAMGUI
 
 7.02.2019