[GRASS-SVN] r43193 - in grass/trunk/gui/wxpython: gui_modules xml
svn_grass at osgeo.org
svn_grass at osgeo.org
Sat Aug 21 23:37:07 EDT 2010
Author: hamish
Date: 2010-08-22 03:37:07 +0000 (Sun, 22 Aug 2010)
New Revision: 43193
Modified:
grass/trunk/gui/wxpython/gui_modules/mcalc_builder.py
grass/trunk/gui/wxpython/xml/menudata.xml
Log:
fix & buttons; tooltip typos; add 'map' back into name to preserve prior training
Modified: grass/trunk/gui/wxpython/gui_modules/mcalc_builder.py
===================================================================
--- grass/trunk/gui/wxpython/gui_modules/mcalc_builder.py 2010-08-22 03:15:07 UTC (rev 43192)
+++ grass/trunk/gui/wxpython/gui_modules/mcalc_builder.py 2010-08-22 03:37:07 UTC (rev 43193)
@@ -51,10 +51,10 @@
if self.cmd == 'r.mapcalc':
self.rast3d = False
- title = _('GRASS GIS Raster Calculator')
+ title = _('GRASS GIS Raster Map Calculator')
if self.cmd == 'r3.mapcalc':
self.rast3d = True
- title = _('GRASS GIS 3D Raster Calculator')
+ title = _('GRASS GIS 3D Raster Map Calculator')
wx.Frame.__init__(self, parent, id = id, title = title, **kwargs)
self.SetIcon(wx.Icon(os.path.join(globalvar.ETCICONDIR, 'grass.ico'), wx.BITMAP_TYPE_ICO))
@@ -176,18 +176,18 @@
self.btn['compl'].SetToolTipString(_('one\'s complement'))
self.btn['not'] = wx.Button(parent = self.panel, id = wx.ID_ANY, label = "!")
self.btn['not'].SetToolTipString(_('NOT'))
- self.btn['andbit'] = wx.Button(parent = self.panel, id = wx.ID_ANY, label = '&')
+ self.btn['andbit'] = wx.Button(parent = self.panel, id = wx.ID_ANY, label = '&&&')
self.btn['andbit'].SetToolTipString(_('bitwise AND'))
self.btn['orbit'] = wx.Button(parent = self.panel, id = wx.ID_ANY, label = "|")
self.btn['orbit'].SetToolTipString(_('bitwise OR'))
- self.btn['and'] = wx.Button(parent = self.panel, id = wx.ID_ANY, label = "&&&")
+ self.btn['and'] = wx.Button(parent = self.panel, id = wx.ID_ANY, label = "&&&&&")
self.btn['and'].SetToolTipString(_('logical AND'))
- self.btn['andnull'] = wx.Button(parent = self.panel, id = wx.ID_ANY, label = "&&&&&")
- self.btn['andnull'].SetToolTipString(_('logical AND (ignores NULLs'))
+ self.btn['andnull'] = wx.Button(parent = self.panel, id = wx.ID_ANY, label = "&&&&&&&")
+ self.btn['andnull'].SetToolTipString(_('logical AND (ignores NULLs)'))
self.btn['or'] = wx.Button(parent = self.panel, id = wx.ID_ANY, label = "||")
self.btn['or'].SetToolTipString(_('logical OR'))
self.btn['ornull'] = wx.Button(parent = self.panel, id = wx.ID_ANY, label = "|||")
- self.btn['ornull'].SetToolTipString(_('logical OR (ignores NULLs'))
+ self.btn['ornull'].SetToolTipString(_('logical OR (ignores NULLs)'))
self.btn['cond'] = wx.Button(parent = self.panel, id = wx.ID_ANY, label = "a ? b : c")
self.btn['cond'].SetToolTipString(_('conditional'))
Modified: grass/trunk/gui/wxpython/xml/menudata.xml
===================================================================
--- grass/trunk/gui/wxpython/xml/menudata.xml 2010-08-22 03:15:07 UTC (rev 43192)
+++ grass/trunk/gui/wxpython/xml/menudata.xml 2010-08-22 03:37:07 UTC (rev 43193)
@@ -1013,7 +1013,7 @@
<command>r.mask</command>
</menuitem>
<menuitem>
- <label>Raster calculator</label>
+ <label>Raster map calculator</label>
<help>Raster map calculator.</help>
<keywords>raster,algebra</keywords>
<handler>OnMapCalculator</handler>
More information about the grass-commit
mailing list