Support the "Enter" key event in the Qt4 backend.

svn path=/trunk/matplotlib/; revision=8436
mmokrejs · Jun 15, 2010 · 9e7c950 · 9e7c950
1 parent 6dad4e4
commit 9e7c950
Showing 1 changed file with 11 additions and 6 deletions.
diff --git a/lib/matplotlib/backends/backend_qt4.py b/lib/matplotlib/backends/backend_qt4.py
@@ -129,6 +129,7 @@ class FigureCanvasQT( QtGui.QWidget, FigureCanvasBase ):
     keyvald = { QtCore.Qt.Key_Control : 'control',
                 QtCore.Qt.Key_Shift : 'shift',
                 QtCore.Qt.Key_Alt : 'alt',
+                QtCore.Qt.Key_Return : 'enter'
                }
     # left 1, middle 2, right 3
     buttond = {1:1, 2:3, 4:2}
@@ -314,16 +315,19 @@ def __init__( self, canvas, num ):
         self.window._destroying = False
 
         self.toolbar = self._get_toolbar(self.canvas, self.window)
-        self.window.addToolBar(self.toolbar)
-        QtCore.QObject.connect(self.toolbar, QtCore.SIGNAL("message"),
-                self.window.statusBar().showMessage)
+        if self.toolbar is not None:
+            self.window.addToolBar(self.toolbar)
+            QtCore.QObject.connect(self.toolbar, QtCore.SIGNAL("message"),
+                                   self.window.statusBar().showMessage)
+            tbs_height = self.toolbar.sizeHint().height()
+        else:
+            tbs_height = 0
 
         # resize the main window so it will display the canvas with the
         # requested size:
         cs = canvas.sizeHint()
-        tbs = self.toolbar.sizeHint()
         sbs = self.window.statusBar().sizeHint()
-        self.window.resize(cs.width(), cs.height()+tbs.height()+sbs.height())
+        self.window.resize(cs.width(), cs.height()+tbs_height+sbs.height())
 
         self.window.setCentralWidget(self.canvas)
 
@@ -335,7 +339,8 @@ def __init__( self, canvas, num ):
 
         def notify_axes_change( fig ):
            # This will be called whenever the current axes is changed
-           if self.toolbar != None: self.toolbar.update()
+           if self.toolbar is not None:
+               self.toolbar.update()
         self.canvas.figure.add_axobserver( notify_axes_change )
 
     def _widgetclosed( self ):