Merge pull request #3531 from Sigma1912/patch-2

Gmoccapy: Disable all keybord shortcuts if disabled in settings

Author: andypugh

src/emc/usr_intf/gmoccapy/gmoccapy.py

@@ -3213,7 +3213,13 @@ def _switch_to_g7(self, state):
             self.diameter_mode = False
 
     def on_key_event(self, widget, event, signal):
-
+        # if the user has disabled keyboard shortcuts, we leave here
+        # in this case we do not return true, otherwise entering code in MDI history
+        # and the integrated editor will not work
+        if not self.widgets.chk_use_kb_shortcuts.get_active():
+            LOG.debug("Settings say: do not use keyboard shortcuts, abort")
+            return
+        
         # get the keyname
         keyname = Gdk.keyval_name(event.keyval)
 
@@ -3222,6 +3228,7 @@ def on_key_event(self, widget, event, signal):
         if keyname == "F1":  # will estop the machine, but not reset estop!
             self.command.state(linuxcnc.STATE_ESTOP)
             return True
+
         if keyname == "Escape":
             self.command.abort()
             return True
@@ -3266,13 +3273,6 @@ def on_key_event(self, widget, event, signal):
             self.widgets.window1.grab_focus()
             return
 
-        # if the user do not want to use keyboard shortcuts, we leave here
-        # in this case we do not return true, otherwise entering code in MDI history
-        # and the integrated editor will not work
-        if not self.widgets.chk_use_kb_shortcuts.get_active():
-            LOG.debug("Settings say: do not use keyboard shortcuts, abort")
-            return
-
         # Only in MDI mode the RETURN key should execute a command
         if keyname == "Return" and signal and self.stat.task_mode == linuxcnc.MODE_MDI:
             # LOG.debug("Got enter in MDI")