[Commits] (capps) Added caterpillar content views
commits at osafoundation.org
commits at osafoundation.org
Tue Feb 3 13:26:01 PST 2004
Commit by: capps
Modified files:
osaf/chandler/Chandler/Chandler-project.wpr 1.22 1.23
osaf/chandler/Chandler/application/Application.py 1.199 1.200
osaf/chandler/Chandler/parcels/OSAF/contentmodel/tests/GenerateItems.py 1.4 1.5
osaf/chandler/Chandler/parcels/OSAF/framework/blocks/Content.py None 1.1
osaf/chandler/Chandler/parcels/OSAF/framework/blocks/parcel.xml 1.41 1.42
osaf/chandler/Chandler/parcels/OSAF/views/content/parcel.xml None 1.1
osaf/chandler/Chandler/parcels/OSAF/views/main/parcel.xml 1.7 1.8
Log message:
Added caterpillar content views
ViewCVS links:
http://cvs.osafoundation.org/index.cgi/osaf/chandler/Chandler/Chandler-project.wpr.diff?r1=text&tr1=1.22&r2=text&tr2=1.23
http://cvs.osafoundation.org/index.cgi/osaf/chandler/Chandler/application/Application.py.diff?r1=text&tr1=1.199&r2=text&tr2=1.200
http://cvs.osafoundation.org/index.cgi/osaf/chandler/Chandler/parcels/OSAF/contentmodel/tests/GenerateItems.py.diff?r1=text&tr1=1.4&r2=text&tr2=1.5
http://cvs.osafoundation.org/index.cgi/osaf/chandler/Chandler/parcels/OSAF/framework/blocks/Content.py?rev=1.1&content-type=text/vnd.viewcvs-markup
http://cvs.osafoundation.org/index.cgi/osaf/chandler/Chandler/parcels/OSAF/framework/blocks/parcel.xml.diff?r1=text&tr1=1.41&r2=text&tr2=1.42
http://cvs.osafoundation.org/index.cgi/osaf/chandler/Chandler/parcels/OSAF/views/content/parcel.xml?rev=1.1&content-type=text/vnd.viewcvs-markup
http://cvs.osafoundation.org/index.cgi/osaf/chandler/Chandler/parcels/OSAF/views/main/parcel.xml.diff?r1=text&tr1=1.7&r2=text&tr2=1.8
Index: osaf/chandler/Chandler/parcels/OSAF/views/main/parcel.xml
diff -u osaf/chandler/Chandler/parcels/OSAF/views/main/parcel.xml:1.7 osaf/chandler/Chandler/parcels/OSAF/views/main/parcel.xml:1.8
--- osaf/chandler/Chandler/parcels/OSAF/views/main/parcel.xml:1.7 Mon Feb 2 08:35:54 2004
+++ osaf/chandler/Chandler/parcels/OSAF/views/main/parcel.xml Tue Feb 3 13:25:30 2004
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.7 $ -->
-<!-- $Date: 2004/02/02 16:35:54 $ -->
+<!-- $Revision: 1.8 $ -->
+<!-- $Date: 2004/02/03 21:25:30 $ -->
<!-- Copyright (c) 2003 Open Source Applications Foundation -->
<!-- License: http://osafoundation.org/Chandler_0.1_license_terms.htm -->
@@ -13,6 +13,7 @@
xmlns:events="//parcels/OSAF/framework/blocks/Events"
xmlns:repository="//parcels/OSAF/views/repositoryviewer"
xmlns:demo="//parcels/OSAF/views/demo"
+ xmlns:content="//parcels/OSAF/views/content"
xmlns:zaobao="//parcels/OSAF/views/zaobao">
<core:version>0.3</core:version>
@@ -274,6 +275,10 @@
<children itemref="doc:Repository"/>
<children itemref="doc:Demo"/>
<children itemref="doc:ZaoBao"/>
+ <children itemref="doc:MixedView"/>
+ <children itemref="doc:CalendarView"/>
+ <children itemref="doc:ContactsView"/>
+ <children itemref="doc:NotesView"/>
</Node>
<Node itemName="Repository">
@@ -289,6 +294,26 @@
<Node itemName="ZaoBao">
<displayName>ZaoBao</displayName>
<item itemref="zaobao:ZaoBaoTab"/>
+ </Node>
+
+ <Node itemName="CalendarView">
+ <displayName>Calendar</displayName>
+ <item itemref="content:CalendarListView"/>
+ </Node>
+
+ <Node itemName="ContactsView">
+ <displayName>Contacts</displayName>
+ <item itemref="content:ContactListView"/>
+ </Node>
+
+ <Node itemName="NotesView">
+ <displayName>Notes</displayName>
+ <item itemref="content:NoteListView"/>
+ </Node>
+
+ <Node itemName="MixedView">
+ <displayName>Mixed</displayName>
+ <item itemref="content:MixedListView"/>
</Node>
<!--
Index: osaf/chandler/Chandler/Chandler-project.wpr
diff -u osaf/chandler/Chandler/Chandler-project.wpr:1.22 osaf/chandler/Chandler/Chandler-project.wpr:1.23
--- osaf/chandler/Chandler/Chandler-project.wpr:1.22 Thu Jan 22 13:37:01 2004
+++ osaf/chandler/Chandler/Chandler-project.wpr Tue Feb 3 13:25:24 2004
@@ -425,5 +425,5 @@
'repository/util/ext/uuid.h',
'version.py']
file_type = 'shared'
-main_debug_file = 'ChandlerNew.py'
+main_debug_file = 'Chandler.py'
version = '1.0'
Index: osaf/chandler/Chandler/parcels/OSAF/contentmodel/tests/GenerateItems.py
diff -u osaf/chandler/Chandler/parcels/OSAF/contentmodel/tests/GenerateItems.py:1.4 osaf/chandler/Chandler/parcels/OSAF/contentmodel/tests/GenerateItems.py:1.5
--- osaf/chandler/Chandler/parcels/OSAF/contentmodel/tests/GenerateItems.py:1.4 Mon Feb 2 01:27:33 2004
+++ osaf/chandler/Chandler/parcels/OSAF/contentmodel/tests/GenerateItems.py Tue Feb 3 13:25:26 2004
@@ -2,8 +2,8 @@
Generate sample items: calendar, contacts, etc.
"""
-__revision__ = "$Revision: 1.4 $"
-__date__ = "$Date: 2004/02/02 09:27:33 $"
+__revision__ = "$Revision: 1.5 $"
+__date__ = "$Date: 2004/02/03 21:25:26 $"
__copyright__ = "Copyright (c) 2003 Open Source Applications Foundation"
__license__ = "http://osafoundation.org/Chandler_0.1_license_terms.htm"
@@ -47,13 +47,17 @@
for index in range(count):
GenerateCalendarEvent(days)
-TITLES = ["Reading list", "Restaurant recommendation", "Vacation ideas",
- "Grocery list", "Gift ideas"]
+TITLES = ["reading list", "restaurant recommendation", "vacation ideas",
+ "grocery list", "gift ideas", "life goals", "fantastic recipe",
+ "garden plans", "funny joke", "story idea", "poem"]
def GenerateNote():
""" Generate one Note item """
note = Notes.Note()
note.title = random.choice(TITLES)
+ delta = DateTime.DateTimeDelta(random.randint(0, 5),
+ random.randint(0, 24))
+ note.createdOn = DateTime.now() + delta
def GenerateNotes(count):
""" Generate _count_ notes """
@@ -127,9 +131,9 @@
def GenerateContact():
contact = Contacts.Contact()
- contact.name = GenerateContactName()
- contact.homeSection = GenerateContactSection(contact.name)
- contact.workSection = GenerateContactSection(contact.name)
+ contact.contactName = GenerateContactName()
+ contact.homeSection = GenerateContactSection(contact.contactName)
+ contact.workSection = GenerateContactSection(contact.contactName)
def GenerateContacts(count):
for index in range(count):
Index: osaf/chandler/Chandler/parcels/OSAF/framework/blocks/parcel.xml
diff -u osaf/chandler/Chandler/parcels/OSAF/framework/blocks/parcel.xml:1.41 osaf/chandler/Chandler/parcels/OSAF/framework/blocks/parcel.xml:1.42
--- osaf/chandler/Chandler/parcels/OSAF/framework/blocks/parcel.xml:1.41 Mon Feb 2 08:35:55 2004
+++ osaf/chandler/Chandler/parcels/OSAF/framework/blocks/parcel.xml Tue Feb 3 13:25:27 2004
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.41 $ -->
-<!-- $Date: 2004/02/02 16:35:55 $ -->
+<!-- $Revision: 1.42 $ -->
+<!-- $Date: 2004/02/03 21:25:27 $ -->
<!-- Copyright (c) 2003 Open Source Applications Foundation -->
<!-- License: http://osafoundation.org/Chandler_0.1_license_terms.htm -->
@@ -101,6 +101,7 @@
<Enumeration itemName="queryEnumType">
<values>ContainerSearch</values>
<values>listOfItems</values>
+ <values>kind</values>
</Enumeration>
<Attribute itemName="queryEnum">
Index: osaf/chandler/Chandler/application/Application.py
diff -u osaf/chandler/Chandler/application/Application.py:1.199 osaf/chandler/Chandler/application/Application.py:1.200
--- osaf/chandler/Chandler/application/Application.py:1.199 Mon Feb 2 16:37:22 2004
+++ osaf/chandler/Chandler/application/Application.py Tue Feb 3 13:25:25 2004
@@ -1,5 +1,5 @@
-__version__ = "$Revision: 1.199 $"
-__date__ = "$Date: 2004/02/03 00:37:22 $"
+__version__ = "$Revision: 1.200 $"
+__date__ = "$Date: 2004/02/03 21:25:25 $"
__copyright__ = "Copyright (c) 2003 Open Source Applications Foundation"
__license__ = "http://osafoundation.org/Chandler_0.1_license_terms.htm"
@@ -238,6 +238,12 @@
Globals.notificationManager.Subscribe (events,
Globals.mainView.getUUID(),
Globals.mainView.dispatchEvent)
+
+ # @@@ KCP Hack to register the event
+ viewBlock = Globals.repository.find("//parcels/OSAF/views/content/MixedListView")
+ Globals.notificationManager.Subscribe(viewBlock.blockEvents,
+ viewBlock.getUUID(),
+ Globals.mainView.dispatchEvent)
mainView.render (self.mainFrame, self.mainFrame)
More information about the Commits
mailing list