[GRASS-SVN] r52429 - in grass/trunk/gui/wxpython: gui_core xml

[svn_grass at osgeo.org]

Author: annakrat
Date: 2012-07-20 07:41:28 -0700 (Fri, 20 Jul 2012)
New Revision: 52429

Modified:
   grass/trunk/gui/wxpython/gui_core/menu.py
   grass/trunk/gui/wxpython/xml/menudata.xml
Log:
wxGUI: revert r52423 and hide commands in a different way

Modified: grass/trunk/gui/wxpython/gui_core/menu.py
===================================================================
--- grass/trunk/gui/wxpython/gui_core/menu.py	2012-07-20 14:22:36 UTC (rev 52428)
+++ grass/trunk/gui/wxpython/gui_core/menu.py	2012-07-20 14:41:28 UTC (rev 52429)
@@ -66,7 +66,7 @@
             menu.AppendSeparator()
             return
         
-        if len(gcmd) > 0:
+        if len(gcmd) > 0 and handler in ('OnMenuCmd', 'RunMenuCmd'):
             helpString = gcmd + ' -- ' + help
             if menustyle == 1:
                 label += '   [' + gcmd + ']'

Modified: grass/trunk/gui/wxpython/xml/menudata.xml
===================================================================
--- grass/trunk/gui/wxpython/xml/menudata.xml	2012-07-20 14:22:36 UTC (rev 52428)
+++ grass/trunk/gui/wxpython/xml/menudata.xml	2012-07-20 14:41:28 UTC (rev 52429)
@@ -96,6 +96,7 @@
 	      <help>Import raster data into a GRASS map layer using GDAL.</help>
 	      <keywords>raster,import</keywords>
 	      <handler>OnImportGdalLayers</handler>
+	      <command>r.in.gdal</command>
 	    </menuitem>
 	    <separator />
 	    <menuitem>
@@ -186,15 +187,14 @@
 	    <menuitem>
 	      <label>WMS import</label>
 	      <help>Download and import data from WMS servers.</help>
-	      <keywords>raster,import,wms</keywords>
-	      <handler>OnImportWMS</handler>
+	      <keywords>raster,import,wms</keywords><handler>OnImportWMS</handler>
+	      <command>r.in.wms</command>
 	    </menuitem>
 	    <separator />
 	    <menuitem>
 	      <label>Unpack raster map</label>
 	      <help>Unpacks a raster map packed with r.pack.</help>
-	      <keywords>raster,import,copying</keywords>
-	      <handler>OnMenuCmd</handler>
+	      <keywords>raster,import,copying</keywords><handler>OnMenuCmd</handler>
 	      <command>r.unpack</command>
 	    </menuitem>
 	  </items>
@@ -207,6 +207,7 @@
 	      <help>Converts vector layers into a GRASS vector map using OGR.</help>
 	      <keywords>vector,import</keywords>
 	      <handler>OnImportOgrLayers</handler>
+	      <command>v.in.ogr</command>
 	    </menuitem>
 	    <separator />
 	    <menuitem>
@@ -243,6 +244,7 @@
 	      <help>Converts files in DXF format to GRASS vector map format.</help>
 	      <keywords>vector,import,dxf</keywords>
 	      <handler>OnImportDxfFile</handler>
+	      <command>v.in.dxf</command>
 	    </menuitem>
 	    <separator />
 	    <menuitem>
@@ -445,8 +447,7 @@
 	    <menuitem>
 	      <label>Pack raster map</label>
 	      <help>Packs up a raster map and support files for copying.</help>
-	      <keywords>raster,export,copying</keywords>
-	      <handler>OnMenuCmd</handler>
+	      <keywords>raster,export,copying</keywords><handler>OnMenuCmd</handler>
 	      <command>r.pack</command>
 	    </menuitem>
 	  </items>
@@ -560,6 +561,7 @@
 	      <help>Creates a new pseudo-vector map as a link to an OGR-supported layer.</help>
 	      <keywords>vector,import,input,external,OGR,PostGIS</keywords>
               <handler>OnLinkOgrLayers</handler>
+	      <command>v.external</command>
 	    </menuitem>
 	    <separator />
 	    <menuitem>
@@ -574,6 +576,7 @@
 	      <help>Defines vector output format utilizing OGR library.</help>
 	      <keywords>vector,export,output,external,OGR,PostGIS</keywords>
               <handler>OnVectorOutputFormat</handler>
+	      <command>v.external.out</command>
 	    </menuitem>
 	  </items>
 	</menu>
@@ -785,6 +788,7 @@
 	      <help>Set/unset access to other mapsets in current location</help>
 	      <keywords>general,settings,search path</keywords>
 	      <handler>OnMapsets</handler>
+	      <command>g.mapsets</command>
 	    </menuitem>
 	    <menuitem>
 	      <label>User access</label>
@@ -889,6 +893,7 @@
 	      <help>Installs new extension from GRASS AddOns SVN repository.</help>
 	      <keywords>general,installation,extensions</keywords>
 	      <handler>OnInstallExtension</handler>
+	      <command>g.extension</command>
 	    </menuitem>
 	    <menuitem>
 	      <label>Update installed extensions</label>
@@ -902,6 +907,7 @@
 	      <help>Removes installed GRASS AddOns extension.</help>
 	      <keywords>general,installation,extensions</keywords>
 	      <handler>OnUninstallExtension</handler>
+	      <command>g.extension</command>
 	    </menuitem>
 	<separator />
 	<menuitem>
@@ -1051,6 +1057,7 @@
 	      <help>Interactive management of raster color tables.</help>
 	      <keywords>raster,color table</keywords>
 	      <handler>RulesCmd</handler>
+	      <command>r.colors</command>
 	    </menuitem>
 	    <menuitem>
 	      <label>Export color table</label>
@@ -1162,6 +1169,7 @@
 	  <help>Raster map calculator.</help>
 	  <keywords>raster,algebra</keywords>
 	  <handler>OnMapCalculator</handler>
+	  <command>r.mapcalc</command>
 	</menuitem>
 	<menu>
 	  <label>Neighborhood analysis</label>
@@ -2086,6 +2094,7 @@
 	      <help>Toolset for cleaning topology of vector map.</help>
 	      <keywords>vector,topology</keywords>
 	      <handler>OnVectorCleaning</handler>
+	      <command>v.clean</command>
 	    </menuitem>
 	    <menuitem>
 	      <label>Smooth or simplify</label>
@@ -2642,6 +2651,7 @@
 	      <help>Creates, edits, and lists groups of imagery files.</help>
 	      <keywords>imagery,map management</keywords>
 	      <handler>OnEditImageryGroups</handler>
+	      <command>i.group</command>
 	    </menuitem>
 	    <menuitem>
 	      <label>Target group</label>