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

[svn_grass at osgeo.org]

Author: martinl
Date: 2009-05-24 11:10:06 -0400 (Sun, 24 May 2009)
New Revision: 37427

Modified:
   grass/branches/develbranch_6/gui/wxpython/gui_modules/goutput.py
   grass/branches/develbranch_6/gui/wxpython/gui_modules/prompt.py
Log:
wxGUI/prompt: minor fixes
	      (merge from trunk, r37426)


Modified: grass/branches/develbranch_6/gui/wxpython/gui_modules/goutput.py
===================================================================
--- grass/branches/develbranch_6/gui/wxpython/gui_modules/goutput.py	2009-05-24 15:08:20 UTC (rev 37426)
+++ grass/branches/develbranch_6/gui/wxpython/gui_modules/goutput.py	2009-05-24 15:10:06 UTC (rev 37427)
@@ -101,9 +101,10 @@
                               time = requestTime,
                               pid = requestId,
                               onDone = onDone)
+
+            # send event
+            wx.PostEvent(self.parent, event)
             
-            wx.PostEvent(self.parent, event)
-
     def abort(self):
         self.requestCmd.abort()
     
@@ -517,8 +518,11 @@
 
         self.cmd_output_timer.Stop()
 
-        # updated command dialog
-        if hasattr(self.parent.parent, "btn_run"):
+        # set focus on prompt
+        if self.parent.GetName() == "LayerManager":
+            self.parent.cmdinput.SetFocus()
+        else:
+            # updated command dialog
             dialog = self.parent.parent
 
             if hasattr(self.parent.parent, "btn_abort"):

Modified: grass/branches/develbranch_6/gui/wxpython/gui_modules/prompt.py
===================================================================
--- grass/branches/develbranch_6/gui/wxpython/gui_modules/prompt.py	2009-05-24 15:08:20 UTC (rev 37426)
+++ grass/branches/develbranch_6/gui/wxpython/gui_modules/prompt.py	2009-05-24 15:10:06 UTC (rev 37427)
@@ -397,7 +397,13 @@
             self.dropdownlistbox.Select(self.dropdownlistbox.GetFirstSelected(), False)
             if self._hideOnNoMatch:
                 self._showDropDown(False)
-        
+            
+            if self._module and cmd[-1][-2] == '=':
+                optType = self._module.get_param(cmd[-1][:-2])['prompt']
+                if optType in ('raster', 'vector'):
+                    # -> raster/vector map
+                    self.SetChoices(self._choicesMap[optType], optType)
+                                            
         self._listItemVisible()
         
         event.Skip()