Bug 1451357 - removing accessibility commandkey that overlaps with some add-ons and a console on Windows. r=pbro
authorYura Zenevich <yura.zenevich@gmail.com>
Wed, 04 Apr 2018 14:37:30 -0400
changeset 777898 404bbf763428f34cc5d20fbc0c634eb02c5cceab
parent 777897 2fc4f5aef58f3a1552b66221197ccc9c909de0f6
child 777899 50c7857c2a135af29bdbb972ed69391da66ffa7e
child 777900 6d0985a86d31f3e838c2ead04c36543255ea9be6
child 777946 e2f59e695f038804d22046162c12e0070a475052
child 778059 11ff93811572dbf11ceb485a0536108c6eff092d
push id105320
push userbmo:dharvey@mozilla.com
push dateThu, 05 Apr 2018 13:17:43 +0000
reviewerspbro
bugs1451357
milestone61.0a1
Bug 1451357 - removing accessibility commandkey that overlaps with some add-ons and a console on Windows. r=pbro MozReview-Commit-ID: 97lEdUJqjJD
devtools/client/definitions.js
devtools/client/locales/en-US/startup.properties
devtools/startup/devtools-startup.js
devtools/startup/locales/en-US/key-shortcuts.properties
--- a/devtools/client/definitions.js
+++ b/devtools/client/definitions.js
@@ -445,19 +445,17 @@ Tools.accessibility = {
   ordinal: 14,
   modifiers: osString == "Darwin" ? "accel,alt" : "accel,shift",
   visibilityswitch: "devtools.accessibility.enabled",
   icon: "chrome://devtools/skin/images/tool-accessibility.svg",
   url: "chrome://devtools/content/accessibility/accessibility.html",
   label: l10n("accessibility.label"),
   panelLabel: l10n("accessibility.panelLabel"),
   get tooltip() {
-    return l10n("accessibility.tooltip",
-      (osString == "Darwin" ? "Cmd+Opt+" : "Ctrl+Shift+") +
-      l10n("accessibility.commandkey"));
+    return l10n("accessibility.tooltip2");
   },
   inMenu: true,
 
   isTargetSupported(target) {
     return target.hasActor("accessibility");
   },
 
   build(iframeWindow, toolbox) {
--- a/devtools/client/locales/en-US/startup.properties
+++ b/devtools/client/locales/en-US/startup.properties
@@ -251,21 +251,21 @@ accessibility.label=Accessibility
 # LOCALIZATION NOTE (accessibility.panelLabel):
 # This is used as the label for the toolbox panel.
 accessibility.panelLabel=Accessibility Panel
 
 # LOCALIZATION NOTE (accessibility.accesskey)
 # Used for the menuitem in the tool menu
 accessibility.accesskey=y
 
-# LOCALIZATION NOTE (accessibility.tooltip):
+# LOCALIZATION NOTE (accessibility.tooltip2):
 # This string is displayed in the tooltip of the tab when the Accessibility is
 # displayed inside the developer tools window.
 # Keyboard shortcut for Accessibility panel will be shown inside the brackets.
-accessibility.tooltip=Accessibility (%S)
+accessibility.tooltip2=Accessibility
 
 # LOCALIZATION NOTE (toolbox.buttons.splitconsole):
 # This is the tooltip of the button in the toolbox toolbar used to toggle
 # the split console.
 # Keyboard shortcut will be shown inside brackets.
 toolbox.buttons.splitconsole = Toggle split console (%S)
 
 # LOCALIZATION NOTE (toolbox.buttons.responsive):
--- a/devtools/startup/devtools-startup.js
+++ b/devtools/startup/devtools-startup.js
@@ -162,22 +162,16 @@ XPCOMUtils.defineLazyGetter(this, "KeySh
       modifiers: "shift"
     },
     // Key for opening the DOM Panel
     {
       toolId: "dom",
       shortcut: KeyShortcutsBundle.GetStringFromName("dom.commandkey"),
       modifiers
     },
-    // Key for opening the Accessibility Panel
-    {
-      toolId: "accessibility",
-      shortcut: KeyShortcutsBundle.GetStringFromName("accessibility.commandkey"),
-      modifiers
-    },
   ];
 });
 
 function DevToolsStartup() {
   this.onEnabledPrefChanged = this.onEnabledPrefChanged.bind(this);
   this.onWindowReady = this.onWindowReady.bind(this);
 }
 
--- a/devtools/startup/locales/en-US/key-shortcuts.properties
+++ b/devtools/startup/locales/en-US/key-shortcuts.properties
@@ -60,12 +60,8 @@ performance.commandkey=VK_F5
 
 # LOCALIZATION NOTE (storage.commandkey):
 # Key pressed to open a toolbox with the storage panel selected
 storage.commandkey=VK_F9
 
 # LOCALIZATION NOTE (dom.commandkey):
 # Key pressed to open a toolbox with the DOM panel selected
 dom.commandkey=W
-
-# LOCALIZATION NOTE (accessibility.commandkey):
-# Key pressed to open a toolbox with the accessibility panel selected
-accessibility.commandkey=Y