@joebigelow / wix-1 / commits / b6507f65

Handle suppressed Options button.

Fixes https://github.com/wixtoolset/issues/issues/5624.

Bob Arnson committed Aug 1, 2022 at 18:16 UTC b6507f65c183c0b0bd165900bcefe6c3ea15b935
4 files changed +7 -4
src/ext/Bal/wixstdba/Resources/HyperlinkLargeTheme.xml
+2 -1
@@ -22,7 +22,8 @@
22 </Page>
23 <Page Name="Install">
24 <Label X="11" Y="80" Width="-11" Height="30" FontId="2" DisablePrefix="yes">#(loc.InstallHeader)</Label>
25 - <Label X="11" Y="121" Width="-11" Height="-129" FontId="3" DisablePrefix="yes">#(loc.InstallMessage)</Label>
25 + <Label X="11" Y="121" Width="-11" Height="-129" FontId="3" VisibleCondition="WixStdBASuppressOptionsUI" DisablePrefix="yes">#(loc.InstallMessage)</Label>
26 + <Label X="11" Y="121" Width="-11" Height="-129" FontId="3" VisibleCondition="NOT WixStdBASuppressOptionsUI" DisablePrefix="yes">#(loc.InstallMessageOptions)</Label>
27 <Hypertext Name="EulaHyperlink" X="11" Y="-107" Width="-11" Height="17" TabStop="yes" FontId="3" HideWhenDisabled="yes">#(loc.InstallLicenseLinkText)</Hypertext>
28 <Label Name="InstallVersion" X="11" Y="-73" Width="246" Height="17" FontId="3" DisablePrefix="yes" VisibleCondition="WixStdBAShowVersion">#(loc.InstallVersion)</Label>
29 <Checkbox Name="EulaAcceptCheckbox" X="-11" Y="-41" Width="260" Height="17" TabStop="yes" FontId="3" HideWhenDisabled="yes">#(loc.InstallAcceptCheckbox)</Checkbox>
src/ext/Bal/wixstdba/Resources/HyperlinkSidebarTheme.xml
+2 -1
@@ -23,7 +23,8 @@
23 <Label X="185" Y="11" Width="-11" Height="32" FontId="1" DisablePrefix="yes">#(loc.Title)</Label>
24 <ImageControl X="11" Y="11" Width="165" Height="400" ImageFile="logoside.png"/>
25 <Label X="185" Y="50" Width="-11" Height="32" FontId="2" DisablePrefix="yes">#(loc.InstallHeader)</Label>
26 - <Label X="185" Y="91" Width="-11" Height="64" FontId="3" DisablePrefix="yes">#(loc.InstallMessage)</Label>
26 + <Label X="185" Y="91" Width="-11" Height="64" FontId="3" VisibleCondition="WixStdBASuppressOptionsUI" DisablePrefix="yes">#(loc.InstallMessage)</Label>
27 + <Label X="185" Y="91" Width="-11" Height="64" FontId="3" VisibleCondition="NOT WixStdBASuppressOptionsUI" DisablePrefix="yes">#(loc.InstallMessageOptions)</Label>
28 <Hypertext Name="EulaHyperlink" X="185" Y="-111" Width="-11" Height="17" TabStop="yes" FontId="3" HideWhenDisabled="yes">#(loc.InstallLicenseLinkText)</Hypertext>
29 <Label Name="InstallVersion" X="185" Y="-81" Width="-11" Height="17" FontId="3" DisablePrefix="yes" VisibleCondition="WixStdBAShowVersion">#(loc.InstallVersion)</Label>
30 <Checkbox Name="EulaAcceptCheckbox" X="185" Y="-51" Width="-11" Height="17" TabStop="yes" FontId="3" HideWhenDisabled="yes">#(loc.InstallAcceptCheckbox)</Checkbox>
src/ext/Bal/wixstdba/Resources/HyperlinkTheme.wxl
+2 -1
@@ -6,7 +6,8 @@
6 <String Id="Caption">[WixBundleName] Setup</String>
7 <String Id="Title">[WixBundleName]</String>
8 <String Id="InstallHeader">Welcome</String>
9 - <String Id="InstallMessage">Setup will install [WixBundleName] on your computer. Click install to continue, options to set the install directory or Close to exit.</String>
9 + <String Id="InstallMessage">Setup will install [WixBundleName] on your computer. Click Install to continue or Cancel to exit.</String>
10 + <String Id="InstallMessageOptions">Setup will install [WixBundleName] on your computer. Click Install to continue, Options to set installation options, or Cancel to exit.</String>
11 <String Id="InstallVersion">Version [WixBundleVersion]</String>
12 <String Id="ConfirmCancelMessage">Are you sure you want to cancel?</String>
13 <String Id="ExecuteUpgradeRelatedBundleMessage">Previous version</String>
src/test/burn/TestData/WixStdBaTests/BundleA/Bundle.wxs
+1 -1
@@ -7,7 +7,7 @@
7 <Variable Name="TestGroupName" Value="$(var.TestGroupName)" />
8
9 <BootstrapperApplication>
10 - <bal:WixStandardBootstrapperApplication LicenseUrl="" Theme="hyperlinkLicense" SuppressDowngradeFailure="yes" />
10 + <bal:WixStandardBootstrapperApplication LicenseUrl="" Theme="hyperlinkLargeLicense" SuppressOptionsUI="yes" SuppressDowngradeFailure="yes" />
11 </BootstrapperApplication>
12
13 <Chain>