[GRASS-SVN] r32484 - grass/trunk/gui/wxpython/gui_modules

[svn_grass at osgeo.org]

Author: martinl
Date: 2008-08-03 06:19:31 -0400 (Sun, 03 Aug 2008)
New Revision: 32484

Modified:
   grass/trunk/gui/wxpython/gui_modules/goutput.py
   grass/trunk/gui/wxpython/gui_modules/menuform.py
Log:
wxGUI: switch to 'Command output' OnCmdOutput()

Modified: grass/trunk/gui/wxpython/gui_modules/goutput.py
===================================================================
--- grass/trunk/gui/wxpython/gui_modules/goutput.py	2008-08-03 10:13:34 UTC (rev 32483)
+++ grass/trunk/gui/wxpython/gui_modules/goutput.py	2008-08-03 10:19:31 UTC (rev 32484)
@@ -254,12 +254,6 @@
         except:
             curr_disp = None
 
-        # switch to 'Command output'
-        # if hasattr(self.parent, "curr_page"):
-            # change notebook page only for Layer Manager
-            # if self.parent.notebook.GetSelection() != 1:
-            # self.parent.notebook.SetSelection(1)
-        
         # command given as a string ?
         try:
             cmdlist = command.strip().split(' ')
@@ -375,6 +369,10 @@
         message = event.text
         type  = event.type
         
+        # switch to 'Command output'
+        if self.parent.notebook.GetSelection() != self.parent.goutput.pageid:
+            self.parent.notebook.SetSelection(self.parent.goutput.pageid)
+
         # message prefix
         if type == 'warning':
             messege = 'WARNING: ' + message

Modified: grass/trunk/gui/wxpython/gui_modules/menuform.py
===================================================================
--- grass/trunk/gui/wxpython/gui_modules/menuform.py	2008-08-03 10:13:34 UTC (rev 32483)
+++ grass/trunk/gui/wxpython/gui_modules/menuform.py	2008-08-03 10:19:31 UTC (rev 32484)
@@ -799,10 +799,6 @@
         if cmd == [] or cmd == None:
             return
 
-        # change page if needed
-        if self.notebookpanel.notebook.GetSelection() != self.notebookpanel.goutput.pageid:
-            self.notebookpanel.notebook.SetSelection(self.notebookpanel.goutput.pageid)
-
         if cmd[0][0:2] != "d.":
             # Send any non-display command to parent window (probably wxgui.py)
             # put to parents