Skip to content

Commit 64bf2a9

Browse files
wtgodbewtgodbe
committed
UI Improvements
1 parent bf1f717 commit 64bf2a9

File tree

1 file changed

+68
-50
lines changed
  • src/Installers/Windows/WindowsHostingBundle

1 file changed

+68
-50
lines changed

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

Lines changed: 68 additions & 50 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<Theme xmlns="http://wixtoolset.org/schemas/v4/thmutil">
1+
<Theme xmlns="http://wixtoolset.org/schemas/v4/thmutil">
22
<!-- Use system colors where possible as they change based on themes and are automatically adjusted for high contrast.
33
For custom colors, ensure the contrast ratio is at least 4.5:1 (3:1 for large text and other UI components).
44
The WinUI 3 Gallery app can be used to calculate contrast settings. Take note that custom colors for <Font>
@@ -8,74 +8,92 @@
88
a line spacing of 31.9, so 32 should be used when calculating the height of a control that contains a single line of text,
99
like a label. For a height of 12, the line spacing to use is 16. -->
1010
<Font Id="DefaultFont" Height="-12" Weight="500" Foreground="windowtext" Background="window">Segoe UI</Font>
11-
<Font Id="WindowBannerFont" Height="-24" Weight="900" Foreground="000000" Background="D42B51">Segoe UI</Font>
12-
<Font Id="PageHeaderFont" Height="-22" Weight="500" Foreground="graytext" Background="window">Segoe UI</Font>
11+
<Font Id="WindowBannerFont" Height="-24" Weight="900" Foreground="000000" Background="D42B52">Segoe UI</Font>
12+
<Font Id="PageHeaderFont" Height="-20" Weight="500" Foreground="graytext" Background="window">Segoe UI</Font>
1313
<Font Id="ErrorFont" Height="-12" Weight="900" Foreground="windowtext" Background="window">Segoe UI</Font>
1414
<Window Width="644" Height="460" HexStyle="100a0000" FontId="DefaultFont" Caption="#(loc.Caption)" IconFile="dotnet.ico">
1515
<ImageControl Name="DotNetLogo" X="12" Y="-48" Width="124" Height="124" ImageFile="DotNetLogo_256x.png" Visible="yes" />
16-
<Text X="80" Y="11" Width="-11" Height="40" FontId="WindowBannerFont" Visible="yes" DisablePrefix="yes">#(loc.Title)</Text>
17-
<Text X="80" Y="40" Width="-11" Height="40" FontId="WindowBannerFont" Visible="yes" DisablePrefix="yes">#(loc.SubTitle)</Text>
16+
<Text X="80" Y="12" Width="-12" Height="40" FontId="WindowBannerFont" Visible="yes" DisablePrefix="yes">#(loc.Title)</Text>
17+
<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="11" Y="80" Width="-11" Height="30" FontId="PageHeaderFont" DisablePrefix="yes">#(loc.HelpHeader)</Text>
21-
<Text X="11" Y="112" Width="-11" Height="-35" FontId="DefaultFont" DisablePrefix="yes">#(loc.HelpText)</Text>
22-
<Button Name="HelpCancelButton" X="-11" Y="-11" Width="75" Height="23" TabStop="yes" FontId="DefaultFont">#(loc.HelpCloseButton)</Button>
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">
23+
<Text>#(loc.HelpCloseButton)</Text>
24+
<CloseWindowAction/>
25+
</Button>
2326
</Page>
2427
<Page Name="Install">
25-
<Hypertext X="11" Y="90" Width="-11" Height="15" FontId="DefaultFont">#(loc.Welcome)</Hypertext>
26-
<Hypertext X="11" Y="119" Width="-11" Height="45" FontId="DefaultFont" Name="InstallResetIIS" HideWhenDisabled="yes">#(loc.InstallResetIIS)</Hypertext>
27-
<Hypertext X="11" Y="119" Width="-11" Height="45" FontId="DefaultFont" Name="InstallNoIIS" HideWhenDisabled="yes">#(loc.InstallNoIIS)</Hypertext>
28-
<Hypertext Name="EulaAndPrivacyHyperlink" X="11" Y="178" Width="-11" Height="51" TabStop="yes" FontId="DefaultFont" HideWhenDisabled="yes">#(loc.EulaPrivacy)</Hypertext>
29-
<Checkbox Name="EulaAcceptCheckbox" X="-11" Y="-41" Width="260" Height="34" TabStop="yes" FontId="DefaultFont" HideWhenDisabled="yes">#(loc.InstallAcceptCheckbox)</Checkbox>
30-
<Button Name="InstallButton" X="-91" Y="-11" Width="95" Height="23" TabStop="yes" FontId="DefaultFont">#(loc.InstallInstallButton)</Button>
31-
<Button Name="WelcomeCancelButton" X="-11" Y="-11" Width="75" Height="23" TabStop="yes" FontId="DefaultFont">#(loc.InstallCloseButton)</Button>
28+
<Hypertext X="12" Y="90" Width="-12" Height="16" FontId="DefaultFont">#(loc.Welcome)</Hypertext>
29+
<Hypertext X="12" Y="119" Width="-12" Height="44" FontId="DefaultFont" Name="InstallResetIIS" HideWhenDisabled="yes">#(loc.InstallResetIIS)</Hypertext>
30+
<Hypertext X="12" Y="119" 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="95" Height="24" TabStop="yes" FontId="DefaultFont">#(loc.InstallInstallButton)</Button>
34+
<Button Name="WelcomeCancelButton" X="-12" Y="-12" Width="76" Height="24" TabStop="yes" FontId="DefaultFont">
35+
<Text>#(loc.InstallCloseButton)</Text>
36+
<CloseWindowAction/>
37+
</Button>
3238
</Page>
3339
<Page Name="FilesInUse">
34-
<Text X="11" Y="80" Width="-11" Height="30" FontId="PageHeaderFont" DisablePrefix="yes">#(loc.FilesInUseHeader)</Text>
35-
<Text X="11" Y="121" Width="-11" Height="34" FontId="DefaultFont" DisablePrefix="yes">#(loc.FilesInUseLabel)</Text>
36-
<Text Name="FilesInUseText" X="11" Y="150" Width="-11" Height="-86" FontId="DefaultFont" DisablePrefix="yes" HexStyle="0x0000C000"></Text>
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>
3743

38-
<Button Name="FilesInUseCloseRadioButton" X="11" Y="-60" Width="-11" Height="23" TabStop="yes" FontId="DefaultFont" HideWhenDisabled="yes" HexStyle="0x000009">#(loc.FilesInUseCloseRadioButton)</Button>
39-
<Button Name="FilesInUseDontCloseRadioButton" X="11" Y="-40" Width="-11" Height="23" TabStop="yes" FontId="DefaultFont" HideWhenDisabled="yes" HexStyle="0x000009">#(loc.FilesInUseDontCloseRadioButton)</Button>
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>
4046

41-
<Button Name="FilesInUseOkButton" X="-91" Y="-11" Width="75" Height="23" TabStop="yes" FontId="DefaultFont" HideWhenDisabled="yes">#(loc.FilesInUseOkButton)</Button>
42-
<Button Name="FilesInUseCancelButton" X="-11" Y="-11" Width="75" Height="23" TabStop="yes" FontId="DefaultFont">#(loc.FilesInUseCancelButton)</Button>
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>
50+
<CloseWindowAction/>
51+
</Button>
4352
</Page>
4453
<Page Name="Progress">
45-
<Text X="11" Y="80" Width="-11" Height="30" FontId="PageHeaderFont" DisablePrefix="yes">#(loc.ProgressHeader)</Text>
46-
<Text X="11" Y="121" Width="90" Height="17" FontId="DefaultFont" DisablePrefix="yes">#(loc.ProgressLabel)</Text>
47-
<Text Name="OverallProgressPackageText" X="105" Y="121" Width="-11" Height="17" FontId="DefaultFont" DisablePrefix="yes">#(loc.OverallProgressPackageText)</Text>
48-
<Progressbar Name="OverallCalculatedProgressbar" X="11" Y="143" Width="-11" Height="15" />
49-
<Button Name="ProgressCancelButton" X="-11" Y="-11" Width="75" Height="23" TabStop="yes" FontId="DefaultFont">#(loc.ProgressCancelButton)</Button>
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="143" Width="-12" Height="16" />
58+
<Button Name="ProgressCancelButton" X="-12" Y="-12" Width="76" Height="24" TabStop="yes" FontId="DefaultFont">
59+
<Text>#(loc.ProgressCancelButton)</Text>
60+
<CloseWindowAction/>
61+
</Button>
5062
</Page>
5163
<Page Name="Modify">
52-
<Text X="11" Y="80" Width="-11" Height="30" FontId="PageHeaderFont" DisablePrefix="yes">#(loc.ModifyHeader)</Text>
53-
<Hypertext X="11" Y="121" Width="-11" Height="45" FontId="DefaultFont" Name="ModifyResetIIS" HideWhenDisabled="yes">#(loc.ModifyResetIIS)</Hypertext>
54-
<Hypertext X="11" Y="121" Width="-11" Height="45" FontId="DefaultFont" Name="ModifyNoIIS" HideWhenDisabled="yes">#(loc.ModifyNoIIS)</Hypertext>
55-
<Button Name="RepairButton" X="-171" Y="-11" Width="75" Height="23" TabStop="yes" FontId="DefaultFont" HideWhenDisabled="yes">#(loc.ModifyRepairButton)</Button>
56-
<Button Name="UninstallButton" X="-91" Y="-11" Width="75" Height="23" TabStop="yes" FontId="DefaultFont">#(loc.ModifyUninstallButton)</Button>
57-
<Button Name="ModifyCancelButton" X="-11" Y="-11" Width="75" Height="23" TabStop="yes" FontId="DefaultFont">#(loc.ModifyCloseButton)</Button>
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">
70+
<Text>#(loc.ModifyCloseButton)</Text>
71+
<CloseWindowAction/>
72+
</Button>
5873
</Page>
5974
<Page Name="Success">
60-
<Text Name="SuccessHeader" X="11" Y="80" Width="-11" Height="60" FontId="PageHeaderFont" HideWhenDisabled="yes" DisablePrefix="yes">#(loc.SuccessHeader)</Text>
61-
<Text Name="SuccessInstallHeader" X="11" Y="80" Width="-11" Height="60" FontId="PageHeaderFont" HideWhenDisabled="yes" DisablePrefix="yes">#(loc.SuccessInstallHeader)</Text>
62-
<Text Name="SuccessRepairHeader" X="11" Y="80" Width="-11" Height="60" FontId="PageHeaderFont" HideWhenDisabled="yes" DisablePrefix="yes">#(loc.SuccessRepairHeader)</Text>
63-
<Text Name="SuccessUninstallHeader" X="11" Y="80" Width="-11" Height="60" FontId="PageHeaderFont" HideWhenDisabled="yes" DisablePrefix="yes">#(loc.SuccessUninstallHeader)</Text>
64-
<Button Name="LaunchButton" X="-91" Y="-11" Width="75" Height="23" TabStop="yes" FontId="DefaultFont" HideWhenDisabled="yes">#(loc.SuccessLaunchButton)</Button>
65-
<Text Name="SuccessRestartText" X="-11" Y="-51" Width="400" Height="34" FontId="DefaultFont" HideWhenDisabled="yes" DisablePrefix="yes">#(loc.SuccessRestartText)</Text>
66-
<Button Name="SuccessRestartButton" X="-91" Y="-11" Width="75" Height="23" TabStop="yes" FontId="DefaultFont" HideWhenDisabled="yes">#(loc.SuccessRestartButton)</Button>
67-
<Button Name="SuccessCancelButton" X="-11" Y="-11" Width="75" Height="23" TabStop="yes" FontId="DefaultFont">#(loc.SuccessCloseButton)</Button>
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">
83+
<Text>#(loc.SuccessCloseButton)</Text>
84+
<CloseWindowAction/>
85+
</Button>
6886
</Page>
6987
<Page Name="Failure">
70-
<Text Name="FailureHeader" X="11" Y="80" Width="-11" Height="30" FontId="PageHeaderFont" HideWhenDisabled="yes" DisablePrefix="yes">#(loc.FailureHeader)</Text>
71-
<Text Name="FailureInstallHeader" X="11" Y="80" Width="-11" Height="30" FontId="PageHeaderFont" HideWhenDisabled="yes" DisablePrefix="yes">#(loc.FailureInstallHeader)</Text>
72-
<Text Name="FailureUninstallHeader" X="11" Y="80" Width="-11" Height="30" FontId="PageHeaderFont" HideWhenDisabled="yes" DisablePrefix="yes">#(loc.FailureUninstallHeader)</Text>
73-
<Text Name="FailureRepairHeader" X="11" Y="80" Width="-11" Height="30" FontId="PageHeaderFont" HideWhenDisabled="yes" DisablePrefix="yes">#(loc.FailureRepairHeader)</Text>
74-
<Hypertext Name="FailureLogFileLink" X="11" Y="121" Width="-11" Height="42" FontId="DefaultFont" TabStop="yes" HideWhenDisabled="yes">#(loc.FailureHyperlinkLogText)</Hypertext>
75-
<Hypertext Name="FailureMessageText" X="22" Y="163" Width="-11" Height="51" FontId="ErrorFont" TabStop="yes" HideWhenDisabled="yes" />
76-
<Text Name="FailureRestartText" X="-11" Y="-51" Width="400" Height="34" FontId="DefaultFont" HideWhenDisabled="yes" DisablePrefix="yes">#(loc.FailureRestartText)</Text>
77-
<Button Name="FailureRestartButton" X="-91" Y="-11" Width="75" Height="23" TabStop="yes" FontId="DefaultFont" HideWhenDisabled="yes">#(loc.FailureRestartButton)</Button>
78-
<Button Name="FailureCloseButton" X="-11" Y="-11" Width="75" Height="23" TabStop="yes" FontId="DefaultFont">#(loc.FailureCloseButton)</Button>
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="163" 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">#(loc.FailureCloseButton)</Button>
7997
</Page>
8098
</Window>
8199
</Theme>

0 commit comments

Comments
 (0)