WIXFEAT4149 #188

Merged
merged 2 commits into from Jan 30, 2015

Projects

None yet

4 participants

@PavelAnfimov
Contributor

Hello, we want you to present our "lightweight" implementation WIXFEAT4149. In the discussion on the wix-devs, you have not come to a consensus, or discussing labor-intensive solutions. This implementation is easy to develop and support, because it requires minimal modifications as WixStandardBA as themes.

@PavelAnfimov PavelAnfimov WIXFEAT4149
Adding support to WixStdBA for displaying the message "Uninstall Successful"/"Repair Successful" after product uninstall/repair.
d863029
@bdwade100

Thank you--we look forward to this being included in 3.10.

@rseanhall
Member

From meeting #48, we can't make these kind of changes to the stock theme files. The only thing we can take is the changes to the code of WixStdBA.

@barnson barnson commented on an outdated diff Dec 11, 2014
...lExtension/wixstdba/Resources/HyperlinkLargeTheme.xml
@@ -47,14 +47,20 @@
<Button Name="ModifyCancelButton" X="-11" Y="-11" Width="75" Height="23" TabStop="yes" FontId="0">#(loc.ModifyCloseButton)</Button>
</Page>
<Page Name="Success">
- <Text X="11" Y="80" Width="-11" Height="30" FontId="2" DisablePrefix="yes">#(loc.SuccessHeader)</Text>
+ <Text Name="SuccessHeader" X="11" Y="80" Width="-11" Height="30" FontId="2" HideWhenDisabled="yes" DisablePrefix="yes">#(loc.SuccessHeader)</Text>
+ <Text Name="SuccessSetupHeader" X="11" Y="80" Width="-11" Height="30" FontId="2" HideWhenDisabled="yes" DisablePrefix="yes">#(loc.SuccessSetupHeader)</Text>
@barnson
barnson Dec 11, 2014 Member

Please rename to SuccessInstallHeader, to match the action. ("SuccessHeader" is the generic one; this is specific to the install action so it should match the ones for repair and uninstall.)

@barnson barnson commented on an outdated diff Dec 11, 2014
...lExtension/wixstdba/Resources/HyperlinkLargeTheme.xml
<Button Name="LaunchButton" X="-91" Y="-11" Width="75" Height="23" TabStop="yes" FontId="0" HideWhenDisabled="yes">#(loc.SuccessLaunchButton)</Button>
<Text Name="SuccessRestartText" X="-11" Y="-51" Width="400" Height="34" FontId="3" HideWhenDisabled="yes" DisablePrefix="yes">#(loc.SuccessRestartText)</Text>
<Button Name="SuccessRestartButton" X="-91" Y="-11" Width="75" Height="23" TabStop="yes" FontId="0" HideWhenDisabled="yes">#(loc.SuccessRestartButton)</Button>
<Button Name="SuccessCancelButton" X="-11" Y="-11" Width="75" Height="23" TabStop="yes" FontId="0">#(loc.SuccessCloseButton)</Button>
</Page>
<Page Name="Failure">
- <Text X="11" Y="80" Width="-11" Height="30" FontId="2" DisablePrefix="yes">#(loc.FailureHeader)</Text>
+ <Text Name="FailureHeader" X="11" Y="80" Width="-11" Height="30" FontId="2" HideWhenDisabled="yes" DisablePrefix="yes">#(loc.FailureHeader)</Text>
+ <Text Name="FailureSetupHeader" X="11" Y="80" Width="-11" Height="30" FontId="2" HideWhenDisabled="yes" DisablePrefix="yes">#(loc.FailureSetupHeader)</Text>
@barnson
barnson Dec 11, 2014 Member

As above, please rename to FailureInstallHeader.

@barnson barnson commented on an outdated diff Dec 11, 2014
...xtension/wixstdba/Resources/HyperlinkSidebarTheme.xml
@@ -57,7 +57,10 @@
<Page Name="Success">
<Text X="185" Y="11" Width="-11" Height="32" FontId="1" DisablePrefix="yes">#(loc.Title)</Text>
<Image X="11" Y="11" Width="165" Height="400" ImageFile="logoside.png"/>
- <Text X="185" Y="50" Width="-11" Height="30" FontId="2" DisablePrefix="yes">#(loc.SuccessHeader)</Text>
+ <Text Name="SuccessHeader" X="185" Y="50" Width="-11" Height="30" FontId="2" HideWhenDisabled="yes" DisablePrefix="yes">#(loc.SuccessHeader)</Text>
+ <Text Name="SuccessSetupHeader" X="185" Y="50" Width="-11" Height="100" FontId="2" HideWhenDisabled="yes" DisablePrefix="yes">#(loc.SuccessSetupHeader)</Text>
@barnson
barnson Dec 11, 2014 Member

As above.

@barnson barnson commented on an outdated diff Dec 11, 2014
...xtension/wixstdba/Resources/HyperlinkSidebarTheme.xml
@@ -66,7 +69,10 @@
<Page Name="Failure">
<Text X="185" Y="11" Width="-11" Height="32" FontId="1" DisablePrefix="yes">#(loc.Title)</Text>
<Image X="11" Y="11" Width="165" Height="400" ImageFile="logoside.png"/>
- <Text X="185" Y="50" Width="-11" Height="30" FontId="2" DisablePrefix="yes">#(loc.FailureHeader)</Text>
+ <Text Name="FailureHeader" X="185" Y="50" Width="-11" Height="30" FontId="2" HideWhenDisabled="yes" DisablePrefix="yes">#(loc.FailureHeader)</Text>
+ <Text Name="FailureSetupHeader" X="185" Y="50" Width="-11" Height="30" FontId="2" HideWhenDisabled="yes" DisablePrefix="yes">#(loc.FailureSetupHeader)</Text>
@barnson
barnson Dec 11, 2014 Member

As above.

@barnson barnson commented on an outdated diff Dec 11, 2014
...xt/BalExtension/wixstdba/Resources/HyperlinkTheme.wxl
@@ -35,12 +35,18 @@
<String Id="ModifyRepairButton">&amp;Repair</String>
<String Id="ModifyUninstallButton">&amp;Uninstall</String>
<String Id="ModifyCloseButton">&amp;Close</String>
- <String Id="SuccessHeader">Setup Successful</String>
+ <String Id="SuccessRepairHeader">Repair Successfully Completed</String>
+ <String Id="SuccessUninstallHeader">Uninstall Successfully Completed</String>
+ <String Id="SuccessSetupHeader">Installation Successfully Completed</String>
@barnson
barnson Dec 11, 2014 Member

As above.

@barnson barnson commented on an outdated diff Dec 11, 2014
...xt/BalExtension/wixstdba/Resources/HyperlinkTheme.wxl
<String Id="SuccessLaunchButton">&amp;Launch</String>
<String Id="SuccessRestartText">You must restart your computer before you can use the software.</String>
<String Id="SuccessRestartButton">&amp;Restart</String>
<String Id="SuccessCloseButton">&amp;Close</String>
<String Id="FailureHeader">Setup Failed</String>
+ <String Id="FailureSetupHeader">Setup Failed</String>
@barnson
barnson Dec 11, 2014 Member

As above.

@barnson barnson commented on an outdated diff Dec 11, 2014
...xt/BalExtension/wixstdba/Resources/HyperlinkTheme.xml
@@ -44,14 +44,20 @@
<Button Name="ModifyCancelButton" X="-11" Y="-11" Width="75" Height="23" TabStop="yes" FontId="0">#(loc.ModifyCloseButton)</Button>
</Page>
<Page Name="Success">
- <Text X="11" Y="80" Width="-11" Height="30" FontId="2" DisablePrefix="yes">#(loc.SuccessHeader)</Text>
+ <Text Name="SuccessHeader" X="11" Y="80" Width="-11" Height="30" FontId="2" HideWhenDisabled="yes" DisablePrefix="yes">#(loc.SuccessHeader)</Text>
+ <Text Name="SuccessSetupHeader" X="11" Y="80" Width="-11" Height="30" FontId="2" HideWhenDisabled="yes" DisablePrefix="yes">#(loc.SuccessSetupHeader)</Text>
@barnson
barnson Dec 11, 2014 Member

As above.

@barnson barnson commented on an outdated diff Dec 11, 2014
...xt/BalExtension/wixstdba/Resources/HyperlinkTheme.xml
<Button Name="LaunchButton" X="-91" Y="-11" Width="75" Height="23" TabStop="yes" FontId="0" HideWhenDisabled="yes">#(loc.SuccessLaunchButton)</Button>
<Text Name="SuccessRestartText" X="-11" Y="-51" Width="400" Height="34" FontId="3" HideWhenDisabled="yes" DisablePrefix="yes">#(loc.SuccessRestartText)</Text>
<Button Name="SuccessRestartButton" X="-91" Y="-11" Width="75" Height="23" TabStop="yes" FontId="0" HideWhenDisabled="yes">#(loc.SuccessRestartButton)</Button>
<Button Name="SuccessCancelButton" X="-11" Y="-11" Width="75" Height="23" TabStop="yes" FontId="0">#(loc.SuccessCloseButton)</Button>
</Page>
<Page Name="Failure">
- <Text X="11" Y="80" Width="-11" Height="30" FontId="2" DisablePrefix="yes">#(loc.FailureHeader)</Text>
+ <Text Name="FailureHeader" X="11" Y="80" Width="-11" Height="30" FontId="2" HideWhenDisabled="yes" DisablePrefix="yes">#(loc.FailureHeader)</Text>
+ <Text Name="FailureSetupHeader" X="11" Y="80" Width="-11" Height="30" FontId="2" HideWhenDisabled="yes" DisablePrefix="yes">#(loc.FailureSetupHeader)</Text>
@barnson
barnson Dec 11, 2014 Member

As above.

@barnson barnson commented on an outdated diff Dec 11, 2014
...ext/BalExtension/wixstdba/Resources/RtfLargeTheme.xml
@@ -46,14 +46,20 @@
<Button Name="ModifyCancelButton" X="-11" Y="-11" Width="75" Height="23" TabStop="yes" FontId="0">#(loc.ModifyCloseButton)</Button>
</Page>
<Page Name="Success">
- <Text X="11" Y="80" Width="-11" Height="30" FontId="2" DisablePrefix="yes">#(loc.SuccessHeader)</Text>
+ <Text Name="SuccessHeader" X="11" Y="80" Width="-11" Height="30" FontId="2" HideWhenDisabled="yes" DisablePrefix="yes">#(loc.SuccessHeader)</Text>
+ <Text Name="SuccessSetupHeader" X="11" Y="80" Width="-11" Height="30" FontId="2" HideWhenDisabled="yes" DisablePrefix="yes">#(loc.SuccessSetupHeader)</Text>
@barnson
barnson Dec 11, 2014 Member

As above.

@barnson barnson commented on an outdated diff Dec 11, 2014
...ext/BalExtension/wixstdba/Resources/RtfLargeTheme.xml
<Button Name="LaunchButton" X="-91" Y="-11" Width="75" Height="23" TabStop="yes" FontId="0" HideWhenDisabled="yes">#(loc.SuccessLaunchButton)</Button>
<Text Name="SuccessRestartText" X="-11" Y="-51" Width="400" Height="34" FontId="3" HideWhenDisabled="yes" DisablePrefix="yes">#(loc.SuccessRestartText)</Text>
<Button Name="SuccessRestartButton" X="-91" Y="-11" Width="75" Height="23" TabStop="yes" FontId="0" HideWhenDisabled="yes">#(loc.SuccessRestartButton)</Button>
<Button Name="SuccessCancelButton" X="-11" Y="-11" Width="75" Height="23" TabStop="yes" FontId="0">#(loc.SuccessCloseButton)</Button>
</Page>
<Page Name="Failure">
- <Text X="11" Y="80" Width="-11" Height="30" FontId="2" DisablePrefix="yes">#(loc.FailureHeader)</Text>
+ <Text Name="FailureHeader" X="11" Y="80" Width="-11" Height="30" FontId="2" HideWhenDisabled="yes" DisablePrefix="yes">#(loc.FailureHeader)</Text>
+ <Text Name="FailureSetupHeader" X="11" Y="80" Width="-11" Height="30" FontId="2" HideWhenDisabled="yes" DisablePrefix="yes">#(loc.FailureSetupHeader)</Text>
@barnson
barnson Dec 11, 2014 Member

As above.

@barnson barnson commented on an outdated diff Dec 11, 2014
src/ext/BalExtension/wixstdba/Resources/RtfTheme.wxl
@@ -32,12 +32,18 @@
<String Id="ModifyRepairButton">&amp;Repair</String>
<String Id="ModifyUninstallButton">&amp;Uninstall</String>
<String Id="ModifyCloseButton">&amp;Close</String>
- <String Id="SuccessHeader">Setup Successful</String>
+ <String Id="SuccessRepairHeader">Repair Successfully Completed</String>
+ <String Id="SuccessUninstallHeader">Uninstall Successfully Completed</String>
+ <String Id="SuccessSetupHeader">Installation Successfully Completed</String>
@barnson
barnson Dec 11, 2014 Member

As above.

@barnson barnson commented on an outdated diff Dec 11, 2014
src/ext/BalExtension/wixstdba/Resources/RtfTheme.wxl
<String Id="SuccessLaunchButton">&amp;Launch</String>
<String Id="SuccessRestartText">You must restart your computer before you can use the software.</String>
<String Id="SuccessRestartButton">&amp;Restart</String>
<String Id="SuccessCloseButton">&amp;Close</String>
<String Id="FailureHeader">Setup Failed</String>
+ <String Id="FailureSetupHeader">Setup Failed</String>
@barnson
barnson Dec 11, 2014 Member

As above.

@barnson barnson commented on an outdated diff Dec 11, 2014
src/ext/BalExtension/wixstdba/Resources/RtfTheme.xml
@@ -44,14 +44,20 @@
<Button Name="ModifyCancelButton" X="-11" Y="-11" Width="75" Height="23" TabStop="yes" FontId="0">#(loc.ModifyCloseButton)</Button>
</Page>
<Page Name="Success">
- <Text X="11" Y="80" Width="-11" Height="30" FontId="2" DisablePrefix="yes">#(loc.SuccessHeader)</Text>
+ <Text Name="SuccessHeader" X="11" Y="80" Width="-11" Height="30" FontId="2" HideWhenDisabled="yes" DisablePrefix="yes">#(loc.SuccessHeader)</Text>
+ <Text Name="SuccessSetupHeader" X="11" Y="80" Width="-11" Height="30" FontId="2" HideWhenDisabled="yes" DisablePrefix="yes">#(loc.SuccessSetupHeader)</Text>
@barnson
barnson Dec 11, 2014 Member

As above.

@barnson barnson commented on an outdated diff Dec 11, 2014
src/ext/BalExtension/wixstdba/Resources/RtfTheme.xml
<Button Name="LaunchButton" X="-91" Y="-11" Width="75" Height="23" TabStop="yes" FontId="0" HideWhenDisabled="yes">#(loc.SuccessLaunchButton)</Button>
<Text Name="SuccessRestartText" X="-11" Y="-51" Width="400" Height="34" FontId="3" HideWhenDisabled="yes" DisablePrefix="yes">#(loc.SuccessRestartText)</Text>
<Button Name="SuccessRestartButton" X="-91" Y="-11" Width="75" Height="23" TabStop="yes" FontId="0" HideWhenDisabled="yes">#(loc.SuccessRestartButton)</Button>
<Button Name="SuccessCancelButton" X="-11" Y="-11" Width="75" Height="23" TabStop="yes" FontId="0">#(loc.SuccessCloseButton)</Button>
</Page>
<Page Name="Failure">
- <Text X="11" Y="80" Width="-11" Height="30" FontId="2" DisablePrefix="yes">#(loc.FailureHeader)</Text>
+ <Text Name="FailureHeader" X="11" Y="80" Width="-11" Height="30" FontId="2" HideWhenDisabled="yes" DisablePrefix="yes">#(loc.FailureHeader)</Text>
+ <Text Name="FailureSetupHeader" X="11" Y="80" Width="-11" Height="30" FontId="2" HideWhenDisabled="yes" DisablePrefix="yes">#(loc.FailureSetupHeader)</Text>
@barnson
barnson Dec 11, 2014 Member

As above.

@barnson barnson commented on an outdated diff Dec 11, 2014
src/ext/BalExtension/wixstdba/Resources/mbapreq.thm
@@ -28,7 +28,10 @@
<Button Name="ProgressCancelButton" X="-11" Y="-11" Width="75" Height="23" TabStop="yes" FontId="0">#(loc.ProgressCancelButton)</Button>
</Page>
<Page Name="Failure">
- <Text X="11" Y="112" Width="-11" Height="30" FontId="2" DisablePrefix="yes">#(loc.FailureHeader)</Text>
+ <Text Name="FailureHeader" X="11" Y="112" Width="-11" Height="30" FontId="2" HideWhenDisabled="yes" DisablePrefix="yes">#(loc.FailureHeader)</Text>
+ <Text Name="FailureSetupHeader" X="11" Y="112" Width="-11" Height="30" FontId="2" HideWhenDisabled="yes" DisablePrefix="yes">#(loc.FailureSetupHeader)</Text>
@barnson
barnson Dec 11, 2014 Member

As above.

@barnson barnson commented on an outdated diff Dec 11, 2014
src/ext/BalExtension/wixstdba/Resources/mbapreq.wxl
@@ -17,6 +17,9 @@
<String Id="ProgressLabel">Processing:</String>
<String Id="ProgressCancelButton">&amp;Cancel</String>
<String Id="FailureHeader">Setup Failed</String>
+ <String Id="FailureSetupHeader">Setup Failed</String>
@barnson
barnson Dec 11, 2014 Member

As above.

@barnson barnson commented on an outdated diff Dec 11, 2014
...nsion/wixstdba/WixStandardBootstrapperApplication.cpp
@@ -130,6 +130,11 @@ enum WIXSTDBA_CONTROL
WIXSTDBA_CONTROL_SUCCESS_RESTART_TEXT,
WIXSTDBA_CONTROL_SUCCESS_RESTART_BUTTON,
WIXSTDBA_CONTROL_SUCCESS_CANCEL_BUTTON,
+
+ WIXSTDBA_CONTROL_SUCCESS_HEADER,
+ WIXSTDBA_CONTROL_SUCCESS_SETUP_HEADER,
@barnson
barnson Dec 11, 2014 Member

As above.

@barnson barnson commented on an outdated diff Dec 11, 2014
...nsion/wixstdba/WixStandardBootstrapperApplication.cpp
@@ -137,6 +142,11 @@ enum WIXSTDBA_CONTROL
WIXSTDBA_CONTROL_FAILURE_RESTART_TEXT,
WIXSTDBA_CONTROL_FAILURE_RESTART_BUTTON,
WIXSTDBA_CONTROL_FAILURE_CANCEL_BUTTON,
+
+ WIXSTDBA_CONTROL_FAILURE_HEADER,
+ WIXSTDBA_CONTROL_FAILURE_SETUP_HEADER,
@barnson
barnson Dec 11, 2014 Member

As above.

@barnson barnson commented on an outdated diff Dec 11, 2014
...nsion/wixstdba/WixStandardBootstrapperApplication.cpp
@@ -2154,6 +2174,28 @@ class CWixStandardBootstrapperApplication : public CBalBaseBootstrapperApplicati
ThemeControlEnable(m_pTheme, WIXSTDBA_CONTROL_LAUNCH_BUTTON, fLaunchTargetExists && BOOTSTRAPPER_ACTION_UNINSTALL < m_plannedAction);
ThemeControlEnable(m_pTheme, WIXSTDBA_CONTROL_SUCCESS_RESTART_TEXT, fShowRestartButton);
ThemeControlEnable(m_pTheme, WIXSTDBA_CONTROL_SUCCESS_RESTART_BUTTON, fShowRestartButton);
+
+ ThemeControlEnable(m_pTheme, WIXSTDBA_CONTROL_SUCCESS_HEADER, TRUE);
@barnson
barnson Dec 11, 2014 Member

Should this always be shown or be in an else block of the following if statement?

@barnson
Member
barnson commented Dec 11, 2014

One rename I'd like you to make for clarity. Otherwise the code correctly handles old themes so I don't see any compatibility concerns. We also need an assignment agreement; see http://wixtoolset.org/development/ for details.

@barnson barnson merged commit 6829bb1 into wixtoolset:develop Jan 30, 2015
@barnson
Member
barnson commented Jan 30, 2015

Thanks!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment