Issue 4510 - Filter preferences: replace the built-in findbar widget by our own look-alike

chrome/content/ui/filters.xul

Index: chrome/content/ui/filters.xul
===================================================================
--- a/chrome/content/ui/filters.xul
+++ b/chrome/content/ui/filters.xul
@@ -81,19 +81,19 @@
   <command id="filters-add-command" oncommand="FilterActions.insertFilter();"/>
   <command id="filters-delete-command" oncommand="FilterActions.deleteSelected();"/>
   <command id="filters-resetHitCounts-command" oncommand="FilterActions.resetHitCounts();"/>
   <command id="filters-moveUp-command" oncommand="FilterActions.moveUp();"/>
   <command id="filters-moveDown-command" oncommand="FilterActions.moveDown();"/>
   <command id="filters-copy-command" oncommand="FilterActions.copySelected(true);"/>
   <command id="filters-cut-command" oncommand="FilterActions.copySelected(false);"/>
   <command id="filters-paste-command" oncommand="FilterActions.paste();"/>
-  <command id="find-command" oncommand="E('findbar').startFind(E('findbar').FIND_NORMAL)"/>
-  <command id="find-again-command" oncommand="E('findbar').onFindAgainCommand(false)"/>
-  <command id="find-previous-command" oncommand="E('findbar').onFindAgainCommand(true)"/>
+  <command id="find-command" oncommand="FilterSearch.open();"/>
+  <command id="find-again-command" oncommand="FilterSearch.search(1);"/>
+  <command id="find-previous-command" oncommand="FilterSearch.search(-1);"/>
 </commandset>
 
 <popupset id="filtersPopupset">
   <menupopup id="filters-view-menu1" onpopupshowing="FilterActions.fillColumnPopup(this);">
     <menuitem id="filters-view-filter1" label="&filter.column;" type="checkbox" disabled="true"/>
     <menuitem id="filters-view-slow1" label="&slow.column;" type="checkbox" oncommand="FilterActions.toggleColumn('col-slow')"/>
     <menuitem id="filters-view-enabled1" label="&enabled.column;" type="checkbox" oncommand="FilterActions.toggleColumn('col-enabled')"/>
     <menuitem id="filters-view-hitcount1" label="&hitcount.column;" type="checkbox" oncommand="FilterActions.toggleColumn('col-hitcount')"/>
@@ -338,16 +338,17 @@
           <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>
+
     <tree id="filtersTree"
         flex="1"
         editable="true"
         seltype="multiple"
         enableColumnDrag="true"
         hidecolumnpicker="true"
         _removewarning="&filters.remove.warning;">
       <treecols context="filters-view-menu1">
@@ -365,21 +366,31 @@
       <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>
 
-<findbar id="findbar"/>
-
 <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;"