Side by Side Diff: installer/src/msi/adblockplusie.wxs
Issue 6505394822184960:
Issue 1109 - Support notifications (Closed)
Patch Set: fix naming
Created July 29, 2015, 11:18 a.m.
| Left: | ||
| Right: |
Use n/p to move between diff chunks;
N/P to move between comments.
« no previous file with comments
|
« html/templates/NotificationWindow.html ('k')
|
src/engine/Main.cpp » ('j')
|
src/engine/Main.cpp » ('J')
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 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 361 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 372 <ComponentRef Id="html_static_img_social_twitter.png"/> | 372 <ComponentRef Id="html_static_img_social_twitter.png"/> |
| 373 <ComponentRef Id="html_static_js_firstRun.js"/> | 373 <ComponentRef Id="html_static_js_firstRun.js"/> |
| 374 <ComponentRef Id="html_static_js_IESettings.js"/> | 374 <ComponentRef Id="html_static_js_IESettings.js"/> |
| 375 <ComponentRef Id="html_static_js_ieEventListenerPolyfill.js"/> | 375 <ComponentRef Id="html_static_js_ieEventListenerPolyfill.js"/> |
| 376 <ComponentRef Id="html_static_js_ieFirstRun.js"/> | 376 <ComponentRef Id="html_static_js_ieFirstRun.js"/> |
| 377 <ComponentRef Id="html_static_js_settings.js"/> | 377 <ComponentRef Id="html_static_js_settings.js"/> |
| 378 <ComponentRef Id="html_static_js_vendor_DD.belatedPNG.js"/> | 378 <ComponentRef Id="html_static_js_vendor_DD.belatedPNG.js"/> |
| 379 <ComponentRef Id="html_static_js_vendor_html5shiv.js"/> | 379 <ComponentRef Id="html_static_js_vendor_html5shiv.js"/> |
| 380 <ComponentRef Id="html_templates_firstRun.html"/> | 380 <ComponentRef Id="html_templates_firstRun.html"/> |
| 381 <ComponentRef Id="html_templates_index.html"/> | 381 <ComponentRef Id="html_templates_index.html"/> |
| 382 <ComponentRef Id="html_templates_NotificationWindow.html"/> | |
| 382 </ComponentGroup> | 383 </ComponentGroup> |
| 383 | 384 |
| 384 <DirectoryRef Id="HTML_Folder"> | 385 <DirectoryRef Id="HTML_Folder"> |
| 385 <Directory Id="html" FileSource="$(var.plugin_dir)\html"> | 386 <Directory Id="html" FileSource="$(var.plugin_dir)\html"> |
| 386 <Directory Name="static" Id="html_static"> | 387 <Directory Name="static" Id="html_static"> |
| 387 <Directory Name="css" Id="html_static_css"> | 388 <Directory Name="css" Id="html_static_css"> |
| 388 <Component Id="html_static_css_firstRun.css" Guid="facb02d0-f073-11e 2-b778-0800200c9a66"> | 389 <Component Id="html_static_css_firstRun.css" Guid="facb02d0-f073-11e 2-b778-0800200c9a66"> |
| 389 <File Name="firstRun.css"/> | 390 <File Name="firstRun.css"/> |
| 390 </Component> | 391 </Component> |
| 391 <Component Id="html_static_css_settings.css" Guid="07173c90-d713-11e 2-8b8b-0800200c9a66"> | 392 <Component Id="html_static_css_settings.css" Guid="07173c90-d713-11e 2-8b8b-0800200c9a66"> |
| (...skipping 76 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 468 </Directory> | 469 </Directory> |
| 469 </Directory> | 470 </Directory> |
| 470 </Directory> | 471 </Directory> |
| 471 <Directory Name="templates" Id="html_templates"> | 472 <Directory Name="templates" Id="html_templates"> |
| 472 <Component Id="html_templates_firstRun.html" Guid="3d423d40-f074-11e2- b778-0800200c9a66"> | 473 <Component Id="html_templates_firstRun.html" Guid="3d423d40-f074-11e2- b778-0800200c9a66"> |
| 473 <File Name="firstRun.html"/> | 474 <File Name="firstRun.html"/> |
| 474 </Component> | 475 </Component> |
| 475 <Component Id="html_templates_index.html" Guid="ba2259a0-d713-11e2-8b8 b-0800200c9a66"> | 476 <Component Id="html_templates_index.html" Guid="ba2259a0-d713-11e2-8b8 b-0800200c9a66"> |
| 476 <File Name="index.html"/> | 477 <File Name="index.html"/> |
| 477 </Component> | 478 </Component> |
| 479 <Component Id="html_templates_NotificationWindow.html" Guid="f45572c0- d712-11e2-8b8b-0800200c9a67"> | |
| 480 <File Id="NotificationWindow.html"/> | |
| 481 </Component> | |
| 478 </Directory> | 482 </Directory> |
| 479 </Directory> | 483 </Directory> |
| 480 </DirectoryRef> | 484 </DirectoryRef> |
| 481 | 485 |
| 482 <!-- | 486 <!-- |
| 483 Locale files | 487 Locale files |
| 484 --> | 488 --> |
| 485 <ComponentGroup Id="Locale_Files"> | 489 <ComponentGroup Id="Locale_Files"> |
| 486 <ComponentRef Id="locales_af.ini"/> | 490 <ComponentRef Id="locales_af.ini"/> |
| 487 <ComponentRef Id="locales_am.ini"/> | 491 <ComponentRef Id="locales_am.ini"/> |
| (...skipping 335 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 823 <Component Id="ini_settings.ini" Guid="dc30c3b0-d713-11e2-8b8b-0800200c9 a66"> | 827 <Component Id="ini_settings.ini" Guid="dc30c3b0-d713-11e2-8b8b-0800200c9 a66"> |
| 824 <File Name="settings.ini"/> | 828 <File Name="settings.ini"/> |
| 825 </Component> | 829 </Component> |
| 826 </Directory> | 830 </Directory> |
| 827 </DirectoryRef> | 831 </DirectoryRef> |
| 828 | 832 |
| 829 <?include ../installer-lib/custom-i18n.wxi ?> | 833 <?include ../installer-lib/custom-i18n.wxi ?> |
| 830 <?include ../custom-action/close_ie.wxi ?> | 834 <?include ../custom-action/close_ie.wxi ?> |
| 831 </Product> | 835 </Product> |
| 832 </Wix> | 836 </Wix> |
| OLD | NEW |
« no previous file with comments
|
« html/templates/NotificationWindow.html ('k')
|
src/engine/Main.cpp » ('j')
|
src/engine/Main.cpp » ('J')
