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

[svn_grass at osgeo.org]

Author: martinl
Date: 2009-01-02 05:26:09 -0500 (Fri, 02 Jan 2009)
New Revision: 35161

Modified:
   grass/branches/releasebranch_6_4/gui/wxpython/gui_modules/mapdisp.py
   grass/branches/releasebranch_6_4/gui/wxpython/gui_modules/toolbars.py
Log:
wxGUI: map -> view, i18n
       (merge from devbr6, r35160)


Modified: grass/branches/releasebranch_6_4/gui/wxpython/gui_modules/mapdisp.py
===================================================================
--- grass/branches/releasebranch_6_4/gui/wxpython/gui_modules/mapdisp.py	2009-01-02 10:21:50 UTC (rev 35160)
+++ grass/branches/releasebranch_6_4/gui/wxpython/gui_modules/mapdisp.py	2009-01-02 10:26:09 UTC (rev 35161)
@@ -2892,7 +2892,7 @@
             #
             self.tree.EnableItemType(type='3d-raster', enable=False)
             
-        self.toolbars['map'].combo.SetValue ("Tools")
+        self.toolbars['map'].combo.SetValue (_("2D view"))
         self.toolbars['map'].Enable2D(True)
         self.toggleStatus.Enable(True)
 

Modified: grass/branches/releasebranch_6_4/gui/wxpython/gui_modules/toolbars.py
===================================================================
--- grass/branches/releasebranch_6_4/gui/wxpython/gui_modules/toolbars.py	2009-01-02 10:21:50 UTC (rev 35160)
+++ grass/branches/releasebranch_6_4/gui/wxpython/gui_modules/toolbars.py	2009-01-02 10:26:09 UTC (rev 35161)
@@ -149,8 +149,8 @@
         self.InitToolbar(self.mapdisplay, self.toolbar, self.ToolbarData())
         
         # optional tools
-        self.combo = wx.ComboBox(parent=self.toolbar, id=wx.ID_ANY, value='2D map',
-                                 choices=['2D map', '3D map', 'Digitize'], 
+        self.combo = wx.ComboBox(parent=self.toolbar, id=wx.ID_ANY, value=_('2D view'),
+                                 choices=[_('2D view'), _('3D view'), _('Digitize')], 
                                  style=wx.CB_READONLY, size=(90, -1))
 
         self.comboid = self.toolbar.AddControl(self.combo)
@@ -242,17 +242,17 @@
         """
         Select / enable tool available in tools list
         """
-        tool =  event.GetString()
+        tool =  event.GetSelection()
         
-        if tool == "2D map":
+        if tool == 0:
             self.ExitToolbars()
             self.Enable2D(True)
 
-        elif tool == "3D map" and not self.mapdisplay.toolbars['nviz']:
+        elif tool == 1 and not self.mapdisplay.toolbars['nviz']:
             self.ExitToolbars()
             self.mapdisplay.AddToolbar("nviz")
             
-        elif tool == "Digitize" and not self.mapdisplay.toolbars['vdigit']:
+        elif tool == 2 and not self.mapdisplay.toolbars['vdigit']:
             self.ExitToolbars()
             self.mapdisplay.AddToolbar("vdigit")