diff --git a/images/console/imgHelpConsole.png b/images/console/imgHelpConsole.png new file mode 100644 index 00000000000..7ac3dbc69e6 Binary files /dev/null and b/images/console/imgHelpConsole.png differ diff --git a/images/console/imgHelpMenu.png b/images/console/imgHelpMenu.png new file mode 100644 index 00000000000..7f7bf4d5188 Binary files /dev/null and b/images/console/imgHelpMenu.png differ diff --git a/images/images.qrc b/images/images.qrc index 6d22bea4970..87992732dc7 100644 --- a/images/images.qrc +++ b/images/images.qrc @@ -489,6 +489,8 @@ console/iconRunConsole.png console/iconAboutConsole.png console/iconCodepadConsole.png + console/imgHelpConsole.png + console/imgHelpMenu.png flags/sr_Cyrl.png flags/sr_Latn.png flags/sw.png diff --git a/python/console/console_help.py b/python/console/console_help.py index 20e00bf2537..2f448138adb 100644 --- a/python/console/console_help.py +++ b/python/console/console_help.py @@ -23,7 +23,6 @@ __copyright__ = '(C) 2012, Salvatore Larosa' # This will get replaced with a git SHA1 when you do a git archive __revision__ = '$Format:%H$' -from PyQt4.QtWebKit import * from PyQt4.QtCore import * from PyQt4.QtGui import * from ui_console_help import Ui_Help @@ -33,11 +32,10 @@ import os class HelpDialog(QDialog, Ui_Help): def __init__(self, parent): QDialog.__init__(self, parent) - self.setModal(True) self.setupUi(self) self.setWindowTitle(QCoreApplication.translate("PythonConsole","Help Python Console")) - self.setMaximumSize(500, 300) + self.setMaximumSize(530, 300) qgisDataDir = QgsApplication.pkgDataPath() listFile = os.listdir(qgisDataDir + "/python/console/console_help/i18n") diff --git a/python/console/console_help.ui b/python/console/console_help.ui index c9eeb0c854f..7562bd58b72 100644 --- a/python/console/console_help.ui +++ b/python/console/console_help.ui @@ -6,8 +6,8 @@ 0 0 - 519 - 328 + 555 + 363 @@ -62,22 +62,6 @@ - - buttonBox - accepted() - Help - accept() - - - 248 - 254 - - - 157 - 274 - - - buttonBox rejected() @@ -85,12 +69,12 @@ reject() - 316 - 260 + 259 + 310 - 286 - 274 + 259 + 163 diff --git a/python/console/console_help/help.htm b/python/console/console_help/help.htm index 65588f76103..00b82e59a85 100644 --- a/python/console/console_help/help.htm +++ b/python/console/console_help/help.htm @@ -8,18 +8,29 @@ @@ -29,22 +40,45 @@ -

Python Console for QGIS

+ Python Console for QGIS + + + + + + + + + + +
+

+ Python Console based on PyQScintilla2. +

+ To access Quantum GIS environment from this console + use qgis.utils.iface object (instance of QgisInterface class). + To import the class QgisInterface can also use the dedicated + button on the toolbar on the left. +

+
+

+ The console is splitted in two main panes, output and input areas. + Both are resizable by using the horizontal splitter. + Output area pane is a widget read-only which shows the commands output. + You can drag and drop or copy text into input area (no matter if selected text contains >>> or ...). + Use 'Share on codepad' from contextual menu for sharing snippets code. + The context menu looks like the image below.

+
+ Input area pane is the interactive python shell for input commands. +

+
-

- Python Console based on PyQScintilla2. -

- To access Quantum GIS environment from this console - use qgis.utils.iface object (instance of QgisInterface class). - To import the class QgisInterface can also use the dedicated - button on the toolbar on the left. -

@@ -86,7 +120,7 @@ @@ -139,17 +173,6 @@ Run command (like Enter key pressed) -
- - - - - -

- Thanks to Larry Shaffer who provided the API files. -