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

[svn_grass at osgeo.org]

Author: martinl
Date: 2010-11-23 06:19:59 -0800 (Tue, 23 Nov 2010)
New Revision: 44389

Modified:
   grass/branches/develbranch_6/gui/wxpython/gui_modules/mcalc_builder.py
Log:
wxGUI: cosmetics in mcalc


Modified: grass/branches/develbranch_6/gui/wxpython/gui_modules/mcalc_builder.py
===================================================================
--- grass/branches/develbranch_6/gui/wxpython/gui_modules/mcalc_builder.py	2010-11-23 14:04:24 UTC (rev 44388)
+++ grass/branches/develbranch_6/gui/wxpython/gui_modules/mcalc_builder.py	2010-11-23 14:19:59 UTC (rev 44389)
@@ -131,7 +131,7 @@
         #
         # Buttons
         #
-        self.btn_clear = wx.Button(parent = self.panel, id = wx.ID_CLEAR)
+        self.btn_clear = wx.Button(parent = self.panel, id = wx.ID_CLEAR, label = _("Cl&ear"))
         self.btn_help = wx.Button(parent = self.panel, id = wx.ID_HELP)
         self.btn_run = wx.Button(parent = self.panel, id = wx.ID_ANY, label = _("&Run"))
         self.btn_run.SetDefault()
@@ -307,7 +307,7 @@
                          flag = wx.ALL, border = 5)
         buttonSizer4.Add(item = self.btn_save,
                          flag = wx.ALL, border = 5)                         
-        buttonSizer4.AddSpacer(10)
+        buttonSizer4.AddSpacer(30)
         buttonSizer4.Add(item = self.btn_help,
                          flag = wx.ALL, border = 5)
         buttonSizer4.Add(item = self.btn_run,
@@ -338,12 +338,12 @@
         sizer.Add(item = expressSizer, proportion = 1,
                   flag = wx.EXPAND | wx.LEFT | wx.RIGHT,
                   border = 5)
+        sizer.Add(item = buttonSizer4, proportion = 0,
+                  flag = wx.ALIGN_RIGHT | wx.ALL, border = 3)
         if self.addbox.IsShown():
             sizer.Add(item = self.addbox, proportion = 0,
-                      flag = wx.EXPAND | wx.LEFT | wx.TOP | wx.RIGHT,
+                      flag = wx.LEFT | wx.RIGHT,
                       border = 5)
-        sizer.Add(item = buttonSizer4, proportion = 0,
-                  flag = wx.ALIGN_RIGHT | wx.ALL, border = 1)
         
         self.panel.SetAutoLayout(True)
         self.panel.SetSizer(sizer)
@@ -390,8 +390,8 @@
 
     def OnUpdateStatusBar(self, event):
         """!Update statusbar text"""
-        self.SetStatusText("r.mapcalc ' %s = %s'" % (self.newmaptxt.GetValue(),
-                                                     self.text_mcalc.GetValue()))
+        self.SetStatusText("r.mapcalc '%s = %s'" % (self.newmaptxt.GetValue(),
+                                                    self.text_mcalc.GetValue()))
         event.Skip()
         
     def _addSomething(self, what):