Merge pull request #417 from wrh3c/Enable-Escape-button-and-fix-issue…

…-400

Enable Esc key and fix issue 400

UIElements/gcodeCanvas.py

@@ -85,10 +85,13 @@ def _on_keyboard_down(self, keyboard, keycode, text, modifiers):
         if keycode[1] == self.data.config.get('Ground Control Settings', 'zoomIn'):
             mat = Matrix().scale(1-scaleFactor, 1-scaleFactor, 1)
             self.scatterInstance.apply_transform(mat, anchor)
+            return True # we handled this key - don't pass to other callbacks
         elif keycode[1] == self.data.config.get('Ground Control Settings', 'zoomOut'):
             mat = Matrix().scale(1+scaleFactor, 1+scaleFactor, 1)
             self.scatterInstance.apply_transform(mat, anchor)
-        return True
+            return True # we handled this key - don't pass to other callbacks
+        else:
+            return False # we didn't handle this key - let next callback handle it
 
     def isClose(self, a, b):
         return abs(a-b) <= self.data.tolerance

main.py

@@ -5,6 +5,7 @@
 '''
 from kivy.config                import Config
 Config.set('input', 'mouse', 'mouse,disable_multitouch')
+Config.set('kivy', 'exit_on_escape', '0')
 from kivy.app                   import App
 from kivy.uix.gridlayout        import GridLayout
 from kivy.uix.floatlayout       import FloatLayout
@@ -426,13 +427,6 @@ def on_config_change(self, config, section, key, value):
             if (key == "truncate") or (key == "digits"):
                 self.frontpage.gcodecanvas.reloadGcode()
 
-
-
-    def close_settings(self, settings):
-        """
-        Close settings panel
-        """
-        super(GroundControlApp, self).close_settings(settings)
 
     def push_settings_to_machine(self, *args):