You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flex.apache.org by jm...@apache.org on 2014/08/18 06:38:29 UTC
[1/7] git commit: [flex-utilities] [refs/heads/develop] - updated for
working examples
Repository: flex-utilities
Updated Branches:
refs/heads/develop 616713d1a -> 08b9c2d20
updated for working examples
Project: http://git-wip-us.apache.org/repos/asf/flex-utilities/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-utilities/commit/7eb23691
Tree: http://git-wip-us.apache.org/repos/asf/flex-utilities/tree/7eb23691
Diff: http://git-wip-us.apache.org/repos/asf/flex-utilities/diff/7eb23691
Branch: refs/heads/develop
Commit: 7eb236912b06d330320651ad76a659cb8d74c450
Parents: 616713d
Author: Justin Mclean <jm...@apache.org>
Authored: Mon Aug 18 14:35:02 2014 +1000
Committer: Justin Mclean <jm...@apache.org>
Committed: Mon Aug 18 14:35:02 2014 +1000
----------------------------------------------------------------------
TourDeFlex/TourDeFlex3/src/explorer.xml | 9 +++++++--
1 file changed, 7 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-utilities/blob/7eb23691/TourDeFlex/TourDeFlex3/src/explorer.xml
----------------------------------------------------------------------
diff --git a/TourDeFlex/TourDeFlex3/src/explorer.xml b/TourDeFlex/TourDeFlex3/src/explorer.xml
index c5296af..fdc2eaf 100755
--- a/TourDeFlex/TourDeFlex3/src/explorer.xml
+++ b/TourDeFlex/TourDeFlex3/src/explorer.xml
@@ -304,7 +304,9 @@
<node label="Wipe" app="spark/effects/WipeExample" />
<node label="Animate Property" app="spark/effects/AnimatePropertiesExample" />
<node label="Animate Transform" app="spark/effects/AnimateTransformExample" />
+ <!-- not working
<node label="Cross Fade" app="spark/effects/CrossFadeExample" />
+ -->
<node label="Fade" app="spark/effects/FadeExample" />
<node label="Rotate 3D" app="spark/effects/Rotate3DExample" />
<node label="Scale 3D" app="spark/effects/Scale3DExample" />
@@ -319,7 +321,6 @@
<node label="Group" app="spark/containers/GroupExample"/>
<node label="Panel" app="spark/containers/PanelExample"/>
<node label="SkinableDataContainer" app="spark/containers/SkinableDataContainerExample" />
- <node label="TabNavigator" app="spark/controls/TabNavigatorExample" />
<node label="TabNavigator" app="spark/containers/TabNavigator1Example" />
<node label="TabNavigator" app="spark/containers/TabNavigator2Example" />
<node label="TitleGroup" app="spark/containers/TileGroupExample" />
@@ -346,10 +347,10 @@
<node label="ComboBox" app="spark/controls/ComboBoxExample" />
<node label="DropDown" app="spark/controls/DropdownExample"/>
<node label="DataGrid" app="spark/controls/DataGridExample" />
+ <node label="Image" app="spark/controls/ImageExample" />
<node label="List" app="spark/controls/ListExample" />
<node label="Menu" app="spark/controls/MenuExample" />
<node label="NumericStepper" app="spark/controls/NumericStepperExample"/>
- <node label="Image" app="spark/controls/ImageExample" />
<node label="OLAPDataGrid" app="spark/controls/OLAPDataGridExample" />
<node label="ProgressBar" app="spark/controls/ProgressBarExample" />
<node label="RadioButton" app="spark/controls/RadioButtonExample"/>
@@ -358,7 +359,9 @@
<node label="Scroller and Tabbing" app="spark/controls/Scroller2Example"/>
<node label="Slider" app="spark/controls/SliderExample"/>
<node label="Spinner" app="spark/controls/SpinnerExample"/>
+ <!-- Removed to avoid putting swf in repo
<node label="SWFloader" app="spark/controls/SWFLoaderExample" />
+ -->
<node label="ToolTip" app="spark/controls/ToolTipExample" />
<node label="Tree" app="spark/controls/TreeExample" />
<node label="VideoDisplay" app="spark/controls/VideoDisplayExample" />
@@ -388,7 +391,9 @@
<node label="News Layout" app="spark/controls/TextLayout2Example" />
<node label="Text Controls" app="spark/controls/TextLayout3Example" />
<node label="Import Format Types" app="spark/controls/TextLayout4Example" />
+ <!-- Doesn't comile with current version of TLF
<node label="Text Layout Editor" app="spark/tlf/TextLayoutEditorSample" />
+ -->
</node>
<node label="Layouts">
<node label="Animated" app="spark/layouts/CustomLayoutAnimatedExample" />
[7/7] git commit: [flex-utilities] [refs/heads/develop] - replace
image with dummy image
Posted by jm...@apache.org.
replace image with dummy image
Project: http://git-wip-us.apache.org/repos/asf/flex-utilities/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-utilities/commit/08b9c2d2
Tree: http://git-wip-us.apache.org/repos/asf/flex-utilities/tree/08b9c2d2
Diff: http://git-wip-us.apache.org/repos/asf/flex-utilities/diff/08b9c2d2
Branch: refs/heads/develop
Commit: 08b9c2d20ce47671157f783e94bdc20cef28a980
Parents: 092eef2
Author: Justin Mclean <jm...@apache.org>
Authored: Mon Aug 18 14:38:10 2014 +1000
Committer: Justin Mclean <jm...@apache.org>
Committed: Mon Aug 18 14:38:10 2014 +1000
----------------------------------------------------------------------
.../TourDeFlex3/src/spark/layouts/renderers/PhoneRenderer.mxml | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-utilities/blob/08b9c2d2/TourDeFlex/TourDeFlex3/src/spark/layouts/renderers/PhoneRenderer.mxml
----------------------------------------------------------------------
diff --git a/TourDeFlex/TourDeFlex3/src/spark/layouts/renderers/PhoneRenderer.mxml b/TourDeFlex/TourDeFlex3/src/spark/layouts/renderers/PhoneRenderer.mxml
index 9e17279..d964c6b 100644
--- a/TourDeFlex/TourDeFlex3/src/spark/layouts/renderers/PhoneRenderer.mxml
+++ b/TourDeFlex/TourDeFlex3/src/spark/layouts/renderers/PhoneRenderer.mxml
@@ -41,8 +41,7 @@
</s:Transition>
</s:transitions>
- <mx:Image id="image" source="{data.image}" horizontalCenter="0"
- width="50" height="94"/>
+ <mx:Image id="image" source="@Embed('../assets/ApacheFlexIcon.png')" horizontalCenter="0" />
<s:Group id="group" top="0" bottom="0" left="0" right="0" visible.normal="false">
[3/7] git commit: [flex-utilities] [refs/heads/develop] - reduced
size of image
Posted by jm...@apache.org.
reduced size of image
Project: http://git-wip-us.apache.org/repos/asf/flex-utilities/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-utilities/commit/b3524241
Tree: http://git-wip-us.apache.org/repos/asf/flex-utilities/tree/b3524241
Diff: http://git-wip-us.apache.org/repos/asf/flex-utilities/diff/b3524241
Branch: refs/heads/develop
Commit: b352424178c8c7ca38f63ab7f2783da890b24e43
Parents: b6a8505
Author: Justin Mclean <jm...@apache.org>
Authored: Mon Aug 18 14:36:08 2014 +1000
Committer: Justin Mclean <jm...@apache.org>
Committed: Mon Aug 18 14:36:08 2014 +1000
----------------------------------------------------------------------
TourDeFlex/TourDeFlex3/src/spark/controls/ImageExample.mxml | 4 ++--
.../TourDeFlex3/src/spark/controls/Scroller2Example.mxml | 2 +-
TourDeFlex/TourDeFlex3/src/spark/effects/FadeExample.mxml | 2 +-
TourDeFlex/TourDeFlex3/src/spark/effects/Move3DExample.mxml | 2 +-
TourDeFlex/TourDeFlex3/src/spark/effects/Rotate3DExample.mxml | 2 +-
TourDeFlex/TourDeFlex3/src/spark/effects/Scale3DExample.mxml | 6 +++---
TourDeFlex/TourDeFlex3/src/spark/effects/WipeExample.mxml | 2 +-
7 files changed, 10 insertions(+), 10 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-utilities/blob/b3524241/TourDeFlex/TourDeFlex3/src/spark/controls/ImageExample.mxml
----------------------------------------------------------------------
diff --git a/TourDeFlex/TourDeFlex3/src/spark/controls/ImageExample.mxml b/TourDeFlex/TourDeFlex3/src/spark/controls/ImageExample.mxml
index d139d1b..f3473b7 100644
--- a/TourDeFlex/TourDeFlex3/src/spark/controls/ImageExample.mxml
+++ b/TourDeFlex/TourDeFlex3/src/spark/controls/ImageExample.mxml
@@ -54,7 +54,7 @@
<s:VerticalLayout paddingBottom="5" paddingLeft="5" paddingRight="5" paddingTop="5"/>
</s:layout>
<s:Label color="0x323232" text="Sample of image embeded at compile time." />
- <mx:Image id="embededImage" source="@Embed('assets/ApacheFlexLogo.png')" creationComplete="smoothImage(event);"/>
+ <mx:Image id="embededImage" width="50%" height="50%" source="@Embed('assets/ApacheFlexLogo.png')" creationComplete="smoothImage(event);"/>
</s:BorderContainer>
<s:BorderContainer width="50%" borderColor="0xACACAC" height="100%" borderStyle="solid">
@@ -63,7 +63,7 @@
<s:VerticalLayout paddingBottom="5" paddingLeft="5" paddingRight="5" paddingTop="5"/>
</s:layout>
<s:Label color="0x323232" text="Sample of image loaded at run-time." />
- <mx:Image id="loadedImage" source="assets/ApacheFlexLogo.png" creationComplete="smoothImage(event);"/>
+ <mx:Image id="loadedImage" width="50%" height="50%" source="assets/ApacheFlexLogo.png" creationComplete="smoothImage(event);"/>
</s:BorderContainer>
</s:Panel>
http://git-wip-us.apache.org/repos/asf/flex-utilities/blob/b3524241/TourDeFlex/TourDeFlex3/src/spark/controls/Scroller2Example.mxml
----------------------------------------------------------------------
diff --git a/TourDeFlex/TourDeFlex3/src/spark/controls/Scroller2Example.mxml b/TourDeFlex/TourDeFlex3/src/spark/controls/Scroller2Example.mxml
index d960837..c6768bc 100644
--- a/TourDeFlex/TourDeFlex3/src/spark/controls/Scroller2Example.mxml
+++ b/TourDeFlex/TourDeFlex3/src/spark/controls/Scroller2Example.mxml
@@ -48,7 +48,7 @@
<!-- The fields are tab-able within the VGroup container -->
<s:HGroup horizontalCenter="0" top="10">
<s:VGroup left="0" horizontalAlign="center" width="20%">
- <s:BitmapImage id="img" source="@Embed(source='assets/ApacheFlexLogo.png')"/>
+ <s:BitmapImage id="img" width="200" height="200" source="@Embed(source='assets/ApacheFlexLogo.png')"/>
<s:Label text="Item For Sale"/>
</s:VGroup>
<s:Scroller tabEnabled="true" hasFocusableChildren="true">
http://git-wip-us.apache.org/repos/asf/flex-utilities/blob/b3524241/TourDeFlex/TourDeFlex3/src/spark/effects/FadeExample.mxml
----------------------------------------------------------------------
diff --git a/TourDeFlex/TourDeFlex3/src/spark/effects/FadeExample.mxml b/TourDeFlex/TourDeFlex3/src/spark/effects/FadeExample.mxml
index e2dba36..54d62c4 100644
--- a/TourDeFlex/TourDeFlex3/src/spark/effects/FadeExample.mxml
+++ b/TourDeFlex/TourDeFlex3/src/spark/effects/FadeExample.mxml
@@ -47,7 +47,7 @@
label="Fade" click="fadeEffect.play();"/>
</s:VGroup>
- <s:BitmapImage id="targetImg" source="@Embed(source='assets/ApacheFlexLogo.png')"/>
+ <s:BitmapImage id="targetImg" width="200" height="200" source="@Embed(source='assets/ApacheFlexLogo.png')"/>
<s:VGroup width="100%" >
<s:Label text="Fade Sample" fontSize="18" color="#B7B6B6"/>
http://git-wip-us.apache.org/repos/asf/flex-utilities/blob/b3524241/TourDeFlex/TourDeFlex3/src/spark/effects/Move3DExample.mxml
----------------------------------------------------------------------
diff --git a/TourDeFlex/TourDeFlex3/src/spark/effects/Move3DExample.mxml b/TourDeFlex/TourDeFlex3/src/spark/effects/Move3DExample.mxml
index fda6db2..b40ada6 100644
--- a/TourDeFlex/TourDeFlex3/src/spark/effects/Move3DExample.mxml
+++ b/TourDeFlex/TourDeFlex3/src/spark/effects/Move3DExample.mxml
@@ -85,7 +85,7 @@
label="Move Image" click="moveEffect.play();"/>
</s:VGroup>
<s:HGroup horizontalCenter="0" height="30%" verticalAlign="middle" width="40%">
- <s:BitmapImage id="targetImg" source="@Embed(source='assets/ApacheFlexLogo.png')"/>
+ <s:BitmapImage id="targetImg" width="200" height="200" source="@Embed(source='assets/ApacheFlexLogo.png')"/>
</s:HGroup>
<s:VGroup top="0" right="5" horizontalAlign="right" width="30%">
<s:Label text="Move3D Effect Sample" fontSize="18" color="#B7B6B6"/>
http://git-wip-us.apache.org/repos/asf/flex-utilities/blob/b3524241/TourDeFlex/TourDeFlex3/src/spark/effects/Rotate3DExample.mxml
----------------------------------------------------------------------
diff --git a/TourDeFlex/TourDeFlex3/src/spark/effects/Rotate3DExample.mxml b/TourDeFlex/TourDeFlex3/src/spark/effects/Rotate3DExample.mxml
index 8d7f0b3..5134671 100644
--- a/TourDeFlex/TourDeFlex3/src/spark/effects/Rotate3DExample.mxml
+++ b/TourDeFlex/TourDeFlex3/src/spark/effects/Rotate3DExample.mxml
@@ -100,7 +100,7 @@
label="Rotate Image" click="rotateEffect.play();"/>
</s:VGroup>
<s:HGroup horizontalCenter="0" height="60%" verticalAlign="middle" width="10%">
- <s:BitmapImage id="targetImg" source="@Embed(source='assets/ApacheFlexLogo.png')"/>
+ <s:BitmapImage id="targetImg" width="200" height="200" source="@Embed(source='assets/ApacheFlexLogo.png')"/>
</s:HGroup>
<s:VGroup top="0" right="5" horizontalAlign="right">
<s:Label text="Rotate3D Effect Sample" fontSize="18" color="#B7B6B6"/>
http://git-wip-us.apache.org/repos/asf/flex-utilities/blob/b3524241/TourDeFlex/TourDeFlex3/src/spark/effects/Scale3DExample.mxml
----------------------------------------------------------------------
diff --git a/TourDeFlex/TourDeFlex3/src/spark/effects/Scale3DExample.mxml b/TourDeFlex/TourDeFlex3/src/spark/effects/Scale3DExample.mxml
index afb5702..c6fd840 100644
--- a/TourDeFlex/TourDeFlex3/src/spark/effects/Scale3DExample.mxml
+++ b/TourDeFlex/TourDeFlex3/src/spark/effects/Scale3DExample.mxml
@@ -56,7 +56,7 @@
<fx:Declarations>
<s:Scale3D id="scaleEffect" target="{targetImg}"
scaleXFrom="1.0" scaleXTo="{Number(xVal.text)}"
- scaleYFrom="1.0" scaleYBy="{Number(yVal.text)}"
+ scaleYFrom="1.0" scaleYTo="{Number(yVal.text)}"
scaleZFrom="1.0" scaleZTo="{Number(zVal.text)}"
duration="{duration.value}"
repeatCount="{repeatCnt.value}" repeatBehavior="{chkReverse.selected?'reverse':'loop'}"
@@ -77,7 +77,7 @@
<s:TextInput id="xVal" text="1.0" widthInChars="3"/>
</s:HGroup>
<s:HGroup verticalAlign="middle">
- <s:Label text="Scale Y By" verticalAlign="bottom"/>
+ <s:Label text="Scale Y To" verticalAlign="bottom"/>
<s:TextInput id="yVal" text="1.0" widthInChars="3"/>
</s:HGroup>
<s:HGroup verticalAlign="middle">
@@ -101,7 +101,7 @@
label="Scale Image" click="scaleEffect.play();"/>
</s:VGroup>
<s:HGroup horizontalCenter="0" height="30%" verticalAlign="middle" width="40%">
- <s:BitmapImage id="targetImg" source="@Embed(source='assets/ApacheFlexLogo.png')"/>
+ <s:BitmapImage id="targetImg" width="200" height="200" source="@Embed(source='assets/ApacheFlexLogo.png')"/>
</s:HGroup>
<s:VGroup top="0" right="5" horizontalAlign="right" width="30%">
<s:Label text="Scale3D Effect Sample" fontSize="18" color="#B7B6B6"/>
http://git-wip-us.apache.org/repos/asf/flex-utilities/blob/b3524241/TourDeFlex/TourDeFlex3/src/spark/effects/WipeExample.mxml
----------------------------------------------------------------------
diff --git a/TourDeFlex/TourDeFlex3/src/spark/effects/WipeExample.mxml b/TourDeFlex/TourDeFlex3/src/spark/effects/WipeExample.mxml
index 451ee18..ac96897 100644
--- a/TourDeFlex/TourDeFlex3/src/spark/effects/WipeExample.mxml
+++ b/TourDeFlex/TourDeFlex3/src/spark/effects/WipeExample.mxml
@@ -45,7 +45,7 @@
<s:BitmapImage
source="@Embed('assets/back.png')"
visible="true" visible.flipped="false"/>
- <s:BitmapImage
+ <s:BitmapImage width="200" height="200"
source="@Embed('assets/ApacheFlexLogo.png')"
visible="false" visible.flipped="true"/>
[4/7] git commit: [flex-utilities] [refs/heads/develop] - embed XML
rather that load at run time so it can work with local paths
Posted by jm...@apache.org.
embed XML rather that load at run time so it can work with local paths
Project: http://git-wip-us.apache.org/repos/asf/flex-utilities/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-utilities/commit/8ded4b16
Tree: http://git-wip-us.apache.org/repos/asf/flex-utilities/tree/8ded4b16
Diff: http://git-wip-us.apache.org/repos/asf/flex-utilities/diff/8ded4b16
Branch: refs/heads/develop
Commit: 8ded4b16573af6c8712fab45d744bc29e2eff04b
Parents: b352424
Author: Justin Mclean <jm...@apache.org>
Authored: Mon Aug 18 14:36:50 2014 +1000
Committer: Justin Mclean <jm...@apache.org>
Committed: Mon Aug 18 14:36:50 2014 +1000
----------------------------------------------------------------------
.../itemRenderers/ItemRenderer1Example.mxml | 25 ++++++++++----------
.../itemRenderers/ItemRenderer2Example.mxml | 20 ++++++++--------
2 files changed, 22 insertions(+), 23 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-utilities/blob/8ded4b16/TourDeFlex/TourDeFlex3/src/spark/itemRenderers/ItemRenderer1Example.mxml
----------------------------------------------------------------------
diff --git a/TourDeFlex/TourDeFlex3/src/spark/itemRenderers/ItemRenderer1Example.mxml b/TourDeFlex/TourDeFlex3/src/spark/itemRenderers/ItemRenderer1Example.mxml
index c83b860..3c21155 100644
--- a/TourDeFlex/TourDeFlex3/src/spark/itemRenderers/ItemRenderer1Example.mxml
+++ b/TourDeFlex/TourDeFlex3/src/spark/itemRenderers/ItemRenderer1Example.mxml
@@ -20,31 +20,30 @@
<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"
- applicationComplete="srv.send()">
+ initialize="init()">
<fx:Script>
<![CDATA[
- import mx.collections.ArrayCollection;
- import mx.rpc.events.ResultEvent;
+ import mx.collections.XMLListCollection;
import skins.TDFPanelSkin;
[Bindable]
- private var employees:ArrayCollection;
+ private var employees:XMLListCollection;
- private function resultHandler(event:ResultEvent):void
- {
- employees = event.result.list.employee as ArrayCollection;
- }
+ [Embed(source="data/list.xml", mimeType="application/octet-stream")]
+ private var XMLData:Class;
+ private function init():void
+ {
+ var data:XML = XML(new XMLData());
+
+ employees = new XMLListCollection(data.employee);
+ }
]]>
</fx:Script>
-
- <fx:Declarations>
- <s:HTTPService id="srv" url="./data/list.xml" result="resultHandler(event)"/>
- </fx:Declarations>
-
+
<s:Panel width="100%" height="100%" title="Custom Item Renderer with Animation" skinClass="skins.TDFPanelSkin">
<s:layout>
<s:HorizontalLayout paddingLeft="100" paddingRight="10" paddingTop="10" paddingBottom="10"/>
http://git-wip-us.apache.org/repos/asf/flex-utilities/blob/8ded4b16/TourDeFlex/TourDeFlex3/src/spark/itemRenderers/ItemRenderer2Example.mxml
----------------------------------------------------------------------
diff --git a/TourDeFlex/TourDeFlex3/src/spark/itemRenderers/ItemRenderer2Example.mxml b/TourDeFlex/TourDeFlex3/src/spark/itemRenderers/ItemRenderer2Example.mxml
index d418326..29ab4ca 100644
--- a/TourDeFlex/TourDeFlex3/src/spark/itemRenderers/ItemRenderer2Example.mxml
+++ b/TourDeFlex/TourDeFlex3/src/spark/itemRenderers/ItemRenderer2Example.mxml
@@ -20,7 +20,7 @@
<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"
- applicationComplete="srv.send()">
+ initialize="init()">
<fx:Style>
@@ -35,23 +35,23 @@
<fx:Script>
<![CDATA[
- import mx.collections.ArrayCollection;
- import mx.rpc.events.ResultEvent;
+ import mx.collections.XMLListCollection;
[Bindable]
- private var employees:ArrayCollection;
+ private var employees:XMLListCollection;
- private function resultHandler(event:ResultEvent):void
+ [Embed(source="data/list.xml", mimeType="application/octet-stream")]
+ private var XMLData:Class;
+
+ private function init():void
{
- employees = event.result.list.employee as ArrayCollection;
+ var data:XML = XML(new XMLData());
+
+ employees = new XMLListCollection(data.employee);
}
-
]]>
</fx:Script>
- <fx:Declarations>
- <s:HTTPService id="srv" url="./data/list.xml" result="resultHandler(event)"/>
- </fx:Declarations>
<s:Panel width="100%" height="100%" title="Custom Item Renderer with Animation" skinClass="skins.TDFPanelSkin">
<s:layout>
<s:HorizontalLayout paddingTop="2" paddingLeft="50" paddingRight="8"/>
[5/7] git commit: [flex-utilities] [refs/heads/develop] - embed XML
rather than load at runtime
Posted by jm...@apache.org.
embed XML rather than load at runtime
Project: http://git-wip-us.apache.org/repos/asf/flex-utilities/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-utilities/commit/749af7da
Tree: http://git-wip-us.apache.org/repos/asf/flex-utilities/tree/749af7da
Diff: http://git-wip-us.apache.org/repos/asf/flex-utilities/diff/749af7da
Branch: refs/heads/develop
Commit: 749af7dae541a8c34fbded414f2552dc66aaf1a9
Parents: 8ded4b1
Author: Justin Mclean <jm...@apache.org>
Authored: Mon Aug 18 14:37:30 2014 +1000
Committer: Justin Mclean <jm...@apache.org>
Committed: Mon Aug 18 14:37:30 2014 +1000
----------------------------------------------------------------------
.../layouts/CustomLayoutAnimatedExample.mxml | 26 ++++++++++++--------
1 file changed, 16 insertions(+), 10 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-utilities/blob/749af7da/TourDeFlex/TourDeFlex3/src/spark/layouts/CustomLayoutAnimatedExample.mxml
----------------------------------------------------------------------
diff --git a/TourDeFlex/TourDeFlex3/src/spark/layouts/CustomLayoutAnimatedExample.mxml b/TourDeFlex/TourDeFlex3/src/spark/layouts/CustomLayoutAnimatedExample.mxml
index 9b89803..c8964a0 100644
--- a/TourDeFlex/TourDeFlex3/src/spark/layouts/CustomLayoutAnimatedExample.mxml
+++ b/TourDeFlex/TourDeFlex3/src/spark/layouts/CustomLayoutAnimatedExample.mxml
@@ -20,8 +20,9 @@
<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"
- applicationComplete="srv.send()" xmlns:local="*" xmlns:layouts="layouts.*"
- backgroundColor="0x323232" color="0xFFFFFF">
+ xmlns:local="*" xmlns:layouts="layouts.*"
+ backgroundColor="0x323232" color="0xFFFFFF"
+ initialize="init()">
<fx:Style>
@@ -39,7 +40,9 @@
<fx:Script>
<![CDATA[
import mx.collections.ArrayCollection;
- import mx.rpc.events.ResultEvent;
+ import mx.rpc.xml.SimpleXMLDecoder;
+ import mx.rpc.xml.SimpleXMLEncoder;
+ import mx.utils.ArrayUtil;
[Bindable]
private var items:ArrayCollection;
@@ -59,10 +62,17 @@
[Bindable]
private var _triband:Boolean = false;
+ [Embed(source="data/catalog.xml", mimeType="application/octet-stream")]
+ private var XMLData:Class;
- private function resultHandler(event:ResultEvent):void
+ private function init():void
{
- items = event.result.catalog.product as ArrayCollection;
+ var data:XML = XML(new XMLData());
+ var xmlDoc:XMLDocument = new XMLDocument(data);
+ var decoder:SimpleXMLDecoder = new SimpleXMLDecoder(true);
+ var object:Object = decoder.decodeXML(xmlDoc);
+
+ items = object.catalog.product;
filteredItems = new ArrayCollection(items.source);
filteredItems.filterFunction = filter;
}
@@ -83,11 +93,7 @@
]]>
</fx:Script>
-
- <fx:Declarations>
- <s:HTTPService id="srv" url="data/catalog.xml" result="resultHandler(event)"/>
- </fx:Declarations>
-
+
<s:HGroup verticalAlign="middle" paddingLeft="8" left="50" top="5">
<s:Label text="Max Price:"/>
<s:HSlider id="priceSlider" minimum="0" maximum="1000" snapInterval="100" value="@{_maxPrice}" change="selectionChange()"/>
[6/7] git commit: [flex-utilities] [refs/heads/develop] - remove
images and references to Nokia
Posted by jm...@apache.org.
remove images and references to Nokia
Project: http://git-wip-us.apache.org/repos/asf/flex-utilities/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-utilities/commit/092eef2c
Tree: http://git-wip-us.apache.org/repos/asf/flex-utilities/tree/092eef2c
Diff: http://git-wip-us.apache.org/repos/asf/flex-utilities/diff/092eef2c
Branch: refs/heads/develop
Commit: 092eef2ca80d812b6510825fd57ae13559f63173
Parents: 749af7d
Author: Justin Mclean <jm...@apache.org>
Authored: Mon Aug 18 14:37:48 2014 +1000
Committer: Justin Mclean <jm...@apache.org>
Committed: Mon Aug 18 14:37:48 2014 +1000
----------------------------------------------------------------------
.../src/spark/layouts/data/catalog.xml | 64 ++++++++------------
1 file changed, 25 insertions(+), 39 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-utilities/blob/092eef2c/TourDeFlex/TourDeFlex3/src/spark/layouts/data/catalog.xml
----------------------------------------------------------------------
diff --git a/TourDeFlex/TourDeFlex3/src/spark/layouts/data/catalog.xml b/TourDeFlex/TourDeFlex3/src/spark/layouts/data/catalog.xml
index ecf9bc6..7fbf54e 100644
--- a/TourDeFlex/TourDeFlex3/src/spark/layouts/data/catalog.xml
+++ b/TourDeFlex/TourDeFlex3/src/spark/layouts/data/catalog.xml
@@ -21,11 +21,10 @@
<catalog>
<product productId="1">
- <name>Nokia 6010</name>
+ <name>Phone A</name>
<color></color>
- <description>Easy to use without sacrificing style, the Nokia 6010 phone offers functional voice communication supported by text messaging, multimedia messaging, mobile internet, games and more</description>
+ <description>Easy to use without sacrificing style, this phone offers functional voice communication supported by text messaging, multimedia messaging, mobile internet, games and more.</description>
<price>99.99</price>
- <image>assets/pic/Nokia_6010.gif</image>
<series>6000</series>
<triband>false</triband>
<camera>false</camera>
@@ -35,11 +34,10 @@
</product>
<product productId="2">
- <name>Nokia 3100</name>
+ <name>Phone B</name>
<color>Blue</color>
- <description>Light up the night with a glow-in-the-dark cover - when it's charged with light you can easily find your phone in the dark. When you get a call, the Nokia 3100 phone flashes in tune with your ringing tone. And when you snap on a Nokia Xpress-on™ gaming cover*, you'll get luminescent light effects in time to the gaming action.</description>
+ <description>Light up the night with a glow-in-the-dark cover - when it's charged with light you can easily find your phone in the dark. When you get a call, this phone flashes in tune with your ringing tone. And when you snap on a gaming cover, you'll get luminescent light effects in time to the gaming action.</description>
<price>139</price>
- <image>assets/pic/Nokia_3100_blue.gif</image>
<series>3000</series>
<triband>true</triband>
<camera>false</camera>
@@ -49,11 +47,10 @@
</product>
<product productId="3">
- <name>Nokia 3100</name>
+ <name>Phone C</name>
<color>Pink</color>
- <description>Light up the night with a glow-in-the-dark cover - when it's charged with light you can easily find your phone in the dark. When you get a call, the Nokia 3100 phone flashes in tune with your ringing tone. And when you snap on a Nokia Xpress-on™ gaming cover*, you'll get luminescent light effects in time to the gaming action.</description>
+ <description>Light up the night with a glow-in-the-dark cover - when it's charged with light you can easily find your phone in the dark. When you get a call, this phone flashes in tune with your ringing tone. And when you snap on a gaming cover, you'll get luminescent light effects in time to the gaming action.</description>
<price>139</price>
- <image>assets/pic/Nokia_3100_pink.gif</image>
<series>3000</series>
<triband>true</triband>
<camera>false</camera>
@@ -63,11 +60,10 @@
</product>
<product productId="4">
- <name>Nokia 3120</name>
+ <name>Phone D</name>
<color></color>
- <description>Designed for both business and pleasure, the elegant Nokia 3120 phone offers a pleasing mix of features. Enclosed within its chic, compact body, you will discover the benefits of tri-band compatibility, a color screen, MMS, XHTML browsing, cheerful screensavers, and much more.</description>
+ <description>Designed for both business and pleasure, this phone offers a pleasing mix of features. Enclosed within its chic, compact body, you will discover the benefits of tri-band compatibility, a color screen, MMS, XHTML browsing, cheerful screensavers, and much more.</description>
<price>159.99</price>
- <image>assets/pic/Nokia_3120.gif</image>
<series>3000</series>
<triband>true</triband>
<camera>false</camera>
@@ -77,11 +73,10 @@
</product>
<product productId="5">
- <name>Nokia 3220</name>
+ <name>Phone E</name>
<color></color>
- <description>The Nokia 3220 phone is a fresh new cut on some familiar ideas - animate your MMS messages with cute characters, see the music with lights that flash in time with your ringing tone, download wallpapers and screensavers with matching color schemes for the interface.</description>
+ <description>This phone is a fresh new cut on some familiar ideas - animate your MMS messages with cute characters, see the music with lights that flash in time with your ringing tone, download wallpapers and screensavers with matching color schemes for the interface.</description>
<price>159.99</price>
- <image>assets/pic/Nokia_3220.gif</image>
<series>3000</series>
<triband>false</triband>
<camera>true</camera>
@@ -91,11 +86,10 @@
</product>
<product productId="6">
- <name>Nokia 3650</name>
+ <name>Phone F</name>
<color></color>
- <description>Messaging is more personal, versatile and fun with the Nokia 3650 camera phone. Capture experiences as soon as you see them and send the photos you take to you friends and family.</description>
+ <description>Messaging is more personal, versatile and fun with this camera phone. Capture experiences as soon as you see them and send the photos you take to you friends and family.</description>
<price>199.99</price>
- <image>assets/pic/Nokia_3650.gif</image>
<series>3000</series>
<triband>false</triband>
<camera>true</camera>
@@ -105,25 +99,23 @@
</product>
<product productId="7">
- <name>Nokia 6820</name>
+ <name>Phone G</name>
<color></color>
- <description>Messaging just got a whole lot smarter. The Nokia 6820 messaging device puts the tools you need for rich communication - full messaging keyboard, digital camera, mobile email, MMS, SMS, and Instant Messaging - right at your fingertips, in a small, sleek device.</description>
+ <description>Messaging just got a whole lot smarter. This messaging device puts the tools you need for rich communication - full messaging keyboard, digital camera, mobile email, MMS, SMS, and Instant Messaging - right at your fingertips, in a small, sleek device.</description>
<price>299.99</price>
- <image>assets/pic/Nokia_6820.gif</image>
<series>6000</series>
<triband>true</triband>
<camera>true</camera>
<video>false</video>
<highlight1>Messaging keyboard</highlight1>
- <highlight2>Bluetooth </highlight2>
+ <highlight2>Bluetooth</highlight2>
</product>
<product productId="8">
- <name>Nokia 6670</name>
+ <name>Phone F</name>
<color></color>
- <description>Classic business tools meet your creative streak in the Nokia 6670 imaging smartphone. It has a Netfront Web browser with PDF support, document viewer applications for email attachments, a direct printing application, and a megapixel still camera that also shoots up to 10 minutes of video.</description>
+ <description>Classic business tools meet your creative streak in this imaging smartphone. It has a Web browser with PDF support, document viewer applications for email attachments, a direct printing application, and a megapixel still camera that also shoots up to 10 minutes of video.</description>
<price>309.99</price>
- <image>assets/pic/Nokia_6670.gif</image>
<series>6000</series>
<triband>false</triband>
<camera>true</camera>
@@ -133,11 +125,10 @@
</product>
<product productId="9">
- <name>Nokia 6620</name>
+ <name>Phone G</name>
<color></color>
- <description>Shoot a basket. Shoot a movie. Video phones from Nokia... the perfect way to save and share life’s playful moments. Feel connected.</description>
+ <description>Shoot a basket. Shoot a movie. This video phone is the perfect way to save and share life's playful moments. Feel connected.</description>
<price>329.99</price>
- <image>assets/pic/Nokia_6620.gif</image>
<series>6000</series>
<triband>false</triband>
<camera>true</camera>
@@ -147,11 +138,10 @@
</product>
<product productId="10">
- <name>Nokia 3230</name>
+ <name>Phone H</name>
<color>Silver</color>
- <description>Get creative with the Nokia 3230 smartphone. Create your own ringing tones, print your mobile images, play multiplayer games over a wireless Bluetooth connection, and browse HTML and xHTML Web pages. Plus, with a 32 MB MMC card and expandable memory, you'll have lots of space to be creative.</description>
+ <description>Get creative with this smartphone. Create your own ringing tones, print your mobile images, play multiplayer games over a wireless Bluetooth connection, and browse HTML and xHTML Web pages. Plus, with a 32 MB MMC card and expandable memory, you'll have lots of space to be creative.</description>
<price>369</price>
- <image>assets/pic/Nokia_3230_black.gif</image>
<series>3000</series>
<triband>false</triband>
<camera>true</camera>
@@ -161,11 +151,10 @@
</product>
<product productId="11">
- <name>Nokia 3230</name>
+ <name>Phone I</name>
<color>Bronze</color>
- <description>Get creative with the Nokia 3230 smartphone. Create your own ringing tones, print your mobile images, play multiplayer games over a wireless Bluetooth connection, and browse HTML and xHTML Web pages. Plus, with a 32 MB MMC card and expandable memory, you'll have lots of space to be creative.</description>
+ <description>Get creative with this smartphone. Create your own ringing tones, print your mobile images, play multiplayer games over a wireless Bluetooth connection, and browse HTML and xHTML Web pages. Plus, with a 32 MB MMC card and expandable memory, you'll have lots of space to be creative.</description>
<price>369</price>
- <image>assets/pic/Nokia_3230_bronze.gif</image>
<series>3000</series>
<triband>false</triband>
<camera>true</camera>
@@ -175,11 +164,10 @@
</product>
<product productId="12">
- <name>Nokia 6630</name>
+ <name>Phone J</name>
<color></color>
- <description>Not only is the Nokia 6630 imaging smartphone a 1.3 megapixel digital imaging device (1.3 megapixel camera sensor, effective resolution 1.23 megapixels for image capture, image size 1280 x 960 pixels), it's also a portable office and a modern rich-media machine.</description>
+ <description>Not only is this imaging smartphone have a 1.3 megapixel digital imaging device (1.3 megapixel camera sensor, effective resolution 1.23 megapixels for image capture, image size 1280 x 960 pixels), it's also a portable office and a modern rich-media machine.</description>
<price>379</price>
- <image>assets/pic/Nokia_6630.gif</image>
<series>6000</series>
<triband>false</triband>
<camera>true</camera>
@@ -188,6 +176,4 @@
<highlight2>6x smooth digital zoom</highlight2>
</product>
-
-
</catalog>
\ No newline at end of file
[2/7] git commit: [flex-utilities] [refs/heads/develop] - added
missing states
Posted by jm...@apache.org.
added missing states
Project: http://git-wip-us.apache.org/repos/asf/flex-utilities/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-utilities/commit/b6a8505c
Tree: http://git-wip-us.apache.org/repos/asf/flex-utilities/tree/b6a8505c
Diff: http://git-wip-us.apache.org/repos/asf/flex-utilities/diff/b6a8505c
Branch: refs/heads/develop
Commit: b6a8505c2ebcbd4ee385bdbcc107ad7f10f93497
Parents: 7eb2369
Author: Justin Mclean <jm...@apache.org>
Authored: Mon Aug 18 14:35:27 2014 +1000
Committer: Justin Mclean <jm...@apache.org>
Committed: Mon Aug 18 14:35:27 2014 +1000
----------------------------------------------------------------------
TourDeFlex/TourDeFlex3/src/spark/controls/skins/MyPanelSkin.mxml | 2 ++
1 file changed, 2 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-utilities/blob/b6a8505c/TourDeFlex/TourDeFlex3/src/spark/controls/skins/MyPanelSkin.mxml
----------------------------------------------------------------------
diff --git a/TourDeFlex/TourDeFlex3/src/spark/controls/skins/MyPanelSkin.mxml b/TourDeFlex/TourDeFlex3/src/spark/controls/skins/MyPanelSkin.mxml
index d125964..edd44e5 100644
--- a/TourDeFlex/TourDeFlex3/src/spark/controls/skins/MyPanelSkin.mxml
+++ b/TourDeFlex/TourDeFlex3/src/spark/controls/skins/MyPanelSkin.mxml
@@ -59,6 +59,8 @@
<s:states>
<s:State name="normal" />
<s:State name="disabled" />
+ <s:State name="normalWithControlBar" stateGroups="withControls" />
+ <s:State name="disabledWithControlBar" stateGroups="withControls" />
</s:states>
<!-- background fill -->