Commit by: stearns Modified files: chandler/parcels/osaf/framework/blocks/Trunk.py 1.10 1.11 chandler/parcels/osaf/framework/blocks/parcel.xml 1.154 1.155 chandler/parcels/osaf/framework/blocks/detail/parcel.xml 1.69 1.70 chandler/parcels/osaf/views/main/parcel.xml 1.189 1.190
Log message: Fix bug 2606 (DV blanks out when you select calendar app in the filter bar), r=capps ViewCVS links: http://cvs.osafoundation.org/index.cgi/chandler/parcels/osaf/framework/blocks/Trunk.py.diff?r1=text&tr1=1.10&r2=text&tr2=1.11 http://cvs.osafoundation.org/index.cgi/chandler/parcels/osaf/framework/blocks/parcel.xml.diff?r1=text&tr1=1.154&r2=text&tr2=1.155 http://cvs.osafoundation.org/index.cgi/chandler/parcels/osaf/framework/blocks/detail/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.189&r2=text&tr2=1.190 Index: chandler/parcels/osaf/framework/blocks/Trunk.py diff -u chandler/parcels/osaf/framework/blocks/Trunk.py:1.10 chandler/parcels/osaf/framework/blocks/Trunk.py:1.11 --- chandler/parcels/osaf/framework/blocks/Trunk.py:1.10 Sat Feb 19 14:40:54 2005 +++ chandler/parcels/osaf/framework/blocks/Trunk.py Thu Mar 10 10:38:52 2005 @@ -1,5 +1,5 @@ -__version__ = "$Revision: 1.10 $" -__date__ = "$Date: 2005/02/19 22:40:54 $" +__version__ = "$Revision: 1.11 $" +__date__ = "$Date: 2005/03/10 18:38:52 $" __copyright__ = "Copyright (c) 2005 Open Source Applications Foundation" __license__ = "http://osafoundation.org/Chandler_0.1_license_terms.htm"; @@ -27,6 +27,7 @@ if self.blockItem.isShown: self.blockItem.installTreeOfBlocks() super(wxTrunkParentBlock, self).wxSynchronizeWidget(*arguments, **keywords) + self.blockItem.synchronizeColor() class TrunkParentBlock(ContainerBlocks.BoxContainer): """ @@ -83,6 +84,10 @@ self.trunkDelegate._setContentsOnTrunk (newView, detailItem, keyItem) newView.synchronizeWidget() + def synchronizeColor (self): + # if there's a color style defined, synchronize the color + if self.hasLocalAttributeValue("colorStyle"): + self.colorStyle.synchronizeColor(self) # @@@BJS: "reload parcels" needs to blow away this cache! Index: chandler/parcels/osaf/framework/blocks/parcel.xml diff -u chandler/parcels/osaf/framework/blocks/parcel.xml:1.154 chandler/parcels/osaf/framework/blocks/parcel.xml:1.155 --- chandler/parcels/osaf/framework/blocks/parcel.xml:1.154 Thu Mar 3 18:03:06 2005 +++ chandler/parcels/osaf/framework/blocks/parcel.xml Thu Mar 10 10:38:53 2005 @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="iso-8859-1"?> -<!-- $Revision: 1.154 $ --> -<!-- $Date: 2005/03/04 02:03:06 $ --> +<!-- $Revision: 1.155 $ --> +<!-- $Date: 2005/03/10 18:38:53 $ --> <!-- Copyright (c) 2003-2005 Open Source Applications Foundation --> <!-- License: http://osafoundation.org/Chandler_0.1_license_terms.htm --> @@ -1372,6 +1372,8 @@ <inverseAttribute itemref="docSchema:Block/detailItemOwner"/> </Attribute> + <attributes itemref="docSchema:colorStyle"/> + <!-- Share the same trunkDelegate amongst all copies of the parent block --> <Cloud itsName="DefaultCloud"> <Endpoint itsName="trunkDelegate"> @@ -1385,6 +1387,11 @@ <includePolicy value="byRef"/> </Endpoint> <endpoints itemref="docSchema:TrunkParentBlock/DefaultCloud/detailItem"/> + <Endpoint itsName="colorStyle"> + <attribute value="colorStyle"/> + <includePolicy value="byRef"/> + </Endpoint> + <endpoints itemref="docSchema:TrunkParentBlock/DefaultCloud/colorStyle"/> </Cloud> <clouds alias="default" itemref="docSchema:TrunkParentBlock/DefaultCloud"/> </Kind> Index: chandler/parcels/osaf/framework/blocks/detail/parcel.xml diff -u chandler/parcels/osaf/framework/blocks/detail/parcel.xml:1.69 chandler/parcels/osaf/framework/blocks/detail/parcel.xml:1.70 --- chandler/parcels/osaf/framework/blocks/detail/parcel.xml:1.69 Fri Feb 25 10:15:56 2005 +++ chandler/parcels/osaf/framework/blocks/detail/parcel.xml Thu Mar 10 10:38:53 2005 @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="iso-8859-1"?> -<!-- $Revision: 1.69 $ --> -<!-- $Date: 2005/02/25 18:15:56 $ --> +<!-- $Revision: 1.70 $ --> +<!-- $Date: 2005/03/10 18:38:53 $ --> <!-- Copyright (c) 2003-2005 Open Source Applications Foundation --> <!-- License: http://osafoundation.org/Chandler_0.1_license_terms.htm --> @@ -48,6 +48,10 @@ <backgroundColor>204,204,204,204</backgroundColor> </ColorStyle> + <ColorStyle itsName="WhiteBackground"> + <backgroundColor>255,255,255,0</backgroundColor> + </ColorStyle> + <!-- Events --> Index: chandler/parcels/osaf/views/main/parcel.xml diff -u chandler/parcels/osaf/views/main/parcel.xml:1.189 chandler/parcels/osaf/views/main/parcel.xml:1.190 --- chandler/parcels/osaf/views/main/parcel.xml:1.189 Thu Mar 3 18:03:03 2005 +++ chandler/parcels/osaf/views/main/parcel.xml Thu Mar 10 10:38:53 2005 @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="iso-8859-1"?> -<!-- $Revision: 1.189 $ --> -<!-- $Date: 2005/03/04 02:03:03 $ --> +<!-- $Revision: 1.190 $ --> +<!-- $Date: 2005/03/10 18:38:53 $ --> <!-- Copyright (c) 2003-2004 Open Source Applications Foundation --> <!-- License: http://osafoundation.org/Chandler_0.1_license_terms.htm --> @@ -1346,6 +1346,7 @@ <blockName>CalendarDetailTPB</blockName> <detailItem itemref="core:None"/> <trunkDelegate itemref="doc:CalendarDetailTrunkDelegate"/> + <colorStyle itemref="detail:WhiteBackground"/> </TrunkParentBlock> <DetailTrunkDelegate itsName="CalendarDetailTrunkDelegate"> _______________________________________________ Commits mailing list Commits@osafoundation.org http://lists.osafoundation.org/mailman/listinfo/commits
