Skip to content

fix: Update the MSI UI to clean up formatting and readability issues. #1748

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Jun 27, 2023
Merged

fix: Update the MSI UI to clean up formatting and readability issues. #1748

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f6e5e86
fix: Update license font in MSI to better fit inside UI.
jaffinito Jun 27, 2023
254887d
fix: Update the MSI feature selection to improve readability.
jaffinito Jun 27, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions licenses/LICENSE.rtf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
{\rtf1\ansi\deff0\nouicompat{\fonttbl{\f0\fnil\fcharset0 Courier New;}}
{\rtf1\ansi\ansicpg1252\deff0\nouicompat{\fonttbl{\f0\fnil\fcharset0 Arial;}}
{\colortbl ;\red0\green0\blue255;}
{\*\generator Riched20 10.0.19041}\viewkind4\uc1
\pard\f0\fs22\lang1033 Apache License\par
{\*\generator Riched20 10.0.22621}\viewkind4\uc1
\pard\fs16\lang1033 Apache License\par
Version 2.0, January 2004\par
{{\field{\*\fldinst{HYPERLINK http://www.apache.org/licenses/ }}{\fldrslt{http://www.apache.org/licenses/\ul0\cf0}}}}\f0\fs22\par
{{\field{\*\fldinst{HYPERLINK http://www.apache.org/licenses/ }}{\fldrslt{http://www.apache.org/licenses/\ul0\cf0}}}}\f0\fs16\par
\par
TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION\par
\par
Expand Down Expand Up @@ -195,7 +195,7 @@
you may not use this file except in compliance with the License.\par
You may obtain a copy of the License at\par
\par
{{\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
{{\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
\par
Unless required by applicable law or agreed to in writing, software\par
distributed under the License is distributed on an "AS IS" BASIS,\par
Expand Down
2 changes: 1 addition & 1 deletion src/Agent/MsiInstaller/Installer/LicenseKeyDialog.wxs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ SPDX-License-Identifier: Apache-2.0
<Publish Event="NewDialog" Value="LicenseAgreementDlg">1</Publish>
</Control>
<Control Id="Next" Type="PushButton" X="236" Y="243" Width="56" Height="17" Default="yes" Text="&amp;Next">
<Publish Event="NewDialog" Value="CustomizeDlg"><![CDATA[NR_LICENSE_KEY <> " "]]></Publish>
<Publish Event="NewDialog" Value="FeaturesDlg"><![CDATA[NR_LICENSE_KEY <> " "]]></Publish>
</Control>
<Control Id="Cancel" Type="PushButton" X="304" Y="243" Width="56" Height="17" Cancel="yes" Text="Cancel">
<Publish Event="SpawnDialog" Value="CancelDlg">1</Publish>
Expand Down
6 changes: 3 additions & 3 deletions src/Agent/MsiInstaller/Installer/WizardUI.wxs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,13 +14,13 @@ SPDX-License-Identifier: Apache-2.0
<!-- Try to get the license key from a previous install. -->
<Publish Dialog="LicenseAgreementDlg" Control="Next" Event="DoAction" Value="FindPreviousLicenseKey" Order="1">1</Publish>
<!-- 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). -->
<Publish Dialog="LicenseAgreementDlg" Control="Next" Event="NewDialog" Value="CustomizeDlg" Order="2">PREVLICENSEKEYFOUND AND LicenseAccepted = "1"</Publish>
<Publish Dialog="LicenseAgreementDlg" Control="Next" Event="NewDialog" Value="FeaturesDlg" Order="2">PREVLICENSEKEYFOUND AND LicenseAccepted = "1"</Publish>
<!-- If a previous license key was not found then prompt for the license key next. -->
<Publish Dialog="LicenseAgreementDlg" Control="Next" Event="NewDialog" Value="LicenseKeyDialog" Order="3">NOT PREVLICENSEKEYFOUND AND LicenseAccepted = "1"</Publish>
<!-- If a previous license key was not found then the back button from customize goes to the license key dialog. -->
<Publish Dialog="CustomizeDlg" Control="Back" Event="NewDialog" Value="LicenseKeyDialog" Order="2">NOT Installed AND NOT PREVLICENSEKEYFOUND</Publish>
<Publish Dialog="FeaturesDlg" Control="Back" Event="NewDialog" Value="LicenseKeyDialog" Order="2">NOT Installed AND NOT PREVLICENSEKEYFOUND</Publish>
<!-- If a previous license key was found then the back button from customize goes to the license agreement dialog. -->
<Publish Dialog="CustomizeDlg" Control="Back" Event="NewDialog" Value="LicenseAgreementDlg" Order="2">NOT Installed AND PREVLICENSEKEYFOUND</Publish>
<Publish Dialog="FeaturesDlg" Control="Back" Event="NewDialog" Value="LicenseAgreementDlg" Order="2">NOT Installed AND PREVLICENSEKEYFOUND</Publish>
</UI>
</Fragment>
</Wix>