Skip to content

Commit 7165a28

Browse files
wtgodbewtgodbe
committed
UI fixes
1 parent 71246f7 commit 7165a28

File tree

2 files changed

+86
-52
lines changed

2 files changed

+86
-52
lines changed

‎src/Installers/Windows/WindowsHostingBundle/LCID/1033/thm.wxl‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,16 +24,25 @@
2424
<String Id="ModifyRepairButton" Value="&amp;Repair" />
2525
<String Id="ModifyUninstallButton" Value="&amp;Uninstall" />
2626
<String Id="ModifyCloseButton" Value="&amp;Close" />
27+
<String Id="SuccessCacheHeader" Value="Cache Successfully Completed" />
28+
<String Id="SuccessModifyHeader" Value="Modify Successfully Completed" />
2729
<String Id="SuccessRepairHeader" Value="Repair Successfully Completed" />
2830
<String Id="SuccessUninstallHeader" Value="Uninstall Successfully Completed" />
31+
<String Id="SuccessUnsafeUninstallHeader" Value="Uninstall Successfully Completed" />
2932
<String Id="SuccessInstallHeader" Value="Installation Successfully Completed" />
3033
<String Id="SuccessHeader" Value="Setup Successful" />
3134
<String Id="SuccessLaunchButton" Value="&amp;Launch" />
35+
<String Id="SuccessLayoutHeader" Value="Layout Successfully Completed" />
3236
<String Id="SuccessRestartText" Value="You must restart your computer before you can use the software." />
37+
<String Id="SuccessUninstallRestartText" Value="You must restart your computer to complete the removal of the software." />
3338
<String Id="SuccessRestartButton" Value="&amp;Restart" />
3439
<String Id="SuccessCloseButton" Value="&amp;Close" />
3540
<String Id="FailureHeader" Value="Setup Failed" />
41+
<String Id="FailureCacheHeader" Value="Cache Failed" />
42+
<String Id="FailureLayoutHeader" Value="Layout Failed" />
43+
<String Id="FailureModifyHeader" Value="Modify Failed" />
3644
<String Id="FailureInstallHeader" Value="Setup Failed" />
45+
<String Id="FailureUnsafeUninstallHeader" Value="Uninstall Failed" />
3746
<String Id="FailureUninstallHeader" Value="Uninstall Failed" />
3847
<String Id="FailureRepairHeader" Value="Repair Failed" />
3948
<String Id="FailureHyperlinkLogText" Value="One or more issues caused the setup to fail. Please fix the issues and then retry setup. For more information see the &lt;a href=&quot;#&quot;&gt;log file&lt;/a&gt;." />
@@ -46,6 +55,7 @@
4655
<String Id="FilesInUseDontCloseRadioButton" Value="&amp;Do not close applications. A reboot will be required." />
4756
<String Id="FilesInUseOkButton" Value="&amp;OK" />
4857
<String Id="FilesInUseCancelButton" Value="&amp;Cancel" />
58+
<String Id="LicenseAssent" Value="By clicking Install, you agree to the following terms:" />
4959

5060
<!-- Custom UI strings -->
5161
<!--_locComment_text="{Locked='[WixBundleName]'}"-->

‎src/Installers/Windows/WindowsHostingBundle/bundle.thm‎

Lines changed: 76 additions & 52 deletions
Original file line numberDiff line numberDiff line change
@@ -17,83 +17,107 @@
1717
<Text X="80" Y="40" Width="-12" Height="40" FontId="WindowBannerFont" Visible="yes" DisablePrefix="yes">#(loc.SubTitle)</Text>
1818

1919
<Page Name="Help">
20-
<Text X="12" Y="80" Width="-12" Height="32" FontId="PageHeaderFont" DisablePrefix="yes">#(loc.HelpHeader)</Text>
21-
<Text X="12" Y="112" Width="-12" Height="-36" FontId="DefaultFont" DisablePrefix="yes">#(loc.HelpText)</Text>
22-
<Button Name="HelpCancelButton" X="-12" Y="-12" Width="76" Height="24" TabStop="yes" FontId="DefaultFont">
20+
<Label Name="HelpHeader" X="148" Y="80" Width="-12" Height="32" FontId="PageHeaderFont" HexStyle="00000000" DisablePrefix="yes">#(loc.HelpHeader)</Label>
21+
<Label Name="HelpText" X="148" Y="124" Width="-12" Height="-48" FontId="DefaultFont" HexStyle="00000000" DisablePrefix="yes">#(loc.HelpText)</Label>
22+
23+
<Button Name="HelpCancelButton" X="-12" Y="-12" Width="100" Height="24" TabStop="yes" FontId="DefaultFont">
2324
<Text>#(loc.HelpCloseButton)</Text>
2425
<CloseWindowAction/>
2526
</Button>
2627
</Page>
2728
<Page Name="Install">
28-
<Hypertext X="12" Y="90" Width="-12" Height="16" FontId="DefaultFont">#(loc.Welcome)</Hypertext>
29-
<Hypertext X="12" Y="120" Width="-12" Height="44" FontId="DefaultFont" Name="InstallResetIIS" HideWhenDisabled="yes">#(loc.InstallResetIIS)</Hypertext>
30-
<Hypertext X="12" Y="120" Width="-12" Height="44" FontId="DefaultFont" Name="InstallNoIIS" HideWhenDisabled="yes">#(loc.InstallNoIIS)</Hypertext>
31-
<Hypertext Name="EulaAndPrivacyHyperlink" X="12" Y="180" Width="-12" Height="52" TabStop="yes" FontId="DefaultFont" HideWhenDisabled="yes">#(loc.EulaPrivacy)</Hypertext>
32-
<Checkbox Name="EulaAcceptCheckbox" X="-12" Y="-40" Width="260" Height="36" TabStop="yes" FontId="DefaultFont" HideWhenDisabled="yes">#(loc.InstallAcceptCheckbox)</Checkbox>
33-
<Button Name="InstallButton" X="-92" Y="-12" Width="96" Height="24" TabStop="yes" FontId="DefaultFont">#(loc.InstallInstallButton)</Button>
34-
<Button Name="InstallCancelButton" X="-12" Y="-12" Width="76" Height="24" TabStop="yes" FontId="DefaultFont">
35-
<Text>#(loc.InstallCloseButton)</Text>
36-
<CloseWindowAction/>
37-
</Button>
38-
</Page>
39-
<Page Name="FilesInUse">
40-
<Text X="12" Y="80" Width="-12" Height="32" FontId="PageHeaderFont" DisablePrefix="yes">#(loc.FilesInUseHeader)</Text>
41-
<Text X="12" Y="120" Width="-12" Height="36" FontId="DefaultFont" DisablePrefix="yes">#(loc.FilesInUseLabel)</Text>
42-
<Text Name="FilesInUseText" X="12" Y="150" Width="-12" Height="-86" FontId="DefaultFont" DisablePrefix="yes" HexStyle="0x0000C000"></Text>
29+
<Label Name="WelcomeHeader" X="148" Y="80" Width="-12" Height="32" FontId="PageHeaderFont" HexStyle="000000">#(loc.Welcome)</Label>
4330

44-
<Button Name="FilesInUseCloseRadioButton" X="12" Y="-60" Width="-12" Height="24" TabStop="yes" FontId="DefaultFont" HideWhenDisabled="yes" HexStyle="0x000009">#(loc.FilesInUseCloseRadioButton)</Button>
45-
<Button Name="FilesInUseDontCloseRadioButton" X="12" Y="-40" Width="-12" Height="24" TabStop="yes" FontId="DefaultFont" HideWhenDisabled="yes" HexStyle="0x000009">#(loc.FilesInUseDontCloseRadioButton)</Button>
31+
<Hypertext X="148" Y="120" Width="-12" Height="44" FontId="DefaultFont" Name="InstallResetIIS" HideWhenDisabled="yes">#(loc.InstallResetIIS)</Hypertext>
32+
<Hypertext X="148" Y="120" Width="-12" Height="44" FontId="DefaultFont" Name="InstallNoIIS" HideWhenDisabled="yes">#(loc.InstallNoIIS)</Hypertext>
4633

47-
<Button Name="FilesInUseOkButton" X="-92" Y="-12" Width="76" Height="24" TabStop="yes" FontId="DefaultFont" HideWhenDisabled="yes">#(loc.FilesInUseOkButton)</Button>
48-
<Button Name="FilesInUseCancelButton" X="-12" Y="-12" Width="76" Height="24" TabStop="yes" FontId="DefaultFont">
49-
<Text>#(loc.FilesInUseCancelButton)</Text>
34+
<!-- Align the label with the top of the logo on the left. -->
35+
<Label Name="LicenseTermsAndPolicies" X="148" Y="288" Width="-12" Height="32" FontId="DefaultFont" HexStyle="000000">#(loc.LicenseAssent)</Label>
36+
37+
<!-- These controls have larger vertical spacing to improve readability (20 instead of 16). -->
38+
<Hypertext Name="PrivacyStatementLink" X="172" Y="320" Width="-12" Height="16" FontId="DefaultFont" TabStop="yes" HexStyle="000000" HideWhenDisabled="yes">&lt;A HREF=&quot;https://aka.ms/dev-privacy&quot;&gt;Privacy Statement&lt;/A&gt;</Hypertext>
39+
<Hypertext Name="DotNetCLITelemetryLink" X="172" Y="340" Width="-12" Height="16" FontId="DefaultFont" TabStop="yes" HexStyle="000000" HideWhenDisabled="yes">&lt;A HREF=&quot;https://aka.ms/dotnet-license-windows&quot;&gt;Licensing Information for .NET&lt;/A&gt;</Hypertext>
40+
<Hypertext Name="DotNetEulaLink" X="172" Y="360" Width="-12" Height="16" FontId="DefaultFont" TabStop="yes" HexStyle="000000" HideWhenDisabled="yes">&lt;A HREF=&quot;https://aka.ms/dotnet-cli-telemetry&quot;&gt;Telemetry collection and opt-out&lt;/A&gt;</Hypertext>
41+
<Button Name="InstallButton" X="-124" Y="-12" Width="100" Height="24" TabStop="yes" FontId="DefaultFont">#(loc.InstallInstallButton)</Button>
42+
<Button Name="InstallCancelButton" X="-12" Y="-12" Width="100" Height="24" TabStop="yes" FontId="DefaultFont">
43+
<Text>#(loc.InstallCloseButton)</Text>
5044
<CloseWindowAction/>
5145
</Button>
5246
</Page>
5347
<Page Name="Progress">
54-
<Text X="12" Y="80" Width="-12" Height="32" FontId="PageHeaderFont" DisablePrefix="yes">#(loc.ProgressHeader)</Text>
55-
<Text X="12" Y="120" Width="90" Height="16" FontId="DefaultFont" DisablePrefix="yes">#(loc.ProgressLabel)</Text>
56-
<Text Name="OverallProgressPackageText" X="104" Y="120" Width="-12" Height="16" FontId="DefaultFont" DisablePrefix="yes">#(loc.OverallProgressPackageText)</Text>
57-
<Progressbar Name="OverallCalculatedProgressbar" X="12" Y="144" Width="-12" Height="16" />
58-
<Button Name="ProgressCancelButton" X="-12" Y="-12" Width="76" Height="24" TabStop="yes" FontId="DefaultFont">
48+
<Label HexStyle="000000" Name="ProgressHeader" X="12" Y="80" Width="-12" Height="32" FontId="PageHeaderFont" DisablePrefix="yes">#(loc.ProgressHeader)</Label>
49+
<Label HexStyle="000000" Name="ProgressLabel" X="12" Y="124" Width="96" Height="16" FontId="DefaultFont" DisablePrefix="yes">#(loc.ProgressLabel)</Label>
50+
<Label HexStyle="000000" Name="OverallProgressPackageText" X="108" Y="124" Width="-12" Height="16" FontId="DefaultFont" DisablePrefix="yes">#(loc.OverallProgressPackageText)</Label>
51+
52+
<Progressbar Name="OverallCalculatedProgressbar" X="12" Y="152" Width="-12" Height="20" />
53+
54+
<Button Name="ProgressCancelButton" X="-12" Y="-12" Width="100" Height="24" TabStop="yes" FontId="DefaultFont">
5955
<Text>#(loc.ProgressCancelButton)</Text>
6056
<CloseWindowAction/>
6157
</Button>
6258
</Page>
6359
<Page Name="Modify">
64-
<Text X="12" Y="80" Width="-12" Height="32" FontId="PageHeaderFont" DisablePrefix="yes">#(loc.ModifyHeader)</Text>
65-
<Hypertext X="12" Y="120" Width="-12" Height="44" FontId="DefaultFont" Name="ModifyResetIIS" HideWhenDisabled="yes">#(loc.ModifyResetIIS)</Hypertext>
66-
<Hypertext X="12" Y="120" Width="-12" Height="44" FontId="DefaultFont" Name="ModifyNoIIS" HideWhenDisabled="yes">#(loc.ModifyNoIIS)</Hypertext>
67-
<Button Name="RepairButton" X="-172" Y="-12" Width="76" Height="24" TabStop="yes" FontId="DefaultFont" HideWhenDisabled="yes">#(loc.ModifyRepairButton)</Button>
68-
<Button Name="UninstallButton" X="-92" Y="-12" Width="76" Height="24" TabStop="yes" FontId="DefaultFont">#(loc.ModifyUninstallButton)</Button>
69-
<Button Name="ModifyCancelButton" X="-12" Y="-12" Width="76" Height="24" TabStop="yes" FontId="DefaultFont">
60+
<Label Name="ModifyHeader" X="148" Y="80" Width="-12" Height="32" FontId="PageHeaderFont" DisablePrefix="yes">#(loc.ModifyHeader)</Label>
61+
62+
<Label Name="ModifyTextIIS" X="148" Y="124" Width="-12" Height="-48" FontId="DefaultFont" HexStyle="00000000" DisablePrefix="yes">#(loc.ModifyResetIIS)</Label>
63+
<Label Name="ModifyTextNoIIS" X="148" Y="124" Width="-12" Height="-48" FontId="DefaultFont" HexStyle="00000000" DisablePrefix="yes">#(loc.ModifyNoIIS)</Label>
64+
65+
<Button Name="RepairButton" X="-236" Y="-12" Width="100" Height="24" TabStop="yes" FontId="DefaultFont" HideWhenDisabled="yes">#(loc.ModifyRepairButton)</Button>
66+
<Button Name="UninstallButton" X="-124" Y="-12" Width="100" Height="24" TabStop="yes" FontId="DefaultFont">#(loc.ModifyUninstallButton)</Button>
67+
<Button Name="ModifyCancelButton" X="-12" Y="-12" Width="100" Height="24" TabStop="yes" FontId="DefaultFont">
7068
<Text>#(loc.ModifyCloseButton)</Text>
7169
<CloseWindowAction/>
7270
</Button>
7371
</Page>
7472
<Page Name="Success">
75-
<Text Name="SuccessHeader" X="12" Y="80" Width="-12" Height="60" FontId="PageHeaderFont" HideWhenDisabled="yes" DisablePrefix="yes">#(loc.SuccessHeader)</Text>
76-
<Text Name="SuccessInstallHeader" X="12" Y="80" Width="-12" Height="60" FontId="PageHeaderFont" HideWhenDisabled="yes" DisablePrefix="yes">#(loc.SuccessInstallHeader)</Text>
77-
<Text Name="SuccessRepairHeader" X="12" Y="80" Width="-12" Height="60" FontId="PageHeaderFont" HideWhenDisabled="yes" DisablePrefix="yes">#(loc.SuccessRepairHeader)</Text>
78-
<Text Name="SuccessUninstallHeader" X="12" Y="80" Width="-12" Height="60" FontId="PageHeaderFont" HideWhenDisabled="yes" DisablePrefix="yes">#(loc.SuccessUninstallHeader)</Text>
79-
<Button Name="LaunchButton" X="-92" Y="-12" Width="76" Height="24" TabStop="yes" FontId="DefaultFont" HideWhenDisabled="yes">#(loc.SuccessLaunchButton)</Button>
80-
<Text Name="SuccessRestartText" X="-12" Y="-52" Width="400" Height="36" FontId="DefaultFont" HideWhenDisabled="yes" DisablePrefix="yes">#(loc.SuccessRestartText)</Text>
81-
<Button Name="SuccessRestartButton" X="-92" Y="-12" Width="76" Height="24" TabStop="yes" FontId="DefaultFont" HideWhenDisabled="yes">#(loc.SuccessRestartButton)</Button>
82-
<Button Name="SuccessCancelButton" X="-12" Y="-12" Width="76" Height="24" TabStop="yes" FontId="DefaultFont">
73+
<Label Name="SuccessHeader" X="148" Y="80" Width="-12" Height="32" HexStyle="00000000" FontId="PageHeaderFont">
74+
<!-- Default text to display if none of the conditions are true. -->
75+
<Text>#(loc.SuccessHeader)</Text>
76+
<Text Condition="WixBundleAction = 2">#(loc.SuccessLayoutHeader)</Text>
77+
<Text Condition="WixBundleAction = 3">#(loc.SuccessUnsafeUninstallHeader)</Text>
78+
<Text Condition="WixBundleAction = 4">#(loc.SuccessUninstallHeader)</Text>
79+
<Text Condition="WixBundleAction = 5">#(loc.SuccessCacheHeader)</Text>
80+
<Text Condition="WixBundleAction = 6">#(loc.SuccessInstallHeader)</Text>
81+
<Text Condition="WixBundleAction = 7">#(loc.SuccessModifyHeader)</Text>
82+
<Text Condition="WixBundleAction = 8">#(loc.SuccessRepairHeader)</Text>
83+
</Label>
84+
85+
<Label X="148" Y="-48" Width="-12" Height="34" FontId="DefaultFont" DisablePrefix="yes" VisibleCondition="WixStdBARestartRequired">
86+
<Text>#(loc.SuccessRestartText)</Text>
87+
<Text Condition="WixBundleAction = 3">#(loc.SuccessUninstallRestartText)</Text>
88+
</Label>
89+
90+
<!-- Calculate the relative offset as follows, assuming there are two buttons, right aligned:
91+
First button, X="-12" Width="100"
92+
Second button, X="-124" (-12 - 100 (width of first button) - 12 (gap between buttons)) -->
93+
<Button Name="SuccessRestartButton" X="-124" Y="-12" Width="100" Height="24" TabStop="yes" FontId="DefaultFont" HideWhenDisabled="yes">#(loc.SuccessRestartButton)</Button>
94+
<Button Name="SuccessCloseButton" X="-12" Y="-12" Width="100" Height="24" TabStop="yes" FontId="DefaultFont">
8395
<Text>#(loc.SuccessCloseButton)</Text>
84-
<CloseWindowAction/>
96+
<CloseWindowAction />
8597
</Button>
8698
</Page>
8799
<Page Name="Failure">
88-
<Text Name="FailureHeader" X="12" Y="80" Width="-12" Height="32" FontId="PageHeaderFont" HideWhenDisabled="yes" DisablePrefix="yes">#(loc.FailureHeader)</Text>
89-
<Text Name="FailureInstallHeader" X="12" Y="80" Width="-12" Height="32" FontId="PageHeaderFont" HideWhenDisabled="yes" DisablePrefix="yes">#(loc.FailureInstallHeader)</Text>
90-
<Text Name="FailureUninstallHeader" X="12" Y="80" Width="-12" Height="32" FontId="PageHeaderFont" HideWhenDisabled="yes" DisablePrefix="yes">#(loc.FailureUninstallHeader)</Text>
91-
<Text Name="FailureRepairHeader" X="12" Y="80" Width="-12" Height="32" FontId="PageHeaderFont" HideWhenDisabled="yes" DisablePrefix="yes">#(loc.FailureRepairHeader)</Text>
92-
<Hypertext Name="FailureLogFileLink" X="12" Y="120" Width="-12" Height="44" FontId="DefaultFont" TabStop="yes" HideWhenDisabled="yes">#(loc.FailureHyperlinkLogText)</Hypertext>
93-
<Hypertext Name="FailureMessageText" X="20" Y="164" Width="-12" Height="52" FontId="ErrorFont" TabStop="yes" HideWhenDisabled="yes" />
94-
<Text Name="FailureRestartText" X="-12" Y="-52" Width="400" Height="36" FontId="DefaultFont" HideWhenDisabled="yes" DisablePrefix="yes">#(loc.FailureRestartText)</Text>
95-
<Button Name="FailureRestartButton" X="-92" Y="-12" Width="76" Height="24" TabStop="yes" FontId="DefaultFont" HideWhenDisabled="yes">#(loc.FailureRestartButton)</Button>
96-
<Button Name="FailureCloseButton" X="-12" Y="-12" Width="76" Height="24" TabStop="yes" FontId="DefaultFont">
100+
<Label Name="FailureHeader" X="148" Y="80" Width="-12" Height="32" HexStyle="00000000" FontId="PageHeaderFont">
101+
<Text>#(loc.FailureHeader)</Text>
102+
<Text Condition="WixBundleAction = 2">#(loc.FailureLayoutHeader)</Text>
103+
<Text Condition="WixBundleAction = 3">#(loc.FailureUnsafeUninstallHeader)</Text>
104+
<Text Condition="WixBundleAction = 4">#(loc.FailureUninstallHeader)</Text>
105+
<Text Condition="WixBundleAction = 5">#(loc.FailureCacheHeader)</Text>
106+
<Text Condition="WixBundleAction = 6">#(loc.FailureInstallHeader)</Text>
107+
<Text Condition="WixBundleAction = 7">#(loc.FailureModifyHeader)</Text>
108+
<Text Condition="WixBundleAction = 8">#(loc.FailureRepairHeader)</Text>
109+
</Label>
110+
111+
<!-- Reserve three lines of space (2 for the message plus a 3rd for a line break. -->
112+
<Hypertext HexStyle="000000" Name="FailureLogFileLink" X="148" Y="124" Width="-12" Height="48" FontId="DefaultFont" TabStop="yes" HideWhenDisabled="yes">#(loc.FailureHyperlinkLogText)</Hypertext>
113+
114+
<!-- This element is updated by the bootstrapper application. Reserve 3 lines of space. -->
115+
<Hypertext HexStyle="000000" Name="FailureMessageText" X="148" Y="172" Width="-12" Height="48" FontId="ErrorFont" TabStop="yes" HideWhenDisabled="yes" />
116+
117+
<!-- Reserve two lines of space to accommodate localized content. -->
118+
<Label X="148" Y="-48" Width="-12" Height="32" FontId="DefaultFont" DisablePrefix="yes" VisibleCondition="WixStdBARestartRequired">#(loc.FailureRestartText)</Label>
119+
<Button Name="FailureRestartButton" X="-124" Y="-12" Width="100" Height="24" TabStop="yes" FontId="DefaultFont" HideWhenDisabled="yes">#(loc.FailureRestartButton)</Button>
120+
<Button Name="FailureCloseButton" X="-12" Y="-12" Width="100" Height="24" TabStop="yes" FontId="DefaultFont">
97121
<Text>#(loc.FailureCloseButton)</Text>
98122
<CloseWindowAction/>
99123
</Button>

0 commit comments

Comments
 (0)