[GRASS-SVN] r43194 - in grass/branches/develbranch_6/gui/wxpython: gui_modules xml

[svn_grass at osgeo.org]

Author: hamish
Date: 2010-08-22 03:40:31 +0000 (Sun, 22 Aug 2010)
New Revision: 43194

Modified:
   grass/branches/develbranch_6/gui/wxpython/gui_modules/mcalc_builder.py
   grass/branches/develbranch_6/gui/wxpython/xml/menudata.xml
Log:
fix & buttons; tooltip typos; add 'map' back into tool name (merge from trunk)

Modified: grass/branches/develbranch_6/gui/wxpython/gui_modules/mcalc_builder.py
===================================================================
--- grass/branches/develbranch_6/gui/wxpython/gui_modules/mcalc_builder.py	2010-08-22 03:37:07 UTC (rev 43193)
+++ grass/branches/develbranch_6/gui/wxpython/gui_modules/mcalc_builder.py	2010-08-22 03:40:31 UTC (rev 43194)
@@ -50,10 +50,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))
@@ -172,18 +172,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 = "?:") 
         self.btn['cond'].SetToolTipString(_('conditional'))
         

Modified: grass/branches/develbranch_6/gui/wxpython/xml/menudata.xml
===================================================================
--- grass/branches/develbranch_6/gui/wxpython/xml/menudata.xml	2010-08-22 03:37:07 UTC (rev 43193)
+++ grass/branches/develbranch_6/gui/wxpython/xml/menudata.xml	2010-08-22 03:40:31 UTC (rev 43194)
@@ -1019,7 +1019,7 @@
 	  <command>r.mask</command>
 	</menuitem>
 	<menuitem>
-	  <label>Raster calculator</label>
+	  <label>Raster map calculator</label>
 	  <help>Map calculator for raster map algebra.</help>
 	  <keywords>raster,algebra</keywords>
 	  <handler>OnMapCalculator</handler>