[GRASS-SVN] r73880 - grass/branches/releasebranch_7_6/gui/wxpython/xml

[svn_grass at osgeo.org]

Author: martinl
Date: 2018-12-28 05:13:32 -0800 (Fri, 28 Dec 2018)
New Revision: 73880

Modified:
   grass/branches/releasebranch_7_6/gui/wxpython/xml/toolboxes.xml
   grass/branches/releasebranch_7_6/gui/wxpython/xml/wxgui_items.xml
Log:
r.mapcalc.simple added to the menu, #3431 (g76: merge r73829 from trunk)

Modified: grass/branches/releasebranch_7_6/gui/wxpython/xml/toolboxes.xml
===================================================================
--- grass/branches/releasebranch_7_6/gui/wxpython/xml/toolboxes.xml	2018-12-27 22:28:36 UTC (rev 73879)
+++ grass/branches/releasebranch_7_6/gui/wxpython/xml/toolboxes.xml	2018-12-28 13:13:32 UTC (rev 73880)
@@ -70,7 +70,7 @@
       <module-item name="r.mask">
         <label>Mask</label>
       </module-item>
-      <wxgui-item name="RasterMapCalculator"/>
+      <subtoolbox name="RasterMapCalculator"/>
       <subtoolbox name="NeighborhoodAnalysis"/>
       <subtoolbox name="OverlayRasters"/>
       <subtoolbox name="SolarRadianceAndShadows"/>
@@ -575,6 +575,18 @@
       </module-item>
     </items>
   </toolbox>
+  <toolbox name="RasterMapCalculator">
+    <label>Raster map calculator</label>
+    <items>
+      <module-item name="r.mapcalc.simple">
+        <label>Simplified raster map calculator</label>
+      </module-item>
+      <module-item name="r.mapcalc">
+        <label>Raster map calculator</label>
+        <handler>OnMapCalculator</handler>
+      </module-item>
+    </items>
+  </toolbox>
   <toolbox name="GRASSWorkingEnvironment">
     <label>GRASS working environment</label>
     <items>

Modified: grass/branches/releasebranch_7_6/gui/wxpython/xml/wxgui_items.xml
===================================================================
--- grass/branches/releasebranch_7_6/gui/wxpython/xml/wxgui_items.xml	2018-12-27 22:28:36 UTC (rev 73879)
+++ grass/branches/releasebranch_7_6/gui/wxpython/xml/wxgui_items.xml	2018-12-28 13:13:32 UTC (rev 73880)
@@ -85,13 +85,6 @@
     <description>User GUI preferences (display font, commands, digitizer, etc.)</description>
     <wx-id>ID_PREFERENCES</wx-id>
   </wxgui-item>
-  <wxgui-item name="RasterMapCalculator">
-    <label>Raster map calculator</label>
-    <handler>OnMapCalculator</handler>
-    <related-module>r.mapcalc</related-module>
-    <description>Raster map calculator</description>
-    <keywords>raster,algebra</keywords>
-  </wxgui-item>
   <wxgui-item name="Histogram">
     <label>Histogram</label>
     <handler>OnHistogram</handler>