diff --git a/python/console.py b/python/console.py index 1a7842b4f331..363bbd16367f 100755 --- a/python/console.py +++ b/python/console.py @@ -128,7 +128,7 @@ def __init__(self, parent=None): self.actionScript = QAction(parent) self.actionScript.setCheckable(False) self.actionScript.setEnabled(True) - self.actionScript.setIcon(QIcon(os.path.dirname(__file__) + "/iconConsole/iconTempConsole.png")) + self.actionScript.setIcon(QIcon(os.path.dirname(__file__) + "/iconConsole/iconScriptConsole.png")) self.actionScript.setMenuRole(QAction.PreferencesRole) self.actionScript.setIconVisibleInMenu(True) self.actionScript.setToolTip(actionScriptBt) diff --git a/python/help.py b/python/help.py index 7faa38c66f0a..4316229b2a1c 100644 --- a/python/help.py +++ b/python/help.py @@ -9,9 +9,9 @@ def __init__(self): QtGui.QDialog.__init__(self) self.setModal(True) self.setupUi() - + def setupUi(self): - self.resize(400, 300) + self.setMaximumSize(500, 300) self.webView = QtWebKit.QWebView() self.setWindowTitle("Help Python Console") self.verticalLayout= QtGui.QVBoxLayout() diff --git a/python/helpConsole/help.htm b/python/helpConsole/help.htm index 9c92e55a05f6..39bf951848c3 100644 --- a/python/helpConsole/help.htm +++ b/python/helpConsole/help.htm @@ -9,9 +9,13 @@ font-size : 12px; } #header{ - background: #c6c6c6; + background: #cccccc; width: 100%; } + #headerTool td{ + background: #f6f6f6; + /*width: 100%;*/ + } @@ -56,16 +60,16 @@

Features


  • CTRL+ALT+SPACE to view the command history list.

    • -
  • Saves command history by typing _save or closing the widget.
    +
  • Saves the command history by typing _save or closing the widget.
    This command saves the history command in the file ~/.qgis/console_history.txt

    • -
  • Clears command history by typing _clear.
    - This command clears the history command from file ~/.qgis/console_history.txt +
  • Clears the command history by typing _clear.
    + This command clears the command history from file ~/.qgis/console_history.txt

  • Clears completely command history by typing _clearAll.
    - This command clears completely the history command. It has an irreversible effect. + This command clears completely the command history. It has an irreversible effect.

    • @@ -77,34 +81,38 @@

    Toolbar

    The following is a description of the tools in the toolbar:

    - +
    - - + + - - + + + - - + + + - - + + + - - + + + - - + + - - + +
    Tool to clear python consoleTool to clear python console
    Tool to import iface classTool to import iface class
    Tool to import Sextante classTool to import Sextante class
    Tool to open a python script and load in consoleTool to open a python script and load in console
    Tool to save a python scriptTool to save a python script
    This! ;-)Help
    Run command (like Enter key pressed)Run command (like Enter key pressed)

    diff --git a/python/iconConsole/CMakeLists.txt b/python/iconConsole/CMakeLists.txt index fe35df0ac86f..c0c22e6985ca 100644 --- a/python/iconConsole/CMakeLists.txt +++ b/python/iconConsole/CMakeLists.txt @@ -9,6 +9,7 @@ iconHelpConsole.png imgHelpDialog.png iconIfaceConsole.png iconClassConsole.png +iconScriptConsole.png ) FILE(GLOB ICON_FILES *.png) diff --git a/python/iconConsole/iconClassConsole.png b/python/iconConsole/iconClassConsole.png index b9ef3087d9ff..621de0055183 100644 Binary files a/python/iconConsole/iconClassConsole.png and b/python/iconConsole/iconClassConsole.png differ diff --git a/python/iconConsole/iconClearConsole.png b/python/iconConsole/iconClearConsole.png index 2023eefd365e..ec415ddc54ba 100644 Binary files a/python/iconConsole/iconClearConsole.png and b/python/iconConsole/iconClearConsole.png differ diff --git a/python/iconConsole/iconHelpConsole.png b/python/iconConsole/iconHelpConsole.png index d17761b1ab2f..c747c80f7b8a 100644 Binary files a/python/iconConsole/iconHelpConsole.png and b/python/iconConsole/iconHelpConsole.png differ diff --git a/python/iconConsole/iconIfaceConsole.png b/python/iconConsole/iconIfaceConsole.png index 3aab833cd97b..ca5b5cc9d8c2 100644 Binary files a/python/iconConsole/iconIfaceConsole.png and b/python/iconConsole/iconIfaceConsole.png differ diff --git a/python/iconConsole/iconOpenConsole.png b/python/iconConsole/iconOpenConsole.png index 103504fcd927..2e0cb308c047 100644 Binary files a/python/iconConsole/iconOpenConsole.png and b/python/iconConsole/iconOpenConsole.png differ diff --git a/python/iconConsole/iconRunConsole.png b/python/iconConsole/iconRunConsole.png index 1d0114936987..e9bcd3fdb15a 100644 Binary files a/python/iconConsole/iconRunConsole.png and b/python/iconConsole/iconRunConsole.png differ diff --git a/python/iconConsole/iconSaveConsole.png b/python/iconConsole/iconSaveConsole.png index 529e4ec58e5e..0487611aef7a 100644 Binary files a/python/iconConsole/iconSaveConsole.png and b/python/iconConsole/iconSaveConsole.png differ diff --git a/python/iconConsole/iconScriptConsole.png b/python/iconConsole/iconScriptConsole.png new file mode 100644 index 000000000000..903b31c107d0 Binary files /dev/null and b/python/iconConsole/iconScriptConsole.png differ diff --git a/python/iconConsole/iconSextanteConsole.png b/python/iconConsole/iconSextanteConsole.png index bd6928256843..a78f5ceae3f9 100644 Binary files a/python/iconConsole/iconSextanteConsole.png and b/python/iconConsole/iconSextanteConsole.png differ diff --git a/python/iconConsole/iconTempConsole.png b/python/iconConsole/iconTempConsole.png index a7475e841b65..fa4adcb29199 100644 Binary files a/python/iconConsole/iconTempConsole.png and b/python/iconConsole/iconTempConsole.png differ