added command mappings

Author: retailcoder

RetailCoder.VBE/Settings/ConfigurationLoader.cs

@@ -51,6 +51,10 @@ public override Configuration LoadConfiguration()
             {
                 config.UserSettings.GeneralSettings = GetDefaultGeneralSettings();
             }
+            else
+            {
+                AssociateHotkeyCommands(config);
+            }
 
             if (config.UserSettings.ToDoListSettings == null)
             {
@@ -80,6 +84,33 @@ public override Configuration LoadConfiguration()
             return config;
         }
 
+        private IDictionary<RubberduckHotkey, ICommand> GetCommandMappings()
+        {
+            return new Dictionary<RubberduckHotkey, ICommand>
+            {
+                { RubberduckHotkey.CodeExplorer, _commands.SingleOrDefault(cmd => cmd is CodeExplorerCommand)},
+                { RubberduckHotkey.IndentModule, _commands.SingleOrDefault(cmd => cmd is IndentCurrentModuleCommand)},
+                { RubberduckHotkey.IndentProcedure, _commands.SingleOrDefault(cmd => cmd is IndentCurrentProcedureCommand)},
+                { RubberduckHotkey.InspectionResults, _commands.SingleOrDefault(cmd => cmd is InspectionResultsCommand)},
+                { RubberduckHotkey.RefactorExtractMethod, _commands.SingleOrDefault(cmd => cmd is RefactorExtractMethodCommand)},
+                { RubberduckHotkey.RefactorRename, _commands.SingleOrDefault(cmd => cmd is CodePaneRefactorRenameCommand)},
+                { RubberduckHotkey.TestExplorer, _commands.SingleOrDefault(cmd => cmd is TestExplorerCommand)}
+            };
+        }
+
+        private void AssociateHotkeyCommands(Configuration config)
+        {
+            var mappings = GetCommandMappings();
+            foreach (var setting in config.UserSettings.GeneralSettings.HotkeySettings)
+            {
+                RubberduckHotkey hotkey;
+                if (Enum.TryParse(setting.Name, out hotkey))
+                {
+                    setting.Command = mappings[hotkey];
+                }
+            }
+        }
+
         protected override Configuration HandleIOException(IOException ex)
         {
             return GetDefaultConfiguration();
@@ -139,16 +170,17 @@ public Configuration GetDefaultConfiguration()
 
         private GeneralSettings GetDefaultGeneralSettings()
         {
+            var commandMappings = GetCommandMappings();
             return new GeneralSettings(new DisplayLanguageSetting("en-US"),
                 new[]
                 {
-                    new HotkeySetting{Name=RubberduckHotkey.IndentProcedure.ToString(), IsEnabled=true, HasCtrlModifier = true, Key1="P", Command = _commands.SingleOrDefault(cmd => cmd is IndentCurrentProcedureCommand)},
-                    new HotkeySetting{Name=RubberduckHotkey.IndentModule.ToString(), IsEnabled=true, HasCtrlModifier = true, Key1="M", Command = _commands.SingleOrDefault(cmd => cmd is IndentCurrentModuleCommand)},
-                    new HotkeySetting{Name=RubberduckHotkey.CodeExplorer.ToString(), IsEnabled=true, HasCtrlModifier = true, Key1="R", Command = _commands.SingleOrDefault(cmd => cmd is CodeExplorerCommand)},
-                    new HotkeySetting{Name=RubberduckHotkey.InspectionResults.ToString(), IsEnabled=true, HasCtrlModifier = true, HasShiftModifier = true, Key1="I", Command = _commands.SingleOrDefault(cmd => cmd is InspectionResultsCommand)},
-                    new HotkeySetting{Name=RubberduckHotkey.TestExplorer.ToString(), IsEnabled=true, HasCtrlModifier = true, HasShiftModifier = true, Key1="T", Command = _commands.SingleOrDefault(cmd => cmd is TestExplorerCommand)},
-                    new HotkeySetting{Name=RubberduckHotkey.RefactorRename.ToString(), IsEnabled=true, HasCtrlModifier = true, HasShiftModifier = true, Key1="R", Command = _commands.SingleOrDefault(cmd => cmd is CodePaneRefactorRenameCommand)},
-                    new HotkeySetting{Name=RubberduckHotkey.RefactorExtractMethod.ToString(), IsEnabled=true, HasCtrlModifier = true, HasShiftModifier = true, Key1="M", Command = _commands.SingleOrDefault(cmd => cmd is RefactorExtractMethodCommand)}
+                    new HotkeySetting{Name=RubberduckHotkey.IndentProcedure.ToString(), IsEnabled=true, HasCtrlModifier = true, Key1="P", Command = commandMappings[RubberduckHotkey.IndentProcedure]},
+                    new HotkeySetting{Name=RubberduckHotkey.IndentModule.ToString(), IsEnabled=true, HasCtrlModifier = true, Key1="M", Command = commandMappings[RubberduckHotkey.IndentModule]},
+                    new HotkeySetting{Name=RubberduckHotkey.CodeExplorer.ToString(), IsEnabled=true, HasCtrlModifier = true, Key1="R", Command = commandMappings[RubberduckHotkey.CodeExplorer]},
+                    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.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]}
                 },
                 false, 10);
         }