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

Side by Side Diff: 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
Patch Set: Created Oct. 11, 2016, 8:56 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 | chrome/content/ui/filters-search.js » ('j') | 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"?> 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 68 matching lines...) Expand 10 before | Expand all | Expand 10 after
79 <command id="filters-selectAll-command" oncommand="FilterActions.selectAll();" /> 79 <command id="filters-selectAll-command" oncommand="FilterActions.selectAll();" />
80 <command id="filters-edit-command" oncommand="FilterActions.startEditing();"/> 80 <command id="filters-edit-command" oncommand="FilterActions.startEditing();"/>
81 <command id="filters-add-command" oncommand="FilterActions.insertFilter();"/> 81 <command id="filters-add-command" oncommand="FilterActions.insertFilter();"/>
82 <command id="filters-delete-command" oncommand="FilterActions.deleteSelected() ;"/> 82 <command id="filters-delete-command" oncommand="FilterActions.deleteSelected() ;"/>
83 <command id="filters-resetHitCounts-command" oncommand="FilterActions.resetHit Counts();"/> 83 <command id="filters-resetHitCounts-command" oncommand="FilterActions.resetHit Counts();"/>
84 <command id="filters-moveUp-command" oncommand="FilterActions.moveUp();"/> 84 <command id="filters-moveUp-command" oncommand="FilterActions.moveUp();"/>
85 <command id="filters-moveDown-command" oncommand="FilterActions.moveDown();"/> 85 <command id="filters-moveDown-command" oncommand="FilterActions.moveDown();"/>
86 <command id="filters-copy-command" oncommand="FilterActions.copySelected(true) ;"/> 86 <command id="filters-copy-command" oncommand="FilterActions.copySelected(true) ;"/>
87 <command id="filters-cut-command" oncommand="FilterActions.copySelected(false) ;"/> 87 <command id="filters-cut-command" oncommand="FilterActions.copySelected(false) ;"/>
88 <command id="filters-paste-command" oncommand="FilterActions.paste();"/> 88 <command id="filters-paste-command" oncommand="FilterActions.paste();"/>
89 <command id="find-command" oncommand="E('findbar').startFind(E('findbar').FIND _NORMAL)"/> 89 <command id="find-command" oncommand="FilterSearch.open();"/>
90 <command id="find-again-command" oncommand="E('findbar').onFindAgainCommand(fa lse)"/> 90 <command id="find-again-command" oncommand="FilterSearch.search(1);"/>
91 <command id="find-previous-command" oncommand="E('findbar').onFindAgainCommand (true)"/> 91 <command id="find-previous-command" oncommand="FilterSearch.search(-1);"/>
92 </commandset> 92 </commandset>
93 93
94 <popupset id="filtersPopupset"> 94 <popupset id="filtersPopupset">
95 <menupopup id="filters-view-menu1" onpopupshowing="FilterActions.fillColumnPop up(this);"> 95 <menupopup id="filters-view-menu1" onpopupshowing="FilterActions.fillColumnPop up(this);">
96 <menuitem id="filters-view-filter1" label="&filter.column;" type="checkbox" disabled="true"/> 96 <menuitem id="filters-view-filter1" label="&filter.column;" type="checkbox" disabled="true"/>
97 <menuitem id="filters-view-slow1" label="&slow.column;" type="checkbox" onco mmand="FilterActions.toggleColumn('col-slow')"/> 97 <menuitem id="filters-view-slow1" label="&slow.column;" type="checkbox" onco mmand="FilterActions.toggleColumn('col-slow')"/>
98 <menuitem id="filters-view-enabled1" label="&enabled.column;" type="checkbox " oncommand="FilterActions.toggleColumn('col-enabled')"/> 98 <menuitem id="filters-view-enabled1" label="&enabled.column;" type="checkbox " oncommand="FilterActions.toggleColumn('col-enabled')"/>
99 <menuitem id="filters-view-hitcount1" label="&hitcount.column;" type="checkb ox" oncommand="FilterActions.toggleColumn('col-hitcount')"/> 99 <menuitem id="filters-view-hitcount1" label="&hitcount.column;" type="checkb ox" oncommand="FilterActions.toggleColumn('col-hitcount')"/>
100 <menuitem id="filters-view-lasthit1" label="&lasthit.column;" type="checkbox " oncommand="FilterActions.toggleColumn('col-lasthit')"/> 100 <menuitem id="filters-view-lasthit1" label="&lasthit.column;" type="checkbox " oncommand="FilterActions.toggleColumn('col-lasthit')"/>
101 <menuseparator/> 101 <menuseparator/>
(...skipping 234 matching lines...) Expand 10 before | Expand all | Expand 10 after
336 <menuitem label="&filter.resetHitCounts.label;" command="filters-reset HitCounts-command"/> 336 <menuitem label="&filter.resetHitCounts.label;" command="filters-reset HitCounts-command"/>
337 <menuseparator/> 337 <menuseparator/>
338 <menuitem label="&filter.moveUp.label;" key="moveUp-key" command="filt ers-moveUp-command"/> 338 <menuitem label="&filter.moveUp.label;" key="moveUp-key" command="filt ers-moveUp-command"/>
339 <menuitem label="&filter.moveDown.label;" key="moveDown-key" command=" filters-moveDown-command"/> 339 <menuitem label="&filter.moveDown.label;" key="moveDown-key" command=" filters-moveDown-command"/>
340 <menuseparator/> 340 <menuseparator/>
341 <menu id="viewMenu" label="&viewMenu.label;"/> 341 <menu id="viewMenu" label="&viewMenu.label;"/>
342 </menupopup> 342 </menupopup>
343 </button> 343 </button>
344 <button id="addFilterButton" label="&addFilter.label;" command="filters-ad d-command"/> 344 <button id="addFilterButton" label="&addFilter.label;" command="filters-ad d-command"/>
345 </hbox> 345 </hbox>
346
346 <tree id="filtersTree" 347 <tree id="filtersTree"
347 flex="1" 348 flex="1"
348 editable="true" 349 editable="true"
349 seltype="multiple" 350 seltype="multiple"
350 enableColumnDrag="true" 351 enableColumnDrag="true"
351 hidecolumnpicker="true" 352 hidecolumnpicker="true"
352 _removewarning="&filters.remove.warning;"> 353 _removewarning="&filters.remove.warning;">
353 <treecols context="filters-view-menu1"> 354 <treecols context="filters-view-menu1">
354 <treecol id="col-enabled" label="&enabled.column;" cycler="true" flex="0 " persist="width ordinal sortDirection hidden"/> 355 <treecol id="col-enabled" label="&enabled.column;" cycler="true" flex="0 " persist="width ordinal sortDirection hidden"/>
355 <splitter class="tree-splitter"/> 356 <splitter class="tree-splitter"/>
356 <treecol id="col-filter" label="&filter.column;" flex="10" persist="widt h ordinal sortDirection hidden"/> 357 <treecol id="col-filter" label="&filter.column;" flex="10" persist="widt h ordinal sortDirection hidden"/>
357 <splitter class="tree-splitter"/> 358 <splitter class="tree-splitter"/>
358 <treecol id="col-slow" label="!" display="&slow.column;" tooltiptext="&s low.column;" flex="0" width="16" persist="width ordinal sortDirection hidden"/> 359 <treecol id="col-slow" label="!" display="&slow.column;" tooltiptext="&s low.column;" flex="0" width="16" persist="width ordinal sortDirection hidden"/>
359 <splitter class="tree-splitter"/> 360 <splitter class="tree-splitter"/>
360 <treecol id="col-hitcount" label="&hitcount.column;" flex="0" persist="w idth ordinal sortDirection hidden"/> 361 <treecol id="col-hitcount" label="&hitcount.column;" flex="0" persist="w idth ordinal sortDirection hidden"/>
361 <splitter class="tree-splitter"/> 362 <splitter class="tree-splitter"/>
362 <treecol id="col-lasthit" label="&lasthit.column;" hidden="true" flex="4 " persist="width ordinal sortDirection hidden"/> 363 <treecol id="col-lasthit" label="&lasthit.column;" hidden="true" flex="4 " persist="width ordinal sortDirection hidden"/>
363 </treecols> 364 </treecols>
364 365
365 <treechildren id="filtersTreeChildren" 366 <treechildren id="filtersTreeChildren"
366 oncontextmenu="E('filterActionMenu').openPopupAtScreen(event.screenX, event.screenY, true);" 367 oncontextmenu="E('filterActionMenu').openPopupAtScreen(event.screenX, event.screenY, true);"
367 tooltip="filtersTooltip" 368 tooltip="filtersTooltip"
368 noGroupText="&noGroupSelected.text;" 369 noGroupText="&noGroupSelected.text;"
369 noFiltersText="&noFiltersInGroup.text;" 370 noFiltersText="&noFiltersInGroup.text;"
370 ondragstart="FilterActions.startDrag(event);" 371 ondragstart="FilterActions.startDrag(event);"
371 ondragend="FilterActions.endDrag(event);"/> 372 ondragend="FilterActions.endDrag(event);"/>
372 </tree> 373 </tree>
374
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();"/>
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);"/>
379 <button id="findbar-case-sensitive" type="checkbox" label="&findbar.caseSe nsitive;" oncommand="FilterSearch.search(0);"/>
380 <stack>
381 <label id="findbar-status-wrappedStart" class="findbar-status" value="&f indbar.statusWrappedStart;" hidden="true"/>
382 <label id="findbar-status-wrappedEnd" class="findbar-status" value="&fin dbar.statusWrappedEnd;" hidden="true"/>
383 <label id="findbar-status-notFound" class="findbar-status" value="&findb ar.statusNotFound;" hidden="true"/>
384 </stack>
385 </hbox>
373 </vbox> 386 </vbox>
374 </hbox> 387 </hbox>
375 388
376 <findbar id="findbar"/>
377
378 <hbox id="buttons"> 389 <hbox id="buttons">
379 <button id="backupButton" type="menu" 390 <button id="backupButton" type="menu"
380 label="&backupButton.label;" 391 label="&backupButton.label;"
381 _backupDialogTitle="&backup.label;" _restoreDialogTitle="&restore.own.labe l;" 392 _backupDialogTitle="&backup.label;" _restoreDialogTitle="&restore.own.labe l;"
382 _fileFilterComplete="&backup.complete.title;" _fileFilterCustom="&backup.c ustom.title;" 393 _fileFilterComplete="&backup.complete.title;" _fileFilterCustom="&backup.c ustom.title;"
383 _backupError="&backup.error;" _restoreError="&restore.error;" 394 _backupError="&backup.error;" _restoreError="&restore.error;"
384 _restoreCompleteWarning="&restore.complete.warning;" _restoreCustomWarning ="&restore.custom.warning;" 395 _restoreCompleteWarning="&restore.complete.warning;" _restoreCustomWarning ="&restore.custom.warning;"
385 _restoreVersionWarning="&restore.minVersion.warning;" 396 _restoreVersionWarning="&restore.minVersion.warning;"
386 oncommand="if (event.target == this) Utils.runAsync(() => this.open = true );"> 397 oncommand="if (event.target == this) Utils.runAsync(() => this.open = true );">
387 <menupopup onpopupshowing="Backup.fillRestorePopup();"> 398 <menupopup onpopupshowing="Backup.fillRestorePopup();">
388 <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();"/>
389 <menuseparator/> 400 <menuseparator/>
390 <menuitem id="restoreBackupTemplate" label="&restore.default.label;" hidde n="true"/> 401 <menuitem id="restoreBackupTemplate" label="&restore.default.label;" hidde n="true"/>
391 <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();"/>
392 </menupopup> 403 </menupopup>
393 </button> 404 </button>
394 405
395 <spacer flex="1"/> 406 <spacer flex="1"/>
396 407
397 <button id="close" dlgtype="accept" label="&close.label;"/> 408 <button id="close" dlgtype="accept" label="&close.label;"/>
398 </hbox> 409 </hbox>
399 410
400 </dialog> 411 </dialog>
OLDNEW
« no previous file with comments | « no previous file | chrome/content/ui/filters-search.js » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld