Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
[processing] more HiDPI fixes (refs #14474)
  • Loading branch information
alexbruy committed Apr 1, 2016
1 parent 32b5faa commit aef26c9
Show file tree
Hide file tree
Showing 28 changed files with 223 additions and 27 deletions.
Expand Up @@ -105,7 +105,7 @@ def getName(self):
return 'gdalogr'

def getIcon(self):
return QIcon(os.path.join(pluginPath, 'images', 'gdal.png'))
return QIcon(os.path.join(pluginPath, 'images', 'gdal.svg'))

def _loadAlgorithms(self):
self.algs = self.preloadedAlgs
Expand Down
Expand Up @@ -98,7 +98,7 @@ def getName(self):
return 'grass'

def getIcon(self):
return QIcon(os.path.join(pluginPath, 'images', 'grass.png'))
return QIcon(os.path.join(pluginPath, 'images', 'grass.svg'))

def getSupportedOutputVectorLayerExtensions(self):
return ['shp']
Expand Down
Expand Up @@ -102,7 +102,7 @@ def getName(self):
return 'grass70'

def getIcon(self):
return QIcon(os.path.join(pluginPath, 'images', 'grass.png'))
return QIcon(os.path.join(pluginPath, 'images', 'grass.svg'))

def getSupportedOutputVectorLayerExtensions(self):
return ['shp']
Expand Down
2 changes: 1 addition & 1 deletion python/plugins/processing/algs/r/RAlgorithmProvider.py
Expand Up @@ -86,7 +86,7 @@ def unload(self):
ProcessingConfig.removeSetting(RUtils.R_USE64)

def getIcon(self):
return QIcon(os.path.join(pluginPath, 'images', 'r.png'))
return QIcon(os.path.join(pluginPath, 'images', 'r.svg'))

def getDescription(self):
return 'R scripts'
Expand Down
2 changes: 1 addition & 1 deletion python/plugins/processing/algs/taudem/TauDEMAlgorithm.py
Expand Up @@ -59,7 +59,7 @@ def getCopy(self):
return newone

def getIcon(self):
return QIcon(os.path.dirname(__file__) + '/../../images/taudem.png')
return QIcon(os.path.dirname(__file__) + '/../../images/taudem.svg')

def defineCharacteristicsFromFile(self):
lines = open(self.descriptionFile)
Expand Down
Expand Up @@ -71,7 +71,7 @@ def getName(self):
return 'taudem'

def getIcon(self):
return QIcon(os.path.dirname(__file__) + '/../../images/taudem.png')
return QIcon(os.path.dirname(__file__) + '/../../images/taudem.svg')

def initializeSettings(self):
AlgorithmProvider.initializeSettings(self)
Expand Down
2 changes: 1 addition & 1 deletion python/plugins/processing/algs/taudem/dinfdistdown.py
Expand Up @@ -65,7 +65,7 @@ class DinfDistDown(GeoAlgorithm):
}

def getIcon(self):
return QIcon(os.path.dirname(__file__) + '/../../images/taudem.png')
return QIcon(os.path.dirname(__file__) + '/../../images/taudem.svg')

def defineCharacteristics(self):
self.name, self.i18n_name = self.trAlgorithm('D-Infinity Distance Down')
Expand Down
Expand Up @@ -66,7 +66,7 @@ class DinfDistDownMulti(GeoAlgorithm):
}

def getIcon(self):
return QIcon(os.path.dirname(__file__) + '/../../images/taudem.png')
return QIcon(os.path.dirname(__file__) + '/../../images/taudem.svg')

def defineCharacteristics(self):
self.name, self.i18n_name = self.trAlgorithm('D-Infinity Distance Down (multifile)')
Expand Down
2 changes: 1 addition & 1 deletion python/plugins/processing/algs/taudem/dinfdistup.py
Expand Up @@ -66,7 +66,7 @@ class DinfDistUp(GeoAlgorithm):
}

def getIcon(self):
return QIcon(os.path.dirname(__file__) + '/../../images/taudem.png')
return QIcon(os.path.dirname(__file__) + '/../../images/taudem.svg')

def defineCharacteristics(self):
self.name, self.i18n_name = self.trAlgorithm('D-Infinity Distance Up')
Expand Down
2 changes: 1 addition & 1 deletion python/plugins/processing/algs/taudem/dinfdistup_multi.py
Expand Up @@ -67,7 +67,7 @@ class DinfDistUpMulti(GeoAlgorithm):
}

def getIcon(self):
return QIcon(os.path.dirname(__file__) + '/../../images/taudem.png')
return QIcon(os.path.dirname(__file__) + '/../../images/taudem.svg')

def defineCharacteristics(self):
self.name, self.i18n_name = self.trAlgorithm('D-Infinity Distance Up (multifile)')
Expand Down
2 changes: 1 addition & 1 deletion python/plugins/processing/algs/taudem/dinftranslimaccum.py
Expand Up @@ -56,7 +56,7 @@ class DinfTransLimAccum(GeoAlgorithm):
OUT_CONCENTR_GRID = 'OUT_CONCENTR_GRID'

def getIcon(self):
return QIcon(os.path.dirname(__file__) + '/../../images/taudem.png')
return QIcon(os.path.dirname(__file__) + '/../../images/taudem.svg')

def defineCharacteristics(self):
self.name, self.i18n_name = self.trAlgorithm('D-Infinity Transport Limited Accumulation')
Expand Down
Expand Up @@ -56,7 +56,7 @@ class DinfTransLimAccum2(GeoAlgorithm):
OUT_CONCENTR_GRID = 'OUT_CONCENTR_GRID'

def getIcon(self):
return QIcon(os.path.dirname(__file__) + '/../../images/taudem.png')
return QIcon(os.path.dirname(__file__) + '/../../images/taudem.svg')

def defineCharacteristics(self):
self.name, self.i18n_name = self.trAlgorithm('D-Infinity Transport Limited Accumulation - 2')
Expand Down
Expand Up @@ -56,7 +56,7 @@ class DinfTransLimAccum2Multi(GeoAlgorithm):
OUT_CONCENTR_GRID = 'OUT_CONCENTR_GRID'

def getIcon(self):
return QIcon(os.path.dirname(__file__) + '/../../images/taudem.png')
return QIcon(os.path.dirname(__file__) + '/../../images/taudem.svg')

def defineCharacteristics(self):
self.name, self.i18n_name = self.trAlgorithm('D-Infinity Transport Limited Accumulation - 2 (multifile)')
Expand Down
Expand Up @@ -56,7 +56,7 @@ class DinfTransLimAccumMulti(GeoAlgorithm):
OUT_CONCENTR_GRID = 'OUT_CONCENTR_GRID'

def getIcon(self):
return QIcon(os.path.dirname(__file__) + '/../../images/taudem.png')
return QIcon(os.path.dirname(__file__) + '/../../images/taudem.svg')

def defineCharacteristics(self):
self.name, self.i18n_name = self.trAlgorithm('D-Infinity Transport Limited Accumulation (multifile)')
Expand Down
2 changes: 1 addition & 1 deletion python/plugins/processing/algs/taudem/dropanalysis.py
Expand Up @@ -60,7 +60,7 @@ class DropAnalysis(GeoAlgorithm):
STEPS = ['Logarithmic', 'Linear']

def getIcon(self):
return QIcon(os.path.dirname(__file__) + '/../../images/taudem.png')
return QIcon(os.path.dirname(__file__) + '/../../images/taudem.svg')

def defineCharacteristics(self):
self.name, self.i18n_name = self.trAlgorithm('Stream Drop Analysis')
Expand Down
Expand Up @@ -60,7 +60,7 @@ class DropAnalysisMulti(GeoAlgorithm):
STEPS = ['Logarithmic', 'Linear']

def getIcon(self):
return QIcon(os.path.dirname(__file__) + '/../../images/taudem.png')
return QIcon(os.path.dirname(__file__) + '/../../images/taudem.svg')

def defineCharacteristics(self):
self.name, self.i18n_name = self.trAlgorithm('Stream Drop Analysis (multifile)')
Expand Down
2 changes: 1 addition & 1 deletion python/plugins/processing/algs/taudem/gridnet.py
Expand Up @@ -54,7 +54,7 @@ class GridNet(GeoAlgorithm):
STRAHLER_GRID = 'STRAHLER_GRID'

def getIcon(self):
return QIcon(os.path.dirname(__file__) + '/../../images/taudem.png')
return QIcon(os.path.dirname(__file__) + '/../../images/taudem.svg')

def defineCharacteristics(self):
self.name, self.i18n_name = self.trAlgorithm('Grid Network')
Expand Down
2 changes: 1 addition & 1 deletion python/plugins/processing/algs/taudem/gridnet_multi.py
Expand Up @@ -54,7 +54,7 @@ class GridNetMulti(GeoAlgorithm):
STRAHLER_GRID = 'STRAHLER_GRID'

def getIcon(self):
return QIcon(os.path.dirname(__file__) + '/../../images/taudem.png')
return QIcon(os.path.dirname(__file__) + '/../../images/taudem.svg')

def defineCharacteristics(self):
self.name, self.i18n_name = self.trAlgorithm('Grid Network (multifile)')
Expand Down
2 changes: 1 addition & 1 deletion python/plugins/processing/algs/taudem/lengtharea.py
Expand Up @@ -51,7 +51,7 @@ class LengthArea(GeoAlgorithm):
STREAM_SOURCE_GRID = 'STREAM_SOURCE_GRID'

def getIcon(self):
return QIcon(os.path.dirname(__file__) + '/../../images/taudem.png')
return QIcon(os.path.dirname(__file__) + '/../../images/taudem.svg')

def defineCharacteristics(self):
self.name, self.i18n_name = self.trAlgorithm('Length Area Stream Source')
Expand Down
2 changes: 1 addition & 1 deletion python/plugins/processing/algs/taudem/lengtharea_multi.py
Expand Up @@ -51,7 +51,7 @@ class LengthAreaMulti(GeoAlgorithm):
STREAM_SOURCE_GRID = 'STREAM_SOURCE_GRID'

def getIcon(self):
return QIcon(os.path.dirname(__file__) + '/../../images/taudem.png')
return QIcon(os.path.dirname(__file__) + '/../../images/taudem.svg')

def defineCharacteristics(self):
self.name, self.i18n_name = self.trAlgorithm('Length Area Stream Source (multifile)')
Expand Down
2 changes: 1 addition & 1 deletion python/plugins/processing/algs/taudem/peukerdouglas.py
Expand Up @@ -48,7 +48,7 @@ class PeukerDouglas(GeoAlgorithm):
STREAM_SOURCE_GRID = 'STREAM_SOURCE_GRID'

def getIcon(self):
return QIcon(os.path.dirname(__file__) + '/../../images/taudem.png')
return QIcon(os.path.dirname(__file__) + '/../../images/taudem.svg')

def defineCharacteristics(self):
self.name, self.i18n_name = self.trAlgorithm('Peuker Douglas')
Expand Down
Expand Up @@ -50,7 +50,7 @@ class PeukerDouglasMulti(GeoAlgorithm):
STREAM_SOURCE_GRID = 'STREAM_SOURCE_GRID'

def getIcon(self):
return QIcon(os.path.dirname(__file__) + '/../../images/taudem.png')
return QIcon(os.path.dirname(__file__) + '/../../images/taudem.svg')

def defineCharacteristics(self):
self.name, self.i18n_name = self.trAlgorithm('Peuker Douglas (multifile)')
Expand Down
2 changes: 1 addition & 1 deletion python/plugins/processing/algs/taudem/slopearea.py
Expand Up @@ -51,7 +51,7 @@ class SlopeArea(GeoAlgorithm):
SLOPE_AREA_GRID = 'SLOPE_AREA_GRID'

def getIcon(self):
return QIcon(os.path.dirname(__file__) + '/../../images/taudem.png')
return QIcon(os.path.dirname(__file__) + '/../../images/taudem.svg')

def defineCharacteristics(self):
self.name, self.i18n_name = self.trAlgorithm('Slope Area Combination')
Expand Down
2 changes: 1 addition & 1 deletion python/plugins/processing/algs/taudem/slopearea_multi.py
Expand Up @@ -51,7 +51,7 @@ class SlopeAreaMulti(GeoAlgorithm):
SLOPE_AREA_GRID = 'SLOPE_AREA_GRID'

def getIcon(self):
return QIcon(os.path.dirname(__file__) + '/../../images/taudem.png')
return QIcon(os.path.dirname(__file__) + '/../../images/taudem.svg')

def defineCharacteristics(self):
self.name, self.i18n_name = self.trAlgorithm('Slope Area Combination (multifile)')
Expand Down
2 changes: 1 addition & 1 deletion python/plugins/processing/gui/CreateNewScriptAction.py
Expand Up @@ -49,7 +49,7 @@ def getIcon(self):
if self.scriptType == self.SCRIPT_PYTHON:
return QIcon(os.path.join(pluginPath, 'images', 'script.png'))
elif self.scriptType == self.SCRIPT_R:
return QIcon(os.path.join(pluginPath, 'images', 'r.png'))
return QIcon(os.path.join(pluginPath, 'images', 'r.svg'))

def execute(self):
dlg = None
Expand Down
4 changes: 2 additions & 2 deletions python/plugins/processing/gui/GetScriptsAndModels.py
Expand Up @@ -75,7 +75,7 @@ def __init__(self):
self.group = self.tr('Tools', 'GetRScriptsAction')

def getIcon(self):
return QIcon(os.path.join(pluginPath, 'images', 'r.png'))
return QIcon(os.path.join(pluginPath, 'images', 'r.svg'))

def execute(self):
dlg = GetScriptsAndModelsDialog(GetScriptsAndModelsDialog.RSCRIPTS)
Expand Down Expand Up @@ -138,7 +138,7 @@ def __init__(self, resourceType):
else:
self.folder = RUtils.RScriptsFolder()
self.urlBase = 'https://raw.githubusercontent.com/qgis/QGIS-Processing/master/rscripts/'
self.icon = QIcon(os.path.join(pluginPath, 'images', 'r.png'))
self.icon = QIcon(os.path.join(pluginPath, 'images', 'r.svg'))

self.lastSelectedItem = None
self.updateToolbox = False
Expand Down
Binary file removed python/plugins/processing/images/taudem.png
Binary file not shown.

0 comments on commit aef26c9

Please sign in to comment.