Author: bugman
Date: Wed Sep 15 19:31:43 2010
New Revision: 11564
URL: http://svn.gna.org/viewcvs/relax?rev=11564&view=rev
Log:
The parameter file settings window is now cleaned up like the global settings.
The window responds nicely to resizing and the text has had a few fixes.
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=11564&r1=11563&r2=11564&view=diff
==============================================================================
--- branches/bieri_gui/gui_bieri/settings.py (original)
+++ branches/bieri_gui/gui_bieri/settings.py Wed Sep 15 19:31:43 2010
@@ -164,18 +164,18 @@
# begin inputfile.__init__
kwds["style"] = wx.DEFAULT_FRAME_STYLE
wx.Dialog.__init__(self, *args, **kwds)
- self.label_1_copy_copy = wx.StaticText(self, -1, "Parameter File
Settings")
+ self.label_1_copy_copy = wx.StaticText(self, -1, "Parameter file
settings")
self.bitmap_1_copy_copy = wx.StaticBitmap(self, -1,
wx.Bitmap(IMAGE_PATH+'relax.gif', wx.BITMAP_TYPE_ANY))
- self.subheader = wx.StaticText(self, -1, "Please specify culumn
number below:\n")
- self.label_2_copy_copy = wx.StaticText(self, -1, "Molecule Name")
+ self.subheader = wx.StaticText(self, -1, "Please specify column
number below:\n")
+ self.label_2_copy_copy = wx.StaticText(self, -1, "Molecule name")
self.mol_nam = wx.TextCtrl(self, -1, old_settings[0])
- self.label_3_copy_copy = wx.StaticText(self, -1, "Residue Number")
+ self.label_3_copy_copy = wx.StaticText(self, -1, "Residue number")
self.res_num_col = wx.TextCtrl(self, -1, old_settings[1])
- self.label_5_copy_copy = wx.StaticText(self, -1, "Residue Name")
+ self.label_5_copy_copy = wx.StaticText(self, -1, "Residue name")
self.res_nam_col = wx.TextCtrl(self, -1, old_settings[2])
- self.label_6_copy_copy = wx.StaticText(self, -1, "Spin Number")
+ self.label_6_copy_copy = wx.StaticText(self, -1, "Spin number")
self.spin_num_col = wx.TextCtrl(self, -1, old_settings[3])
- self.label_9_copy_copy = wx.StaticText(self, -1, "Spin Name")
+ self.label_9_copy_copy = wx.StaticText(self, -1, "Spin name")
self.spin_nam_col = wx.TextCtrl(self, -1, old_settings[4])
self.label_7_copy_copy = wx.StaticText(self, -1, "Values")
self.value_col = wx.TextCtrl(self, -1, old_settings[5])
@@ -195,27 +195,30 @@
def __do_layout(self):
# begin inputfile.__do_layout
sizer_1_copy_copy = wx.BoxSizer(wx.VERTICAL)
- grid_sizer_1_copy_copy = wx.GridSizer(8, 2, 0, 0)
- sizer_1_copy_copy.Add(self.label_1_copy_copy, 0,
wx.ALL|wx.ALIGN_CENTER_HORIZONTAL, 5)
- sizer_1_copy_copy.Add(self.bitmap_1_copy_copy, 0,
wx.ALL|wx.ALIGN_CENTER_HORIZONTAL, 5)
- sizer_1_copy_copy.Add(self.subheader, 0,
wx.ALL|wx.ALIGN_CENTER_HORIZONTAL, 5)
- grid_sizer_1_copy_copy.Add(self.label_2_copy_copy, 0, wx.LEFT, 5)
- grid_sizer_1_copy_copy.Add(self.mol_nam, 0, 0, 0)
- grid_sizer_1_copy_copy.Add(self.label_3_copy_copy, 0, wx.LEFT, 5)
- grid_sizer_1_copy_copy.Add(self.res_num_col, 0, 0, 0)
- grid_sizer_1_copy_copy.Add(self.label_5_copy_copy, 0, wx.LEFT, 5)
- grid_sizer_1_copy_copy.Add(self.res_nam_col, 0, 0, 0)
- grid_sizer_1_copy_copy.Add(self.label_6_copy_copy, 0, wx.LEFT, 5)
- grid_sizer_1_copy_copy.Add(self.spin_num_col, 0, 0, 0)
- grid_sizer_1_copy_copy.Add(self.label_9_copy_copy, 0, wx.LEFT, 5)
- grid_sizer_1_copy_copy.Add(self.spin_nam_col, 0, 0, 0)
- grid_sizer_1_copy_copy.Add(self.label_7_copy_copy, 0, wx.LEFT, 5)
- grid_sizer_1_copy_copy.Add(self.value_col, 0, 0, 0)
- grid_sizer_1_copy_copy.Add(self.label_8_copy_copy, 0,
wx.LEFT|wx.RIGHT, 5)
- grid_sizer_1_copy_copy.Add(self.error_col, 0, 0, 0)
- grid_sizer_1_copy_copy.Add(self.ok_copy_copy, 0,
wx.ALL|wx.ALIGN_RIGHT, 5)
- grid_sizer_1_copy_copy.Add(self.cancel_copy_copy, 0, wx.ALL, 5)
- sizer_1_copy_copy.Add(grid_sizer_1_copy_copy, 1, wx.SHAPED, 0)
+ grid_sizer_1_copy_copy = wx.FlexGridSizer(8, 2, 0, 0)
+ sizer_1_copy_copy.Add(self.label_1_copy_copy, 0,
wx.ALIGN_CENTER_HORIZONTAL, 5)
+ sizer_1_copy_copy.Add(self.bitmap_1_copy_copy, 0,
wx.ALIGN_CENTER_HORIZONTAL, 5)
+ sizer_1_copy_copy.Add(self.subheader, 0, wx.ALIGN_CENTER_HORIZONTAL,
5)
+ grid_sizer_1_copy_copy.Add(self.label_2_copy_copy, 1, wx.LEFT, 5)
+ grid_sizer_1_copy_copy.Add(self.mol_nam, 1, wx.EXPAND, 0)
+ grid_sizer_1_copy_copy.Add(self.label_3_copy_copy, 1, wx.LEFT, 5)
+ grid_sizer_1_copy_copy.Add(self.res_num_col, 1, wx.EXPAND, 0)
+ grid_sizer_1_copy_copy.Add(self.label_5_copy_copy, 1, wx.LEFT, 5)
+ grid_sizer_1_copy_copy.Add(self.res_nam_col, 1, wx.EXPAND, 0)
+ grid_sizer_1_copy_copy.Add(self.label_6_copy_copy, 1, wx.LEFT, 5)
+ grid_sizer_1_copy_copy.Add(self.spin_num_col, 1, wx.EXPAND, 0)
+ grid_sizer_1_copy_copy.Add(self.label_9_copy_copy, 1, wx.LEFT, 5)
+ grid_sizer_1_copy_copy.Add(self.spin_nam_col, 1, wx.EXPAND, 0)
+ grid_sizer_1_copy_copy.Add(self.label_7_copy_copy, 1, wx.LEFT, 5)
+ grid_sizer_1_copy_copy.Add(self.value_col, 1, wx.EXPAND, 0)
+ grid_sizer_1_copy_copy.Add(self.label_8_copy_copy, 1, wx.LEFT, 5)
+ grid_sizer_1_copy_copy.Add(self.error_col, 1, wx.EXPAND, 0)
+ grid_sizer_1_copy_copy.AddGrowableCol(1)
+ sizer_1_copy_copy.Add(grid_sizer_1_copy_copy, 1, wx.EXPAND|wx.ALL, 5)
+ sizer2 = wx.BoxSizer(wx.HORIZONTAL)
+ sizer2.Add(self.ok_copy_copy, 0, wx.ALL|wx.ALIGN_RIGHT, 5)
+ sizer2.Add(self.cancel_copy_copy, 0, wx.ALL, 5)
+ sizer_1_copy_copy.Add(sizer2, 0, wx.ALIGN_CENTER_HORIZONTAL, 0)
self.SetSizer(sizer_1_copy_copy)
sizer_1_copy_copy.Fit(self)
self.Layout()
@@ -223,7 +226,7 @@
def __set_properties(self):
# begin inputfile.__set_properties
- self.SetTitle("relaxGUI")
+ self.SetTitle("File settings")
_icon = wx.EmptyIcon()
_icon.CopyFromBitmap(wx.Bitmap(IMAGE_PATH+'relax_start.gif',
wx.BITMAP_TYPE_ANY))
self.SetIcon(_icon)
r11564 - /branches/bieri_gui/gui_bieri/settings.py