reordered refactor menu items, swapped Ctrl and Shift modifiers in ToMenuHotkeyString

Author: retailcoder

RetailCoder.VBE/Settings/HotkeySetting.cs

@@ -34,17 +34,17 @@ public string Prompt
         public string ToMenuHotkeyString()
         {
             return string.Format("{0}{1}{2}+{3}",
-                HasShiftModifier ? "Shift" : string.Empty,
-                HasCtrlModifier ? (HasShiftModifier ? "+" : string.Empty) + "Ctrl" : string.Empty,
-                HasAltModifier ? (HasShiftModifier | HasCtrlModifier ? "+" : string.Empty) + "Alt" : string.Empty,
+                HasCtrlModifier ? "Ctrl" : string.Empty,
+                HasShiftModifier ? (HasCtrlModifier ? "+" : string.Empty) + "Shift" : string.Empty,
+                HasAltModifier ? (HasCtrlModifier | HasShiftModifier ? "+" : string.Empty) + "Alt" : string.Empty,
                 Key1);
         }
 
         public override string ToString()
         {
-            return string.Format("{0}{1}{2}{3}", 
-                HasShiftModifier ? KeyModifierShift : string.Empty,
+            return string.Format("{0}{1}{2}{3}",
                 HasCtrlModifier ? KeyModifierCtrl : string.Empty,
+                HasShiftModifier ? KeyModifierShift : string.Empty,
                 HasAltModifier ? KeyModifierAlt : string.Empty,
                 Key1);
         }

RetailCoder.VBE/UI/Command/MenuItems/ParentMenus/RefactoringsParentMenu.cs

@@ -18,11 +18,11 @@ public enum RefactoringsMenuItemDisplayOrder
         ExtractMethod,
         ExtractInterface,
         ImplementInterface,
+        RemoveParameters,
+        ReorderParameters,
         MoveCloserToUsage,
+        EncapsulateField,
         IntroduceParameter,
-        ReorderParameters,
-        RemoveParameters,
         IntroduceField,
-        EncapsulateField,
     }
 }

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

@@ -15,8 +15,8 @@ public RefactorEncapsulateFieldCommandMenuItem(ICommand command)
 
         public override string Key { get { return "RefactorMenu_EncapsulateField"; } }
         public override int DisplayOrder { get { return (int)RefactoringsMenuItemDisplayOrder.EncapsulateField; } }
-        public override Image Image { get { return Resources.AddProperty_5538_32; } }
-        public override Image Mask { get { return Resources.AddProperty_5538_321_Mask; } }
+        //public override Image Image { get { return Resources.AddProperty_5538_32; } }
+        //public override Image Mask { get { return Resources.AddProperty_5538_321_Mask; } }
 
         public override bool EvaluateCanExecute(RubberduckParserState state)
         {

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

@@ -14,6 +14,8 @@ public RefactorRemoveParametersCommandMenuItem(ICommand command) : base(command)
 
         public override string Key { get { return "RefactorMenu_RemoveParameter"; } }
         public override int DisplayOrder { get { return (int)RefactoringsMenuItemDisplayOrder.RemoveParameters; } }
+        public override bool BeginGroup { get { return true; } }
+
         public override Image Image { get { return Resources.RemoveParameters_6781_32; } }
         public override Image Mask { get { return Resources.RemoveParameters_6781_32_Mask; }}