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/08 03:49:20 UTC
[1/2] git commit: [flex-utilities] [refs/heads/develop] - Added a
little branding, trademarks and copyright
Repository: flex-utilities
Updated Branches:
refs/heads/develop b549143bd -> ff2b4c3a4
Added a little branding, trademarks and copyright
Project: http://git-wip-us.apache.org/repos/asf/flex-utilities/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-utilities/commit/eaa9b5e9
Tree: http://git-wip-us.apache.org/repos/asf/flex-utilities/tree/eaa9b5e9
Diff: http://git-wip-us.apache.org/repos/asf/flex-utilities/diff/eaa9b5e9
Branch: refs/heads/develop
Commit: eaa9b5e958e6a6c148255160f24c9f9dda0ded72
Parents: e3d7980
Author: Justin Mclean <jm...@apache.org>
Authored: Fri Aug 8 11:48:41 2014 +1000
Committer: Justin Mclean <jm...@apache.org>
Committed: Fri Aug 8 11:48:41 2014 +1000
----------------------------------------------------------------------
TourDeFlex/TourDeFlex3/src/explorer.mxml | 23 +++++++++++++++++------
1 file changed, 17 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-utilities/blob/eaa9b5e9/TourDeFlex/TourDeFlex3/src/explorer.mxml
----------------------------------------------------------------------
diff --git a/TourDeFlex/TourDeFlex3/src/explorer.mxml b/TourDeFlex/TourDeFlex3/src/explorer.mxml
index 337f875..b26da62 100755
--- a/TourDeFlex/TourDeFlex3/src/explorer.mxml
+++ b/TourDeFlex/TourDeFlex3/src/explorer.mxml
@@ -17,11 +17,15 @@
-->
<mx:Application xmlns:mx="http://www.adobe.com/2006/mxml" xmlns:explorer="*"
- width="100%" height="100%" pageTitle="Apache Flex 4 Component Explorer"
- initialize="sdk.send();">
+ width="100%" height="100%" pageTitle="{TITLE}"
+ initialize="sdk.send()" layout="vertical">
<mx:Script>
<![CDATA[
+
+ static protected const VERSION:String = "1.0";
+ static protected const TITLE:String = "Tour De Flex Component Explorer";
+ static protected const FULL_TITLE:String = "Apache Flex™ Tour De Flex Component Explorer " + VERSION;
private function treeChanged(event:Event):void
{
@@ -59,14 +63,18 @@
<mx:XML id="explorerTree"/>
- <mx:HTTPService id="sdk" url="explorer.xml" resultFormat="e4x" result="sdkLoaded();" fault="//do nothing" />
+ <mx:HTTPService id="sdk" url="explorer.xml" resultFormat="e4x" result="sdkLoaded()" />
- <mx:HTTPService id="charts" url="charts_explorer.xml" resultFormat="e4x" result="chartsLoaded();" fault="populateTree()" />
+ <mx:HTTPService id="charts" url="charts_explorer.xml" resultFormat="e4x" result="chartsLoaded()" fault="populateTree()" />
+ <mx:HBox width="100%">
+ <mx:Image source="./controls/assets/ApacheFlexIcon.png" />
+ <mx:Label text="{FULL_TITLE}" fontSize="20" fontWeight="bold" />
+ </mx:HBox>
<mx:HDividedBox width="100%" height="100%">
- <mx:Panel width="30%" height="100%" title="Apache Flex 4 Component Explorer">
+ <mx:Panel width="30%" height="100%" title="{TITLE}">
<mx:Tree id="compLibTree" width="100%" height="100%" showRoot="false" labelField="@label"
- change="treeChanged(event);"/>
+ change="treeChanged(event)"/>
</mx:Panel>
<mx:VDividedBox width="100%" height="100%">
<explorer:loaderPanel id="swfLoader" width="100%" height="50%"/>
@@ -75,4 +83,7 @@
</mx:VBox>
</mx:VDividedBox>
</mx:HDividedBox>
+ <mx:HBox width="100%">
+ <mx:Label fontSize="9" width="100%" text="Copyright © 2014 The Apache Software Foundation, Licensed under the Apache License, Version 2.0. Apache Flex is trademark of The Apache Software Foundation." />
+ </mx:HBox>
</mx:Application>
[2/2] git commit: [flex-utilities] [refs/heads/develop] - Merge
branch 'develop' of https://git-wip-us.apache.org/repos/asf/flex-utilities
into develop
Posted by jm...@apache.org.
Merge branch 'develop' of https://git-wip-us.apache.org/repos/asf/flex-utilities into develop
Project: http://git-wip-us.apache.org/repos/asf/flex-utilities/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-utilities/commit/ff2b4c3a
Tree: http://git-wip-us.apache.org/repos/asf/flex-utilities/tree/ff2b4c3a
Diff: http://git-wip-us.apache.org/repos/asf/flex-utilities/diff/ff2b4c3a
Branch: refs/heads/develop
Commit: ff2b4c3a4abc30ecac05220cd170e57ab8da520c
Parents: eaa9b5e b549143
Author: Justin Mclean <jm...@apache.org>
Authored: Fri Aug 8 11:48:54 2014 +1000
Committer: Justin Mclean <jm...@apache.org>
Committed: Fri Aug 8 11:48:54 2014 +1000
----------------------------------------------------------------------
installer/build.properties | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------