[GRASS-SVN] r37629 - in grass/branches/develbranch_6/gui/wxpython: . gui_modules

[svn_grass at osgeo.org]

Author: martinl
Date: 2009-05-30 12:35:35 -0400 (Sat, 30 May 2009)
New Revision: 37629

Modified:
   grass/branches/develbranch_6/gui/wxpython/gui_modules/prompt.py
   grass/branches/develbranch_6/gui/wxpython/wxgui.py
Log:
wxGUI: layout cosmetics
       (merge from trunk, r37628)


Modified: grass/branches/develbranch_6/gui/wxpython/gui_modules/prompt.py
===================================================================
--- grass/branches/develbranch_6/gui/wxpython/gui_modules/prompt.py	2009-05-30 16:34:11 UTC (rev 37628)
+++ grass/branches/develbranch_6/gui/wxpython/gui_modules/prompt.py	2009-05-30 16:35:35 UTC (rev 37629)
@@ -55,12 +55,13 @@
         self.searchBy = wx.Choice(parent = cmdprompt, id = wx.ID_ANY,
                              choices = [_("description"),
                                         _("keywords")])
-        
+        winHeight = self.searchBy.GetSize()[1]
+
         self.search = wx.TextCtrl(parent = cmdprompt, id = wx.ID_ANY,
                              value = "", size = (-1, 25))
         
         label = wx.Button(parent = cmdprompt, id = wx.ID_ANY,
-                          label = _("Cmd >"), size = (-1, 25))
+                          label = _("Cmd >"), size = (-1, winHeight))
         label.SetToolTipString(_("Click for erasing command prompt"))
 
         ### todo: fix TextCtrlAutoComplete to work also on Macs
@@ -69,7 +70,7 @@
             cmdinput = TextCtrlAutoComplete(parent = cmdprompt, id = wx.ID_ANY,
                                             value = "",
                                             style = wx.TE_LINEWRAP | wx.TE_PROCESS_ENTER,
-                                            size = (-1, 25))
+                                            size = (-1, winHeight))
         except NotImplementedError:
             # wx.PopupWindow may be not available in wxMac
             # see http://trac.wxwidgets.org/ticket/9377

Modified: grass/branches/develbranch_6/gui/wxpython/wxgui.py
===================================================================
--- grass/branches/develbranch_6/gui/wxpython/wxgui.py	2009-05-30 16:34:11 UTC (rev 37628)
+++ grass/branches/develbranch_6/gui/wxpython/wxgui.py	2009-05-30 16:35:35 UTC (rev 37629)
@@ -146,7 +146,7 @@
                              Left().CentrePane().BestSize((-1,-1)).Dockable(False).
                              CloseButton(False).DestroyOnClose(True).Row(1).Layer(0))
         self._auimgr.AddPane(self.cmdprompt, wx.aui.AuiPaneInfo().
-                             Bottom().BestSize((-1, 60)).Dockable(False).
+                             Bottom().BestSize((-1, 65)).Dockable(False).
                              CloseButton(False).DestroyOnClose(True).
                              PaneBorder(False).Row(1).Layer(0).Position(0).
                              CaptionVisible(False))