Bug 1068997 - Implement keyboard shortcut for composition's 'Find and Replace' on Mac. r=Mnyromyr, a=Callek for checkin to a CLOSED TREE.

suite/common/mac/platformCommunicatorOverlay.xul

@@ -49,6 +49,13 @@
   <!-- Select All Key -->
   <key id="key_selectAll" key="&selectAllCmd.key;" modifiers="accel"/>
 
+  <keyset id="findKeys">
+    <key id="key_findReplace"
+         key="&findReplaceCmd.key;"
+         modifiers="accel,alt"
+         command="cmd_findReplace"/>
+  </keyset>
+
   <!-- Delete Key -->
   <!-- not all Mac keyboards have a VK_DELETE key, so we use VK_BACK as
        the primary and provide VK_DELETE as a secondary key definition -->

suite/common/unix/platformCommunicatorOverlay.xul

@@ -32,7 +32,6 @@
   
     <!-- Edit Menu -->
     <key id="key_redo"  key="&redoCmd.key;" command="cmd_redo" modifiers="accel"/>
-    <menuitem id="menu_findReplace" key="key_findReplace"/>
 
     <!-- Select All Key -->
     <key id="key_selectAll" key="&selectAllCmd.key;" modifiers="alt"/>

suite/common/utilityOverlay.xul

@@ -287,6 +287,7 @@
             command="cmd_find"/>
   <menuitem id="menu_findReplace"
             accesskey="&findReplaceCmd.accesskey;"
+            key="key_findReplace"
             command="cmd_findReplace"/>
   <menuitem id="menu_findNext"
             label="&findAgainCmd.label;"

suite/common/win/platformCommunicatorOverlay.xul

@@ -32,7 +32,6 @@
   
   <!-- Edit Menu -->
   <key id="key_redo"  key="&redoCmd.key;" command="cmd_redo" modifiers="accel"/>
-  <menuitem id="menu_findReplace" key="key_findReplace"/>
 
   <!-- Select All Key -->
   <key id="key_selectAll" key="&selectAllCmd.key;" modifiers="accel"/>

suite/locales/en-US/chrome/common/help/shortcuts_composer.xhtml

@@ -68,9 +68,9 @@
   </tr>
   <tr>
     <td>Find and Replace</td>
-    <td>Ctrl+F</td>
-    <td>Cmd+F</td>
-    <td>Ctrl+F</td>
+    <td>Ctrl+H</td>
+    <td>Cmd+Opt+F</td>
+    <td>Ctrl+H</td>
   </tr>
   <tr>
     <td>Find Again</td>

suite/locales/en-US/chrome/common/help/shortcuts_mailnews.xhtml

@@ -340,6 +340,12 @@
     <td>Cmd+R</td>
     <td>Ctrl+R</td>
   </tr>
+  <tr>
+    <td>Find and Replace</td>
+    <td>Ctrl+H</td>
+    <td>Cmd+Opt+F</td>
+    <td>Ctrl+H</td>
+  </tr>
   <tr>
     <td>Send Message Now</td>
     <td>Ctrl+Enter</td>

suite/locales/en-US/chrome/common/mac/platformCommunicatorOverlay.dtd

@@ -31,6 +31,7 @@
 <!ENTITY printSetupCmd.label            "Page Setup…">
 <!ENTITY printSetupCmd.accesskey        "u">
 
+<!ENTITY findReplaceCmd.key             "F">
 <!ENTITY redoCmd.key                    "Z">
 
 <!-- Keys for toggling Sidebar, Folder Pane in mailNews and Directory Pane in

suite/locales/en-US/chrome/common/unix/platformCommunicatorOverlay.dtd

@@ -16,6 +16,7 @@
 <!ENTITY redoCmd.key                    "Y">  
 
 <!ENTITY findCmd.key2                   "VK_F19">
+<!ENTITY findReplaceCmd.key             "H">
 <!ENTITY findTypeTextCmd.key            "/">
 <!ENTITY findTypeLinksCmd.key           "'">
 

suite/locales/en-US/chrome/common/utilityOverlay.dtd

@@ -74,7 +74,6 @@
      findBarCmd.label found in editorOverlay.dtd, findCmd.label in messenger.dtd
      and messengercompose.dtd and findOnCmd.label found in navigatorOverlay.dtd -->
 <!ENTITY findBarCmd.accesskey "F">
-<!ENTITY findReplaceCmd.key "H">
 <!ENTITY findReplaceCmd.accesskey "l">
 <!ENTITY findAgainCmd.label "Find Again">
 <!ENTITY findAgainCmd.key "G">

suite/locales/en-US/chrome/common/win/platformCommunicatorOverlay.dtd

@@ -15,7 +15,7 @@
 <!ENTITY quitApplicationCmd.accesskey   "x">
 
 <!ENTITY redoCmd.key                    "Y">  
-
+<!ENTITY findReplaceCmd.key             "H">
 <!ENTITY findTypeTextCmd.key            "/">
 <!ENTITY findTypeLinksCmd.key           "'">