From 4d7520176bc6e9bd01512ce46239ae177ce618ca Mon Sep 17 00:00:00 2001
From: Lyubomir Marinov <lyubomir.marinov@jitsi.org>
Date: Fri, 26 Sep 2008 02:04:59 +0000
Subject: [PATCH] Completes the support for the customizable installer
 properties in the Windows Installer-based setup.

---
 resources/install/build.xml                     | 2 ++
 resources/install/windows/en-us.wxl             | 2 ++
 resources/install/windows/installer-windows.wxs | 5 ++++-
 3 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/resources/install/build.xml b/resources/install/build.xml
index 0fc85eebc..aa5ebbf81 100644
--- a/resources/install/build.xml
+++ b/resources/install/build.xml
@@ -432,6 +432,8 @@
         <filter token="APP_EMAIL" value="${application.email}" />
         <filter token="APP_NAME" value="${application.name}" />
         <filter token="APP_WEB" value="${application.web}" />
+        <filter token="WelcomeText1" value="${installer.welcome.wtext1}" />
+        <filter token="WelcomeText2" value="${installer.welcome.wtext2}" />
         <filter token="WelcomeText3" value="${installer.welcome.wtext3}" />
     	<filter token="WINDOWS_JRE_FILE" value="${windows.jre.file}" />
         <filter token="WIX_PRODUCT_ID" value="${wix.product.id}" />
diff --git a/resources/install/windows/en-us.wxl b/resources/install/windows/en-us.wxl
index b1bb75724..da0f0d4a4 100644
--- a/resources/install/windows/en-us.wxl
+++ b/resources/install/windows/en-us.wxl
@@ -2,5 +2,7 @@
 <WixLocalization
     xmlns="http://schemas.microsoft.com/wix/2006/localization"
     Culture="en-us">
+  <String Id="WelcomeText1" Overridable="yes"><![CDATA[@WelcomeText1@]]></String>
+  <String Id="WelcomeText2" Overridable="yes"><![CDATA[@WelcomeText2@]]></String>
   <String Id="WelcomeText3" Overridable="yes">{\GreyText}@WelcomeText3@</String>
 </WixLocalization>
diff --git a/resources/install/windows/installer-windows.wxs b/resources/install/windows/installer-windows.wxs
index f31c8f915..ade3cd4a7 100644
--- a/resources/install/windows/installer-windows.wxs
+++ b/resources/install/windows/installer-windows.wxs
@@ -14,6 +14,7 @@
     Compressed="yes"
     Description="@PKG_DESCRIPTION@"
     InstallPrivileges="elevated"
+    InstallScope="perMachine"
     InstallerVersion="200"
     Languages="1033"
     Manufacturer="@APP_NAME@"
@@ -114,7 +115,9 @@
                 <Control Id="Bitmap" Type="Bitmap" X="0" Y="0" Width="370" Height="234" TabSkip="no" Text="!(loc.WelcomeDlgBitmap)" />
                 <Control Id="Back" Type="PushButton" X="180" Y="243" Width="56" Height="17" Disabled="yes" Text="!(loc.WixUIBack)" />
                 <Control Id="BottomLine" Type="Line" X="0" Y="234" Width="370" Height="0" />
-                <Control Id="WelcomeText3" Type="Text" X="135" Y="220" Width="215" Height="19" Transparent="yes" NoPrefix="yes" Text="!(loc.WelcomeText3)" />
+                <Control Id="WelcomeText1" Type="Text" X="135" Y="155" Width="220" Height="40" Transparent="yes" NoPrefix="yes" Text="!(loc.WelcomeText1)" />
+                <Control Id="WelcomeText2" Type="Text" X="135" Y="190" Width="220" Height="30" Transparent="yes" NoPrefix="yes" Text="!(loc.WelcomeText2)" />
+                <Control Id="WelcomeText3" Type="Text" X="135" Y="220" Width="220" Height="14" Transparent="yes" NoPrefix="yes" Text="!(loc.WelcomeText3)" />
                 <Control Id="Description" Type="Text" X="135" Y="80" Width="220" Height="60" Transparent="yes" NoPrefix="yes" Text="!(loc.WelcomeDlgDescription)" />
                 <Control Id="Title" Type="Text" X="135" Y="20" Width="220" Height="60" Transparent="yes" NoPrefix="yes" Text="!(loc.WelcomeDlgTitle)" />
             </Dialog>