From cfdf9135f8dcdc91c5a7bc9e4fa8284b92afa04a Mon Sep 17 00:00:00 2001
From: "aaronl%netscape.com"
 <aaronl%netscape.com@18797224-902f-48f8-a5cc-f745e15eee43>
Date: Thu, 14 Sep 2006 06:07:11 +0000
Subject: [PATCH] Bug 187511. Add Find As You Type to menus. r=brade,
 sr=dveditz.

git-svn-id: svn://10.0.0.236/trunk@211335 18797224-902f-48f8-a5cc-f745e15eee43
---
 mozilla/suite/browser/navigator.xul         |  1 +
 mozilla/suite/browser/navigatorOverlay.xul  | 10 +++++++++-
 mozilla/suite/browser/viewSourceOverlay.xul |  5 ++++-
 3 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/mozilla/suite/browser/navigator.xul b/mozilla/suite/browser/navigator.xul
index ad4ed8c4546..41223bbf7d1 100644
--- a/mozilla/suite/browser/navigator.xul
+++ b/mozilla/suite/browser/navigator.xul
@@ -92,6 +92,7 @@ Contributor(s):
   </stringbundleset>
 
   <commandset id="commands">    
+    <commandset id="findTypeMenuItems"/>
     <commandset id="globalEditMenuItems"/>
     <commandset id="selectEditMenuItems"/>
     <commandset id="undoEditMenuItems"/>
diff --git a/mozilla/suite/browser/navigatorOverlay.xul b/mozilla/suite/browser/navigatorOverlay.xul
index 79e21f5a80c..7d22a79c2a1 100644
--- a/mozilla/suite/browser/navigatorOverlay.xul
+++ b/mozilla/suite/browser/navigatorOverlay.xul
@@ -85,6 +85,8 @@
     <key id="key_findPrev"   key="&findPrevCmd.commandkey;"       command="Browser:FindPrev"  modifiers="accel,shift"/>
     <key keycode="&findAgainCmd.commandkey2;" command="Browser:FindAgain"/>
     <key keycode="&findPrevCmd.commandkey2;"  command="Browser:FindPrev" modifiers="shift"/>
+    <key id="key_findTypeText"/>
+    <key id="key_findTypeLinks"/>
 
     <!-- Go Menu -->
 
@@ -150,7 +152,9 @@
     <command id="Browser:Find" oncommand="BrowserFind();" observes="isImage"/>
     <command id="Browser:FindAgain" oncommand="BrowserFindAgain(false);" observes="isImage"/>
     <command id="Browser:FindPrev"  oncommand="BrowserFindAgain(true);"  observes="isImage"/>
-  
+    <command id="cmd_findTypeText" observes="isImage"/>
+    <command id="cmd_findTypeLinks" observes="isImage"/>
+
     <!-- Bookmarks Menu -->
     <command id="Browser:AddBookmark" label="&addCurPageCmd.label;" accesskey="&addCurPageCmd.accesskey;" 
              oncommand="BookmarksUtils.addBookmarkForBrowser(document.getElementById('content').webNavigation, false);"/>
@@ -234,6 +238,10 @@
         <menuitem id="menu_find" label="&findOnCmd.label;" accesskey="&findOnCmd.accesskey;" key="key_find" command="Browser:Find"/>
         <menuitem id="menu_findAgain" label="&findAgainCmd.label;" accesskey="&findAgainCmd.accesskey;" key="key_findAgain" command="Browser:FindAgain"/>
         <menuitem id="menu_findPrev"  label="&findPrevCmd.label;"  accesskey="&findPrevCmd.accesskey;" key="key_findPrev" command="Browser:FindPrev"/>
+        <menuseparator/> 
+        <menuitem id="menu_findTypeLinks"/>
+        <menuitem id="menu_findTypeText"/>
+
         <menuseparator id="menu_PrefsSeparator"/> 
         <menuitem id="menu_preferences" oncommand="goPreferences('navigator', 'chrome://communicator/content/pref/pref-navigator.xul', 'navigator')"/>
       </menupopup>
diff --git a/mozilla/suite/browser/viewSourceOverlay.xul b/mozilla/suite/browser/viewSourceOverlay.xul
index b3518536e2e..80f4206dde4 100644
--- a/mozilla/suite/browser/viewSourceOverlay.xul
+++ b/mozilla/suite/browser/viewSourceOverlay.xul
@@ -97,9 +97,10 @@
     <key id="key_selectAll"/>
     <key id="key_find"         key="&findOnCmd.commandkey;" command="Browser:Find" modifiers="accel"/>
     <key id="key_findAgain"    key="&findAgainCmd.commandkey;" command="Browser:FindAgain" modifiers="accel"/>
-    <key id="key_findNext"     key="&findPrevCmd.commandkey;"  command="Browser:FindPrev"  modifiers="accel, shift"/>
+    <key id="key_findPrev"     key="&findPrevCmd.commandkey;"  command="Browser:FindPrev"  modifiers="accel, shift"/>
     <key keycode="&findAgainCmd.commandkey2;" command="Browser:FindAgain"/>
     <key keycode="&findPrevCmd.commandkey2;"  command="Browser:FindPrev"  modifiers="shift"/>
+    <key id="key_findTypeText"/>
 
     <keyset id="viewZoomKeys"/>
   </keyset>
@@ -160,6 +161,8 @@
                     label="&findAgainCmd.label;" accesskey="&findAgainCmd.accesskey;"/>
           <menuitem id="menu_findPrev" key="key_findPrev" command="Browser:FindPrev"
                     label="&findPrevCmd.label;" accesskey="&findPrevCmd.accesskey;"/>
+          <menuseparator/> 
+          <menuitem id="menu_findTypeText"/>
         </menupopup>
       </menu>