[GRASS-SVN] r41152 - in grass/trunk/gui/wxpython: . gui_modules icons

[svn_grass at osgeo.org]

Author: cmbarton
Date: 2010-02-21 20:33:55 -0500 (Sun, 21 Feb 2010)
New Revision: 41152

Modified:
   grass/trunk/gui/wxpython/gui_modules/goutput.py
   grass/trunk/gui/wxpython/gui_modules/wxgui_utils.py
   grass/trunk/gui/wxpython/icons/icon.py
   grass/trunk/gui/wxpython/wxgui.py
Log:
Replace d.vect.thematic script with d.thematic.area module for thematic map layer.

Modified: grass/trunk/gui/wxpython/gui_modules/goutput.py
===================================================================
--- grass/trunk/gui/wxpython/gui_modules/goutput.py	2010-02-21 19:38:17 UTC (rev 41151)
+++ grass/trunk/gui/wxpython/gui_modules/goutput.py	2010-02-22 01:33:55 UTC (rev 41152)
@@ -441,7 +441,7 @@
                                  'd.rast.arrow'   : 'rastarrow',
                                  'd.rast.num'     : 'rastnum',
                                  'd.vect'         : 'vector',
-                                 'd.vect.thematic': 'thememap',
+                                 'd.thematic.area': 'thememap',
                                  'd.vect.chart'   : 'themechart',
                                  'd.grid'         : 'grid',
                                  'd.geodesic'     : 'geodesic',

Modified: grass/trunk/gui/wxpython/gui_modules/wxgui_utils.py
===================================================================
--- grass/trunk/gui/wxpython/gui_modules/wxgui_utils.py	2010-02-21 19:38:17 UTC (rev 41151)
+++ grass/trunk/gui/wxpython/gui_modules/wxgui_utils.py	2010-02-22 01:33:55 UTC (rev 41152)
@@ -715,7 +715,7 @@
             self.SetItemText(layer, '%s %s' % (_('vector'), _('(double click to set properties)')))
         elif ltype == 'thememap':
             self.SetItemImage(layer, self.theme_icon)
-            self.SetItemText(layer, '%s %s' % (_('thematic map'), _('(double click to set properties)')))
+            self.SetItemText(layer, '%s %s' % (_('thematic area (choropleth) map'), _('(double click to set properties)')))
         elif ltype == 'themechart':
             self.SetItemImage(layer, self.chart_icon)
             self.SetItemText(layer, '%s %s' % (_('thematic charts'), _('(double click to set properties)')))
@@ -892,7 +892,7 @@
         elif ltype == 'thememap':
             # -s flag requested, otherwise only first thematic category is displayed
             # should be fixed by C-based d.thematic.* modules
-            menuform.GUI().ParseCommand(['d.vect.thematic', '-s'], 
+            menuform.GUI().ParseCommand(['d.thematic.area'], 
                                         completed=(self.GetOptData,layer,params),
                                         parentframe=self)
         elif ltype == 'themechart':

Modified: grass/trunk/gui/wxpython/icons/icon.py
===================================================================
--- grass/trunk/gui/wxpython/icons/icon.py	2010-02-21 19:38:17 UTC (rev 41151)
+++ grass/trunk/gui/wxpython/icons/icon.py	2010-02-22 01:33:55 UTC (rev 41152)
@@ -213,7 +213,7 @@
     "addrnum"    : MetaIcon (img=Icons["addrnum"],
                              label=_("Add raster cell numbers")),
     "addthematic": MetaIcon (img=Icons["addthematic"],
-                             label=_("Add thematic layer")),
+                             label=_("Add thematic area (choropleth) map layer")),
     "addchart"   : MetaIcon (img=Icons["addchart"],
                              label=_("Add thematic chart layer")),
     "addgrid"    : MetaIcon (img=Icons["addgrid"],

Modified: grass/trunk/gui/wxpython/wxgui.py
===================================================================
--- grass/trunk/gui/wxpython/wxgui.py	2010-02-21 19:38:17 UTC (rev 41151)
+++ grass/trunk/gui/wxpython/wxgui.py	2010-02-22 01:33:55 UTC (rev 41152)
@@ -1011,7 +1011,7 @@
                  ('addvect', Icons["addvect"].GetBitmap(),
                   Icons["addvect"].GetLabel(), self.OnAddVector),
                  ('addthematic', Icons["addthematic"].GetBitmap(),
-                  _("Add various vector-based map layer"), self.OnAddVectorMisc),
+                  _("Add various vector-based map layers"), self.OnAddVectorMisc),
                  ('addcmd',  Icons["addcmd"].GetBitmap(),
                   Icons["addcmd"].GetLabel(),  self.OnAddCommand),
                  ('addgrp',  Icons["addgrp"].GetBitmap(),