[QGIS Commit] r14996 - trunk/qgis/python

[svn_qgis at osgeo.org]

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

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

This reverts commit f371465e122e525e3e3b10038090bb29be0d0ab7.

Modified: trunk/qgis/python/console.py
===================================================================
--- trunk/qgis/python/console.py	2011-01-05 04:43:29 UTC (rev 14995)
+++ trunk/qgis/python/console.py	2011-01-05 04:43:34 UTC (rev 14996)
@@ -24,7 +24,6 @@
 
 from PyQt4.QtCore import *
 from PyQt4.QtGui import *
-from qgis.utils import iface 
 import sys
 import traceback
 import code
@@ -32,6 +31,7 @@
 
 _init_commands = ["from qgis.core import *", "import qgis.utils"]
 
+
 _console = None
 
 def show_console():
@@ -39,12 +39,16 @@
   global _console
   if _console is None:
     _console = PythonConsole()
-  _console.setVisible(True)
+  _console.show()
+  _console.raise_()
+  _console.setWindowState( _console.windowState() & ~Qt.WindowMinimized )
+  _console.activateWindow()
+ 
 
+
 _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):
@@ -65,18 +69,17 @@
 
 sys.stdout = QgisOutputCatcher()
 
-class PythonConsole(QDockWidget):
+
+class PythonConsole(QWidget):
   def __init__(self, parent=None):
-    QDockWidget.__init__(self, parent)
-   
-    self.widget = QWidget()
-    self.l = QVBoxLayout(self.widget)
+    QWidget.__init__(self, parent)
+
     self.edit = PythonEdit()
+    self.l = QVBoxLayout()
     self.l.addWidget(self.edit)
-    self.setWidget(self.widget)
+    self.setLayout(self.l)
+    self.setWindowTitle(QCoreApplication.translate("PythonConsole", "Python Console"))
 
-    self.setWindowTitle(QCoreApplication.translate("PythonConsole", "Python Console"))
-    iface.addDockWidget(Qt.BottomDockWidgetArea,self)
     s = QSettings()
     self.restoreGeometry(s.value("/python/console/geometry").toByteArray())