Merge lp:~mandel/ubuntuone-windows-installer/remove_license into lp:ubuntuone-windows-installer/beta

[Manuel de la Peña]

Do a custom modification to the minimal ui from the msi to remove the EULA agreement since the user has to agree to it when he joins the service.

[Stuart Colville (muffinresearch)]

review: Approve

[Rick McBride (rmcbride)]

review: Approve

=== modified file 'install/UbuntuOne.wxs'
--- install/UbuntuOne.wxs	2010-09-01 14:47:38 +0000
+++ install/UbuntuOne.wxs	2010-09-01 14:47:38 +0000
@@ -1087,12 +1087,44 @@
             <ComponentRef Id="Msvcr90Component" />
 		</Feature>
         
-        <UIRef Id="WixUI_Minimal"/>
+        <UI Id="WixUI_Minimal_No_License">
+            <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="Minimal" />
+
+            <DialogRef Id="ErrorDlg" />
+            <DialogRef Id="FatalError" />
+            <DialogRef Id="FilesInUse" />
+            <DialogRef Id="MsiRMFilesInUse" />
+            <DialogRef Id="PrepareDlg" />
+            <DialogRef Id="ProgressDlg" />
+            <DialogRef Id="ResumeDlg" />
+            <DialogRef Id="UserExit" />
+            <DialogRef Id="WelcomeDlg" />
+
+            <Publish Dialog="ExitDialog" Control="Finish" Event="EndDialog" Value="Return" Order="999">1</Publish>
+
+            <Publish Dialog="VerifyReadyDlg" Control="Back" Event="NewDialog" Value="MaintenanceTypeDlg">1</Publish>
+
+            <Publish Dialog="WelcomeDlg" Control="Next" Event="NewDialog" Value="PrepareDlg">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="WelcomeDlg">1</Publish>
+
+            <Property Id="ARPNOMODIFY" Value="1" />
+        </UI>
+        
+        <UIRef Id="WixUI_Common" />
+        <UIRef Id="WixUI_Minimal_No_License"/>
 		<UIRef Id="WixUI_ErrorProgressText" />
 		
 		<!-- UI settings, to be defined by the design team -->
-		<!-- <WixVariable Id="WixUILicenseRtf" Value="path\License.rtf" />
-		<WixVariable Id="WixUIBannerBmp" Value="path\banner.bmp" />
+		
+		<!--  <WixVariable Id="WixUIBannerBmp" Value="path\banner.bmp" />
 		<WixVariable Id="WixUIDialogBmp" Value="path\dialog.bmp" />
 		<WixVariable Id="WixUIExclamationIco" Value="path\exclamation.ico" />
 		<WixVariable Id="WixUIInfoIco" Value="path\information.ico" />