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

[svn_grass at osgeo.org]

Author: martinl
Date: 2011-09-05 09:43:56 -0700 (Mon, 05 Sep 2011)
New Revision: 48139

Modified:
   grass/branches/develbranch_6/gui/wxpython/gui_modules/ghelp.py
   grass/branches/develbranch_6/gui/wxpython/gui_modules/gmodeler.py
Log:
wxGUI/modeler: define focus for ModelSearchDialog
	       (merge r48138 from trunk)


Modified: grass/branches/develbranch_6/gui/wxpython/gui_modules/ghelp.py
===================================================================
--- grass/branches/develbranch_6/gui/wxpython/gui_modules/ghelp.py	2011-09-05 16:42:29 UTC (rev 48138)
+++ grass/branches/develbranch_6/gui/wxpython/gui_modules/ghelp.py	2011-09-05 16:43:56 UTC (rev 48139)
@@ -206,6 +206,8 @@
         """!Reset widget"""
         self.searchBy.SetSelection(0)
         self.search.SetValue('')
+        if self.showTip:
+            self.searchTip.SetLabel('')
         
 class MenuTreeWindow(wx.Panel):
     """!Show menu tree"""

Modified: grass/branches/develbranch_6/gui/wxpython/gui_modules/gmodeler.py
===================================================================
--- grass/branches/develbranch_6/gui/wxpython/gui_modules/gmodeler.py	2011-09-05 16:42:29 UTC (rev 48138)
+++ grass/branches/develbranch_6/gui/wxpython/gui_modules/gmodeler.py	2011-09-05 16:43:56 UTC (rev 48139)
@@ -2488,6 +2488,7 @@
         self.search.Reset()
         self.cmd_prompt.OnCmdErase(None)
         self.btnOk.Enable(False)
+        self.cmd_prompt.SetFocus()
 
 class ModelRelation(ogl.LineShape):
     """!Data - action relation"""