switch icons by product
Project: http://git-wip-us.apache.org/repos/asf/flex-utilities/repo Commit: http://git-wip-us.apache.org/repos/asf/flex-utilities/commit/e73e3927 Tree: http://git-wip-us.apache.org/repos/asf/flex-utilities/tree/e73e3927 Diff: http://git-wip-us.apache.org/repos/asf/flex-utilities/diff/e73e3927 Branch: refs/heads/develop Commit: e73e39277f36b01d3099a89cf4da132ab64418cf Parents: b80578a Author: Alex Harui <aha...@apache.org> Authored: Thu Feb 13 13:17:39 2014 -0800 Committer: Alex Harui <aha...@apache.org> Committed: Thu Feb 13 13:19:34 2014 -0800 ---------------------------------------------------------------------- installer/src/InstallApacheFlex.mxml | 9 ++++++--- installer/src/installer/sdk-installer-config-4.0.xml | 6 +++--- .../ws/tink/spark/skins/controls/InstallApacheFlexSkin.mxml | 2 +- 3 files changed, 10 insertions(+), 7 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/flex-utilities/blob/e73e3927/installer/src/InstallApacheFlex.mxml ---------------------------------------------------------------------- diff --git a/installer/src/InstallApacheFlex.mxml b/installer/src/InstallApacheFlex.mxml index e9b0b5f..ee7c698 100644 --- a/installer/src/InstallApacheFlex.mxml +++ b/installer/src/InstallApacheFlex.mxml @@ -140,6 +140,7 @@ variables are not required because the locations of these pieces are known. import org.osmf.utils.OSMFStrings; import ws.tink.spark.controls.StepItem; + import ws.tink.spark.skins.controls.InstallApacheFlexSkin; private var _mirrorURLCGI:String; private var _useMirror:Boolean = true; @@ -636,8 +637,9 @@ variables are not required because the locations of these pieces are known. var productPrefix:String = productData.@prefix.toString(); var productVersionList:XMLList = productData.versions.children(); var isOverlay:Boolean = productData.@overlay.toString() == "true"; - var needsAIR:Boolean = productData.@needsAIR.toString() != "false" - var needsFlash:Boolean = productData.@needsFlash.toString() != "false" + var needsAIR:Boolean = productData.@needsAIR.toString() != "false"; + var needsFlash:Boolean = productData.@needsFlash.toString() != "false"; + var icon:String = productData.@icon.toString(); for each (var productVersion:XML in productVersionList) { var shortName:String = productVersion.@file.toString(); var fileName:String = shortName + (_os.isWindows() ? Constants.ARCHIVE_EXTENSION_WIN : Constants.ARCHIVE_EXTENSION_MAC); @@ -650,7 +652,7 @@ variables are not required because the locations of these pieces are known. selectedFlexVersion = FLEX_VERSIONS.length; FLEX_VERSIONS.addItem({shortName: shortName, fileName:fileName,label:label, version:ver, path:path, overlay: isOverlay, prefix: productPrefix, - needsAIR: needsAIR, needsFlash: needsFlash, devBuild: devBuild}); + needsAIR: needsAIR, needsFlash: needsFlash, devBuild: devBuild, icon: icon}); } } @@ -1102,6 +1104,7 @@ variables are not required because the locations of these pieces are known. updateFlexVersionStrings(item); updatePaths(); updateWindowTitle(); + InstallApacheFlexSkin(skin).textIcon.source = item.icon; } protected function browseForSDK(event:MouseEvent):void { http://git-wip-us.apache.org/repos/asf/flex-utilities/blob/e73e3927/installer/src/installer/sdk-installer-config-4.0.xml ---------------------------------------------------------------------- diff --git a/installer/src/installer/sdk-installer-config-4.0.xml b/installer/src/installer/sdk-installer-config-4.0.xml index 3cc7b0a..2f83762 100644 --- a/installer/src/installer/sdk-installer-config-4.0.xml +++ b/installer/src/installer/sdk-installer-config-4.0.xml @@ -63,17 +63,17 @@ limitations under the License. <Nightly id="Nightly" version="Nightly" path="https://builds.apache.org/job/flex-sdk_release/lastSuccessfulBuild/artifact/out/"; file="apache-flex-sdk-4.12.0-bin" dev="true"/> </versions> </ApacheFlexSDK> - <ApacheFlexJS name="Apache FlexJS" prefix="apache-flex-flexjs-"> + <ApacheFlexJS name="Apache FlexJS" prefix="apache-flex-flexjs-" icon="http://flex.apache.org/icons/apache_flexjs_logo_text.png";> <versions> <Nightly id="FlexJSNightly" version="Nightly" path="https://builds.apache.org/job/flex-asjs/lastSuccessfulBuild/artifact/out/"; file="apache-flex-flexjs-4.0.1-bin" dev="true"/> </versions> </ApacheFlexJS> - <ApacheFlexFalcon name="Apache Flex Falcon" prefix="apache-flex-falcon-" overlay="true" needsAIR="false" needsFlash="false"> + <ApacheFlexFalcon name="Apache Flex Falcon" prefix="apache-flex-falcon-" overlay="true" needsAIR="false" needsFlash="false" icon="http://flex.apache.org/icons/apache_flexfalcon_logo_text.png";> <versions> <Nightly id="FlexFalconNightly" version="Nightly" path="https://builds.apache.org/job/flex-falcon/lastSuccessfulBuild/artifact/out/"; file="apache-flex-falcon-0.0.1-bin" dev="true"/> </versions> </ApacheFlexFalcon> - <ApacheFlexFalconJX name="Apache Flex FalconJX" prefix="apache-flex-falconjx-" overlay="true" needsAIR="false" needsFlash="false"> + <ApacheFlexFalconJX name="Apache Flex FalconJX" prefix="apache-flex-falconjx-" overlay="true" needsAIR="false" needsFlash="false" icon="http://flex.apache.org/icons/apache_flexfalcon_logo_text.png";> <versions> <Nightly id="FlexFalconJXNightly" version="Nightly" path="https://builds.apache.org/job/flex-falcon/lastSuccessfulBuild/artifact/out/"; file="apache-flex-falconjx-0.0.1-bin" dev="true"/> </versions> http://git-wip-us.apache.org/repos/asf/flex-utilities/blob/e73e3927/installer/src/ws/tink/spark/skins/controls/InstallApacheFlexSkin.mxml ---------------------------------------------------------------------- diff --git a/installer/src/ws/tink/spark/skins/controls/InstallApacheFlexSkin.mxml b/installer/src/ws/tink/spark/skins/controls/InstallApacheFlexSkin.mxml index 75f3429..c6211be 100644 --- a/installer/src/ws/tink/spark/skins/controls/InstallApacheFlexSkin.mxml +++ b/installer/src/ws/tink/spark/skins/controls/InstallApacheFlexSkin.mxml @@ -84,7 +84,7 @@ limitations under the License. <!-- layer 1: background fill --> <s:BitmapImage source="@Embed('/assets/icons/bg_logo.png')" top="0" left="0" scaleMode="letterbox" /> <s:BitmapImage source="@Embed('/assets/icons/bg_logo.png')" top="25" left="0" scaleMode="letterbox" /> - <s:BitmapImage source="@Embed('/assets/icons/apache_flex_logo_text.png')" scaleX=".3" scaleY=".3" smooth="true" horizontalCenter="0" top="5" /> + <s:BitmapImage id="textIcon" source="@Embed('/assets/icons/apache_flex_logo_text.png')" scaleX=".3" scaleY=".3" smooth="true" horizontalCenter="0" top="5" /> <!-- layer 2: content + status bar --> <s:Group left="0" right="0" top="0" bottom="0" minHeight="24" minWidth="0" >
![http://flex.apache.org/icons/apache_flexjs_logo_text.png"](http://flex.apache.org/icons/apache_flexjs_logo_text.png"){kind=link}
![http://flex.apache.org/icons/apache_flexfalcon_logo_text.png"](http://flex.apache.org/icons/apache_flexfalcon_logo_text.png"){kind=link}