Skip to content
Permalink
Browse files

Merge pull request #6244 from alexbruy/processing-cleanup

[processing] remove unused icons and use SVG icon for Heatmap algorithm
  • Loading branch information
alexbruy committed Feb 1, 2018
2 parents 3ab6e5c + 55759a4 commit cc9210735fc80b45a4578e6d192201f5684980cd
@@ -122,6 +122,7 @@
<file>themes/default/grass_mapset_open.png</file>
<file>themes/default/grass_mapset_search.png</file>
<file>themes/default/histogram.svg</file>
<file>themes/default/heatmap.svg</file>
<file>themes/default/join_bevel.svg</file>
<file>themes/default/join_miter.svg</file>
<file>themes/default/join_round.svg</file>
@@ -26,7 +26,6 @@
__revision__ = '$Format:%H$'

import shutil
import inspect
import os
import sys

@@ -55,9 +54,7 @@
from processing.gui.menus import removeMenus, initializeMenus, createMenus
from processing.core.ProcessingResults import resultsList

cmd_folder = os.path.split(inspect.getfile(inspect.currentframe()))[0]
if cmd_folder not in sys.path:
sys.path.insert(0, cmd_folder)
pluginPath = os.path.dirname(__file__)


class ProcessingOptionsFactory(QgsOptionsWidgetFactory):
@@ -208,7 +205,7 @@ def initGui(self):
self.menu.addAction(self.modelerAction)

self.historyAction = QAction(
QIcon(os.path.join(cmd_folder, 'images', 'history.svg')),
QIcon(os.path.join(pluginPath, 'images', 'history.svg')),
self.tr('&History...'), self.iface.mainWindow())
self.historyAction.setObjectName('historyAction')
self.historyAction.triggered.connect(self.openHistory)
@@ -30,7 +30,8 @@

from qgis.PyQt.QtGui import QIcon

from qgis.core import (QgsFeatureRequest,
from qgis.core import (QgsApplication,
QgsFeatureRequest,
QgsRasterFileWriter,
QgsProcessing,
QgsProcessingException,
@@ -61,7 +62,7 @@ class Heatmap(QgisAlgorithm):
OUTPUT = 'OUTPUT'

def icon(self):
return QIcon(os.path.join(pluginPath, 'images', 'heatmap.png'))
return QgsApplication.getThemeIcon("/heatmap.svg")

def tags(self):
return self.tr('heatmap,kde,hotspot').split(',')
@@ -1,4 +1,4 @@
FILE(GLOB IMAGE_FILES *.png *.gif *.svg)
FILE(GLOB IMAGE_FILES *.png *.svg)

ADD_SUBDIRECTORY(ftools)
ADD_SUBDIRECTORY(gdaltools)

This file was deleted.

Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.

0 comments on commit cc92107

Please sign in to comment.
You can’t perform that action at this time.