added a quit shortcut key for gui backends and fixed "toggle full screen" shortcut key which was broken.

Phil Elson · pelson · commit ed4d33858ba5 · 2012-06-24T20:22:18.000+01:00
diff --git a/lib/matplotlib/backend_bases.py b/lib/matplotlib/backend_bases.py
@@ -2274,9 +2274,6 @@ def key_press_handler(event, canvas, toolbar=None):
 
     """
     # these bindings happen whether you are over an axes or not
-    #if event.key == 'q':
-    #    self.destroy() # how cruel to have to destroy oneself!
-    #    return
 
     if event.key is None:
         return
@@ -2289,6 +2286,7 @@ def key_press_handler(event, canvas, toolbar=None):
     pan_keys = rcParams['keymap.pan']
     zoom_keys = rcParams['keymap.zoom']
     save_keys = rcParams['keymap.save']
+    quit_keys = rcParams['keymap.quit']
     grid_keys = rcParams['keymap.grid']
     toggle_yscale_keys = rcParams['keymap.yscale']
     toggle_xscale_keys = rcParams['keymap.xscale']
@@ -2298,6 +2296,10 @@ def key_press_handler(event, canvas, toolbar=None):
     if event.key in fullscreen_keys:
         canvas.manager.full_screen_toggle()
 
+    # quit the figure (defaut key 'q')
+    if event.key in quit_keys:
+        Gcf.destroy_fig(canvas.figure)
+   
     if toolbar is not None:
         # home or reset mnemonic  (default key 'h', 'home' and 'r')
         if event.key in home_keys:
@@ -2322,7 +2324,8 @@ def key_press_handler(event, canvas, toolbar=None):
     if event.inaxes is None:
         return
 
-    # the mouse has to be over an axes to trigger these
+    # these bindings require the mouse to be over an axes to trigger
+
     # switching on/off a grid in current axes (default key 'g')
     if event.key in grid_keys:
         event.inaxes.grid()
@@ -2387,7 +2390,7 @@ def __init__(self, canvas, num):
     def destroy(self):
         pass
 
-    def full_screen_toggle (self):
+    def full_screen_toggle(self):
         pass
 
     def resize(self, w, h):
diff --git a/lib/matplotlib/backends/backend_gtk.py b/lib/matplotlib/backends/backend_gtk.py
@@ -592,7 +592,7 @@ def show(self):
         # show the figure window
         self.window.show()
 
-    def full_screen_toggle (self):
+    def full_screen_toggle(self):
         self._full_screen_flag = not self._full_screen_flag
         if self._full_screen_flag:
             self.window.fullscreen()
diff --git a/lib/matplotlib/backends/backend_tkagg.py b/lib/matplotlib/backends/backend_tkagg.py
@@ -457,7 +457,7 @@ def __init__(self, canvas, num, window):
         self.window.wm_title("Figure %d" % num)
         self.canvas = canvas
         self._num =  num
-        t1,t2,w,h = canvas.figure.bbox.bounds
+        _, _, w, h = canvas.figure.bbox.bounds
         w, h = int(w), int(h)
         self.window.minsize(int(w*3/4),int(h*3/4))
         if matplotlib.rcParams['toolbar']=='classic':
@@ -476,12 +476,9 @@ def notify_axes_change(fig):
             if self.toolbar != None: self.toolbar.update()
         self.canvas.figure.add_axobserver(notify_axes_change)
 
-
-
         # attach a show method to the figure for pylab ease of use
         self.canvas.figure.show = lambda *args: self.show()
 
-
     def resize(self, width, height=None):
         # before 09-12-22, the resize method takes a single *event*
         # parameter. On the other hand, the resize method of other
@@ -499,7 +496,6 @@ def resize(self, width, height=None):
 
         self.toolbar.configure(width=width)
 
-
     def show(self):
         """
         this function doesn't segfault but causes the
@@ -518,7 +514,6 @@ def destroy(*args):
             self.canvas.draw_idle()
         self._shown = True
 
-
     def destroy(self, *args):
         if self.window is not None:
             #self.toolbar.destroy()
@@ -533,6 +528,12 @@ def destroy(self, *args):
     def set_window_title(self, title):
         self.window.wm_title(title)
 
+    def full_screen_toggle(self):
+        # cross platform way of maximizing a tk window
+        # http://devourer09.blogspot.co.uk/2009/07/maximizing-tkinter-app.html
+        self.window.attributes('-zoomed', '1')
+
+
 class AxisMenu:
     def __init__(self, master, naxes):
         self._master = master
@@ -597,7 +598,7 @@ def select_all(self):
 
 class NavigationToolbar(Tk.Frame):
     """
-    Public attriubutes
+    Public attributes
 
       canvas   - the FigureCanvas  (gtk.DrawingArea)
       win   - the gtk.Window
@@ -722,7 +723,7 @@ def update(self):
 
 class NavigationToolbar2TkAgg(NavigationToolbar2, Tk.Frame):
     """
-    Public attriubutes
+    Public attributes
 
       canvas   - the FigureCanvas  (gtk.DrawingArea)
       win   - the gtk.Window
diff --git a/lib/matplotlib/rcsetup.py b/lib/matplotlib/rcsetup.py
@@ -582,6 +582,7 @@ def __call__(self, s):
     'keymap.pan' : ['p', validate_stringlist],
     'keymap.zoom' : ['o', validate_stringlist],
     'keymap.save' : ['s', validate_stringlist],
+    'keymap.quit' : ['q', validate_stringlist],
     'keymap.grid' : ['g', validate_stringlist],
     'keymap.yscale' : ['l', validate_stringlist],
     'keymap.xscale' : [['k', 'L'], validate_stringlist],
diff --git a/matplotlibrc.template b/matplotlibrc.template
@@ -410,6 +410,7 @@ text.hinting_factor : 8 # Specifies the amount of softness for hinting in the
 #keymap.pan : p                      # pan mnemonic
 #keymap.zoom : o                     # zoom mnemonic
 #keymap.save : s                     # saving current figure
+#keymap.quit : q                     # close the current figure
 #keymap.grid : g                     # switching on/off a grid in current axes
 #keymap.yscale : l                   # toggle scaling of y-axes ('log'/'linear')
 #keymap.xscale : L, k                # toggle scaling of x-axes ('log'/'linear')
