r14098 - in /branches/gui_testing/gui: fonts.py user_functions/base.py -- August 04, 2011 - 09:51

Author: bugman
Date: Thu Aug  4 09:51:55 2011
New Revision: 14098

URL: http://svn.gna.org/viewcvs/relax?rev=14098&view=rev
Log:
Expanded and renamed the 'modern' fonts.


Modified:
    branches/gui_testing/gui/fonts.py
    branches/gui_testing/gui/user_functions/base.py

Modified: branches/gui_testing/gui/fonts.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/gui_testing/gui/fonts.py?rev=14098&r1=14097&r2=14098&view=diff
==============================================================================
--- branches/gui_testing/gui/fonts.py (original)
+++ branches/gui_testing/gui/fonts.py Thu Aug  4 09:51:55 2011
@@ -45,8 +45,10 @@
         self.title =                wx.Font(16, wx.FONTFAMILY_DEFAULT, 
wx.FONTSTYLE_NORMAL, wx.FONTWEIGHT_NORMAL, 0, "Sans")
 
         # Modern fixed-width fonts.
-        self.modern_8 =             wx.Font(8,  wx.FONTFAMILY_MODERN, 
wx.FONTSTYLE_NORMAL, wx.FONTWEIGHT_NORMAL, 0)
-        self.modern_10 =            wx.Font(10, wx.FONTFAMILY_MODERN, 
wx.FONTSTYLE_NORMAL, wx.FONTWEIGHT_NORMAL, 0)
+        self.modern_small =         wx.Font(8,  wx.FONTFAMILY_MODERN,  
wx.FONTSTYLE_NORMAL, wx.FONTWEIGHT_NORMAL, 0)
+        self.modern_small_bold =    wx.Font(8,  wx.FONTFAMILY_MODERN,  
wx.FONTSTYLE_NORMAL, wx.FONTWEIGHT_BOLD,   0)
+        self.modern_normal =        wx.Font(10, wx.FONTFAMILY_MODERN,  
wx.FONTSTYLE_NORMAL, wx.FONTWEIGHT_NORMAL, 0)
+        self.modern_normal_bold =   wx.Font(10, wx.FONTFAMILY_MODERN,  
wx.FONTSTYLE_NORMAL, wx.FONTWEIGHT_BOLD,   0)
 
 
 

Modified: branches/gui_testing/gui/user_functions/base.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/gui_testing/gui/user_functions/base.py?rev=14098&r1=14097&r2=14098&view=diff
==============================================================================
--- branches/gui_testing/gui/user_functions/base.py (original)
+++ branches/gui_testing/gui/user_functions/base.py Thu Aug  4 09:51:55 2011
@@ -202,7 +202,7 @@
             elif type == 'desc':
                 text_elements[-1].SetFont(font.normal)
             elif type == 'table':
-                text_elements[-1].SetFont(font.modern_8)
+                text_elements[-1].SetFont(font.modern_small)
 
             # Wrap the text.
             text_elements[-1].Wrap(self._main_size - 20)