[commits] (pbossut) [11347] Fix for bug #6117, Editing font of events is Times, not Helvetica, r=stearns

[commits]

Title: [commits] (pbossut) [11347] Fix for bug #6117, Editing font of events is Times, not Helvetica, r=stearns

Revision

11347

Author

pbossut

Date

2006-08-07 16:45:25 -0700 (Mon, 07 Aug 2006)

Log Message

Fix for bug #6117, Editing font of events is Times, not Helvetica, r=stearns
As stearns says: "This is *not* a solution to our style goals" but a good stopgap for now.

Modified Paths

• trunk/chandler/application/Application.py
• trunk/chandler/parcels/osaf/framework/blocks/calendar/CalendarCanvas.py

Diff

Modified: trunk/chandler/application/Application.py (11346 => 11347)

--- trunk/chandler/application/Application.py	2006-08-07 23:33:52 UTC (rev 11346)
+++ trunk/chandler/application/Application.py	2006-08-07 23:45:25 UTC (rev 11347)
@@ -1001,13 +1001,13 @@
                             'mainview'    : ( 10, _(u"Rendering the main view"))}
 
         # Font to be used for the progress text
-        font = wx.Font(fontsize, wx.NORMAL, wx.NORMAL, wx.NORMAL)
+        font = wx.Font(fontsize, wx.SWISS, wx.NORMAL, wx.NORMAL)
         
         # Add title text
         titleText = wx.StaticText(self, -1, _(u"Experimentally Usable Calendar"))
         titleText.SetBackgroundColour(wx.WHITE)
         sizer.Add(titleText, 1, wx.ALIGN_CENTER | wx.TOP | wx.BOTTOM, padding)
-        titleText.SetFont(wx.Font(fontsize, wx.NORMAL, wx.NORMAL, wx.NORMAL))
+        titleText.SetFont(wx.Font(fontsize, wx.SWISS, wx.NORMAL, wx.NORMAL))
 
         # Load the splash screen picture.
         # The picture will set the width of the splash screen, 
@@ -1019,20 +1019,20 @@
         text1 = wx.StaticText(self, -1, _(u"Chandler"))
         text1.SetBackgroundColour(wx.WHITE)
         sizer.Add(text1, 1,  wx.ALIGN_CENTER | wx.TOP | wx.BOTTOM, padding)
-        text1.SetFont(wx.Font(16, wx.NORMAL, wx.NORMAL, wx.BOLD))
+        text1.SetFont(wx.Font(16, wx.SWISS, wx.NORMAL, wx.BOLD))
 
         # Add Version text
         text2 = wx.StaticText(self, -1,
                               _(u"Version %(version)s") % { 'version': version })
         text2.SetBackgroundColour(wx.WHITE)
         sizer.Add(text2, 1,  wx.ALIGN_CENTER | wx.TOP | wx.BOTTOM, padding)
-        text2.SetFont(wx.Font(16, wx.NORMAL, wx.NORMAL, wx.NORMAL))
+        text2.SetFont(wx.Font(16, wx.SWISS, wx.NORMAL, wx.NORMAL))
 
         # Add OSAF text
         text3 = wx.StaticText(self, -1, _(u"Open Source Applications Foundation"))
         text3.SetBackgroundColour(wx.WHITE)
         sizer.Add(text3, 1,  wx.ALIGN_CENTER | wx.TOP | wx.BOTTOM, padding)
-        text3.SetFont(wx.Font(10, wx.NORMAL, wx.NORMAL, wx.NORMAL))
+        text3.SetFont(wx.Font(10, wx.SWISS, wx.NORMAL, wx.NORMAL))
 
         # The progress text is in 2 parts: a text indicating the section being initialized
         # and a percent number indicating an approximate value of the total being done

Modified: trunk/chandler/parcels/osaf/framework/blocks/calendar/CalendarCanvas.py (11346 => 11347)

--- trunk/chandler/parcels/osaf/framework/blocks/calendar/CalendarCanvas.py	2006-08-07 23:33:52 UTC (rev 11346)
+++ trunk/chandler/parcels/osaf/framework/blocks/calendar/CalendarCanvas.py	2006-08-07 23:45:25 UTC (rev 11347)
@@ -1505,7 +1505,7 @@
 
         newSize = wx.Size(size.width, size.height)
 
-        font = wx.Font(pointSize, wx.NORMAL, wx.NORMAL, wx.NORMAL)
+        font = wx.Font(pointSize, wx.SWISS, wx.NORMAL, wx.NORMAL)
         self.SetFont(font)
 
         # move the frame so that the default Mac Aqua focus "halo"

_______________________________________________
Commits mailing list
Commits@osafoundation.org
http://lists.osafoundation.org/mailman/listinfo/commits