Merge pull request #1302 from retailcoder/next

hotkey config fixes; added hotkeys to menu items; layout changes to "refactor" menu, too

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/Navigation/RegexSearchReplace/RegexSearchReplacePresenter.cs

@@ -27,12 +27,12 @@ public RegexSearchReplacePresenter(VBE vbe, IRubberduckParser parser/*, IRegexSe
 
         public void Show()
         {
-            _view.ShowDialog();
+            //_view.ShowDialog();
         }
 
         public void Hide()
         {
-            _view.Close();
+            //_view.Close();
         }
 
         public event EventHandler<IEnumerable<RegexSearchResult>> FindButtonResults;
@@ -65,7 +65,7 @@ private void _view_ReplaceAllButtonClicked(object sender, EventArgs e)
 
         private void _view_CancelButtonClicked(object sender, EventArgs e)
         {
-            _view.Close();
+            //_view.Close();
         }
     }
 }

RetailCoder.VBE/Properties/Resources.Designer.cs

@@ -385,4 +385,22 @@
   <data name="blue_folder_horizontal_open" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\blue-folder-horizontal-open.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
+  <data name="AddProperty_5538_321_Mask" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\Microsoft\Mask\AddProperty_5538_32.bmp;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="ExtractInterface_6778_321_Mask" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\Microsoft\Mask\ExtractInterface_6778_32.bmp;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="ImplementInterface_5540_321_Mask" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\Microsoft\Mask\ImplementInterface_5540_32.bmp;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="AddVariable_5541_32_Mask" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\Microsoft\Mask\AddVariable_5541_32.bmp;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="PromoteLocal_6784_32" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\Microsoft\PromoteLocal_6784_32.bmp;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="PromoteLocal_6784_32_Mask" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\Microsoft\Mask\PromoteLocal_6784_32.bmp;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
 </root>