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

[svn_grass at osgeo.org]

Author: martinl
Date: 2011-11-04 03:16:20 -0700 (Fri, 04 Nov 2011)
New Revision: 49089

Modified:
   grass/trunk/gui/wxpython/gui_modules/menuform.py
Log:
wxGUI: revert r49087
       1) to put "clear" button to the main button sizer is not good
       idea, the button is related only to command output, to show this
       button when other tabs are selected can be very confusing for
       the user
       2) unsplit causes that other buttons are not shown (eg. "Stop
       running command")


Modified: grass/trunk/gui/wxpython/gui_modules/menuform.py
===================================================================
--- grass/trunk/gui/wxpython/gui_modules/menuform.py	2011-11-04 06:07:45 UTC (rev 49088)
+++ grass/trunk/gui/wxpython/gui_modules/menuform.py	2011-11-04 10:16:20 UTC (rev 49089)
@@ -483,17 +483,11 @@
         self.btn_cancel.SetToolTipString(_("Close this window without executing the command (Ctrl+Q)"))
         btnsizer.Add(item = self.btn_cancel, proportion = 0, flag = wx.ALL | wx.ALIGN_CENTER, border = 10)
         self.btn_cancel.Bind(wx.EVT_BUTTON, self.OnCancel)
-
-        self.btnOutputClear = wx.Button(parent = self.panel, id = wx.ID_CLEAR)
-        self.btnOutputClear.SetToolTipString(_("Clear output window content"))
-        btnsizer.Add(item = self.btnOutputClear, proportion = 0, flag = wx.ALL | wx.ALIGN_CENTER, border = 10)
-        self.btnOutputClear.Bind(wx.EVT_BUTTON, self.goutput.ClearHistory)
-
         if self.get_dcmd is not None: # A callback has been set up
             btn_apply = wx.Button(parent = self.panel, id = wx.ID_APPLY)
             btn_ok = wx.Button(parent = self.panel, id = wx.ID_OK)
             btn_ok.SetDefault()
-
+            
             btnsizer.Add(item = btn_apply, proportion = 0,
                          flag = wx.ALL | wx.ALIGN_CENTER,
                          border = 10)
@@ -844,8 +838,6 @@
         ### add 'command output' tab regardless standalone dialog
         if self.parent.GetName() ==  "MainFrame" and self.parent.get_dcmd is None:
             self.goutput = goutput.GMConsole(parent = self, margin = False)
-            self.goutput.Unsplit()
-            self.outputBox = self.goutput.outputBox
             self.outpage = self.notebook.AddPage(page = self.goutput, text = _("Command output"), name = 'output')
         else:
             self.goutput = None