Skip to content

Commit 04eb293

Browse files
committed
[processing] Move some SVG icons out of plugin to themes
...and swap to using QgsApplication methods for retrieving cached icons, implement svgIconPath for providers with SVG icons
1 parent bf484da commit 04eb293

43 files changed

Lines changed: 148 additions & 137 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎images/images.qrc‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -550,6 +550,14 @@
550550
<file>themes/default/mTaskRunning.svg</file>
551551
<file>themes/default/mTaskTerminated.svg</file>
552552
<file>themes/default/mTaskCancel.svg</file>
553+
<file>themes/default/providerGdal.svg</file>
554+
<file>themes/default/providerGrass.svg</file>
555+
<file>themes/default/providerQgis.svg</file>
556+
<file>themes/default/providerR.svg</file>
557+
<file>themes/default/providerTaudem.svg</file>
558+
<file>themes/default/processingModel.svg</file>
559+
<file>themes/default/processingScript.svg</file>
560+
<file>themes/default/processingAlgorithm.svg</file>
553561
</qresource>
554562
<qresource prefix="/images/tips">
555563
<file alias="symbol_levels.png">qgis_tips/symbol_levels.png</file>
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.

python/plugins/processing/images/taudem.svg renamed to images/themes/default/providerTaudem.svg

Lines changed: 9 additions & 76 deletions
Loading

‎python/plugins/processing/ProcessingPlugin.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -72,13 +72,13 @@ def initGui(self):
7272
self.toolboxAction = self.toolbox.toggleViewAction()
7373
self.toolboxAction.setObjectName('toolboxAction')
7474
self.toolboxAction.setIcon(
75-
QIcon(os.path.join(cmd_folder, 'images', 'alg.svg')))
75+
QgsApplication.getThemeIcon("/processingAlgorithm.svg"))
7676
self.toolboxAction.setText(self.tr('&Toolbox'))
7777
self.iface.registerMainWindowAction(self.toolboxAction, 'Ctrl+Alt+T')
7878
self.menu.addAction(self.toolboxAction)
7979

8080
self.modelerAction = QAction(
81-
QIcon(os.path.join(cmd_folder, 'images', 'model.svg')),
81+
QgsApplication.getThemeIcon("/processingModel.svg"),
8282
self.tr('Graphical &Modeler...'), self.iface.mainWindow())
8383
self.modelerAction.setObjectName('modelerAction')
8484
self.modelerAction.triggered.connect(self.openModeler)

0 commit comments

Comments
 (0)