Author: bugman
Date: Thu Jun 9 12:16:38 2011
New Revision: 12909
URL: http://svn.gna.org/viewcvs/relax?rev=12909&view=rev
Log:
Regularisation of the font formatting in the steady-state NOE GUI tab.
Modified:
1.3/gui/analyses/auto_noe.py
1.3/gui/relax_gui.py
Modified: 1.3/gui/analyses/auto_noe.py
URL:
http://svn.gna.org/viewcvs/relax/1.3/gui/analyses/auto_noe.py?rev=12909&r1=12908&r2=12909&view=diff
==============================================================================
--- 1.3/gui/analyses/auto_noe.py (original)
+++ 1.3/gui/analyses/auto_noe.py Thu Jun 9 12:16:38 2011
@@ -86,9 +86,6 @@
main_box = self.build_main_box()
self.parent.SetSizer(main_box)
- # Set the frame font size.
- self.parent.SetFont(wx.Font(8, wx.DEFAULT, wx.NORMAL, wx.NORMAL, 0,
""))
-
def add_execute_relax(self, box):
"""Create and add the relax execution GUI element to the given box.
@@ -103,6 +100,7 @@
# The label.
label = wx.StaticText(self.parent, -1, "Execute relax ",
style=wx.ALIGN_RIGHT)
label.SetMinSize((118, 17))
+ label.SetFont(self.gui.font_normal)
sizer.Add(label, 0, wx.ALIGN_CENTER_VERTICAL|wx.ADJUST_MINSIZE, 0)
# The button.
@@ -127,10 +125,12 @@
label = wx.StaticText(self.parent, -1, "Setup for steady-state NOE
analysis")
# The font properties.
- label.SetFont(wx.Font(16, wx.DEFAULT, wx.NORMAL, wx.NORMAL, 0,
"Sans"))
-
- # Pack the title.
- box.Add(label, 0, wx.BOTTOM|wx.ADJUST_MINSIZE, 18)
+ label.SetFont(self.gui.font_title)
+
+ # Pack the title, with spacing.
+ box.AddSpacer(10)
+ box.Add(label)
+ box.AddSpacer(5)
def add_frq(self, box):
@@ -144,8 +144,9 @@
sizer = wx.BoxSizer(wx.HORIZONTAL)
# The label.
- label = wx.StaticText(self.parent, -1, "NMR Frequency [MHz]:",
style=wx.ALIGN_RIGHT)
+ label = wx.StaticText(self.parent, -1, "NMR Frequency [MHz]")
label.SetMinSize((230, 17))
+ label.SetFont(self.gui.font_normal)
sizer.Add(label, 0,
wx.LEFT|wx.ALIGN_CENTER_VERTICAL|wx.ADJUST_MINSIZE, 0)
# The text input field.
@@ -168,8 +169,9 @@
sizer = wx.BoxSizer(wx.HORIZONTAL)
# The label.
- label = wx.StaticText(self.parent, -1, "Reference NOE peak list:",
style=wx.ALIGN_RIGHT)
+ label = wx.StaticText(self.parent, -1, "Reference NOE peak list")
label.SetMinSize((230, 17))
+ label.SetFont(self.gui.font_normal)
sizer.Add(label, 0,
wx.LEFT|wx.ALIGN_CENTER_VERTICAL|wx.ADJUST_MINSIZE, 0)
# The text input field.
@@ -198,8 +200,9 @@
sizer = wx.BoxSizer(wx.HORIZONTAL)
# The label.
- label = wx.StaticText(self.parent, -1, "Baseplane RMSD:",
style=wx.ALIGN_RIGHT)
+ label = wx.StaticText(self.parent, -1, "Baseplane RMSD")
label.SetMinSize((230, 17))
+ label.SetFont(self.gui.font_normal)
sizer.Add(label, 0,
wx.LEFT|wx.ALIGN_CENTER_VERTICAL|wx.ADJUST_MINSIZE, 0)
# The text input field.
@@ -222,8 +225,9 @@
sizer = wx.BoxSizer(wx.HORIZONTAL)
# The label.
- label = wx.StaticText(self.parent, -1, "Results directory",
style=wx.ALIGN_RIGHT)
+ label = wx.StaticText(self.parent, -1, "Results directory")
label.SetMinSize((230, 17))
+ label.SetFont(self.gui.font_normal)
sizer.Add(label, 0,
wx.LEFT|wx.ALIGN_CENTER_VERTICAL|wx.ADJUST_MINSIZE, 0)
# The text input field.
@@ -252,8 +256,9 @@
sizer = wx.BoxSizer(wx.HORIZONTAL)
# The label.
- label = wx.StaticText(self.parent, -1, "Saturated NOE peak list:",
style=wx.ALIGN_RIGHT)
+ label = wx.StaticText(self.parent, -1, "Saturated NOE peak list")
label.SetMinSize((230, 17))
+ label.SetFont(self.gui.font_normal)
sizer.Add(label, 0,
wx.LEFT|wx.ALIGN_CENTER_VERTICAL|wx.ADJUST_MINSIZE, 0)
# The text input field.
@@ -282,8 +287,9 @@
sizer = wx.BoxSizer(wx.HORIZONTAL)
# The label.
- label = wx.StaticText(self.parent, -1, "Baseplane RMSD:",
style=wx.ALIGN_RIGHT)
+ label = wx.StaticText(self.parent, -1, "Baseplane RMSD")
label.SetMinSize((230, 17))
+ label.SetFont(self.gui.font_normal)
sizer.Add(label, 0,
wx.LEFT|wx.ALIGN_CENTER_VERTICAL|wx.ADJUST_MINSIZE, 0)
# The text input field.
@@ -306,8 +312,9 @@
sizer = wx.BoxSizer(wx.HORIZONTAL)
# The label.
- label = wx.StaticText(self.parent, -1, "Sequence file",
style=wx.ALIGN_RIGHT)
+ label = wx.StaticText(self.parent, -1, "Sequence file")
label.SetMinSize((230, 17))
+ label.SetFont(self.gui.font_normal)
sizer.Add(label, 0,
wx.LEFT|wx.ALIGN_CENTER_VERTICAL|wx.ADJUST_MINSIZE, 0)
# The text input field.
@@ -337,8 +344,9 @@
sizer = wx.BoxSizer(wx.HORIZONTAL)
# The label.
- label = wx.StaticText(self.parent, -1, "Sequence from PDB structure
file", style=wx.ALIGN_RIGHT)
+ label = wx.StaticText(self.parent, -1, "Sequence from PDB structure
file")
label.SetMinSize((230, 17))
+ label.SetFont(self.gui.font_normal)
sizer.Add(label, 0,
wx.LEFT|wx.ALIGN_CENTER_VERTICAL|wx.ADJUST_MINSIZE, 0)
# The text input field.
@@ -368,8 +376,9 @@
sizer = wx.BoxSizer(wx.HORIZONTAL)
# The label.
- label = wx.StaticText(self.parent, -1, "Unresolved residues:",
style=wx.ALIGN_RIGHT)
+ label = wx.StaticText(self.parent, -1, "Unresolved residues")
label.SetMinSize((230, 17))
+ label.SetFont(self.gui.font_normal)
sizer.Add(label, 0,
wx.LEFT|wx.ALIGN_CENTER_VERTICAL|wx.ADJUST_MINSIZE, 0)
# The text input field.
@@ -659,9 +668,9 @@
sizer = wx.BoxSizer(wx.HORIZONTAL)
# The label.
- label = wx.StaticText(self.parent, -1, "\nNOE peak lists:",
style=wx.ALIGN_RIGHT)
- label.SetMinSize((230, 34))
- label.SetFont(wx.Font(10, wx.DEFAULT, wx.NORMAL, wx.BOLD, 0, ""))
+ label = wx.StaticText(self.parent, -1, "\nNOE peak lists")
+ label.SetMinSize((230, 44))
+ label.SetFont(self.gui.font_subtitle)
sizer.Add(label, 0,
wx.LEFT|wx.ALIGN_CENTER_VERTICAL|wx.ADJUST_MINSIZE, 0)
# Add the element to the box.
Modified: 1.3/gui/relax_gui.py
URL:
http://svn.gna.org/viewcvs/relax/1.3/gui/relax_gui.py?rev=12909&r1=12908&r2=12909&view=diff
==============================================================================
--- 1.3/gui/relax_gui.py (original)
+++ 1.3/gui/relax_gui.py Thu Jun 9 12:16:38 2011
@@ -557,11 +557,12 @@
"""Initialise a series of fonts to be used throughout the GUI."""
# The fonts.
- self.font_smaller = wx.Font(6, wx.DEFAULT, wx.NORMAL, wx.NORMAL, 0,
"Sans")
- self.font_small = wx.Font(8, wx.DEFAULT, wx.NORMAL, wx.NORMAL, 0,
"Sans")
- self.font_button = wx.Font(8, wx.DEFAULT, wx.NORMAL, wx.NORMAL, 0,
"Sans")
- self.font_normal = wx.Font(10, wx.DEFAULT, wx.NORMAL, wx.NORMAL, 0,
"Sans")
- self.font_title = wx.Font(16, wx.DEFAULT, wx.NORMAL, wx.NORMAL, 0,
"Sans")
+ self.font_smaller = wx.Font(6, wx.DEFAULT, wx.NORMAL,
wx.NORMAL, 0, "Sans")
+ self.font_small = wx.Font(8, wx.DEFAULT, wx.NORMAL,
wx.NORMAL, 0, "Sans")
+ self.font_button = wx.Font(8, wx.DEFAULT, wx.NORMAL,
wx.NORMAL, 0, "Sans")
+ self.font_normal = wx.Font(10, wx.DEFAULT, wx.NORMAL,
wx.NORMAL, 0, "Sans")
+ self.font_subtitle = wx.Font(12, wx.DEFAULT, wx.NORMAL, wx.BOLD,
0, "Sans")
+ self.font_title = wx.Font(16, wx.DEFAULT, wx.NORMAL,
wx.NORMAL, 0, "Sans")
def show_controller(self, event):
r12909 - in /1.3/gui: analyses/auto_noe.py relax_gui.py