Bug 186789 - Ctrl+Shift Shortcuts in Mozilla conflict with ISO 14755 Input methods (shift+ctrl keys don't work) [mark all read]

r=neil.parkwaycc.co.uk@myrealbox.com, sr=alecf@flett.org (for XPFE changes), src=mscott@mozilla.org (for MailNews changes)

suite/browser/mac/platformNavigationBindings.xul

@@ -14,6 +14,9 @@
     <key key="." oncommand="BrowserStop();" modifiers="accel"/>
     <key id="goHome" keycode="VK_HOME" command="Browser:Home" modifiers="meta"/>
     <key id="key_newTabWithTarget" keycode="VK_INSERT" modifiers="shift" command="cmd_newTabWithTarget"/>
+
+    <!-- Support Accel+Shift for Add Bookmark -->
+    <key id="addBookmarkKb" key="&addCurPageCmd.commandkey;" command="Browser:AddBookmark" modifiers="accel,shift"/>
   </keyset>  
 
 </overlay>

suite/browser/navigatorOverlay.xul

@@ -107,8 +107,7 @@
     <!-- Go Menu -->
 
     <!-- Bookmarks Menu -->
-    <key id="addBookmarkKb" key="&addCurPageCmd.commandkey;" command="Browser:AddBookmark" modifiers="accel"/>
-    <key id="addBookmarkAsKb" key="&addCurPageCmd.commandkey;" command="Browser:AddBookmarkAs" modifiers="accel,shift"/>
+    <key id="addBookmarkAsKb" key="&addCurPageAsCmd.commandkey;" command="Browser:AddBookmarkAs" modifiers="accel"/>
     <key id="manBookmarkKb" key="&manBookmarksCmd.commandkey;" command="Browser:ManageBookmark" modifiers="accel"/>
 
     <!-- Tools Menu -->

suite/browser/win/platformNavigationBindings.xul

@@ -26,7 +26,10 @@
     <key id="key_fullScreen" keycode="VK_F11" command="View:FullScreen"/>
     <key id="key_newTabWithTarget" keycode="VK_INSERT" command="cmd_newTabWithTarget"/>
     <key id="key_newTabWithTarget" keycode="VK_INSERT" modifiers="shift" command="cmd_newTabWithTarget"/>
-  </keyset>  
+
+    <!-- Support Accel+Shift for Add Bookmark -->
+    <key id="addBookmarkKb" key="&addCurPageCmd.commandkey;" command="Browser:AddBookmark" modifiers="accel,shift"/>
+  </keyset>
 
   <menuitem id="menuitem_fullScreen" hidden="false"/>
 </overlay>

suite/locales/en-US/chrome/browser/mac/platformNavigationBindings.dtd

@@ -4,4 +4,6 @@
 <!ENTITY goBackCmd.commandKey "[">
 <!ENTITY goForwardCmd.commandKey "]">
 
+<!ENTITY addCurPageCmd.commandkey "d">
+
 

suite/locales/en-US/chrome/browser/navigator.dtd

@@ -123,7 +123,7 @@
 
 <!ENTITY searchInternetCmd.label "Search the Web">
 <!ENTITY searchInternetCmd.accesskey "S">
-<!ENTITY searchInternet.commandKey "f">
+<!ENTITY searchInternet.commandKey "s">
 
 <!ENTITY goMenu.label "Go">
 <!ENTITY goMenu.accesskey "g">
@@ -134,9 +134,9 @@
 <!ENTITY bookmarksMenu.accesskey "B">
 <!ENTITY addCurPageCmd.label "Bookmark This Page">
 <!ENTITY addCurPageCmd.accesskey "B">
-<!ENTITY addCurPageCmd.commandkey "d">
 <!ENTITY addCurPageAsCmd.label "File Bookmark...">
 <!ENTITY addCurPageAsCmd.accesskey "F">
+<!ENTITY addCurPageAsCmd.commandkey "d">
 <!ENTITY addCurTabsAsCmd.label "Bookmark This Group of Tabs...">
 <!ENTITY addCurTabsAsCmd.accesskey "G">
 <!ENTITY manBookmarksCmd.label "Manage Bookmarks...">

suite/locales/en-US/chrome/browser/win/platformNavigationBindings.dtd

@@ -2,4 +2,6 @@
 <!ENTITY goBackCmd.keyCode "VK_LEFT">
 <!ENTITY goForwardCmd.keyCode "VK_RIGHT">
 
+<!ENTITY addCurPageCmd.commandkey "d">
+