- Revision
- 15991
- Author
- jeffrey
- Date
- 2007-11-30 15:23:42 -0800 (Fri, 30 Nov 2007)
Log Message
[APP] Show calendar in ExampleFrame
Modified Paths
Diff
Modified: branches/rearchitecture/Chandler-Debugging/ocap/debugging/py_crust.py (15990 => 15991)
--- branches/rearchitecture/Chandler-Debugging/ocap/debugging/py_crust.py 2007-11-30 22:58:38 UTC (rev 15990) +++ branches/rearchitecture/Chandler-Debugging/ocap/debugging/py_crust.py 2007-11-30 23:23:42 UTC (rev 15991) @@ -168,18 +168,20 @@ ) @trellis.observer - def printCell(self): - print self.cell - - @trellis.rule def changeActive(self): value = self.cell + shown_child = None + self.widget.Freeze() if self.widget is not None: for child in self.widget.GetChildren(): if child.Name == value: child.Show() + shown_child = child else: child.Hide() + if shown_child: + shown_child.SetSize(self.widget.GetSize()) + self.widget.Thaw() class PreviewAndMinicalendarSizer(Boxer, trellis.Component): widgets = trellis.value(trellis.List()) @@ -228,6 +230,7 @@ def ExampleFrame(app): """Create a demo frame, suitable for experimenting""" from ocap.chandler import interaction, sidebar, minicalendar, preview, summary + from ocap.wxui import calendar frame = wx.Frame(parent=None, title='Example', size=(700, 685)) frame.MenuBar = wx.MenuBar() @@ -247,7 +250,6 @@ tbBridge.addAppTool("Mail", 'ApplicationBarMail.png', 'mail') tbBridge.addAppTool("Tasks", 'ApplicationBarTask.png', 'tasks') tbBridge.addAppTool("Calendar", 'ApplicationBarEvent.png', 'calendar') - splitterStyle = wx.SP_LIVE_UPDATE | wx.NO_BORDER | wx.SP_3DSASH main_splitter = ChangeTrackingSplitter(frame, style=splitterStyle) @@ -270,14 +272,22 @@ mc_and_preview.SetSizerAndFit(mc_sizer) main_view = wx.Panel(main_splitter) + main_view.SetBackgroundColour(wx.WHITE) + + main_view.Sizer = wx.BoxSizer() + sum = summary.SummaryPresentation(main_view, ia.sidebar[0].items) sum.View.Name = 'list' - main_view.Sizer = wx.BoxSizer() + cal = calendar.CalendarPanel(main_view, name='calendar') + main_view.Sizer.Add(sum.View, 1, flag=wx.EXPAND) + main_view.Sizer.Add(cal, 1, flag=wx.EXPAND) avBridge = ActiveViewBridge(widget=main_view, cell=trellis.Cells(ia)['active_view']) - + # keep the bridges around so they don't get garbage collected + bridges = {'ActiveView' : avBridge, 'Toolbar' : tbBridge} + main_splitter.SplitVertically(child_splitter, main_view) child_splitter.SplitHorizontally(sb.GetView(), mc_and_preview) @@ -291,7 +301,7 @@ child_splitter.update_sash(.5) Debugger(app).variables.update( frame = frame, - splitter = main_splitter, sidebar=sb, summary=sum + splitter = main_splitter, sidebar=sb, summary=sum, bridges=bridges ) #from wx.lib.inspection import InspectionTool #InspectionTool().Show()
Modified: branches/rearchitecture/Chandler-Platform/ocap/wxui/calendar.py (15990 => 15991)
--- branches/rearchitecture/Chandler-Platform/ocap/wxui/calendar.py 2007-11-30 22:58:38 UTC (rev 15990) +++ branches/rearchitecture/Chandler-Platform/ocap/wxui/calendar.py 2007-11-30 23:23:42 UTC (rev 15991) @@ -627,8 +627,8 @@ class CalendarPanel(wx.Panel): - def __init__(self, parent, name): - super(CalendarPanel, self).__init__(parent, -1, style=wx.NO_BORDER) + def __init__(self, parent, **kw): + super(CalendarPanel, self).__init__(parent, -1, style=wx.NO_BORDER, **kw) self.Bind(wx.EVT_SIZE, self.OnSize) bg_color = self.GetBackgroundColour() @@ -932,7 +932,7 @@ frame = wx.Frame(None, title="Calendar Mockup", size=wx.Size(600, 450)) frame.CenterOnParent() - panel = CalendarPanel(frame, -1) + panel = CalendarPanel(frame) calendar = panel.calendar allday = panel.allday
_______________________________________________ Commits mailing list [email protected] http://lists.osafoundation.org/mailman/listinfo/commits
