[Commits] (jed) Renamed ChoiceContainer to be LayoutChooser.

[commits at osafoundation.org]

Commit by: jed
Modified files:
chandler/parcels/osaf/framework/blocks/ContainerBlocks.py 1.133 1.134
chandler/parcels/osaf/framework/blocks/parcel.xml 1.118 1.119
chandler/parcels/osaf/views/content/parcel.xml 1.74 1.75

Log message:
Renamed ChoiceContainer to be LayoutChooser.

ViewCVS links:
http://cvs.osafoundation.org/index.cgi/chandler/parcels/osaf/framework/blocks/ContainerBlocks.py.diff?r1=text&tr1=1.133&r2=text&tr2=1.134
http://cvs.osafoundation.org/index.cgi/chandler/parcels/osaf/framework/blocks/parcel.xml.diff?r1=text&tr1=1.118&r2=text&tr2=1.119
http://cvs.osafoundation.org/index.cgi/chandler/parcels/osaf/views/content/parcel.xml.diff?r1=text&tr1=1.74&r2=text&tr2=1.75

Index: chandler/parcels/osaf/framework/blocks/ContainerBlocks.py
diff -u chandler/parcels/osaf/framework/blocks/ContainerBlocks.py:1.133 chandler/parcels/osaf/framework/blocks/ContainerBlocks.py:1.134
--- chandler/parcels/osaf/framework/blocks/ContainerBlocks.py:1.133	Tue Sep 28 13:08:06 2004
+++ chandler/parcels/osaf/framework/blocks/ContainerBlocks.py	Tue Sep 28 13:46:57 2004
@@ -1,5 +1,5 @@
-__version__ = "$Revision: 1.133 $"
-__date__ = "$Date: 2004/09/28 20:08:06 $"
+__version__ = "$Revision: 1.134 $"
+__date__ = "$Date: 2004/09/28 20:46:57 $"
 __copyright__ = "Copyright (c) 2003-2004 Open Source Applications Foundation"
 __license__ = "http://osafoundation.org/Chandler_0.1_license_terms.htm"
 
@@ -51,9 +51,9 @@
         return widget
 
 
-class wxChoiceContainer(wxBoxContainer):
+class wxLayoutChooser(wxBoxContainer):
     def __init__(self, *arguments, **keywords):
-        super (wxChoiceContainer, self).__init__ (*arguments, **keywords)
+        super (wxLayoutChooser, self).__init__ (*arguments, **keywords)
             
     def wxSynchronizeWidget(self, *arguments, **keywords):
         selectedChoice = self._getSelectedChoice()
@@ -63,7 +63,7 @@
                     childBlock.parentBlock = None
                     if hasattr(childBlock, 'widget'):
                         childBlock.widget.Destroy()
-            super(wxChoiceContainer, self).wxSynchronizeWidget(*arguments, **keywords)
+            super(wxLayoutChooser, self).wxSynchronizeWidget(*arguments, **keywords)
 
             try: # @@@ Until all the views have the necessary choices
                 choice = self.blockItem.choices[selectedChoice]
@@ -116,7 +116,7 @@
         return -1
     
 
-class ChoiceContainer(BoxContainer):
+class LayoutChooser(BoxContainer):
     def instantiateWidget (self):
         self.selection = -1
         if self.orientationEnum == 'Horizontal':
@@ -127,7 +127,7 @@
         sizer = wx.BoxSizer(orientation)
         sizer.SetMinSize((self.minimumSize.width, self.minimumSize.height))
         parentWidget = self.parentBlock.widget 
-        widget = wxChoiceContainer(parentWidget, Block.getWidgetID(self))
+        widget = wxLayoutChooser(parentWidget, Block.getWidgetID(self))
         widget.SetSizer (sizer)
 
         return widget

Index: chandler/parcels/osaf/framework/blocks/parcel.xml
diff -u chandler/parcels/osaf/framework/blocks/parcel.xml:1.118 chandler/parcels/osaf/framework/blocks/parcel.xml:1.119
--- chandler/parcels/osaf/framework/blocks/parcel.xml:1.118	Tue Sep 28 13:08:06 2004
+++ chandler/parcels/osaf/framework/blocks/parcel.xml	Tue Sep 28 13:46:57 2004
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
 
-<!-- $Revision: 1.118 $ -->
-<!-- $Date: 2004/09/28 20:08:06 $ -->
+<!-- $Revision: 1.119 $ -->
+<!-- $Date: 2004/09/28 20:46:57 $ -->
 <!-- Copyright (c) 2003-2004 Open Source Applications Foundation -->
 <!-- License: http://osafoundation.org/Chandler_0.1_license_terms.htm -->
 
@@ -688,10 +688,10 @@
   </Kind>
 
   <!--
-    ChoiceContainer
+    LayoutChooser
   -->
-  <Kind itsName="ChoiceContainer">
-    <classes key="python">osaf.framework.blocks.ContainerBlocks.ChoiceContainer</classes>
+  <Kind itsName="LayoutChooser">
+    <classes key="python">osaf.framework.blocks.ContainerBlocks.LayoutChooser</classes>
     <superKinds itemref="docSchema:BoxContainer"/>
     
     <Attribute itsName="choices">
@@ -699,7 +699,7 @@
       <cardinality>list</cardinality>
     </Attribute>
 
-    <attributes itemref="docSchema:ChoiceContainer/choices"/>
+    <attributes itemref="docSchema:LayoutChooser/choices"/>
   </Kind>
 
   <!--

Index: chandler/parcels/osaf/views/content/parcel.xml
diff -u chandler/parcels/osaf/views/content/parcel.xml:1.74 chandler/parcels/osaf/views/content/parcel.xml:1.75
--- chandler/parcels/osaf/views/content/parcel.xml:1.74	Tue Sep 28 13:39:31 2004
+++ chandler/parcels/osaf/views/content/parcel.xml	Tue Sep 28 13:46:57 2004
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
 
-<!-- $Revision: 1.74 $ -->
-<!-- $Date: 2004/09/28 20:39:31 $ -->
+<!-- $Revision: 1.75 $ -->
+<!-- $Date: 2004/09/28 20:46:57 $ -->
 <!-- Copyright (c) 2004 Open Source Applications Foundation -->
 <!-- License: http://osafoundation.org/Chandler_0.1_license_terms.htm -->
 
@@ -214,14 +214,14 @@
     <columnWidths>170</columnWidths>
   </Table>
   
-  <ChoiceContainer itsName="CalendarSummary">
+  <LayoutChooser itsName="CalendarSummary">
     <childrenBlocks itemref="main:LayoutSelector" copy="LayoutSelector"/>
     <choices itemref="view:CalendarTable"/>
     <choices itemref="view:SummaryMonth"/>
     <choices itemref="view:SummaryWeek"/>
     <choices itemref="view:SummaryDay"/>    
     <orientationEnum>Vertical</orientationEnum>
-  </ChoiceContainer>
+  </LayoutChooser>
 
   <!-- Calendar Table -->
   <Table itsName="CalendarTable">