From d6a33f529869e3de7c41f8b6880d755bb78f97ef Mon Sep 17 00:00:00 2001 From: Salvatore Larosa Date: Thu, 3 Jan 2013 14:20:56 +0100 Subject: [PATCH] Reorganize icons theme for pyqgis console - add icon to Python Console entry in Plugins menu --- images/images.qrc | 36 +++++++++--------- .../default}/console/iconAboutConsole.png | Bin .../default}/console/iconClassConsole.png | Bin .../default}/console/iconClearConsole.png | Bin .../default}/console/iconCodepadConsole.png | Bin .../default}/console/iconHelpConsole.png | Bin .../default}/console/iconHideToolConsole.png | Bin .../default}/console/iconIfaceConsole.png | Bin .../default}/console/iconOpenConsole.png | Bin .../default}/console/iconQtCoreConsole.png | Bin .../default}/console/iconQtGuiConsole.png | Bin .../default}/console/iconRunConsole.png | Bin .../default}/console/iconSaveConsole.png | Bin .../default}/console/iconScriptConsole.png | Bin .../default}/console/iconSettingsConsole.png | Bin .../default}/console/iconSextanteConsole.png | Bin .../default}/console/imgHelpConsole.png | Bin .../default}/console/imgHelpDialog.png | Bin .../default}/console/imgHelpMenu.png | Bin python/console/console.py | 25 ++++++------ python/console/console_help/help.htm | 30 +++++++-------- python/console/console_output.py | 9 +++-- src/app/qgisapp.cpp | 1 + 23 files changed, 52 insertions(+), 49 deletions(-) rename images/{ => themes/default}/console/iconAboutConsole.png (100%) rename images/{ => themes/default}/console/iconClassConsole.png (100%) rename images/{ => themes/default}/console/iconClearConsole.png (100%) rename images/{ => themes/default}/console/iconCodepadConsole.png (100%) rename images/{ => themes/default}/console/iconHelpConsole.png (100%) rename images/{ => themes/default}/console/iconHideToolConsole.png (100%) rename images/{ => themes/default}/console/iconIfaceConsole.png (100%) rename images/{ => themes/default}/console/iconOpenConsole.png (100%) rename images/{ => themes/default}/console/iconQtCoreConsole.png (100%) rename images/{ => themes/default}/console/iconQtGuiConsole.png (100%) rename images/{ => themes/default}/console/iconRunConsole.png (100%) rename images/{ => themes/default}/console/iconSaveConsole.png (100%) rename images/{ => themes/default}/console/iconScriptConsole.png (100%) rename images/{ => themes/default}/console/iconSettingsConsole.png (100%) rename images/{ => themes/default}/console/iconSextanteConsole.png (100%) rename images/{ => themes/default}/console/imgHelpConsole.png (100%) rename images/{ => themes/default}/console/imgHelpDialog.png (100%) rename images/{ => themes/default}/console/imgHelpMenu.png (100%) mode change 100755 => 100644 python/console/console.py diff --git a/images/images.qrc b/images/images.qrc index 5d52b281887..3ce1d17c384 100644 --- a/images/images.qrc +++ b/images/images.qrc @@ -490,24 +490,24 @@ themes/default/text.png themes/default/histogram.png themes/default/pie-chart.png - console/iconClassConsole.png - console/iconSaveConsole.png - console/iconHelpConsole.png - console/iconSettingsConsole.png - console/iconOpenConsole.png - console/iconClearConsole.png - console/imgHelpDialog.png - console/iconSextanteConsole.png - console/iconScriptConsole.png - console/iconIfaceConsole.png - console/iconQtCoreConsole.png - console/iconQtGuiConsole.png - console/iconRunConsole.png - console/iconAboutConsole.png - console/iconCodepadConsole.png - console/imgHelpConsole.png - console/imgHelpMenu.png - console/iconHideToolConsole.png + themes/default/console/iconClassConsole.png + themes/default/console/iconSaveConsole.png + themes/default/console/iconHelpConsole.png + themes/default/console/iconSettingsConsole.png + themes/default/console/iconOpenConsole.png + themes/default/console/iconClearConsole.png + themes/default/console/imgHelpDialog.png + themes/default/console/iconSextanteConsole.png + themes/default/console/iconScriptConsole.png + themes/default/console/iconIfaceConsole.png + themes/default/console/iconQtCoreConsole.png + themes/default/console/iconQtGuiConsole.png + themes/default/console/iconRunConsole.png + themes/default/console/iconAboutConsole.png + themes/default/console/iconCodepadConsole.png + themes/default/console/imgHelpConsole.png + themes/default/console/imgHelpMenu.png + themes/default/console/iconHideToolConsole.png flags/sr_Cyrl.png flags/sr_Latn.png flags/sw.png diff --git a/images/console/iconAboutConsole.png b/images/themes/default/console/iconAboutConsole.png similarity index 100% rename from images/console/iconAboutConsole.png rename to images/themes/default/console/iconAboutConsole.png diff --git a/images/console/iconClassConsole.png b/images/themes/default/console/iconClassConsole.png similarity index 100% rename from images/console/iconClassConsole.png rename to images/themes/default/console/iconClassConsole.png diff --git a/images/console/iconClearConsole.png b/images/themes/default/console/iconClearConsole.png similarity index 100% rename from images/console/iconClearConsole.png rename to images/themes/default/console/iconClearConsole.png diff --git a/images/console/iconCodepadConsole.png b/images/themes/default/console/iconCodepadConsole.png similarity index 100% rename from images/console/iconCodepadConsole.png rename to images/themes/default/console/iconCodepadConsole.png diff --git a/images/console/iconHelpConsole.png b/images/themes/default/console/iconHelpConsole.png similarity index 100% rename from images/console/iconHelpConsole.png rename to images/themes/default/console/iconHelpConsole.png diff --git a/images/console/iconHideToolConsole.png b/images/themes/default/console/iconHideToolConsole.png similarity index 100% rename from images/console/iconHideToolConsole.png rename to images/themes/default/console/iconHideToolConsole.png diff --git a/images/console/iconIfaceConsole.png b/images/themes/default/console/iconIfaceConsole.png similarity index 100% rename from images/console/iconIfaceConsole.png rename to images/themes/default/console/iconIfaceConsole.png diff --git a/images/console/iconOpenConsole.png b/images/themes/default/console/iconOpenConsole.png similarity index 100% rename from images/console/iconOpenConsole.png rename to images/themes/default/console/iconOpenConsole.png diff --git a/images/console/iconQtCoreConsole.png b/images/themes/default/console/iconQtCoreConsole.png similarity index 100% rename from images/console/iconQtCoreConsole.png rename to images/themes/default/console/iconQtCoreConsole.png diff --git a/images/console/iconQtGuiConsole.png b/images/themes/default/console/iconQtGuiConsole.png similarity index 100% rename from images/console/iconQtGuiConsole.png rename to images/themes/default/console/iconQtGuiConsole.png diff --git a/images/console/iconRunConsole.png b/images/themes/default/console/iconRunConsole.png similarity index 100% rename from images/console/iconRunConsole.png rename to images/themes/default/console/iconRunConsole.png diff --git a/images/console/iconSaveConsole.png b/images/themes/default/console/iconSaveConsole.png similarity index 100% rename from images/console/iconSaveConsole.png rename to images/themes/default/console/iconSaveConsole.png diff --git a/images/console/iconScriptConsole.png b/images/themes/default/console/iconScriptConsole.png similarity index 100% rename from images/console/iconScriptConsole.png rename to images/themes/default/console/iconScriptConsole.png diff --git a/images/console/iconSettingsConsole.png b/images/themes/default/console/iconSettingsConsole.png similarity index 100% rename from images/console/iconSettingsConsole.png rename to images/themes/default/console/iconSettingsConsole.png diff --git a/images/console/iconSextanteConsole.png b/images/themes/default/console/iconSextanteConsole.png similarity index 100% rename from images/console/iconSextanteConsole.png rename to images/themes/default/console/iconSextanteConsole.png diff --git a/images/console/imgHelpConsole.png b/images/themes/default/console/imgHelpConsole.png similarity index 100% rename from images/console/imgHelpConsole.png rename to images/themes/default/console/imgHelpConsole.png diff --git a/images/console/imgHelpDialog.png b/images/themes/default/console/imgHelpDialog.png similarity index 100% rename from images/console/imgHelpDialog.png rename to images/themes/default/console/imgHelpDialog.png diff --git a/images/console/imgHelpMenu.png b/images/themes/default/console/imgHelpMenu.png similarity index 100% rename from images/console/imgHelpMenu.png rename to images/themes/default/console/imgHelpMenu.png diff --git a/python/console/console.py b/python/console/console.py old mode 100755 new mode 100644 index 80247350121..22cf985d445 --- a/python/console/console.py +++ b/python/console/console.py @@ -26,6 +26,7 @@ from console_sci import PythonEdit from console_output import EditorOutput from console_help import HelpDialog from console_settings import optionsDialog +from qgis.core import QgsApplication import sys import os @@ -121,7 +122,7 @@ class PythonConsoleWidget(QWidget): self.clearButton = QAction(parent) self.clearButton.setCheckable(False) self.clearButton.setEnabled(True) - self.clearButton.setIcon(QIcon(":/images/console/iconClearConsole.png")) + self.clearButton.setIcon(QgsApplication.getThemeIcon("console/iconClearConsole.png")) self.clearButton.setMenuRole(QAction.PreferencesRole) self.clearButton.setIconVisibleInMenu(True) self.clearButton.setToolTip(clearBt) @@ -131,7 +132,7 @@ class PythonConsoleWidget(QWidget): self.optionsButton = QAction(parent) self.optionsButton.setCheckable(False) self.optionsButton.setEnabled(True) - self.optionsButton.setIcon(QIcon(":/images/console/iconSettingsConsole.png")) + self.optionsButton.setIcon(QgsApplication.getThemeIcon("console/iconSettingsConsole.png")) self.optionsButton.setMenuRole(QAction.PreferencesRole) self.optionsButton.setIconVisibleInMenu(True) self.optionsButton.setToolTip(optionsBt) @@ -141,7 +142,7 @@ class PythonConsoleWidget(QWidget): self.actionClass = QAction(parent) self.actionClass.setCheckable(False) self.actionClass.setEnabled(True) - self.actionClass.setIcon(QIcon(":/images/console/iconClassConsole.png")) + self.actionClass.setIcon(QgsApplication.getThemeIcon("console/iconClassConsole.png")) self.actionClass.setMenuRole(QAction.PreferencesRole) self.actionClass.setIconVisibleInMenu(True) self.actionClass.setToolTip(actionClassBt) @@ -151,7 +152,7 @@ class PythonConsoleWidget(QWidget): self.actionScript = QAction(parent) self.actionScript.setCheckable(False) self.actionScript.setEnabled(True) - self.actionScript.setIcon(QIcon(":/images/console/iconScriptConsole.png")) + self.actionScript.setIcon(QgsApplication.getThemeIcon("console/iconScriptConsole.png")) self.actionScript.setMenuRole(QAction.PreferencesRole) self.actionScript.setIconVisibleInMenu(True) self.actionScript.setToolTip(actionScriptBt) @@ -161,7 +162,7 @@ class PythonConsoleWidget(QWidget): self.loadSextanteButton = QAction(parent) self.loadSextanteButton.setCheckable(False) self.loadSextanteButton.setEnabled(True) - self.loadSextanteButton.setIcon(QIcon(":/images/console/iconSextanteConsole.png")) + self.loadSextanteButton.setIcon(QgsApplication.getThemeIcon("console/iconSextanteConsole.png")) self.loadSextanteButton.setMenuRole(QAction.PreferencesRole) self.loadSextanteButton.setIconVisibleInMenu(True) self.loadSextanteButton.setToolTip(loadSextanteBt) @@ -171,7 +172,7 @@ class PythonConsoleWidget(QWidget): self.loadIfaceButton = QAction(parent) self.loadIfaceButton.setCheckable(False) self.loadIfaceButton.setEnabled(True) - self.loadIfaceButton.setIcon(QIcon(":/images/console/iconIfaceConsole.png")) + self.loadIfaceButton.setIcon(QgsApplication.getThemeIcon("console/iconIfaceConsole.png")) self.loadIfaceButton.setMenuRole(QAction.PreferencesRole) self.loadIfaceButton.setIconVisibleInMenu(True) self.loadIfaceButton.setToolTip(loadIfaceBt) @@ -181,7 +182,7 @@ class PythonConsoleWidget(QWidget): self.loadQtCoreButton = QAction(parent) self.loadQtCoreButton.setCheckable(False) self.loadQtCoreButton.setEnabled(True) - self.loadQtCoreButton.setIcon(QIcon(":/images/console/iconQtCoreConsole.png")) + self.loadQtCoreButton.setIcon(QgsApplication.getThemeIcon("console/iconQtCoreConsole.png")) self.loadQtCoreButton.setMenuRole(QAction.PreferencesRole) self.loadQtCoreButton.setIconVisibleInMenu(True) self.loadQtCoreButton.setToolTip(loadQtCoreBt) @@ -191,7 +192,7 @@ class PythonConsoleWidget(QWidget): self.loadQtGuiButton = QAction(parent) self.loadQtGuiButton.setCheckable(False) self.loadQtGuiButton.setEnabled(True) - self.loadQtGuiButton.setIcon(QIcon(":/images/console/iconQtGuiConsole.png")) + self.loadQtGuiButton.setIcon(QgsApplication.getThemeIcon("console/iconQtGuiConsole.png")) self.loadQtGuiButton.setMenuRole(QAction.PreferencesRole) self.loadQtGuiButton.setIconVisibleInMenu(True) self.loadQtGuiButton.setToolTip(loadQtGuiBt) @@ -201,7 +202,7 @@ class PythonConsoleWidget(QWidget): self.openFileButton = QAction(parent) self.openFileButton.setCheckable(False) self.openFileButton.setEnabled(True) - self.openFileButton.setIcon(QIcon(":/images/console/iconOpenConsole.png")) + self.openFileButton.setIcon(QgsApplication.getThemeIcon("console/iconOpenConsole.png")) self.openFileButton.setMenuRole(QAction.PreferencesRole) self.openFileButton.setIconVisibleInMenu(True) self.openFileButton.setToolTip(openFileBt) @@ -211,7 +212,7 @@ class PythonConsoleWidget(QWidget): self.saveFileButton = QAction(parent) self.saveFileButton.setCheckable(False) self.saveFileButton.setEnabled(True) - self.saveFileButton.setIcon(QIcon(":/images/console/iconSaveConsole.png")) + self.saveFileButton.setIcon(QgsApplication.getThemeIcon("console/iconSaveConsole.png")) self.saveFileButton.setMenuRole(QAction.PreferencesRole) self.saveFileButton.setIconVisibleInMenu(True) self.saveFileButton.setToolTip(saveFileBt) @@ -221,7 +222,7 @@ class PythonConsoleWidget(QWidget): self.runButton = QAction(parent) self.runButton.setCheckable(False) self.runButton.setEnabled(True) - self.runButton.setIcon(QIcon(":/images/console/iconRunConsole.png")) + self.runButton.setIcon(QgsApplication.getThemeIcon("console/iconRunConsole.png")) self.runButton.setMenuRole(QAction.PreferencesRole) self.runButton.setIconVisibleInMenu(True) self.runButton.setToolTip(runBt) @@ -231,7 +232,7 @@ class PythonConsoleWidget(QWidget): self.helpButton = QAction(parent) self.helpButton.setCheckable(False) self.helpButton.setEnabled(True) - self.helpButton.setIcon(QIcon(":/images/console/iconHelpConsole.png")) + self.helpButton.setIcon(QgsApplication.getThemeIcon("console/iconHelpConsole.png")) self.helpButton.setMenuRole(QAction.PreferencesRole) self.helpButton.setIconVisibleInMenu(True) self.helpButton.setToolTip(helpBt) diff --git a/python/console/console_help/help.htm b/python/console/console_help/help.htm index a242176b18a..fbaeb769e14 100644 --- a/python/console/console_help/help.htm +++ b/python/console/console_help/help.htm @@ -37,7 +37,7 @@ - + @@ -127,49 +127,49 @@

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

- + - - + + - + - + - + - - + + - + - + - + - +
Tool to clear python console
Tool to import QgisInterface class
Tool to import Sextante class
Tool to import PyQt4.QtCore class
Tool to import PyQt4.QtGui class
Tool to open a python script and load in console
Tool to save a python script
Settings
Help
Run command (like Enter key pressed)
diff --git a/python/console/console_output.py b/python/console/console_output.py index 4f773b4b26b..939afa71438 100644 --- a/python/console/console_output.py +++ b/python/console/console_output.py @@ -24,6 +24,7 @@ from PyQt4.QtGui import * from PyQt4.Qsci import (QsciScintilla, QsciScintillaBase, QsciLexerPython) +from qgis.core import QgsApplication import sys class writeOut: @@ -162,10 +163,10 @@ class EditorOutput(QsciScintilla): def contextMenuEvent(self, e): menu = QMenu(self) - iconRun = QIcon(":/images/console/iconRunConsole.png") - iconPastebin = QIcon(":/images/console/iconCodepadConsole.png") - iconClear = QIcon(":/images/console/iconClearConsole.png") - iconHideTool = QIcon(":/images/console/iconHideToolConsole.png") + iconRun = QgsApplication.getThemeIcon("console/iconRunConsole.png") + iconPastebin = QgsApplication.getThemeIcon("console/iconCodepadConsole.png") + iconClear = QgsApplication.getThemeIcon("console/iconClearConsole.png") + iconHideTool = QgsApplication.getThemeIcon("console/iconHideToolConsole.png") hideToolBar = menu.addAction(iconHideTool, "Hide/Show Toolbar", self.hideToolBar) diff --git a/src/app/qgisapp.cpp b/src/app/qgisapp.cpp index d13b6818029..d29dcd78803 100644 --- a/src/app/qgisapp.cpp +++ b/src/app/qgisapp.cpp @@ -1658,6 +1658,7 @@ void QgisApp::setTheme( QString theThemeName ) mActionToggleFullScreen->setIcon( QgsApplication::getThemeIcon( "/mActionToggleFullScreen.png" ) ); mActionProjectProperties->setIcon( QgsApplication::getThemeIcon( "/mActionProjectProperties.png" ) ); mActionManagePlugins->setIcon( QgsApplication::getThemeIcon( "/mActionShowPluginManager.png" ) ); + mActionShowPythonDialog->setIcon( QgsApplication::getThemeIcon( "console/iconRunConsole.png" ) ); mActionCheckQgisVersion->setIcon( QgsApplication::getThemeIcon( "/mActionCheckQgisVersion.png" ) ); mActionOptions->setIcon( QgsApplication::getThemeIcon( "/mActionOptions.png" ) ); mActionConfigureShortcuts->setIcon( QgsApplication::getThemeIcon( "/mActionOptions.png" ) );