[Commits] (john) * Removed old views that were part of old sidebar
commits at osafoundation.org
commits at osafoundation.org
Thu Jan 27 15:39:10 PST 2005
Commit by: john
Modified files:
chandler/parcels/osaf/views/content/parcel.xml 1.86 1.87
chandler/parcels/osaf/views/main/parcel.xml 1.159 1.160
chandler/parcels/osaf/views/main/TabbedView.py 1.32 1.33
chandler/parcels/osaf/framework/blocks/ContainerBlocks.py 1.146 1.147
Log message:
* Removed old views that were part of old sidebar
ViewCVS links:
http://cvs.osafoundation.org/index.cgi/chandler/parcels/osaf/views/content/parcel.xml.diff?r1=text&tr1=1.86&r2=text&tr2=1.87
http://cvs.osafoundation.org/index.cgi/chandler/parcels/osaf/views/main/parcel.xml.diff?r1=text&tr1=1.159&r2=text&tr2=1.160
http://cvs.osafoundation.org/index.cgi/chandler/parcels/osaf/views/main/TabbedView.py.diff?r1=text&tr1=1.32&r2=text&tr2=1.33
http://cvs.osafoundation.org/index.cgi/chandler/parcels/osaf/framework/blocks/ContainerBlocks.py.diff?r1=text&tr1=1.146&r2=text&tr2=1.147
Index: chandler/parcels/osaf/views/content/parcel.xml
diff -u chandler/parcels/osaf/views/content/parcel.xml:1.86 chandler/parcels/osaf/views/content/parcel.xml:1.87
--- chandler/parcels/osaf/views/content/parcel.xml:1.86 Wed Jan 26 18:45:17 2005
+++ chandler/parcels/osaf/views/content/parcel.xml Thu Jan 27 15:39:08 2005
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.86 $ -->
-<!-- $Date: 2005/01/27 02:45:17 $ -->
+<!-- $Revision: 1.87 $ -->
+<!-- $Date: 2005/01/27 23:39:08 $ -->
<!-- Copyright (c) 2004-2005 Open Source Applications Foundation -->
<!-- License: http://osafoundation.org/Chandler_0.1_license_terms.htm -->
@@ -138,27 +138,6 @@
<fontSize>10.0</fontSize>
</CharacterStyle>
- <!-- Mixed Table -->
- <Table itsName="MixedTable">
- <contents itemref="view:mixedItemCollection"/>
-
- <columnHeadings></columnHeadings>
- <columnHeadings>who</columnHeadings>
- <columnHeadings>about</columnHeadings>
- <columnHeadings>date</columnHeadings>
-
- <columnData>itsKind</columnData>
- <columnData>who</columnData>
- <columnData>about</columnData>
- <columnData>date</columnData>
-
- <columnWidths>20</columnWidths>
- <columnWidths>130</columnWidths>
- <columnWidths>130</columnWidths>
- <columnWidths>130</columnWidths>
- </Table>
-
-
<LayoutChooser itsName="CalendarSummary">
<childrenBlocks itemref="view:LayoutSelector" copy="LayoutSelector"/>
<choices itemref="view:CalendarTable"/>
@@ -205,180 +184,6 @@
<daysPerView>1</daysPerView>
</calendarBlocks:CanvasWeek>
- <!-- Contacts Table -->
- <Table itsName="ContactsTable">
- <contents itemref="view:contactItemCollection"/>
-
- <columnHeadings></columnHeadings>
- <columnHeadings>who</columnHeadings>
- <columnHeadings>about</columnHeadings>
- <columnHeadings>date</columnHeadings>
-
- <columnData>itsKind</columnData>
- <columnData>who</columnData>
- <columnData>about</columnData>
- <columnData>date</columnData>
-
- <columnWidths>20</columnWidths>
- <columnWidths>130</columnWidths>
- <columnWidths>130</columnWidths>
- <columnWidths>130</columnWidths>
- </Table>
-
- <!-- Notes Table -->
- <Table itsName="NotesTable">
- <contents itemref="view:notesItemCollection"/>
-
- <columnHeadings></columnHeadings>
- <columnHeadings>who</columnHeadings>
- <columnHeadings>about</columnHeadings>
- <columnHeadings>date</columnHeadings>
-
- <columnData>itsKind</columnData>
- <columnData>who</columnData>
- <columnData>about</columnData>
- <columnData>date</columnData>
-
- <columnWidths>20</columnWidths>
- <columnWidths>130</columnWidths>
- <columnWidths>130</columnWidths>
- <columnWidths>130</columnWidths>
- </Table>
-
- <!-- Tasks Table -->
- <Table itsName="TasksTable">
- <contents itemref="view:taskItemCollection"/>
-
- <columnHeadings></columnHeadings>
- <columnHeadings>who</columnHeadings>
- <columnHeadings>about</columnHeadings>
- <columnHeadings>date</columnHeadings>
-
- <columnData>itsKind</columnData>
- <columnData>who</columnData>
- <columnData>about</columnData>
- <columnData>date</columnData>
-
- <columnWidths>20</columnWidths>
- <columnWidths>130</columnWidths>
- <columnWidths>130</columnWidths>
- <columnWidths>130</columnWidths>
- </Table>
-
- <!-- Mail Table -->
- <Table itsName="MailTable">
- <contents itemref="view:mailItemCollection"/>
-
- <columnHeadings></columnHeadings>
- <columnHeadings>who</columnHeadings>
- <columnHeadings>about</columnHeadings>
- <columnHeadings>date</columnHeadings>
-
- <columnData>itsKind</columnData>
- <columnData>who</columnData>
- <columnData>about</columnData>
- <columnData>date</columnData>
-
- <columnWidths>20</columnWidths>
- <columnWidths>130</columnWidths>
- <columnWidths>130</columnWidths>
- <columnWidths>130</columnWidths>
- </Table>
-
- <LayoutChooser itsName="UntitledSummary">
- <childrenBlocks itemref="view:LayoutSelector" copy="LayoutSelector"/>
- <choices itemref="view:UntitledTable"/>
- <choices itemref="view:UntitledMonth"/>
- <choices itemref="view:UntitledWeek"/>
- <choices itemref="view:UntitledDay"/>
- <orientationEnum>Vertical</orientationEnum>
- </LayoutChooser>
-
- <!-- Untitled Table -->
- <Table itsName="UntitledTable">
- <contents itemref="view:untitledItemCollection"/>
-
- <columnHeadings></columnHeadings>
- <columnHeadings>who</columnHeadings>
- <columnHeadings>about</columnHeadings>
- <columnHeadings>date</columnHeadings>
-
- <columnData>itsKind</columnData>
- <columnData>who</columnData>
- <columnData>about</columnData>
- <columnData>date</columnData>
-
- <columnWidths>20</columnWidths>
- <columnWidths>130</columnWidths>
- <columnWidths>130</columnWidths>
- <columnWidths>130</columnWidths>
- </Table>
-
- <!-- UntitledMonth -->
- <calendarBlocks:CanvasMonth itsName="UntitledMonth">
- <contents itemref="view:untitledItemCollection"/>
- </calendarBlocks:CanvasMonth>
-
- <!-- UntitledWeek -->
- <calendarBlocks:CanvasWeek itsName="UntitledWeek">
- <contents itemref="view:untitledItemCollection"/>
- <daysPerView>7</daysPerView>
- </calendarBlocks:CanvasWeek>
-
- <!-- UntitledDay -->
- <calendarBlocks:CanvasWeek itsName="UntitledDay">
- <contents itemref="view:untitledItemCollection"/>
- <daysPerView>1</daysPerView>
- </calendarBlocks:CanvasWeek>
-
- <!-- Notes View -->
- <SplitterWindow itsName="NotesView">
- <displayName>Notes</displayName>
- <contents itemref="view:notesItemCollection"/>
-
- <childrenBlocks itemref="view:NotesTable"/>
- <childrenBlocks itemref="detail:DetailRootTemplate" copy="DetailRoot"/>
-
- <eventBoundary>True</eventBoundary>
- <orientationEnum>Vertical</orientationEnum>
- </SplitterWindow>
-
- <!-- Tasks View -->
- <SplitterWindow itsName="TasksView">
- <displayName>TaskList</displayName>
- <contents itemref="view:taskItemCollection"/>
-
- <childrenBlocks itemref="view:TasksTable"/>
- <childrenBlocks itemref="detail:DetailRootTemplate" copy="DetailRoot"/>
-
- <eventBoundary>True</eventBoundary>
- <orientationEnum>Vertical</orientationEnum>
- </SplitterWindow>
-
- <!-- Mail View -->
- <SplitterWindow itsName="MailView">
- <displayName>MailList</displayName>
- <contents itemref="view:mailItemCollection"/>
-
- <childrenBlocks itemref="view:MailTable"/>
- <childrenBlocks itemref="detail:DetailRootTemplate" copy="DetailRoot"/>
-
- <eventBoundary>True</eventBoundary>
- <orientationEnum>Vertical</orientationEnum>
- </SplitterWindow>
-
- <!-- Mixed View -->
- <SplitterWindow itsName="MixedView">
- <displayName>Mixed</displayName>
- <contents itemref="view:mixedItemCollection"/>
-
- <childrenBlocks itemref="view:MixedTable"/>
- <childrenBlocks itemref="detail:DetailRootTemplate" copy="DetailRoot"/>
-
- <eventBoundary>True</eventBoundary>
- <orientationEnum>Vertical</orientationEnum>
- </SplitterWindow>
-
<!-- Calendar View -->
<SplitterWindow itsName="CalendarView">
<displayName>Calendar Demo</displayName>
@@ -391,27 +196,4 @@
<orientationEnum>Vertical</orientationEnum>
</SplitterWindow>
- <!-- Contacts View -->
- <SplitterWindow itsName="ContactsView">
- <displayName>Contacts</displayName>
- <contents itemref="view:contactItemCollection"/>
-
- <childrenBlocks itemref="view:ContactsTable"/>
- <childrenBlocks itemref="detail:DetailRootTemplate" copy="DetailRoot"/>
-
- <eventBoundary>True</eventBoundary>
- <orientationEnum>Vertical</orientationEnum>
- </SplitterWindow>
-
- <!-- Untitled View -->
- <SplitterWindow itsName="UntitledView">
- <contents itemref="view:untitledItemCollection"/>
-
- <childrenBlocks itemref="view:UntitledSummary"/>
- <childrenBlocks itemref="detail:DetailRootTemplate" copy="DetailRoot"/>
-
- <eventBoundary>True</eventBoundary>
- <orientationEnum>Vertical</orientationEnum>
- </SplitterWindow>
-
</core:Parcel>
Index: chandler/parcels/osaf/views/main/parcel.xml
diff -u chandler/parcels/osaf/views/main/parcel.xml:1.159 chandler/parcels/osaf/views/main/parcel.xml:1.160
--- chandler/parcels/osaf/views/main/parcel.xml:1.159 Thu Jan 27 14:44:16 2005
+++ chandler/parcels/osaf/views/main/parcel.xml Thu Jan 27 15:39:08 2005
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.159 $ -->
-<!-- $Date: 2005/01/27 22:44:16 $ -->
+<!-- $Revision: 1.160 $ -->
+<!-- $Date: 2005/01/27 23:39:08 $ -->
<!-- Copyright (c) 2003-2004 Open Source Applications Foundation -->
<!-- License: http://osafoundation.org/Chandler_0.1_license_terms.htm -->
@@ -169,11 +169,11 @@
<methodName>onModifyContentsEvent</methodName>
<items itemref="demo:BlockDemoView"/>
<items itemref="repository:RepositoryView"/>
- <items itemref="content:MixedView"/>
- <items itemref="content:NotesView"/>
- <items itemref="content:ContactsView"/>
- <items itemref="content:TasksView"/>
- <items itemref="content:MailView"/>
+ <items itemref="content:mixedItemCollection"/>
+ <items itemref="content:notesItemCollection"/>
+ <items itemref="content:contactItemCollection"/>
+ <items itemref="content:taskItemCollection"/>
+ <items itemref="content:mailItemCollection"/>
</ModifyContentsEvent>
<ModifyContentsEvent itsName="AddContactsView">
@@ -181,7 +181,7 @@
<dispatchEnum>SendToBlockByName</dispatchEnum>
<dispatchToBlockName>Sidebar</dispatchToBlockName>
<methodName>onModifyContentsEvent</methodName>
- <items itemref="content:ContactsView"/>
+ <items itemref="content:contactItemCollection"/>
</ModifyContentsEvent>
<ModifyContentsEvent itsName="AddDemoView">
@@ -213,9 +213,9 @@
<dispatchEnum>SendToBlockByName</dispatchEnum>
<dispatchToBlockName>Sidebar</dispatchToBlockName>
<methodName>onModifyContentsEvent</methodName>
- <items itemref="content:NotesView"/>
- <items itemref="content:TasksView"/>
- <items itemref="content:MailView"/>
+ <items itemref="content:notesItemCollection"/>
+ <items itemref="content:taskItemCollection"/>
+ <items itemref="content:mailItemCollection"/>
</ModifyContentsEvent>
<ModifyContentsEvent itsName="AddMailView">
@@ -223,7 +223,7 @@
<dispatchEnum>SendToBlockByName</dispatchEnum>
<dispatchToBlockName>Sidebar</dispatchToBlockName>
<methodName>onModifyContentsEvent</methodName>
- <items itemref="content:MailView"/>
+ <items itemref="content:mailItemCollection"/>
</ModifyContentsEvent>
<ModifyContentsEvent itsName="AddMixedView">
@@ -231,7 +231,7 @@
<dispatchEnum>SendToBlockByName</dispatchEnum>
<dispatchToBlockName>Sidebar</dispatchToBlockName>
<methodName>onModifyContentsEvent</methodName>
- <items itemref="content:MixedView"/>
+ <items itemref="content:mixedItemCollection"/>
</ModifyContentsEvent>
<ModifyContentsEvent itsName="AddNotesView">
@@ -239,7 +239,7 @@
<dispatchEnum>SendToBlockByName</dispatchEnum>
<dispatchToBlockName>Sidebar</dispatchToBlockName>
<methodName>onModifyContentsEvent</methodName>
- <items itemref="content:NotesView"/>
+ <items itemref="content:notesItemCollection"/>
</ModifyContentsEvent>
<ModifyContentsEvent itsName="AddRepositoryView">
@@ -255,7 +255,7 @@
<dispatchEnum>SendToBlockByName</dispatchEnum>
<dispatchToBlockName>Sidebar</dispatchToBlockName>
<methodName>onModifyContentsEvent</methodName>
- <items itemref="content:TasksView"/>
+ <items itemref="content:taskItemCollection"/>
</ModifyContentsEvent>
<BlockEvent itsName="CheckRepository">
Index: chandler/parcels/osaf/views/main/TabbedView.py
diff -u chandler/parcels/osaf/views/main/TabbedView.py:1.32 chandler/parcels/osaf/views/main/TabbedView.py:1.33
--- chandler/parcels/osaf/views/main/TabbedView.py:1.32 Tue Jan 25 16:23:45 2005
+++ chandler/parcels/osaf/views/main/TabbedView.py Thu Jan 27 15:39:08 2005
@@ -1,5 +1,5 @@
-__version__ = "$Revision: 1.32 $"
-__date__ = "$Date: 2005/01/26 00:23:45 $"
+__version__ = "$Revision: 1.33 $"
+__date__ = "$Date: 2005/01/27 23:39:08 $"
__copyright__ = "Copyright (c) 2003-2004 Open Source Applications Foundation"
__license__ = "http://osafoundation.org/Chandler_0.1_license_terms.htm"
@@ -38,7 +38,7 @@
def onNewEvent (self, event):
"Create a new tab"
- originalItem = self.findPath('parcels/osaf/views/content/UntitledView')
+ originalItem = self.findPath('parcels/osaf/views/content/untitledItemCollection')
userdata = self.findPath('//userdata')
newItem = originalItem.copy(parent=userdata, cloudAlias='default')
newItem.contents.displayName = self._getUniqueName("Untitled")
Index: chandler/parcels/osaf/framework/blocks/ContainerBlocks.py
diff -u chandler/parcels/osaf/framework/blocks/ContainerBlocks.py:1.146 chandler/parcels/osaf/framework/blocks/ContainerBlocks.py:1.147
--- chandler/parcels/osaf/framework/blocks/ContainerBlocks.py:1.146 Tue Jan 25 16:23:41 2005
+++ chandler/parcels/osaf/framework/blocks/ContainerBlocks.py Thu Jan 27 15:39:08 2005
@@ -1,5 +1,5 @@
-__version__ = "$Revision: 1.146 $"
-__date__ = "$Date: 2005/01/26 00:23:41 $"
+__version__ = "$Revision: 1.147 $"
+__date__ = "$Date: 2005/01/27 23:39:08 $"
__copyright__ = "Copyright (c) 2003-2005 Open Source Applications Foundation"
__license__ = "http://osafoundation.org/Chandler_0.1_license_terms.htm"
@@ -490,7 +490,7 @@
def onNewEvent (self, event):
"Create a new tab"
- originalItem = self.findPath('parcels/osaf/views/content/UntitledView')
+ originalItem = self.findPath('parcels/osaf/views/content/untitledItemCollection')
userdata = self.findPath('//userdata')
newItem = originalItem.copy(parent=userdata, cloudAlias='default')
newItem.contents.displayName = self._getUniqueName("Untitled")
More information about the Commits
mailing list