From 96008c00fa785297875201f97d6bdd231e2881d2 Mon Sep 17 00:00:00 2001
From: Reinhard Pointner <reinhard.pointner@gmail.com>
Date: Fri, 21 Apr 2017 12:15:02 +0800
Subject: [PATCH] Include fail-safe launcher in appx package

---
 installer/appx/AppxManifest.xml               | 11 ++++++++++
 .../appx/filebot.platform.launcher.l4j.ini    | 22 +++++++++----------
 2 files changed, 22 insertions(+), 11 deletions(-)

diff --git a/installer/appx/AppxManifest.xml b/installer/appx/AppxManifest.xml
index eec3942e..60b7d138 100644
--- a/installer/appx/AppxManifest.xml
+++ b/installer/appx/AppxManifest.xml
@@ -97,6 +97,17 @@
 				</uap3:Extension>
 			</Extensions>
 		</Application>
+		<Application Id="@{package.identifier}.Platform" Executable="filebot.launcher.platform.exe" EntryPoint="Windows.FullTrustApplication">
+			<uap:VisualElements DisplayName="@{application.name} (platform)" Description="Run @{application.name} with alternate configuration" BackgroundColor="purple" Square150x150Logo="Assets\Square150x150Logo.png" Square44x44Logo="Assets\Square44x44Logo.png" >
+				<uap:DefaultTile ShortName="@{application.name} (platform)" Wide310x150Logo="Assets\Wide310x150Logo.png" Square310x310Logo="Assets\Square310x310Logo.png" Square71x71Logo="Assets\Square71x71Logo.png">
+					<uap:ShowNameOnTiles>
+						<uap:ShowOn Tile="square150x150Logo" />
+						<uap:ShowOn Tile="wide310x150Logo" />
+						<uap:ShowOn Tile="square310x310Logo" />
+					</uap:ShowNameOnTiles>
+				</uap:DefaultTile>
+			</uap:VisualElements>
+		</Application>
 		<Application Id="@{package.identifier}.Command" Executable="filebot.exe" EntryPoint="Windows.FullTrustApplication">
 			<uap:VisualElements DisplayName="@{application.name} (console)" Description="Run @{application.name} with Console" BackgroundColor="black" Square150x150Logo="Assets\Square150x150Logo.png" Square44x44Logo="Assets\Square44x44Logo.png" >
 				<uap:DefaultTile ShortName="@{application.name} (console)" Wide310x150Logo="Assets\Wide310x150Logo.png" Square310x310Logo="Assets\Square310x310Logo.png" Square71x71Logo="Assets\Square71x71Logo.png">
diff --git a/installer/appx/filebot.platform.launcher.l4j.ini b/installer/appx/filebot.platform.launcher.l4j.ini
index 350608b8..5f60a835 100644
--- a/installer/appx/filebot.platform.launcher.l4j.ini
+++ b/installer/appx/filebot.platform.launcher.l4j.ini
@@ -6,9 +6,6 @@
 # put all temporary files here
 -Djava.io.tmpdir="%APPDATA%\FileBot\tmp"
 
-# FileBot system properties
--DthreadPool=32
-
 # network settings
 -Djava.net.useSystemProxies=true
 
@@ -37,22 +34,25 @@
 # force Application User Model ID for Windows Store
 -Dnet.filebot.AppUserModelID=@{microsoft.application.name}
 
-# use Java implementation for extracting archives
--Dnet.filebot.Archive.extractor="ApacheVFS"
+# force platform L&F
+-Dswing.systemlaf=javax.swing.plaf.nimbus.NimbusLookAndFeel
 
-# force english locale
+# disable hardware acceleration
+-Dsun.java2d.d3d=false
+-Dprism.order=sw
+
+# force English locale
 -Dfile.encoding=UTF-8
 -Duser.country=US
 -Duser.country.format=US
 -Duser.language=en
 -Duser.language.format=en
 
-# disable hardware acceleration
--Dsun.java2d.d3d=false
--Dprism.order=sw
+# use Java implementation for extracting archives
+-Dnet.filebot.Archive.extractor="ApacheVFS"
 
-# force platform L&F
--Dswing.systemlaf=javax.swing.plaf.nimbus.NimbusLookAndFeel
+# force thread pool size
+-DthreadPool=32
 
 # support FILEBOT_OPTS environment variable
 %FILEBOT_OPTS%