From 73c0efbd904eeb6e8f2fe826167ece9c5a4b9e3d Mon Sep 17 00:00:00 2001
From: AMZN-ScottR <24445312+AMZN-ScottR@users.noreply.github.com>
Date: Tue, 29 Jun 2021 12:37:04 -0700
Subject: [PATCH] [cpack/2106-progress-screen] generalize progress screen text
 and split out download/execution progress

Signed-off-by: AMZN-ScottR <24445312+AMZN-ScottR@users.noreply.github.com>
---
 .../Windows/Packaging/BootstrapperTheme.wxl.in         |  6 +++---
 .../Windows/Packaging/BootstrapperTheme.xml.in         | 10 +++++++---
 2 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/cmake/Platform/Windows/Packaging/BootstrapperTheme.wxl.in b/cmake/Platform/Windows/Packaging/BootstrapperTheme.wxl.in
index 7da81d0397..0c532fa4d8 100644
--- a/cmake/Platform/Windows/Packaging/BootstrapperTheme.wxl.in
+++ b/cmake/Platform/Windows/Packaging/BootstrapperTheme.wxl.in
@@ -32,9 +32,9 @@ Setup will install [WixBundleName] on your computer. Click install to continue,
     <String Id="ModifyCloseButton">&amp;Close</String>
 
     <!-- action progress page -->
-    <String Id="ProgressHeader">Installing @CPACK_PACKAGE_FULL_NAME@...</String>
-    <String Id="ProgressLabel">Processing:</String>
-    <String Id="OverallProgressPackageText">Initializing...</String>
+    <String Id="ProgressHeader">Processing @CPACK_PACKAGE_FULL_NAME@...</String>
+    <String Id="CacheProgressLabel">Caching Progress</String>
+    <String Id="ExecuteProgressLabel">Execution Progress</String>
     <String Id="ProgressCancelButton">&amp;Cancel</String>
 
     <!-- final page (success state) -->
diff --git a/cmake/Platform/Windows/Packaging/BootstrapperTheme.xml.in b/cmake/Platform/Windows/Packaging/BootstrapperTheme.xml.in
index 93984d06b8..62980a35f7 100644
--- a/cmake/Platform/Windows/Packaging/BootstrapperTheme.xml.in
+++ b/cmake/Platform/Windows/Packaging/BootstrapperTheme.xml.in
@@ -54,9 +54,13 @@
     <Page Name="Progress">
         <Text X="38" Y="142" Width="-42" Height="34" FontId="0" DisablePrefix="yes">#(loc.ProgressHeader)</Text>
 
-        <Text X="42" Y="202" Width="70" Height="18" FontId="1" DisablePrefix="yes">#(loc.ProgressLabel)</Text>
-        <Text Name="OverallProgressPackageText" X="116" Y="202" Width="-42" Height="18" FontId="2" DisablePrefix="yes">#(loc.OverallProgressPackageText)</Text>
-        <Progressbar Name="OverallCalculatedProgressbar" X="42" Y="230" Width="-90" Height="20" />
+        <Text X="42" Y="202" Width="-45" Height="18" FontId="1" DisablePrefix="yes">#(loc.CacheProgressLabel)</Text>
+        <Progressbar Name="CacheProgressbar" X="42" Y="230" Width="-90" Height="20" />
+        <Text Name="CacheProgressText" X="-45" Y="232" Width="32" Height="18" FontId="2" DisablePrefix="yes"/>
+
+        <Text X="42" Y="262" Width="-45" Height="18" FontId="1" DisablePrefix="yes">#(loc.ExecuteProgressLabel)</Text>
+        <Progressbar Name="ExecuteProgressbar" X="42" Y="290" Width="-90" Height="20" />
+        <Text Name="ExecuteProgressText" X="-45" Y="292" Width="32" Height="18" FontId="2" DisablePrefix="yes"/>
 
         <Text X="0" Y="426" Width="672" Height="46" FontId="3" HideWhenDisabled="yes" />
         <Button Name="ProgressCancelButton" X="-22" Y="-10" Width="80" Height="24" TabStop="yes" FontId="2">#(loc.ProgressCancelButton)</Button>