From 76df15d3c334638db9cb5cffa3571b64b7be50cc Mon Sep 17 00:00:00 2001
From: David Capello <davidcapello@gmail.com>
Date: Tue, 13 Jun 2017 12:04:40 -0300
Subject: [PATCH] Add mnemonics to Extensions section in Preferences

Also fixed a problem using Alt+mnemonic on hidden buttons.
---
 data/strings/en.ini              | 6 +++---
 src/app/commands/cmd_options.cpp | 3 ++-
 src/ui/button.cpp                | 3 +--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/data/strings/en.ini b/data/strings/en.ini
index 3d7e16ccc..5ba278c8a 100644
--- a/data/strings/en.ini
+++ b/data/strings/en.ini
@@ -392,9 +392,9 @@ undo_allow_nonlinear_history = Allow non-linear history
 available_themes = Available Themes
 select_theme = &Select
 open_theme_folder = Open &Folder
-add_extension = Add Extension
-disable_extension = Disable
-uninstall_extension = Uninstall
+add_extension = &Add Extension
+disable_extension = &Disable
+uninstall_extension = &Uninstall
 open_extension_folder = Open &Folder
 user_interface = User Interface
 native_file_dialog = Use native file dialog
diff --git a/src/app/commands/cmd_options.cpp b/src/app/commands/cmd_options.cpp
index b4c5967d2..b547c7092 100644
--- a/src/app/commands/cmd_options.cpp
+++ b/src/app/commands/cmd_options.cpp
@@ -703,7 +703,8 @@ private:
   void onExtensionChange() {
     ExtensionItem* item = dynamic_cast<ExtensionItem*>(extensionsList()->getSelectedChild());
     if (item && item->isInstalled()) {
-      disableExtension()->setText(item->isEnabled() ? "Disable": "Enable");
+      disableExtension()->setText(item->isEnabled() ? "&Disable": "&Enable");
+      disableExtension()->processMnemonicFromText();
       disableExtension()->setEnabled(item->isEnabled() ? item->canBeDisabled(): true);
       uninstallExtension()->setEnabled(item->canBeUninstalled());
       openExtensionFolder()->setEnabled(true);
diff --git a/src/ui/button.cpp b/src/ui/button.cpp
index 4c8f9b6cf..bc8b7f41f 100644
--- a/src/ui/button.cpp
+++ b/src/ui/button.cpp
@@ -78,8 +78,7 @@ bool ButtonBase::onProcessMessage(Message* msg)
       KeyMessage* keymsg = static_cast<KeyMessage*>(msg);
       KeyScancode scancode = keymsg->scancode();
 
-      // If the button is enabled.
-      if (isEnabled()) {
+      if (isEnabled() && isVisible()) {
         bool mnemonicPressed =
           ((msg->altPressed() || msg->cmdPressed()) &&
            isMnemonicPressed(keymsg));