From 3c8d2ce11ea400d82cb79d1ac9da6423cecc2980 Mon Sep 17 00:00:00 2001 From: Ben Soares Date: Fri, 26 May 2023 00:45:53 +0100 Subject: [PATCH] JAL-3416 JAL-3820 FlatLaf default for everyone, including Windows. Add jalview_local.bat and .ps1 on Windows installation. --- build.gradle | 1 + src/jalview/bin/Jalview.java | 7 ++++- utils/install4j/install4j10_template.install4j | 38 +++++++++++++++++++++++- 3 files changed, 44 insertions(+), 2 deletions(-) diff --git a/build.gradle b/build.gradle index ad7c94f..ca599a8 100644 --- a/build.gradle +++ b/build.gradle @@ -2787,6 +2787,7 @@ task installerFiles(type: com.install4j.gradle.Install4jTask) { 'WRAPPER_LINK': getdownWrapperLink, 'BASH_WRAPPER_SCRIPT': getdown_bash_wrapper_script, 'POWERSHELL_WRAPPER_SCRIPT': getdown_powershell_wrapper_script, + 'BATCH_WRAPPER_SCRIPT': getdown_batch_wrapper_script, 'WRAPPER_SCRIPT_BIN_DIR': getdown_wrapper_script_dir, 'INSTALLER_NAME': install4jInstallerName, 'INSTALL4J_UTILS_DIR': install4j_utils_dir, diff --git a/src/jalview/bin/Jalview.java b/src/jalview/bin/Jalview.java index 51e9af9..615e318 100755 --- a/src/jalview/bin/Jalview.java +++ b/src/jalview/bin/Jalview.java @@ -1246,7 +1246,12 @@ public class Jalview } if (!lafSet) { - setSystemLookAndFeel(); + // Flatlaf default for everyone! + lafSet = setFlatLookAndFeel(); + if (!lafSet) + { + setSystemLookAndFeel(); + } if (Platform.isLinux()) { setLinuxLookAndFeel(); diff --git a/utils/install4j/install4j10_template.install4j b/utils/install4j/install4j10_template.install4j index 070c668..3bc98ae 100644 --- a/utils/install4j/install4j10_template.install4j +++ b/utils/install4j/install4j10_template.install4j @@ -54,12 +54,14 @@ - + + + @@ -735,6 +737,40 @@ return console.askOkCancel(message, true); context.getBooleanVariable("makeSymbolicLinkAction") && Util.isMacOS() && ( context.getVariable("unixUserBinDir") != null ) && ( context.getVariable("macWrapperLinkLocation") != null ) + + + + + ${compiler:WRAPPER_SCRIPT_BIN_DIR}/${compiler:WRAPPER_LINK}.bat + + + + + + ${compiler:WRAPPER_SCRIPT_BIN_DIR}/${compiler:BATCH_WRAPPER_SCRIPT} + + + + + Util.isWindows() && !(((String)context.getCompilerVariable("WRAPPER_LINK")+".bat").equals((String)context.getCompilerVariable("BATCH_WRAPPER_SCRIPT"))) + + + + + + ${compiler:WRAPPER_SCRIPT_BIN_DIR}/${compiler:WRAPPER_LINK}.ps1 + + + + + + ${compiler:WRAPPER_SCRIPT_BIN_DIR}/${compiler:POWERSHELL_WRAPPER_SCRIPT} + + + + + Util.isWindows() && !(((String)context.getCompilerVariable("WRAPPER_LINK")+".ps1").equals((String)context.getCompilerVariable("POWERSHELL_WRAPPER_SCRIPT"))) + -- 1.7.10.2