[GRASS-SVN] r39927 - grass/trunk/gui/wxpython/gui_modules

[svn_grass at osgeo.org]

Author: martinl
Date: 2009-12-06 15:59:03 -0500 (Sun, 06 Dec 2009)
New Revision: 39927

Modified:
   grass/trunk/gui/wxpython/gui_modules/help.py
Log:
fix bug introduced in r39922 - menu items are not grass commands,
eval() required
       (merge r39925 from devbr6)


Modified: grass/trunk/gui/wxpython/gui_modules/help.py
===================================================================
--- grass/trunk/gui/wxpython/gui_modules/help.py	2009-12-06 20:51:28 UTC (rev 39926)
+++ grass/trunk/gui/wxpython/gui_modules/help.py	2009-12-06 20:59:03 UTC (rev 39927)
@@ -65,7 +65,7 @@
 
         self.panel = wx.Panel(parent = self, id = wx.ID_ANY)
         self.dataBox = wx.StaticBox(parent = self.panel, id = wx.ID_ANY,
-                               label=" %s " % _("Menu tree (double-click to run command)"))        
+                                    label=" %s " % _("Menu tree (double-click to run command)"))        
         # tree
         self.tree = MenuTree(parent = self.panel, data = menudata.Data())
         self.tree.Load()
@@ -116,9 +116,6 @@
         sizer = wx.BoxSizer(wx.VERTICAL)
         
         # body
-#        dataBox = wx.StaticBox(parent = self.panel, id = wx.ID_ANY,
-#                               label=" %s " % _("Menu tree (double-click to run command)"))
-        
         dataSizer = wx.StaticBoxSizer(self.dataBox, wx.HORIZONTAL)
         dataSizer.Add(item = self.tree, proportion =1,
                       flag = wx.EXPAND)
@@ -177,14 +174,15 @@
             return
 
         handler = 'self.parent.' + data['handler'].lstrip('self.')
-        print 'handler = '+data['handler']
         if data['handler'] == 'self.OnXTerm':
-            wx.MessageBox('You must run this command from the menu or command line',
-                          'This command require an XTerm')
+            wx.MessageBox(parent = self,
+                          message = _('You must run this command from the menu or command line',
+                                      'This command require an XTerm'),
+                          caption = _('Message'), style=wx.OK | wx.ICON_ERROR | wx.CENTRE)
         elif data['command']:
-            self.parent.goutput.RunCmd(data['command'], switchPage = True)
+            eval(handler)(event = None, cmd = data['command'].split())
         else:
-            pass
+            eval(handler)(None)
         
         if self.closeOnRun.IsChecked():
             self.OnCloseWindow(None)