Merge pull request #328 from slarosa/master

Add action: Hide/Show toolbar for PyQGIS Console
qgis · Nov 16, 2012 · 5bc0a8a · 5bc0a8a
2 parents 5053818 + 1237546
commit 5bc0a8a
Show file tree

Hide file tree

Showing 6 changed files with 15 additions and 3 deletions.
diff --git a/images/console/iconHideToolConsole.png b/images/console/iconHideToolConsole.png
diff --git a/images/console/imgHelpMenu.png b/images/console/imgHelpMenu.png
diff --git a/images/images.qrc b/images/images.qrc
@@ -491,6 +491,7 @@
         <file>console/iconCodepadConsole.png</file>
         <file>console/imgHelpConsole.png</file>
         <file>console/imgHelpMenu.png</file>
+        <file>console/iconHideToolConsole.png</file>
         <file>flags/sr_Cyrl.png</file>
         <file>flags/sr_Latn.png</file>
         <file>flags/sw.png</file>

diff --git a/python/console/console.py b/python/console/console.py
@@ -355,7 +355,7 @@ def saveScriptFile(self):
             sF.close()
 
     def openHelp(self):
-        dlg = HelpDialog(self)
+        dlg = HelpDialog()
         dlg.exec_()
 
     def openSettings(self):

diff --git a/python/console/console_help.py b/python/console/console_help.py
@@ -30,10 +30,11 @@
 import os
 
 class HelpDialog(QDialog, Ui_Help):
-    def __init__(self, parent):
+    def __init__(self, parent=None):
         QDialog.__init__(self, parent)
         self.setupUi(self)
-
+
+        self.setWindowModality(Qt.WindowModal)
         self.setWindowTitle(QCoreApplication.translate("PythonConsole","Help Python Console"))
         self.setMaximumSize(530, 300)
 

diff --git a/python/console/console_output.py b/python/console/console_output.py
@@ -165,6 +165,11 @@ def contextMenuEvent(self, e):
         iconRun = QIcon(":/images/console/iconRunConsole.png")
         iconPastebin = QIcon(":/images/console/iconCodepadConsole.png")
         iconClear = QIcon(":/images/console/iconClearConsole.png")
+        iconHideTool = QIcon(":/images/console/iconHideToolConsole.png")
+        hideToolBar = menu.addAction(iconHideTool, 
+                                     "Hide/Show Toolbar", 
+                                     self.hideToolBar)
+        menu.addSeparator()
         runAction = menu.addAction(iconRun, 
                                    "Enter Selected", 
                                    self.enteredSelected, 
@@ -196,6 +201,11 @@ def contextMenuEvent(self, e):
             selectAllAction.setEnabled(True)
             clearAction.setEnabled(True)
         action = menu.exec_(self.mapToGlobal(e.pos()))
+
+    def hideToolBar(self):
+        tB = self.parent.toolBar
+        tB.hide() if tB.isVisible() else tB.show()
+        self.edit.setFocus()
 
     def copy(self):
         """Copy text to clipboard... or keyboard interrupt"""