[Commits] (john) Use parcel XML defaults: phase1
commits at osafoundation.org
commits at osafoundation.org
Fri May 28 11:54:13 PDT 2004
Commit by: john
Modified files:
chandler/parcels/osaf/framework/blocks/ContainerBlocks.py 1.95 1.96
chandler/parcels/osaf/framework/blocks/parcel.xml 1.64 1.65
chandler/parcels/osaf/views/content/parcel.xml 1.13 1.14
chandler/parcels/osaf/views/demo/parcel.xml 1.12 1.13
chandler/parcels/osaf/views/main/parcel.xml 1.40 1.41
chandler/parcels/osaf/views/repositoryviewer/parcel.xml 1.12 1.13
chandler/parcels/osaf/views/zaobao/parcel.xml 1.17 1.18
Log message:
Use parcel XML defaults: phase1
Found one remaining instantiateWidget that returned multiple arguments.
ViewCVS links:
http://cvs.osafoundation.org/index.cgi/chandler/parcels/osaf/framework/blocks/ContainerBlocks.py.diff?r1=text&tr1=1.95&r2=text&tr2=1.96
http://cvs.osafoundation.org/index.cgi/chandler/parcels/osaf/framework/blocks/parcel.xml.diff?r1=text&tr1=1.64&r2=text&tr2=1.65
http://cvs.osafoundation.org/index.cgi/chandler/parcels/osaf/views/content/parcel.xml.diff?r1=text&tr1=1.13&r2=text&tr2=1.14
http://cvs.osafoundation.org/index.cgi/chandler/parcels/osaf/views/demo/parcel.xml.diff?r1=text&tr1=1.12&r2=text&tr2=1.13
http://cvs.osafoundation.org/index.cgi/chandler/parcels/osaf/views/main/parcel.xml.diff?r1=text&tr1=1.40&r2=text&tr2=1.41
http://cvs.osafoundation.org/index.cgi/chandler/parcels/osaf/views/repositoryviewer/parcel.xml.diff?r1=text&tr1=1.12&r2=text&tr2=1.13
http://cvs.osafoundation.org/index.cgi/chandler/parcels/osaf/views/zaobao/parcel.xml.diff?r1=text&tr1=1.17&r2=text&tr2=1.18
Index: chandler/parcels/osaf/views/demo/parcel.xml
diff -u chandler/parcels/osaf/views/demo/parcel.xml:1.12 chandler/parcels/osaf/views/demo/parcel.xml:1.13
--- chandler/parcels/osaf/views/demo/parcel.xml:1.12 Tue May 11 13:22:56 2004
+++ chandler/parcels/osaf/views/demo/parcel.xml Fri May 28 11:53:38 2004
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.12 $ -->
-<!-- $Date: 2004/05/11 20:22:56 $ -->
+<!-- $Revision: 1.13 $ -->
+<!-- $Date: 2004/05/28 18:53:38 $ -->
<!-- Copyright (c) 2003 Open Source Applications Foundation -->
<!-- License: http://osafoundation.org/Chandler_0.1_license_terms.htm -->
@@ -26,17 +26,11 @@
Styles
-->
<CharacterStyle itemName="TitleStyle">
- <fontFamily>DefaultUIFont</fontFamily>
- <fontSize>12.0</fontSize>
<fontStyle>bold</fontStyle>
- <fontName></fontName>
</CharacterStyle>
<CharacterStyle itemName="TextStyle">
- <fontFamily>DefaultUIFont</fontFamily>
<fontSize>10.0</fontSize>
- <fontStyle></fontStyle>
- <fontName></fontName>
</CharacterStyle>
<!--
@@ -157,7 +151,6 @@
<StaticText itemName="IntroTextBlank">
<!-- Attributes -->
- <textAlignmentEnum>Left</textAlignmentEnum>
<characterStyle itemref="doc:TextStyle"/>
<title></title>
@@ -169,7 +162,6 @@
<StaticText itemName="IntroTextOne">
<!-- Attributes -->
- <textAlignmentEnum>Left</textAlignmentEnum>
<characterStyle itemref="doc:TextStyle"/>
<title>The demo view demonstrates the new CPIA functionality and some of the available blocks. It is used as an example for</title>
@@ -182,7 +174,6 @@
<StaticText itemName="IntroTextTwo">
<!-- Attributes -->
- <textAlignmentEnum>Left</textAlignmentEnum>
<characterStyle itemref="doc:TextStyle"/>
<title>developers new to Chandler to see the kinds of blocks that are available and as a test framework</title>
@@ -194,7 +185,6 @@
<StaticText itemName="IntroTextThree">
<!-- Attributes -->
- <textAlignmentEnum>Left</textAlignmentEnum>
<characterStyle itemref="doc:TextStyle"/>
<title>for blocks.</title>
@@ -206,7 +196,6 @@
<StaticText itemName="IntroInstructionsBlank">
<!-- Attributes -->
- <textAlignmentEnum>Left</textAlignmentEnum>
<characterStyle itemref="doc:TextStyle"/>
<title></title>
@@ -218,7 +207,6 @@
<StaticText itemName="IntroInstructions">
<!-- Attributes -->
- <textAlignmentEnum>Left</textAlignmentEnum>
<characterStyle itemref="doc:TextStyle"/>
<title>Click through the tabs to view the kinds of blocks that Chandler supports.</title>
@@ -307,8 +295,6 @@
<childrenBlocks itemref="doc:TextButton"/>
<!-- Attributes -->
- <orientationEnum>Horizontal</orientationEnum>
-
<contentSpec itemref="doc:myQuery"/>
<size>200,40</size>
<minimumSize>200,40</minimumSize>
@@ -317,7 +303,6 @@
<EditText itemName="ButtonText">
<!-- Attributes -->
- <textAlignmentEnum>Left</textAlignmentEnum>
<lineStyleEnum>MultiLine</lineStyleEnum>
<textStyleEnum>PlainText</textStyleEnum>
<readOnly>False</readOnly>
@@ -380,8 +365,6 @@
<childrenBlocks itemref="doc:RadioExample"/>
<!-- Attributes -->
- <orientationEnum>Horizontal</orientationEnum>
-
<contentSpec itemref="doc:myQuery"/>
<size>200,100</size>
<minimumSize>200,100</minimumSize>
@@ -393,8 +376,6 @@
<childrenBlocks itemref="doc:ComboExample"/>
<!-- Attributes -->
- <orientationEnum>Horizontal</orientationEnum>
-
<contentSpec itemref="doc:myQuery"/>
<size>200,100</size>
<minimumSize>200,100</minimumSize>
Index: chandler/parcels/osaf/framework/blocks/ContainerBlocks.py
diff -u chandler/parcels/osaf/framework/blocks/ContainerBlocks.py:1.95 chandler/parcels/osaf/framework/blocks/ContainerBlocks.py:1.96
--- chandler/parcels/osaf/framework/blocks/ContainerBlocks.py:1.95 Thu May 27 18:54:49 2004
+++ chandler/parcels/osaf/framework/blocks/ContainerBlocks.py Fri May 28 11:53:36 2004
@@ -1,5 +1,5 @@
-__version__ = "$Revision: 1.95 $"
-__date__ = "$Date: 2004/05/28 01:54:49 $"
+__version__ = "$Revision: 1.96 $"
+__date__ = "$Date: 2004/05/28 18:53:36 $"
__copyright__ = "Copyright (c) 2003 Open Source Applications Foundation"
__license__ = "http://osafoundation.org/Chandler_0.1_license_terms.htm"
@@ -63,7 +63,7 @@
try:
newChild = self.contentSpec.data[0]
except IndexError:
- return None, None, None
+ return None
else:
newChild.parentBlock = self
self.RegisterEvents(newChild)
Index: chandler/parcels/osaf/views/content/parcel.xml
diff -u chandler/parcels/osaf/views/content/parcel.xml:1.13 chandler/parcels/osaf/views/content/parcel.xml:1.14
--- chandler/parcels/osaf/views/content/parcel.xml:1.13 Wed May 26 18:39:46 2004
+++ chandler/parcels/osaf/views/content/parcel.xml Fri May 28 11:53:37 2004
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.13 $ -->
-<!-- $Date: 2004/05/27 01:39:46 $ -->
+<!-- $Revision: 1.14 $ -->
+<!-- $Date: 2004/05/28 18:53:37 $ -->
<!-- Copyright (c) 2004 Open Source Applications Foundation -->
<!-- License: http://osafoundation.org/Chandler_0.1_license_terms.htm -->
@@ -232,7 +232,6 @@
<alignmentEnum>grow</alignmentEnum>
<stretchFactor>1.0</stretchFactor>
- <orientationEnum>Horizontal</orientationEnum>
<splitPercentage>0.5</splitPercentage>
</SplitterWindow>
@@ -250,7 +249,6 @@
<alignmentEnum>grow</alignmentEnum>
<stretchFactor>1.0</stretchFactor>
- <orientationEnum>Horizontal</orientationEnum>
<splitPercentage>0.5</splitPercentage>
</SplitterWindow>
@@ -268,7 +266,6 @@
<alignmentEnum>grow</alignmentEnum>
<stretchFactor>1.0</stretchFactor>
- <orientationEnum>Horizontal</orientationEnum>
<splitPercentage>0.5</splitPercentage>
</SplitterWindow>
@@ -286,7 +283,6 @@
<alignmentEnum>grow</alignmentEnum>
<stretchFactor>1.0</stretchFactor>
- <orientationEnum>Horizontal</orientationEnum>
<splitPercentage>0.5</splitPercentage>
</SplitterWindow>
@@ -304,7 +300,6 @@
<alignmentEnum>grow</alignmentEnum>
<stretchFactor>1.0</stretchFactor>
- <orientationEnum>Horizontal</orientationEnum>
<splitPercentage>0.5</splitPercentage>
</SplitterWindow>
@@ -322,7 +317,6 @@
<alignmentEnum>grow</alignmentEnum>
<stretchFactor>1.0</stretchFactor>
- <orientationEnum>Horizontal</orientationEnum>
<splitPercentage>0.5</splitPercentage>
</SplitterWindow>
Index: chandler/parcels/osaf/views/repositoryviewer/parcel.xml
diff -u chandler/parcels/osaf/views/repositoryviewer/parcel.xml:1.12 chandler/parcels/osaf/views/repositoryviewer/parcel.xml:1.13
--- chandler/parcels/osaf/views/repositoryviewer/parcel.xml:1.12 Wed May 26 18:39:48 2004
+++ chandler/parcels/osaf/views/repositoryviewer/parcel.xml Fri May 28 11:53:40 2004
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.12 $ -->
-<!-- $Date: 2004/05/27 01:39:48 $ -->
+<!-- $Revision: 1.13 $ -->
+<!-- $Date: 2004/05/28 18:53:40 $ -->
<!-- Copyright (c) 2003 Open Source Applications Foundation -->
<!-- License: http://osafoundation.org/Chandler_0.1_license_terms.htm -->
@@ -25,10 +25,7 @@
Styles
-->
<CharacterStyle itemName="HeaderCharacterStyle">
- <fontFamily>DefaultUIFont</fontFamily>
- <fontSize>12.0</fontSize>
<fontStyle>bold</fontStyle>
- <fontName></fontName>
</CharacterStyle>
<!--
@@ -105,7 +102,6 @@
<childrenBlocks itemref="doc:ItemDetail"/>
<!-- Attributes -->
- <orientationEnum>Horizontal</orientationEnum>
<splitPercentage>0.5</splitPercentage>
<contentSpec itemref="doc:myQuery"/>
Index: chandler/parcels/osaf/framework/blocks/parcel.xml
diff -u chandler/parcels/osaf/framework/blocks/parcel.xml:1.64 chandler/parcels/osaf/framework/blocks/parcel.xml:1.65
--- chandler/parcels/osaf/framework/blocks/parcel.xml:1.64 Thu May 27 12:11:07 2004
+++ chandler/parcels/osaf/framework/blocks/parcel.xml Fri May 28 11:53:36 2004
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.64 $ -->
-<!-- $Date: 2004/05/27 19:11:07 $ -->
+<!-- $Revision: 1.65 $ -->
+<!-- $Date: 2004/05/28 18:53:36 $ -->
<!-- Copyright (c) 2003 Open Source Applications Foundation -->
<!-- License: http://osafoundation.org/Chandler_0.1_license_terms.htm -->
@@ -26,10 +26,12 @@
<Attribute itemName="fontFamily">
<type itemref="docSchema:fontFamilyEnumType"/>
+ <defaultValue type="docSchema:fontFamilyEnumType">DefaultUIFont</defaultValue>
</Attribute>
<Attribute itemName="fontSize">
<type itemref="Float"/>
+ <defaultValue type="Float">12.0</defaultValue>
</Attribute>
<!--
@@ -38,10 +40,12 @@
-->
<Attribute itemName="fontStyle">
<type itemref="String"/>
+ <defaultValue type="String">""</defaultValue>
</Attribute>
<Attribute itemName="fontName">
<type itemref="String"/>
+ <defaultValue type="String">""</defaultValue>
</Attribute>
<Struct itemName="ColorType" itemClass="osaf.framework.blocks.DocumentTypes.ColorStruct">
@@ -74,6 +78,7 @@
<Attribute itemName="textAlignmentEnum">
<type itemref="docSchema:textAlignmentEnumType"/>
+ <defaultValue type="docSchema:textAlignmentEnumType">Left</defaultValue>
</Attribute>
<Enumeration itemName="orientationEnumType">
@@ -83,6 +88,7 @@
<Attribute itemName="orientationEnum">
<type itemref="docSchema:orientationEnumType"/>
+ <defaultValue type="docSchema:orientationEnumType">Horizontal</defaultValue>
</Attribute>
<Attribute itemName="columnHeadings">
Index: chandler/parcels/osaf/views/zaobao/parcel.xml
diff -u chandler/parcels/osaf/views/zaobao/parcel.xml:1.17 chandler/parcels/osaf/views/zaobao/parcel.xml:1.18
--- chandler/parcels/osaf/views/zaobao/parcel.xml:1.17 Wed May 26 18:39:49 2004
+++ chandler/parcels/osaf/views/zaobao/parcel.xml Fri May 28 11:53:42 2004
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.17 $ -->
-<!-- $Date: 2004/05/27 01:39:49 $ -->
+<!-- $Revision: 1.18 $ -->
+<!-- $Date: 2004/05/28 18:53:42 $ -->
<!-- Copyright (c) 2003 Open Source Applications Foundation -->
<!-- License: http://osafoundation.org/Chandler_0.1_license_terms.htm -->
@@ -57,10 +57,7 @@
<!-- Styles -->
<CharacterStyle itemName="HeaderCharacterStyle">
- <fontFamily>DefaultUIFont</fontFamily>
- <fontSize>12.0</fontSize>
<fontStyle>bold</fontStyle>
- <fontName></fontName>
</CharacterStyle>
<!-- Events -->
@@ -107,7 +104,6 @@
<border>3.0, 3.0, 3.0, 3.0</border>
<alignmentEnum>grow</alignmentEnum>
<stretchFactor>0.0</stretchFactor>
- <textAlignmentEnum>Left</textAlignmentEnum>
<lineStyleEnum>SingleLine</lineStyleEnum>
<textStyleEnum>PlainText</textStyleEnum>
<readOnly>False</readOnly>
@@ -140,7 +136,6 @@
</HTML>
<SplitterWindow itemName="ZaoBaoView">
- <orientationEnum>Horizontal</orientationEnum>
<splitPercentage>0.5</splitPercentage>
<eventBoundary>True</eventBoundary>
@@ -193,7 +188,6 @@
</zb:ZaoBaoItemDetail>
<SplitterWindow itemName="ZaoBaoChannelView">
- <orientationEnum>Horizontal</orientationEnum>
<splitPercentage>0.5</splitPercentage>
<eventBoundary>True</eventBoundary>
@@ -239,7 +233,6 @@
</zb:ZaoBaoItemDetail>
<SplitterWindow itemName="chandlerwiki_ZaoBaoChannelView">
- <orientationEnum>Horizontal</orientationEnum>
<splitPercentage>0.5</splitPercentage>
<eventBoundary>True</eventBoundary>
@@ -284,7 +277,6 @@
</zb:ZaoBaoItemDetail>
<SplitterWindow itemName="junglewiki_ZaoBaoChannelView">
- <orientationEnum>Horizontal</orientationEnum>
<splitPercentage>0.5</splitPercentage>
<eventBoundary>True</eventBoundary>
@@ -330,7 +322,6 @@
</zb:ZaoBaoItemDetail>
<SplitterWindow itemName="ted_ZaoBaoChannelView">
- <orientationEnum>Horizontal</orientationEnum>
<splitPercentage>0.5</splitPercentage>
<eventBoundary>True</eventBoundary>
@@ -376,7 +367,6 @@
</zb:ZaoBaoItemDetail>
<SplitterWindow itemName="zaobao_ZaoBaoChannelView">
- <orientationEnum>Horizontal</orientationEnum>
<splitPercentage>0.5</splitPercentage>
<eventBoundary>True</eventBoundary>
@@ -423,7 +413,6 @@
</zb:ZaoBaoItemDetail>
<SplitterWindow itemName="chao_ZaoBaoChannelView">
- <orientationEnum>Horizontal</orientationEnum>
<splitPercentage>0.5</splitPercentage>
<eventBoundary>True</eventBoundary>
@@ -470,7 +459,6 @@
</zb:ZaoBaoItemDetail>
<SplitterWindow itemName="lessig_ZaoBaoChannelView">
- <orientationEnum>Horizontal</orientationEnum>
<splitPercentage>0.5</splitPercentage>
<eventBoundary>True</eventBoundary>
@@ -517,7 +505,6 @@
</zb:ZaoBaoItemDetail>
<SplitterWindow itemName="mark_ZaoBaoChannelView">
- <orientationEnum>Horizontal</orientationEnum>
<splitPercentage>0.5</splitPercentage>
<eventBoundary>True</eventBoundary>
Index: chandler/parcels/osaf/views/main/parcel.xml
diff -u chandler/parcels/osaf/views/main/parcel.xml:1.40 chandler/parcels/osaf/views/main/parcel.xml:1.41
--- chandler/parcels/osaf/views/main/parcel.xml:1.40 Wed May 26 18:39:47 2004
+++ chandler/parcels/osaf/views/main/parcel.xml Fri May 28 11:53:39 2004
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.40 $ -->
-<!-- $Date: 2004/05/27 01:39:47 $ -->
+<!-- $Revision: 1.41 $ -->
+<!-- $Date: 2004/05/28 18:53:39 $ -->
<!-- Copyright (c) 2003 Open Source Applications Foundation -->
<!-- License: http://osafoundation.org/Chandler_0.1_license_terms.htm -->
@@ -29,10 +29,7 @@
Styles
-->
<CharacterStyle itemName="HeaderCharacterStyle">
- <fontFamily>DefaultUIFont</fontFamily>
- <fontSize>12.0</fontSize>
<fontStyle>bold</fontStyle>
- <fontName></fontName>
</CharacterStyle>
<!--
More information about the Commits
mailing list