diff options
| author | Bob Arnson <bob@firegiant.com> | 2022-08-01 18:16:08 -0400 |
|---|---|---|
| committer | Bob Arnson <github@bobs.org> | 2022-08-03 14:25:36 -0400 |
| commit | b6507f65c183c0b0bd165900bcefe6c3ea15b935 (patch) | |
| tree | a8134be57add94265305f5926ff2bcdfb8794e45 /src/ext/Bal | |
| parent | 7e2a9522351c58c45c7185f9e97b3b2faf1f9c90 (diff) | |
| download | wix-b6507f65c183c0b0bd165900bcefe6c3ea15b935.tar.gz wix-b6507f65c183c0b0bd165900bcefe6c3ea15b935.tar.bz2 wix-b6507f65c183c0b0bd165900bcefe6c3ea15b935.zip | |
Handle suppressed Options button.
Fixes https://github.com/wixtoolset/issues/issues/5624.
Diffstat (limited to 'src/ext/Bal')
| -rw-r--r-- | src/ext/Bal/wixstdba/Resources/HyperlinkLargeTheme.xml | 3 | ||||
| -rw-r--r-- | src/ext/Bal/wixstdba/Resources/HyperlinkSidebarTheme.xml | 3 | ||||
| -rw-r--r-- | src/ext/Bal/wixstdba/Resources/HyperlinkTheme.wxl | 3 |
3 files changed, 6 insertions, 3 deletions
diff --git a/src/ext/Bal/wixstdba/Resources/HyperlinkLargeTheme.xml b/src/ext/Bal/wixstdba/Resources/HyperlinkLargeTheme.xml index 39a38ee0..beb75cca 100644 --- a/src/ext/Bal/wixstdba/Resources/HyperlinkLargeTheme.xml +++ b/src/ext/Bal/wixstdba/Resources/HyperlinkLargeTheme.xml | |||
| @@ -22,7 +22,8 @@ | |||
| 22 | </Page> | 22 | </Page> |
| 23 | <Page Name="Install"> | 23 | <Page Name="Install"> |
| 24 | <Label X="11" Y="80" Width="-11" Height="30" FontId="2" DisablePrefix="yes">#(loc.InstallHeader)</Label> | 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> | ||
| 26 | <Hypertext Name="EulaHyperlink" X="11" Y="-107" Width="-11" Height="17" TabStop="yes" FontId="3" HideWhenDisabled="yes">#(loc.InstallLicenseLinkText)</Hypertext> | 27 | <Hypertext Name="EulaHyperlink" X="11" Y="-107" Width="-11" Height="17" TabStop="yes" FontId="3" HideWhenDisabled="yes">#(loc.InstallLicenseLinkText)</Hypertext> |
| 27 | <Label Name="InstallVersion" X="11" Y="-73" Width="246" Height="17" FontId="3" DisablePrefix="yes" VisibleCondition="WixStdBAShowVersion">#(loc.InstallVersion)</Label> | 28 | <Label Name="InstallVersion" X="11" Y="-73" Width="246" Height="17" FontId="3" DisablePrefix="yes" VisibleCondition="WixStdBAShowVersion">#(loc.InstallVersion)</Label> |
| 28 | <Checkbox Name="EulaAcceptCheckbox" X="-11" Y="-41" Width="260" Height="17" TabStop="yes" FontId="3" HideWhenDisabled="yes">#(loc.InstallAcceptCheckbox)</Checkbox> | 29 | <Checkbox Name="EulaAcceptCheckbox" X="-11" Y="-41" Width="260" Height="17" TabStop="yes" FontId="3" HideWhenDisabled="yes">#(loc.InstallAcceptCheckbox)</Checkbox> |
diff --git a/src/ext/Bal/wixstdba/Resources/HyperlinkSidebarTheme.xml b/src/ext/Bal/wixstdba/Resources/HyperlinkSidebarTheme.xml index d9076a5d..3365a292 100644 --- a/src/ext/Bal/wixstdba/Resources/HyperlinkSidebarTheme.xml +++ b/src/ext/Bal/wixstdba/Resources/HyperlinkSidebarTheme.xml | |||
| @@ -23,7 +23,8 @@ | |||
| 23 | <Label X="185" Y="11" Width="-11" Height="32" FontId="1" DisablePrefix="yes">#(loc.Title)</Label> | 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"/> | 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> | 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> | ||
| 27 | <Hypertext Name="EulaHyperlink" X="185" Y="-111" Width="-11" Height="17" TabStop="yes" FontId="3" HideWhenDisabled="yes">#(loc.InstallLicenseLinkText)</Hypertext> | 28 | <Hypertext Name="EulaHyperlink" X="185" Y="-111" Width="-11" Height="17" TabStop="yes" FontId="3" HideWhenDisabled="yes">#(loc.InstallLicenseLinkText)</Hypertext> |
| 28 | <Label Name="InstallVersion" X="185" Y="-81" Width="-11" Height="17" FontId="3" DisablePrefix="yes" VisibleCondition="WixStdBAShowVersion">#(loc.InstallVersion)</Label> | 29 | <Label Name="InstallVersion" X="185" Y="-81" Width="-11" Height="17" FontId="3" DisablePrefix="yes" VisibleCondition="WixStdBAShowVersion">#(loc.InstallVersion)</Label> |
| 29 | <Checkbox Name="EulaAcceptCheckbox" X="185" Y="-51" Width="-11" Height="17" TabStop="yes" FontId="3" HideWhenDisabled="yes">#(loc.InstallAcceptCheckbox)</Checkbox> | 30 | <Checkbox Name="EulaAcceptCheckbox" X="185" Y="-51" Width="-11" Height="17" TabStop="yes" FontId="3" HideWhenDisabled="yes">#(loc.InstallAcceptCheckbox)</Checkbox> |
diff --git a/src/ext/Bal/wixstdba/Resources/HyperlinkTheme.wxl b/src/ext/Bal/wixstdba/Resources/HyperlinkTheme.wxl index cb1f8da4..8d222a3b 100644 --- a/src/ext/Bal/wixstdba/Resources/HyperlinkTheme.wxl +++ b/src/ext/Bal/wixstdba/Resources/HyperlinkTheme.wxl | |||
| @@ -6,7 +6,8 @@ | |||
| 6 | <String Id="Caption">[WixBundleName] Setup</String> | 6 | <String Id="Caption">[WixBundleName] Setup</String> |
| 7 | <String Id="Title">[WixBundleName]</String> | 7 | <String Id="Title">[WixBundleName]</String> |
| 8 | <String Id="InstallHeader">Welcome</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> | ||
| 10 | <String Id="InstallVersion">Version [WixBundleVersion]</String> | 11 | <String Id="InstallVersion">Version [WixBundleVersion]</String> |
| 11 | <String Id="ConfirmCancelMessage">Are you sure you want to cancel?</String> | 12 | <String Id="ConfirmCancelMessage">Are you sure you want to cancel?</String> |
| 12 | <String Id="ExecuteUpgradeRelatedBundleMessage">Previous version</String> | 13 | <String Id="ExecuteUpgradeRelatedBundleMessage">Previous version</String> |