@joebigelow / wix / commits / 2df3f73a

WIXBUG:5688 Installation Successful and Repair Successful headers not shown correctly.

Sean Hall committed Aug 7, 2020 at 19:57 UTC 2df3f73a2cc98e5d96ad4b2f2bf53a3558cc44ee
5 files changed +20 -20
src/wixstdba/Resources/HyperlinkLargeTheme.xml
+4 -4
@@ -74,8 +74,8 @@
74 <Text>#(loc.SuccessHeader)</Text>
75 <Text Condition="WixBundleAction = 2">#(loc.SuccessLayoutHeader)</Text>
76 <Text Condition="WixBundleAction = 3">#(loc.SuccessUninstallHeader)</Text>
77 - <Text Condition="WixBundleAction = 4">#(loc.SuccessInstallHeader)</Text>
78 - <Text Condition="WixBundleAction = 6">#(loc.SuccessRepairHeader)</Text>
77 + <Text Condition="WixBundleAction = 5">#(loc.SuccessInstallHeader)</Text>
78 + <Text Condition="WixBundleAction = 7">#(loc.SuccessRepairHeader)</Text>
79 </Label>
80 <Button Name="LaunchButton" X="-91" Y="-11" Width="75" Height="23" TabStop="yes" FontId="0" HideWhenDisabled="yes">#(loc.SuccessLaunchButton)</Button>
81 <Label X="-11" Y="-51" Width="400" Height="34" FontId="3" DisablePrefix="yes" VisibleCondition="WixStdBARestartRequired">
@@ -93,8 +93,8 @@
93 <Text>#(loc.FailureHeader)</Text>
94 <Text Condition="WixBundleAction = 2">#(loc.FailureLayoutHeader)</Text>
95 <Text Condition="WixBundleAction = 3">#(loc.FailureUninstallHeader)</Text>
96 - <Text Condition="WixBundleAction = 4">#(loc.FailureInstallHeader)</Text>
97 - <Text Condition="WixBundleAction = 6">#(loc.FailureRepairHeader)</Text>
96 + <Text Condition="WixBundleAction = 5">#(loc.FailureInstallHeader)</Text>
97 + <Text Condition="WixBundleAction = 7">#(loc.FailureRepairHeader)</Text>
98 </Label>
99 <Hypertext Name="FailureLogFileLink" X="11" Y="121" Width="-11" Height="42" FontId="3" TabStop="yes" HideWhenDisabled="yes">#(loc.FailureHyperlinkLogText)</Hypertext>
100 <Hypertext Name="FailureMessageText" X="22" Y="163" Width="-11" Height="51" FontId="3" TabStop="yes" HideWhenDisabled="yes" />
src/wixstdba/Resources/HyperlinkSidebarTheme.xml
+4 -4
@@ -83,8 +83,8 @@
83 <Text>#(loc.SuccessHeader)</Text>
84 <Text Condition="WixBundleAction = 2">#(loc.SuccessLayoutHeader)</Text>
85 <Text Condition="WixBundleAction = 3">#(loc.SuccessUninstallHeader)</Text>
86 - <Text Condition="WixBundleAction = 4">#(loc.SuccessInstallHeader)</Text>
87 - <Text Condition="WixBundleAction = 6">#(loc.SuccessRepairHeader)</Text>
86 + <Text Condition="WixBundleAction = 5">#(loc.SuccessInstallHeader)</Text>
87 + <Text Condition="WixBundleAction = 7">#(loc.SuccessRepairHeader)</Text>
88 </Label>
89 <Button Name="LaunchButton" X="-91" Y="-11" Width="75" Height="23" TabStop="yes" FontId="0" HideWhenDisabled="yes">#(loc.SuccessLaunchButton)</Button>
90 <Label X="185" Y="-51" Width="400" Height="34" FontId="3" DisablePrefix="yes" VisibleCondition="WixStdBARestartRequired">
@@ -104,8 +104,8 @@
104 <Text>#(loc.FailureHeader)</Text>
105 <Text Condition="WixBundleAction = 2">#(loc.FailureLayoutHeader)</Text>
106 <Text Condition="WixBundleAction = 3">#(loc.FailureUninstallHeader)</Text>
107 - <Text Condition="WixBundleAction = 4">#(loc.FailureInstallHeader)</Text>
108 - <Text Condition="WixBundleAction = 6">#(loc.FailureRepairHeader)</Text>
107 + <Text Condition="WixBundleAction = 5">#(loc.FailureInstallHeader)</Text>
108 + <Text Condition="WixBundleAction = 7">#(loc.FailureRepairHeader)</Text>
109 </Label>
110 <Hypertext Name="FailureLogFileLink" X="185" Y="121" Width="-11" Height="68" FontId="3" TabStop="yes" HideWhenDisabled="yes">#(loc.FailureHyperlinkLogText)</Hypertext>
111 <Hypertext Name="FailureMessageText" X="185" Y="-115" Width="-11" Height="80" FontId="3" TabStop="yes" HideWhenDisabled="yes" />
src/wixstdba/Resources/HyperlinkTheme.xml
+4 -4
@@ -71,8 +71,8 @@
71 <Text>#(loc.SuccessHeader)</Text>
72 <Text Condition="WixBundleAction = 2">#(loc.SuccessLayoutHeader)</Text>
73 <Text Condition="WixBundleAction = 3">#(loc.SuccessUninstallHeader)</Text>
74 - <Text Condition="WixBundleAction = 4">#(loc.SuccessInstallHeader)</Text>
75 - <Text Condition="WixBundleAction = 6">#(loc.SuccessRepairHeader)</Text>
74 + <Text Condition="WixBundleAction = 5">#(loc.SuccessInstallHeader)</Text>
75 + <Text Condition="WixBundleAction = 7">#(loc.SuccessRepairHeader)</Text>
76 </Label>
77 <Button Name="LaunchButton" X="-91" Y="-11" Width="75" Height="23" TabStop="yes" FontId="0" HideWhenDisabled="yes">#(loc.SuccessLaunchButton)</Button>
78 <Label X="-11" Y="-51" Width="400" Height="34" FontId="3" DisablePrefix="yes" VisibleCondition="WixStdBARestartRequired">
@@ -90,8 +90,8 @@
90 <Text>#(loc.FailureHeader)</Text>
91 <Text Condition="WixBundleAction = 2">#(loc.FailureLayoutHeader)</Text>
92 <Text Condition="WixBundleAction = 3">#(loc.FailureUninstallHeader)</Text>
93 - <Text Condition="WixBundleAction = 4">#(loc.FailureInstallHeader)</Text>
94 - <Text Condition="WixBundleAction = 6">#(loc.FailureRepairHeader)</Text>
93 + <Text Condition="WixBundleAction = 5">#(loc.FailureInstallHeader)</Text>
94 + <Text Condition="WixBundleAction = 7">#(loc.FailureRepairHeader)</Text>
95 </Label>
96 <Hypertext Name="FailureLogFileLink" X="11" Y="121" Width="-11" Height="42" FontId="3" TabStop="yes" HideWhenDisabled="yes">#(loc.FailureHyperlinkLogText)</Hypertext>
97 <Hypertext Name="FailureMessageText" X="22" Y="163" Width="-11" Height="51" FontId="3" TabStop="yes" HideWhenDisabled="yes" />
src/wixstdba/Resources/RtfLargeTheme.xml
+4 -4
@@ -73,8 +73,8 @@
73 <Text>#(loc.SuccessHeader)</Text>
74 <Text Condition="WixBundleAction = 2">#(loc.SuccessLayoutHeader)</Text>
75 <Text Condition="WixBundleAction = 3">#(loc.SuccessUninstallHeader)</Text>
76 - <Text Condition="WixBundleAction = 4">#(loc.SuccessInstallHeader)</Text>
77 - <Text Condition="WixBundleAction = 6">#(loc.SuccessRepairHeader)</Text>
76 + <Text Condition="WixBundleAction = 5">#(loc.SuccessInstallHeader)</Text>
77 + <Text Condition="WixBundleAction = 7">#(loc.SuccessRepairHeader)</Text>
78 </Label>
79 <Button Name="LaunchButton" X="-91" Y="-11" Width="75" Height="23" TabStop="yes" FontId="0" HideWhenDisabled="yes">#(loc.SuccessLaunchButton)</Button>
80 <Label X="-11" Y="-51" Width="400" Height="34" FontId="3" DisablePrefix="yes" VisibleCondition="WixStdBARestartRequired">
@@ -92,8 +92,8 @@
92 <Text>#(loc.FailureHeader)</Text>
93 <Text Condition="WixBundleAction = 2">#(loc.FailureLayoutHeader)</Text>
94 <Text Condition="WixBundleAction = 3">#(loc.FailureUninstallHeader)</Text>
95 - <Text Condition="WixBundleAction = 4">#(loc.FailureInstallHeader)</Text>
96 - <Text Condition="WixBundleAction = 6">#(loc.FailureRepairHeader)</Text>
95 + <Text Condition="WixBundleAction = 5">#(loc.FailureInstallHeader)</Text>
96 + <Text Condition="WixBundleAction = 7">#(loc.FailureRepairHeader)</Text>
97 </Label>
98 <Hypertext Name="FailureLogFileLink" X="11" Y="121" Width="-11" Height="42" FontId="3" TabStop="yes" HideWhenDisabled="yes">#(loc.FailureHyperlinkLogText)</Hypertext>
99 <Hypertext Name="FailureMessageText" X="22" Y="163" Width="-11" Height="51" FontId="3" TabStop="yes" HideWhenDisabled="yes" />
src/wixstdba/Resources/RtfTheme.xml
+4 -4
@@ -71,8 +71,8 @@
71 <Text>#(loc.SuccessHeader)</Text>
72 <Text Condition="WixBundleAction = 2">#(loc.SuccessLayoutHeader)</Text>
73 <Text Condition="WixBundleAction = 3">#(loc.SuccessUninstallHeader)</Text>
74 - <Text Condition="WixBundleAction = 4">#(loc.SuccessInstallHeader)</Text>
75 - <Text Condition="WixBundleAction = 6">#(loc.SuccessRepairHeader)</Text>
74 + <Text Condition="WixBundleAction = 5">#(loc.SuccessInstallHeader)</Text>
75 + <Text Condition="WixBundleAction = 7">#(loc.SuccessRepairHeader)</Text>
76 </Label>
77 <Button Name="LaunchButton" X="-91" Y="-11" Width="75" Height="23" TabStop="yes" FontId="0" HideWhenDisabled="yes">#(loc.SuccessLaunchButton)</Button>
78 <Label X="-11" Y="-51" Width="400" Height="34" FontId="3" DisablePrefix="yes" VisibleCondition="WixStdBARestartRequired">
@@ -90,8 +90,8 @@
90 <Text>#(loc.FailureHeader)</Text>
91 <Text Condition="WixBundleAction = 2">#(loc.FailureLayoutHeader)</Text>
92 <Text Condition="WixBundleAction = 3">#(loc.FailureUninstallHeader)</Text>
93 - <Text Condition="WixBundleAction = 4">#(loc.FailureInstallHeader)</Text>
94 - <Text Condition="WixBundleAction = 6">#(loc.FailureRepairHeader)</Text>
93 + <Text Condition="WixBundleAction = 5">#(loc.FailureInstallHeader)</Text>
94 + <Text Condition="WixBundleAction = 7">#(loc.FailureRepairHeader)</Text>
95 </Label>
96 <Hypertext Name="FailureLogFileLink" X="11" Y="121" Width="-11" Height="42" FontId="3" TabStop="yes" HideWhenDisabled="yes">#(loc.FailureHyperlinkLogText)</Hypertext>
97 <Hypertext Name="FailureMessageText" X="22" Y="163" Width="-11" Height="51" FontId="3" TabStop="yes" HideWhenDisabled="yes" />