chrome/content/ui/filters.xul - Issue 29356477: Issue 4510 - Filter preferences: replace the built-in findbar widget by our own look-alike

Delta Between Two Patch Sets: chrome/content/ui/filters.xul

Issue 29356477: Issue 4510 - Filter preferences: replace the built-in findbar widget by our own look-alike (Closed) Base URL: https://hg.adblockplus.org/adblockplus

Left Patch Set: Created Oct. 11, 2016, 8:56 a.m.

Right Patch Set: Addressed comments Created Oct. 12, 2016, 3:21 p.m.

Left:
Right:

Use n/p to move between diff chunks; N/P to move between comments.

Jump to:

Left: Side by side diff | Download
Right: Side by side diff | Download

LEFT	RIGHT
1 <?xml version="1.0"?>	1 <?xml version="1.0"?>

2	2

3 <!--	3 <!--

4 - This file is part of Adblock Plus <https://adblockplus.org/>,	4 - This file is part of Adblock Plus <https://adblockplus.org/>,

5 - Copyright (C) 2006-2016 Eyeo GmbH	5 - Copyright (C) 2006-2016 Eyeo GmbH

6 -	6 -

7 - Adblock Plus is free software: you can redistribute it and/or modify	7 - Adblock Plus is free software: you can redistribute it and/or modify

8 - it under the terms of the GNU General Public License version 3 as	8 - it under the terms of the GNU General Public License version 3 as

9 - published by the Free Software Foundation.	9 - published by the Free Software Foundation.

10 -	10 -

(...skipping 360 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
371 ondragstart="FilterActions.startDrag(event);"	371 ondragstart="FilterActions.startDrag(event);"

372 ondragend="FilterActions.endDrag(event);"/>	372 ondragend="FilterActions.endDrag(event);"/>

373 </tree>	373 </tree>

374	374

375 <hbox id="findbar" hidden="true" align="center" onkeypress="FilterSearch.key Press(event);">	375 <hbox id="findbar" hidden="true" align="center" onkeypress="FilterSearch.key Press(event);">

376 <toolbarbutton id="findbar-closebutton" tooltiptext="&findbar.close;" onco mmand="FilterSearch.close();"/>	376 <toolbarbutton id="findbar-closebutton" tooltiptext="&findbar.close;" onco mmand="FilterSearch.close();"/>

377 <textbox id="findbar-textbox" type="search" placeholder="&findbar.placehol der;" flex="1" oncommand="FilterSearch.search();"/>	377 <textbox id="findbar-textbox" type="search" placeholder="&findbar.placehol der;" flex="1" oncommand="FilterSearch.search();"/>

378 <spinbuttons id="findbar-findAgain" onup="FilterSearch.search(-1);" ondown ="FilterSearch.search(1);"/>	378 <spinbuttons id="findbar-findAgain" onup="FilterSearch.search(-1);" ondown ="FilterSearch.search(1);"/>

379 <button id="findbar-case-sensitive" type="checkbox" label="&findbar.caseSe nsitive;" oncommand="FilterSearch.search(0);"/>	379 <button id="findbar-case-sensitive" type="checkbox" label="&findbar.caseSe nsitive;" oncommand="FilterSearch.search(0);"/>

380 <stack>	380 <stack>

381 <label id="findbar-status-wrappedStart" class="findbar-status" value="&f indbar.statusWrappedStart;" hidden="true"/>	381 <label id="findbar-status-wrappedStart" class="findbar-status" value="&f indbar.statusWrappedStart;"/>

382 <label id="findbar-status-wrappedEnd" class="findbar-status" value="&fin dbar.statusWrappedEnd;" hidden="true"/>	382 <label id="findbar-status-wrappedEnd" class="findbar-status" value="&fin dbar.statusWrappedEnd;"/>

383 <label id="findbar-status-notFound" class="findbar-status" value="&findb ar.statusNotFound;" hidden="true"/>	383 <label id="findbar-status-notFound" class="findbar-status" value="&findb ar.statusNotFound;"/>

384 </stack>	384 </stack>

385 </hbox>	385 </hbox>

386 </vbox>	386 </vbox>

387 </hbox>	387 </hbox>

388	388

389 <hbox id="buttons">	389 <hbox id="buttons">

390 <button id="backupButton" type="menu"	390 <button id="backupButton" type="menu"

391 label="&backupButton.label;"	391 label="&backupButton.label;"

392 _backupDialogTitle="&backup.label;" _restoreDialogTitle="&restore.own.labe l;"	392 _backupDialogTitle="&backup.label;" _restoreDialogTitle="&restore.own.labe l;"

393 _fileFilterComplete="&backup.complete.title;" _fileFilterCustom="&backup.c ustom.title;"	393 _fileFilterComplete="&backup.complete.title;" _fileFilterCustom="&backup.c ustom.title;"

394 _backupError="&backup.error;" _restoreError="&restore.error;"	394 _backupError="&backup.error;" _restoreError="&restore.error;"

395 _restoreCompleteWarning="&restore.complete.warning;" _restoreCustomWarning ="&restore.custom.warning;"	395 _restoreCompleteWarning="&restore.complete.warning;" _restoreCustomWarning ="&restore.custom.warning;"

396 _restoreVersionWarning="&restore.minVersion.warning;"	396 _restoreVersionWarning="&restore.minVersion.warning;"

397 oncommand="if (event.target == this) Utils.runAsync(() => this.open = true );">	397 oncommand="if (event.target == this) Utils.runAsync(() => this.open = true );">

398 <menupopup onpopupshowing="Backup.fillRestorePopup();">	398 <menupopup onpopupshowing="Backup.fillRestorePopup();">

399 <menuitem id="backup" key="backup-key" label="&backup.label;…" oncommand=" Backup.backupToFile();"/>	399 <menuitem id="backup" key="backup-key" label="&backup.label;…" oncommand=" Backup.backupToFile();"/>

400 <menuseparator/>	400 <menuseparator/>

401 <menuitem id="restoreBackupTemplate" label="&restore.default.label;" hidde n="true"/>	401 <menuitem id="restoreBackupTemplate" label="&restore.default.label;" hidde n="true"/>

402 <menuitem id="restoreOwnBackup" key="restore-key" label="&restore.own.labe l;…" oncommand="Backup.restoreFromFile();"/>	402 <menuitem id="restoreOwnBackup" key="restore-key" label="&restore.own.labe l;…" oncommand="Backup.restoreFromFile();"/>

403 </menupopup>	403 </menupopup>

404 </button>	404 </button>

405	405

406 <spacer flex="1"/>	406 <spacer flex="1"/>

407	407

408 <button id="close" dlgtype="accept" label="&close.label;"/>	408 <button id="close" dlgtype="accept" label="&close.label;"/>

409 </hbox>	409 </hbox>

410	410

411 </dialog>	411 </dialog>

LEFT	RIGHT