[GRASS-SVN] r52867 - in grass/trunk/gui/wxpython: . gui_core location_wizard

[svn_grass at osgeo.org]

Author: annakrat
Date: 2012-08-23 14:11:53 -0700 (Thu, 23 Aug 2012)
New Revision: 52867

Modified:
   grass/trunk/gui/wxpython/gis_set.py
   grass/trunk/gui/wxpython/gui_core/ghelp.py
   grass/trunk/gui/wxpython/location_wizard/wizard.py
Log:
wxGUI/locationWizard: help opens in web browser now (g.manual)

Modified: grass/trunk/gui/wxpython/gis_set.py
===================================================================
--- grass/trunk/gui/wxpython/gis_set.py	2012-08-23 20:40:44 UTC (rev 52866)
+++ grass/trunk/gui/wxpython/gis_set.py	2012-08-23 21:11:53 UTC (rev 52867)
@@ -878,17 +878,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")
+        RunCommand('g.manual', entry = 'helptext')
 
-        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/trunk/gui/wxpython/gui_core/ghelp.py
===================================================================
--- grass/trunk/gui/wxpython/gui_core/ghelp.py	2012-08-23 20:40:44 UTC (rev 52866)
+++ grass/trunk/gui/wxpython/gui_core/ghelp.py	2012-08-23 21:11:53 UTC (rev 52867)
@@ -880,6 +880,9 @@
     As a base class wx.Dialog is used, because of not working
     close button with wx.Frame when dialog is called from wizard.
     If parent is None, application TopLevelWindow is used (wxPython standard behaviour).
+
+    Currently not used (was in location wizard before)
+    due to unsolved problems - window sometimes does not respond.
     """
     def __init__(self, parent, id, title, size, file):
         wx.Dialog.__init__(self, parent = parent, id = id, title = title,

Modified: grass/trunk/gui/wxpython/location_wizard/wizard.py
===================================================================
--- grass/trunk/gui/wxpython/location_wizard/wizard.py	2012-08-23 20:40:44 UTC (rev 52866)
+++ grass/trunk/gui/wxpython/location_wizard/wizard.py	2012-08-23 21:11:53 UTC (rev 52867)
@@ -41,7 +41,6 @@
 from core                    import globalvar
 from core                    import utils
 from core.gcmd               import RunCommand, GError, GMessage, GWarning
-from gui_core.ghelp          import HelpFrame
 from location_wizard.base    import BaseClass
 from location_wizard.dialogs import SelectTransformDialog
 
@@ -2113,16 +2112,10 @@
 
     def OnHelp(self, event):
         """'Help' button clicked"""
+
         # help text in lib/init/helptext.html
-        filePath = os.path.join(os.getenv('GISBASE'), "docs", "html", "helptext.html")
+        RunCommand('g.manual', entry = 'helptext')
 
-        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()