From 52b016075dcc0fc35a0b1a93d3c1a0bc78e3f73d Mon Sep 17 00:00:00 2001
From: Raoul Snyman <raoul@snyman.info>
Date: Sat, 4 May 2019 14:43:52 -0700
Subject: [PATCH] Use the variables everywhere, and set the version in the
 name. Also register oszl files in macOS

---
 osx/Info.plist          | 24 ++++++++++++++++++++++--
 windows/OpenLP-base.wxs | 10 +++++-----
 2 files changed, 27 insertions(+), 7 deletions(-)

diff --git a/osx/Info.plist b/osx/Info.plist
index cfc1a38..4435075 100755
--- a/osx/Info.plist
+++ b/osx/Info.plist
@@ -21,7 +21,27 @@
 			<string>Owner</string>
 			<key>LSItemContentTypes</key>
 			<array>
-				<string>org.openlp.osz</string>
+				<string>org.openlp.service</string>
+			</array>
+		</dict>
+		<dict>
+			<key>CFBundleTypeExtension</key>
+			<array>
+				<string>oszl</string>
+			</array>
+			<key>CFBundleTypeIconFiles</key>
+			<array>
+				<string>OpenLP.icns</string>
+			</array>
+			<key>CFBundleTypeName</key>
+			<string>OpenLP Service</string>
+			<key>CFBundleTypeRole</key>
+			<string>Viewer</string>
+			<key>LSHandlerRank</key>
+			<string>Owner</string>
+			<key>LSItemContentTypes</key>
+			<array>
+				<string>org.openlp.servicelite</string>
 			</array>
 		</dict>
 		<dict>
@@ -41,7 +61,7 @@
 			<string>Owner</string>
 			<key>LSItemContentTypes</key>
 			<array>
-				<string>org.openlp.otz</string>
+				<string>org.openlp.theme</string>
 			</array>
 		</dict>
 	</array>
diff --git a/windows/OpenLP-base.wxs b/windows/OpenLP-base.wxs
index d0049e5..32ac17e 100644
--- a/windows/OpenLP-base.wxs
+++ b/windows/OpenLP-base.wxs
@@ -9,8 +9,8 @@
   <?define Comments="OpenLP is open source under the GNU General Public License"?>
   <?define UpgradeCode="8C5881AC-8F1E-4937-BB99-B823FABF18F0"?>
   <?define Platform="%(platform)s"?>
-  <Product Name="$(var.ProductName)" Manufacturer="$(var.Manufacturer)" Id="$(var.ProductCode)"
-    UpgradeCode="$(var.UpgradeCode)" Language="1033" Codepage="1252" Version="2.5.0">
+  <Product Name="$(var.ProductName) $(var.Version)" Manufacturer="$(var.Manufacturer)" Id="$(var.ProductCode)"
+    UpgradeCode="$(var.UpgradeCode)" Language="1033" Codepage="1252" Version="$(var.ProductVersion)">
     <Package Id="*" Keywords="Installer" Description="$(var.Description)" Comments="$(var.Comments)"
       Manufacturer="$(var.Manufacturer)" InstallerVersion="251" Languages="1033" Compressed="yes"
       SummaryCodepage="1252" Platform="$(var.Platform)"/>
@@ -84,7 +84,7 @@
               Icon="OpenLP.ico"
               WorkingDirectory="RootDirectory"/>
             <Shortcut Id="HelpStartMenuShortcut"
-              Name="OpenLP Help" 
+              Name="$(var.ProductName) Help" 
               Description="Help file for $(var.ProductName)"
               Target="[#file_436f15ee9b174c85745878fe09b6d47e]"
               WorkingDirectory="RootDirectory"/>
@@ -105,9 +105,9 @@
       <Directory Id="DesktopFolder" Name="Desktop" />
     </Directory>
     <DirectoryRef Id="INSTALLDIR">
-      <Directory Id="RootDirectory" Name="OpenLP" />
+      <Directory Id="RootDirectory" Name="$(var.ProductName)" />
     </DirectoryRef>
-    <Feature Id="Complete" Title="Complete" Description="The OpenLP program files" Level="1"
+    <Feature Id="Complete" Title="Complete" Description="The $(var.ProductName) program files" Level="0"
       ConfigurableDirectory="INSTALLDIR" AllowAdvertise="no" InstallDefault="local" Absent="disallow">
       <ComponentGroupRef Id="Files"/>
       <ComponentRef Id="ProgramMenuDir"/>