cleaned up subplot code, blank bug still exists

cmoad · cmoad · commit ea70ba4f369e · 2006-07-30T17:58:34.000Z
svn path=/trunk/matplotlib/; revision=2637
diff --git a/lib/matplotlib/backends/backend_qt4.py b/lib/matplotlib/backends/backend_qt4.py
@@ -315,30 +315,26 @@ def draw_rubberband( self, event, x0, y0, x1, y1 ):
         self.canvas.drawRectangle( rect )
         
     def configure_subplots(self):
-        self.adj_window = QtGui.QMainWindow()
-        win = self.adj_window
-        win.setAttribute(QtCore.Qt.WA_DeleteOnClose)
-        win.setWindowTitle("Subplot Configuration Tool")
-        
-        toolfig = Figure(figsize=(6,3))
-        toolfig.subplots_adjust(top=0.9)        
-        w = int (toolfig.bbox.width())
-        h = int (toolfig.bbox.height())
-        
-        canvas = self._get_canvas(toolfig)
-        tool = SubplotTool(self.canvas.figure, toolfig)
-        centralWidget = QtGui.QWidget(win)
-        canvas.setParent(centralWidget)
-        win.setCentralWidget(centralWidget)
-        
-        layout = QtGui.QVBoxLayout(centralWidget)
-        layout.setMargin(0)
-        layout.addWidget(canvas, 1)
-        
-        win.resize(w, h)
-        canvas.setFocusPolicy(QtCore.Qt.ClickFocus)
-        canvas.setFocus()
-        win.show()
+		self.adj_window = QtGui.QDialog()
+		win = self.adj_window
+		win.setAttribute(QtCore.Qt.WA_DeleteOnClose)
+		win.setWindowTitle("Subplot Configuration Tool")
+		image = os.path.join( matplotlib.rcParams['datapath'],'matplotlib.png' )
+		win.setWindowIcon(QtGui.QIcon( image ))
+
+		toolfig = Figure(figsize=(6,3))
+		toolfig.subplots_adjust(top=0.9)
+		canvas = self._get_canvas(toolfig)
+		tool = SubplotTool(self.canvas.figure, toolfig)
+
+		canvas.setParent(win)
+		w = int (toolfig.bbox.width())
+		h = int (toolfig.bbox.height())
+
+		win.resize(w, h)
+		canvas.setFocus()
+		
+		win.show()
     
     def _get_canvas(self, fig):
         return FigureCanvasQT(fig)
