From 582cfd1acdbe4652e08118e1ba9ce65d52210f5d Mon Sep 17 00:00:00 2001 From: Reinhard Pointner Date: Sun, 1 Jul 2018 23:36:32 +0700 Subject: [PATCH] Update platform defaults --- app.properties | 1 + build.xml | 15 +++++++-------- installer/portable/filebot.sh | 2 +- installer/zip/filebot.l4j.ini | 2 +- installer/zip/filebot.launcher.l4j.ini | 2 +- source/net/filebot/Main.java | 17 +++++------------ source/net/filebot/Settings.java | 16 ++++++++-------- source/net/filebot/Settings.properties | 1 + 8 files changed, 25 insertions(+), 31 deletions(-) diff --git a/app.properties b/app.properties index 3eae21f2..e2c6dc4c 100644 --- a/app.properties +++ b/app.properties @@ -12,6 +12,7 @@ update.url: https://app.filebot.net/update.xml # Store link.mas: macappstore://itunes.apple.com/app/id905384638 link.mws: ms-windows-store://review/?ProductId=9NBLGGH52T9X +link.usc: snap://filebot # Links link.app.help: https://www.filebot.net/getting-started/embed.html diff --git a/build.xml b/build.xml index 8f5ee850..5147bc01 100644 --- a/build.xml +++ b/build.xml @@ -344,7 +344,7 @@ - + @@ -430,7 +430,7 @@ - + @@ -457,7 +457,7 @@ - + @@ -504,7 +504,7 @@ - + @@ -531,11 +531,11 @@ - - + + - + @@ -693,7 +693,6 @@ - diff --git a/installer/portable/filebot.sh b/installer/portable/filebot.sh index b2b55983..088abe52 100755 --- a/installer/portable/filebot.sh +++ b/installer/portable/filebot.sh @@ -42,4 +42,4 @@ APP_DATA="$FILEBOT_HOME/data" LIBRARY_PATH="$PACKAGE_LIBRARY_PATH:$LD_LIBRARY_PATH" # start filebot -java -Dapplication.deployment=portable -Dnet.filebot.media.parser="$MEDIA_PARSER" -Dnet.filebot.Archive.extractor="$EXTRACTOR" @{java.application.options} @{linux.application.options} @{linux.portable.application.options} $JAVA_OPTS $FILEBOT_OPTS -jar "$FILEBOT_HOME/jar/filebot.jar" "$@" +java -Dapplication.deployment=tar -Dnet.filebot.media.parser="$MEDIA_PARSER" -Dnet.filebot.Archive.extractor="$EXTRACTOR" @{java.application.options} @{linux.application.options} @{linux.portable.application.options} $JAVA_OPTS $FILEBOT_OPTS -jar "$FILEBOT_HOME/jar/filebot.jar" "$@" diff --git a/installer/zip/filebot.l4j.ini b/installer/zip/filebot.l4j.ini index 3aae2cff..cee7179e 100644 --- a/installer/zip/filebot.l4j.ini +++ b/installer/zip/filebot.l4j.ini @@ -8,7 +8,7 @@ @{windows.portable.application.options} # Deployment Options --Dapplication.deployment=portable +-Dapplication.deployment=zip # Use Java API move/copy operations -DuseNativeShell=false diff --git a/installer/zip/filebot.launcher.l4j.ini b/installer/zip/filebot.launcher.l4j.ini index 3aae2cff..cee7179e 100644 --- a/installer/zip/filebot.launcher.l4j.ini +++ b/installer/zip/filebot.launcher.l4j.ini @@ -8,7 +8,7 @@ @{windows.portable.application.options} # Deployment Options --Dapplication.deployment=portable +-Dapplication.deployment=zip # Use Java API move/copy operations -DuseNativeShell=false diff --git a/source/net/filebot/Main.java b/source/net/filebot/Main.java index 9e4f5b78..6136bfa6 100644 --- a/source/net/filebot/Main.java +++ b/source/net/filebot/Main.java @@ -208,12 +208,8 @@ public class Main { } private static void startUserInterface(ArgumentBean args) { - // use native LaF an all platforms (use platform-independent laf for standalone jar deployment) - if (isPortableApp()) { - setNimbusLookAndFeel(); - } else { - setSystemLookAndFeel(); - } + // use native LaF an all platforms + setSystemLookAndFeel(); // start multi panel or single panel frame PanelBuilder[] panels = args.getPanelBuilders(); @@ -243,7 +239,7 @@ public class Main { // configure main window if (isMacApp()) { - // Mac specific configuration + // macOS-specific configuration MacAppUtilities.initializeApplication(FileBotMenuBar.createHelp(), files -> { if (LICENSE.isFile() && files.size() == 1 && containsOnly(files, LICENSE_FILES)) { configureLicense(files.get(0)); @@ -252,15 +248,12 @@ public class Main { SwingEventBus.getInstance().post(new FileTransferable(files)); } }); - } else if (isUbuntuApp()) { - // Ubuntu/Debian specific configuration - frame.setIconImages(ResourceManager.getApplicationIconImages()); } else if (isWindowsApp()) { - // Windows specific configuration + // Windows-specific configuration WinAppUtilities.initializeApplication(); frame.setIconImages(ResourceManager.getApplicationIconImages()); } else { - // generic Linux/FreeBSD/Solaris configuration + // generic Linux / FreeBSD / Solaris configuration frame.setIconImages(ResourceManager.getApplicationIconImages()); } diff --git a/source/net/filebot/Settings.java b/source/net/filebot/Settings.java index 23a73b69..c801c46a 100644 --- a/source/net/filebot/Settings.java +++ b/source/net/filebot/Settings.java @@ -80,20 +80,20 @@ public final class Settings { return System.getProperty("application.deployment", "jar"); } - public static boolean isPortableApp() { - return isApplicationDeployment("portable", "jar"); - } - public static boolean isAppStore() { return isApplicationDeployment("appx", "mas"); } public static boolean isWindowsApp() { - return isApplicationDeployment("appx", "msi"); + return isApplicationDeployment("appx", "msi", "zip"); } public static boolean isUbuntuApp() { - return isApplicationDeployment("deb", "snap"); + return isApplicationDeployment("snap"); + } + + public static boolean isLinuxApp() { + return isApplicationDeployment("snap", "deb", "tar"); } public static boolean isMacApp() { @@ -109,7 +109,7 @@ public final class Settings { } public static boolean isAutoUpdateEnabled() { - return isApplicationDeployment("mas", "appx", "snap", "spk", "aur"); + return isApplicationDeployment("appx", "mas", "snap", "spk"); } private static boolean isApplicationDeployment(String... ids) { @@ -172,7 +172,7 @@ public final class Settings { if (isWindowsApp()) return getApplicationProperty("link.mws"); if (isUbuntuApp()) - return null; + return getApplicationProperty("link.usc"); return null; } diff --git a/source/net/filebot/Settings.properties b/source/net/filebot/Settings.properties index c146bb44..cc320910 100644 --- a/source/net/filebot/Settings.properties +++ b/source/net/filebot/Settings.properties @@ -9,6 +9,7 @@ github.master: @{github.master} link.mas: @{link.mas} link.mws: @{link.mws} +link.usc: @{link.usc} link.app.help: @{link.app.help} link.app.purchase: @{link.app.purchase}