You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flex.apache.org by jm...@apache.org on 2014/10/24 06:12:09 UTC

[1/2] git commit: [flex-utilities] [refs/heads/develop] - back in multiple languages

Repository: flex-utilities
Updated Branches:
  refs/heads/develop 8ed358b03 -> 68ccd35d8


back in multiple languages


Project: http://git-wip-us.apache.org/repos/asf/flex-utilities/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-utilities/commit/300c4917
Tree: http://git-wip-us.apache.org/repos/asf/flex-utilities/tree/300c4917
Diff: http://git-wip-us.apache.org/repos/asf/flex-utilities/diff/300c4917

Branch: refs/heads/develop
Commit: 300c491751228572b558095433191a087601655d
Parents: 8ed358b
Author: Justin Mclean <jm...@apache.org>
Authored: Fri Oct 24 15:10:47 2014 +1100
Committer: Justin Mclean <jm...@apache.org>
Committed: Fri Oct 24 15:10:47 2014 +1100

----------------------------------------------------------------------
 installer/src/properties/de_DE.properties | 1 +
 installer/src/properties/el_GR.properties | 1 +
 installer/src/properties/en_US.properties | 1 +
 installer/src/properties/es_ES.properties | 1 +
 installer/src/properties/fr_FR.properties | 1 +
 installer/src/properties/ko_KR.properties | 1 +
 installer/src/properties/nl_NL.properties | 1 +
 installer/src/properties/pl_PL.properties | 1 +
 installer/src/properties/pt_BR.properties | 1 +
 installer/src/properties/zh_CN.properties | 1 +
 installer/src/properties/zh_TW.properties | 1 +
 11 files changed, 11 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/flex-utilities/blob/300c4917/installer/src/properties/de_DE.properties
----------------------------------------------------------------------
diff --git a/installer/src/properties/de_DE.properties b/installer/src/properties/de_DE.properties
index 66f3bac..3a7d24e 100644
--- a/installer/src/properties/de_DE.properties
+++ b/installer/src/properties/de_DE.properties
@@ -31,6 +31,7 @@ BTN_LABEL_INSTALL=INSTALLIEREN
 BTN_LABEL_INSTALL_LOG=PROTOKOLL ANZEIGEN
 BTN_LABEL_MPL_LICENSE=MPL LIZENZ ANZEIGEN
 BTN_LABEL_NEXT=WEITER
+BTN_LABEL_NEXT=ZURÜCK
 BTN_DISCLAIMER=Haftungsausschluss
 BTN_LABEL_OPEN_APACHE_FLEX_FOLDER=APACHE FLEX ORDNER ÖFFNEN
 ERROR_CONFIG_XML_LOAD=Fehler beim Laden der XML Konfigurationsdatei: 

http://git-wip-us.apache.org/repos/asf/flex-utilities/blob/300c4917/installer/src/properties/el_GR.properties
----------------------------------------------------------------------
diff --git a/installer/src/properties/el_GR.properties b/installer/src/properties/el_GR.properties
index e3c2cd9..189d7f2 100644
--- a/installer/src/properties/el_GR.properties
+++ b/installer/src/properties/el_GR.properties
@@ -21,6 +21,7 @@ BTN_LABEL_CLOSE=ΕΞΟΔΟΣ
 BTN_LABEL_INSTALL=ΕΓΚΑΤΑΣΤΑΣΗ
 BTN_LABEL_INSTALL_LOG=ΑΡΧΕΙΟ ΚΑΤΑΓΡΑΦΗΣ ΕΓΚΑΤΑΣΤΑΣΗΣ
 BTN_LABEL_NEXT=ΕΠΟΜΕΝΟ
+BTN_LABEL_BACK=πίσω
 BTN_LABEL_OPEN_APACHE_FLEX_FOLDER=ΑΝΟΙΓΜΑ ΦΑΚΕΛΟΥ APACHE FLEX
 ERROR_CONFIG_XML_LOAD=Πρόεκυψε σφάλμα κατά την προσπάθεια φόρτωσης του αρχείου ρυθμίσεων XML:
 ERROR_DIR_NOT_EMPTY=Ο κατάλογος που επιλέξατε δεν είναι άδειος

http://git-wip-us.apache.org/repos/asf/flex-utilities/blob/300c4917/installer/src/properties/en_US.properties
----------------------------------------------------------------------
diff --git a/installer/src/properties/en_US.properties b/installer/src/properties/en_US.properties
index 9432443..cd01459 100644
--- a/installer/src/properties/en_US.properties
+++ b/installer/src/properties/en_US.properties
@@ -32,6 +32,7 @@ BTN_LABEL_INSTALL=INSTALL
 BTN_LABEL_INSTALL_LOG=INSTALL LOG
 BTN_LABEL_MPL_LICENSE=SHOW MPL LICENSE
 BTN_LABEL_NEXT=NEXT
+BTN_LABEL_BACK=BACK
 BTN_DISCLAIMER=Disclaimer
 BTN_LABEL_OPEN_APACHE_FLEX_FOLDER=OPEN APACHE FLEX FOLDER
 ERROR_CONFIG_XML_LOAD=Error while trying to load XML configuration file: 

http://git-wip-us.apache.org/repos/asf/flex-utilities/blob/300c4917/installer/src/properties/es_ES.properties
----------------------------------------------------------------------
diff --git a/installer/src/properties/es_ES.properties b/installer/src/properties/es_ES.properties
index 9a9170c..691db36 100644
--- a/installer/src/properties/es_ES.properties
+++ b/installer/src/properties/es_ES.properties
@@ -31,6 +31,7 @@ BTN_LABEL_INSTALL=INSTALAR
 BTN_LABEL_INSTALL_LOG=DETALLES DE INSTALACIÓN
 BTN_LABEL_MPL_LICENSE=VER LICENCIA MPL
 BTN_LABEL_NEXT=SIGUIENTE
+BTN_LABEL_BACK=ANTERIOR
 BTN_DISCLAIMER=Aviso legal
 BTN_LABEL_OPEN_APACHE_FLEX_FOLDER=MOSTRAR UBICACIÓN DE APACHE FLEX
 ERROR_CONFIG_XML_LOAD=Se produjo un error al intentar leer el archivo de configuración: 

http://git-wip-us.apache.org/repos/asf/flex-utilities/blob/300c4917/installer/src/properties/fr_FR.properties
----------------------------------------------------------------------
diff --git a/installer/src/properties/fr_FR.properties b/installer/src/properties/fr_FR.properties
index e3f0cb8..f3f8372 100644
--- a/installer/src/properties/fr_FR.properties
+++ b/installer/src/properties/fr_FR.properties
@@ -31,6 +31,7 @@ BTN_LABEL_INSTALL=INSTALLER
 BTN_LABEL_INSTALL_LOG=JOURNAL D'INSTALLATION
 BTN_LABEL_MPL_LICENSE=AFFICHER LA LICENCE MPL
 BTN_LABEL_NEXT=SUIVANT
+BTN_LABEL_BACK=RETOUR
 BTN_DISCLAIMER=Notes légales
 BTN_LABEL_OPEN_APACHE_FLEX_FOLDER=OUVRIR LE DOSSIER APACHE FLEX
 ERROR_CONFIG_XML_LOAD=Erreur lors du chargement du fichier de configuration XML: 

http://git-wip-us.apache.org/repos/asf/flex-utilities/blob/300c4917/installer/src/properties/ko_KR.properties
----------------------------------------------------------------------
diff --git a/installer/src/properties/ko_KR.properties b/installer/src/properties/ko_KR.properties
index 789f6cc..20c219a 100644
--- a/installer/src/properties/ko_KR.properties
+++ b/installer/src/properties/ko_KR.properties
@@ -31,6 +31,7 @@ BTN_LABEL_INSTALL=설치
 BTN_LABEL_INSTALL_LOG=설치 로그
 BTN_LABEL_MPL_LICENSE=MPL 라이센스 보기
 BTN_LABEL_NEXT=다음
+BTN_LABEL_BACK=다시
 BTN_DISCLAIMER=거부
 BTN_LABEL_OPEN_APACHE_FLEX_FOLDER=아파치 플렉스 폴더 열기
 ERROR_CONFIG_XML_LOAD=XML 설정파일 로딩시 에러 : XML 설정 파일을 읽는 중 에러발생 : 

http://git-wip-us.apache.org/repos/asf/flex-utilities/blob/300c4917/installer/src/properties/nl_NL.properties
----------------------------------------------------------------------
diff --git a/installer/src/properties/nl_NL.properties b/installer/src/properties/nl_NL.properties
index 3f2c61b..d317611 100644
--- a/installer/src/properties/nl_NL.properties
+++ b/installer/src/properties/nl_NL.properties
@@ -31,6 +31,7 @@ BTN_LABEL_INSTALL=INSTALLEREN
 BTN_LABEL_INSTALL_LOG=TOON LOG
 BTN_LABEL_MPL_LICENSE=TOON MPL LICENSE
 BTN_LABEL_NEXT=VERDER
+BTN_LABEL_BACK=TERUG
 BTN_DISCLAIMER=Disclaimer
 BTN_LABEL_OPEN_APACHE_FLEX_FOLDER=OPEN APACHE FLEX MAP
 ERROR_CONFIG_XML_LOAD=Fout tijdens het laden van het XML configuratie bestand: 

http://git-wip-us.apache.org/repos/asf/flex-utilities/blob/300c4917/installer/src/properties/pl_PL.properties
----------------------------------------------------------------------
diff --git a/installer/src/properties/pl_PL.properties b/installer/src/properties/pl_PL.properties
index fba4bc4..1039b7e 100644
--- a/installer/src/properties/pl_PL.properties
+++ b/installer/src/properties/pl_PL.properties
@@ -32,6 +32,7 @@ BTN_LABEL_INSTALL=ZAINSTALUJ
 BTN_LABEL_INSTALL_LOG=LOGI INSTALACJI
 BTN_LABEL_MPL_LICENSE=POKAŻ LICENCJĘ MPL
 BTN_LABEL_NEXT=NASTĘPNY
+BTN_LABEL_BACK=WSTECZ
 BTN_DISCLAIMER=Wyłączenie odpowiedzialności
 BTN_LABEL_OPEN_APACHE_FLEX_FOLDER=OTWÓRZ FOLDER APACHE FLEX
 ERROR_CONFIG_XML_LOAD=Błąd podczas ładowania pliku konfiguracyjnego XML: 

http://git-wip-us.apache.org/repos/asf/flex-utilities/blob/300c4917/installer/src/properties/pt_BR.properties
----------------------------------------------------------------------
diff --git a/installer/src/properties/pt_BR.properties b/installer/src/properties/pt_BR.properties
index 422ee2a..fd49a7e 100644
--- a/installer/src/properties/pt_BR.properties
+++ b/installer/src/properties/pt_BR.properties
@@ -32,6 +32,7 @@ BTN_LABEL_INSTALL=INSTALAR
 BTN_LABEL_INSTALL_LOG=LOG
 BTN_LABEL_MPL_LICENSE=LICENÇA MPL
 BTN_LABEL_NEXT=PROX.
+BTN_LABEL_BACK=RETROCEDER
 BTN_DISCLAIMER=Disclaimer
 BTN_LABEL_OPEN_APACHE_FLEX_FOLDER=ABRIR DIRETÓRIO APACHE FLEX
 ERROR_CONFIG_XML_LOAD=Erro ao tentar carregar o arquivo XML de configuração: 

http://git-wip-us.apache.org/repos/asf/flex-utilities/blob/300c4917/installer/src/properties/zh_CN.properties
----------------------------------------------------------------------
diff --git a/installer/src/properties/zh_CN.properties b/installer/src/properties/zh_CN.properties
index 3d7392c..dba9c41 100755
--- a/installer/src/properties/zh_CN.properties
+++ b/installer/src/properties/zh_CN.properties
@@ -33,6 +33,7 @@ BTN_LABEL_INSTALL=安装
 BTN_LABEL_INSTALL_LOG=安装日志
 BTN_LABEL_MPL_LICENSE=显示 MPL 许可协议
 BTN_LABEL_NEXT=下一步
+BTN_LABEL_BACK=后面
 BTN_DISCLAIMER=免责声明
 BTN_LABEL_OPEN_APACHE_FLEX_FOLDER=打开 Apache Flex 目录
 ERROR_CONFIG_XML_LOAD=尝试加载 XML 配置文件时遇到错误: 

http://git-wip-us.apache.org/repos/asf/flex-utilities/blob/300c4917/installer/src/properties/zh_TW.properties
----------------------------------------------------------------------
diff --git a/installer/src/properties/zh_TW.properties b/installer/src/properties/zh_TW.properties
index e78f457..e91d00a 100755
--- a/installer/src/properties/zh_TW.properties
+++ b/installer/src/properties/zh_TW.properties
@@ -33,6 +33,7 @@ BTN_LABEL_INSTALL=安裝
 BTN_LABEL_INSTALL_LOG=安裝日誌
 BTN_LABEL_MPL_LICENSE=顯示 MPL 授權合約
 BTN_LABEL_NEXT=下一步
+BTN_LABEL_BACK=后面
 BTN_DISCLAIMER=免責聲明
 BTN_LABEL_OPEN_APACHE_FLEX_FOLDER=打開 Apache Flex 目錄
 ERROR_CONFIG_XML_LOAD=嘗試載入 XML 設定檔案時遇到錯誤: 


[2/2] git commit: [flex-utilities] [refs/heads/develop] - FLEX-34310 Add button "back" to installer

Posted by jm...@apache.org.
FLEX-34310 Add button "back" to installer


Project: http://git-wip-us.apache.org/repos/asf/flex-utilities/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-utilities/commit/68ccd35d
Tree: http://git-wip-us.apache.org/repos/asf/flex-utilities/tree/68ccd35d
Diff: http://git-wip-us.apache.org/repos/asf/flex-utilities/diff/68ccd35d

Branch: refs/heads/develop
Commit: 68ccd35d8cdac622485b326eeac1e7bf3f5946bd
Parents: 300c491
Author: Justin Mclean <jm...@apache.org>
Authored: Fri Oct 24 15:11:57 2014 +1100
Committer: Justin Mclean <jm...@apache.org>
Committed: Fri Oct 24 15:11:57 2014 +1100

----------------------------------------------------------------------
 installer/src/InstallApacheFlex.mxml | 43 +++++++++++++++++++++++--------
 1 file changed, 32 insertions(+), 11 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/flex-utilities/blob/68ccd35d/installer/src/InstallApacheFlex.mxml
----------------------------------------------------------------------
diff --git a/installer/src/InstallApacheFlex.mxml b/installer/src/InstallApacheFlex.mxml
index 7ce73b1..071bf18 100644
--- a/installer/src/InstallApacheFlex.mxml
+++ b/installer/src/InstallApacheFlex.mxml
@@ -365,7 +365,7 @@ variables are not required because the locations of these pieces are known.
             calc.buttonWidth(installLogBtn);
             calc.buttonWidth(openApacheFlexFolderBtn);
             
-            _standardButtonWidth = calc.maxButtonWidth([installBtn, browseBtn, closeBtn, nextBtn]);
+            _standardButtonWidth = calc.maxButtonWidth([installBtn, browseBtn, closeBtn, nextBtn, firstStepBackBtn, secondStepBackBtn]);
         }
         
         private function parseArgs(event:InvokeEvent):void
@@ -1166,13 +1166,6 @@ variables are not required because the locations of these pieces are known.
             showDirectoryState();
         }
 		 
-        protected function showDefaultState():void
-        {
-            zeroStepGroup.visible = true;
-            directoryBtn.enabled = true;
-            currentState = "default";
-        }        
-
 		protected function handleFirstStepNextBtnClick(event:MouseEvent):void
         {
             // Quick check to see if the selected directory is writable
@@ -1261,17 +1254,27 @@ variables are not required because the locations of these pieces are known.
             abortInstallation("Unable to load " + APACHE_FLEX_BIN_INSTALLER_URL);
         }
         
+        protected function showDefaultState():void
+        {
+            zeroStepGroup.visible = true;
+            directoryBtn.enabled = true;
+            currentState = "default";
+        }
+        
         protected function showDirectoryState():void
         {
             initiateInstallStepsActivity();
+            if (currentState != "optionsState")
+            {
             initializeInstallerComponentsDataProvider();
-            
+            }
             currentState = "directoryState";
         }
         
         protected function showOptionsState():void
         {
             currentState = "optionsState";
+            checkIfAllRequiredComponentsPromptsAnswered();
         }
         
         protected function initiateInstallStepsActivity():void
@@ -3216,6 +3219,24 @@ variables are not required because the locations of these pieces are known.
                 <s:Move target="{thirdStepGroup}" xFrom="800" xTo="{this.width/2 - thirdStepGroup.width/2}" duration="500" easer="{ease}"/>
             </s:Sequence>
         </s:Transition>
+        <s:Transition id="backToDefault" fromState="directoryState" toState="default">
+            <s:Sequence id="t4" targets="{[zeroStepGroup]}" effectEnd="placeGroup(zeroStepGroup)">
+                <s:SetAction target="{zeroStepGroup}" property="visible" value="true"/>
+                <s:SetAction target="{firstStepGroup}" property="visible" value="false"/>
+                <s:SetAction target="{secondStepGroup}" property="visible" value="false"/>
+                <s:SetAction target="{thirdStepGroup}" property="visible" value="false"/>
+                <s:Move target="{zeroStepGroup}" xFrom="-800" xTo="{this.width/2 - zeroStepGroup.width/2}" duration="500" easer="{ease}"/>
+            </s:Sequence>
+        </s:Transition>
+        <s:Transition id="backToDirectory" fromState="optionsState" toState="directoryState">
+            <s:Sequence id="t5" targets="{[firstStepGroup]}" effectEnd="placeGroup(firstStepGroup)">
+                <s:SetAction target="{zeroStepGroup}" property="visible" value="false"/>
+                <s:SetAction target="{firstStepGroup}" property="visible" value="true"/>
+                <s:SetAction target="{secondStepGroup}" property="visible" value="false"/>
+                <s:SetAction target="{thirdStepGroup}" property="visible" value="false"/>
+                <s:Move target="{firstStepGroup}" xFrom="-800" xTo="{this.width/2 - firstStepGroup.width/2}" duration="500" easer="{ease}"/>
+            </s:Sequence>
+        </s:Transition>
     </s:transitions>
     <s:layout>
         <s:BasicLayout/>
@@ -3362,7 +3383,7 @@ variables are not required because the locations of these pieces are known.
                       styleName="mainBtnStyle"
                       width="{_standardButtonWidth}"
                       height="32"
-                      right="10"
+                      left="10"
                       label="{_viewResourceConstants.BTN_LABEL_BACK}"
                       enabled="true"
                       click="handleFirstStepBackBtnClick(event)"/>
@@ -3391,7 +3412,7 @@ variables are not required because the locations of these pieces are known.
                       styleName="mainBtnStyle"
                       width="{_standardButtonWidth}"
                       height="32"
-                      right="10"
+                      left="10"
                       label="{_viewResourceConstants.BTN_LABEL_BACK}"
                       enabled="true"
                       click="handleSecondStepBackBtnClick(event)"/>