From 19ba09c168d736598f4e0e0869f4be9df5af3114 Mon Sep 17 00:00:00 2001
From: Raoul Snyman <raoul.snyman@saturnlaboratories.co.za>
Date: Sat, 13 Mar 2010 00:33:04 +0200
Subject: [PATCH] Tweaked setup a bit. Added a default configuration.

---
 resources/innosetup/OpenLP-2.0.iss | 11 +++++++----
 resources/innosetup/openlp.conf    | 26 ++++++++++++++++++++++++++
 2 files changed, 33 insertions(+), 4 deletions(-)
 create mode 100644 resources/innosetup/openlp.conf

diff --git a/resources/innosetup/OpenLP-2.0.iss b/resources/innosetup/OpenLP-2.0.iss
index eb2198fe4..ea2a70664 100644
--- a/resources/innosetup/OpenLP-2.0.iss
+++ b/resources/innosetup/OpenLP-2.0.iss
@@ -20,12 +20,14 @@ AppSupportURL={#MyAppURL}
 AppUpdatesURL={#MyAppURL}
 DefaultDirName={pf}\{#MyAppName}
 DefaultGroupName=OpenLP 2.0
-AllowNoIcons=yes
+AllowNoIcons=true
 LicenseFile=LICENSE.txt
 OutputBaseFilename=OpenLP-1.9.0-bzr737-setup
 Compression=lzma
 SolidCompression=true
-SetupIconFile=OpenLP.ico
+SetupIconFile=C:\Program Files\Inno Setup 5\Examples\Setup.ico
+WizardImageFile=C:\Program Files\Inno Setup 5\WizModernImage-IS.bmp
+WizardSmallImageFile=C:\Program Files\Inno Setup 5\WizModernSmallImage-IS.bmp
 
 [Languages]
 Name: english; MessagesFile: compiler:Default.isl
@@ -51,8 +53,8 @@ Name: slovenian; MessagesFile: compiler:Languages\Slovenian.isl
 Name: spanish; MessagesFile: compiler:Languages\Spanish.isl
 
 [Tasks]
-Name: desktopicon; Description: {cm:CreateDesktopIcon}; GroupDescription: {cm:AdditionalIcons}; Flags: unchecked
-Name: quicklaunchicon; Description: {cm:CreateQuickLaunchIcon}; GroupDescription: {cm:AdditionalIcons}; Flags: unchecked
+Name: desktopicon; Description: {cm:CreateDesktopIcon}; GroupDescription: {cm:AdditionalIcons}
+Name: quicklaunchicon; Description: {cm:CreateQuickLaunchIcon}; GroupDescription: {cm:AdditionalIcons}
 
 [Files]
 Source: ..\..\dist\OpenLP\*; DestDir: {app}; Flags: ignoreversion
@@ -60,6 +62,7 @@ Source: ..\..\dist\OpenLP\plugins\*; DestDir: {app}\plugins; Flags: ignoreversio
 Source: ..\..\dist\OpenLP\Microsoft.VC90.CRT\*; DestDir: {app}\Microsoft.VC90.CRT; Flags: ignoreversion recursesubdirs createallsubdirs
 Source: ..\..\dist\OpenLP\qt4_plugins\*; DestDir: {app}\qt4_plugins; Flags: ignoreversion recursesubdirs createallsubdirs
 Source: ..\..\dist\OpenLP\eggs\*; DestDir: {app}\eggs; Flags: ignoreversion recursesubdirs createallsubdirs
+Source: openlp.conf; DestDir: {userappdata}\openlp; Flags: ignoreversion
 ; NOTE: Don't use "Flags: ignoreversion" on any shared system files
 
 [Icons]
diff --git a/resources/innosetup/openlp.conf b/resources/innosetup/openlp.conf
new file mode 100644
index 000000000..3471aede1
--- /dev/null
+++ b/resources/innosetup/openlp.conf
@@ -0,0 +1,26 @@
+[bibles]
+status = 1
+
+[media]
+status = 1
+
+[alerts]
+status = 1
+
+[presentations]
+status = 1
+
+[custom]
+status = 1
+
+[remotes]
+status = 1
+
+[images]
+status = 1
+
+[songusage]
+status = 1
+
+[songs]
+status = 1