[GRASS-SVN] r46364 - grass/branches/develbranch_6/gui/wxpython/gui_modules

[svn_grass at osgeo.org]

Author: martinl
Date: 2011-05-22 06:23:52 -0700 (Sun, 22 May 2011)
New Revision: 46364

Modified:
   grass/branches/develbranch_6/gui/wxpython/gui_modules/mcalc_builder.py
Log:
wxGUI: only full strings allowed
       (merge r46360 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	2011-05-22 13:18:47 UTC (rev 46363)
+++ grass/branches/develbranch_6/gui/wxpython/gui_modules/mcalc_builder.py	2011-05-22 13:23:52 UTC (rev 46364)
@@ -113,12 +113,10 @@
             self.funct_list.insert(indx, 'z()')
             indx = self.funct_list.index('nsres()') +1
             self.funct_list.insert(indx, 'tbres()')
-            maplabel = _('3D raster map')
             element = 'rast3d'
         else:
-            maplabel = _('raster map')
             element = 'cell'
-
+        
         self.operatorBox = wx.StaticBox(parent = self.panel, id = wx.ID_ANY,
                                         label=" %s " % _('Operators'))
         self.operandBox = wx.StaticBox(parent = self.panel, id = wx.ID_ANY,
@@ -203,11 +201,17 @@
         
         #
         # Map and function insertion text and ComboBoxes
-        self.newmaplabel = wx.StaticText(parent = self.panel, id = wx.ID_ANY,
-                                         label= _('Name for new %s to create') % maplabel)
+        self.newmaplabel = wx.StaticText(parent = self.panel, id = wx.ID_ANY)
+        if self.rast3d:
+            self.newmaplabel.SetLabel(_('Name for new 3D raster map to create'))
+        else:
+            self.newmaplabel.SetLabel(_('Name for new raster map to create'))
         self.newmaptxt = wx.TextCtrl(parent = self.panel, id = wx.ID_ANY, size=(250, -1))
-        self.mapsellabel = wx.StaticText(parent = self.panel, id = wx.ID_ANY,
-                                         label = _('Insert existing %s') % maplabel)
+        self.mapsellabel = wx.StaticText(parent = self.panel, id = wx.ID_ANY)
+        if self.rast3d:
+            self.mapsellabel.SetLabel(_('Insert existing 3D raster map'))
+        else:
+            self.mapsellabel.SetLabel(_('Insert existing raster map'))
         self.mapselect = gselect.Select(parent = self.panel, id = wx.ID_ANY, size = (250, -1),
                                         type = element, multiple = False)
         self.functlabel = wx.StaticText(parent = self.panel, id = wx.ID_ANY,