[GRASS-SVN] r37236 - grass/branches/develbranch_6/gui/wxpython

[svn_grass at osgeo.org]

Author: martinl
Date: 2009-05-14 16:41:35 -0400 (Thu, 14 May 2009)
New Revision: 37236

Modified:
   grass/branches/develbranch_6/gui/wxpython/wxgui.py
Log:
wxGUI: use gis_h revision in about dialog
       (merge from trunk, r37235)


Modified: grass/branches/develbranch_6/gui/wxpython/wxgui.py
===================================================================
--- grass/branches/develbranch_6/gui/wxpython/wxgui.py	2009-05-14 19:45:42 UTC (rev 37235)
+++ grass/branches/develbranch_6/gui/wxpython/wxgui.py	2009-05-14 20:41:35 UTC (rev 37236)
@@ -542,18 +542,21 @@
     def OnAboutGRASS(self, event):
         """Display 'About GRASS' dialog"""
         info = wx.AboutDialogInfo()
-
-        rev = "$Revision$"
+        
         # name
         info.SetName("GRASS GIS")
         # version
-        version = grass.read_command('g.version').replace('GRASS', '').strip()
+        version, svn_gis_h_rev, svn_gis_h_date = gcmd.RunCommand('g.version',
+                                                                 flags = 'r',
+                                                                 read = True).splitlines()
+        version = version.replace('GRASS', '').strip()
         info.SetVersion(version)
         # description
         copyrightFile = open(os.path.join(os.getenv("GISBASE"), "COPYING"), 'r')
         copyrightOut = []
         copyright = copyrightFile.readlines()
-        info.SetCopyright(rev + '\n\n' + wordwrap(''.join(copyright[:11] + copyright[26:-3]),
+        info.SetCopyright('GIS Library: '+ svn_gis_h_rev + 
+                          '\n\n' + wordwrap(''.join(copyright[:11] + copyright[26:-3]),
                                                   550, wx.ClientDC(self)))
         copyrightFile.close()
         # website
@@ -568,7 +571,7 @@
         authorsFile.close()
         
         wx.AboutBox(info)
-
+        
     def OnWorkspace(self, event):
         """Workspace menu (new, load)"""
         point = wx.GetMousePosition()


Property changes on: grass/branches/develbranch_6/gui/wxpython/wxgui.py
___________________________________________________________________
Name: svn:keywords
   - Author Date Id Revision
   + Author Date Id