Return-Path: X-Original-To: apmail-flex-commits-archive@www.apache.org Delivered-To: apmail-flex-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 5BDCE10B27 for ; Thu, 13 Feb 2014 22:03:36 +0000 (UTC) Received: (qmail 25356 invoked by uid 500); 13 Feb 2014 22:03:34 -0000 Delivered-To: apmail-flex-commits-archive@flex.apache.org Received: (qmail 25304 invoked by uid 500); 13 Feb 2014 22:03:33 -0000 Mailing-List: contact commits-help@flex.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@flex.apache.org Delivered-To: mailing list commits@flex.apache.org Received: (qmail 25289 invoked by uid 99); 13 Feb 2014 22:03:33 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 13 Feb 2014 22:03:33 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 081E28A9A01; Thu, 13 Feb 2014 22:03:33 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: aharui@apache.org To: commits@flex.apache.org Date: Thu, 13 Feb 2014 22:03:33 -0000 Message-Id: In-Reply-To: <92ac2452d5564a389a6817e9fb7bfb99@git.apache.org> References: <92ac2452d5564a389a6817e9fb7bfb99@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [2/4] git commit: [flex-utilities] [refs/heads/develop] - switch icons by product 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 Authored: Thu Feb 13 13:17:39 2014 -0800 Committer: Alex Harui 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. - + - + - + 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. - +