[Commits] (jed) Removed the Trash and Junk views. Moved the
Contacts view out of the sidebar and added it to the Test
menu (Bug#1906).
commits at osafoundation.org
commits at osafoundation.org
Thu Sep 16 13:36:51 PDT 2004
Commit by: jed
Modified files:
chandler/parcels/osaf/views/content/parcel.xml 1.69 1.70
chandler/parcels/osaf/views/main/parcel.xml 1.100 1.101
Log message:
Removed the Trash and Junk views. Moved the Contacts view out of the sidebar and added it to the Test menu (Bug#1906).
ViewCVS links:
http://cvs.osafoundation.org/index.cgi/chandler/parcels/osaf/views/content/parcel.xml.diff?r1=text&tr1=1.69&r2=text&tr2=1.70
http://cvs.osafoundation.org/index.cgi/chandler/parcels/osaf/views/main/parcel.xml.diff?r1=text&tr1=1.100&r2=text&tr2=1.101
Index: chandler/parcels/osaf/views/content/parcel.xml
diff -u chandler/parcels/osaf/views/content/parcel.xml:1.69 chandler/parcels/osaf/views/content/parcel.xml:1.70
--- chandler/parcels/osaf/views/content/parcel.xml:1.69 Thu Sep 16 13:18:52 2004
+++ chandler/parcels/osaf/views/content/parcel.xml Thu Sep 16 13:36:50 2004
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.69 $ -->
-<!-- $Date: 2004/09/16 20:18:52 $ -->
+<!-- $Revision: 1.70 $ -->
+<!-- $Date: 2004/09/16 20:36:50 $ -->
<!-- Copyright (c) 2004 Open Source Applications Foundation -->
<!-- License: http://osafoundation.org/Chandler_0.1_license_terms.htm -->
@@ -72,14 +72,6 @@
<_rule value="for i in '//parcels/osaf/contentmodel/mail/MailMessageMixin' where i.isOutbound == True"/>
</contentModel:ItemCollection>
- <contentModel:ItemCollection itsName="junkItemCollection">
- <displayName>Junk</displayName>
- </contentModel:ItemCollection>
-
- <contentModel:ItemCollection itsName="trashItemCollection">
- <displayName>Trash</displayName>
- </contentModel:ItemCollection>
-
<!-- Calendar Blocks -->
<CharacterStyle itsName="CalendarTitle">
<fontStyle>bold</fontStyle>
@@ -284,52 +276,6 @@
<columnWidths>170</columnWidths>
</Table>
- <BoxContainer itsName="JunkSummary">
- <childrenBlocks itemref="main:LayoutSelector" copy="LayoutSelector"/>
- <childrenBlocks itemref="view:JunkTable"/>
- <orientationEnum>Vertical</orientationEnum>
- </BoxContainer>
-
- <!-- Junk Table -->
- <Table itsName="JunkTable">
- <contents itemref="view:junkItemCollection"/>
-
- <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>
-
- <BoxContainer itsName="TrashSummary">
- <childrenBlocks itemref="main:LayoutSelector" copy="LayoutSelector"/>
- <childrenBlocks itemref="view:TrashTable"/>
- <orientationEnum>Vertical</orientationEnum>
- </BoxContainer>
-
- <!-- Trash Table -->
- <Table itsName="TrashTable">
- <contents itemref="view:trashItemCollection"/>
-
- <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>
-
<!-- Untitled Summary -->
<BoxContainer itsName="UntitledSummary">
<childrenBlocks itemref="main:LayoutSelector" copy="LayoutSelector"/>
@@ -460,28 +406,6 @@
<border>1.0, 1.0, 1.0, 1.0</border>
</SplitterWindow>
- <!-- Junk View -->
- <SplitterWindow itsName="JunkTableView">
- <contents itemref="view:junkItemCollection"/>
-
- <childrenBlocks itemref="view:JunkSummary"/>
- <childrenBlocks itemref="detail:DetailRootTemplate" copy="DetailRoot"/>
-
- <eventBoundary>True</eventBoundary>
- <border>1.0, 1.0, 1.0, 1.0</border>
- </SplitterWindow>
-
- <!-- Trash View -->
- <SplitterWindow itsName="TrashTableView">
- <contents itemref="view:trashItemCollection"/>
-
- <childrenBlocks itemref="view:TrashSummary"/>
- <childrenBlocks itemref="detail:DetailRootTemplate" copy="DetailRoot"/>
-
- <eventBoundary>True</eventBoundary>
- <border>1.0, 1.0, 1.0, 1.0</border>
- </SplitterWindow>
-
<!-- Untitled View -->
<SplitterWindow itsName="UntitledView">
<contents itemref="view:untitledItemCollection"/>
Index: chandler/parcels/osaf/views/main/parcel.xml
diff -u chandler/parcels/osaf/views/main/parcel.xml:1.100 chandler/parcels/osaf/views/main/parcel.xml:1.101
--- chandler/parcels/osaf/views/main/parcel.xml:1.100 Thu Sep 16 13:07:33 2004
+++ chandler/parcels/osaf/views/main/parcel.xml Thu Sep 16 13:36:50 2004
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.100 $ -->
-<!-- $Date: 2004/09/16 20:07:33 $ -->
+<!-- $Revision: 1.101 $ -->
+<!-- $Date: 2004/09/16 20:36:50 $ -->
<!-- Copyright (c) 2003 Open Source Applications Foundation -->
<!-- License: http://osafoundation.org/Chandler_0.1_license_terms.htm -->
@@ -124,6 +124,7 @@
<items itemref="content:MixedTableView"/>
<items itemref="stockQuote:StockQuoteView"/>
<items itemref="content:NoteTableView"/>
+ <items itemref="content:ContactTableView"/>
<items itemref="content:TaskTableView"/>
<items itemref="content:MailTableView"/>
</ModifyContentsEvent>
@@ -163,6 +164,13 @@
<items itemref="content:NoteTableView"/>
</ModifyContentsEvent>
+ <ModifyContentsEvent itsName="AddContactTableView">
+ <dispatchEnum>SendToBlock</dispatchEnum>
+ <dispatchToBlock itemref="doc:Sidebar"/>
+ <methodName>onModifyContentsEvent</methodName>
+ <items itemref="content:ContactTableView"/>
+ </ModifyContentsEvent>
+
<ModifyContentsEvent itsName="AddTaskTableView">
<dispatchEnum>SendToBlock</dispatchEnum>
<dispatchToBlock itemref="doc:Sidebar"/>
@@ -837,6 +845,7 @@
<childrenBlocks itemref="doc:AddMixedViewItem"/>
<childrenBlocks itemref="doc:TestSeparator2"/>
<childrenBlocks itemref="doc:AddNoteViewItem"/>
+ <childrenBlocks itemref="doc:AddContactViewItem"/>
<childrenBlocks itemref="doc:AddTaskViewItem"/>
<childrenBlocks itemref="doc:AddMailViewItem"/>
<childrenBlocks itemref="doc:AddKindViewsItem"/>
@@ -888,6 +897,13 @@
<event itemref="doc:AddNoteTableView"/>
<helpString>Adds the Note-Kind view to the sidebar</helpString>
</MenuItem>
+
+ <MenuItem itsName="AddContactViewItem">
+ <blockName>AddContactViewItem</blockName>
+ <title>Add Contact-Kind View</title>
+ <event itemref="doc:AddContactTableView"/>
+ <helpString>Adds the Contact-Kind view to the sidebar</helpString>
+ </MenuItem>
<MenuItem itsName="AddTaskViewItem">
<blockName>AddTaskViewItem</blockName>
@@ -1353,9 +1369,6 @@
<_inclusions itemref="content:InTableView"/>
<_inclusions itemref="content:OutTableView"/>
<_inclusions itemref="content:CalendarTableView"/>
- <_inclusions itemref="content:ContactTableView"/>
- <_inclusions itemref="content:JunkTableView"/>
- <_inclusions itemref="content:TrashTableView"/>
</contentModel:ItemCollection>
<Table itsName="Sidebar"
@@ -1409,7 +1422,8 @@
<subscribeWhenVisibleEvents itemref="doc:AddKindViews"/>
<subscribeWhenVisibleEvents itemref="doc:AddMailTableView"/>
<subscribeWhenVisibleEvents itemref="doc:AddMixedTableView"/>
- <subscribeWhenVisibleEvents itemref="doc:AddNoteTableView"/>
+ <subscribeWhenVisibleEvents itemref="doc:AddNoteTableView"/>
+ <subscribeWhenVisibleEvents itemref="doc:AddContactTableView"/>
<subscribeWhenVisibleEvents itemref="doc:AddRepositoryView"/>
<subscribeWhenVisibleEvents itemref="doc:AddStockQuoteView"/>
<subscribeWhenVisibleEvents itemref="doc:AddTaskTableView"/>
More information about the Commits
mailing list