Author: fthomas
Date: Wed Mar 13 23:48:10 2013
New Revision: 1456279
URL: http://svn.apache.org/r1456279
Log:
- Changed the INFO_TRACKING to "Anonymous usage statistics will be collected in
accordance with our privacy policy" and made it navigate to
"http://flex.apache.org/about-privacy.html"
Modified:
flex/utilities/trunk/installer/src/InstallApacheFlex.mxml
flex/utilities/trunk/installer/src/assets/styles/InstallApacheFlexStyle.css
flex/utilities/trunk/installer/src/org/apache/flex/packageflexsdk/resource/RuntimeLocale.as
Modified: flex/utilities/trunk/installer/src/InstallApacheFlex.mxml
URL:
http://svn.apache.org/viewvc/flex/utilities/trunk/installer/src/InstallApacheFlex.mxml?rev=1456279&r1=1456278&r2=1456279&view=diff
==============================================================================
--- flex/utilities/trunk/installer/src/InstallApacheFlex.mxml (original)
+++ flex/utilities/trunk/installer/src/InstallApacheFlex.mxml Wed Mar 13
23:48:10 2013
@@ -101,7 +101,8 @@ variables are not required because the l
private var APACHE_FLEX_BIN_DISTRO_FILE:String;
private var APACHE_FLEX_BIN_DISTRO_FILE_SHORT:String;
private var APACHE_FLEX_BIN_DISTRO_URL:String;
- [Bindable]private var APACHE_FLEX_BIN_DISTRO_VERSION:String = "";
+ [Bindable]
+ private var APACHE_FLEX_BIN_DISTRO_VERSION:String = "";
/**
* Adobe AIR SDK
@@ -1654,6 +1655,14 @@ variables are not required because the l
protected function
installComponentsList_creationCompleteHandler(event:FlexEvent):void {
installComponentsList.addEventListener(InstallItemSelectionEvent.INSTALL_ITEM_SELECTION_CHANGED,
handleInstallPermissionChange);
}
+
+ private function onMouseRoll(event:MouseEvent):void {
+ if (event.type == MouseEvent.MOUSE_OVER) {
+ event.target.styleName = "linkTextHover";
+ } else {
+ event.target.styleName = "linkText";
+ }
+ }
]]></fx:Script>
<fx:Declarations>
@@ -1734,7 +1743,7 @@ variables are not required because the l
fontFamily="openSansBold"
color="0x172647" fontSize="85"
trackingLeft="-2" trackingRight="-2"
- />
+ />
</s:VGroup>
<s:Spacer width="100" />
</s:HGroup>
@@ -1830,7 +1839,7 @@ variables are not required because the l
includeInLayout="false"
/>
<s:TextArea id="optionalInstallsTxtArea"
text="{_viewResourceConstants.INFO_NEED_TO_READ_AND_AGREE_TO_LICENSE}"
-
fontFamily="openSansSemiBold"
+
fontFamily="openSansSemiBold"
fontSize="12"
width="100%"
height="100%"
@@ -1903,7 +1912,13 @@ variables are not required because the l
label="{_viewResourceConstants.BTN_LABEL_INSTALL_LOG}"
click="showConsole(event)"/>
<s:Spacer width="100%"/>
- <s:Label fontFamily="openSansLightItalic"
text="{_viewResourceConstants.INFO_TRACKING}"/>
+ <s:Label fontFamily="openSansLightItalic"
text="{_viewResourceConstants.INFO_TRACKING}"
+ styleName="linkText" maxDisplayedLines="2"
+ mouseOver="onMouseRoll(event)" mouseOut="onMouseRoll(event)"
+ click="navigateToURL(new
URLRequest('http://flex.apache.org/about-privacy.html'))"
+ buttonMode="true"
+ useHandCursor="true"
+ mouseChildren="false"/>
<s:Spacer width="100%"/>
<s:Button id="closeBtn"
styleName="genericBtnStyle"
Modified:
flex/utilities/trunk/installer/src/assets/styles/InstallApacheFlexStyle.css
URL:
http://svn.apache.org/viewvc/flex/utilities/trunk/installer/src/assets/styles/InstallApacheFlexStyle.css?rev=1456279&r1=1456278&r2=1456279&view=diff
==============================================================================
--- flex/utilities/trunk/installer/src/assets/styles/InstallApacheFlexStyle.css
(original)
+++ flex/utilities/trunk/installer/src/assets/styles/InstallApacheFlexStyle.css
Wed Mar 13 23:48:10 2013
@@ -65,4 +65,16 @@ s|TextInput:normalWithPrompt,
s|TextInput:disabledWithPrompt
{
color: #BBBBBB;
-}
\ No newline at end of file
+}
+
+s|Label.linkText {
+ color: #0000FF;
+ verticalAlign: middle;
+ textDecoration: none;
+}
+
+s|Label.linkTextHover {
+ color: #0000FF;
+ verticalAlign: middle;
+ textDecoration: underline;
+}
Modified:
flex/utilities/trunk/installer/src/org/apache/flex/packageflexsdk/resource/RuntimeLocale.as
URL:
http://svn.apache.org/viewvc/flex/utilities/trunk/installer/src/org/apache/flex/packageflexsdk/resource/RuntimeLocale.as?rev=1456279&r1=1456278&r2=1456279&view=diff
==============================================================================
---
flex/utilities/trunk/installer/src/org/apache/flex/packageflexsdk/resource/RuntimeLocale.as
(original)
+++
flex/utilities/trunk/installer/src/org/apache/flex/packageflexsdk/resource/RuntimeLocale.as
Wed Mar 13 23:48:10 2013
@@ -233,7 +233,7 @@ public class RuntimeLocale
content["LICENSE_URL_FONTSWF"] = "";
content["LICENSE_BLAZEDS"] = "'Îδεια ÏÏήÏÎ·Ï Adobe Flex SDK";
content["LICENSE_URL_BLAZEDS"] = "";
- content["INFO_TRACKING"] = "Information about your use of this
application\nis being collected using HTTP requests.";
+ content["INFO_TRACKING"] = "Anonymous usage statistics will be
collected\nin accordance with our privacy policy.";
_resourceManager.addResourceBundle(resource);
@@ -475,7 +475,7 @@ public class RuntimeLocale
content["LICENSE_URL_FONTSWF"]="http://www.adobe.com/products/eulas/pdfs/adobe_flex_software_development_kit-combined-20110916_0930.pdf";
content["LICENSE_BLAZEDS"]="Adobe Flex SDK License";
content["LICENSE_URL_BLAZEDS"]="http://www.adobe.com/products/eulas/pdfs/adobe_flex_software_development_kit-combined-20110916_0930.pdf";
- content["INFO_TRACKING"]="Information about your use of this
application is being collected using HTTP requests.";
+ content["INFO_TRACKING"]="Anonymous usage statistics will be
collected in accordance with our privacy policy.";
content["INFO_VERSION"]="version";
_resourceManager.addResourceBundle(resource);
@@ -591,7 +591,7 @@ public class RuntimeLocale
content["LICENSE_TLF"]="Licencia Pública de Mozilla Versión
1.1";
content["LICENSE_FONTSWF"]="Licencia de Adobe Flex SDK";
content["LICENSE_BLAZEDS"]="Licencia de Adobe Flex SDK";
- content["INFO_TRACKING"] = "Information about your use of this
application\nis being collected using HTTP requests.";
+ content["INFO_TRACKING"] = "Anonymous usage statistics will be
collected\nin accordance with our privacy policy.";
_resourceManager.addResourceBundle(resource);
}
@@ -714,7 +714,6 @@ public class RuntimeLocale
content["LICENSE_URL_TLF"]="http://www.mozilla.org/MPL/";
content["LICENSE_URL_FONTSWF"]="http://www.adobe.com/products/eulas/pdfs/adobe_flex_software_development_kit-combined-20110916_0930.pdf";
content["LICENSE_URL_BLAZEDS"]="http://www.adobe.com/products/eulas/pdfs/adobe_flex_software_development_kit-combined-20110916_0930.pdf";
- content["INFO_TRACKING"]="Informatie over uw gebruik van deze
applicatie wordt verzameld via HTTP verzoeken.";
_resourceManager.addResourceBundle(resource);
}
@@ -937,7 +936,7 @@ public class RuntimeLocale
content["LICENSE_URL_FONTSWF"]="http://www.adobe.com/products/eulas/pdfs/adobe_flex_software_development_kit-combined-20110916_0930.pdf";
content["LICENSE_BLAZEDS"]="Licence Adobe Flex SDK";
content["LICENSE_URL_BLAZEDS"]="http://www.adobe.com/products/eulas/pdfs/adobe_flex_software_development_kit-combined-20110916_0930.pdf";
- content["INFO_TRACKING"]="Les informations concernant votre
utilisation de cette application\nvont être collectées en utilisant des
requêtes HTTP";
+ content["INFO_TRACKING"]="Des statistiques anonymes d'utilisation
seront\ncollectées en accord avec notre politique de confidentialité.";
_resourceManager.addResourceBundle(resource);
}
@@ -1062,7 +1061,7 @@ public class RuntimeLocale
content["LICENSE_URL_FONTSWF"]="http://www.adobe.com/products/eulas/pdfs/adobe_flex_software_development_kit-combined-20110916_0930.pdf";
content["LICENSE_BLAZEDS"]="Adobe Flex SDK Lizenzvereinbarung";
content["LICENSE_URL_BLAZEDS"]="http://www.adobe.com/products/eulas/pdfs/adobe_flex_software_development_kit-combined-20110916_0930.pdf";
- content["INFO_TRACKING"]="Es werden Informationen über die Nutzung
dieser \n Anwendung per HTTP-Request gesammelt.";
+ content["INFO_TRACKING"] = "Anonymous usage statistics will be
collected\nin accordance with our privacy policy.";
_resourceManager.addResourceBundle(resource);
}