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

[svn_grass at osgeo.org]

Author: martinl
Date: 2010-01-05 17:40:27 -0500 (Tue, 05 Jan 2010)
New Revision: 40264

Modified:
   grass/branches/develbranch_6/gui/wxpython/gui_modules/goutput.py
   grass/branches/develbranch_6/gui/wxpython/gui_modules/menuform.py
   grass/branches/develbranch_6/gui/wxpython/wxgui.py
Log:
wxGUI: fix sash position (tested on Linux/Windows)
       (merge r40263 from trunk)


Modified: grass/branches/develbranch_6/gui/wxpython/gui_modules/goutput.py
===================================================================
--- grass/branches/develbranch_6/gui/wxpython/gui_modules/goutput.py	2010-01-05 22:36:56 UTC (rev 40263)
+++ grass/branches/develbranch_6/gui/wxpython/gui_modules/goutput.py	2010-01-05 22:40:27 UTC (rev 40264)
@@ -282,10 +282,9 @@
         # split window
         if self.parent.GetName() == 'LayerManager':
             self.SplitHorizontally(self.panelOutput, self.panelPrompt, -75)
-            self.SetMinimumPaneSize(100)
         else:
             self.SplitHorizontally(self.panelOutput, self.panelPrompt, -10)
-            self.SetMinimumPaneSize(45)
+        self.SetMinimumPaneSize(35)
         self.Fit()
         
         # layout

Modified: grass/branches/develbranch_6/gui/wxpython/gui_modules/menuform.py
===================================================================
--- grass/branches/develbranch_6/gui/wxpython/gui_modules/menuform.py	2010-01-05 22:36:56 UTC (rev 40263)
+++ grass/branches/develbranch_6/gui/wxpython/gui_modules/menuform.py	2010-01-05 22:40:27 UTC (rev 40264)
@@ -805,6 +805,9 @@
         if width > 640: width = 640
         if height > 480: height = 480
         self.SetSize((width,height))
+        
+        # fix goutput's pane size
+        self.goutput.SetSashPosition(int(self.GetSize()[1] * .75))
 
     def updateValuesHook(self):
         """!Update status bar data"""

Modified: grass/branches/develbranch_6/gui/wxpython/wxgui.py
===================================================================
--- grass/branches/develbranch_6/gui/wxpython/wxgui.py	2010-01-05 22:36:56 UTC (rev 40263)
+++ grass/branches/develbranch_6/gui/wxpython/wxgui.py	2010-01-05 22:40:27 UTC (rev 40264)
@@ -179,9 +179,11 @@
         # -> OnSize() -> UpdateMap()
         if self.curr_page and not self.curr_page.maptree.mapdisplay.IsShown():
             self.curr_page.maptree.mapdisplay.Show()
-
+        
         # redirect stderr to log area    
         self.goutput.Redirect()
+        # fix goutput's pane size
+        self.goutput.SetSashPosition(int(self.GetSize()[1] * .45))
         
         # start with layer manager on top
         self.curr_page.maptree.mapdisplay.Raise()