[GRASS-SVN] r50849 - grass/branches/releasebranch_6_4/gui/wxpython/gui_modules

[svn_grass at osgeo.org]

Author: martinl
Date: 2012-02-17 13:06:04 -0800 (Fri, 17 Feb 2012)
New Revision: 50849

Modified:
   grass/branches/releasebranch_6_4/gui/wxpython/gui_modules/ghelp.py
Log:
wxGUI/about window: use grass.version()


Modified: grass/branches/releasebranch_6_4/gui/wxpython/gui_modules/ghelp.py
===================================================================
--- grass/branches/releasebranch_6_4/gui/wxpython/gui_modules/ghelp.py	2012-02-17 20:58:10 UTC (rev 50848)
+++ grass/branches/releasebranch_6_4/gui/wxpython/gui_modules/ghelp.py	2012-02-17 21:06:04 UTC (rev 50849)
@@ -39,6 +39,7 @@
 import wx.lib.flatnotebook as FN
 import  wx.lib.scrolledpanel as scrolled
 
+from grass.script import core as grass
 from grass.script import task as gtask
 
 import menudata
@@ -493,9 +494,7 @@
         self.SetIcon(wx.Icon(os.path.join(globalvar.ETCICONDIR, 'grass.ico'), wx.BITMAP_TYPE_ICO))
 
         # get version and web site
-        version, svn_gis_h_rev, svn_gis_h_date = gcmd.RunCommand('g.version',
-                                                                 flags = 'r',
-                                                                 read = True).splitlines()
+        vInfo = grass.version()
         
         infoTxt = wx.Panel(parent = panel, id = wx.ID_ANY)
         infoSizer = wx.BoxSizer(wx.VERTICAL)
@@ -510,7 +509,7 @@
                       flag = wx.ALL | wx.ALIGN_CENTER, border = 25)
         
         info = wx.StaticText(parent = infoTxt, id = wx.ID_ANY,
-                             label = version.replace('GRASS', 'GRASS GIS').strip() + '\n\n')
+                             label = 'GRASS GIS ' + vInfo['version'] + '\n\n')
         info.SetFont(wx.Font(13, wx.DEFAULT, wx.NORMAL, wx.BOLD, 0, ""))
         infoSizer.Add(item = info, proportion = 0,
                           flag = wx.BOTTOM | wx.ALIGN_CENTER, border = 15)
@@ -531,8 +530,8 @@
                           flag = wx.ALIGN_RIGHT)
         
         infoGridSizer.Add(item = wx.StaticText(parent = infoTxt, id = wx.ID_ANY,
-                                               label = svn_gis_h_rev.split(' ')[1] + ' (' +
-                                               svn_gis_h_date.split(' ')[1] + ')'),
+                                               label = vInfo['libgis_revision'] + ' (' +
+                                               vInfo['libgis_date'].split(' ')[0] + ')'),
                           pos = (2, 1),
                           flag = wx.ALIGN_LEFT)