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

svn_grass at osgeo.org svn_grass at osgeo.org
Sat Dec 19 14:14:09 EST 2009


Author: martinl
Date: 2009-12-19 14:14:09 -0500 (Sat, 19 Dec 2009)
New Revision: 40073

Modified:
   grass/branches/develbranch_6/gui/wxpython/gui_modules/goutput.py
Log:
wxGUI: include prompt only in Layer Manager


Modified: grass/branches/develbranch_6/gui/wxpython/gui_modules/goutput.py
===================================================================
--- grass/branches/develbranch_6/gui/wxpython/gui_modules/goutput.py	2009-12-19 19:05:04 UTC (rev 40072)
+++ grass/branches/develbranch_6/gui/wxpython/gui_modules/goutput.py	2009-12-19 19:14:09 UTC (rev 40073)
@@ -1,4 +1,4 @@
-"""
+"""!
 @package goutput
 
 @brief Command output log widget
@@ -9,7 +9,7 @@
  - GMStdout
  - GMStderr
 
-(C) 2007-2008 by the GRASS Development Team
+(C) 2007-2009 by the GRASS Development Team
 This program is free software under the GNU General Public
 License (>=v2). Read the file COPYING that comes with GRASS
 for details.
@@ -182,12 +182,13 @@
         self.Bind(EVT_CMD_RUN, self.OnCmdRun)
         self.Bind(EVT_CMD_DONE, self.OnCmdDone)
         
+        if self.parent.GetName() == 'LayerManager':
+            #
+            # command prompt
+            #
+            self.cmd_prompt = prompt.GPromptSTC(self, id=wx.ID_ANY)
+        
         #
-        # command prompt
-        #
-        self.cmd_prompt = prompt.GPromptSTC(self, id=wx.ID_ANY)
-
-        #
         # stream redirection
         #
         self.cmd_stdout = GMStdout(self)
@@ -203,11 +204,15 @@
         #
         self.console_clear = wx.Button(parent = self, id = wx.ID_ANY,
                                        label = _("Clear output"), size=(125,-1))
-        self.cmd_clear = wx.Button(parent = self, id = wx.ID_ANY,
-                                   label = _("Clear command"), size=(125,-1))
+        
+        if self.parent.GetName() == 'LayerManager':
+            self.cmd_clear = wx.Button(parent = self, id = wx.ID_ANY,
+                                       label = _("Clear command"), size=(125,-1))
+            self.Bind(wx.EVT_BUTTON, self.cmd_prompt.OnCmdErase, self.cmd_clear)
+            
         self.console_save  = wx.Button(parent = self, id = wx.ID_ANY,
                                        label = _("Save output"), size=(125,-1))
-        self.Bind(wx.EVT_BUTTON, self.cmd_prompt.OnCmdErase, self.cmd_clear)
+        
         self.Bind(wx.EVT_BUTTON, self.ClearHistory, self.console_clear)
         self.Bind(wx.EVT_BUTTON, self.SaveHistory,  self.console_save)
 
@@ -222,15 +227,17 @@
         
         boxsizer1.Add(item=self.cmd_output, proportion=1,
                       flag=wx.EXPAND | wx.ALIGN_BOTTOM, border=0)
-        boxsizer1.Add(item=self.cmd_prompt, proportion=0,
-                      flag=wx.EXPAND | wx.FIXED_MINSIZE | wx.ALIGN_BOTTOM, border=0)
+        if self.parent.GetName() == 'LayerManager':
+            boxsizer1.Add(item=self.cmd_prompt, proportion=0,
+                          flag=wx.EXPAND | wx.FIXED_MINSIZE | wx.ALIGN_BOTTOM, border=0)
                                             
         gridsizer1.Add(item=self.console_clear, proportion=0,
                        flag=wx.ALIGN_CENTER_HORIZONTAL | wx.FIXED_MINSIZE, border=0)
         gridsizer1.Add(item=self.console_save, proportion=0,
                        flag=wx.ALIGN_CENTER_HORIZONTAL | wx.FIXED_MINSIZE, border=0)
-        gridsizer1.Add(item=self.cmd_clear, proportion=0,
-                       flag=wx.ALIGN_CENTER_HORIZONTAL | wx.FIXED_MINSIZE, border=0)
+        if self.parent.GetName() == 'LayerManager':
+            gridsizer1.Add(item=self.cmd_clear, proportion=0,
+                           flag=wx.ALIGN_CENTER_HORIZONTAL | wx.FIXED_MINSIZE, border=0)
         gridsizer1.Add(item=self.btn_abort, proportion=0,
                        flag=wx.ALIGN_CENTER_HORIZONTAL | wx.FIXED_MINSIZE, border=0)
         boxsizer1.Add(item=gridsizer1, proportion=0,



More information about the grass-commit mailing list