summaryrefslogtreecommitdiff
path: root/windows/AdvancedWelcomeEulaDlg_Custom.wxs
diff options
context:
space:
mode:
authorJohn MacFarlane <jgm@berkeley.edu>2016-06-04 11:34:41 -0700
committerJohn MacFarlane <jgm@berkeley.edu>2016-06-04 11:34:41 -0700
commit146c7a78e551af2f59c95215833f39be5b6c8a67 (patch)
treede6bec9c608cc6779583cfe38de591986977cb86 /windows/AdvancedWelcomeEulaDlg_Custom.wxs
parent64a037141d6730b6282615e28fffda344f1c1211 (diff)
Improved Windows installer (nkalvi, #2708, #2389).
* Scope selection in the first screen. Since I couldn't detect if the user is 'real' admin user, default is still per user. * Scope is limited to per machine on servers. Though not perfect (couldn't detect `DisableMSI` policy), it should handle #2389 better. * For per machine, location can be changed by selecting Advanced. Localization: modified templates from WiX toolkit support localization very well. A short sample localization file for en-us is used. * Dialog elements are moved to their own files.
Diffstat (limited to 'windows/AdvancedWelcomeEulaDlg_Custom.wxs')
-rw-r--r--windows/AdvancedWelcomeEulaDlg_Custom.wxs90
1 files changed, 90 insertions, 0 deletions
diff --git a/windows/AdvancedWelcomeEulaDlg_Custom.wxs b/windows/AdvancedWelcomeEulaDlg_Custom.wxs
new file mode 100644
index 000000000..61e6d8e00
--- /dev/null
+++ b/windows/AdvancedWelcomeEulaDlg_Custom.wxs
@@ -0,0 +1,90 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ <copyright file="AdvancedWelcomeEulaDlg.wxs" company="Outercurve Foundation">
+ Copyright (c) 2004, Outercurve Foundation.
+ This software is released under Microsoft Reciprocal License (MS-RL).
+ The license and further copyright text can be found in the file
+ LICENSE.TXT at the root directory of the distribution.
+ </copyright>
+-->
+<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
+ <Fragment>
+ <UI>
+ <Dialog Id="AdvancedWelcomeEulaDlg_Custom" Width="370" Height="270" Title="!(loc.AdvancedWelcomeEulaDlg_Title)">
+
+ <Control Id="BannerBitmap" Type="Bitmap" X="0" Y="0" Width="370" Height="44" TabSkip="no" Text="!(loc.AdvancedWelcomeEulaDlgBannerBitmap)" />
+ <Control Id="BottomLine" Type="Line" X="0" Y="234" Width="370" Height="0" />
+ <Control Id="Title" Type="Text" X="20" Y="10" Width="300" Height="24" Transparent="yes" NoPrefix="yes" Text="!(loc.AdvancedWelcomeEulaDlgTitle)" />
+
+ <Control Id="LicenseAcceptedCheckBox" Type="CheckBox" X="20" Y="140" Width="226" Height="19" CheckBoxValue="1" Property="LicenseAccepted" Text="!(loc.WelcomeEulaDlgLicenseAcceptedCheckBox)" />
+
+ <Control Id="ScopeGroupBox" Type="GroupBox" X="20" Y="155" Height="70" Width="330" />
+
+ <Control Id="AllUsersCheckBox" Type="CheckBox" X="88" Y="200" Width="226" Height="18" CheckBoxValue="1" Property="ALLUSERS" Text="!(loc.InstallScopeDlgPerMachine)">
+ <Condition Action="enable">LicenseAccepted AND (WixUISupportPerUser = 1)</Condition>
+ <Condition Action="disable">(NOT LicenseAccepted) OR (WixUISupportPerUser = 0)</Condition>
+ </Control>
+
+ <Control Id="PerUserDescription" Type="Text" X="30" Y="167" Width="300" Height="36" NoPrefix="yes" Text="!(loc.InstallScopeDlgPerUserDescription)">
+ <Condition Action="hide">ALLUSERS</Condition>
+ <Condition Action="show">NOT (ALLUSERS = 1)</Condition>
+ <Condition Action="disable">NOT LicenseAccepted</Condition>
+ <Condition Action="enable">LicenseAccepted</Condition>
+ </Control>
+
+ <Control Id="PerMachineDescription" Type="Text" X="30" Y="167" Width="300" Height="36" Hidden="yes" NoPrefix="yes" Text="!(loc.InstallScopeDlgPerMachineDescription)">
+ <Condition Action="hide">NOT (ALLUSERS = 1)</Condition>
+ <Condition Action="show">ALLUSERS = 1</Condition>
+ <Condition Action="disable">NOT LicenseAccepted</Condition>
+ <Condition Action="enable">LicenseAccepted</Condition>
+ </Control>
+
+ <Control Id="Print" Type="PushButton" X="88" Y="243" Width="56" Height="17" Text="!(loc.WixUIPrint)">
+ <Publish Event="DoAction" Value="WixUIPrintEula">1</Publish>
+ </Control>
+
+ <Control Id="Advanced" Type="PushButton" X="156" Y="243" Width="56" Height="17" Text="!(loc.AdvancedWelcomeEulaDlgAdvanced)">
+ <Condition Action="disable">NOT LicenseAccepted OR NOT (ALLUSERS = 1)</Condition>
+ <Condition Action="enable">(LicenseAccepted = "1") AND (ALLUSERS = 1)</Condition>
+ </Control>
+
+ <Control Id="Install" Type="PushButton" ElevationShield="yes" X="212" Y="243" Width="80" Height="17" Default="yes" Text="!(loc.AdvancedWelcomeEulaDlgInstall)" Hidden="yes">
+ <Publish Event="SpawnWaitDialog" Value="WaitForCostingDlg">!(wix.WixUICostingPopupOptOut) OR CostingComplete = 1</Publish>
+ <Publish Event="EndDialog" Value="Return"><![CDATA[OutOfDiskSpace <> 1]]></Publish>
+ <Publish Event="SpawnDialog" Value="OutOfRbDiskDlg">OutOfDiskSpace = 1 AND OutOfNoRbDiskSpace = 0 AND (PROMPTROLLBACKCOST="P" OR NOT PROMPTROLLBACKCOST)</Publish>
+ <Publish Event="EndDialog" Value="Return">OutOfDiskSpace = 1 AND OutOfNoRbDiskSpace = 0 AND PROMPTROLLBACKCOST="D"</Publish>
+ <Publish Event="EnableRollback" Value="False">OutOfDiskSpace = 1 AND OutOfNoRbDiskSpace = 0 AND PROMPTROLLBACKCOST="D"</Publish>
+ <Publish Event="SpawnDialog" Value="OutOfDiskDlg">(OutOfDiskSpace = 1 AND OutOfNoRbDiskSpace = 1) OR (OutOfDiskSpace = 1 AND PROMPTROLLBACKCOST="F")</Publish>
+ <Condition Action="disable">NOT LicenseAccepted</Condition>
+ <Condition Action="enable">LicenseAccepted = "1"</Condition>
+ <Condition Action="show">ALLUSERS = 1</Condition>
+ <Condition Action="hide">NOT (ALLUSERS = 1)</Condition>
+ </Control>
+ <Control Id="InstallNoShield" Type="PushButton" ElevationShield="no" X="212" Y="243" Width="80" Height="17" Default="yes" Text="!(loc.AdvancedWelcomeEulaDlgInstall)" Hidden="yes">
+ <Publish Event="SpawnWaitDialog" Value="WaitForCostingDlg">!(wix.WixUICostingPopupOptOut) OR CostingComplete = 1</Publish>
+ <Publish Event="EndDialog" Value="Return"><![CDATA[OutOfDiskSpace <> 1]]></Publish>
+ <Publish Event="SpawnDialog" Value="OutOfRbDiskDlg">OutOfDiskSpace = 1 AND OutOfNoRbDiskSpace = 0 AND (PROMPTROLLBACKCOST="P" OR NOT PROMPTROLLBACKCOST)</Publish>
+ <Publish Event="EndDialog" Value="Return">OutOfDiskSpace = 1 AND OutOfNoRbDiskSpace = 0 AND PROMPTROLLBACKCOST="D"</Publish>
+ <Publish Event="EnableRollback" Value="False">OutOfDiskSpace = 1 AND OutOfNoRbDiskSpace = 0 AND PROMPTROLLBACKCOST="D"</Publish>
+ <Publish Event="SpawnDialog" Value="OutOfDiskDlg">(OutOfDiskSpace = 1 AND OutOfNoRbDiskSpace = 1) OR (OutOfDiskSpace = 1 AND PROMPTROLLBACKCOST="F")</Publish>
+ <Condition Action="disable">NOT LicenseAccepted</Condition>
+ <Condition Action="enable">LicenseAccepted = "1"</Condition>
+ <Condition Action="show">NOT (ALLUSERS = 1)</Condition>
+ <Condition Action="hide">ALLUSERS = 1</Condition>
+ </Control>
+
+ <Control Id="Cancel" Type="PushButton" X="304" Y="243" Width="56" Height="17" Cancel="yes" Text="!(loc.WixUICancel)">
+ <Publish Event="SpawnDialog" Value="CancelDlg">1</Publish>
+ </Control>
+ <Control Id="LicenseText" Type="ScrollableText" X="20" Y="55" Width="330" Height="80" Sunken="yes" TabSkip="no">
+ <!--<Text SourceFile="!(wix.WixUILicenseRtf=$(var.licenseRtf))" />-->
+ <Text SourceFile="!(loc.LicenseRtf)" />
+ </Control>
+ </Dialog>
+ </UI>
+
+ <InstallUISequence>
+ <Show Dialog="AdvancedWelcomeEulaDlg_Custom" Before="ProgressDlg">NOT Installed</Show>
+ </InstallUISequence>
+ </Fragment>
+</Wix> \ No newline at end of file