loading shapefiles with umlauts in name

BergWerkGIS · Mar 5, 2015 · a20a91f · a20a91f
1 parent 432e43e
commit a20a91f
Show file tree

Hide file tree

Showing 9 changed files with 10 additions and 10 deletions.
diff --git a/VoGisProfilTool.zip b/VoGisProfilTool.zip
diff --git a/VoGisProfilTool/__init__.py b/VoGisProfilTool/__init__.py
@@ -31,7 +31,7 @@ def description():
 
 
 def version():
-    return "2.5.3"
+    return "2.5.4"
 
 
 def icon():

diff --git a/VoGisProfilTool/metadata.txt b/VoGisProfilTool/metadata.txt
@@ -13,7 +13,7 @@ name=VoGIS-ProfilTool
 qgisMinimumVersion=1.8
 qgisMaximumVersion=2.99
 description=Create profiles from DHMs using vector geometries or a digitized line.
-version=2.5.3
+version=2.5.4
 author=BergWerk GIS
 [email protected]
 

diff --git a/VoGisProfilTool/resources_rc.py b/VoGisProfilTool/resources_rc.py
@@ -2,7 +2,7 @@
 
 # Resource object code
 #
-# Created: Mo. Feb 9 14:29:24 2015
+# Created: Do. Mär 5 15:46:43 2015
 #      by: The Resource Compiler for PyQt (Qt v4.8.6)
 #
 # WARNING! All changes made in this file will be lost!

diff --git a/VoGisProfilTool/ui/ui_vogisprofiltoolmain.py b/VoGisProfilTool/ui/ui_vogisprofiltoolmain.py
@@ -2,7 +2,7 @@
 
 # Form implementation generated from reading ui file 'ui/ui_vogisprofiltoolmain.ui'
 #
-# Created: Mon Feb  9 14:29:24 2015
+# Created: Thu Mar  5 15:46:42 2015
 #      by: PyQt4 UI code generator 4.10.4
 #
 # WARNING! All changes made in this file will be lost!

diff --git a/VoGisProfilTool/ui/ui_vogisprofiltoolplot.py b/VoGisProfilTool/ui/ui_vogisprofiltoolplot.py
@@ -2,7 +2,7 @@
 
 # Form implementation generated from reading ui file 'ui/ui_vogisprofiltoolplot.ui'
 #
-# Created: Mon Feb  9 14:29:24 2015
+# Created: Thu Mar  5 15:46:43 2015
 #      by: PyQt4 UI code generator 4.10.4
 #
 # WARNING! All changes made in this file will be lost!

diff --git a/VoGisProfilTool/util/u.py b/VoGisProfilTool/util/u.py
@@ -100,7 +100,7 @@ def getFileName(self, text, filter, filePath):
 
         #QgsMessageLog.logMessage('{0}'.format(fileName), 'VoGis')
         if fileName is None or fileName == '':
-            return u''
+            return u'', u''
         if QGis.QGIS_VERSION_INT < 10900:
             #fileExt = fInfo.suffix()
             fileExt = str(selectedFilter[:3]).lower()
@@ -430,7 +430,7 @@ def loadVectorFile(self, fileName):
                                      )
         if reply == QMessageBox.Yes:
             self.iface.addVectorLayer(fileName,
-                                      basename(str(fileName)),
+                                      basename(unicode(fileName)),
                                       'ogr'
                                       )
 

diff --git a/VoGisProfilTool/vogisprofiltoolmaindialog.py b/VoGisProfilTool/vogisprofiltoolmaindialog.py
@@ -184,7 +184,7 @@ def profiles_finished(self, profiles, intersections):
 
         #QGIS 2.0 http://gis.stackexchange.com/a/58754 http://gis.stackexchange.com/a/57090
         self.iface.mainWindow().statusBar().showMessage('VoGIS-Profiltool, {0} Profile'.format(len(profiles)))
-        QgsMessageLog.logMessage('Profile Count: ' + str(len(profiles)), 'VoGis')
+        QgsMessageLog.logMessage(u'Profile Count: {0}'.format(len(profiles)), 'VoGis')
 
         if len(profiles) < 1:
             QApplication.restoreOverrideCursor()

diff --git a/plugins.xml b/plugins.xml
@@ -1,8 +1,8 @@
 <?xml version = '1.0' encoding = 'UTF-8'?>
 <plugins>
-    <pyqgis_plugin name="VoGIS-ProfilTool" version="2.5.3">
+    <pyqgis_plugin name="VoGIS-ProfilTool" version="2.5.4">
         <description><![CDATA[Create profiles from DHMs using vector geometries or a digitized line.]]></description>
-        <version>2.5.3</version>
+        <version>2.5.4</version>
         <qgis_minimum_version>1.8.0</qgis_minimum_version>
         <qgis_maximum_version>2.99.0</qgis_maximum_version>
         <homepage>https://github.com/BergWerkGIS/VoGIS-Profil-Tool/</homepage>