Introduced Tools ParentMenu in Rubberduck and moved NavigateMenuItem Orders into NavigateParentMenu.cs to match other ParentMenus

Vogel612 · Vogel612 · commit 35c803c88ccf · 2016-07-14T01:18:50.000+02:00
diff --git a/RetailCoder.VBE/Root/RubberduckModule.cs b/RetailCoder.VBE/Root/RubberduckModule.cs
@@ -144,6 +144,7 @@ public override void Load()
             ConfigureFormDesignerContextMenu();
             ConfigureFormDesignerControlContextMenu();
             ConfigureProjectExplorerContextMenu();
+            
 
             BindWindowsHooks();
         }
@@ -383,10 +384,9 @@ private IEnumerable<IMenuItem> GetRubberduckMenuItems()
                 Kernel.Get<AboutCommandMenuItem>(),
                 Kernel.Get<SettingsCommandMenuItem>(),
                 Kernel.Get<InspectionResultsCommandMenuItem>(),
-                Kernel.Get<ShowSourceControlPanelCommandMenuItem>(),
-                Kernel.Get<RegexAssistantCommandMenuItem>(),
                 GetUnitTestingParentMenu(),
                 GetSmartIndenterParentMenu(),
+                GetToolsParentMenu(),
                 GetRefactoringsParentMenu(),
                 GetNavigateParentMenu(),
             };
@@ -428,7 +428,6 @@ private IMenuItem GetNavigateParentMenu()
             var items = new IMenuItem[]
             {
                 Kernel.Get<CodeExplorerCommandMenuItem>(),
-                Kernel.Get<ToDoExplorerCommandMenuItem>(),
                 //Kernel.Get<RegexSearchReplaceCommandMenuItem>(),
                 Kernel.Get<FindSymbolCommandMenuItem>(),
                 Kernel.Get<FindAllReferencesCommandMenuItem>(),
@@ -455,13 +454,24 @@ private IEnumerable<IMenuItem> GetCodePaneContextMenuItems()
             {
                 GetRefactoringsParentMenu(),
                 GetSmartIndenterParentMenu(),
-                //Kernel.Get<RegexSearchReplaceCommandMenuItem>(),
                 Kernel.Get<FindSymbolCommandMenuItem>(),
                 Kernel.Get<FindAllReferencesCommandMenuItem>(),
                 Kernel.Get<FindAllImplementationsCommandMenuItem>(),
             };
         }
 
+        private IMenuItem GetToolsParentMenu()
+        {
+            var items = new IMenuItem[]
+            {
+                Kernel.Get<ShowSourceControlPanelCommandMenuItem>(),
+                Kernel.Get<RegexAssistantCommandMenuItem>(),
+                Kernel.Get<ToDoExplorerCommandMenuItem>(),
+            };
+
+            return new ToolsParentMenu(items);
+        }
+
         private IEnumerable<IMenuItem> GetFormDesignerContextMenuItems()
         {
             return new IMenuItem[]
diff --git a/RetailCoder.VBE/Rubberduck.csproj b/RetailCoder.VBE/Rubberduck.csproj
@@ -433,6 +433,7 @@
     <Compile Include="UI\CodeExplorer\Commands\AddClassModuleCommand.cs" />
     <Compile Include="UI\CodeExplorer\Commands\AddStdModuleCommand.cs" />
     <Compile Include="UI\CodeExplorer\Commands\AddTestModuleCommand.cs" />
+    <Compile Include="UI\Command\MenuItems\ParentMenus\ToolsParentMenu.cs" />
     <Compile Include="UI\Command\MenuItems\RegexAssistantCommandMenuItem.cs" />
     <Compile Include="UI\Command\RegexAssistantCommand.cs" />
     <Compile Include="UI\Controls\LinkButton.xaml.cs">
@@ -620,7 +621,6 @@
     <Compile Include="UI\Command\FindSymbolCommand.cs" />
     <Compile Include="UI\Command\FindAllReferencesCommand.cs" />
     <Compile Include="UI\Command\MenuItems\ParentMenus\NavigateParentMenu.cs" />
-    <Compile Include="UI\Command\MenuItems\ParentMenus\NavigationMenuItemDisplayOrder.cs" />
     <Compile Include="UI\Command\MenuItems\ParentMenus\SmartIndenterParentMenu.cs" />
     <Compile Include="UI\Command\MenuItems\RubberduckCommandBar.cs" />
     <Compile Include="UI\Command\MenuItems\RefactorEncapsulateFieldCommandMenuItem.cs" />
diff --git a/RetailCoder.VBE/UI/Command/MenuItems/ParentMenus/NavigateParentMenu.cs b/RetailCoder.VBE/UI/Command/MenuItems/ParentMenus/NavigateParentMenu.cs
@@ -11,4 +11,14 @@ public NavigateParentMenu(IEnumerable<IMenuItem> items)
 
         public override int DisplayOrder { get { return (int)RubberduckMenuItemDisplayOrder.Navigate; } }
     }
+
+    public enum NavigationMenuItemDisplayOrder
+    {
+        CodeExplorer,
+        //ToDoExplorer,
+        RegexSearchReplace,
+        FindSymbol,
+        FindAllReferences,
+        FindImplementations
+    }
 }
diff --git a/RetailCoder.VBE/UI/Command/MenuItems/ParentMenus/NavigationMenuItemDisplayOrder.cs b/RetailCoder.VBE/UI/Command/MenuItems/ParentMenus/NavigationMenuItemDisplayOrder.cs
diff --git a/RetailCoder.VBE/UI/Command/MenuItems/ParentMenus/RubberduckParentMenu.cs b/RetailCoder.VBE/UI/Command/MenuItems/ParentMenus/RubberduckParentMenu.cs
@@ -15,10 +15,9 @@ public enum RubberduckMenuItemDisplayOrder
         UnitTesting,
         Refactorings,
         Navigate,
+        Tools,
         CodeInspections,
-        SourceControl,
         Settings,
         About,
-        RegexAssistant
     }
 }
diff --git a/RetailCoder.VBE/UI/Command/MenuItems/RegexAssistantCommandMenuItem.cs b/RetailCoder.VBE/UI/Command/MenuItems/RegexAssistantCommandMenuItem.cs
@@ -9,8 +9,8 @@ public RegexAssistantCommandMenuItem(CommandBase command) : base(command)
         {
         }
 
-        public override string Key { get { return "RubberduckMenu_RegexAssistant"; } }
+        public override string Key { get { return "ToolsMenu_RegexAssistant"; } }
 
-        public override int DisplayOrder { get { return (int)RubberduckMenuItemDisplayOrder.RegexAssistant; } }
+        public override int DisplayOrder { get { return (int)ToolsMenuItemDisplayOrder.RegexAssistant; } }
     }
 }
diff --git a/RetailCoder.VBE/UI/Command/MenuItems/ShowSourceControlPanelCommandMenuItem.cs b/RetailCoder.VBE/UI/Command/MenuItems/ShowSourceControlPanelCommandMenuItem.cs
@@ -10,7 +10,7 @@ public ShowSourceControlPanelCommandMenuItem(CommandBase command)
         {
         }
 
-        public override string Key { get { return "RubberduckMenu_SourceControl"; } }
-        public override int DisplayOrder { get { return (int)RubberduckMenuItemDisplayOrder.SourceControl; } }
+        public override string Key { get { return "ToolsMenu_SourceControl"; } }
+        public override int DisplayOrder { get { return (int)ToolsMenuItemDisplayOrder.SourceControl; } }
     }
 }
diff --git a/RetailCoder.VBE/UI/Command/MenuItems/ToDoExplorerCommandMenuItem.cs b/RetailCoder.VBE/UI/Command/MenuItems/ToDoExplorerCommandMenuItem.cs
@@ -1,5 +1,4 @@
-﻿using System.Windows.Input;
-using Rubberduck.UI.Command.MenuItems.ParentMenus;
+﻿using Rubberduck.UI.Command.MenuItems.ParentMenus;
 
 namespace Rubberduck.UI.Command.MenuItems
 {
@@ -10,7 +9,7 @@ public ToDoExplorerCommandMenuItem(CommandBase command)
         {
         }
 
-        public override string Key { get { return "RubberduckMenu_TodoItems"; } }
-        public override int DisplayOrder { get { return (int)NavigationMenuItemDisplayOrder.ToDoExplorer; } }
+        public override string Key { get { return "ToolsMenu_TodoItems"; } }
+        public override int DisplayOrder { get { return (int)ToolsMenuItemDisplayOrder.ToDoExplorer; } }
     }
 }
diff --git a/RetailCoder.VBE/UI/RegexAssistant/RegexAssistant.xaml b/RetailCoder.VBE/UI/RegexAssistant/RegexAssistant.xaml
@@ -8,6 +8,7 @@
              d:DesignHeight="300" Width="555"
              d:DataContext="{d:DesignInstance {x:Type assistant:RegexAssistantViewModel}, IsDesignTimeCreatable=False}">
     <UserControl.Resources>
+        <!-- Style adapted from http://stackoverflow.com/a/16640367/1803692 -->
         <Style TargetType="{x:Type TreeViewItem}" x:Key="ShinyRegexTreeViewItem">
             <Setter Property="Template">
                 <Setter.Value>
diff --git a/RetailCoder.VBE/UI/RubberduckUI.Designer.cs b/RetailCoder.VBE/UI/RubberduckUI.Designer.cs
diff --git a/RetailCoder.VBE/UI/RubberduckUI.resx b/RetailCoder.VBE/UI/RubberduckUI.resx
@@ -338,10 +338,10 @@
   <data name="RubberduckMenu_Refactor" xml:space="preserve">
     <value>&amp;Refactor</value>
   </data>
-  <data name="RubberduckMenu_SourceControl" xml:space="preserve">
+  <data name="ToolsMenu_SourceControl" xml:space="preserve">
     <value>&amp;Source Control</value>
   </data>
-  <data name="RubberduckMenu_TodoItems" xml:space="preserve">
+  <data name="ToolsMenu_TodoItems" xml:space="preserve">
     <value>To&amp;Do Items</value>
   </data>
   <data name="RubberduckMenu_UnitTests" xml:space="preserve">
@@ -1748,7 +1748,10 @@ All our stargazers, likers &amp; followers, for the warm fuzzies
   <data name="RegexAssistant_RegexPatternLabel" xml:space="preserve">
     <value>The RegExp:</value>
   </data>
-  <data name="RubberduckMenu_RegexAssistant" xml:space="preserve">
+  <data name="ToolsMenu_RegexAssistant" xml:space="preserve">
     <value>Regex &amp;Assistant</value>
   </data>
+  <data name="ToolsMenu" xml:space="preserve">
+    <value>T&amp;ools</value>
+  </data>
 </root>

Original file line number	Diff line number	Diff line change
`@@ -11,4 +11,14 @@ public NavigateParentMenu(IEnumerable<IMenuItem> items)`
`11`	`11`
`12`	`12`	`public override int DisplayOrder { get { return (int)RubberduckMenuItemDisplayOrder.Navigate; } }`
`13`	`13`	`}`
	`14`	`+`
	`15`	`+ public enum NavigationMenuItemDisplayOrder`
	`16`	`+ {`
	`17`	`+ CodeExplorer,`
	`18`	`+ //ToDoExplorer,`
	`19`	`+ RegexSearchReplace,`
	`20`	`+ FindSymbol,`
	`21`	`+ FindAllReferences,`
	`22`	`+ FindImplementations`
	`23`	`+ }`
`14`	`24`	`}`
Original file line number	Diff line number	Diff line change
`@@ -15,10 +15,9 @@ public enum RubberduckMenuItemDisplayOrder`
`15`	`15`	`UnitTesting,`
`16`	`16`	`Refactorings,`
`17`	`17`	`Navigate,`
	`18`	`+ Tools,`
`18`	`19`	`CodeInspections,`
`19`		`- SourceControl,`
`20`	`20`	`Settings,`
`21`	`21`	`About,`
`22`		`- RegexAssistant`
`23`	`22`	`}`
`24`	`23`	`}`
Original file line number	Diff line number	Diff line change
`@@ -9,8 +9,8 @@ public RegexAssistantCommandMenuItem(CommandBase command) : base(command)`
`9`	`9`	`{`
`10`	`10`	`}`
`11`	`11`
`12`		`- public override string Key { get { return "RubberduckMenu_RegexAssistant"; } }`
	`12`	`+ public override string Key { get { return "ToolsMenu_RegexAssistant"; } }`
`13`	`13`
`14`		`- public override int DisplayOrder { get { return (int)RubberduckMenuItemDisplayOrder.RegexAssistant; } }`
	`14`	`+ public override int DisplayOrder { get { return (int)ToolsMenuItemDisplayOrder.RegexAssistant; } }`
`15`	`15`	`}`
`16`	`16`	`}`
Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,7 @@ public ShowSourceControlPanelCommandMenuItem(CommandBase command)`
`10`	`10`	`{`
`11`	`11`	`}`
`12`	`12`
`13`		`- public override string Key { get { return "RubberduckMenu_SourceControl"; } }`
`14`		`- public override int DisplayOrder { get { return (int)RubberduckMenuItemDisplayOrder.SourceControl; } }`
	`13`	`+ public override string Key { get { return "ToolsMenu_SourceControl"; } }`
	`14`	`+ public override int DisplayOrder { get { return (int)ToolsMenuItemDisplayOrder.SourceControl; } }`
`15`	`15`	`}`
`16`	`16`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,4 @@`
`1`		`-using System.Windows.Input;`
`2`		`-using Rubberduck.UI.Command.MenuItems.ParentMenus;`
	`1`	`+using Rubberduck.UI.Command.MenuItems.ParentMenus;`
`3`	`2`
`4`	`3`	`namespace Rubberduck.UI.Command.MenuItems`
`5`	`4`	`{`
`@@ -10,7 +9,7 @@ public ToDoExplorerCommandMenuItem(CommandBase command)`
`10`	`9`	`{`
`11`	`10`	`}`
`12`	`11`
`13`		`- public override string Key { get { return "RubberduckMenu_TodoItems"; } }`
`14`		`- public override int DisplayOrder { get { return (int)NavigationMenuItemDisplayOrder.ToDoExplorer; } }`
	`12`	`+ public override string Key { get { return "ToolsMenu_TodoItems"; } }`
	`13`	`+ public override int DisplayOrder { get { return (int)ToolsMenuItemDisplayOrder.ToDoExplorer; } }`
`15`	`14`	`}`
`16`	`15`	`}`