[GRASS-SVN] r52954 - in grass/branches/develbranch_6/gui/wxpython: . location_wizard

[svn_grass at osgeo.org]

Author: annakrat
Date: 2012-08-28 05:55:34 -0700 (Tue, 28 Aug 2012)
New Revision: 52954

Modified:
   grass/branches/develbranch_6/gui/wxpython/gis_set.py
   grass/branches/develbranch_6/gui/wxpython/location_wizard/wizard.py
Log:
wxGUI/locationWizard: use python webbrowser module instead of g.manual which blocks application (merge from releasebranch, r52953)

Modified: grass/branches/develbranch_6/gui/wxpython/gis_set.py
===================================================================
--- grass/branches/develbranch_6/gui/wxpython/gis_set.py	2012-08-28 12:49:25 UTC (rev 52953)
+++ grass/branches/develbranch_6/gui/wxpython/gis_set.py	2012-08-28 12:55:34 UTC (rev 52954)
@@ -869,16 +869,10 @@
     def OnHelp(self, event):
         """'Help' button clicked"""
         # help text in lib/init/helptext.html
-        file = os.path.join(self.gisbase, "docs", "html", "helptext.html")
+        filePath = os.path.join(self.gisbase, "docs", "html", "helptext.html")
+        import webbrowser
+        webbrowser.open(filePath)
 
-        helpFrame = HelpFrame(parent = None, id = wx.ID_ANY,
-                              title = _("GRASS Quickstart"),
-                              size = (640, 480),
-                              file = file)
-        helpFrame.Show(True)
-
-        event.Skip()
-
     def OnCloseWindow(self, event):
         """!Close window event"""
         event.Skip()

Modified: grass/branches/develbranch_6/gui/wxpython/location_wizard/wizard.py
===================================================================
--- grass/branches/develbranch_6/gui/wxpython/location_wizard/wizard.py	2012-08-28 12:49:25 UTC (rev 52953)
+++ grass/branches/develbranch_6/gui/wxpython/location_wizard/wizard.py	2012-08-28 12:55:34 UTC (rev 52954)
@@ -2052,15 +2052,11 @@
     def OnHelp(self, event):
         """'Help' button clicked"""
         # help text in lib/init/helptext.html
+        import webbrowser
         filePath = os.path.join(os.getenv('GISBASE'), "docs", "html", "helptext.html")
+        webbrowser.open(filePath)
 
-        helpFrame = HelpFrame(parent = None, id = wx.ID_ANY,
-                              title = _("GRASS Quickstart"),
-                              size = (640, 480),
-                              file = filePath)
-        helpFrame.Show(True)
 
-
 class WizardWithHelpButton(wiz.Wizard):
     def __init__(self, parent, id, title, bitmap):
         pre = wiz.PreWizard()