Rietveld Code Review Tool
Help | Bug tracker | Discussion group | Source code

Side by Side Diff: installer/src/msi/adblockplusie.wxs

Issue 4657627648753664: Issue #1235 - Add icon for ABP in the Windows control panel (Closed)
Patch Set: Created Jan. 5, 2015, 1:33 a.m.
Left:
Right:
Use n/p to move between diff chunks; N/P to move between comments.
Jump to:
View unified diff | Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 <?xml version="1.0" encoding="UTF-8"?> 1 <?xml version="1.0" encoding="UTF-8"?>
2 <!-- 2 <!--
3 Compilation Note: 3 Compilation Note:
4 You may see linking errors that look like these: 4 You may see linking errors that look like these:
5 <quote>LGHT0217 : Error executing ICE action 'ICExx' [...] The error code is 2738.</quote> 5 <quote>LGHT0217 : Error executing ICE action 'ICExx' [...] The error code is 2738.</quote>
6 The documentation for this error code talks about custom actions, 6 The documentation for this error code talks about custom actions,
7 even though the CustomAction keyword does not appear in this source. 7 even though the CustomAction keyword does not appear in this source.
8 Certain WiX elements are implemented by MSI custom actions, 8 Certain WiX elements are implemented by MSI custom actions,
9 which means this source implicitly declares some insofar as the Windows Inst aller sees it. 9 which means this source implicitly declares some insofar as the Windows Inst aller sees it.
10 These errors are benign and can be avoided by some fiddling with the registry on the development machine. 10 These errors are benign and can be avoided by some fiddling with the registry on the development machine.
(...skipping 127 matching lines...) Expand 10 before | Expand all | Expand 10 after
138 AllowDowngrades="yes" 138 AllowDowngrades="yes"
139 /> 139 />
140 <MediaTemplate EmbedCab="yes"/> 140 <MediaTemplate EmbedCab="yes"/>
141 141
142 <!-- 142 <!--
143 User interface 143 User interface
144 --> 144 -->
145 <UIRef Id="custom_WixUI_InstallDir"/> 145 <UIRef Id="custom_WixUI_InstallDir"/>
146 <UIRef Id="WixUI_ErrorProgressText"/> 146 <UIRef Id="WixUI_ErrorProgressText"/>
147 <Property Id="WIXUI_INSTALLDIR" Value="INSTALLFOLDER"/> 147 <Property Id="WIXUI_INSTALLDIR" Value="INSTALLFOLDER"/>
148
149 <!--
150 Icon for Add/Remove Programs
151
152 It currently uses the blocking icon.
153 When #1538 is ready, we may have a separate icon file for this.
154 -->
155 <Icon Id="program_icon" SourceFile="$(var.plugin_dir)\src\res\blocking.ico"/ >
156 <Property Id="ARPPRODUCTICON" Value="program_icon"/>
148 157
149 <!-- 158 <!--
150 Define and schedule a "Custom Action Type 1" to ensure that IE is closed b efore installation. 159 Define and schedule a "Custom Action Type 1" to ensure that IE is closed b efore installation.
151 Because WiX is closely tied to the MSI database format, there are multiple tags required to do this. 160 Because WiX is closely tied to the MSI database format, there are multiple tags required to do this.
152 The "CustomAction" tag defines the tag itself, but doesn't sequence it; 161 The "CustomAction" tag defines the tag itself, but doesn't sequence it;
153 it defines an entry in the "CustomAction" table. 162 it defines an entry in the "CustomAction" table.
154 The "Binary" tag describe an asset that's incorporated into the MSI but th at is not an installed component. 163 The "Binary" tag describe an asset that's incorporated into the MSI but th at is not an installed component.
155 The "Custom" tag defines when the action executes by defining an entry in one of the sequence tables. 164 The "Custom" tag defines when the action executes by defining an entry in one of the sequence tables.
156 165
157 Attribute "Return" sets the "Custom Action Return Processing Options" to z ero, 166 Attribute "Return" sets the "Custom Action Return Processing Options" to z ero,
(...skipping 656 matching lines...) Expand 10 before | Expand all | Expand 10 after
814 <Component Id="ini_settings.ini" Guid="dc30c3b0-d713-11e2-8b8b-0800200c9 a66"> 823 <Component Id="ini_settings.ini" Guid="dc30c3b0-d713-11e2-8b8b-0800200c9 a66">
815 <File Name="settings.ini"/> 824 <File Name="settings.ini"/>
816 </Component> 825 </Component>
817 </Directory> 826 </Directory>
818 </DirectoryRef> 827 </DirectoryRef>
819 828
820 <?include ../installer-lib/custom-i18n.wxi ?> 829 <?include ../installer-lib/custom-i18n.wxi ?>
821 <?include ../custom-action/close_ie.wxi ?> 830 <?include ../custom-action/close_ie.wxi ?>
822 </Product> 831 </Product>
823 </Wix> 832 </Wix>
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld