Repository: flex-utilities Updated Branches: refs/heads/develop 06bbbd6c6 -> bec21024d
fix minor issue in two example names Project: http://git-wip-us.apache.org/repos/asf/flex-utilities/repo Commit: http://git-wip-us.apache.org/repos/asf/flex-utilities/commit/8c236671 Tree: http://git-wip-us.apache.org/repos/asf/flex-utilities/tree/8c236671 Diff: http://git-wip-us.apache.org/repos/asf/flex-utilities/diff/8c236671 Branch: refs/heads/develop Commit: 8c23667119e32c1b1f81a0cfd0633f54186b2a2c Parents: 06bbbd6 Author: Justin Mclean <[email protected]> Authored: Mon Aug 25 09:53:29 2014 +1000 Committer: Justin Mclean <[email protected]> Committed: Mon Aug 25 09:53:29 2014 +1000 ---------------------------------------------------------------------- TourDeFlex/TourDeFlex3/build.xml | 2 +- TourDeFlex/TourDeFlex3/src/explorer.xml | 4 +- .../SkinableDataContainerExample.mxml | 62 -------------------- .../SkinnableDataContainerExample.mxml | 62 ++++++++++++++++++++ 4 files changed, 65 insertions(+), 65 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/flex-utilities/blob/8c236671/TourDeFlex/TourDeFlex3/build.xml ---------------------------------------------------------------------- diff --git a/TourDeFlex/TourDeFlex3/build.xml b/TourDeFlex/TourDeFlex3/build.xml index e71896e..6b025b7 100644 --- a/TourDeFlex/TourDeFlex3/build.xml +++ b/TourDeFlex/TourDeFlex3/build.xml @@ -256,7 +256,7 @@ <compile-mxml example="/spark/containers/SampleHGroup"/> <compile-mxml example="/spark/containers/SampleVGroup"/> <compile-mxml example="/spark/containers/SampleVerticalHorizontalAlign"/> - <compile-mxml example="/spark/containers/SkinableDataContainerExample"/> + <compile-mxml example="/spark/containers/SkinnableDataContainerExample"/> <compile-mxml example="/spark/containers/TileGroupExample"/> <compile-mxml example="/spark/effects/Move3DExample"/> http://git-wip-us.apache.org/repos/asf/flex-utilities/blob/8c236671/TourDeFlex/TourDeFlex3/src/explorer.xml ---------------------------------------------------------------------- diff --git a/TourDeFlex/TourDeFlex3/src/explorer.xml b/TourDeFlex/TourDeFlex3/src/explorer.xml index 5915040..8946f1d 100755 --- a/TourDeFlex/TourDeFlex3/src/explorer.xml +++ b/TourDeFlex/TourDeFlex3/src/explorer.xml @@ -320,10 +320,10 @@ <node label="HGroup" app="spark/containers/SampleHGroup" /> <node label="Group" app="spark/containers/GroupExample"/> <node label="Panel" app="spark/containers/PanelExample"/> - <node label="SkinableDataContainer" app="spark/containers/SkinableDataContainerExample" /> + <node label="SkinnableDataContainer" app="spark/containers/SkinnableDataContainerExample" /> <node label="TabNavigator" app="spark/containers/TabNavigator1Example" /> <node label="TabNavigator" app="spark/containers/TabNavigator2Example" /> - <node label="TitleGroup" app="spark/containers/TileGroupExample" /> + <node label="TileGroup" app="spark/containers/TileGroupExample" /> <node label="TitleWindow" app="spark/controls/TitleWindowExample" /> <node label="ViewStack" app="spark/controls/ViewStackExample" /> <node label="VGroup" app="spark/containers/SampleVGroup" /> http://git-wip-us.apache.org/repos/asf/flex-utilities/blob/8c236671/TourDeFlex/TourDeFlex3/src/spark/containers/SkinableDataContainerExample.mxml ---------------------------------------------------------------------- diff --git a/TourDeFlex/TourDeFlex3/src/spark/containers/SkinableDataContainerExample.mxml b/TourDeFlex/TourDeFlex3/src/spark/containers/SkinableDataContainerExample.mxml deleted file mode 100644 index 09fb38c..0000000 --- a/TourDeFlex/TourDeFlex3/src/spark/containers/SkinableDataContainerExample.mxml +++ /dev/null @@ -1,62 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- - - Licensed to the Apache Software Foundation (ASF) under one or more - contributor license agreements. See the NOTICE file distributed with - this work for additional information regarding copyright ownership. - The ASF licenses this file to You under the Apache License, Version 2.0 - (the "License"); you may not use this file except in compliance with - the License. You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. - ---> -<s:Application xmlns:fx="http://ns.adobe.com/mxml/2009"; - xmlns:s="library://ns.adobe.com/flex/spark" - xmlns:mx="library://ns.adobe.com/flex/mx"> - - <s:Panel width="100%" height="100%" title="SkinnableDataContainer" skinClass="skins.TDFPanelSkin"> - <s:layout><s:HorizontalLayout paddingLeft="8" paddingTop="8" paddingRight="12"/></s:layout> - - <s:VGroup> - <s:Label text="Famous Astronauts" fontWeight="bold" fontSize="14"/> - <s:SkinnableDataContainer horizontalCenter="-66" verticalCenter="0" width="301"> - <s:layout> - <s:VerticalLayout/> - </s:layout> - <s:itemRenderer> - <fx:Component> - <s:ItemRenderer> - <s:VGroup horizontalCenter="0" verticalCenter="0"> - <s:HGroup verticalAlign="middle"> - <s:Label text="{data.firstName}"/> - <s:Label text="{data.lastName}"/> - <s:Label text="{data.phoneNumber}"/> - <mx:LinkButton label="{data.college}" color="0x3380DD" click="navigateToURL(new URLRequest(data.url), '_blank')" - textDecoration="underline" fontWeight="normal" icon="@Embed('assets/arrow_icon_sm.png')" /> - </s:HGroup> - </s:VGroup> - </s:ItemRenderer> - </fx:Component> - </s:itemRenderer> - - <s:ArrayCollection> - <fx:Object firstName="John" lastName="Glenn" phoneNumber="888-555-1111" college="West Point" url="http://www.usma.edu/"/> - <fx:Object firstName="Neil" lastName="Armstrong" phoneNumber="888-555-2222" college="Purdue" url="http://www.purdue.edu/"/> - <fx:Object firstName="Buzz" lastName="Aldrin" phoneNumber="888-555-3333" college="Muskingum" url="http://www.muskingum.edu/"/> - <fx:Object firstName="James" lastName="Lovell" phoneNumber="888-555-4444" college="US Naval Academy" url="http://www.usna.edu/"/> - </s:ArrayCollection> - </s:SkinnableDataContainer> - </s:VGroup> - <s:Label color="0x323232" width="200" text="The SkinnableDataContainer is the skinnable version of the DataGroup and -while it can hold visual elements, they are often used only to hold data items as children. Data items can be simple data items -such String and Number objects, and more complicated data items such as Object and XMLNode objects."/> - </s:Panel> - -</s:Application> http://git-wip-us.apache.org/repos/asf/flex-utilities/blob/8c236671/TourDeFlex/TourDeFlex3/src/spark/containers/SkinnableDataContainerExample.mxml ---------------------------------------------------------------------- diff --git a/TourDeFlex/TourDeFlex3/src/spark/containers/SkinnableDataContainerExample.mxml b/TourDeFlex/TourDeFlex3/src/spark/containers/SkinnableDataContainerExample.mxml new file mode 100644 index 0000000..09fb38c --- /dev/null +++ b/TourDeFlex/TourDeFlex3/src/spark/containers/SkinnableDataContainerExample.mxml @@ -0,0 +1,62 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one or more + contributor license agreements. See the NOTICE file distributed with + this work for additional information regarding copyright ownership. + The ASF licenses this file to You under the Apache License, Version 2.0 + (the "License"); you may not use this file except in compliance with + the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + +--> +<s:Application xmlns:fx="http://ns.adobe.com/mxml/2009"; + xmlns:s="library://ns.adobe.com/flex/spark" + xmlns:mx="library://ns.adobe.com/flex/mx"> + + <s:Panel width="100%" height="100%" title="SkinnableDataContainer" skinClass="skins.TDFPanelSkin"> + <s:layout><s:HorizontalLayout paddingLeft="8" paddingTop="8" paddingRight="12"/></s:layout> + + <s:VGroup> + <s:Label text="Famous Astronauts" fontWeight="bold" fontSize="14"/> + <s:SkinnableDataContainer horizontalCenter="-66" verticalCenter="0" width="301"> + <s:layout> + <s:VerticalLayout/> + </s:layout> + <s:itemRenderer> + <fx:Component> + <s:ItemRenderer> + <s:VGroup horizontalCenter="0" verticalCenter="0"> + <s:HGroup verticalAlign="middle"> + <s:Label text="{data.firstName}"/> + <s:Label text="{data.lastName}"/> + <s:Label text="{data.phoneNumber}"/> + <mx:LinkButton label="{data.college}" color="0x3380DD" click="navigateToURL(new URLRequest(data.url), '_blank')" + textDecoration="underline" fontWeight="normal" icon="@Embed('assets/arrow_icon_sm.png')" /> + </s:HGroup> + </s:VGroup> + </s:ItemRenderer> + </fx:Component> + </s:itemRenderer> + + <s:ArrayCollection> + <fx:Object firstName="John" lastName="Glenn" phoneNumber="888-555-1111" college="West Point" url="http://www.usma.edu/"/> + <fx:Object firstName="Neil" lastName="Armstrong" phoneNumber="888-555-2222" college="Purdue" url="http://www.purdue.edu/"/> + <fx:Object firstName="Buzz" lastName="Aldrin" phoneNumber="888-555-3333" college="Muskingum" url="http://www.muskingum.edu/"/> + <fx:Object firstName="James" lastName="Lovell" phoneNumber="888-555-4444" college="US Naval Academy" url="http://www.usna.edu/"/> + </s:ArrayCollection> + </s:SkinnableDataContainer> + </s:VGroup> + <s:Label color="0x323232" width="200" text="The SkinnableDataContainer is the skinnable version of the DataGroup and +while it can hold visual elements, they are often used only to hold data items as children. Data items can be simple data items +such String and Number objects, and more complicated data items such as Object and XMLNode objects."/> + </s:Panel> + +</s:Application>
