Skip to content

Commit 3fbc543

Browse files
authored
fix: Update the MSI UI to clean up formatting and readability issues. (#1748)
1 parent a695ce6 commit 3fbc543

File tree

3 files changed

+9
-9
lines changed

3 files changed

+9
-9
lines changed

licenses/LICENSE.rtf

+5-5
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
{\rtf1\ansi\deff0\nouicompat{\fonttbl{\f0\fnil\fcharset0 Courier New;}}
1+
{\rtf1\ansi\ansicpg1252\deff0\nouicompat{\fonttbl{\f0\fnil\fcharset0 Arial;}}
22
{\colortbl ;\red0\green0\blue255;}
3-
{\*\generator Riched20 10.0.19041}\viewkind4\uc1
4-
\pard\f0\fs22\lang1033 Apache License\par
3+
{\*\generator Riched20 10.0.22621}\viewkind4\uc1
4+
\pard\fs16\lang1033 Apache License\par
55
Version 2.0, January 2004\par
6-
{{\field{\*\fldinst{HYPERLINK http://www.apache.org/licenses/ }}{\fldrslt{http://www.apache.org/licenses/\ul0\cf0}}}}\f0\fs22\par
6+
{{\field{\*\fldinst{HYPERLINK http://www.apache.org/licenses/ }}{\fldrslt{http://www.apache.org/licenses/\ul0\cf0}}}}\f0\fs16\par
77
\par
88
TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION\par
99
\par
@@ -195,7 +195,7 @@
195195
you may not use this file except in compliance with the License.\par
196196
You may obtain a copy of the License at\par
197197
\par
198-
{{\field{\*\fldinst{HYPERLINK http://www.apache.org/licenses/LICENSE-2.0 }}{\fldrslt{http://www.apache.org/licenses/LICENSE-2.0\ul0\cf0}}}}\f0\fs22\par
198+
{{\field{\*\fldinst{HYPERLINK http://www.apache.org/licenses/LICENSE-2.0 }}{\fldrslt{http://www.apache.org/licenses/LICENSE-2.0\ul0\cf0}}}}\f0\fs16\par
199199
\par
200200
Unless required by applicable law or agreed to in writing, software\par
201201
distributed under the License is distributed on an "AS IS" BASIS,\par

src/Agent/MsiInstaller/Installer/LicenseKeyDialog.wxs

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ SPDX-License-Identifier: Apache-2.0
2323
<Publish Event="NewDialog" Value="LicenseAgreementDlg">1</Publish>
2424
</Control>
2525
<Control Id="Next" Type="PushButton" X="236" Y="243" Width="56" Height="17" Default="yes" Text="&amp;Next">
26-
<Publish Event="NewDialog" Value="CustomizeDlg"><![CDATA[NR_LICENSE_KEY <> " "]]></Publish>
26+
<Publish Event="NewDialog" Value="FeaturesDlg"><![CDATA[NR_LICENSE_KEY <> " "]]></Publish>
2727
</Control>
2828
<Control Id="Cancel" Type="PushButton" X="304" Y="243" Width="56" Height="17" Cancel="yes" Text="Cancel">
2929
<Publish Event="SpawnDialog" Value="CancelDlg">1</Publish>

src/Agent/MsiInstaller/Installer/WizardUI.wxs

+3-3
Original file line numberDiff line numberDiff line change
@@ -14,13 +14,13 @@ SPDX-License-Identifier: Apache-2.0
1414
<!-- Try to get the license key from a previous install. -->
1515
<Publish Dialog="LicenseAgreementDlg" Control="Next" Event="DoAction" Value="FindPreviousLicenseKey" Order="1">1</Publish>
1616
<!-- If there was a previous license key found and they have accepted the agreement, then go on to the customize dialog (skip license key input). -->
17-
<Publish Dialog="LicenseAgreementDlg" Control="Next" Event="NewDialog" Value="CustomizeDlg" Order="2">PREVLICENSEKEYFOUND AND LicenseAccepted = "1"</Publish>
17+
<Publish Dialog="LicenseAgreementDlg" Control="Next" Event="NewDialog" Value="FeaturesDlg" Order="2">PREVLICENSEKEYFOUND AND LicenseAccepted = "1"</Publish>
1818
<!-- If a previous license key was not found then prompt for the license key next. -->
1919
<Publish Dialog="LicenseAgreementDlg" Control="Next" Event="NewDialog" Value="LicenseKeyDialog" Order="3">NOT PREVLICENSEKEYFOUND AND LicenseAccepted = "1"</Publish>
2020
<!-- If a previous license key was not found then the back button from customize goes to the license key dialog. -->
21-
<Publish Dialog="CustomizeDlg" Control="Back" Event="NewDialog" Value="LicenseKeyDialog" Order="2">NOT Installed AND NOT PREVLICENSEKEYFOUND</Publish>
21+
<Publish Dialog="FeaturesDlg" Control="Back" Event="NewDialog" Value="LicenseKeyDialog" Order="2">NOT Installed AND NOT PREVLICENSEKEYFOUND</Publish>
2222
<!-- If a previous license key was found then the back button from customize goes to the license agreement dialog. -->
23-
<Publish Dialog="CustomizeDlg" Control="Back" Event="NewDialog" Value="LicenseAgreementDlg" Order="2">NOT Installed AND PREVLICENSEKEYFOUND</Publish>
23+
<Publish Dialog="FeaturesDlg" Control="Back" Event="NewDialog" Value="LicenseAgreementDlg" Order="2">NOT Installed AND PREVLICENSEKEYFOUND</Publish>
2424
</UI>
2525
</Fragment>
2626
</Wix>

0 commit comments

Comments
 (0)