[GRASS-SVN] r42182 - grass/branches/develbranch_6/gui/wxpython/gui_modules

[svn_grass at osgeo.org]

Author: martinl
Date: 2010-05-09 07:58:24 -0400 (Sun, 09 May 2010)
New Revision: 42182

Modified:
   grass/branches/develbranch_6/gui/wxpython/gui_modules/help.py
Log:
wxGUI: message cosmetics
(merge r42181 from trunk)


Modified: grass/branches/develbranch_6/gui/wxpython/gui_modules/help.py
===================================================================
--- grass/branches/develbranch_6/gui/wxpython/gui_modules/help.py	2010-05-09 11:50:34 UTC (rev 42181)
+++ grass/branches/develbranch_6/gui/wxpython/gui_modules/help.py	2010-05-09 11:58:24 UTC (rev 42182)
@@ -109,7 +109,11 @@
         selection = self.searchBy.GetStringSelection()
         
         return self._searchDict[selection]
-    
+
+    def SetSelection(self, i):
+        """!Set selection element"""
+        self.searchBy.SetSelection(i)
+        
 class MenuTreeWindow(wx.Panel):
     """!Show menu tree"""
     def __init__(self, parent, id = wx.ID_ANY, **kwargs):
@@ -681,10 +685,11 @@
         self.repo = wx.TextCtrl(parent = self.panel, id = wx.ID_ANY,
                                 value = 'https://svn.osgeo.org/grass/grass-addons')
         self.fullDesc = wx.CheckBox(parent = self.panel, id=wx.ID_ANY,
-                                    label = _("Fetch full description (takes time)"))
+                                    label = _("Fetch full info including description and keywords (takes time)"))
         self.fullDesc.SetValue(False)
         
         self.search = SearchModuleWindow(parent = self.panel, showLabel = False)
+        self.search.SetSelection(2) 
         
         self.tree   = ExtensionTree(parent = self.panel, log = parent.GetLogWindow())
         
@@ -760,6 +765,10 @@
     def OnUpdateStatusBar(self, event):
         """!Update statusbar text"""
         element = self.search.GetSelection()
+        if not self.tree.IsLoaded():
+            self.SetStatusText(_("Fetch list of available extensions by clicking on 'Fetch' button"), 0)
+            return
+        
         self.tree.SearchItems(element = element,
                               value = event.GetString())
         
@@ -834,6 +843,7 @@
                        'raster', 'raster3D', 'sites', 'vector'):
             self.AppendItem(parentId = self.root,
                             text = prefix)
+        self._loaded = False
         
     def _expandPrefix(self, c):
         name = { 'd'  : 'display',
@@ -912,3 +922,8 @@
                 
                 self.SetPyData(new, data)
         
+        self._loaded = True
+
+    def IsLoaded(self):
+        """Check if items are loaded"""
+        return self._loaded