From a2e9b0cb6922f4276da0b547988ab48c4b74580e Mon Sep 17 00:00:00 2001
From: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
Date: Wed, 22 Sep 2021 19:29:08 -0700
Subject: [PATCH] reverting some changes that affected the custom UI
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
---
.../Packaging/BootstrapperTheme.wxl.in | 2 -
.../Packaging/BootstrapperTheme.xml.in | 122 +++++++++---------
.../Platform/Windows/Packaging_windows.cmake | 4 +-
3 files changed, 62 insertions(+), 66 deletions(-)
diff --git a/cmake/Platform/Windows/Packaging/BootstrapperTheme.wxl.in b/cmake/Platform/Windows/Packaging/BootstrapperTheme.wxl.in
index 9e5f796b70..7d221913d5 100644
--- a/cmake/Platform/Windows/Packaging/BootstrapperTheme.wxl.in
+++ b/cmake/Platform/Windows/Packaging/BootstrapperTheme.wxl.in
@@ -20,8 +20,6 @@ Setup will install [WixBundleName] on your computer. Click install to continue,
- Include debug SDK
- Include release-monolithic SDK
Install location:
&Browse
WARNING:
diff --git a/cmake/Platform/Windows/Packaging/BootstrapperTheme.xml.in b/cmake/Platform/Windows/Packaging/BootstrapperTheme.xml.in
index 22e76ad2db..eea1adc11b 100644
--- a/cmake/Platform/Windows/Packaging/BootstrapperTheme.xml.in
+++ b/cmake/Platform/Windows/Packaging/BootstrapperTheme.xml.in
@@ -1,7 +1,7 @@
- #(loc.WindowTitle)
+ #(loc.WindowTitle)
Segoe UI
@@ -15,112 +15,110 @@
Segoe UI
-
+
- #(loc.InstallHeader)
+ #(loc.InstallHeader)
-
+@WIX_THEME_INSTALL_LICENSE_ELEMENTS@
-
-
-
-
+
+
+
+
- #(loc.OptionsHeader)
+ #(loc.OptionsHeader)
- #(loc.IncludeDebugSDK)
- #(loc.IncludeReleaseMonolithicSDK)
+ #(loc.OptionsLocationLabel)
+
+
+ #(loc.OptionsWarningTitle)
+ #(loc.OptionsWarning)
- #(loc.OptionsLocationLabel)
-
-
- #(loc.OptionsWarningTitle)
- #(loc.OptionsWarning)
-
-
-
-
+
+
+
- #(loc.ModifyHeader)
+ #(loc.ModifyHeader)
-
-
-
-
+
+
+
+
- #(loc.ProgressHeader)
+ #(loc.ProgressHeader)
- #(loc.CacheProgressLabel)
-
- 100%
+ #(loc.CacheProgressLabel)
+
+
- #(loc.ExecuteProgressLabel)
-
- 100%
+ #(loc.ExecuteProgressLabel)
+
+
-
-
+
+
- #(loc.FilesInUseHeader)
+ #(loc.FilesInUseHeader)
- #(loc.FilesInUseLabel)
-
-
-
+ #(loc.FilesInUseLabel)
+
-
-
-
+
+
+
+
+
+
- #(loc.SuccessHeader)
- #(loc.SuccessInstallHeader)
- #(loc.SuccessRepairHeader)
- #(loc.SuccessUninstallHeader)
+ #(loc.SuccessHeader)
+ #(loc.SuccessInstallHeader)
+ #(loc.SuccessRepairHeader)
+ #(loc.SuccessUninstallHeader)
-
-
-
+
+
+
-
- #(loc.FailureHeader)
- #(loc.FailureInstallHeader)
- #(loc.FailureUninstallHeader)
- #(loc.FailureRepairHeader)
+
+ #(loc.FailureHeader)
+ #(loc.FailureInstallHeader)
+ #(loc.FailureUninstallHeader)
+ #(loc.FailureRepairHeader)
- #(loc.FailureHyperlinkLogText)
- MessageText
+ #(loc.FailureHyperlinkLogText)
+
-
-
+
+
- #(loc.HelpHeader)
+ #(loc.HelpHeader)
- #(loc.HelpText)
+ #(loc.HelpText)
-
-
+
+
diff --git a/cmake/Platform/Windows/Packaging_windows.cmake b/cmake/Platform/Windows/Packaging_windows.cmake
index 63f0abc6ae..ddfaea00d1 100644
--- a/cmake/Platform/Windows/Packaging_windows.cmake
+++ b/cmake/Platform/Windows/Packaging_windows.cmake
@@ -83,8 +83,8 @@ endif()
set(CPACK_WIX_PRODUCT_GUID ${LY_WIX_PRODUCT_GUID})
set(CPACK_WIX_UPGRADE_GUID ${LY_WIX_UPGRADE_GUID})
-set(CPACK_WIX_PRODUCT_LOGO ${CPACK_SOURCE_DIR}/Platform/Windows/Packaging/logo.png)
-set(CPACK_WIX_PRODUCT_ICON ${CPACK_SOURCE_DIR}/Platform/Windows/Packaging/icon.ico)
+set(CPACK_WIX_PRODUCT_LOGO ${CPACK_SOURCE_DIR}/Platform/Windows/Packaging/product_logo.png)
+set(CPACK_WIX_PRODUCT_ICON ${CPACK_SOURCE_DIR}/Platform/Windows/Packaging/product_icon.ico)
set(CPACK_WIX_TEMPLATE "${CPACK_SOURCE_DIR}/Platform/Windows/Packaging/Template.wxs.in")