[Commits] (john) - Added blockName to blocks and now use it in
cases where we used to use itemName. This was necessary
because itemNames get changed when blocks are copied to userData.
commits at osafoundation.org
commits at osafoundation.org
Sun Jul 18 17:01:17 PDT 2004
Commit by: john
Modified files:
chandler/parcels/osaf/contentmodel/parcel.xml 1.45 1.46
chandler/parcels/osaf/framework/blocks/Block.py 1.53 1.54
chandler/parcels/osaf/framework/blocks/ControlBlocks.py 1.84 1.85
chandler/parcels/osaf/framework/blocks/DynamicContainerBlocks.py 1.7 1.8
chandler/parcels/osaf/framework/blocks/parcel.xml 1.95 1.96
chandler/parcels/osaf/framework/blocks/detail/parcel.xml 1.10 1.11
chandler/parcels/osaf/framework/blocks/Events/parcel.xml 1.37 1.38
chandler/parcels/osaf/views/content/Content.py 1.18 1.19
chandler/parcels/osaf/views/content/parcel.xml 1.48 1.49
chandler/parcels/osaf/views/demo/parcel.xml 1.24 1.25
chandler/parcels/osaf/views/main/parcel.xml 1.72 1.73
Log message:
- Added blockName to blocks and now use it in cases where we used to use itemName. This was necessary because itemNames get changed when blocks are copied to userData.
- Added an untitled view tree that is now copied and added to the sidebar.
- Updated copy polidy on views, contents, etc. so the entire view is copies.
- Renamed a bunch of old lists that are now tables.
- Removed lots of no longer used delegates
- Added partial hack to work around broken ItemCollectikons.
ViewCVS links:
http://cvs.osafoundation.org/index.cgi/chandler/parcels/osaf/contentmodel/parcel.xml.diff?r1=text&tr1=1.45&r2=text&tr2=1.46
http://cvs.osafoundation.org/index.cgi/chandler/parcels/osaf/framework/blocks/Block.py.diff?r1=text&tr1=1.53&r2=text&tr2=1.54
http://cvs.osafoundation.org/index.cgi/chandler/parcels/osaf/framework/blocks/ControlBlocks.py.diff?r1=text&tr1=1.84&r2=text&tr2=1.85
http://cvs.osafoundation.org/index.cgi/chandler/parcels/osaf/framework/blocks/DynamicContainerBlocks.py.diff?r1=text&tr1=1.7&r2=text&tr2=1.8
http://cvs.osafoundation.org/index.cgi/chandler/parcels/osaf/framework/blocks/parcel.xml.diff?r1=text&tr1=1.95&r2=text&tr2=1.96
http://cvs.osafoundation.org/index.cgi/chandler/parcels/osaf/framework/blocks/detail/parcel.xml.diff?r1=text&tr1=1.10&r2=text&tr2=1.11
http://cvs.osafoundation.org/index.cgi/chandler/parcels/osaf/framework/blocks/Events/parcel.xml.diff?r1=text&tr1=1.37&r2=text&tr2=1.38
http://cvs.osafoundation.org/index.cgi/chandler/parcels/osaf/views/content/Content.py.diff?r1=text&tr1=1.18&r2=text&tr2=1.19
http://cvs.osafoundation.org/index.cgi/chandler/parcels/osaf/views/content/parcel.xml.diff?r1=text&tr1=1.48&r2=text&tr2=1.49
http://cvs.osafoundation.org/index.cgi/chandler/parcels/osaf/views/demo/parcel.xml.diff?r1=text&tr1=1.24&r2=text&tr2=1.25
http://cvs.osafoundation.org/index.cgi/chandler/parcels/osaf/views/main/parcel.xml.diff?r1=text&tr1=1.72&r2=text&tr2=1.73
Index: chandler/parcels/osaf/framework/blocks/Events/parcel.xml
diff -u chandler/parcels/osaf/framework/blocks/Events/parcel.xml:1.37 chandler/parcels/osaf/framework/blocks/Events/parcel.xml:1.38
--- chandler/parcels/osaf/framework/blocks/Events/parcel.xml:1.37 Wed Jul 14 12:23:19 2004
+++ chandler/parcels/osaf/framework/blocks/Events/parcel.xml Sun Jul 18 17:01:14 2004
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.37 $ -->
-<!-- $Date: 2004/07/14 19:23:19 $ -->
+<!-- $Revision: 1.38 $ -->
+<!-- $Date: 2004/07/19 00:01:14 $ -->
<!-- Copyright (c) 2003 Open Source Applications Foundation -->
<!-- License: http://osafoundation.org/Chandler_0.1_license_terms.htm -->
@@ -9,7 +9,9 @@
itsName="Events"
xmlns:core="http://osafoundation.org/parcels/core"
xmlns="http://osafoundation.org/parcels/osaf/framework/blocks"
- xmlns:events="http://osafoundation.org/parcels/osaf/framework/blocks/Events">
+ xmlns:events="http://osafoundation.org/parcels/osaf/framework/blocks/Events"
+ xmlns:content="http://osafoundation.org/parcels/osaf/views/content"
+ xmlns:doc="http://osafoundation.org/parcels/osaf/views/main">
<description>Events, need to be defined in a different parcel than the schema because
of a limitation of the XML format, which will be eliminated</description>
@@ -25,6 +27,7 @@
<subscribeAlwaysEvents itemref="events:Copy"/>
<subscribeAlwaysEvents itemref="events:Paste"/>
<subscribeAlwaysEvents itemref="events:Preferences"/>
+ <subscribeAlwaysEvents itemref="events:NewItemCollectionItem"/>
<subscribeAlwaysEvents itemref="events:ViewNavigationBar"/>
<subscribeAlwaysEvents itemref="events:SelectionChanged"/>
<subscribeAlwaysEvents itemref="events:EnterPressed"/>
@@ -76,6 +79,14 @@
<dispatchEnum>ActiveViewBubbleUp</dispatchEnum>
</BlockEvent>
+ <ModifyContentsEvent itsName="NewItemCollectionItem">
+ <dispatchEnum>SendToBlock</dispatchEnum>
+ <dispatchToBlock itemref="doc:Sidebar"/>
+ <methodName>onModifyContentsEvent</methodName>
+ <items itemref="content:UntitledView"/>
+ <copyItems>True</copyItems>
+ </ModifyContentsEvent>
+
<BlockEvent itsName="ViewNavigationBar">
<dispatchEnum>BroadcastInsideMyEventBoundary</dispatchEnum>
</BlockEvent>
Index: chandler/parcels/osaf/framework/blocks/ControlBlocks.py
diff -u chandler/parcels/osaf/framework/blocks/ControlBlocks.py:1.84 chandler/parcels/osaf/framework/blocks/ControlBlocks.py:1.85
--- chandler/parcels/osaf/framework/blocks/ControlBlocks.py:1.84 Thu Jul 15 15:27:06 2004
+++ chandler/parcels/osaf/framework/blocks/ControlBlocks.py Sun Jul 18 17:01:13 2004
@@ -1,5 +1,5 @@
-__version__ = "$Revision: 1.84 $"
-__date__ = "$Date: 2004/07/15 22:27:06 $"
+__version__ = "$Revision: 1.85 $"
+__date__ = "$Date: 2004/07/19 00:01:13 $"
__copyright__ = "Copyright (c) 2003 Open Source Applications Foundation"
__license__ = "http://osafoundation.org/Chandler_0.1_license_terms.htm"
@@ -460,8 +460,7 @@
"""
Hack to work around Stuarts bug #1568 -- DJA
"""
- if len (self.blockItem.contents) == 0:
- self.blockItem.contents._ItemCollection__refresh()
+ self.blockItem.contents._ItemCollection__refresh()
if self.blockItem.hideColumnHeadings:
self.SetColLabelSize (0)
Index: chandler/parcels/osaf/contentmodel/parcel.xml
diff -u chandler/parcels/osaf/contentmodel/parcel.xml:1.45 chandler/parcels/osaf/contentmodel/parcel.xml:1.46
--- chandler/parcels/osaf/contentmodel/parcel.xml:1.45 Sat Jul 17 12:26:45 2004
+++ chandler/parcels/osaf/contentmodel/parcel.xml Sun Jul 18 17:01:12 2004
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="iso-8859-1"?>
<!-- Parcel manifest for Pim Schema -->
-<!-- $Revision: 1.45 $ -->
-<!-- $Date: 2004/07/17 19:26:45 $ -->
+<!-- $Revision: 1.46 $ -->
+<!-- $Date: 2004/07/19 00:01:12 $ -->
<!-- Copyright (c) 2003 Open Source Applications Foundation -->
<!-- License: http://osafoundation.org/Chandler_0.1_license_terms.htm -->
@@ -321,6 +321,7 @@
<core:Attribute itsName="data">
<core:type itemref="core:Item"/>
<core:cardinality>list</core:cardinality>
+ <copyPolicy value="cascade"/>
</core:Attribute>
<core:Attribute itsName="queryOwner">
@@ -333,6 +334,7 @@
<core:type itemref="core:Item"/>
<core:cardinality>list</core:cardinality>
<initialValue/>
+ <copyPolicy value="cascade"/>
</core:Attribute>
<core:Kind itsName="Query">
@@ -365,18 +367,21 @@
<core:type itemref="Query"/>
<core:inverseAttribute itemref="queryOwner"/>
<initialValue ref="core:None"/>
+ <copyPolicy value="cascade"/>
</core:Attribute>
<core:Attribute itsName="inclusions">
<core:cardinality>list</core:cardinality>
<core:type itemref="core:UUID"/>
<initialValue/>
+ <copyPolicy value="cascade"/>
</core:Attribute>
<core:Attribute itsName="exclusions">
<core:cardinality>list</core:cardinality>
<core:type itemref="core:UUID"/>
<initialValue/>
+ <copyPolicy value="cascade"/>
</core:Attribute>
<core:Kind itsName="ItemCollection">
Index: chandler/parcels/osaf/framework/blocks/parcel.xml
diff -u chandler/parcels/osaf/framework/blocks/parcel.xml:1.95 chandler/parcels/osaf/framework/blocks/parcel.xml:1.96
--- chandler/parcels/osaf/framework/blocks/parcel.xml:1.95 Thu Jul 15 15:27:06 2004
+++ chandler/parcels/osaf/framework/blocks/parcel.xml Sun Jul 18 17:01:13 2004
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.95 $ -->
-<!-- $Date: 2004/07/15 22:27:06 $ -->
+<!-- $Revision: 1.96 $ -->
+<!-- $Date: 2004/07/19 00:01:13 $ -->
<!-- Copyright (c) 2003 Open Source Applications Foundation -->
<!-- License: http://osafoundation.org/Chandler_0.1_license_terms.htm -->
@@ -281,6 +281,7 @@
<Attribute itsName="contents">
<type itemref="contentModel:ItemCollection"/>
+ <copyPolicy value="cascade"/>
<inverseAttribute itemref="contentModel:collectionOwner"/>
</Attribute>
@@ -315,6 +316,11 @@
<defaultValue type="Boolean">False</defaultValue>
</Attribute>
+ <Attribute itsName="blockName">
+ <type itemref="String"/>
+ </Attribute>
+
+ <attributes itemref="docSchema:Block/blockName"/>
<attributes itemref="docSchema:Block/contents"/>
<attributes itemref="docSchema:Block/childrenBlocks"/>
<attributes itemref="docSchema:Block/parentBlock"/>
Index: chandler/parcels/osaf/framework/blocks/Block.py
diff -u chandler/parcels/osaf/framework/blocks/Block.py:1.53 chandler/parcels/osaf/framework/blocks/Block.py:1.54
--- chandler/parcels/osaf/framework/blocks/Block.py:1.53 Thu Jul 15 13:36:24 2004
+++ chandler/parcels/osaf/framework/blocks/Block.py Sun Jul 18 17:01:13 2004
@@ -1,5 +1,5 @@
-__version__ = "$Revision: 1.53 $"
-__date__ = "$Date: 2004/07/15 20:36:24 $"
+__version__ = "$Revision: 1.54 $"
+__date__ = "$Date: 2004/07/19 00:01:13 $"
__copyright__ = "Copyright (c) 2003 Open Source Applications Foundation"
__license__ = "http://osafoundation.org/Chandler_0.1_license_terms.htm"
@@ -187,7 +187,12 @@
operation = event.operation
for item in event.items:
if event.copyItems:
- pass # eventually item = copy of event.item
+ item = item.copy (None, #NewName
+ Globals.repository.findPath('//userdata')) #parent
+ """
+ Hack to work around Stuarts bug #1568 -- DJA
+ """
+ item.contents._ItemCollection__refresh()
if operation == 'toggle':
try:
index = self.contents.index (item)
Index: chandler/parcels/osaf/views/content/Content.py
diff -u chandler/parcels/osaf/views/content/Content.py:1.18 chandler/parcels/osaf/views/content/Content.py:1.19
--- chandler/parcels/osaf/views/content/Content.py:1.18 Tue Jul 6 16:04:39 2004
+++ chandler/parcels/osaf/views/content/Content.py Sun Jul 18 17:01:14 2004
@@ -1,5 +1,5 @@
-__version__ = "$Revision: 1.18 $"
-__date__ = "$Date: 2004/07/06 23:04:39 $"
+__version__ = "$Revision: 1.19 $"
+__date__ = "$Date: 2004/07/19 00:01:14 $"
__copyright__ = "Copyright (c) 2003 Open Source Applications Foundation"
__license__ = "http://osafoundation.org/Chandler_0.1_license_terms.htm"
@@ -46,63 +46,3 @@
HTMLText += "</body></html>"
Contacts
return HTMLText
-
-
-class ContactListDelegate(ControlBlocks.ListDelegate):
- def valOrEmpty(self, element, attrList):
- if len(attrList)==0:
- return element
- attr=attrList[0]
- if element.hasAttributeValue(attr):
- if element.getAttributeAspect(attr, "cardinality") == "single":
- r=element.getAttributeValue(attr)
- else:
- r=element.getAttributeValue(attr).first()
- return self.valOrEmpty(r, attrList[1:])
- else:
- return ""
-
- def GetElementValue (self, row, column):
- result = self.blockItem.contents [row]
- if column == 0:
- return self.valOrEmpty(result, ("contactName", "firstName"))
- elif column == 1:
- return self.valOrEmpty(result, ("contactName", "lastName"))
- elif column == 2:
- return self.valOrEmpty(result, ("homeSection", "phoneNumbers", "phoneNumber"))
- elif column == 3:
- return self.valOrEmpty(result, ("homeSection", "emailAddresses", "emailAddress"))
- elif __debug__:
- assert False, "Bad column"
- return ""
-
-class MixedListDelegate(ControlBlocks.ListDelegate):
- def GetElementValue (self, row, column):
- result = self.blockItem.contents [row]
- if column == 0:
- return result.who
- elif column == 1:
- return result.about
- elif column == 2:
- return result.date
- elif __debug__:
- assert False, "Bad column"
- return ""
-
-
-class NoteListDelegate(ControlBlocks.ListDelegate):
- def GetElementValue (self, row, column):
- result = self.blockItem.contents [row]
- if column == 0:
- try:
- return result.about
- except AttributeError:
- return ""
- elif column == 1:
- try:
- return result.date
- except AttributeError:
- return ""
- elif __debug__:
- assert False, "Bad column"
- return ""
Index: chandler/parcels/osaf/views/demo/parcel.xml
diff -u chandler/parcels/osaf/views/demo/parcel.xml:1.24 chandler/parcels/osaf/views/demo/parcel.xml:1.25
--- chandler/parcels/osaf/views/demo/parcel.xml:1.24 Thu Jul 15 18:37:42 2004
+++ chandler/parcels/osaf/views/demo/parcel.xml Sun Jul 18 17:01:15 2004
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.24 $ -->
-<!-- $Date: 2004/07/16 01:37:42 $ -->
+<!-- $Revision: 1.25 $ -->
+<!-- $Date: 2004/07/19 00:01:15 $ -->
<!-- Copyright (c) 2003 Open Source Applications Foundation -->
<!-- License: http://osafoundation.org/Chandler_0.1_license_terms.htm -->
@@ -71,6 +71,7 @@
Menus
-->
<Menu itsName="DemoMenu">
+ <blockName>DemoMenu</blockName>
<title>Block Demo</title>
<itemLocation>HelpMenu</itemLocation>
<helpString></helpString>
@@ -80,6 +81,7 @@
Menu Items
-->
<MenuItem itsName="IntroMenuItem">
+ <blockName>IntroMenuItem</blockName>
<title>Intro Tab</title>
<location>DemoMenu</location>
<menuItemKind>Radio</menuItemKind>
@@ -88,6 +90,7 @@
</MenuItem>
<MenuItem itsName="ButtonsMenuItem">
+ <blockName>ButtonsMenuItem</blockName>
<title>Buttons Tab</title>
<location>DemoMenu</location>
<menuItemKind>Radio</menuItemKind>
@@ -96,6 +99,7 @@
</MenuItem>
<MenuItem itsName="ControlsMenuItem">
+ <blockName>ControlsMenuItem</blockName>
<title>Controls Tab</title>
<location>DemoMenu</location>
<menuItemKind>Radio</menuItemKind>
@@ -104,6 +108,7 @@
</MenuItem>
<MenuItem itsName="HTMLMenuItem">
+ <blockName>HTMLMenuItem</blockName>
<title>HTML Tab</title>
<location>DemoMenu</location>
<menuItemKind>Radio</menuItemKind>
Index: chandler/parcels/osaf/framework/blocks/DynamicContainerBlocks.py
diff -u chandler/parcels/osaf/framework/blocks/DynamicContainerBlocks.py:1.7 chandler/parcels/osaf/framework/blocks/DynamicContainerBlocks.py:1.8
--- chandler/parcels/osaf/framework/blocks/DynamicContainerBlocks.py:1.7 Tue Jul 13 06:18:07 2004
+++ chandler/parcels/osaf/framework/blocks/DynamicContainerBlocks.py Sun Jul 18 17:01:13 2004
@@ -1,5 +1,5 @@
-__version__ = "$Revision: 1.7 $"
-__date__ = "$Date: 2004/07/13 13:18:07 $"
+__version__ = "$Revision: 1.8 $"
+__date__ = "$Date: 2004/07/19 00:01:13 $"
__copyright__ = "Copyright (c) 2004 Open Source Applications Foundation"
__license__ = "http://osafoundation.org/Chandler_0.1_license_terms.htm"
@@ -164,6 +164,12 @@
This list of children is in "dynamicChildren" and the
back pointer is in "dynamicParent".
"""
+ def itemNameAccessor(self, item):
+ """
+ Use blockName for the accessor
+ """
+ return item.blockName
+
def rebuildDynamicContainers(cls, startingAtBlock, dynamicChildBlock):
"""
rebuildDynamicContainers rebuilds the dynamic
@@ -205,7 +211,7 @@
# pick up container definitions
if isinstance (child, DynamicContainer):
child.dynamicChildren = [] # rebuild children from scratch
- containers [child.itsName] = child
+ containers [child.blockName] = child
def rebuildChildren(block, containers):
"""
@@ -234,8 +240,8 @@
# Shouldn't have items with the same name, unless they are the same
if __debug__:
if not child in bar:
- if bar.has_key(child.itsName):
- logging.warning("%s already has a %s named %s" % (bar.itsName, child.itsKind, child.itsName))
+ if bar.has_key(child.blockName):
+ logging.warning("%s already has a %s named %s" % (bar.blockName, child.blockName, child.blockName))
i = bar.index(child.itemLocation)
bar.insert(i, child)
elif child.operation == 'Replace':
@@ -273,7 +279,7 @@
# Help users who forget to put a location attribute on a menuItem or toolbarItem
for menu in containers['MenuBar']:
assert isinstance(menu, Menu), "Non-Menu block named %s found in \
- Menu Bar (specify a location attribute)" % menu.itsName
+ Menu Bar (specify a location attribute)" % menu.blockName
for bar in containers.values():
bar.synchronizeWidget()
rebuildDynamicContainers=classmethod(rebuildDynamicContainers)
Index: chandler/parcels/osaf/framework/blocks/detail/parcel.xml
diff -u chandler/parcels/osaf/framework/blocks/detail/parcel.xml:1.10 chandler/parcels/osaf/framework/blocks/detail/parcel.xml:1.11
--- chandler/parcels/osaf/framework/blocks/detail/parcel.xml:1.10 Sat Jul 17 12:26:47 2004
+++ chandler/parcels/osaf/framework/blocks/detail/parcel.xml Sun Jul 18 17:01:13 2004
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.10 $ -->
-<!-- $Date: 2004/07/17 19:26:47 $ -->
+<!-- $Revision: 1.11 $ -->
+<!-- $Date: 2004/07/19 00:01:13 $ -->
<!-- Copyright (c) 2003 Open Source Applications Foundation -->
<!-- License: http://osafoundation.org/Chandler_0.1_license_terms.htm -->
@@ -104,6 +104,7 @@
<!-- MarkupBar -->
<Toolbar itemName="MarkupBar1"
itemClass="osaf.framework.blocks.detail.Detail.MarkupBar">
+ <blockName>MarkupBar1</blockName>
<!-- Dynamic Children -->
<dynamicChildren itemref="doc:TriageButton"/>
<dynamicChildren itemref="doc:Triage"/>
@@ -133,7 +134,7 @@
ToolbarItems
-->
<ToolbarItem itsName="TriageButton">
- <!-- Attributes -->
+ <blockName>TriageButton</blockName>
<location>MarkupBar1</location>
<dynamicParent itemref="doc:MarkupBar1"/>
<title>Triage</title>
@@ -145,7 +146,7 @@
</ToolbarItem>
<ToolbarItem itsName="Triage">
- <!-- Attributes -->
+ <blockName>Triage</blockName>
<location>MarkupBar1</location>
<dynamicParent itemref="doc:MarkupBar1"/>
<title>Triage</title>
@@ -165,7 +166,7 @@
<ToolbarItem itsName="SharingButton"
itemClass="osaf.framework.blocks.detail.Detail.SharingButton">
- <!-- Attributes -->
+ <blockName>SharingButton</blockName>
<location>MarkupBar1</location>
<dynamicParent itemref="doc:MarkupBar1"/>
<title>Sharing</title>
@@ -178,7 +179,7 @@
<ToolbarItem itsName="TaskStamp"
itemClass="osaf.framework.blocks.detail.Detail.TaskStamp">
- <!-- Attributes -->
+ <blockName>TaskStamp</blockName>
<location>MarkupBar1</location>
<dynamicParent itemref="doc:MarkupBar1"/>
<title>Task</title>
@@ -191,7 +192,7 @@
<ToolbarItem itsName="CalendarStamp"
itemClass="osaf.framework.blocks.detail.Detail.CalendarStamp">
- <!-- Attributes -->
+ <blockName>CalendarStamp</blockName>
<location>MarkupBar1</location>
<dynamicParent itemref="doc:MarkupBar1"/>
<title>Calendar</title>
@@ -203,14 +204,14 @@
</ToolbarItem>
<ToolbarItem itsName="Spacer1">
- <!-- Attributes -->
+ <blockName>Spacer1</blockName>
<location>MarkupBar1</location>
<dynamicParent itemref="doc:MarkupBar1"/>
<toolbarItemKind>Separator</toolbarItemKind>
</ToolbarItem>
<ToolbarItem itsName="NeedsReplyButton">
- <!-- Attributes -->
+ <blockName>NeedsReplyButton</blockName>
<location>MarkupBar1</location>
<dynamicParent itemref="doc:MarkupBar1"/>
<title>Needs reply</title>
@@ -222,7 +223,7 @@
</ToolbarItem>
<ToolbarItem itsName="Spacer2">
- <!-- Attributes -->
+ <blockName>Spacer2</blockName>
<location>MarkupBar1</location>
<dynamicParent itemref="doc:MarkupBar1"/>
<toolbarItemKind>Separator</toolbarItemKind>
@@ -230,7 +231,7 @@
</ToolbarItem>
<ToolbarItem itsName="OutboxFlag">
- <!-- Attributes -->
+ <blockName>OutboxFlag</blockName>
<location>MarkupBar1</location>
<dynamicParent itemref="doc:MarkupBar1"/>
<title>Outbox</title>
@@ -241,7 +242,7 @@
</ToolbarItem>
<ToolbarItem itsName="RepliedFlag">
- <!-- Attributes -->
+ <blockName>RepliedFlag</blockName>
<location>MarkupBar1</location>
<dynamicParent itemref="doc:MarkupBar1"/>
<title>Replied</title>
@@ -252,7 +253,7 @@
</ToolbarItem>
<ToolbarItem itsName="ForwardedFlag">
- <!-- Attributes -->
+ <blockName>ForwardedFlag</blockName>
<location>MarkupBar1</location>
<dynamicParent itemref="doc:MarkupBar1"/>
<title>Forwarded</title>
@@ -263,7 +264,7 @@
</ToolbarItem>
<ToolbarItem itsName="RedirectedFlag">
- <!-- Attributes -->
+ <blockName>RedirectedFlag</blockName>
<location>MarkupBar1</location>
<dynamicParent itemref="doc:MarkupBar1"/>
<title>Redirected</title>
@@ -274,7 +275,7 @@
</ToolbarItem>
<ToolbarItem itsName="DraftFlag">
- <!-- Attributes -->
+ <blockName>DraftFlag</blockName>
<location>MarkupBar1</location>
<dynamicParent itemref="doc:MarkupBar1"/>
<title>Draft</title>
@@ -285,7 +286,7 @@
</ToolbarItem>
<ToolbarItem itsName="QueuedFlag">
- <!-- Attributes -->
+ <blockName>QueuedFlag</blockName>
<location>MarkupBar1</location>
<dynamicParent itemref="doc:MarkupBar1"/>
<title>Queued</title>
@@ -296,7 +297,7 @@
</ToolbarItem>
<ToolbarItem itsName="Spacer3">
- <!-- Attributes -->
+ <blockName>Spacer3</blockName>
<location>MarkupBar1</location>
<dynamicParent itemref="doc:MarkupBar1"/>
<toolbarItemKind>Separator</toolbarItemKind>
@@ -304,7 +305,7 @@
</ToolbarItem>
<ToolbarItem itsName="PrivateButton">
- <!-- Attributes -->
+ <blockName>PrivateButton</blockName>
<location>MarkupBar1</location>
<dynamicParent itemref="doc:MarkupBar1"/>
<title>Private</title>
Index: chandler/parcels/osaf/views/content/parcel.xml
diff -u chandler/parcels/osaf/views/content/parcel.xml:1.48 chandler/parcels/osaf/views/content/parcel.xml:1.49
--- chandler/parcels/osaf/views/content/parcel.xml:1.48 Sat Jul 17 12:26:48 2004
+++ chandler/parcels/osaf/views/content/parcel.xml Sun Jul 18 17:01:14 2004
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.48 $ -->
-<!-- $Date: 2004/07/17 19:26:48 $ -->
+<!-- $Revision: 1.49 $ -->
+<!-- $Date: 2004/07/19 00:01:14 $ -->
<!-- Copyright (c) 2004 Open Source Applications Foundation -->
<!-- License: http://osafoundation.org/Chandler_0.1_license_terms.htm -->
@@ -78,6 +78,11 @@
<rule itemref="view:mixedQuery"/>
</contentModel:NamedCollection>
+ <contentModel:NamedCollection itsName="untitledItemCollection">
+ <displayName>Untitled</displayName>
+ <rule itemref="view:mixedQuery"/>
+ </contentModel:NamedCollection>
+
<contentModel:Query itsName="inQuery">
</contentModel:Query>
@@ -168,12 +173,12 @@
<BoxContainer itsName="InSummary">
<childrenBlocks itemref="view:LayoutSelector3"/>
- <childrenBlocks itemref="view:InList"/>
+ <childrenBlocks itemref="view:InTable"/>
<orientationEnum>Vertical</orientationEnum>
</BoxContainer>
- <!-- In List -->
- <Table itsName="InList">
+ <!-- In Table -->
+ <Table itsName="InTable">
<contents itemref="view:inItemCollection"/>
<columnHeadings>who</columnHeadings>
@@ -191,12 +196,12 @@
<BoxContainer itsName="OutSummary">
<childrenBlocks itemref="view:LayoutSelector2"/>
- <childrenBlocks itemref="view:OutList"/>
+ <childrenBlocks itemref="view:OutTable"/>
<orientationEnum>Vertical</orientationEnum>
</BoxContainer>
- <!-- Out List -->
- <Table itsName="OutList">
+ <!-- Out Table -->
+ <Table itsName="OutTable">
<contents itemref="view:outItemCollection"/>
<columnHeadings>who</columnHeadings>
@@ -214,15 +219,15 @@
<ChoiceContainer itsName="CalendarSummary">
<childrenBlocks itemref="view:LayoutSelector"/>
- <choices itemref="view:CalendarList"/>
+ <choices itemref="view:CalendarTable"/>
<choices itemref="view:SummaryMonth"/>
<choices itemref="view:SummaryWeek"/>
<choices itemref="view:SummaryDay"/>
<orientationEnum>Vertical</orientationEnum>
</ChoiceContainer>
- <!-- Calendar List -->
- <Table itsName="CalendarList">
+ <!-- Calendar Table -->
+ <Table itsName="CalendarTable">
<contents itemref="view:calendarItemCollection"/>
<columnHeadings>who</columnHeadings>
@@ -240,12 +245,12 @@
<BoxContainer itsName="ContactSummary">
<childrenBlocks itemref="view:LayoutSelector4"/>
- <childrenBlocks itemref="view:ContactList"/>
+ <childrenBlocks itemref="view:ContactTable"/>
<orientationEnum>Vertical</orientationEnum>
</BoxContainer>
- <!-- Contact List -->
- <Table itsName="ContactList">
+ <!-- Contact Table -->
+ <Table itsName="ContactTable">
<contents itemref="view:contactItemCollection"/>
<columnHeadings>who</columnHeadings>
@@ -261,8 +266,8 @@
<columnWidths>170</columnWidths>
</Table>
- <!-- Note List -->
- <Table itsName="NoteList">
+ <!-- Note Table -->
+ <Table itsName="NoteTable">
<contents itemref="view:notesItemCollection"/>
<columnHeadings>who</columnHeadings>
@@ -278,8 +283,8 @@
<columnWidths>170</columnWidths>
</Table>
- <!-- Task List -->
- <Table itsName="TaskList">
+ <!-- Task Table -->
+ <Table itsName="TaskTable">
<contents itemref="view:taskItemCollection"/>
<columnHeadings>who</columnHeadings>
@@ -295,8 +300,8 @@
<columnWidths>170</columnWidths>
</Table>
- <!-- Mail List -->
- <Table itsName="MailList">
+ <!-- Mail Table -->
+ <Table itsName="MailTable">
<contents itemref="view:mailItemCollection"/>
<columnHeadings>who</columnHeadings>
@@ -314,12 +319,12 @@
<BoxContainer itsName="JunkSummary">
<childrenBlocks itemref="view:LayoutSelector5"/>
- <childrenBlocks itemref="view:JunkList"/>
+ <childrenBlocks itemref="view:JunkTable"/>
<orientationEnum>Vertical</orientationEnum>
</BoxContainer>
- <!-- Junk List -->
- <Table itsName="JunkList">
+ <!-- Junk Table -->
+ <Table itsName="JunkTable">
<contents itemref="view:junkItemCollection"/>
<columnHeadings>who</columnHeadings>
@@ -337,12 +342,12 @@
<BoxContainer itsName="TrashSummary">
<childrenBlocks itemref="view:LayoutSelector6"/>
- <childrenBlocks itemref="view:TrashList"/>
+ <childrenBlocks itemref="view:TrashTable"/>
<orientationEnum>Vertical</orientationEnum>
</BoxContainer>
- <!-- Trash List -->
- <Table itsName="TrashList">
+ <!-- Trash Table -->
+ <Table itsName="TrashTable">
<contents itemref="view:trashItemCollection"/>
<columnHeadings>who</columnHeadings>
@@ -358,6 +363,23 @@
<columnWidths>170</columnWidths>
</Table>
+ <!-- Untitled Table -->
+ <Table itsName="UntitledTable">
+ <contents itemref="view:inItemCollection"/>
+
+ <columnHeadings>who</columnHeadings>
+ <columnHeadings>about</columnHeadings>
+ <columnHeadings>date</columnHeadings>
+
+ <columnAttributeNames>who</columnAttributeNames>
+ <columnAttributeNames>about</columnAttributeNames>
+ <columnAttributeNames>date</columnAttributeNames>
+
+ <columnWidths>270</columnWidths>
+ <columnWidths>150</columnWidths>
+ <columnWidths>170</columnWidths>
+ </Table>
+
<ItemDetail itsName="MixedItemDetail"
itemClass="osaf.views.content.Content.ContentItemDetail">
</ItemDetail>
@@ -388,6 +410,7 @@
<!-- LayoutSelector -->
<Toolbar itemName="LayoutSelector">
+ <blockName>LayoutSelector</blockName>
<childrenBlocks itemref="view:ListViewButton"/>
<childrenBlocks itemref="view:MonthViewButton"/>
<childrenBlocks itemref="view:WeekViewButton"/>
@@ -407,6 +430,7 @@
<!-- LayoutSelector2 -->
<Toolbar itemName="LayoutSelector2">
+ <blockName>LayoutSelector2</blockName>
<childrenBlocks itemref="view:ListViewButton2"/>
<childrenBlocks itemref="view:MonthViewButton2"/>
<childrenBlocks itemref="view:WeekViewButton2"/>
@@ -426,6 +450,7 @@
<!-- LayoutSelector3 -->
<Toolbar itemName="LayoutSelector3">
+ <blockName>LayoutSelector3</blockName>
<childrenBlocks itemref="view:ListViewButton3"/>
<childrenBlocks itemref="view:MonthViewButton3"/>
<childrenBlocks itemref="view:WeekViewButton3"/>
@@ -445,6 +470,7 @@
<!-- LayoutSelector4 -->
<Toolbar itemName="LayoutSelector4">
+ <blockName>LayoutSelector4</blockName>
<childrenBlocks itemref="view:ListViewButton4"/>
<childrenBlocks itemref="view:MonthViewButton4"/>
<childrenBlocks itemref="view:WeekViewButton4"/>
@@ -464,6 +490,7 @@
<!-- LayoutSelector5 -->
<Toolbar itemName="LayoutSelector5">
+ <blockName>LayoutSelector5</blockName>
<childrenBlocks itemref="view:ListViewButton5"/>
<childrenBlocks itemref="view:MonthViewButton5"/>
<childrenBlocks itemref="view:WeekViewButton5"/>
@@ -483,6 +510,7 @@
<!-- LayoutSelector6 -->
<Toolbar itemName="LayoutSelector6">
+ <blockName>LayoutSelector6</blockName>
<childrenBlocks itemref="view:ListViewButton6"/>
<childrenBlocks itemref="view:MonthViewButton6"/>
<childrenBlocks itemref="view:WeekViewButton6"/>
@@ -510,6 +538,7 @@
ToolbarItems
-->
<ToolbarItem itsName="ListViewButton">
+ <blockName>ListViewButton</blockName>
<location>LayoutSelector</location>
<dynamicParent itemref="view:LayoutSelector"/>
<title>List View</title>
@@ -521,6 +550,7 @@
</ToolbarItem>
<ToolbarItem itsName="MonthViewButton">
+ <blockName>MonthViewButton</blockName>
<location>LayoutSelector</location>
<dynamicParent itemref="view:LayoutSelector"/>
<title>Month View</title>
@@ -532,6 +562,7 @@
</ToolbarItem>
<ToolbarItem itsName="WeekViewButton">
+ <blockName>WeekViewButton</blockName>
<location>LayoutSelector</location>
<dynamicParent itemref="view:LayoutSelector"/>
<title>Week View</title>
@@ -543,6 +574,7 @@
</ToolbarItem>
<ToolbarItem itsName="DayViewButton">
+ <blockName>DayViewButton</blockName>
<location>LayoutSelector</location>
<dynamicParent itemref="view:LayoutSelector"/>
<title>Day View</title>
@@ -554,6 +586,7 @@
</ToolbarItem>
<ToolbarItem itsName="ListViewButton2">
+ <blockName>ListViewButton2</blockName>
<location>LayoutSelector2</location>
<dynamicParent itemref="view:LayoutSelector2"/>
<title>List View</title>
@@ -565,6 +598,7 @@
</ToolbarItem>
<ToolbarItem itsName="MonthViewButton2">
+ <blockName>MonthViewButton2</blockName>
<location>LayoutSelector2</location>
<dynamicParent itemref="view:LayoutSelector2"/>
<title>Month View</title>
@@ -576,6 +610,7 @@
</ToolbarItem>
<ToolbarItem itsName="WeekViewButton2">
+ <blockName>WeekViewButton2</blockName>
<location>LayoutSelector2</location>
<dynamicParent itemref="view:LayoutSelector2"/>
<title>Week View</title>
@@ -587,6 +622,7 @@
</ToolbarItem>
<ToolbarItem itsName="DayViewButton2">
+ <blockName>DayViewButton2</blockName>
<location>LayoutSelector2</location>
<dynamicParent itemref="view:LayoutSelector2"/>
<title>Day View</title>
@@ -598,6 +634,7 @@
</ToolbarItem>
<ToolbarItem itsName="ListViewButton3">
+ <blockName>ListViewButton3</blockName>
<location>LayoutSelector3</location>
<dynamicParent itemref="view:LayoutSelector3"/>
<title>List View</title>
@@ -609,6 +646,7 @@
</ToolbarItem>
<ToolbarItem itsName="MonthViewButton3">
+ <blockName>MonthViewButton3</blockName>
<location>LayoutSelector3</location>
<dynamicParent itemref="view:LayoutSelector3"/>
<title>Month View</title>
@@ -620,6 +658,7 @@
</ToolbarItem>
<ToolbarItem itsName="WeekViewButton3">
+ <blockName>WeekViewButton3</blockName>
<location>LayoutSelector3</location>
<dynamicParent itemref="view:LayoutSelector3"/>
<title>Week View</title>
@@ -631,6 +670,7 @@
</ToolbarItem>
<ToolbarItem itsName="DayViewButton3">
+ <blockName>DayViewButton3</blockName>
<location>LayoutSelector3</location>
<dynamicParent itemref="view:LayoutSelector3"/>
<title>Day View</title>
@@ -642,6 +682,7 @@
</ToolbarItem>
<ToolbarItem itsName="ListViewButton4">
+ <blockName>ListViewButton4</blockName>
<location>LayoutSelector4</location>
<dynamicParent itemref="view:LayoutSelector4"/>
<title>List View</title>
@@ -653,6 +694,7 @@
</ToolbarItem>
<ToolbarItem itsName="MonthViewButton4">
+ <blockName>MonthViewButton4</blockName>
<location>LayoutSelector4</location>
<dynamicParent itemref="view:LayoutSelector4"/>
<title>Month View</title>
@@ -664,6 +706,7 @@
</ToolbarItem>
<ToolbarItem itsName="WeekViewButton4">
+ <blockName>WeekViewButton4</blockName>
<location>LayoutSelector4</location>
<dynamicParent itemref="view:LayoutSelector4"/>
<title>Week View</title>
@@ -675,6 +718,7 @@
</ToolbarItem>
<ToolbarItem itsName="DayViewButton4">
+ <blockName>DayViewButton4</blockName>
<location>LayoutSelector4</location>
<dynamicParent itemref="view:LayoutSelector4"/>
<title>Day View</title>
@@ -686,6 +730,7 @@
</ToolbarItem>
<ToolbarItem itsName="ListViewButton5">
+ <blockName>ListViewButton5</blockName>
<location>LayoutSelector5</location>
<dynamicParent itemref="view:LayoutSelector5"/>
<title>List View</title>
@@ -697,6 +742,7 @@
</ToolbarItem>
<ToolbarItem itsName="MonthViewButton5">
+ <blockName>MonthViewButton5</blockName>
<location>LayoutSelector5</location>
<dynamicParent itemref="view:LayoutSelector5"/>
<title>Month View</title>
@@ -708,6 +754,7 @@
</ToolbarItem>
<ToolbarItem itsName="WeekViewButton5">
+ <blockName>WeekViewButton5</blockName>
<location>LayoutSelector5</location>
<dynamicParent itemref="view:LayoutSelector5"/>
<title>Week View</title>
@@ -719,6 +766,7 @@
</ToolbarItem>
<ToolbarItem itsName="DayViewButton5">
+ <blockName>DayViewButton5</blockName>
<location>LayoutSelector5</location>
<dynamicParent itemref="view:LayoutSelector5"/>
<title>Day View</title>
@@ -730,6 +778,7 @@
</ToolbarItem>
<ToolbarItem itsName="ListViewButton6">
+ <blockName>ListViewButton6</blockName>
<location>LayoutSelector6</location>
<dynamicParent itemref="view:LayoutSelector6"/>
<title>List View</title>
@@ -741,6 +790,7 @@
</ToolbarItem>
<ToolbarItem itsName="MonthViewButton6">
+ <blockName>MonthViewButton6</blockName>
<location>LayoutSelector6</location>
<dynamicParent itemref="view:LayoutSelector6"/>
<title>Month View</title>
@@ -752,6 +802,7 @@
</ToolbarItem>
<ToolbarItem itsName="WeekViewButton6">
+ <blockName>WeekViewButton6</blockName>
<location>LayoutSelector6</location>
<dynamicParent itemref="view:LayoutSelector6"/>
<title>Week View</title>
@@ -763,6 +814,7 @@
</ToolbarItem>
<ToolbarItem itsName="DayViewButton6">
+ <blockName>DayViewButton6</blockName>
<location>LayoutSelector6</location>
<dynamicParent itemref="view:LayoutSelector6"/>
<title>Day View</title>
@@ -774,10 +826,10 @@
</ToolbarItem>
<!-- Note View -->
- <SplitterWindow itsName="NoteListView">
+ <SplitterWindow itsName="NoteTableView">
<contents itemref="view:notesItemCollection"/>
- <childrenBlocks itemref="view:NoteList"/>
+ <childrenBlocks itemref="view:NoteTable"/>
<childrenBlocks itemref="detail:DetailRoot"/>
<eventBoundary>True</eventBoundary>
@@ -786,10 +838,10 @@
</SplitterWindow>
<!-- Task View -->
- <SplitterWindow itsName="TaskListView">
+ <SplitterWindow itsName="TaskTableView">
<contents itemref="view:taskItemCollection"/>
- <childrenBlocks itemref="view:TaskList"/>
+ <childrenBlocks itemref="view:TaskTable"/>
<childrenBlocks itemref="detail:DetailRoot" copy="DetailRoot"/>
<eventBoundary>True</eventBoundary>
@@ -798,10 +850,10 @@
</SplitterWindow>
<!-- Mail View -->
- <SplitterWindow itsName="MailListView">
+ <SplitterWindow itsName="MailTableView">
<contents itemref="view:mailItemCollection"/>
- <childrenBlocks itemref="view:MailList"/>
+ <childrenBlocks itemref="view:MailTable"/>
<childrenBlocks itemref="detail:DetailRoot" copy="DetailRoot"/>
<eventBoundary>True</eventBoundary>
@@ -821,7 +873,7 @@
</SplitterWindow>
<!-- In View -->
- <SplitterWindow itsName="InListView">
+ <SplitterWindow itsName="InTableView">
<contents itemref="view:inItemCollection"/>
<childrenBlocks itemref="view:InSummary"/>
@@ -833,7 +885,7 @@
</SplitterWindow>
<!-- Out View -->
- <SplitterWindow itsName="OutListView">
+ <SplitterWindow itsName="OutTableView">
<contents itemref="view:outItemCollection"/>
<childrenBlocks itemref="view:OutSummary"/>
@@ -845,7 +897,7 @@
</SplitterWindow>
<!-- Calendar View -->
- <SplitterWindow itsName="CalendarListView">
+ <SplitterWindow itsName="CalendarTableView">
<contents itemref="view:calendarItemCollection"/>
<childrenBlocks itemref="view:CalendarSummary"/>
@@ -857,7 +909,7 @@
</SplitterWindow>
<!-- Contact View -->
- <SplitterWindow itsName="ContactListView">
+ <SplitterWindow itsName="ContactTableView">
<contents itemref="view:contactItemCollection"/>
<childrenBlocks itemref="view:ContactSummary"/>
@@ -868,7 +920,7 @@
</SplitterWindow>
<!-- Junk View -->
- <SplitterWindow itsName="JunkListView">
+ <SplitterWindow itsName="JunkTableView">
<contents itemref="view:junkItemCollection"/>
<childrenBlocks itemref="view:JunkSummary"/>
@@ -879,7 +931,7 @@
</SplitterWindow>
<!-- Trash View -->
- <SplitterWindow itsName="TrashListView">
+ <SplitterWindow itsName="TrashTableView">
<contents itemref="view:trashItemCollection"/>
<childrenBlocks itemref="view:TrashSummary"/>
@@ -889,4 +941,15 @@
<border>1.0, 1.0, 1.0, 1.0</border>
</SplitterWindow>
+ <!-- Untitled View -->
+ <SplitterWindow itsName="UntitledView">
+ <contents itemref="view:untitledItemCollection"/>
+
+ <childrenBlocks itemref="view:UntitledTable"/>
+ <childrenBlocks itemref="detail:DetailRoot" copy="DetailRoot"/>
+
+ <eventBoundary>True</eventBoundary>
+ <border>1.0, 1.0, 1.0, 1.0</border>
+ </SplitterWindow>
+
</core:Parcel>
Index: chandler/parcels/osaf/views/main/parcel.xml
diff -u chandler/parcels/osaf/views/main/parcel.xml:1.72 chandler/parcels/osaf/views/main/parcel.xml:1.73
--- chandler/parcels/osaf/views/main/parcel.xml:1.72 Thu Jul 15 15:27:06 2004
+++ chandler/parcels/osaf/views/main/parcel.xml Sun Jul 18 17:01:15 2004
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.72 $ -->
-<!-- $Date: 2004/07/15 22:27:06 $ -->
+<!-- $Revision: 1.73 $ -->
+<!-- $Date: 2004/07/19 00:01:15 $ -->
<!-- Copyright (c) 2003 Open Source Applications Foundation -->
<!-- License: http://osafoundation.org/Chandler_0.1_license_terms.htm -->
@@ -116,9 +116,9 @@
<items itemref="repository:RepositoryView"/>
<items itemref="content:MixedListView"/>
<items itemref="stockQuote:StockQuoteView"/>
- <items itemref="content:NoteListView"/>
- <items itemref="content:TaskListView"/>
- <items itemref="content:MailListView"/>
+ <items itemref="content:NoteTableView"/>
+ <items itemref="content:TaskTableView"/>
+ <items itemref="content:MailTableView"/>
</ModifyContentsEvent>
<ModifyContentsEvent itsName="AddDemoView">
@@ -149,69 +149,77 @@
<items itemref="stockQuote:StockQuoteView"/>
</ModifyContentsEvent>
- <ModifyContentsEvent itsName="AddNoteListView">
+ <ModifyContentsEvent itsName="AddNoteTableView">
<dispatchEnum>SendToBlock</dispatchEnum>
<dispatchToBlock itemref="doc:Sidebar"/>
<methodName>onModifyContentsEvent</methodName>
- <items itemref="content:NoteListView"/>
+ <items itemref="content:NoteTableView"/>
</ModifyContentsEvent>
- <ModifyContentsEvent itsName="AddTaskListView">
+ <ModifyContentsEvent itsName="AddTaskTableView">
<dispatchEnum>SendToBlock</dispatchEnum>
<dispatchToBlock itemref="doc:Sidebar"/>
<methodName>onModifyContentsEvent</methodName>
- <items itemref="content:TaskListView"/>
+ <items itemref="content:TaskTableView"/>
</ModifyContentsEvent>
- <ModifyContentsEvent itsName="AddMailListView">
+ <ModifyContentsEvent itsName="AddMailTableView">
<dispatchEnum>SendToBlock</dispatchEnum>
<dispatchToBlock itemref="doc:Sidebar"/>
<methodName>onModifyContentsEvent</methodName>
- <items itemref="content:MailListView"/>
+ <items itemref="content:MailTableView"/>
</ModifyContentsEvent>
<ModifyContentsEvent itsName="AddKindViews">
<dispatchEnum>SendToBlock</dispatchEnum>
<dispatchToBlock itemref="doc:Sidebar"/>
<methodName>onModifyContentsEvent</methodName>
- <items itemref="content:NoteListView"/>
- <items itemref="content:TaskListView"/>
- <items itemref="content:MailListView"/>
+ <items itemref="content:NoteTableView"/>
+ <items itemref="content:TaskTableView"/>
+ <items itemref="content:MailTableView"/>
</ModifyContentsEvent>
<!--
Menus
-->
<Menu itsName="FileMenu">
+ <blockName>FileMenu</blockName>
<title>&File</title>
<location>MenuBar</location>
</Menu>
<Menu itsName="EditMenu">
+ <blockName>EditMenu</blockName>
<title>&Edit</title>
<location>MenuBar</location>
</Menu>
<Menu itsName="ViewMenu">
+ <blockName>ViewMenu</blockName>
<title>&View</title>
<location>MenuBar</location>
</Menu>
<Menu itsName="TestMenu">
+ <blockName>TestMenu</blockName>
<title>&Test</title>
</Menu>
<Menu itsName="HelpMenu">
+ <blockName>HelpMenu</blockName>
<title>&Help</title>
</Menu>
<!-- the Menu Bar -->
- <MenuBar itsName="MenuBar"/>
+ <MenuBar itsName="MenuBar">
+ <blockName>MenuBar</blockName>
+ </MenuBar>
<!--
Menu Items
-->
<MenuItem itsName="NewTabItem">
+ <blockName>NewTabItem</blockName>
<title>New Tab</title>
<location>FileMenu</location>
<accel>N</accel>
@@ -220,6 +228,7 @@
</MenuItem>
<MenuItem itsName="CloseTabItem">
+ <blockName>CloseTabItem</blockName>
<title>Close Tab</title>
<location>FileMenu</location>
<accel>W</accel>
@@ -228,11 +237,13 @@
</MenuItem>
<MenuItem itsName="FileSeparator1">
+ <blockName>FileSeparator1</blockName>
<location>FileMenu</location>
<menuItemKind>Separator</menuItemKind>
</MenuItem>
<MenuItem itsName="QuitItem">
+ <blockName>QuitItem</blockName>
<title>Quit</title>
<location>FileMenu</location>
<accel>Q</accel>
@@ -241,6 +252,7 @@
</MenuItem>
<MenuItem itsName="UndoItem">
+ <blockName>UndoItem</blockName>
<title>Undo</title>
<location>EditMenu</location>
<accel>Z</accel>
@@ -248,6 +260,7 @@
</MenuItem>
<MenuItem itsName="RedoItem">
+ <blockName>RedoItem</blockName>
<title>Redo</title>
<location>EditMenu</location>
<accel>Y</accel>
@@ -255,11 +268,13 @@
</MenuItem>
<MenuItem itsName="EditSeparator1">
+ <blockName>EditSeparator1</blockName>
<location>EditMenu</location>
<menuItemKind>Separator</menuItemKind>
</MenuItem>
<MenuItem itsName="CutItem">
+ <blockName>CutItem</blockName>
<title>Cut</title>
<location>EditMenu</location>
<accel>X</accel>
@@ -267,6 +282,7 @@
</MenuItem>
<MenuItem itsName="CopyItem">
+ <blockName>CopyItem</blockName>
<title>Copy</title>
<location>EditMenu</location>
<accel>C</accel>
@@ -274,6 +290,7 @@
</MenuItem>
<MenuItem itsName="PasteItem">
+ <blockName>PasteItem</blockName>
<title>Paste</title>
<location>EditMenu</location>
<accel>V</accel>
@@ -281,17 +298,33 @@
</MenuItem>
<MenuItem itsName="EditSeparator2">
+ <blockName>EditSeparator2</blockName>
+ <location>EditMenu</location>
+ <menuItemKind>Separator</menuItemKind>
+ </MenuItem>
+
+ <MenuItem itsName="NewItemCollectionItem">
+ <blockName>NewItemCollectionItem</blockName>
+ <title>New ItemCollection</title>
+ <location>EditMenu</location>
+ <event itemref="events:NewItemCollectionItem"/>
+ </MenuItem>
+
+ <MenuItem itsName="EditSeparator3">
+ <blockName>EditSeparator3</blockName>
<location>EditMenu</location>
<menuItemKind>Separator</menuItemKind>
</MenuItem>
<MenuItem itsName="PreferencesItem">
+ <blockName>PreferencesItem</blockName>
<title>Preferences</title>
<location>EditMenu</location>
<event itemref="events:Preferences"/>
</MenuItem>
<MenuItem itsName="ViewSideBarItem">
+ <blockName>ViewSideBarItem</blockName>
<title>View Sidebar</title>
<location>ViewMenu</location>
<menuItemKind>Check</menuItemKind>
@@ -299,6 +332,7 @@
</MenuItem>
<MenuItem itsName="ViewNavigationBarItem">
+ <blockName>ViewNavigationBarItem</blockName>
<title>View Navigation Bar</title>
<location>ViewMenu</location>
<menuItemKind>Check</menuItemKind>
@@ -306,6 +340,7 @@
</MenuItem>
<MenuItem itsName="ViewStatusBarItem">
+ <blockName>ViewStatusBarItem</blockName>
<title>View Status Bar</title>
<location>ViewMenu</location>
<menuItemKind>Check</menuItemKind>
@@ -313,6 +348,7 @@
</MenuItem>
<MenuItem itsName="GenerateAllItem">
+ <blockName>GenerateAllItem</blockName>
<title>Generate Content Items</title>
<location>TestMenu</location>
<event itemref="events:GenerateContentItems"/>
@@ -320,6 +356,7 @@
</MenuItem>
<MenuItem itsName="GenerateContactItem">
+ <blockName>GenerateContactItem</blockName>
<title>Generate Contacts</title>
<location>TestMenu</location>
<event itemref="events:GenerateContacts"/>
@@ -327,6 +364,7 @@
</MenuItem>
<MenuItem itsName="GenerateCalendarItem">
+ <blockName>GenerateCalendarItem</blockName>
<title>Generate Calendar Event Items</title>
<location>TestMenu</location>
<event itemref="events:GenerateCalendarEventItems"/>
@@ -334,6 +372,7 @@
</MenuItem>
<MenuItem itsName="GenerateNoteItem">
+ <blockName>GenerateNoteItem</blockName>
<title>Generate Notes</title>
<location>TestMenu</location>
<event itemref="events:GenerateNotes"/>
@@ -341,6 +380,7 @@
</MenuItem>
<MenuItem itsName="ImportContactItem">
+ <blockName>ImportContactItem</blockName>
<title>Import Contacts from Outlook CSV</title>
<location>TestMenu</location>
<event itemref="events:ImportContacts"/>
@@ -348,6 +388,7 @@
</MenuItem>
<MenuItem itsName="CheckRepositoryItem">
+ <blockName>CheckRepositoryItem</blockName>
<title>Check Repository</title>
<location>TestMenu</location>
<event itemref="events:CheckRepository"/>
@@ -355,6 +396,7 @@
</MenuItem>
<MenuItem itsName="ShowPyCrustItem">
+ <blockName>ShowPyCrustItem</blockName>
<title>Show PyCrust Debugger</title>
<location>TestMenu</location>
<event itemref="events:ShowPyCrust"/>
@@ -362,6 +404,7 @@
</MenuItem>
<MenuItem itsName="ReloadParcelsItem">
+ <blockName>ReloadParcelsItem</blockName>
<title>Reload Parcels</title>
<location>TestMenu</location>
<event itemref="events:ReloadParcels"/>
@@ -369,12 +412,14 @@
</MenuItem>
<Menu itsName="AddAdditionalViewsItem">
+ <blockName>AddAdditionalViewsItem</blockName>
<title>Add Additional Views</title>
<location>TestMenu</location>
<helpString>Add views to the sidebar</helpString>
</Menu>
<MenuItem itsName="AddAllAdditionalViewsItem">
+ <blockName>AddAllAdditionalViewsItem</blockName>
<title>Add All Additional Views</title>
<location>AddAdditionalViewsItem</location>
<event itemref="doc:AddAllAdditionalViews"/>
@@ -382,11 +427,13 @@
</MenuItem>
<MenuItem itsName="TestSeparator1">
+ <blockName>TestSeparator1</blockName>
<location>AddAdditionalViewsItem</location>
<menuItemKind>Separator</menuItemKind>
</MenuItem>
<MenuItem itsName="AddDemoViewItem">
+ <blockName>AddDemoViewItem</blockName>
<title>Add Block Demo View</title>
<location>AddAdditionalViewsItem</location>
<event itemref="doc:AddDemoView"/>
@@ -394,6 +441,7 @@
</MenuItem>
<MenuItem itsName="AddRepositoryViewItem">
+ <blockName>ButtonsMenuItem</blockName>
<title>Add Repository Viewer</title>
<location>AddAdditionalViewsItem</location>
<event itemref="doc:AddRepositoryView"/>
@@ -401,6 +449,7 @@
</MenuItem>
<MenuItem itsName="AddMixedViewItem">
+ <blockName>AddMixedViewItem</blockName>
<title>Add Mixed View</title>
<location>AddAdditionalViewsItem</location>
<event itemref="doc:AddMixedListView"/>
@@ -408,32 +457,37 @@
</MenuItem>
<MenuItem itsName="TestSeparator2">
+ <blockName>TestSeparator2</blockName>
<location>AddAdditionalViewsItem</location>
<menuItemKind>Separator</menuItemKind>
</MenuItem>
<MenuItem itsName="AddNoteViewItem">
+ <blockName>AddNoteViewItem</blockName>
<title>Add Note-Kind View</title>
<location>AddAdditionalViewsItem</location>
- <event itemref="doc:AddNoteListView"/>
+ <event itemref="doc:AddNoteTableView"/>
<helpString>Adds the Note-Kind view to the sidebar</helpString>
</MenuItem>
<MenuItem itsName="AddTaskViewItem">
+ <blockName>AddTaskViewItem</blockName>
<title>Add Task-Kind View</title>
<location>AddAdditionalViewsItem</location>
- <event itemref="doc:AddTaskListView"/>
+ <event itemref="doc:AddTaskTableView"/>
<helpString>Adds the Task-Kind view to the sidebar</helpString>
</MenuItem>
<MenuItem itsName="AddMailViewItem">
+ <blockName>AddMailViewItem</blockName>
<title>Add Mail-Kind View</title>
<location>AddAdditionalViewsItem</location>
- <event itemref="doc:AddMailListView"/>
+ <event itemref="doc:AddMailTableView"/>
<helpString>Adds the Mail-Kind view to the sidebar</helpString>
</MenuItem>
<MenuItem itsName="AddKindViewsItem">
+ <blockName>AddKindViewsItem</blockName>
<title>Add all Kind-specific Views</title>
<location>AddAdditionalViewsItem</location>
<event itemref="doc:AddKindViews"/>
@@ -441,11 +495,13 @@
</MenuItem>
<MenuItem itsName="TestSeparator3">
+ <blockName>TestSeparator3</blockName>
<location>AddAdditionalViewsItem</location>
<menuItemKind>Separator</menuItemKind>
</MenuItem>
<MenuItem itsName="AddStockQuoteItem">
+ <blockName>AddStockQuoteItem</blockName>
<title>Add Stock Quote</title>
<location>AddAdditionalViewsItem</location>
<event itemref="doc:AddStockQuoteView"/>
@@ -453,6 +509,7 @@
</MenuItem>
<MenuItem itsName="AboutChandlerItem">
+ <blockName>AboutChandlerItem</blockName>
<title>About Chandler</title>
<location>HelpMenu</location>
<event itemref="events:AboutChandler"/>
@@ -464,6 +521,7 @@
-->
<Toolbar itemName="NavigationBar"
itemClass="osaf.framework.blocks.NavigationBlocks.NavigationBar">
+ <blockName>NavigationBar</blockName>
<!-- Dynamic Children -->
<dynamicChildren itemref="doc:GoBackButton"/>
<dynamicChildren itemref="doc:GoForwardButton"/>
@@ -504,7 +562,7 @@
ToolbarItems
-->
<ToolbarItem itsName="GoBackButton">
- <!-- Attributes -->
+ <blockName>GoBackButton</blockName>
<location>NavigationBar</location>
<title>Back</title>
<bitmap>application/images/backarrow.png</bitmap>
@@ -514,7 +572,7 @@
</ToolbarItem>
<ToolbarItem itsName="GoForwardButton">
- <!-- Attributes -->
+ <blockName>GoForwardButton</blockName>
<location>NavigationBar</location>
<title>Forward</title>
<bitmap>application/images/forwardarrow.png</bitmap>
@@ -524,7 +582,7 @@
</ToolbarItem>
<ToolbarItem itsName="SyncButton">
- <!-- Attributes -->
+ <blockName>SyncButton</blockName>
<location>NavigationBar</location>
<title>Sync</title>
<label>Sync</label>
@@ -535,31 +593,31 @@
</ToolbarItem>
<ToolbarItem itsName="Spacer1">
- <!-- Attributes -->
+ <blockName>Spacer1</blockName>
<location>NavigationBar</location>
<toolbarItemKind>Separator</toolbarItemKind>
</ToolbarItem>
<ToolbarItem itsName="Spacer2">
- <!-- Attributes -->
+ <blockName>Spacer2</blockName>
<location>NavigationBar</location>
<toolbarItemKind>Separator</toolbarItemKind>
</ToolbarItem>
<ToolbarItem itsName="Spacer3">
- <!-- Attributes -->
+ <blockName>Spacer3</blockName>
<location>NavigationBar</location>
<toolbarItemKind>Separator</toolbarItemKind>
</ToolbarItem>
<ToolbarItem itsName="Spacer4">
- <!-- Attributes -->
+ <blockName>Spacer4</blockName>
<location>NavigationBar</location>
<toolbarItemKind>Separator</toolbarItemKind>
</ToolbarItem>
<ToolbarItem itsName="NewButton">
- <!-- Attributes -->
+ <blockName>NewButton</blockName>
<location>NavigationBar</location>
<title>New</title>
<label>New</label>
@@ -570,7 +628,7 @@
</ToolbarItem>
<ToolbarItem itsName="ReplyButton">
- <!-- Attributes -->
+ <blockName>ReplyButton</blockName>
<location>NavigationBar</location>
<title>Reply</title>
<bitmap>application/images/replyto.png</bitmap>
@@ -580,7 +638,7 @@
</ToolbarItem>
<ToolbarItem itsName="DiscussButton">
- <!-- Attributes -->
+ <blockName>DiscussButton</blockName>
<location>NavigationBar</location>
<title>Discuss</title>
<label>Discuss</label>
@@ -591,7 +649,7 @@
</ToolbarItem>
<ToolbarItem itsName="ForwardButton">
- <!-- Attributes -->
+ <blockName>ForwardButton</blockName>
<location>NavigationBar</location>
<title>Forward</title>
<bitmap>application/images/forwardto.png</bitmap>
@@ -601,7 +659,7 @@
</ToolbarItem>
<ToolbarItem itsName="DeleteButton">
- <!-- Attributes -->
+ <blockName>DeleteButton</blockName>
<location>NavigationBar</location>
<title>Delete</title>
<label>Delete</label>
@@ -612,7 +670,7 @@
</ToolbarItem>
<ToolbarItem itsName="JunkButton">
- <!-- Attributes -->
+ <blockName>JunkButton</blockName>
<location>NavigationBar</location>
<title>Junk</title>
<label>Junk</label>
@@ -623,7 +681,7 @@
</ToolbarItem>
<ToolbarItem itsName="FontsButton">
- <!-- Attributes -->
+ <blockName>FontsButton</blockName>
<location>NavigationBar</location>
<title>Fonts</title>
<label>Fonts</label>
@@ -634,7 +692,7 @@
</ToolbarItem>
<ToolbarItem itsName="PrintButton">
- <!-- Attributes -->
+ <blockName>PrintButton</blockName>
<location>NavigationBar</location>
<title>Print</title>
<label>Print</label>
@@ -645,7 +703,7 @@
</ToolbarItem>
<ToolbarItem itsName="SearchBox">
- <!-- Attributes -->
+ <blockName>SearchBox</blockName>
<location>NavigationBar</location>
<title>SearchBox</title>
<toolbarItemKind>Text</toolbarItemKind>
@@ -665,7 +723,7 @@
<TabbedContainer itsName="TabbedView"
itemClass="osaf.views.main.TabbedView.TabbedView">
<!-- Layout children -->
- <childrenBlocks itemref="content:InListView"/>
+ <childrenBlocks itemref="content:InTableView"/>
<!-- Attributes -->
<tabPosEnum>Top</tabPosEnum>
@@ -687,17 +745,17 @@
</BoxContainer>
<contentModel:NamedCollection itsName="sidebarItemCollection">
- <inclusions uuidOf="content:InListView"/>
- <inclusions uuidOf="content:OutListView"/>
- <inclusions uuidOf="content:CalendarListView"/>
- <inclusions uuidOf="content:ContactListView"/>
- <inclusions uuidOf="content:JunkListView"/>
- <inclusions uuidOf="content:TrashListView"/>
+ <inclusions uuidOf="content:InTableView"/>
+ <inclusions uuidOf="content:OutTableView"/>
+ <inclusions uuidOf="content:CalendarTableView"/>
+ <inclusions uuidOf="content:ContactTableView"/>
+ <inclusions uuidOf="content:JunkTableView"/>
+ <inclusions uuidOf="content:TrashTableView"/>
</contentModel:NamedCollection>
<Table itsName="Sidebar">
<contents itemref="doc:sidebarItemCollection"/>
- <selection itemref="content:InListView"/>
+ <selection itemref="content:InTableView"/>
<elementDelegate>osaf.views.main.SideBar.SideBarDelegate</elementDelegate>
<columnHeadings></columnHeadings>
<columnAttributeNames>displayName</columnAttributeNames>
@@ -762,6 +820,8 @@
<childrenBlocks itemref="doc:CopyItem"/>
<childrenBlocks itemref="doc:PasteItem"/>
<childrenBlocks itemref="doc:EditSeparator2"/>
+ <childrenBlocks itemref="doc:NewItemCollectionItem"/>
+ <childrenBlocks itemref="doc:EditSeparator3"/>
<childrenBlocks itemref="doc:PreferencesItem"/>
<childrenBlocks itemref="doc:ViewMenu"/>
<childrenBlocks itemref="doc:ViewSideBarItem"/>
@@ -807,9 +867,9 @@
<subscribeWhenVisibleEvents itemref="doc:AddRepositoryView"/>
<subscribeWhenVisibleEvents itemref="doc:AddMixedListView"/>
<subscribeWhenVisibleEvents itemref="doc:AddStockQuoteView"/>
- <subscribeWhenVisibleEvents itemref="doc:AddNoteListView"/>
- <subscribeWhenVisibleEvents itemref="doc:AddTaskListView"/>
- <subscribeWhenVisibleEvents itemref="doc:AddMailListView"/>
+ <subscribeWhenVisibleEvents itemref="doc:AddNoteTableView"/>
+ <subscribeWhenVisibleEvents itemref="doc:AddTaskTableView"/>
+ <subscribeWhenVisibleEvents itemref="doc:AddMailTableView"/>
<subscribeWhenVisibleEvents itemref="doc:AddKindViews"/>
<!-- Attributes -->
More information about the Commits
mailing list