Side by Side Diff: installer/src/msi/custom_WixUI_InstallDir.wxs
Issue 4805711393456128:
Remove the Repair button from Programs and Features. Fix the CA. (Closed)
Patch Set:
Created June 30, 2014, 4:28 p.m.
| Left: | ||
| Right: |
Use n/p to move between diff chunks;
N/P to move between comments.
« no previous file with comments
|
« installer/src/msi/adblockplusie.wxs ('k')
|
no next file »
|
no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')
| OLD | NEW |
|---|---|
| 1 <?xml version="1.0" encoding="UTF-8"?> | 1 <?xml version="1.0" encoding="UTF-8"?> |
| 2 <!-- | 2 <!-- |
| 3 <copyright file="WixUI_InstallDir.wxs" company="Outercurve Foundation"> | 3 <copyright file="WixUI_InstallDir.wxs" company="Outercurve Foundation"> |
| 4 Copyright (c) 2004, Outercurve Foundation. | 4 Copyright (c) 2004, Outercurve Foundation. |
| 5 This software is released under Microsoft Reciprocal License (MS-RL). | 5 This software is released under Microsoft Reciprocal License (MS-RL). |
| 6 The license and further copyright text can be found in the file | 6 The license and further copyright text can be found in the file |
| 7 LICENSE.TXT at the root directory of the distribution. | 7 LICENSE.TXT at the root directory of the distribution. |
| 8 </copyright> | 8 </copyright> |
| 9 Modified to remove license dialog. | 9 Modified to remove license dialog. |
| 10 --> | 10 --> |
| (...skipping 46 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 57 <Publish Dialog="VerifyReadyDlg" Control="Back" Event="NewDialog" Va lue="WelcomeDlg" Order="1">NOT Installed</Publish> | 57 <Publish Dialog="VerifyReadyDlg" Control="Back" Event="NewDialog" Va lue="WelcomeDlg" Order="1">NOT Installed</Publish> |
| 58 <Publish Dialog="VerifyReadyDlg" Control="Back" Event="NewDialog" Va lue="MaintenanceTypeDlg" Order="2">Installed AND NOT PATCH</Publish> | 58 <Publish Dialog="VerifyReadyDlg" Control="Back" Event="NewDialog" Va lue="MaintenanceTypeDlg" Order="2">Installed AND NOT PATCH</Publish> |
| 59 <Publish Dialog="VerifyReadyDlg" Control="Back" Event="NewDialog" Va lue="WelcomeDlg" Order="2">Installed AND PATCH</Publish> | 59 <Publish Dialog="VerifyReadyDlg" Control="Back" Event="NewDialog" Va lue="WelcomeDlg" Order="2">Installed AND PATCH</Publish> |
| 60 | 60 |
| 61 <Publish Dialog="MaintenanceWelcomeDlg" Control="Next" Event="NewDia log" Value="MaintenanceTypeDlg">1</Publish> | 61 <Publish Dialog="MaintenanceWelcomeDlg" Control="Next" Event="NewDia log" Value="MaintenanceTypeDlg">1</Publish> |
| 62 | 62 |
| 63 <Publish Dialog="MaintenanceTypeDlg" Control="RepairButton" Event="N ewDialog" Value="VerifyReadyDlg">1</Publish> | 63 <Publish Dialog="MaintenanceTypeDlg" Control="RepairButton" Event="N ewDialog" Value="VerifyReadyDlg">1</Publish> |
| 64 <Publish Dialog="MaintenanceTypeDlg" Control="RemoveButton" Event="N ewDialog" Value="VerifyReadyDlg">1</Publish> | 64 <Publish Dialog="MaintenanceTypeDlg" Control="RemoveButton" Event="N ewDialog" Value="VerifyReadyDlg">1</Publish> |
| 65 <Publish Dialog="MaintenanceTypeDlg" Control="Back" Event="NewDialog " Value="MaintenanceWelcomeDlg">1</Publish> | 65 <Publish Dialog="MaintenanceTypeDlg" Control="Back" Event="NewDialog " Value="MaintenanceWelcomeDlg">1</Publish> |
| 66 | 66 |
| 67 <Property Id="ARPNOMODIFY" Value="1" /> | 67 <!-- |
| 68 Remove the "Modify" and "Repair" buttons from our control panel entry. | |
| 69 Since we only have a single feature, there's only a single way of installi ng the plugin, | |
| 70 and thus modifying the installation can't possibly do anything. | |
| 71 This is currently set by the WiXUI property WIXUI_INSTALLDIR, so it's comm ented out now. | |
|
Eric
2014/07/18 16:56:09
The comment about "commented out" is no longer tru
| |
| 72 --> | |
| 73 <Property Id="ARPNOMODIFY" Value="1"/> | |
| 74 <Property Id="ARPNOREPAIR" Value="1"/> | |
| 75 | |
| 76 | |
| 68 </UI> | 77 </UI> |
| 69 | 78 |
| 70 <UIRef Id="WixUI_Common" /> | 79 <UIRef Id="WixUI_Common" /> |
| 71 </Fragment> | 80 </Fragment> |
| 72 </Wix> | 81 </Wix> |
| OLD | NEW |
« no previous file with comments
|
« installer/src/msi/adblockplusie.wxs ('k')
|
no next file »
|
no next file with comments »
