r20110 - in /branches/relax_disp: ./ gui/analyses/base.py gui/fonts.py -- June 14, 2013 - 10:39

Author: bugman
Date: Fri Jun 14 10:39:54 2013
New Revision: 20110

URL: http://svn.gna.org/viewcvs/relax?rev=20110&view=rev
Log:
Merged revisions 20109 via svnmerge from 
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/trunk

........
  r20109 | bugman | 2013-06-14 10:39:32 +0200 (Fri, 14 Jun 2013) | 5 lines
  
  Added more emphasis on the titles of the auto-analysis GUI elements.
  
  There is now more space below the title, and a different font (16pt roman 
italic) is being used.
........

Modified:
    branches/relax_disp/   (props changed)
    branches/relax_disp/gui/analyses/base.py
    branches/relax_disp/gui/fonts.py

Propchange: branches/relax_disp/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Fri Jun 14 10:39:54 2013
@@ -1,1 +1,1 @@
-/trunk:1-20106
+/trunk:1-20109

Modified: branches/relax_disp/gui/analyses/base.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/relax_disp/gui/analyses/base.py?rev=20110&r1=20109&r2=20110&view=diff
==============================================================================
--- branches/relax_disp/gui/analyses/base.py (original)
+++ branches/relax_disp/gui/analyses/base.py Fri Jun 14 10:39:54 2013
@@ -325,7 +325,7 @@
         return field
 
 
-    def add_title(self, box, text):
+    def add_title(self, box, text, top_spacing=10, bottom_spacing=15):
         """Create and add the frame title.
 
         @param box:     The box element to pack the frame title into.
@@ -338,12 +338,12 @@
         label = wx.StaticText(self, -1, text)
 
         # The font properties.
-        label.SetFont(font.title)
+        label.SetFont(font.roman_title_italic)
 
         # Pack the title, with spacing.
-        box.AddSpacer(10)
+        box.AddSpacer(top_spacing)
         box.Add(label)
-        box.AddSpacer(5)
+        box.AddSpacer(bottom_spacing)
 
 
     def build_left_box(self):

Modified: branches/relax_disp/gui/fonts.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/relax_disp/gui/fonts.py?rev=20110&r1=20109&r2=20110&view=diff
==============================================================================
--- branches/relax_disp/gui/fonts.py (original)
+++ branches/relax_disp/gui/fonts.py Fri Jun 14 10:39:54 2013
@@ -1,6 +1,6 @@
 
###############################################################################
 #                                                                            
 #
-# Copyright (C) 2011-2012 Edward d'Auvergne                                  
 #
+# Copyright (C) 2011-2013 Edward d'Auvergne                                  
 #
 #                                                                            
 #
 # This file is part of the program relax (http://www.nmr-relax.com).         
 #
 #                                                                            
 #
@@ -68,6 +68,7 @@
         self.roman_font_12 =        wx.Font(12+scale, wx.FONTFAMILY_ROMAN, 
wx.FONTSTYLE_NORMAL, wx.FONTWEIGHT_NORMAL, 0)
         self.roman_font_14 =        wx.Font(14+scale, wx.FONTFAMILY_ROMAN, 
wx.FONTSTYLE_NORMAL, wx.FONTWEIGHT_NORMAL, 0)
         self.roman_title =          wx.Font(16+scale, wx.FONTFAMILY_ROMAN, 
wx.FONTSTYLE_NORMAL, wx.FONTWEIGHT_NORMAL, 0)
+        self.roman_title_italic =   wx.Font(16+scale, wx.FONTFAMILY_ROMAN, 
wx.FONTSTYLE_ITALIC, wx.FONTWEIGHT_NORMAL, 0)
         self.roman_font_18 =        wx.Font(18+scale, wx.FONTFAMILY_ROMAN, 
wx.FONTSTYLE_NORMAL, wx.FONTWEIGHT_NORMAL, 0)