[QGIS Commit] r14994 - trunk/qgis/python

[svn_qgis at osgeo.org]

Author: gsherman
Date: 2011-01-04 20:43:23 -0800 (Tue, 04 Jan 2011)
New Revision: 14994

Modified:
   trunk/qgis/python/console.py
Log:
Adding docking support to python console

Modified: trunk/qgis/python/console.py
===================================================================
--- trunk/qgis/python/console.py	2011-01-04 18:02:05 UTC (rev 14993)
+++ trunk/qgis/python/console.py	2011-01-05 04:43:23 UTC (rev 14994)
@@ -24,6 +24,7 @@
 
 from PyQt4.QtCore import *
 from PyQt4.QtGui import *
+from qgis.utils import iface 
 import sys
 import traceback
 import code
@@ -31,7 +32,6 @@
 
 _init_commands = ["from qgis.core import *", "import qgis.utils"]
 
-
 _console = None
 
 def show_console():
@@ -39,16 +39,12 @@
   global _console
   if _console is None:
     _console = PythonConsole()
-  _console.show()
-  _console.raise_()
-  _console.setWindowState( _console.windowState() & ~Qt.WindowMinimized )
-  _console.activateWindow()
- 
+  _console.setVisible(True)
 
-
 _old_stdout = sys.stdout
 _console_output = None
 
+
 # hook for python console so all output will be redirected
 # and then shown in console
 def console_displayhook(obj):
@@ -69,17 +65,18 @@
 
 sys.stdout = QgisOutputCatcher()
 
-
-class PythonConsole(QWidget):
+class PythonConsole(QDockWidget):
   def __init__(self, parent=None):
-    QWidget.__init__(self, parent)
-
+    QDockWidget.__init__(self, parent)
+   
+    self.widget = QWidget()
+    self.l = QVBoxLayout(self.widget)
     self.edit = PythonEdit()
-    self.l = QVBoxLayout()
     self.l.addWidget(self.edit)
-    self.setLayout(self.l)
-    self.setWindowTitle(QCoreApplication.translate("PythonConsole", "Python Console"))
+    self.setWidget(self.widget)
 
+    self.setWindowTitle(QCoreApplication.translate("PythonConsole", "Python Console"))
+    iface.addDockWidget(Qt.BottomDockWidgetArea,self)
     s = QSettings()
     self.restoreGeometry(s.value("/python/console/geometry").toByteArray())