hotkeys re-attach and update menu shortcutkeys when settings are saved

Author: retailcoder

RetailCoder.VBE/App.cs

@@ -61,6 +61,7 @@ public App(VBE vbe, IMessageBox messageBox,
             _hooks = hooks;
             _logger = LogManager.GetCurrentClassLogger();
 
+            _configService.SettingsChanged += _configService_SettingsChanged;
             _configService.LanguageChanged += ConfigServiceLanguageChanged;
             _parser.State.StateChanged += Parser_StateChanged;
             _stateBar.Refresh += _stateBar_Refresh;
@@ -80,6 +81,13 @@ public App(VBE vbe, IMessageBox messageBox,
             UiDispatcher.Initialize();
         }
 
+        private void _configService_SettingsChanged(object sender, EventArgs e)
+        {
+            // also updates the ShortcutKey text
+            _appMenus.Localize();
+            _hooks.HookHotkeys();
+        }
+
         public void Startup()
         {
             CleanReloadConfig();

RetailCoder.VBE/Common/RubberduckHooks.cs

@@ -38,12 +38,17 @@ public RubberduckHooks(VBE vbe, IAttachable timerHook, IGeneralConfigService con
 
         public void HookHotkeys()
         {
+            Detach();
+            _hooks.Clear();
+
             var config = _config.LoadConfiguration();
             var settings = config.UserSettings.GeneralSettings.HotkeySettings;
             foreach (var hotkey in settings.Where(hotkey => hotkey.IsEnabled))
             {
                 AddHook(new Hotkey(_mainWindowHandle, hotkey.ToString(), hotkey.Command));
             }
+
+            Attach();
         }
 
         public IEnumerable<IAttachable> Hooks { get { return _hooks; } }
@@ -77,7 +82,7 @@ public void Attach()
             {
                 hook.Attach();
                 hook.MessageReceived += hook_MessageReceived;
-                }
+            }
 
             IsAttached = true;
         }
@@ -110,7 +115,7 @@ public void Detach()
             {
                 hook.Detach();
                 hook.MessageReceived -= hook_MessageReceived;
-                }
+            }
 
             IsAttached = false;
         }

RetailCoder.VBE/Settings/ConfigurationLoader.cs

@@ -93,6 +93,7 @@ private IDictionary<RubberduckHotkey, ICommand> GetCommandMappings()
                 { RubberduckHotkey.IndentModule, Command<IndentCurrentModuleCommand>() },
                 { RubberduckHotkey.IndentProcedure, Command<IndentCurrentProcedureCommand>() },
                 { RubberduckHotkey.FindSymbol, Command<FindSymbolCommand>() },
+                { RubberduckHotkey.RefactorMoveCloserToUsage, Command<RefactorMoveCloserToUsageCommand>() },
                 { RubberduckHotkey.InspectionResults, Command<InspectionResultsCommand>() },
                 { RubberduckHotkey.RefactorExtractMethod, Command<RefactorExtractMethodCommand>() },
                 { RubberduckHotkey.RefactorRename, Command<CodePaneRefactorRenameCommand>() },
@@ -188,6 +189,7 @@ private GeneralSettings GetDefaultGeneralSettings()
                     new HotkeySetting{Name=RubberduckHotkey.FindSymbol.ToString(), IsEnabled=true, HasCtrlModifier = true, Key1="T", Command = commandMappings[RubberduckHotkey.InspectionResults]},
                     new HotkeySetting{Name=RubberduckHotkey.InspectionResults.ToString(), IsEnabled=true, HasCtrlModifier = true, HasShiftModifier = true, Key1="I", Command = commandMappings[RubberduckHotkey.InspectionResults]},
                     new HotkeySetting{Name=RubberduckHotkey.TestExplorer.ToString(), IsEnabled=true, HasCtrlModifier = true, HasShiftModifier = true, Key1="T", Command = commandMappings[RubberduckHotkey.TestExplorer]},
+                    new HotkeySetting{Name=RubberduckHotkey.RefactorMoveCloserToUsage.ToString(), IsEnabled=true, HasCtrlModifier = true, HasShiftModifier = true, Key1="C", Command = commandMappings[RubberduckHotkey.RefactorMoveCloserToUsage]},
                     new HotkeySetting{Name=RubberduckHotkey.RefactorRename.ToString(), IsEnabled=true, HasCtrlModifier = true, HasShiftModifier = true, Key1="R", Command = commandMappings[RubberduckHotkey.RefactorRename]},
                     new HotkeySetting{Name=RubberduckHotkey.RefactorExtractMethod.ToString(), IsEnabled=true, HasCtrlModifier = true, HasShiftModifier = true, Key1="M", Command = commandMappings[RubberduckHotkey.RefactorExtractMethod]}
                 },

RetailCoder.VBE/Settings/RubberduckHotkey.cs

@@ -8,6 +8,7 @@ public enum RubberduckHotkey
         FindSymbol,
         InspectionResults,
         TestExplorer,
+        RefactorMoveCloserToUsage,
         RefactorRename,
         RefactorExtractMethod,
     }

RetailCoder.VBE/UI/Command/MenuItems/RefactorMoveCloserToUsageCommandMenuItem.cs

@@ -13,6 +13,7 @@ public RefactorMoveCloserToUsageCommandMenuItem(ICommand command)
 
         public override string Key { get { return "RefactorMenu_MoveCloserToUsage"; } }
         public override int DisplayOrder { get { return (int)RefactoringsMenuItemDisplayOrder.MoveCloserToUsage; } }
+        public override bool BeginGroup { get { return true; } }
 
         public override bool EvaluateCanExecute(RubberduckParserState state)
         {

RetailCoder.VBE/UI/RubberduckUI.Designer.cs

@@ -1492,6 +1492,9 @@ All our stargazers, likers & followers, for the warm fuzzies
   <data name="HotkeyDescription_FindSymbol" xml:space="preserve">
     <value>Find symbol</value>
   </data>
+  <data name="HotkeyDescription_RefactorMoveCloserToUsage" xml:space="preserve">
+    <value>Move declaration closer to usage</value>
+  </data>
   <data name="RubberduckMenu_RegexSearchReplace" xml:space="preserve">
     <value>Rege&amp;x Search/Replace</value>
   </data>