JAL-3631 Remove the checkboxes from the Finish screen. Now moved to pre-install screen.

diff --git a/utils/install4j/install4j10_template.install4j b/utils/install4j/install4j10_template.install4j
index d1ca52e..0c78c38 100644 (file)
--- a/utils/install4j/install4j10_template.install4j
+++ b/utils/install4j/install4j10_template.install4j
@@ -1067,57 +1067,6 @@ context.getBooleanVariable("addToDockAction")</condition>
                   <property name="labelText" type="string">${form:finishedMessage}</property>
                 </serializedBean>
               </formComponent>
-              <formComponent name="USERSPACE: Add a desktop link (not macOS)" id="574" beanClass="com.install4j.runtime.beans.formcomponents.CheckboxComponent" resetInitOnPrevious="true">
-                <serializedBean>
-                  <property name="checkboxText" type="string">${i18n:CreateDesktopIcon}</property>
-                  <property name="variableName" type="string">createDesktopLinkAction</property>
-                </serializedBean>
-                <visibilityScript>!Util.isMacOS() &amp;&amp; !Util.hasFullAdminRights()
-</visibilityScript>
-              </formComponent>
-              <formComponent name="USERSPACE: Add an executable to the dock (macOS)" id="577" beanClass="com.install4j.runtime.beans.formcomponents.CheckboxComponent">
-                <serializedBean>
-                  <property name="checkboxText" type="string">${i18n:AddToDock}</property>
-                  <property name="initiallySelected" type="boolean" value="true" />
-                  <property name="variableName" type="string">addToDockAction</property>
-                </serializedBean>
-                <visibilityScript>Util.isMacOS() &amp;&amp; !Util.hasFullAdminRights()
-</visibilityScript>
-              </formComponent>
-              <formComponent name="USERSPACE: Add jalview bin to the user's Path environment variable (Windows)" id="2734" beanClass="com.install4j.runtime.beans.formcomponents.CheckboxComponent">
-                <serializedBean>
-                  <property name="checkboxText" type="string">Add ${compiler:JALVIEW_APPLICATION_NAME}'s bin folder to your Path environment variable</property>
-                  <property name="initiallySelected" type="boolean" value="true" />
-                  <property name="variableName" type="string">appendToPathAction</property>
-                </serializedBean>
-                <visibilityScript>Util.isWindows() &amp;&amp; !Util.hasFullAdminRights()</visibilityScript>
-              </formComponent>
-              <formComponent name="SYSTEMSPACE: Add jalview bin to all users' Path environment variable (Windows)" id="2854" beanClass="com.install4j.runtime.beans.formcomponents.CheckboxComponent">
-                <serializedBean>
-                  <property name="checkboxText" type="string">Add ${compiler:JALVIEW_APPLICATION_NAME}'s bin folder to the system Path environment variable</property>
-                  <property name="initiallySelected" type="boolean" value="true" />
-                  <property name="variableName" type="string">appendToPathAction</property>
-                </serializedBean>
-                <visibilityScript>Util.isWindows() &amp;&amp; Util.hasFullAdminRights()</visibilityScript>
-              </formComponent>
-              <formComponent name="BOTHSPACE: Make a symbolic link to jalview.sh bash script in the user's/system local bin (Linux or Unix)" id="2736" beanClass="com.install4j.runtime.beans.formcomponents.CheckboxComponent">
-                <serializedBean>
-                  <property name="checkboxText" type="string">Make a ${compiler:WRAPPER_LINK} symbolic link in ${installer:unixBinDir}</property>
-                  <property name="initiallySelected" type="boolean" value="true" />
-                  <property name="variableName" type="string">makeSymbolicLinkAction</property>
-                </serializedBean>
-                <visibilityScript>context.getBooleanVariable("makeSymbolicLink")
-&amp;&amp; context.getVariable("unixBinDir") != null
-&amp;&amp; (
-     Util.isLinux()
-     || Util.isUnixInstaller()
-     || (
-          ( Util.isMacOS() &amp;&amp; !Util.hasFullAdminRights() ) // Admin on macOS will add path to /etc/paths.d
-          &amp;&amp; context.getVariable("macWrapperLinkLocation") != null
-        )
-    )
-</visibilityScript>
-              </formComponent>
             </formComponents>
           </screen>
         </screens>