Skip to content

Commit d6a33f5

Browse files
slarosaslarosa
committedJan 3, 2013
Reorganize icons theme for pyqgis console
- add icon to Python Console entry in Plugins menu
·
ltr-3_40Before-merge-new_vector_api
1 parent 1039423 commit d6a33f5

23 files changed

+52
-49
lines changed
 

‎images/images.qrc

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -490,24 +490,24 @@
490490
<file>themes/default/text.png</file>
491491
<file>themes/default/histogram.png</file>
492492
<file>themes/default/pie-chart.png</file>
493-
<file>console/iconClassConsole.png</file>
494-
<file>console/iconSaveConsole.png</file>
495-
<file>console/iconHelpConsole.png</file>
496-
<file>console/iconSettingsConsole.png</file>
497-
<file>console/iconOpenConsole.png</file>
498-
<file>console/iconClearConsole.png</file>
499-
<file>console/imgHelpDialog.png</file>
500-
<file>console/iconSextanteConsole.png</file>
501-
<file>console/iconScriptConsole.png</file>
502-
<file>console/iconIfaceConsole.png</file>
503-
<file>console/iconQtCoreConsole.png</file>
504-
<file>console/iconQtGuiConsole.png</file>
505-
<file>console/iconRunConsole.png</file>
506-
<file>console/iconAboutConsole.png</file>
507-
<file>console/iconCodepadConsole.png</file>
508-
<file>console/imgHelpConsole.png</file>
509-
<file>console/imgHelpMenu.png</file>
510-
<file>console/iconHideToolConsole.png</file>
493+
<file>themes/default/console/iconClassConsole.png</file>
494+
<file>themes/default/console/iconSaveConsole.png</file>
495+
<file>themes/default/console/iconHelpConsole.png</file>
496+
<file>themes/default/console/iconSettingsConsole.png</file>
497+
<file>themes/default/console/iconOpenConsole.png</file>
498+
<file>themes/default/console/iconClearConsole.png</file>
499+
<file>themes/default/console/imgHelpDialog.png</file>
500+
<file>themes/default/console/iconSextanteConsole.png</file>
501+
<file>themes/default/console/iconScriptConsole.png</file>
502+
<file>themes/default/console/iconIfaceConsole.png</file>
503+
<file>themes/default/console/iconQtCoreConsole.png</file>
504+
<file>themes/default/console/iconQtGuiConsole.png</file>
505+
<file>themes/default/console/iconRunConsole.png</file>
506+
<file>themes/default/console/iconAboutConsole.png</file>
507+
<file>themes/default/console/iconCodepadConsole.png</file>
508+
<file>themes/default/console/imgHelpConsole.png</file>
509+
<file>themes/default/console/imgHelpMenu.png</file>
510+
<file>themes/default/console/iconHideToolConsole.png</file>
511511
<file>flags/sr_Cyrl.png</file>
512512
<file>flags/sr_Latn.png</file>
513513
<file>flags/sw.png</file>

‎python/console/console.py

100755100644
Lines changed: 13 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@
2626
from console_output import EditorOutput
2727
from console_help import HelpDialog
2828
from console_settings import optionsDialog
29+
from qgis.core import QgsApplication
2930

3031
import sys
3132
import os
@@ -121,7 +122,7 @@ def __init__(self, parent=None):
121122
self.clearButton = QAction(parent)
122123
self.clearButton.setCheckable(False)
123124
self.clearButton.setEnabled(True)
124-
self.clearButton.setIcon(QIcon(":/images/console/iconClearConsole.png"))
125+
self.clearButton.setIcon(QgsApplication.getThemeIcon("console/iconClearConsole.png"))
125126
self.clearButton.setMenuRole(QAction.PreferencesRole)
126127
self.clearButton.setIconVisibleInMenu(True)
127128
self.clearButton.setToolTip(clearBt)
@@ -131,7 +132,7 @@ def __init__(self, parent=None):
131132
self.optionsButton = QAction(parent)
132133
self.optionsButton.setCheckable(False)
133134
self.optionsButton.setEnabled(True)
134-
self.optionsButton.setIcon(QIcon(":/images/console/iconSettingsConsole.png"))
135+
self.optionsButton.setIcon(QgsApplication.getThemeIcon("console/iconSettingsConsole.png"))
135136
self.optionsButton.setMenuRole(QAction.PreferencesRole)
136137
self.optionsButton.setIconVisibleInMenu(True)
137138
self.optionsButton.setToolTip(optionsBt)
@@ -141,7 +142,7 @@ def __init__(self, parent=None):
141142
self.actionClass = QAction(parent)
142143
self.actionClass.setCheckable(False)
143144
self.actionClass.setEnabled(True)
144-
self.actionClass.setIcon(QIcon(":/images/console/iconClassConsole.png"))
145+
self.actionClass.setIcon(QgsApplication.getThemeIcon("console/iconClassConsole.png"))
145146
self.actionClass.setMenuRole(QAction.PreferencesRole)
146147
self.actionClass.setIconVisibleInMenu(True)
147148
self.actionClass.setToolTip(actionClassBt)
@@ -151,7 +152,7 @@ def __init__(self, parent=None):
151152
self.actionScript = QAction(parent)
152153
self.actionScript.setCheckable(False)
153154
self.actionScript.setEnabled(True)
154-
self.actionScript.setIcon(QIcon(":/images/console/iconScriptConsole.png"))
155+
self.actionScript.setIcon(QgsApplication.getThemeIcon("console/iconScriptConsole.png"))
155156
self.actionScript.setMenuRole(QAction.PreferencesRole)
156157
self.actionScript.setIconVisibleInMenu(True)
157158
self.actionScript.setToolTip(actionScriptBt)
@@ -161,7 +162,7 @@ def __init__(self, parent=None):
161162
self.loadSextanteButton = QAction(parent)
162163
self.loadSextanteButton.setCheckable(False)
163164
self.loadSextanteButton.setEnabled(True)
164-
self.loadSextanteButton.setIcon(QIcon(":/images/console/iconSextanteConsole.png"))
165+
self.loadSextanteButton.setIcon(QgsApplication.getThemeIcon("console/iconSextanteConsole.png"))
165166
self.loadSextanteButton.setMenuRole(QAction.PreferencesRole)
166167
self.loadSextanteButton.setIconVisibleInMenu(True)
167168
self.loadSextanteButton.setToolTip(loadSextanteBt)
@@ -171,7 +172,7 @@ def __init__(self, parent=None):
171172
self.loadIfaceButton = QAction(parent)
172173
self.loadIfaceButton.setCheckable(False)
173174
self.loadIfaceButton.setEnabled(True)
174-
self.loadIfaceButton.setIcon(QIcon(":/images/console/iconIfaceConsole.png"))
175+
self.loadIfaceButton.setIcon(QgsApplication.getThemeIcon("console/iconIfaceConsole.png"))
175176
self.loadIfaceButton.setMenuRole(QAction.PreferencesRole)
176177
self.loadIfaceButton.setIconVisibleInMenu(True)
177178
self.loadIfaceButton.setToolTip(loadIfaceBt)
@@ -181,7 +182,7 @@ def __init__(self, parent=None):
181182
self.loadQtCoreButton = QAction(parent)
182183
self.loadQtCoreButton.setCheckable(False)
183184
self.loadQtCoreButton.setEnabled(True)
184-
self.loadQtCoreButton.setIcon(QIcon(":/images/console/iconQtCoreConsole.png"))
185+
self.loadQtCoreButton.setIcon(QgsApplication.getThemeIcon("console/iconQtCoreConsole.png"))
185186
self.loadQtCoreButton.setMenuRole(QAction.PreferencesRole)
186187
self.loadQtCoreButton.setIconVisibleInMenu(True)
187188
self.loadQtCoreButton.setToolTip(loadQtCoreBt)
@@ -191,7 +192,7 @@ def __init__(self, parent=None):
191192
self.loadQtGuiButton = QAction(parent)
192193
self.loadQtGuiButton.setCheckable(False)
193194
self.loadQtGuiButton.setEnabled(True)
194-
self.loadQtGuiButton.setIcon(QIcon(":/images/console/iconQtGuiConsole.png"))
195+
self.loadQtGuiButton.setIcon(QgsApplication.getThemeIcon("console/iconQtGuiConsole.png"))
195196
self.loadQtGuiButton.setMenuRole(QAction.PreferencesRole)
196197
self.loadQtGuiButton.setIconVisibleInMenu(True)
197198
self.loadQtGuiButton.setToolTip(loadQtGuiBt)
@@ -201,7 +202,7 @@ def __init__(self, parent=None):
201202
self.openFileButton = QAction(parent)
202203
self.openFileButton.setCheckable(False)
203204
self.openFileButton.setEnabled(True)
204-
self.openFileButton.setIcon(QIcon(":/images/console/iconOpenConsole.png"))
205+
self.openFileButton.setIcon(QgsApplication.getThemeIcon("console/iconOpenConsole.png"))
205206
self.openFileButton.setMenuRole(QAction.PreferencesRole)
206207
self.openFileButton.setIconVisibleInMenu(True)
207208
self.openFileButton.setToolTip(openFileBt)
@@ -211,7 +212,7 @@ def __init__(self, parent=None):
211212
self.saveFileButton = QAction(parent)
212213
self.saveFileButton.setCheckable(False)
213214
self.saveFileButton.setEnabled(True)
214-
self.saveFileButton.setIcon(QIcon(":/images/console/iconSaveConsole.png"))
215+
self.saveFileButton.setIcon(QgsApplication.getThemeIcon("console/iconSaveConsole.png"))
215216
self.saveFileButton.setMenuRole(QAction.PreferencesRole)
216217
self.saveFileButton.setIconVisibleInMenu(True)
217218
self.saveFileButton.setToolTip(saveFileBt)
@@ -221,7 +222,7 @@ def __init__(self, parent=None):
221222
self.runButton = QAction(parent)
222223
self.runButton.setCheckable(False)
223224
self.runButton.setEnabled(True)
224-
self.runButton.setIcon(QIcon(":/images/console/iconRunConsole.png"))
225+
self.runButton.setIcon(QgsApplication.getThemeIcon("console/iconRunConsole.png"))
225226
self.runButton.setMenuRole(QAction.PreferencesRole)
226227
self.runButton.setIconVisibleInMenu(True)
227228
self.runButton.setToolTip(runBt)
@@ -231,7 +232,7 @@ def __init__(self, parent=None):
231232
self.helpButton = QAction(parent)
232233
self.helpButton.setCheckable(False)
233234
self.helpButton.setEnabled(True)
234-
self.helpButton.setIcon(QIcon(":/images/console/iconHelpConsole.png"))
235+
self.helpButton.setIcon(QgsApplication.getThemeIcon("console/iconHelpConsole.png"))
235236
self.helpButton.setMenuRole(QAction.PreferencesRole)
236237
self.helpButton.setIconVisibleInMenu(True)
237238
self.helpButton.setToolTip(helpBt)

‎python/console/console_help/help.htm

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@
3737
<table id="header">
3838
<tr>
3939
<td>
40-
<img src="qrc:/images/console/imgHelpDialog.png" />
40+
<img src="qrc:/images/themes/default/console/imgHelpDialog.png" />
4141
</td>
4242
<td>
4343
<span id="headerTitle" class="_title">Python Console for QGIS</span>
@@ -58,7 +58,7 @@
5858
</td>
5959
</tr>
6060
<tr>
61-
<td><img src="qrc:/images/console/imgHelpConsole.png" /></td>
61+
<td><img src="qrc:/images/themes/default/console/imgHelpConsole.png" /></td>
6262
</tr>
6363
<tr>
6464
<td>
@@ -69,7 +69,7 @@
6969
You can drag and drop or copy text into input area (no matter if selected text contains >>> or ...).
7070
Use 'Share on codepad' from contextual menu for sharing snippets code.
7171
The context menu looks like the image below.</span><br><br>
72-
<img src="qrc:/images/console/imgHelpMenu.png"><br>
72+
<img src="qrc:/images/themes/default/console/imgHelpMenu.png"><br>
7373
<span id="headerSubjectB">Input area pane is the interactive python shell for input commands.</span>
7474
</p>
7575
</td>
@@ -127,49 +127,49 @@
127127
<p><span id="toolbarTitle">The following is a description of the tools in the toolbar:</span></p>
128128
<table width="100%" border="0" id="headerTool">
129129
<tr>
130-
<td><img src="qrc:/images/console/iconClearConsole.png" /></td>
130+
<td><img src="qrc:/images/themes/default/console/iconClearConsole.png" /></td>
131131
<td colspan="2"><span id="toolbarClear">Tool to clear python console</span></td>
132132
</tr>
133133
<tr>
134-
<td><img src="qrc:/images/console/iconClassConsole.png" /></td>
135-
<td><img src="qrc:/images/console/iconIfaceConsole.png" /></td>
134+
<td><img src="qrc:/images/themes/default/console/iconClassConsole.png" /></td>
135+
<td><img src="qrc:/images/themes/default/console/iconIfaceConsole.png" /></td>
136136
<td><span id="toolbarIfaceClass">Tool to import QgisInterface class</span></td>
137137
</tr>
138138
<tr>
139139
<td></td>
140-
<td><img src="qrc:/images/console/iconSextanteConsole.png" /></td>
140+
<td><img src="qrc:/images/themes/default/console/iconSextanteConsole.png" /></td>
141141
<td><span id="toolbarSextClass">Tool to import Sextante class</span></td>
142142
</tr>
143143
<tr>
144144
<td></td>
145-
<td><img src="qrc:/images/console/iconQtCoreConsole.png" /></td>
145+
<td><img src="qrc:/images/themes/default/console/iconQtCoreConsole.png" /></td>
146146
<td><span id="toolbarQtCoreClass">Tool to import PyQt4.QtCore class</span></td>
147147
</tr>
148148
<tr>
149149
<td></td>
150-
<td><img src="qrc:/images/console/iconQtGuiConsole.png" /></td>
150+
<td><img src="qrc:/images/themes/default/console/iconQtGuiConsole.png" /></td>
151151
<td><span id="toolbarQtGuiClass">Tool to import PyQt4.QtGui class</span></td>
152152
</tr>
153153
<tr>
154-
<td><img src="qrc:/images/console/iconScriptConsole.png" /></td>
155-
<td><img src="qrc:/images/console/iconOpenConsole.png" /></td>
154+
<td><img src="qrc:/images/themes/default/console/iconScriptConsole.png" /></td>
155+
<td><img src="qrc:/images/themes/default/console/iconOpenConsole.png" /></td>
156156
<td><span id="toolbarScriptOpen">Tool to open a python script and load in console</span></td>
157157
</tr>
158158
<tr>
159159
<td></td>
160-
<td><img src="qrc:/images/console/iconSaveConsole.png" /></td>
160+
<td><img src="qrc:/images/themes/default/console/iconSaveConsole.png" /></td>
161161
<td><span id="toolbarScriptSave">Tool to save a python script</span></td>
162162
</tr>
163163
<tr>
164-
<td><img src="qrc:/images/console/iconSettingsConsole.png" /></td>
164+
<td><img src="qrc:/images/themes/default/console/iconSettingsConsole.png" /></td>
165165
<td colspan="2"><span id="toolbarSettings">Settings</span></td>
166166
</tr>
167167
<tr>
168-
<td><img src="qrc:/images/console/iconHelpConsole.png" /></td>
168+
<td><img src="qrc:/images/themes/default/console/iconHelpConsole.png" /></td>
169169
<td colspan="2"><span id="toolbarHelp">Help</span></td>
170170
</tr>
171171
<tr>
172-
<td><img src="qrc:/images/console/iconRunConsole.png" /></td>
172+
<td><img src="qrc:/images/themes/default/console/iconRunConsole.png" /></td>
173173
<td colspan="2"><span id="toolbarRun">Run command (like Enter key pressed)</span></td>
174174
</tr>
175175
</table>

‎python/console/console_output.py

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@
2424
from PyQt4.Qsci import (QsciScintilla,
2525
QsciScintillaBase,
2626
QsciLexerPython)
27+
from qgis.core import QgsApplication
2728
import sys
2829

2930
class writeOut:
@@ -162,10 +163,10 @@ def clearConsole(self):
162163

163164
def contextMenuEvent(self, e):
164165
menu = QMenu(self)
165-
iconRun = QIcon(":/images/console/iconRunConsole.png")
166-
iconPastebin = QIcon(":/images/console/iconCodepadConsole.png")
167-
iconClear = QIcon(":/images/console/iconClearConsole.png")
168-
iconHideTool = QIcon(":/images/console/iconHideToolConsole.png")
166+
iconRun = QgsApplication.getThemeIcon("console/iconRunConsole.png")
167+
iconPastebin = QgsApplication.getThemeIcon("console/iconCodepadConsole.png")
168+
iconClear = QgsApplication.getThemeIcon("console/iconClearConsole.png")
169+
iconHideTool = QgsApplication.getThemeIcon("console/iconHideToolConsole.png")
169170
hideToolBar = menu.addAction(iconHideTool,
170171
"Hide/Show Toolbar",
171172
self.hideToolBar)

‎src/app/qgisapp.cpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1658,6 +1658,7 @@ void QgisApp::setTheme( QString theThemeName )
16581658
mActionToggleFullScreen->setIcon( QgsApplication::getThemeIcon( "/mActionToggleFullScreen.png" ) );
16591659
mActionProjectProperties->setIcon( QgsApplication::getThemeIcon( "/mActionProjectProperties.png" ) );
16601660
mActionManagePlugins->setIcon( QgsApplication::getThemeIcon( "/mActionShowPluginManager.png" ) );
1661+
mActionShowPythonDialog->setIcon( QgsApplication::getThemeIcon( "console/iconRunConsole.png" ) );
16611662
mActionCheckQgisVersion->setIcon( QgsApplication::getThemeIcon( "/mActionCheckQgisVersion.png" ) );
16621663
mActionOptions->setIcon( QgsApplication::getThemeIcon( "/mActionOptions.png" ) );
16631664
mActionConfigureShortcuts->setIcon( QgsApplication::getThemeIcon( "/mActionOptions.png" ) );

0 commit comments

Comments
 (0)
Please sign in to comment.