r16778 - /branches/uf_redesign/gui/fonts.py -- June 08, 2012 - 16:27

Author: bugman
Date: Fri Jun  8 16:27:50 2012
New Revision: 16778

URL: http://svn.gna.org/viewcvs/relax?rev=16778&view=rev
Log:
Font size improvements for Mac OS X.

The fonts are now roughly the same size as on GNU/Linux and MS Windows.  An 
operating system
specific font scaling is now used, with the Mac OS X fonts each being 
increased by 2 pixels.


Modified:
    branches/uf_redesign/gui/fonts.py

Modified: branches/uf_redesign/gui/fonts.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/uf_redesign/gui/fonts.py?rev=16778&r1=16777&r2=16778&view=diff
==============================================================================
--- branches/uf_redesign/gui/fonts.py (original)
+++ branches/uf_redesign/gui/fonts.py Fri Jun  8 16:27:50 2012
@@ -1,6 +1,6 @@
 
###############################################################################
 #                                                                            
 #
-# Copyright (C) 2011 Edward d'Auvergne                                       
 #
+# Copyright (C) 2011-2012 Edward d'Auvergne                                  
 #
 #                                                                            
 #
 # This file is part of the program relax.                                    
 #
 #                                                                            
 #
@@ -26,6 +26,9 @@
 # Python module imports.
 import wx
 
+# relax module imports.
+from status import Status; status = Status()
+
 
 class Font:
     """A storage container for the fonts."""
@@ -33,22 +36,27 @@
     def setup(self):
         """To be called by the main wx app, so that the fonts can be 
initialised correctly."""
 
+        # Operating system dependent font scaling.
+        scale = 0
+        if status.wx_info["os"] == 'darwin':
+            scale = 2
+
         # The fonts.
-        self.smaller =              wx.Font(6,  wx.FONTFAMILY_DEFAULT, 
wx.FONTSTYLE_NORMAL, wx.FONTWEIGHT_NORMAL, 0, "Sans")
-        self.small =                wx.Font(8,  wx.FONTFAMILY_DEFAULT, 
wx.FONTSTYLE_NORMAL, wx.FONTWEIGHT_NORMAL, 0, "Sans")
-        self.button =               wx.Font(8,  wx.FONTFAMILY_DEFAULT, 
wx.FONTSTYLE_NORMAL, wx.FONTWEIGHT_NORMAL, 0, "Sans")
-        self.normal =               wx.Font(10, wx.FONTFAMILY_DEFAULT, 
wx.FONTSTYLE_NORMAL, wx.FONTWEIGHT_NORMAL, 0, "Sans")
-        self.normal_bold =          wx.Font(10, wx.FONTFAMILY_DEFAULT, 
wx.FONTSTYLE_NORMAL, wx.FONTWEIGHT_BOLD,   0, "Sans")
-        self.normal_italic =        wx.Font(10, wx.FONTFAMILY_DEFAULT, 
wx.FONTSTYLE_ITALIC, wx.FONTWEIGHT_NORMAL, 0, "Sans")
-        self.subtitle =             wx.Font(12, wx.FONTFAMILY_DEFAULT, 
wx.FONTSTYLE_NORMAL, wx.FONTWEIGHT_BOLD,   0, "Sans")
-        self.font_14 =              wx.Font(14, wx.FONTFAMILY_DEFAULT, 
wx.FONTSTYLE_NORMAL, wx.FONTWEIGHT_NORMAL, 0, "Sans")
-        self.title =                wx.Font(16, wx.FONTFAMILY_DEFAULT, 
wx.FONTSTYLE_NORMAL, wx.FONTWEIGHT_NORMAL, 0, "Sans")
+        self.smaller =              wx.Font(6+scale,  wx.FONTFAMILY_DEFAULT, 
wx.FONTSTYLE_NORMAL, wx.FONTWEIGHT_NORMAL, 0, "Sans")
+        self.small =                wx.Font(8+scale,  wx.FONTFAMILY_DEFAULT, 
wx.FONTSTYLE_NORMAL, wx.FONTWEIGHT_NORMAL, 0, "Sans")
+        self.button =               wx.Font(8+scale,  wx.FONTFAMILY_DEFAULT, 
wx.FONTSTYLE_NORMAL, wx.FONTWEIGHT_NORMAL, 0, "Sans")
+        self.normal =               wx.Font(10+scale, wx.FONTFAMILY_DEFAULT, 
wx.FONTSTYLE_NORMAL, wx.FONTWEIGHT_NORMAL, 0, "Sans")
+        self.normal_bold =          wx.Font(10+scale, wx.FONTFAMILY_DEFAULT, 
wx.FONTSTYLE_NORMAL, wx.FONTWEIGHT_BOLD,   0, "Sans")
+        self.normal_italic =        wx.Font(10+scale, wx.FONTFAMILY_DEFAULT, 
wx.FONTSTYLE_ITALIC, wx.FONTWEIGHT_NORMAL, 0, "Sans")
+        self.subtitle =             wx.Font(12+scale, wx.FONTFAMILY_DEFAULT, 
wx.FONTSTYLE_NORMAL, wx.FONTWEIGHT_BOLD,   0, "Sans")
+        self.font_14 =              wx.Font(14+scale, wx.FONTFAMILY_DEFAULT, 
wx.FONTSTYLE_NORMAL, wx.FONTWEIGHT_NORMAL, 0, "Sans")
+        self.title =                wx.Font(16+scale, wx.FONTFAMILY_DEFAULT, 
wx.FONTSTYLE_NORMAL, wx.FONTWEIGHT_NORMAL, 0, "Sans")
 
         # Modern fixed-width fonts.
-        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)
+        self.modern_small =         wx.Font(8+scale,  wx.FONTFAMILY_MODERN,  
wx.FONTSTYLE_NORMAL, wx.FONTWEIGHT_NORMAL, 0)
+        self.modern_small_bold =    wx.Font(8+scale,  wx.FONTFAMILY_MODERN,  
wx.FONTSTYLE_NORMAL, wx.FONTWEIGHT_BOLD,   0)
+        self.modern_normal =        wx.Font(10+scale, wx.FONTFAMILY_MODERN,  
wx.FONTSTYLE_NORMAL, wx.FONTWEIGHT_NORMAL, 0)
+        self.modern_normal_bold =   wx.Font(10+scale, wx.FONTFAMILY_MODERN,  
wx.FONTSTYLE_NORMAL, wx.FONTWEIGHT_BOLD,   0)