[GRASS-SVN] r42258 - in grass/trunk/gui/wxpython: . gui_modules

[svn_grass at osgeo.org]

Author: martinl
Date: 2010-05-15 08:05:19 -0400 (Sat, 15 May 2010)
New Revision: 42258

Modified:
   grass/trunk/gui/wxpython/gis_set.py
   grass/trunk/gui/wxpython/gui_modules/ghelp.py
   grass/trunk/gui/wxpython/gui_modules/menuform.py
Log:
wxGUI: class names sychronized (Help*)


Modified: grass/trunk/gui/wxpython/gis_set.py
===================================================================
--- grass/trunk/gui/wxpython/gis_set.py	2010-05-15 11:57:10 UTC (rev 42257)
+++ grass/trunk/gui/wxpython/gis_set.py	2010-05-15 12:05:19 UTC (rev 42258)
@@ -35,7 +35,7 @@
     globalvar.CheckForWx()
 
 import gui_modules.goutput
-from gui_modules.ghelp import HelpWindow
+from gui_modules.ghelp import HelpFrame
 from gui_modules.gcmd  import GMessage
 
 import wx
@@ -756,10 +756,10 @@
         # help text in lib/init/helptext.html
         file=os.path.join(self.gisbase, "docs", "html", "helptext.html")
 
-        helpFrame = HelpWindow(parent=self, id=wx.ID_ANY,
-                               title=_("GRASS Quickstart"),
-                               size=(640, 480),
-                               file=file)
+        helpFrame = HelpFrame(parent=self, id=wx.ID_ANY,
+                              title=_("GRASS Quickstart"),
+                              size=(640, 480),
+                              file=file)
         helpFrame.Show(True)
 
         event.Skip()

Modified: grass/trunk/gui/wxpython/gui_modules/ghelp.py
===================================================================
--- grass/trunk/gui/wxpython/gui_modules/ghelp.py	2010-05-15 11:57:10 UTC (rev 42257)
+++ grass/trunk/gui/wxpython/gui_modules/ghelp.py	2010-05-15 12:05:19 UTC (rev 42258)
@@ -4,7 +4,6 @@
 @brief Help window
 
 Classes:
- - HelpWindow
  - SearchModuleWindow
  - ItemTree
  - MenuTreeWindow
@@ -12,8 +11,9 @@
  - AboutWindow
  - InstallExtensionWindow
  - ExtensionTree
- - ManualWindow
- - ManualPanel
+ - HelpFrame
+ - HelpWindow
+ - HelpPanel
 
 (C) 2008-2010 by the GRASS Development Team
 This program is free software under the GNU General Public License
@@ -39,7 +39,7 @@
 import globalvar
 import gdialogs
 
-class HelpWindow(wx.Frame):
+class HelpFrame(wx.Frame):
     """!GRASS Quickstart help window"""
     def __init__(self, parent, id, title, size, file):
         wx.Frame.__init__(self, parent=parent, id=id, title=title, size=size)
@@ -47,7 +47,7 @@
         sizer = wx.BoxSizer(wx.VERTICAL)
         
         # text
-        content = ManualPanel(parent = self)
+        content = HelpPanel(parent = self)
         content.LoadPage(file)
         
         sizer.Add(item = content, proportion=1, flag=wx.EXPAND)
@@ -1007,7 +1007,7 @@
         """Check if items are loaded"""
         return self._loaded
 
-class ManualWindow(wx.html.HtmlWindow):
+class HelpWindow(wx.html.HtmlWindow):
     """!This panel holds the text from GRASS docs.
     
     GISBASE must be set in the environment to find the html docs dir.
@@ -1063,7 +1063,7 @@
         self.historyIdx += 1
         self.parent.OnHistory()
         
-        super(ManualWindow, self).OnLinkClicked(linkinfo)
+        super(HelpWindow, self).OnLinkClicked(linkinfo)
         
     def fillContentsFromFile(self, htmlFile, skip_description=True):
         """!Load content from file"""
@@ -1097,14 +1097,14 @@
         except: # The Manual file was not found
             self.loaded = False
         
-class ManualPanel(wx.Panel):
+class HelpPanel(wx.Panel):
     def __init__(self, parent, grass_command = "index", text = None,
                  skip_description = False, **kwargs):
         self.grass_command = grass_command
         wx.Panel.__init__(self, parent = parent, id = wx.ID_ANY)
         
-        self.content = ManualWindow(self, grass_command, text,
-                                    skip_description)
+        self.content = HelpWindow(self, grass_command, text,
+                                  skip_description)
         
         self.btnNext = wx.Button(parent = self, id = wx.ID_ANY,
                                  label = _("&Next"))

Modified: grass/trunk/gui/wxpython/gui_modules/menuform.py
===================================================================
--- grass/trunk/gui/wxpython/gui_modules/menuform.py	2010-05-15 11:57:10 UTC (rev 42257)
+++ grass/trunk/gui/wxpython/gui_modules/menuform.py	2010-05-15 12:05:19 UTC (rev 42258)
@@ -84,7 +84,7 @@
     import elementtree.ElementTree as etree # Python <= 2.4
 
 import gdialogs
-from ghelp import ManualPanel
+from ghelp import HelpPanel
 
 gisbase = os.getenv("GISBASE")
 if gisbase is None:
@@ -1034,7 +1034,7 @@
             self.goutput = None
             self.goutputId = -1
         
-        self.manual_tab = ManualPanel(parent = self, grass_command = self.task.name)
+        self.manual_tab = HelpPanel(parent = self, grass_command = self.task.name)
         if not self.manual_tab.IsFile():
             self.manual_tab.Hide()
         else: