nsis: fix master installer bitmap

qgis · Jun 20, 2014 · 522f2e4 · 522f2e4
1 parent 260d55e
commit 522f2e4
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 10 deletions.
diff --git a/ms-windows/Installer-Files/WelcomeFinishPage.bmp b/ms-windows/Installer-Files/WelcomeFinishPage.bmp
diff --git a/python/plugins/processing/algs/qgis/SetRasterStyle.py b/python/plugins/processing/algs/qgis/SetRasterStyle.py
@@ -46,7 +46,7 @@ class SetRasterStyle(GeoAlgorithm):
     def defineCharacteristics(self):
         self.name = 'Set style for raster layer'
         self.group = 'Raster general tools'
-        self.addParameter(ParameterRaster(self.INPUT, 'Raster layer'))        
+        self.addParameter(ParameterRaster(self.INPUT, 'Raster layer'))
         self.addParameter(ParameterFile(self.STYLE,
                           'Style file', False, False, 'qml'))
         self.addOutput(OutputRaster(self.OUTPUT, 'Styled layer', True))
@@ -61,11 +61,11 @@ def processAlgorithm(self, progress):
             self.getOutputFromName(self.OUTPUT).open = False
         else:
             with open(style) as f:
-                xml = "".join(f.readlines()) 
-            d = QDomDocument();
-            d.setContent(xml);
-            n = d.firstChild();        
-            layer.readSymbology(n, '')                
+                xml = "".join(f.readlines())
+            d = QDomDocument()
+            d.setContent(xml)
+            n = d.firstChild()
+            layer.readSymbology(n, '')
             self.setOutputValue(self.OUTPUT, filename)
             iface.mapCanvas().refresh()
             iface.legendInterface().refreshLayerSymbology(layer)
diff --git a/python/plugins/processing/algs/qgis/SetVectorStyle.py b/python/plugins/processing/algs/qgis/SetVectorStyle.py
@@ -52,7 +52,7 @@ def defineCharacteristics(self):
                           'Style file', False, False, 'qml'))
         self.addOutput(OutputVector(self.OUTPUT, 'Styled layer', True))
 
-    def processAlgorithm(self, progress):        
+    def processAlgorithm(self, progress):
         filename = self.getParameterValue(self.INPUT)
         layer = dataobjects.getObjectFromUri(filename)
 
@@ -62,6 +62,6 @@ def processAlgorithm(self, progress):
             dataobjects.load(filename, os.path.basename(filename), style=style)
             self.getOutputFromName(self.OUTPUT).open = False
         else:
-            layer.loadNamedStyle(style)                        
+            layer.loadNamedStyle(style)
             iface.mapCanvas().refresh()
             iface.legendInterface().refreshLayerSymbology(layer)
diff --git a/python/plugins/processing/algs/qgis/mmqgisx/MMQGISXAlgorithms.py b/python/plugins/processing/algs/qgis/mmqgisx/MMQGISXAlgorithms.py
@@ -1086,7 +1086,7 @@ def defineCharacteristics(self):
     def processAlgorithm(self, progress):
 
         filename = self.getParameterValue(self.LAYERNAME)
-        layer = dataobjects.getObjectFromUri(filename)        
+        layer = dataobjects.getObjectFromUri(filename)
         attribute = self.getParameterValue(self.ATTRIBUTE)
         comparison = self.comparisons[self.getParameterValue(self.COMPARISON)]
         comparisonvalue = self.getParameterValue(self.COMPARISONVALUE)

diff --git a/python/plugins/processing/parameters/ParameterMultipleInput.py b/python/plugins/processing/parameters/ParameterMultipleInput.py
@@ -67,7 +67,7 @@ def setValue(self, obj):
                 if self.optional:
                     return True
                 else:
-                    return False            
+                    return False
             self.value = ";".join([self.getAsString(lay) for lay in obj])
             return True
         else: