Author: bugman Date: Wed Sep 15 19:17:37 2010 New Revision: 11562 URL: http://svn.gna.org/viewcvs/relax?rev=11562&view=rev Log: The global settings window is now behaves properly when resized. The central grid is now flexible and the second column of text inputs resizes with the window. Modified: branches/bieri_gui/gui_bieri/settings.py Modified: branches/bieri_gui/gui_bieri/settings.py URL: http://svn.gna.org/viewcvs/relax/branches/bieri_gui/gui_bieri/settings.py?rev=11562&r1=11561&r2=11562&view=diff ============================================================================== --- branches/bieri_gui/gui_bieri/settings.py (original) +++ branches/bieri_gui/gui_bieri/settings.py Wed Sep 15 19:17:37 2010 @@ -91,24 +91,25 @@ def __do_layout(self): # begin globalparam.__do_layout sizer_1_copy = wx.BoxSizer(wx.VERTICAL) - grid_sizer_1_copy = wx.GridSizer(8, 2, 0, 0) + grid_sizer_1_copy = wx.FlexGridSizer(8, 2, 0, 0) sizer_1_copy.Add(self.label_1_copy, 0, wx.ALL|wx.ALIGN_CENTER_HORIZONTAL, 5) sizer_1_copy.Add(self.bitmap_1_copy, 0, wx.ALL|wx.ALIGN_CENTER_HORIZONTAL, 5) - grid_sizer_1_copy.Add(self.label_2_copy, 0, wx.LEFT, 5) - grid_sizer_1_copy.Add(self.bond, 0, 0, 0) - grid_sizer_1_copy.Add(self.label_3_copy, 0, wx.LEFT, 5) - grid_sizer_1_copy.Add(self.csa, 0, 0, 0) - grid_sizer_1_copy.Add(self.label_5_copy, 0, wx.LEFT, 5) - grid_sizer_1_copy.Add(self.hetero, 0, 0, 0) - grid_sizer_1_copy.Add(self.label_6_copy, 0, wx.LEFT, 5) - grid_sizer_1_copy.Add(self.prot, 0, 0, 0) - grid_sizer_1_copy.Add(self.label_9_copy, 0, 0, 0) - grid_sizer_1_copy.Add(self.grid, 0, 0, 0) - grid_sizer_1_copy.Add(self.label_7_copy, 0, wx.LEFT, 5) - grid_sizer_1_copy.Add(self.minim, 0, 0, 0) - grid_sizer_1_copy.Add(self.label_8_copy, 0, wx.LEFT|wx.RIGHT, 5) - grid_sizer_1_copy.Add(self.monte, 0, 0, 0) - sizer_1_copy.Add(grid_sizer_1_copy, 1, wx.SHAPED, 0) + grid_sizer_1_copy.Add(self.label_2_copy, 1, wx.LEFT, 5) + grid_sizer_1_copy.Add(self.bond, 1, wx.EXPAND, 0) + grid_sizer_1_copy.Add(self.label_3_copy, 1, wx.LEFT, 5) + grid_sizer_1_copy.Add(self.csa, 1, wx.EXPAND, 0) + grid_sizer_1_copy.Add(self.label_5_copy, 1, wx.LEFT, 5) + grid_sizer_1_copy.Add(self.hetero, 1, wx.EXPAND, 0) + grid_sizer_1_copy.Add(self.label_6_copy, 1, wx.LEFT, 5) + grid_sizer_1_copy.Add(self.prot, 1, wx.EXPAND, 0) + grid_sizer_1_copy.Add(self.label_9_copy, 1, wx.LEFT, 5) + grid_sizer_1_copy.Add(self.grid, 1, wx.EXPAND, 0) + grid_sizer_1_copy.Add(self.label_7_copy, 1, wx.LEFT, 5) + grid_sizer_1_copy.Add(self.minim, 1, wx.EXPAND, 0) + grid_sizer_1_copy.Add(self.label_8_copy, 1, wx.LEFT, 5) + grid_sizer_1_copy.Add(self.monte, 1, wx.EXPAND, 0) + grid_sizer_1_copy.AddGrowableCol(1) + sizer_1_copy.Add(grid_sizer_1_copy, 1, wx.EXPAND|wx.ALL, 5) sizer2 = wx.BoxSizer(wx.HORIZONTAL) sizer2.Add(self.ok_copy, 0, wx.ALL|wx.ALIGN_RIGHT, 5) sizer2.Add(self.cancel_copy, 0, wx.ALL, 5) @@ -125,14 +126,14 @@ _icon.CopyFromBitmap(wx.Bitmap(IMAGE_PATH+'relax_start.gif', wx.BITMAP_TYPE_ANY)) self.SetIcon(_icon) self.label_1_copy.SetFont(wx.Font(12, wx.DEFAULT, wx.NORMAL, wx.BOLD, 0, "")) - self.bond.SetMinSize((150, 27)) - self.csa.SetMinSize((150, 27)) - self.hetero.SetMinSize((150, 27)) - self.prot.SetMinSize((150, 27)) - self.grid.SetMinSize((150, 27)) - self.minim.SetMinSize((150, 27)) - self.label_8_copy.SetMinSize((156, 17)) - self.monte.SetMinSize((150, 27)) + self.bond.SetMinSize((250, 27)) + self.csa.SetMinSize((250, 27)) + self.hetero.SetMinSize((250, 27)) + self.prot.SetMinSize((250, 27)) + self.grid.SetMinSize((250, 27)) + self.minim.SetMinSize((250, 27)) + self.label_8_copy.SetMinSize((250, 17)) + self.monte.SetMinSize((250, 27)) def accept_settings(self, event): # change settings