[Commits] (capps) Fixes bug#2105 Month names getting clipped in calendar views, also moves pref/next arrows to edge of view

[commits at osafoundation.org]

Commit by: capps
Modified files:
chandler/parcels/osaf/framework/blocks/calendar/CalendarCanvas.py 1.16 1.17

Log message:
Fixes bug#2105 Month names getting clipped in calendar views, also moves pref/next arrows to edge of view

ViewCVS links:
http://cvs.osafoundation.org/index.cgi/chandler/parcels/osaf/framework/blocks/calendar/CalendarCanvas.py.diff?r1=text&tr1=1.16&r2=text&tr2=1.17

Index: chandler/parcels/osaf/framework/blocks/calendar/CalendarCanvas.py
diff -u chandler/parcels/osaf/framework/blocks/calendar/CalendarCanvas.py:1.16 chandler/parcels/osaf/framework/blocks/calendar/CalendarCanvas.py:1.17
--- chandler/parcels/osaf/framework/blocks/calendar/CalendarCanvas.py:1.16	Sun Oct  3 14:35:26 2004
+++ chandler/parcels/osaf/framework/blocks/calendar/CalendarCanvas.py	Tue Oct  5 10:26:19 2004
@@ -1,8 +1,8 @@
 """ Canvas for calendaring blocks
 """
 
-__version__ = "$Revision: 1.16 $"
-__date__ = "$Date: 2004/10/03 21:35:26 $"
+__version__ = "$Revision: 1.17 $"
+__date__ = "$Date: 2004/10/05 17:26:19 $"
 __copyright__ = "Copyright (c) 2004 Open Source Applications Foundation"
 __license__ = "http://osafoundation.org/Chandler_0.1_license_terms.htm"
 
@@ -209,7 +209,7 @@
         self.todayButton = CollectionCanvas.CanvasTextButton(self, today.Format("%b %d, %Y"),
                                                              self.bigFont, self.bigFontColor,
                                                              self.bgColor)
-        self.monthButton = CollectionCanvas.CanvasTextButton(self, " September 8888 ",
+        self.monthButton = CollectionCanvas.CanvasTextButton(self, "",
                                                              self.bigFont, self.bigFontColor,
                                                              self.bgColor)
 
@@ -217,11 +217,11 @@
         box = wx.BoxSizer(wx.HORIZONTAL)
         box.Add((0,0), 1, wx.EXPAND, 5)
         box.Add((0,0), 1, wx.EXPAND, 5)
-        box.Add(self.prevButton, 0, wx.ALIGN_CENTER_HORIZONTAL | wx.ALL, 5)
         box.Add(self.monthButton, 0, wx.ALIGN_CENTER_HORIZONTAL | wx.ALL, 5)
-        box.Add(self.nextButton, 0, wx.ALIGN_CENTER_HORIZONTAL | wx.ALL, 5)
         box.Add((0,0), 1, wx.EXPAND, 5)
         box.Add(self.todayButton, 0, wx.ALIGN_RIGHT | wx.ALL, 5)
+        box.Add(self.prevButton, 0, wx.ALIGN_CENTER_HORIZONTAL | wx.ALL, 5)
+        box.Add(self.nextButton, 0, wx.ALIGN_CENTER_HORIZONTAL | wx.ALL, 5)
         self.SetSizer(box)
 
         self.Bind(wx.EVT_BUTTON, self.parent.OnPrev, self.prevButton)
@@ -230,6 +230,7 @@
 
     def wxSynchronizeWidget(self):
         self.monthButton.SetLabel(self.parent.blockItem.rangeStart.Format("%B %Y"))
+        self.Layout()
         self.Refresh()
 
     # Drawing code
@@ -532,18 +533,18 @@
         self.todayButton = CollectionCanvas.CanvasTextButton(self, today.Format("%b %d, %Y"),
                                                              self.bigFont, self.bigFontColor,
                                                              self.bgColor)
-        self.monthButton = CollectionCanvas.CanvasTextButton(self, " September 8888 ",
+        self.monthButton = CollectionCanvas.CanvasTextButton(self, "",
                                                              self.bigFont, self.bigFontColor,
                                                              self.bgColor)
 
         box = wx.BoxSizer(wx.HORIZONTAL)
         box.Add((0,0), 1, wx.EXPAND, 5)
         box.Add((0,0), 1, wx.EXPAND, 5)
-        box.Add(self.prevButton, 0, wx.ALIGN_CENTER_HORIZONTAL | wx.ALL, 5)
         box.Add(self.monthButton, 0, wx.ALIGN_CENTER_HORIZONTAL | wx.ALL, 5)
-        box.Add(self.nextButton, 0, wx.ALIGN_CENTER_HORIZONTAL | wx.ALL, 5)
         box.Add((0,0), 1, wx.EXPAND, 5)
         box.Add(self.todayButton, 0, wx.ALIGN_RIGHT | wx.ALL, 5)
+        box.Add(self.prevButton, 0, wx.ALIGN_CENTER_HORIZONTAL | wx.ALL, 5)
+        box.Add(self.nextButton, 0, wx.ALIGN_CENTER_HORIZONTAL | wx.ALL, 5)
         self.SetSizer(box)
                                             
         self.Bind(wx.EVT_BUTTON, self.OnPrev, self.prevButton)
@@ -557,6 +558,7 @@
 
     def wxSynchronizeWidget(self):
         self.monthButton.SetLabel(self.blockItem.rangeStart.Format("%B %Y"))
+        self.Layout()
         self.Refresh()
 
     # Drawing logic