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

[svn_grass at osgeo.org]

Author: martinl
Date: 2011-08-19 02:35:52 -0700 (Fri, 19 Aug 2011)
New Revision: 47771

Modified:
   grass/branches/develbranch_6/gui/wxpython/gui_modules/psmap.py
   grass/branches/develbranch_6/gui/wxpython/xml/menudata.xml
   grass/branches/develbranch_6/gui/wxpython/xml/menudata_psmap.xml
Log:
wxGUI/psmap: show ps.map dialog, simplify LM menu


Modified: grass/branches/develbranch_6/gui/wxpython/gui_modules/psmap.py
===================================================================
--- grass/branches/develbranch_6/gui/wxpython/gui_modules/psmap.py	2011-08-19 09:28:14 UTC (rev 47770)
+++ grass/branches/develbranch_6/gui/wxpython/gui_modules/psmap.py	2011-08-19 09:35:52 UTC (rev 47771)
@@ -40,6 +40,7 @@
 from   toolbars   import PsMapToolbar
 from   icon       import Icons, MetaIcon, iconSet
 from   gcmd       import RunCommand, GError, GMessage
+from   menuform   import GUI
 from psmap_dialogs import *
 
 import wx
@@ -210,7 +211,11 @@
         if filename:
             self.PSFile(filename)
     
-    
+    def OnPsMapDialog(self, event):
+        """!Launch ps.map dialog
+        """
+        GUI(parent = self).ParseCommand(cmd = ['ps.map'])
+        
     def OnPDFFile(self, event):
         """!Generate PDF from PS with ps2pdf if available"""
         try:

Modified: grass/branches/develbranch_6/gui/wxpython/xml/menudata.xml
===================================================================
--- grass/branches/develbranch_6/gui/wxpython/xml/menudata.xml	2011-08-19 09:28:14 UTC (rev 47770)
+++ grass/branches/develbranch_6/gui/wxpython/xml/menudata.xml	2011-08-19 09:35:52 UTC (rev 47771)
@@ -694,13 +694,6 @@
 	  <handler>OnPsMap</handler>
 	  <command>ps.map</command>
 	</menuitem>
-	<menuitem>
-	  <label>Postscript plot</label>
-	  <help>Produces hardcopy PostScript map output.</help>
-	  <keywords>postscript,map,printing</keywords>
-	  <handler>OnMenuCmd</handler>
-	  <command>ps.map</command>
-	</menuitem>
 	<separator />
 	<menuitem>
 	  <label>Launch script</label>

Modified: grass/branches/develbranch_6/gui/wxpython/xml/menudata_psmap.xml
===================================================================
--- grass/branches/develbranch_6/gui/wxpython/xml/menudata_psmap.xml	2011-08-19 09:28:14 UTC (rev 47770)
+++ grass/branches/develbranch_6/gui/wxpython/xml/menudata_psmap.xml	2011-08-19 09:35:52 UTC (rev 47771)
@@ -36,6 +36,12 @@
 	</menuitem>
 	<separator/>
 	<menuitem>
+	  <label>Launch ps.map dialog</label>
+	  <help>Launch ps.map dialog</help>
+	  <handler>OnPsMapDialog</handler>
+	</menuitem>
+	<separator/>
+	<menuitem>
 	  <label>Quit</label>
 	  <help>Close Hardcopy Map Output Utility</help>
 	  <handler>OnCloseWindow</handler>