[GRASS-SVN] r45666 - in grass/branches/develbranch_6/gui/wxpython: . gui_modules xml

[svn_grass at osgeo.org]

Author: martinl
Date: 2011-03-14 16:12:29 -0700 (Mon, 14 Mar 2011)
New Revision: 45666

Modified:
   grass/branches/develbranch_6/gui/wxpython/gui_modules/menudata.py
   grass/branches/develbranch_6/gui/wxpython/wxgui.py
   grass/branches/develbranch_6/gui/wxpython/xml/menudata.xml
Log:
wxGUI: add OnPsMap handler for ps.map's GUI
      update menudata


Modified: grass/branches/develbranch_6/gui/wxpython/gui_modules/menudata.py
===================================================================
--- grass/branches/develbranch_6/gui/wxpython/gui_modules/menudata.py	2011-03-14 23:05:31 UTC (rev 45665)
+++ grass/branches/develbranch_6/gui/wxpython/gui_modules/menudata.py	2011-03-14 23:12:29 UTC (rev 45666)
@@ -19,7 +19,7 @@
  - commands
  - dump
 
-(C) 2007-2010 by the GRASS Development Team
+(C) 2007-2011 by the GRASS Development Team
 This program is free software under the GNU General Public License
 (>=v2). Read the file COPYING that comes with GRASS for details.
 

Modified: grass/branches/develbranch_6/gui/wxpython/wxgui.py
===================================================================
--- grass/branches/develbranch_6/gui/wxpython/wxgui.py	2011-03-14 23:05:31 UTC (rev 45665)
+++ grass/branches/develbranch_6/gui/wxpython/wxgui.py	2011-03-14 23:12:29 UTC (rev 45666)
@@ -264,6 +264,22 @@
         
         win.Show()
         
+    def OnPsMap(self, event):
+        """!Launch Hardcopy Map Output Utility
+        """
+        try:
+            import psmap
+        except:
+            gcmd.GError(parent = self.parent,
+                        message = _("Hardcopy Map Output Utility is not available. You can install it by "
+                                    "'g.extension -s svnurl=https://svn.osgeo.org/grass/grass-addons extension=psmap'"))
+            return
+        
+        win = psmap.PsMapFrame(parent = self)
+        win.CentreOnScreen()
+        
+        win.Show()
+        
     def OnDone(self, returncode):
         """Command execution finised"""
         if hasattr(self, "model"):

Modified: grass/branches/develbranch_6/gui/wxpython/xml/menudata.xml
===================================================================
--- grass/branches/develbranch_6/gui/wxpython/xml/menudata.xml	2011-03-14 23:05:31 UTC (rev 45665)
+++ grass/branches/develbranch_6/gui/wxpython/xml/menudata.xml	2011-03-14 23:12:29 UTC (rev 45666)
@@ -119,7 +119,7 @@
 	    <separator />
 	    <menuitem>
 	      <label>Binary file import</label>
-	      <help>Import a binary raster file into a GRASS raster map layer.</help>
+	      <help>Import a binary raster file into a GRASS raster map.</help>
 	      <keywords>raster,import</keywords>
 	      <handler>OnMenuCmd</handler>
 	      <command>r.in.bin</command>
@@ -356,8 +356,8 @@
 	    <separator />
 	    <menuitem>
 	      <label>Binary export</label>
-	      <help>Exports a GRASS raster to a binary array.</help>
-	      <keywords>raster</keywords>
+	      <help>Exports a GRASS raster map to a binary array.</help>
+	      <keywords>raster,export</keywords>
 	      <handler>OnMenuCmd</handler>
 	      <command>r.out.bin</command>
 	    </menuitem>
@@ -689,8 +689,15 @@
 	</menuitem>
 	<separator />
 	<menuitem>
+	  <label>Hardcopy Map Output Utility</label>
+	  <help>Launch Hardcopy Map Output Utility</help>
+	  <keywords>postscript,map,printing</keywords>
+	  <handler>OnPsMap</handler>
+	  <command>ps.map</command>
+	</menuitem>
+	<menuitem>
 	  <label>Postscript plot</label>
-	  <help>Hardcopy PostScript map output utility.</help>
+	  <help>Produces hardcopy PostScript map output.</help>
 	  <keywords>postscript,map,printing</keywords>
 	  <handler>OnMenuCmd</handler>
 	  <command>ps.map</command>
@@ -771,14 +778,14 @@
 	    <menuitem>
 	      <label>Show settings</label>
 	      <help>Outputs and modifies the user's current GRASS variable settings.</help>
-	      <keywords>general</keywords>
+	      <keywords>general,settings</keywords>
               <handler>RunMenuCmd</handler>
 	      <command>g.gisenv -n</command>
 	    </menuitem>
 	    <menuitem>
 	      <label>Change settings</label>
 	      <help>Outputs and modifies the user's current GRASS variable settings.</help>
-	      <keywords>general</keywords>
+	      <keywords>general,settings</keywords>
               <handler>OnMenuCmd</handler>
 	      <command>g.gisenv</command>
 	    </menuitem>
@@ -793,7 +800,7 @@
 	    <menuitem>
 	      <label>Version</label>
 	      <help>Displays version and copyright information.</help>
-	      <keywords>general</keywords>
+	      <keywords>general,version</keywords>
               <handler>RunMenuCmd</handler>
 	      <command>g.version -c</command>
 	    </menuitem>
@@ -1599,7 +1606,7 @@
 	    <separator />
 	    <menuitem>
 	      <label>Gaussian kernel density surface</label>
-	      <help>Generates a raster density map from vector points data using a moving 2D isotropic Gaussian kernel or optionally generates a vector density map on vector network with a 1D kernel.</help>
+	      <help>Generates a raster density map from vector point data using a moving kernel or optionally generates a vector density map on a vector network.</help>
 	      <keywords>vector,kernel density</keywords>
 	      <handler>OnMenuCmd</handler>
 	      <command>v.kernel</command>