From f7546bfa60917a5153203cc9d3cdc9322f71b812 Mon Sep 17 00:00:00 2001
From: Ben Soares <b.soares@dundee.ac.uk>
Date: Mon, 5 Aug 2024 15:40:17 +0100
Subject: [PATCH] JAL-3631 Adjustment to wizard size (was too big in Windows)
 and add 'Administrator mode' label to installation progress
 screen

---
 utils/install4j/install4j10_template.install4j |   22 ++++++++++++++--------
 1 file changed, 14 insertions(+), 8 deletions(-)

diff --git a/utils/install4j/install4j10_template.install4j b/utils/install4j/install4j10_template.install4j
index d808c91..920563b 100644
--- a/utils/install4j/install4j10_template.install4j
+++ b/utils/install4j/install4j10_template.install4j
@@ -71,8 +71,8 @@
       <variable name="WINDOWS_ICONS_FILE" value="jalview_logo.ico" />
       <variable name="PNG_ICON_FILE" value="jalview_logo.png" />
       <variable name="BACKGROUND" value="utils/channels/release/images/jalview_logo_background_fade-640x480.png" />
-      <variable name="WIZARD_WIDTH" value="640" description="Default/initial width of installer wizard window.  Linux media types adapt this.&#xA;NOT USED" />
-      <variable name="WIZARD_HEIGHT" value="480" description="Default/initial width of installer wizard window.  Linux media types adapt this.&#xA;NOT USED" />
+      <variable name="WIZARD_WIDTH" value="960" description="Default/initial width of installer wizard window.  Linux media types adapt this.&#xA;NOT USED" />
+      <variable name="WIZARD_HEIGHT" value="720" description="Default/initial width of installer wizard window.  Linux media types adapt this.&#xA;NOT USED" />
       <variable name="MACOSARCHIVE_X64_DMG_FILENAME" value="${compiler:APPLICATION_FOLDER}-${compiler:JALVIEW_VERSION}-${compiler:sys.platform}-x64-java_${compiler:JAVA_INTEGER_VERSION}" />
       <variable name="MACOSARCHIVE_AARCH64_DMG_FILENAME" value="${compiler:APPLICATION_FOLDER}-${compiler:JALVIEW_VERSION}-${compiler:sys.platform}-aarch64-java_${compiler:JAVA_INTEGER_VERSION}" />
       <variable name="INSTALLER_ICON" value="jalview_installer.png" />
@@ -419,8 +419,8 @@ public static final String getCanonicalFullPathToDirectoryHash(String installerA
     <applications>
       <application id="installer" beanClass="com.install4j.runtime.beans.applications.InstallerApplication" actionElevationType="elevated" styleId="35" customIcnsFile="${compiler:JALVIEW_DIR}/${compiler:INSTALLER_MAC_ICON}" customIcoFile="${compiler:JALVIEW_DIR}/${compiler:INSTALLER_WINDOWS_ICON}">
         <serializedBean>
-          <property name="frameHeight" type="int" value="812" />
-          <property name="frameWidth" type="int" value="1024" />
+          <property name="frameHeight" type="int" value="720" />
+          <property name="frameWidth" type="int" value="960" />
           <property name="useCustomIcon" type="boolean" value="true" />
         </serializedBean>
         <styleOverrides>
@@ -709,7 +709,7 @@ return context.getCompilerVariable("sys.platform");</property>
           </screen>
         </startup>
         <screens>
-          <screen name="Administrator mode label" id="2" beanClass="com.install4j.runtime.beans.screens.WelcomeScreen" rollbackBarrierExitCode="0">
+          <screen id="2" beanClass="com.install4j.runtime.beans.screens.WelcomeScreen" rollbackBarrierExitCode="0">
             <styleOverrides>
               <styleOverride name="Customize banner image" enabled="true">
                 <group id="145" beanClass="com.install4j.runtime.beans.groups.VerticalFormComponentGroup" useExternalParametrization="true" externalParametrizationName="Customize banner image" externalParametrizationMode="include">
@@ -785,7 +785,7 @@ return context.getCompilerVariable("sys.platform");</property>
               </action>
             </actions>
             <formComponents>
-              <formComponent id="3028" beanClass="com.install4j.runtime.beans.formcomponents.MultilineHtmlLabelComponent" insetBottom="16">
+              <formComponent name="Administrator mode label" id="3028" beanClass="com.install4j.runtime.beans.formcomponents.MultilineHtmlLabelComponent" insetBottom="16">
                 <serializedBean>
                   <property name="labelHtml" type="string">&lt;strong&gt;Administrator mode&lt;/strong&gt;</property>
                 </serializedBean>
@@ -2097,6 +2097,12 @@ return sb.toString();
               </action>
             </actions>
             <formComponents>
+              <formComponent name="Administrator mode label" id="3061" beanClass="com.install4j.runtime.beans.formcomponents.MultilineHtmlLabelComponent" insetBottom="16">
+                <serializedBean>
+                  <property name="labelHtml" type="string">&lt;strong&gt;Administrator mode&lt;/strong&gt;</property>
+                </serializedBean>
+                <visibilityScript>context.getBooleanVariable("isAdmin")</visibilityScript>
+              </formComponent>
               <formComponent id="16" beanClass="com.install4j.runtime.beans.formcomponents.ProgressComponent">
                 <serializedBean>
                   <property name="initialStatusMessage" type="string">${i18n:WizardPreparing}</property>
@@ -2848,7 +2854,7 @@ ${compiler:JALVIEW_APPLICATION_NAME} will now launch.</property>
       </exclude>
       <variables>
         <variable name="variable" value="720" />
-        <variable name="WIZARD_HEIGHT" value="540" />
+        <variable name="WIZARD_HEIGHT" value="800" />
       </variables>
       <jreBundle jreBundleSource="preCreated" includedJre="${compiler:LINUX_X64_JAVA_VM_TGZ}" manualJreEntry="true" />
     </unixInstaller>
@@ -2863,7 +2869,7 @@ ${compiler:JALVIEW_APPLICATION_NAME} will now launch.</property>
       </exclude>
       <variables>
         <variable name="variable" value="720" />
-        <variable name="WIZARD_HEIGHT" value="540" />
+        <variable name="WIZARD_HEIGHT" value="800" />
       </variables>
       <jreBundle jreBundleSource="preCreated" includedJre="${compiler:LINUX_AARCH64_JAVA_VM_TGZ}" manualJreEntry="true" />
     </unixInstaller>
-- 
1.7.10.2