| 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 244 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 255 </Component> | 255 </Component> |
| 256 <?endif?> | 256 <?endif?> |
| 257 </ComponentGroup> | 257 </ComponentGroup> |
| 258 | 258 |
| 259 <!-- | 259 <!-- |
| 260 The HTML_Tree component group contains all the files in the HTML folder. | 260 The HTML_Tree component group contains all the files in the HTML folder. |
| 261 Individual file entries within a single component group must all be in the
same directory. | 261 Individual file entries within a single component group must all be in the
same directory. |
| 262 Also, ComponentGroup is not a valid child of ComponentGroup, so subdirecto
ries are linked by reference. | 262 Also, ComponentGroup is not a valid child of ComponentGroup, so subdirecto
ries are linked by reference. |
| 263 --> | 263 --> |
| 264 <ComponentGroup Id="HTML_Tree"> | 264 <ComponentGroup Id="HTML_Tree"> |
| 265 <ComponentRef Id="html_static_css_firstRun.css"/> |
| 265 <ComponentRef Id="html_static_css_settings.css"/> | 266 <ComponentRef Id="html_static_css_settings.css"/> |
| 266 <ComponentRef Id="html_static_img_abp.128.png"/> | 267 <ComponentRef Id="html_static_img_abp.128.png"/> |
| 268 <ComponentRef Id="html_static_img_ajax_loader.gif"/> |
| 267 <ComponentRef Id="html_static_img_background.png"/> | 269 <ComponentRef Id="html_static_img_background.png"/> |
| 268 <ComponentRef Id="html_static_img_bb_disable.png"/> | 270 <ComponentRef Id="html_static_img_bb_disable.png"/> |
| 269 <ComponentRef Id="html_static_img_bb_disable_active.png"/> | 271 <ComponentRef Id="html_static_img_bb_disable_active.png"/> |
| 272 <ComponentRef Id="html_static_img_bb_donate.png"/> |
| 270 <ComponentRef Id="html_static_img_bb_enable.png"/> | 273 <ComponentRef Id="html_static_img_bb_enable.png"/> |
| 271 <ComponentRef Id="html_static_img_bb_enable_active.png"/> | 274 <ComponentRef Id="html_static_img_bb_enable_active.png"/> |
| 275 <ComponentRef Id="html_static_img_checkmark.png"/> |
| 272 <ComponentRef Id="html_static_img_features_language.png"/> | 276 <ComponentRef Id="html_static_img_features_language.png"/> |
| 273 <ComponentRef Id="html_static_img_features_whitelist.png"/> | |
| 274 <ComponentRef Id="html_static_img_features_adblocking.png"/> | 277 <ComponentRef Id="html_static_img_features_adblocking.png"/> |
| 275 <ComponentRef Id="html_static_img_social_facebook.png"/> | 278 <ComponentRef Id="html_static_img_social_facebook.png"/> |
| 279 <ComponentRef Id="html_static_img_social_facebook_old.png"/> |
| 276 <ComponentRef Id="html_static_img_social_gplus.png"/> | 280 <ComponentRef Id="html_static_img_social_gplus.png"/> |
| 281 <ComponentRef Id="html_static_img_social_gplus_old.png"/> |
| 277 <ComponentRef Id="html_static_img_social_twitter.png"/> | 282 <ComponentRef Id="html_static_img_social_twitter.png"/> |
| 283 <ComponentRef Id="html_static_img_social_twitter_old.png"/> |
| 284 <ComponentRef Id="html_static_js_firstRun.js"/> |
| 278 <ComponentRef Id="html_static_js_IESettings.js"/> | 285 <ComponentRef Id="html_static_js_IESettings.js"/> |
| 279 <ComponentRef Id="html_static_js_settings.js"/> | 286 <ComponentRef Id="html_static_js_settings.js"/> |
| 280 <ComponentRef Id="html_static_js_vendor_DD.belatedPNG.js"/> | 287 <ComponentRef Id="html_static_js_vendor_DD.belatedPNG.js"/> |
| 281 <ComponentRef Id="html_static_js_vendor_html5shiv.js"/> | 288 <ComponentRef Id="html_static_js_vendor_html5shiv.js"/> |
| 289 <ComponentRef Id="html_templates_firstRun.html"/> |
| 282 <ComponentRef Id="html_templates_index.html"/> | 290 <ComponentRef Id="html_templates_index.html"/> |
| 283 </ComponentGroup> | 291 </ComponentGroup> |
| 284 | 292 |
| 285 <DirectoryRef Id="HTML_Folder"> | 293 <DirectoryRef Id="HTML_Folder"> |
| 286 <Directory Id="html" FileSource="..\html"> | 294 <Directory Id="html" FileSource="..\html"> |
| 287 <Directory Name="static" Id="html_static"> | 295 <Directory Name="static" Id="html_static"> |
| 288 <Directory Name="css" Id="html_static_css"> | 296 <Directory Name="css" Id="html_static_css"> |
| 297 <Component Id="html_static_css_firstRun.css" Guid="facb02d0-f073-11e
2-b778-0800200c9a66"> |
| 298 <File Name="firstRun.css"/> |
| 299 </Component> |
| 289 <Component Id="html_static_css_settings.css" Guid="07173c90-d713-11e
2-8b8b-0800200c9a66"> | 300 <Component Id="html_static_css_settings.css" Guid="07173c90-d713-11e
2-8b8b-0800200c9a66"> |
| 290 <File Name="settings.css"/> | 301 <File Name="settings.css"/> |
| 291 </Component> | 302 </Component> |
| 292 </Directory> | 303 </Directory> |
| 293 <Directory Name="img" Id="html_static_img"> | 304 <Directory Name="img" Id="html_static_img"> |
| 294 <Component Id="html_static_img_abp.128.png" Guid="0d86ba60-d713-11e2
-8b8b-0800200c9a66"> | 305 <Component Id="html_static_img_abp.128.png" Guid="0d86ba60-d713-11e2
-8b8b-0800200c9a66"> |
| 295 <File Name="abp-128.png"/> | 306 <File Name="abp-128.png"/> |
| 296 </Component> | 307 </Component> |
| 308 <Component Id="html_static_img_ajax_loader.gif" Guid="10cdc6d0-f074-
11e2-b778-0800200c9a66"> |
| 309 <File Name="ajax-loader.gif"/> |
| 310 </Component> |
| 297 <Component Id="html_static_img_background.png" Guid="407e5db0-d713-1
1e2-8b8b-0800200c9a66"> | 311 <Component Id="html_static_img_background.png" Guid="407e5db0-d713-1
1e2-8b8b-0800200c9a66"> |
| 298 <File Name="background.png"/> | 312 <File Name="background.png"/> |
| 299 </Component> | 313 </Component> |
| 300 <Directory Name="button-background" Id="html_static_img_bb"> | 314 <Directory Name="button-background" Id="html_static_img_bb"> |
| 301 <Component Id="html_static_img_bb_disable.png" Guid="580bb950-d713
-11e2-8b8b-0800200c9a66"> | 315 <Component Id="html_static_img_bb_disable.png" Guid="580bb950-d713
-11e2-8b8b-0800200c9a66"> |
| 302 <File Name="disable.png"/> | 316 <File Name="disable.png"/> |
| 303 </Component> | 317 </Component> |
| 304 <Component Id="html_static_img_bb_disable_active.png" Guid="5c0db9
90-d713-11e2-8b8b-0800200c9a66"> | 318 <Component Id="html_static_img_bb_disable_active.png" Guid="5c0db9
90-d713-11e2-8b8b-0800200c9a66"> |
| 305 <File Name="disable_active.png"/> | 319 <File Name="disable_active.png"/> |
| 306 </Component> | 320 </Component> |
| 321 <Component Id="html_static_img_bb_donate.png" Guid="16c8ff00-f074-
11e2-b778-0800200c9a66"> |
| 322 <File Name="donate.png"/> |
| 323 </Component> |
| 307 <Component Id="html_static_img_bb_enable.png" Guid="5fab52b0-d713-
11e2-8b8b-0800200c9a66"> | 324 <Component Id="html_static_img_bb_enable.png" Guid="5fab52b0-d713-
11e2-8b8b-0800200c9a66"> |
| 308 <File Name="enable.png"/> | 325 <File Name="enable.png"/> |
| 309 </Component> | 326 </Component> |
| 310 <Component Id="html_static_img_bb_enable_active.png" Guid="63efb32
0-d713-11e2-8b8b-0800200c9a66"> | 327 <Component Id="html_static_img_bb_enable_active.png" Guid="63efb32
0-d713-11e2-8b8b-0800200c9a66"> |
| 311 <File Name="enable_active.png"/> | 328 <File Name="enable_active.png"/> |
| 312 </Component> | 329 </Component> |
| 313 </Directory> | 330 </Directory> |
| 331 <Component Id="html_static_img_checkmark.png" Guid="210c1a10-f074-11
e2-b778-0800200c9a66"> |
| 332 <File Name="checkmark.png"/> |
| 333 </Component> |
| 314 <Directory Name="features" Id="html_static_img_features"> | 334 <Directory Name="features" Id="html_static_img_features"> |
| 315 <Component Id="html_static_img_features_language.png" Guid="72b8cb
80-d713-11e2-8b8b-0800200c9a66"> | 335 <Component Id="html_static_img_features_language.png" Guid="72b8cb
80-d713-11e2-8b8b-0800200c9a66"> |
| 316 <File Name="language.png"/> | 336 <File Name="language.png"/> |
| 317 </Component> | 337 </Component> |
| 318 <Component Id="html_static_img_features_whitelist.png" Guid="7cc37
170-d713-11e2-8b8b-0800200c9a66"> | |
| 319 <File Name="whitelist.png"/> | |
| 320 </Component> | |
| 321 <Component Id="html_static_img_features_adblocking.png" Guid="7dd1
2150-d713-11e2-8b8b-0800200c9a66"> | 338 <Component Id="html_static_img_features_adblocking.png" Guid="7dd1
2150-d713-11e2-8b8b-0800200c9a66"> |
| 322 <File Name="adblocking.png"/> | 339 <File Name="adblocking.png"/> |
| 323 </Component> | 340 </Component> |
| 324 </Directory> | 341 </Directory> |
| 325 <Directory Name="social" Id="html_static_img_social"> | 342 <Directory Name="social" Id="html_static_img_social"> |
| 326 <Component Id="html_static_img_social_facebook.png" Guid="862e7c00
-d713-11e2-8b8b-0800200c9a66"> | 343 <Component Id="html_static_img_social_facebook.png" Guid="862e7c00
-d713-11e2-8b8b-0800200c9a66"> |
| 327 <File Name="facebook.png"/> | 344 <File Name="facebook.png"/> |
| 328 </Component> | 345 </Component> |
| 346 <Component Id="html_static_img_social_facebook_old.png" Guid="2638
6980-f074-11e2-b778-0800200c9a66"> |
| 347 <File Name="facebook_old.png"/> |
| 348 </Component> |
| 329 <Component Id="html_static_img_social_gplus.png" Guid="8de48390-d7
13-11e2-8b8b-0800200c9a66"> | 349 <Component Id="html_static_img_social_gplus.png" Guid="8de48390-d7
13-11e2-8b8b-0800200c9a66"> |
| 330 <File Name="gplus.png"/> | 350 <File Name="gplus.png"/> |
| 331 </Component> | 351 </Component> |
| 352 <Component Id="html_static_img_social_gplus_old.png" Guid="2c0035a
0-f074-11e2-b778-0800200c9a66"> |
| 353 <File Name="gplus_old.png"/> |
| 354 </Component> |
| 332 <Component Id="html_static_img_social_twitter.png" Guid="948152f0-
d713-11e2-8b8b-0800200c9a66"> | 355 <Component Id="html_static_img_social_twitter.png" Guid="948152f0-
d713-11e2-8b8b-0800200c9a66"> |
| 333 <File Name="twitter.png"/> | 356 <File Name="twitter.png"/> |
| 334 </Component> | 357 </Component> |
| 358 <Component Id="html_static_img_social_twitter_old.png" Guid="2c003
5a1-f074-11e2-b778-0800200c9a66"> |
| 359 <File Name="twitter_old.png"/> |
| 360 </Component> |
| 335 </Directory> | 361 </Directory> |
| 336 </Directory> | 362 </Directory> |
| 337 <Directory Name="js" Id="html_static_js"> | 363 <Directory Name="js" Id="html_static_js"> |
| 364 <Component Id="html_static_js_firstRun.js" Guid="2c0035a2-f074-11e2-
b778-0800200c9a66"> |
| 365 <File Name="firstRun.js"/> |
| 366 </Component> |
| 338 <Component Id="html_static_js_IESettings.js" Guid="9e851b10-d713-11e
2-8b8b-0800200c9a66"> | 367 <Component Id="html_static_js_IESettings.js" Guid="9e851b10-d713-11e
2-8b8b-0800200c9a66"> |
| 339 <File Name="IESettings.js"/> | 368 <File Name="IESettings.js"/> |
| 340 </Component> | 369 </Component> |
| 341 <Component Id="html_static_js_settings.js" Guid="a5908ac0-d713-11e2-
8b8b-0800200c9a66"> | 370 <Component Id="html_static_js_settings.js" Guid="a5908ac0-d713-11e2-
8b8b-0800200c9a66"> |
| 342 <File Name="settings.js"/> | 371 <File Name="settings.js"/> |
| 343 </Component> | 372 </Component> |
| 344 <Directory Name="vendor" Id="html_static_js_vendor"> | 373 <Directory Name="vendor" Id="html_static_js_vendor"> |
| 345 <Component Id="html_static_js_vendor_DD.belatedPNG.js" Guid="ad5a4
160-d713-11e2-8b8b-0800200c9a66"> | 374 <Component Id="html_static_js_vendor_DD.belatedPNG.js" Guid="ad5a4
160-d713-11e2-8b8b-0800200c9a66"> |
| 346 <File Name="DD_belatedPNG.js"/> | 375 <File Name="DD_belatedPNG.js"/> |
| 347 </Component> | 376 </Component> |
| 348 <Component Id="html_static_js_vendor_html5shiv.js" Guid="b3699dd0-
d713-11e2-8b8b-0800200c9a66"> | 377 <Component Id="html_static_js_vendor_html5shiv.js" Guid="b3699dd0-
d713-11e2-8b8b-0800200c9a66"> |
| 349 <File Name="html5shiv.js"/> | 378 <File Name="html5shiv.js"/> |
| 350 </Component> | 379 </Component> |
| 351 </Directory> | 380 </Directory> |
| 352 </Directory> | 381 </Directory> |
| 353 </Directory> | 382 </Directory> |
| 354 <Directory Name="templates" Id="html_templates"> | 383 <Directory Name="templates" Id="html_templates"> |
| 384 <Component Id="html_templates_firstRun.html" Guid="3d423d40-f074-11e2-
b778-0800200c9a66"> |
| 385 <File Name="firstRun.html"/> |
| 386 </Component> |
| 355 <Component Id="html_templates_index.html" Guid="ba2259a0-d713-11e2-8b8
b-0800200c9a66"> | 387 <Component Id="html_templates_index.html" Guid="ba2259a0-d713-11e2-8b8
b-0800200c9a66"> |
| 356 <File Name="index.html"/> | 388 <File Name="index.html"/> |
| 357 </Component> | 389 </Component> |
| 358 </Directory> | 390 </Directory> |
| 359 </Directory> | 391 </Directory> |
| 360 </DirectoryRef> | 392 </DirectoryRef> |
| 361 | 393 |
| 362 <!-- | 394 <!-- |
| 363 Locale files | 395 Locale files |
| 364 --> | 396 --> |
| (...skipping 27 matching lines...) Expand all Loading... |
| 392 </ComponentGroup> | 424 </ComponentGroup> |
| 393 <DirectoryRef Id="ABP_APPDATA_FOLDER"> | 425 <DirectoryRef Id="ABP_APPDATA_FOLDER"> |
| 394 <Directory Id="ini" FileSource="..\files"> | 426 <Directory Id="ini" FileSource="..\files"> |
| 395 <Component Id="ini_settings.ini" Guid="dc30c3b0-d713-11e2-8b8b-0800200c9
a66"> | 427 <Component Id="ini_settings.ini" Guid="dc30c3b0-d713-11e2-8b8b-0800200c9
a66"> |
| 396 <File Name="settings.ini"/> | 428 <File Name="settings.ini"/> |
| 397 </Component> | 429 </Component> |
| 398 </Directory> | 430 </Directory> |
| 399 </DirectoryRef> | 431 </DirectoryRef> |
| 400 </Product> | 432 </Product> |
| 401 </Wix> | 433 </Wix> |
| OLD | NEW |