| OLD | NEW |
| 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 342 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 353 <ComponentRef Id="html_static_img_features_language.png"/> | 353 <ComponentRef Id="html_static_img_features_language.png"/> |
| 354 <ComponentRef Id="html_static_img_features_adblocking.png"/> | 354 <ComponentRef Id="html_static_img_features_adblocking.png"/> |
| 355 <ComponentRef Id="html_static_img_social_facebook.png"/> | 355 <ComponentRef Id="html_static_img_social_facebook.png"/> |
| 356 <ComponentRef Id="html_static_img_social_facebook_old.png"/> | 356 <ComponentRef Id="html_static_img_social_facebook_old.png"/> |
| 357 <ComponentRef Id="html_static_img_social_gplus.png"/> | 357 <ComponentRef Id="html_static_img_social_gplus.png"/> |
| 358 <ComponentRef Id="html_static_img_social_gplus_old.png"/> | 358 <ComponentRef Id="html_static_img_social_gplus_old.png"/> |
| 359 <ComponentRef Id="html_static_img_social_twitter.png"/> | 359 <ComponentRef Id="html_static_img_social_twitter.png"/> |
| 360 <ComponentRef Id="html_static_img_social_twitter_old.png"/> | 360 <ComponentRef Id="html_static_img_social_twitter_old.png"/> |
| 361 <ComponentRef Id="html_static_js_firstRun.js"/> | 361 <ComponentRef Id="html_static_js_firstRun.js"/> |
| 362 <ComponentRef Id="html_static_js_IESettings.js"/> | 362 <ComponentRef Id="html_static_js_IESettings.js"/> |
| 363 <ComponentRef Id="html_static_js_ieEventListenerPolyfill.js"/> |
| 363 <ComponentRef Id="html_static_js_ieFirstRun.js"/> | 364 <ComponentRef Id="html_static_js_ieFirstRun.js"/> |
| 364 <ComponentRef Id="html_static_js_settings.js"/> | 365 <ComponentRef Id="html_static_js_settings.js"/> |
| 365 <ComponentRef Id="html_static_js_vendor_DD.belatedPNG.js"/> | 366 <ComponentRef Id="html_static_js_vendor_DD.belatedPNG.js"/> |
| 366 <ComponentRef Id="html_static_js_vendor_html5shiv.js"/> | 367 <ComponentRef Id="html_static_js_vendor_html5shiv.js"/> |
| 367 <ComponentRef Id="html_templates_firstRun.html"/> | 368 <ComponentRef Id="html_templates_firstRun.html"/> |
| 368 <ComponentRef Id="html_templates_index.html"/> | 369 <ComponentRef Id="html_templates_index.html"/> |
| 369 </ComponentGroup> | 370 </ComponentGroup> |
| 370 | 371 |
| 371 <DirectoryRef Id="HTML_Folder"> | 372 <DirectoryRef Id="HTML_Folder"> |
| 372 <Directory Id="html" FileSource="$(var.plugin_dir)\html"> | 373 <Directory Id="html" FileSource="$(var.plugin_dir)\html"> |
| (...skipping 65 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 438 </Component> | 439 </Component> |
| 439 </Directory> | 440 </Directory> |
| 440 </Directory> | 441 </Directory> |
| 441 <Directory Name="js" Id="html_static_js"> | 442 <Directory Name="js" Id="html_static_js"> |
| 442 <Component Id="html_static_js_firstRun.js" Guid="2c0035a2-f074-11e2-
b778-0800200c9a66"> | 443 <Component Id="html_static_js_firstRun.js" Guid="2c0035a2-f074-11e2-
b778-0800200c9a66"> |
| 443 <File Name="firstRun.js"/> | 444 <File Name="firstRun.js"/> |
| 444 </Component> | 445 </Component> |
| 445 <Component Id="html_static_js_ieFirstRun.js" Guid="f2a86685-d713-11e
2-8b8b-0800200c9a66"> | 446 <Component Id="html_static_js_ieFirstRun.js" Guid="f2a86685-d713-11e
2-8b8b-0800200c9a66"> |
| 446 <File Name="ieFirstRun.js"/> | 447 <File Name="ieFirstRun.js"/> |
| 447 </Component> | 448 </Component> |
| 449 <Component Id="html_static_js_ieEventListenerPolyfill.js" Guid="a2a8
6688-1713-11e2-8b8b-0800200c9a54"> |
| 450 <File Name="ieEventListenerPolyfill.js"/> |
| 451 </Component> |
| 448 <Component Id="html_static_js_IESettings.js" Guid="9e851b10-d713-11e
2-8b8b-0800200c9a66"> | 452 <Component Id="html_static_js_IESettings.js" Guid="9e851b10-d713-11e
2-8b8b-0800200c9a66"> |
| 449 <File Name="IESettings.js"/> | 453 <File Name="IESettings.js"/> |
| 450 </Component> | 454 </Component> |
| 451 <Component Id="html_static_js_settings.js" Guid="a5908ac0-d713-11e2-
8b8b-0800200c9a66"> | 455 <Component Id="html_static_js_settings.js" Guid="a5908ac0-d713-11e2-
8b8b-0800200c9a66"> |
| 452 <File Name="settings.js"/> | 456 <File Name="settings.js"/> |
| 453 </Component> | 457 </Component> |
| 454 <Directory Name="vendor" Id="html_static_js_vendor"> | 458 <Directory Name="vendor" Id="html_static_js_vendor"> |
| 455 <Component Id="html_static_js_vendor_DD.belatedPNG.js" Guid="ad5a4
160-d713-11e2-8b8b-0800200c9a66"> | 459 <Component Id="html_static_js_vendor_DD.belatedPNG.js" Guid="ad5a4
160-d713-11e2-8b8b-0800200c9a66"> |
| 456 <File Name="DD_belatedPNG.js"/> | 460 <File Name="DD_belatedPNG.js"/> |
| 457 </Component> | 461 </Component> |
| (...skipping 358 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 816 <Component Id="ini_settings.ini" Guid="dc30c3b0-d713-11e2-8b8b-0800200c9
a66"> | 820 <Component Id="ini_settings.ini" Guid="dc30c3b0-d713-11e2-8b8b-0800200c9
a66"> |
| 817 <File Name="settings.ini"/> | 821 <File Name="settings.ini"/> |
| 818 </Component> | 822 </Component> |
| 819 </Directory> | 823 </Directory> |
| 820 </DirectoryRef> | 824 </DirectoryRef> |
| 821 | 825 |
| 822 <?include ../installer-lib/custom-i18n.wxi ?> | 826 <?include ../installer-lib/custom-i18n.wxi ?> |
| 823 <?include ../custom-action/close_ie.wxi ?> | 827 <?include ../custom-action/close_ie.wxi ?> |
| 824 </Product> | 828 </Product> |
| 825 </Wix> | 829 </Wix> |
| OLD | NEW |