Issue 4525 - Filter Preferences: Move findbar to the top of the filters list

chrome/content/ui/filters.xul

 <?xml version="1.0"?>
 
 <!--
   - This file is part of Adblock Plus <https://adblockplus.org/>,
   - Copyright (C) 2006-2016 Eyeo GmbH
   -
   - Adblock Plus is free software: you can redistribute it and/or modify
   - it under the terms of the GNU General Public License version 3 as
   - published by the Free Software Foundation.
   -
@@ skipping 326 matching lines @@
           <menuseparator/>
           <menuitem label="&filter.moveUp.label;" key="moveUp-key" command="filters-moveUp-command"/>
           <menuitem label="&filter.moveDown.label;" key="moveDown-key" command="filters-moveDown-command"/>
           <menuseparator/>
           <menu id="viewMenu" label="&viewMenu.label;"/>
         </menupopup>
       </button>
       <button id="addFilterButton" label="&addFilter.label;" command="filters-add-command"/>
     </hbox>
 
+    <hbox id="findbar" hidden="true" align="center" onkeypress="FilterSearch.keyPress(event);">
+      <toolbarbutton id="findbar-closebutton" tooltiptext="&findbar.close;" oncommand="FilterSearch.close();"/>
+      <textbox id="findbar-textbox" type="search" placeholder="&findbar.placeholder;" flex="1" oncommand="FilterSearch.search();"/>
+      <spinbuttons id="findbar-findAgain" onup="FilterSearch.search(-1);" ondown="FilterSearch.search(1);"/>
+      <button id="findbar-case-sensitive" type="checkbox" label="&findbar.caseSensitive;" oncommand="FilterSearch.search(0);"/>
+      <stack>
+        <label id="findbar-status-wrappedStart" class="findbar-status" value="&findbar.statusWrappedStart;"/>
+        <label id="findbar-status-wrappedEnd" class="findbar-status" value="&findbar.statusWrappedEnd;"/>
+        <label id="findbar-status-notFound" class="findbar-status" value="&findbar.statusNotFound;"/>
+      </stack>
+    </hbox>

[Wladimir Palant, 2016/10/14 08:12:12]

This block has been merely moved, no changes otherwise.

+
     <tree id="filtersTree"
         flex="1"
         editable="true"
         seltype="multiple"
         enableColumnDrag="true"
         hidecolumnpicker="true"
         _removewarning="&filters.remove.warning;">
       <treecols context="filters-view-menu1">
         <treecol id="col-enabled" label="&enabled.column;" cycler="true" flex="0" persist="width ordinal sortDirection hidden"/>
         <splitter class="tree-splitter"/>
         <treecol id="col-filter" label="&filter.column;" flex="10" persist="width ordinal sortDirection hidden"/>
         <splitter class="tree-splitter"/>
         <treecol id="col-slow" label="!" display="&slow.column;" tooltiptext="&slow.column;" flex="0" width="16" persist="width ordinal sortDirection hidden"/>
         <splitter class="tree-splitter"/>
         <treecol id="col-hitcount" label="&hitcount.column;" flex="0" persist="width ordinal sortDirection hidden"/>
         <splitter class="tree-splitter"/>
         <treecol id="col-lasthit" label="&lasthit.column;" hidden="true" flex="4" persist="width ordinal sortDirection hidden"/>
       </treecols>
 
       <treechildren id="filtersTreeChildren"
           oncontextmenu="E('filterActionMenu').openPopupAtScreen(event.screenX, event.screenY, true);"
           tooltip="filtersTooltip"
           noGroupText="&noGroupSelected.text;"
           noFiltersText="&noFiltersInGroup.text;"
           ondragstart="FilterActions.startDrag(event);"
           ondragend="FilterActions.endDrag(event);"/>
     </tree>
-
-    <hbox id="findbar" hidden="true" align="center" onkeypress="FilterSearch.keyPress(event);">
-      <toolbarbutton id="findbar-closebutton" tooltiptext="&findbar.close;" oncommand="FilterSearch.close();"/>
-      <textbox id="findbar-textbox" type="search" placeholder="&findbar.placeholder;" flex="1" oncommand="FilterSearch.search();"/>
-      <spinbuttons id="findbar-findAgain" onup="FilterSearch.search(-1);" ondown="FilterSearch.search(1);"/>
-      <button id="findbar-case-sensitive" type="checkbox" label="&findbar.caseSensitive;" oncommand="FilterSearch.search(0);"/>
-      <stack>
-        <label id="findbar-status-wrappedStart" class="findbar-status" value="&findbar.statusWrappedStart;"/>
-        <label id="findbar-status-wrappedEnd" class="findbar-status" value="&findbar.statusWrappedEnd;"/>
-        <label id="findbar-status-notFound" class="findbar-status" value="&findbar.statusNotFound;"/>
-      </stack>
-    </hbox>
   </vbox>
 </hbox>
 
 <hbox id="buttons">
   <button id="backupButton" type="menu"
       label="&backupButton.label;"
       _backupDialogTitle="&backup.label;" _restoreDialogTitle="&restore.own.label;"
       _fileFilterComplete="&backup.complete.title;" _fileFilterCustom="&backup.custom.title;"
       _backupError="&backup.error;" _restoreError="&restore.error;"
       _restoreCompleteWarning="&restore.complete.warning;" _restoreCustomWarning="&restore.custom.warning;"
       _restoreVersionWarning="&restore.minVersion.warning;"
       oncommand="if (event.target == this) Utils.runAsync(() => this.open = true);">
     <menupopup onpopupshowing="Backup.fillRestorePopup();">
       <menuitem id="backup" key="backup-key" label="&backup.label;…" oncommand="Backup.backupToFile();"/>
       <menuseparator/>
       <menuitem id="restoreBackupTemplate" label="&restore.default.label;" hidden="true"/>
       <menuitem id="restoreOwnBackup" key="restore-key" label="&restore.own.label;…" oncommand="Backup.restoreFromFile();"/>
     </menupopup>
   </button>
 
   <spacer flex="1"/>
 
   <button id="close" dlgtype="accept" label="&close.label;"/>
 </hbox>
 
 </dialog>