[QGIS Commit] r13725 - in trunk/qgis: python/plugins/GdalTools/tools src/app

[svn_qgis at osgeo.org]

Author: brushtyler
Date: 2010-06-13 18:27:55 +0000 (Sun, 13 Jun 2010)
New Revision: 13725

Modified:
   trunk/qgis/python/plugins/GdalTools/tools/GdalTools_utils.py
   trunk/qgis/python/plugins/GdalTools/tools/doAbout.py
   trunk/qgis/src/app/qgisapp.cpp
Log:
applied patch to show GDAL version in about dialog, to fix #2804


Modified: trunk/qgis/python/plugins/GdalTools/tools/GdalTools_utils.py
===================================================================
--- trunk/qgis/python/plugins/GdalTools/tools/GdalTools_utils.py	2010-06-13 08:43:01 UTC (rev 13724)
+++ trunk/qgis/python/plugins/GdalTools/tools/GdalTools_utils.py	2010-06-13 18:27:55 UTC (rev 13725)
@@ -603,33 +603,27 @@
 # class which allows to create version objects and compare them
 class Version:
   def __init__(self, ver):
-      self.vers = (0, 0, 0)
+      self.vers = ('0', '0', '0')
 
       if isinstance(ver, Version):
         self.vers = ver.vers
       elif isinstance(ver, tuple) or isinstance(ver, list):
-        self.vers = tuple(ver)
+        self.vers = map(str, ver)
       elif isinstance(ver, str) or isinstance(ver, QString):
         self.vers = self.string2vers(ver)
 
   @staticmethod
   def string2vers(string):
-      vers = [0, 0, 0]
+      vers = ['0', '0', '0']
 
       nums = str(string).split(".")
       
       if len(nums) > 0:
-        n = QString(nums[0]).remove( QRegExp( "[^0-9].*$" ) )
-        if not n.isEmpty():
-          vers[0] = int(n)
+        vers[0] = nums[0]
       if len(nums) > 1:
-        n = QString(nums[1]).remove( QRegExp( "[^0-9].*$" ) )
-        if not n.isEmpty():
-          vers[1] = int(n)
+        vers[1] = nums[1]
       if len(nums) > 2:
-        n = QString(nums[2]).remove( QRegExp( "[^0-9].*$" ) )
-        if not n.isEmpty():
-          vers[2] = int(n)
+        vers[2] = nums[2]
 
       return (vers[0], vers[1], vers[2])
 

Modified: trunk/qgis/python/plugins/GdalTools/tools/doAbout.py
===================================================================
--- trunk/qgis/python/plugins/GdalTools/tools/doAbout.py	2010-06-13 08:43:01 UTC (rev 13724)
+++ trunk/qgis/python/plugins/GdalTools/tools/doAbout.py	2010-06-13 18:27:55 UTC (rev 13725)
@@ -7,6 +7,7 @@
 
 from ui_dialogAbout import Ui_GdalToolsAboutDialog as Ui_Dialog
 from GdalTools import version
+from GdalTools_utils import GdalConfig
 
 class GdalToolsAboutDialog(QDialog, Ui_Dialog):
 
@@ -17,7 +18,7 @@
 
       QObject.connect(self.btnWeb, SIGNAL("clicked()"), self.openWebsite)
 
-      self.lblVersion.setText( version() )
+      self.lblVersion.setText( version() + self.tr( "\n(using GDAL v. %1)" ).arg( str( GdalConfig.version() ) ) )
       self.textEdit.setText(self.getText())
 
   def getText(self):

Modified: trunk/qgis/src/app/qgisapp.cpp
===================================================================
--- trunk/qgis/src/app/qgisapp.cpp	2010-06-13 08:43:01 UTC (rev 13724)
+++ trunk/qgis/src/app/qgisapp.cpp	2010-06-13 18:27:55 UTC (rev 13725)
@@ -2390,6 +2390,9 @@
     QString versionString = tr( "You are using QGIS version %1 built against code revision %2." )
                             .arg( QGis::QGIS_VERSION )
                             .arg( QGis::QGIS_SVN_VERSION );
+
+    versionString += tr( "\nThis copy of QGIS has been built with GDAL/OGR %1." ).arg( GDAL_RELEASE_NAME );
+
 #ifdef HAVE_POSTGRESQL
     versionString += tr( "\nThis copy of QGIS has been built with PostgreSQL support (%1)." ).arg( PG_VERSION );
 #else