[banshee] windows: Don't show the EULA dialog in the installer (bgo#647210)

[Bertrand Lorentz <blorentz src gnome org>]

commit 4daab20b1edb2861f4a51801c08357c0c0532db9
Author: Bertrand Lorentz <bertrand lorentz gmail com>
Date:   Tue Mar 20 22:01:09 2012 +0100

    windows: Don't show the EULA dialog in the installer (bgo#647210)
    
    We do not need the user to agree to the MIT license or the GPL, so we
    don't need to show them. Saving your mouse, one click at a time...
    
    To achieve that we need to replace the standard WixUI_InstallDir UI
    module with its definition, and adapt it to remove the license agreement
    dialog.
    
    We now install the license.rtf file to the root of the install folder,
    which fixes bgo#642818. The first paragraph of the file is also adapted
    for clarity.

 build/windows/InstallerDefinition.wxs |   61 ++++++++++++++++++++++++++++++--
 build/windows/license.rtf             |    2 +-
 2 files changed, 58 insertions(+), 5 deletions(-)
---
diff --git a/build/windows/InstallerDefinition.wxs b/build/windows/InstallerDefinition.wxs
index 20d12cc..fb852e6 100644
--- a/build/windows/InstallerDefinition.wxs
+++ b/build/windows/InstallerDefinition.wxs
@@ -49,6 +49,9 @@
     <Directory Id="TARGETDIR" Name="SourceDir">
       <Directory Id="ProgramFilesFolder">
         <Directory Id="INSTALLLOCATION" Name="Banshee" FileSource="$(var.BuildRoot)\bin">
+          <Component Id='LicenseComponent' Guid='90353590-72C9-11E1-8A96-80FE4724019B'>
+            <File Id='license' Name='license.rtf' Source='license.rtf' />
+          </Component>
           <Directory Id="bindirectory" Name="bin">
             <Component Id="ProductComponent" Guid="55C2C651-CFF2-4607-ADE0-0BB43D5D1086">
 
@@ -63,7 +66,7 @@
             </Component>
           </Directory>
           <Directory Id="SHARELOCATION" Name="share">
-	  </Directory>
+          </Directory>
         </Directory>
       </Directory>
 
@@ -91,6 +94,7 @@
       <ComponentRef Id="ProductComponent" />
       <ComponentRef Id="StartMenuShortcut" />
       <ComponentRef Id="DesktopShortcut" />
+      <ComponentRef Id="LicenseComponent" />
       <ComponentGroupRef Id="bin" />
       <ComponentGroupRef Id="etc" />
       <ComponentGroupRef Id="lib" />
@@ -114,10 +118,59 @@
 
     <!-- This enables the license screen and where to install screen -->
     <Property Id="WIXUI_INSTALLDIR">INSTALLLOCATION</Property>
-    <UIRef Id="WixUI_InstallDir"/>
+    
+    <!-- Adapted from the standard WixUI_InstallDir -->
+    <UI Id="WixUI_InstallDir">
+        <TextStyle Id="WixUI_Font_Normal" FaceName="Tahoma" Size="8" />
+        <TextStyle Id="WixUI_Font_Bigger" FaceName="Tahoma" Size="12" />
+        <TextStyle Id="WixUI_Font_Title" FaceName="Tahoma" Size="9" Bold="yes" />
+
+        <Property Id="DefaultUIFont" Value="WixUI_Font_Normal" />
+        <Property Id="WixUI_Mode" Value="InstallDir" />
+
+        <DialogRef Id="BrowseDlg" />
+        <DialogRef Id="DiskCostDlg" />
+        <DialogRef Id="ErrorDlg" />
+        <DialogRef Id="FatalError" />
+        <DialogRef Id="FilesInUse" />
+        <DialogRef Id="MsiRMFilesInUse" />
+        <DialogRef Id="PrepareDlg" />
+        <DialogRef Id="ProgressDlg" />
+        <DialogRef Id="ResumeDlg" />
+        <DialogRef Id="UserExit" />
+        
+        <Publish Dialog="BrowseDlg" Control="OK" Event="DoAction" Value="WixUIValidatePath" Order="3">1</Publish>
+        <Publish Dialog="BrowseDlg" Control="OK" Event="SpawnDialog" Value="InvalidDirDlg" Order="4"><![CDATA[WIXUI_INSTALLDIR_VALID<>"1"]]></Publish>
+
+        <Publish Dialog="ExitDialog" Control="Finish" Event="EndDialog" Value="Return" Order="999">1</Publish>
+
+        <Publish Dialog="WelcomeDlg" Control="Next" Event="NewDialog" Value="InstallDirDlg">NOT Installed</Publish>
+        <Publish Dialog="WelcomeDlg" Control="Next" Event="NewDialog" Value="VerifyReadyDlg">Installed AND PATCH</Publish>
+
+        <Publish Dialog="InstallDirDlg" Control="Back" Event="NewDialog" Value="WelcomeDlg">1</Publish>
+        <Publish Dialog="InstallDirDlg" Control="Next" Event="SetTargetPath" Value="[WIXUI_INSTALLDIR]" Order="1">1</Publish>
+        <Publish Dialog="InstallDirDlg" Control="Next" Event="DoAction" Value="WixUIValidatePath" Order="2">NOT WIXUI_DONTVALIDATEPATH</Publish>
+        <Publish Dialog="InstallDirDlg" Control="Next" Event="SpawnDialog" Value="InvalidDirDlg" Order="3"><![CDATA[NOT WIXUI_DONTVALIDATEPATH AND WIXUI_INSTALLDIR_VALID<>"1"]]></Publish>
+        <Publish Dialog="InstallDirDlg" Control="Next" Event="NewDialog" Value="VerifyReadyDlg" Order="4">WIXUI_DONTVALIDATEPATH OR WIXUI_INSTALLDIR_VALID="1"</Publish>
+        <Publish Dialog="InstallDirDlg" Control="ChangeFolder" Property="_BrowseProperty" Value="[WIXUI_INSTALLDIR]" Order="1">1</Publish>
+        <Publish Dialog="InstallDirDlg" Control="ChangeFolder" Event="SpawnDialog" Value="BrowseDlg" Order="2">1</Publish>
+        
+        <Publish Dialog="VerifyReadyDlg" Control="Back" Event="NewDialog" Value="InstallDirDlg" Order="1">NOT Installed</Publish>
+        <Publish Dialog="VerifyReadyDlg" Control="Back" Event="NewDialog" Value="MaintenanceTypeDlg" Order="2">Installed AND NOT PATCH</Publish>
+        <Publish Dialog="VerifyReadyDlg" Control="Back" Event="NewDialog" Value="WelcomeDlg" Order="2">Installed AND PATCH</Publish>
+
+        <Publish Dialog="MaintenanceWelcomeDlg" Control="Next" Event="NewDialog" Value="MaintenanceTypeDlg">1</Publish>
+
+        <Publish Dialog="MaintenanceTypeDlg" Control="RepairButton" Event="NewDialog" Value="VerifyReadyDlg">1</Publish>
+        <Publish Dialog="MaintenanceTypeDlg" Control="RemoveButton" Event="NewDialog" Value="VerifyReadyDlg">1</Publish>
+        <Publish Dialog="MaintenanceTypeDlg" Control="Back" Event="NewDialog" Value="MaintenanceWelcomeDlg">1</Publish>
+
+        <Property Id="ARPNOMODIFY" Value="1" />
+    </UI>
+
+    <UIRef Id="WixUI_Common" />
 
-    <!-- Specify the license to display and graphics to use in our GUI -->
-    <WixVariable Id="WixUILicenseRtf" Value="license.rtf" />
+    <!-- Specify the graphics to use in our GUI -->
     <WixVariable Id="WixUIBannerBmp" Value="Bitmaps\bannrbmp.jpg" />
     <WixVariable Id="WixUIDialogBmp" Value="Bitmaps\dlgbmp.jpg" />
 
diff --git a/build/windows/license.rtf b/build/windows/license.rtf
index fffee21..87a15a8 100644
--- a/build/windows/license.rtf
+++ b/build/windows/license.rtf
@@ -1,5 +1,5 @@
 {\rtf1\ansi\ansicpg1252\deff0\deflang3082\deflangfe3082{\fonttbl{\f0\fswiss\fprq2\fcharset0 Arial;}}
-{\*\generator Msftedit 5.41.15.1515;}\viewkind4\uc1\pard\lang1033\f0\fs20 Banshee itself is MIT/X11 licensed, but this installer contains software licensed under the LGPL and GPL licenses as well.\b\par
+{\*\generator Msftedit 5.41.21.2509;}\viewkind4\uc1\pard\lang1033\f0\fs20 Banshee itself is MIT/X11 licensed, but our installer contains software licensed under the LGPL and GPL licenses as well.\b\par
 \par
 \pard\qc MIT/X11 License\b0\par
 \pard\par