[GRASS-SVN] r53311 - in grass/branches/develbranch_6/gui/wxpython: gui_core lmgr xml
svn_grass at osgeo.org
svn_grass at osgeo.org
Thu Oct 4 06:24:33 PDT 2012
Author: martinl
Date: 2012-10-04 06:24:33 -0700 (Thu, 04 Oct 2012)
New Revision: 53311
Modified:
grass/branches/develbranch_6/gui/wxpython/gui_core/ghelp.py
grass/branches/develbranch_6/gui/wxpython/lmgr/frame.py
grass/branches/develbranch_6/gui/wxpython/xml/menudata.xml
Log:
wxGUI: #1743 (WXGUI About GRASS dialog should allow to copy version information)
(merge r53292 from trunk)
Modified: grass/branches/develbranch_6/gui/wxpython/gui_core/ghelp.py
===================================================================
--- grass/branches/develbranch_6/gui/wxpython/gui_core/ghelp.py 2012-10-03 17:22:45 UTC (rev 53310)
+++ grass/branches/develbranch_6/gui/wxpython/gui_core/ghelp.py 2012-10-04 13:24:33 UTC (rev 53311)
@@ -388,7 +388,7 @@
# icon
self.SetIcon(wx.Icon(os.path.join(globalvar.ETCICONDIR, 'grass.ico'), wx.BITMAP_TYPE_ICO))
-
+
# get version and web site
vInfo = grass.version()
@@ -425,7 +425,7 @@
row += 2
infoGridSizer.Add(item = wx.StaticText(parent = infoTxt, id = wx.ID_ANY,
- label = _('SVN Revision:')),
+ label = '%s:' % _('SVN Revision')),
pos = (row, 0),
flag = wx.ALIGN_RIGHT)
@@ -436,7 +436,7 @@
row += 1
infoGridSizer.Add(item = wx.StaticText(parent = infoTxt, id = wx.ID_ANY,
- label = _('GIS Library Revision:')),
+ label = '%s:' % _('GIS Library Revision')),
pos = (row, 0),
flag = wx.ALIGN_RIGHT)
@@ -448,7 +448,7 @@
row += 2
infoGridSizer.Add(item = wx.StaticText(parent = infoTxt, id = wx.ID_ANY,
- label = _('Python:')),
+ label = 'Python:'),
pos = (row, 0),
flag = wx.ALIGN_RIGHT)
@@ -459,7 +459,7 @@
row += 1
infoGridSizer.Add(item = wx.StaticText(parent = infoTxt, id = wx.ID_ANY,
- label = _('wxPython:')),
+ label = 'wxPython:'),
pos = (row, 0),
flag = wx.ALIGN_RIGHT)
@@ -474,7 +474,7 @@
row += 2
infoGridSizer.Add(item = wx.StaticText(parent = infoTxt, id = wx.ID_ANY,
- label = _('Language:')),
+ label = "%s:" % _('Language')),
pos = (row, 0),
flag = wx.ALIGN_RIGHT)
lang = grass.gisenv().get('LANG', None)
Modified: grass/branches/develbranch_6/gui/wxpython/lmgr/frame.py
===================================================================
--- grass/branches/develbranch_6/gui/wxpython/lmgr/frame.py 2012-10-03 17:22:45 UTC (rev 53310)
+++ grass/branches/develbranch_6/gui/wxpython/lmgr/frame.py 2012-10-04 13:24:33 UTC (rev 53311)
@@ -22,6 +22,7 @@
import os
import tempfile
import stat
+import platform
try:
import xml.etree.ElementTree as etree
except ImportError:
@@ -736,6 +737,23 @@
lcmd = ['d.vect', 'map=%s' % name])
dlg.Destroy()
+ def OnSystemInfo(self, event):
+ """!Print system information"""
+ vInfo = grass.version()
+
+ self.goutput.WriteLog("%s: %s\n"
+ "%s: %s\n"
+ "%s: %s (%s)\n"
+ "Python: %s\n"
+ "wxPython: %s\n"
+ "%s: %s\n"% (_("GRASS version"), vInfo['version'],
+ _("GRASS SVN Revision"), vInfo['revision'],
+ _("GIS Library Revision"), vInfo['libgis_revision'], vInfo['libgis_date'].split(' ', 1)[0],
+ platform.python_version(),
+ wx.__version__,
+ _("Platform"), platform.platform()),
+ switchPage = True)
+
def OnAboutGRASS(self, event):
"""!Display 'About GRASS' dialog"""
win = AboutWindow(self)
Modified: grass/branches/develbranch_6/gui/wxpython/xml/menudata.xml
===================================================================
--- grass/branches/develbranch_6/gui/wxpython/xml/menudata.xml 2012-10-03 17:22:45 UTC (rev 53310)
+++ grass/branches/develbranch_6/gui/wxpython/xml/menudata.xml 2012-10-04 13:24:33 UTC (rev 53311)
@@ -3165,6 +3165,11 @@
</menuitem>
<separator />
<menuitem>
+ <label>About system</label>
+ <help>Prints system information</help>
+ <handler>OnSystemInfo</handler>
+ </menuitem>
+ <menuitem>
<label>About GRASS GIS</label>
<help>About GRASS GIS</help>
<handler>OnAboutGRASS</handler>
More information about the grass-commit
mailing list