Added:
trunk/Installer/ui.wxs
Modified:
trunk/Installer/Installer.wixproj
trunk/Installer/main.wxs
Log:
removed the license agreement dialog
Modified: trunk/Installer/Installer.wixproj
===================================================================
--- trunk/Installer/Installer.wixproj 2007-05-23 15:29:32 UTC (rev 737)
+++ trunk/Installer/Installer.wixproj 2007-05-23 19:44:46 UTC (rev 738)
@@ -100,6 +100,7 @@
<Compile Include="compactframework.wxs" />
<Compile Include="main.wxs" />
<Compile Include="samples.wxs" />
+ <Compile Include="ui.wxs" />
<Compile Include="visualstudio.wxs" />
<Compile Include="webproviders.wxs" />
</ItemGroup>
Modified: trunk/Installer/main.wxs
===================================================================
--- trunk/Installer/main.wxs 2007-05-23 15:29:32 UTC (rev 737)
+++ trunk/Installer/main.wxs 2007-05-23 19:44:46 UTC (rev 738)
@@ -111,12 +111,8 @@
<FeatureRef Id="CompactFramework"/>
<Property Id="WIXUI_INSTALLDIR" Value='INSTALLDIR'/>
- <UIRef Id="WixUI_Mondo"/>
- <?if $(var.IsGPL) = 1 ?>
- <WixVariable Id="WixUILicenseRtf" Value="GPL.rtf"/>
- <?else?>
- <WixVariable Id="WixUILicenseRtf" Value="EULA.rtf"/>
- <?endif?>
+ <!-- Remove the license agreement dialog -->
+ <UIRef Id="WixUI_MySQL"/>
<WixVariable Id="WixUIBannerBmp" Value="Bitmaps/BannrBmp.bmp"/>
<WixVariable Id="WixUIDialogBmp" Value="Bitmaps/DlgBmp.bmp"/>
Added: trunk/Installer/ui.wxs
===================================================================
--- trunk/Installer/ui.wxs 2007-05-23 15:29:32 UTC (rev 737)
+++ trunk/Installer/ui.wxs 2007-05-23 19:44:46 UTC (rev 738)
@@ -0,0 +1,49 @@
+<?xml version="1.0"?>
+<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
+ <Fragment>
+ <UI Id="WixUI_MySQL">
+ <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="Mondo" />
+
+ <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="ExitDialog" Control="Finish" Event="EndDialog" Value="Return" Order="999">1</Publish>
+
+ <Publish Dialog="WelcomeDlg" Control="Next" Event="NewDialog" Value="SetupTypeDlg">1</Publish>
+
+ <Publish Dialog="SetupTypeDlg" Control="Back" Event="NewDialog" Value="WelcomeDlg">1</Publish>
+ <Publish Dialog="SetupTypeDlg" Control="TypicalButton" Event="NewDialog" Value="VerifyReadyDlg">1</Publish>
+ <Publish Dialog="SetupTypeDlg" Control="CustomButton" Event="NewDialog" Value="CustomizeDlg">1</Publish>
+ <Publish Dialog="SetupTypeDlg" Control="CompleteButton" Event="NewDialog" Value="VerifyReadyDlg">1</Publish>
+
+ <Publish Dialog="CustomizeDlg" Control="Back" Event="NewDialog" Value="MaintenanceTypeDlg" Order="1">WixUI_InstallMode = "Change"</Publish>
+ <Publish Dialog="CustomizeDlg" Control="Back" Event="NewDialog" Value="SetupTypeDlg" Order="2">WixUI_InstallMode = "InstallCustom"</Publish>
+ <Publish Dialog="CustomizeDlg" Control="Next" Event="NewDialog" Value="VerifyReadyDlg">1</Publish>
+
+ <Publish Dialog="VerifyReadyDlg" Control="Back" Event="NewDialog" Value="CustomizeDlg" Order="1">WixUI_InstallMode = "InstallCustom"</Publish>
+ <Publish Dialog="VerifyReadyDlg" Control="Back" Event="NewDialog" Value="SetupTypeDlg" Order="2">WixUI_InstallMode = "InstallTypical" OR WixUI_InstallMode = "InstallComplete"</Publish>
+ <Publish Dialog="VerifyReadyDlg" Control="Back" Event="NewDialog" Value="CustomizeDlg" Order="3">WixUI_InstallMode = "Change"</Publish>
+ <Publish Dialog="VerifyReadyDlg" Control="Back" Event="NewDialog" Value="MaintenanceTypeDlg" Order="4">WixUI_InstallMode = "Repair" OR WixUI_InstallMode = "Remove"</Publish>
+
+ <Publish Dialog="MaintenanceWelcomeDlg" Control="Next" Event="NewDialog" Value="MaintenanceTypeDlg">1</Publish>
+
+ <Publish Dialog="MaintenanceTypeDlg" Control="ChangeButton" Event="NewDialog" Value="CustomizeDlg">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>
+ </UI>
+
+ <UIRef Id="WixUI_Common" />
+ </Fragment>
+</Wix>
\ No newline at end of file
| Thread |
|---|
| • Connector/NET commit: r738 - trunk/Installer | rburnett | 23 May |
