incubator-flex-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bigosma...@apache.org
Subject svn commit: r1383650 - in /incubator/flex/utilities/trunk/installer: .actionScriptProperties README src/InstallApacheFlex.mxml src/org/apache/flex/packageflexsdk/resource/RuntimeLocale.as
Date Tue, 11 Sep 2012 23:06:58 GMT
Author: bigosmallm
Date: Tue Sep 11 23:06:58 2012
New Revision: 1383650

URL: http://svn.apache.org/viewvc?rev=1383650&view=rev
Log:
Fixed issues raised in RC2 vote discussion

Modified:
    incubator/flex/utilities/trunk/installer/.actionScriptProperties
    incubator/flex/utilities/trunk/installer/README
    incubator/flex/utilities/trunk/installer/src/InstallApacheFlex.mxml
    incubator/flex/utilities/trunk/installer/src/org/apache/flex/packageflexsdk/resource/RuntimeLocale.as

Modified: incubator/flex/utilities/trunk/installer/.actionScriptProperties
URL: http://svn.apache.org/viewvc/incubator/flex/utilities/trunk/installer/.actionScriptProperties?rev=1383650&r1=1383649&r2=1383650&view=diff
==============================================================================
--- incubator/flex/utilities/trunk/installer/.actionScriptProperties (original)
+++ incubator/flex/utilities/trunk/installer/.actionScriptProperties Tue Sep 11 23:06:58 2012
@@ -20,7 +20,7 @@
 <actionScriptProperties analytics="false" mainApplicationPath="InstallApacheFlex.mxml"
projectUUID="151f0ac8-8811-45cd-b935-d7c2b0949fa3" version="10">
   <compiler additionalCompilerArguments="-define=INSTALLER::buildNumber,3 -define=INSTALLER::releaseVersion,'0.8'"
autoRSLOrdering="true" copyDependentFiles="true" flexSDK="Apache Flex 4.8.0" fteInMXComponents="false"
generateAccessible="true" htmlExpressInstall="true" htmlGenerate="false" htmlHistoryManagement="false"
htmlPlayerVersionCheck="true" includeNetmonSwc="false" outputFolderPath="bin-debug" removeUnusedRSL="true"
sourceFolderPath="src" strict="true" targetPlayerVersion="0.0.0" useApolloConfig="true" useDebugRSLSwfs="true"
verifyDigests="true" warn="true">
     <compilerSourcePath>
-      <compilerSourcePathEntry kind="1" linkType="1" path="/common/src"/>
+      <compilerSourcePathEntry kind="1" linkType="1" path="${APACHE_FLEX_UTILITIES_ROOT}/common/src"/>
     </compilerSourcePath>
     <libraryPath defaultLinkType="0">
       <libraryPathEntry kind="4" path="">

Modified: incubator/flex/utilities/trunk/installer/README
URL: http://svn.apache.org/viewvc/incubator/flex/utilities/trunk/installer/README?rev=1383650&r1=1383649&r2=1383650&view=diff
==============================================================================
--- incubator/flex/utilities/trunk/installer/README (original)
+++ incubator/flex/utilities/trunk/installer/README Tue Sep 11 23:06:58 2012
@@ -85,7 +85,7 @@ How to build the installer using ANT (no
 	file (var: TEMP_PASS_CHANGE_THIS)
 
 ==========================================================================================
-How to build the installer using Adobe Flash Builder (or any other IDE):
+How to set up the project for working with Adobe Flash Builder (or any other IDE):
 ==========================================================================================
 
 1.  Unzip the source distribution.  You should see the 'installer' directory and the 
@@ -99,4 +99,6 @@ How to build the installer using Adobe F
 3.  If using Adobe Flash Builder, add a linked resource called: 
         APACHE_FLEX_UTILITIES_ROOT 
     and point it to the directory path where the 'installer' and 'common' directories are

-    located.  
+    located.
+
+4.  In the installer project, add ${APACHE_FLEX_UTILITIES_ROOT}/common/src as a source path.
 
\ No newline at end of file

Modified: incubator/flex/utilities/trunk/installer/src/InstallApacheFlex.mxml
URL: http://svn.apache.org/viewvc/incubator/flex/utilities/trunk/installer/src/InstallApacheFlex.mxml?rev=1383650&r1=1383649&r2=1383650&view=diff
==============================================================================
--- incubator/flex/utilities/trunk/installer/src/InstallApacheFlex.mxml (original)
+++ incubator/flex/utilities/trunk/installer/src/InstallApacheFlex.mxml Tue Sep 11 23:06:58
2012
@@ -1439,6 +1439,7 @@ variables are not required because the l
 		{
 			var selectedItem:OptionalComponentVO = OptionalComponentVO(event.target.selectedItem);
 			optionalInstallsTxtArea.text = selectedItem.message;
+			installChkBx.label = _viewResourceConstants.INSTALL_AGREE;
 			if(selectedItem.answered)
 			{
 				if(selectedItem.selected)
@@ -1914,7 +1915,7 @@ variables are not required because the l
 	</s:Panel>
 	<s:Panel id="secondStepGroup" 
 			 title="{_viewResourceConstants.INFO_LICENSE_AGREEMENTS}"
-			 width="640" 
+			 width="720" 
 			 height="200" 
 			 top="280" 
 			 visible="false" 
@@ -1943,7 +1944,7 @@ variables are not required because the l
 			height="100%" 
 			horizontalAlign="center">
 			<s:List id="optionalComponentsList" 
-					width="45%" 
+					width="50%" 
 					height="100%"
 					itemRenderer="org.apache.flex.packageflexsdk.view.itemrenderers.OptionalInstallItemRenderer"
 					dataProvider="{_optionalInstallsDataProvider}" 
@@ -1954,7 +1955,7 @@ variables are not required because the l
 			</s:List>
 			<s:TextArea id="optionalInstallsTxtArea" text="{_viewResourceConstants.INFO_NEED_TO_READ_AND_AGREE_TO_LICENSE}"
 						fontSize="12" 
-						width="55%" 
+						width="50%" 
 						height="100%" 
 						verticalScrollPolicy="off" 
 						editable="false"/>
@@ -1965,19 +1966,19 @@ variables are not required because the l
 			horizontalAlign="center" 
 			verticalAlign="middle">
 			<s:CheckBox id="installChkBx"
-						label="{_viewResourceConstants.INSTALL_AGREE}" 
+						label="{_viewResourceConstants.INSTALL_AGREE_ALL}" 
 						selected="false" 
 						change="handleInstallPermissionChange(event)"/>
 			<s:Button id="mplLicenseBtn" 
 					  label="{_viewResourceConstants.BTN_LABEL_MPL_LICENSE}" 
 					  styleName="genericBtnStyle" 
 					  click="{showMPLLicense(event)}" 
-					  includeInLayout="false" />
+					  includeInLayout="true" />
 			<s:Button id="adobeLicenseBtn" 
 					  label="{_viewResourceConstants.BTN_LABEL_ADOBE_LICENSE}" 
 					  styleName="genericBtnStyle" 
 					  click="{showAdobeLicense(event)}" 
-					  includeInLayout="false" />
+					  includeInLayout="true" />
 		</s:HGroup>
 	</s:Panel>
 	

Modified: incubator/flex/utilities/trunk/installer/src/org/apache/flex/packageflexsdk/resource/RuntimeLocale.as
URL: http://svn.apache.org/viewvc/incubator/flex/utilities/trunk/installer/src/org/apache/flex/packageflexsdk/resource/RuntimeLocale.as?rev=1383650&r1=1383649&r2=1383650&view=diff
==============================================================================
--- incubator/flex/utilities/trunk/installer/src/org/apache/flex/packageflexsdk/resource/RuntimeLocale.as
(original)
+++ incubator/flex/utilities/trunk/installer/src/org/apache/flex/packageflexsdk/resource/RuntimeLocale.as
Tue Sep 11 23:06:58 2012
@@ -363,6 +363,7 @@ public class RuntimeLocale
 		content["INFO_VERIFY_FLEX_SDK_DONE"]="The Apache Flex SDK MD5 Signature of the downloaded
files matches the reference. The file is valid.";
 		content["INFO_WINDOW_TITLE"]="Install Apache Flex SDK for use with Adobe Flash Builder";
 		content["INSTALL_AGREE"] = "I Agree, Install"
+		content["INSTALL_AGREE_ALL"] = "I agree to all options and licenses, Install"
 		content["INSTALL_DISAGREE"] = "I Disagree, Don't Install"
 		content["SELECT_PATH_PROMPT"]="Where do you want to install the Apache Flex SDK?";
 		content["STEP_CREATE_DIRECTORIES"]="Create Directories";
@@ -372,7 +373,7 @@ public class RuntimeLocale
 		content["STEP_INSTALL_CONFIG_FILES"]="Install Framework Configuration Files";
 		content["STEP_INSTALL_SWF_OBJECT"]="Download SWFObject";
 		content["STEP_OPTIONAL_INSTALL_BLAZEDS"]="BlazeDS (Optional)";
-		content["STEP_OPTIONAL_INSTALL_FONTSWF"]="Adobe Fontswf Utility (Optional)";
+		content["STEP_OPTIONAL_INSTALL_FONTSWF"]="Adobe Embedded Font Libraries and Utilities (Optional)";
 		content["STEP_OPTIONAL_INSTALL_OSMF"]="OSMF (Required)";
 		content["STEP_OPTIONAL_INSTALL_TLF"]="Adobe Text Layout Framework (Required)";
 		content["STEP_UNZIP_AIR_RUNTIME_KIT"]="Uncompress Adobe AIR Runtime Kit";



Mime
View raw message