svn commit: r1361066 - in /incubator/flex/utilities/InstallApacheFlex/src: InstallApacheFlex.mxml org/apache/flex/packageflexsdk/resource/RuntimeLocale.as

[bi...@apache.org]

Author: bigosmallm
Date: Fri Jul 13 07:37:23 2012
New Revision: 1361066

URL: http://svn.apache.org/viewvc?rev=1361066&view=rev
Log:
Removed option of 'disagreeing' to required installs. 
Changed title of panel to reflect installation abort status

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

Modified: incubator/flex/utilities/InstallApacheFlex/src/InstallApacheFlex.mxml
URL: http://svn.apache.org/viewvc/incubator/flex/utilities/InstallApacheFlex/src/InstallApacheFlex.mxml?rev=1361066&r1=1361065&r2=1361066&view=diff
==============================================================================
--- incubator/flex/utilities/InstallApacheFlex/src/InstallApacheFlex.mxml (original)
+++ incubator/flex/utilities/InstallApacheFlex/src/InstallApacheFlex.mxml Fri Jul 13 07:37:23 2012
@@ -1165,6 +1165,7 @@ Command line usage: packageApacheFlexFor
 				openApacheFlexFolderBtn.includeInLayout = true;
 				progressBar.visible = false;
 				progressBar.includeInLayout = false;
+				thirdStepGroup.title = _constants.INFO_INSTALLATION_COMPLETE;
 			}
 			
 			protected function abortInstallation():void{
@@ -1172,6 +1173,7 @@ Command line usage: packageApacheFlexFor
 				installBtn.enabled = false;
 				cleanup(true);
 				log(_constants.INFO_ABORT_INSTALLATION);
+				firstStepGroup.title = secondStepGroup.title = thirdStepGroup.title = _constants.INFO_ABORT_INSTALLATION;
 			}
 			
 			protected function _langSelect_changeHandler(event:IndexChangeEvent):void
@@ -1254,11 +1256,13 @@ Command line usage: packageApacheFlexFor
 				{
 					mplLicenseBtn.includeInLayout = mplLicenseBtn.visible = true;
 					adobeLicenseBtn.includeInLayout = adobeLicenseBtn.visible = false;
+					dontInstallRdBtn.includeInLayout = dontInstallRdBtn.visible = false; 
 				}
 				if(selectedItem.message == _constants.ASK_BLAZEDS || selectedItem.message == _constants.ASK_FONTSWF)
 				{
 					mplLicenseBtn.includeInLayout = mplLicenseBtn.visible = false;
 					adobeLicenseBtn.includeInLayout = adobeLicenseBtn.visible = true;
+					dontInstallRdBtn.includeInLayout = dontInstallRdBtn.visible = true; 
 				}
 			}
 			

Modified: incubator/flex/utilities/InstallApacheFlex/src/org/apache/flex/packageflexsdk/resource/RuntimeLocale.as
URL: http://svn.apache.org/viewvc/incubator/flex/utilities/InstallApacheFlex/src/org/apache/flex/packageflexsdk/resource/RuntimeLocale.as?rev=1361066&r1=1361065&r2=1361066&view=diff
==============================================================================
--- incubator/flex/utilities/InstallApacheFlex/src/org/apache/flex/packageflexsdk/resource/RuntimeLocale.as (original)
+++ incubator/flex/utilities/InstallApacheFlex/src/org/apache/flex/packageflexsdk/resource/RuntimeLocale.as Fri Jul 13 07:37:23 2012
@@ -107,12 +107,12 @@ package org.apache.flex.packageflexsdk.r
 			_resource.content["info_select_directory"]="Select the directory where you want to install the Flex SDK";
 			_resource.content["info_app_invoked"]="Invoked in command line mode with the following arguments: ";
 			_resource.content["info_downloaded"]="Download complete ";
-			_resource.content["info_abort_installation"]="Aborting Installation";
+			_resource.content["info_abort_installation"]="Installation aborted";
 			_resource.content["info_unzipping"]="Uncompressing: ";
 			_resource.content["info_installing_playerglobal_swc"]="Installing Adobe Flash Player playerglobal.swc from: ";
 			_resource.content["info_installing_config_files"]="Installing frameworks configuration files configured for use with an IDE";
 			_resource.content["info_creating_temp_dir"]="Creating temporary directory";
-			_resource.content["info_installation_complete"]="Installation complete.";
+			_resource.content["info_installation_complete"]="Installation complete";
 			_resource.content["info_finished_unzipping"]="Finished uncompressing: ";
 			_resource.content["info_dowloading_flex_sdk"]="Downloading Apache Flex SDK from: ";
 			_resource.content["info_dowloading_adobe_flex_sdk"]="Downloading Adobe Flex SDK from: ";