Merge pull request #6075 from INOPIAE/window_menu_5505

retailcoder · web-flow · commit 322d6bc3952a · 2023-01-13T08:22:31.000-05:00
Add a Windows menu fixes #5505
diff --git a/Rubberduck.Core/UI/Command/MenuItems/CodeExplorerCommandMenuItem.cs b/Rubberduck.Core/UI/Command/MenuItems/CodeExplorerCommandMenuItem.cs
@@ -16,4 +16,14 @@ public CodeExplorerCommandMenuItem(CodeExplorerCommand command)
         public override string Key => "RubberduckMenu_CodeExplorer";
         public override int DisplayOrder => (int)NavigationMenuItemDisplayOrder.CodeExplorer;
     }
+
+    public class WindowsCodeExplorerCommandMenuItem : CodeExplorerCommandMenuItem
+    {
+        public WindowsCodeExplorerCommandMenuItem(CodeExplorerCommand command)
+            : base(command)
+        { }
+
+        public override int DisplayOrder => (int)WindowMenuItemDisplayOrder.CodeExplorer;
+    }
+
 }
diff --git a/Rubberduck.Core/UI/Command/MenuItems/CodeMetricsCommandMenuItem.cs b/Rubberduck.Core/UI/Command/MenuItems/CodeMetricsCommandMenuItem.cs
@@ -15,4 +15,14 @@ public CodeMetricsCommandMenuItem(CodeMetricsCommand command)
         public override string Key => "RubberduckMenu_CodeMetrics";
         public override int DisplayOrder => (int)ToolsMenuItemDisplayOrder.CodeMetrics;
     }
+
+    public class WindowsCodeMetricsCommandMenuItem : CodeMetricsCommandMenuItem
+    {
+        public WindowsCodeMetricsCommandMenuItem(CodeMetricsCommand command)
+            : base(command)
+        {
+        }
+
+        public override int DisplayOrder => (int)WindowMenuItemDisplayOrder.CodeMetrics;
+    }
 }
diff --git a/Rubberduck.Core/UI/Command/MenuItems/FindAllImplementationsCommandMenuItem.cs b/Rubberduck.Core/UI/Command/MenuItems/FindAllImplementationsCommandMenuItem.cs
@@ -35,4 +35,13 @@ public ProjectExplorerFindAllImplementationsCommandMenuItem(ProjectExplorerFindA
 
         public override int DisplayOrder => (int)ProjectExplorerContextMenuItemDisplayOrder.FindAllImplementations;
     }
+
+    public class WindowsFindAllImplementationsCommandMenuItem : FindAllImplementationsCommandMenuItemBase
+    {
+        public WindowsFindAllImplementationsCommandMenuItem(ProjectExplorerFindAllImplementationsCommand command)
+            : base(command)
+        { }
+
+        public override int DisplayOrder => (int)WindowMenuItemDisplayOrder.FindAllImplementations;
+    }
 }
diff --git a/Rubberduck.Core/UI/Command/MenuItems/FindAllReferencesCommandMenuItem.cs b/Rubberduck.Core/UI/Command/MenuItems/FindAllReferencesCommandMenuItem.cs
@@ -37,4 +37,15 @@ public ProjectExplorerFindAllReferencesCommandMenuItem(ProjectExplorerFindAllRef
 
         public override int DisplayOrder => (int)ProjectExplorerContextMenuItemDisplayOrder.FindAllReferences;
     }
+
+
+    public class WindowsFindAllReferencesCommandMenuItem : FindAllReferencesCommandMenuItemBase
+    {
+        public WindowsFindAllReferencesCommandMenuItem(ProjectExplorerFindAllReferencesCommand command)
+            : base(command)
+        { }
+
+        public override int DisplayOrder => (int)WindowMenuItemDisplayOrder.FindAllReferences;
+    }
+
 }
diff --git a/Rubberduck.Core/UI/Command/MenuItems/FindSymbolCommandMenuItem.cs b/Rubberduck.Core/UI/Command/MenuItems/FindSymbolCommandMenuItem.cs
@@ -38,4 +38,13 @@ public ProjectExplorerFindSymbolCommandMenuItem(FindSymbolCommand command)
 
         public override int DisplayOrder => (int)ProjectExplorerContextMenuItemDisplayOrder.FindSymbol;
     }
+
+    public class WindowsFindSymbolCommandMenuItem : FindSymbolCommandMenuItemBase
+    {
+        public WindowsFindSymbolCommandMenuItem(FindSymbolCommand command)
+            : base(command)
+        { }
+
+        public override int DisplayOrder => (int)WindowMenuItemDisplayOrder.FindSymbol;
+    }
 }
diff --git a/Rubberduck.Core/UI/Command/MenuItems/InspectionResultsCommandMenuItem.cs b/Rubberduck.Core/UI/Command/MenuItems/InspectionResultsCommandMenuItem.cs
@@ -13,4 +13,14 @@ public InspectionResultsCommandMenuItem(InspectionResultsCommand command)
         public override string Key => "RubberduckMenu_CodeInspections";
         public override int DisplayOrder => (int)RubberduckMenuItemDisplayOrder.CodeInspections;
     }
+
+
+    public class WindowsInspectionResultsCommandMenuItem : InspectionResultsCommandMenuItem
+    {
+        public WindowsInspectionResultsCommandMenuItem(InspectionResultsCommand command)
+            : base(command)
+        { }
+
+        public override int DisplayOrder => (int)WindowMenuItemDisplayOrder.CodeInspections;
+    }
 }
diff --git a/Rubberduck.Core/UI/Command/MenuItems/ParentMenus/RubberduckParentMenu.cs b/Rubberduck.Core/UI/Command/MenuItems/ParentMenus/RubberduckParentMenu.cs
@@ -18,6 +18,7 @@ public enum RubberduckMenuItemDisplayOrder
         Refactorings,
         Navigate,
         Tools,
+        Windows,
         CodeInspections,
         Settings,
         About,
diff --git a/Rubberduck.Core/UI/Command/MenuItems/ParentMenus/WindowParentMenu.cs b/Rubberduck.Core/UI/Command/MenuItems/ParentMenus/WindowParentMenu.cs
@@ -0,0 +1,27 @@
+﻿using System.Collections.Generic;
+using Rubberduck.Parsing.UIContext;
+
+namespace Rubberduck.UI.Command.MenuItems.ParentMenus
+{
+    public class WindowParentMenu : ParentMenuItemBase
+    {
+        public WindowParentMenu(IEnumerable<IMenuItem> items, IUiDispatcher dispatcher)
+            : base(dispatcher, "WindowMenu", items)
+        {
+        }
+
+        public override int DisplayOrder => (int)RubberduckMenuItemDisplayOrder.Windows;
+    }
+
+    public enum WindowMenuItemDisplayOrder
+    {
+        CodeExplorer,
+        CodeInspections,
+        CodeMetrics,
+        FindSymbol,
+        FindAllReferences,
+        FindAllImplementations ,
+        TestExplorer,
+        ToDoExplorer
+    }
+}
diff --git a/Rubberduck.Core/UI/Command/MenuItems/TestExplorerCommandMenuItem.cs b/Rubberduck.Core/UI/Command/MenuItems/TestExplorerCommandMenuItem.cs
@@ -13,4 +13,14 @@ public TestExplorerCommandMenuItem(TestExplorerCommand command)
         public override string Key => "TestMenu_TextExplorer";
         public override int DisplayOrder => (int)UnitTestingMenuItemDisplayOrder.TestExplorer;
     }
+
+    internal class WindowsTestExplorerCommandMenuItem : TestExplorerCommandMenuItem
+    {
+        public WindowsTestExplorerCommandMenuItem(TestExplorerCommand command)
+            : base(command)
+        {
+        }
+
+        public override int DisplayOrder => (int)WindowMenuItemDisplayOrder.TestExplorer;
+    }
 }
diff --git a/Rubberduck.Core/UI/Command/MenuItems/ToDoExplorerCommandMenuItem.cs b/Rubberduck.Core/UI/Command/MenuItems/ToDoExplorerCommandMenuItem.cs
@@ -13,4 +13,14 @@ public ToDoExplorerCommandMenuItem(ToDoExplorerCommand command)
         public override string Key => "ToolsMenu_TodoItems";
         public override int DisplayOrder => (int)ToolsMenuItemDisplayOrder.ToDoExplorer;
     }
+
+    public class WindowsToDoExplorerCommandMenuItem : ToDoExplorerCommandMenuItem
+    {
+        public WindowsToDoExplorerCommandMenuItem(ToDoExplorerCommand command)
+            : base(command)
+        {
+        }
+
+        public override int DisplayOrder => (int)WindowMenuItemDisplayOrder.ToDoExplorer;
+    }
 }
diff --git a/Rubberduck.Main/Root/RubberduckIoCInstaller.cs b/Rubberduck.Main/Root/RubberduckIoCInstaller.cs
@@ -531,6 +531,7 @@ private Type[] RubberduckMenuItems()
                 typeof(UnitTestingParentMenu),
                 typeof(SmartIndenterParentMenu),
                 typeof(ToolsParentMenu),
+                typeof(WindowParentMenu),
                 typeof(RefactoringsParentMenu),
                 typeof(NavigateParentMenu)
             };
@@ -717,6 +718,7 @@ private void RegisterParentMenus(IWindsorContainer container)
             RegisterParentMenu<SmartIndenterParentMenu>(container, SmartIndenterMenuItems());
             RegisterParentMenu<AnnotateParentMenu>(container, AnnotateMenuItems());
             RegisterParentMenu<ToolsParentMenu>(container, ToolsMenuItems());
+            RegisterParentMenu<WindowParentMenu>(container, WindowMenuItems());
         }
 
         private void RegisterParentMenu<TParentMenu>(IWindsorContainer container, Type[] menuItemTypes) where TParentMenu : IParentMenuItem
@@ -807,6 +809,24 @@ private Type[] ToolsMenuItems()
             return items.ToArray();
         }
 
+
+        private Type[] WindowMenuItems()
+        {
+            var items = new List<Type>
+            {
+                typeof(WindowsCodeExplorerCommandMenuItem),
+                typeof(WindowsInspectionResultsCommandMenuItem),
+                typeof(WindowsCodeMetricsCommandMenuItem),
+                typeof(WindowsFindSymbolCommandMenuItem),
+                typeof(WindowsFindAllReferencesCommandMenuItem),
+                typeof(WindowsFindAllImplementationsCommandMenuItem),
+                typeof(WindowsTestExplorerCommandMenuItem),
+                typeof(WindowsToDoExplorerCommandMenuItem)
+            };
+
+            return items.ToArray();
+        }
+
         private void RegisterSettingsViewModel(IWindsorContainer container)
         {
             container.Register(Types
diff --git a/Rubberduck.Resources/Menus/RubberduckMenus.Designer.cs b/Rubberduck.Resources/Menus/RubberduckMenus.Designer.cs
diff --git a/Rubberduck.Resources/Menus/RubberduckMenus.de.resx b/Rubberduck.Resources/Menus/RubberduckMenus.de.resx
@@ -270,4 +270,7 @@
   <data name="ProjectExplorer_UnignoreProject" xml:space="preserve">
     <value>Projekt verarbeiten</value>
   </data>
+  <data name="WindowMenu" xml:space="preserve">
+    <value>&amp;Fenster</value>
+  </data>
 </root>
diff --git a/Rubberduck.Resources/Menus/RubberduckMenus.resx b/Rubberduck.Resources/Menus/RubberduckMenus.resx
@@ -274,4 +274,7 @@
   <data name="ContextMenu_PeekDefinition" xml:space="preserve">
     <value>Peek definition</value>
   </data>
+  <data name="WindowMenu" xml:space="preserve">
+    <value>&amp;Windows</value>
+  </data>
 </root>

Original file line number	Diff line number	Diff line change
`@@ -35,4 +35,13 @@ public ProjectExplorerFindAllImplementationsCommandMenuItem(ProjectExplorerFindA`
`35`	`35`
`36`	`36`	`public override int DisplayOrder => (int)ProjectExplorerContextMenuItemDisplayOrder.FindAllImplementations;`
`37`	`37`	`}`
	`38`	`+`
	`39`	`+ public class WindowsFindAllImplementationsCommandMenuItem : FindAllImplementationsCommandMenuItemBase`
	`40`	`+ {`
	`41`	`+ public WindowsFindAllImplementationsCommandMenuItem(ProjectExplorerFindAllImplementationsCommand command)`
	`42`	`+ : base(command)`
	`43`	`+ { }`
	`44`	`+`
	`45`	`+ public override int DisplayOrder => (int)WindowMenuItemDisplayOrder.FindAllImplementations;`
	`46`	`+ }`
`38`	`47`	`}`
Original file line number	Diff line number	Diff line change
`@@ -38,4 +38,13 @@ public ProjectExplorerFindSymbolCommandMenuItem(FindSymbolCommand command)`
`38`	`38`
`39`	`39`	`public override int DisplayOrder => (int)ProjectExplorerContextMenuItemDisplayOrder.FindSymbol;`
`40`	`40`	`}`
	`41`	`+`
	`42`	`+ public class WindowsFindSymbolCommandMenuItem : FindSymbolCommandMenuItemBase`
	`43`	`+ {`
	`44`	`+ public WindowsFindSymbolCommandMenuItem(FindSymbolCommand command)`
	`45`	`+ : base(command)`
	`46`	`+ { }`
	`47`	`+`
	`48`	`+ public override int DisplayOrder => (int)WindowMenuItemDisplayOrder.FindSymbol;`
	`49`	`+ }`
`41`	`50`	`}`