Fixed compilation errors

rubberduck-vba · Jul 13, 2016 · 04dd638 · 04dd638
1 parent f2cb417
commit 04dd638
Show file tree

Hide file tree

Showing 4 changed files with 61 additions and 8 deletions.
diff --git a/RetailCoder.VBE/Rubberduck.csproj b/RetailCoder.VBE/Rubberduck.csproj
@@ -433,9 +433,9 @@
     <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\RegexAssistantCommand.cs" />
     <Compile Include="UI\Command\MenuItems\RegexAssistantCommandMenuItem.cs" />
-    <Compile Include="UI\Command\RegexAssistantCommand.cs" />
+    <Compile Include="UI\Command\MenuItems\ToolsParentMenu.cs" />
     <Compile Include="UI\Controls\LinkButton.xaml.cs">
       <DependentUpon>LinkButton.xaml</DependentUpon>
     </Compile>
@@ -708,6 +708,11 @@
       <DesignTime>True</DesignTime>
       <DependentUpon>RubberduckUI.de.resx</DependentUpon>
     </Compile>
+    <Compile Include="UI\RubberduckUI.Designer.cs">
+      <AutoGen>True</AutoGen>
+      <DesignTime>True</DesignTime>
+      <DependentUpon>RubberduckUI.resx</DependentUpon>
+    </Compile>
     <Compile Include="UI\RubberduckUI.ja.Designer.cs">
       <AutoGen>True</AutoGen>
       <DesignTime>True</DesignTime>
@@ -832,11 +837,6 @@
       <AutoGen>True</AutoGen>
       <DesignTime>True</DesignTime>
     </Compile>
-    <Compile Include="UI\RubberduckUI.Designer.cs">
-      <AutoGen>True</AutoGen>
-      <DesignTime>True</DesignTime>
-      <DependentUpon>RubberduckUI.resx</DependentUpon>
-    </Compile>
     <Compile Include="UI\SourceControl\BranchesView.xaml.cs">
       <DependentUpon>BranchesView.xaml</DependentUpon>
     </Compile>

diff --git a/RetailCoder.VBE/UI/Command/MenuItems/ParentMenus/NavigateParentMenu.cs b/RetailCoder.VBE/UI/Command/MenuItems/ParentMenus/NavigateParentMenu.cs
@@ -15,7 +15,6 @@ public NavigateParentMenu(IEnumerable<IMenuItem> items)
     public enum NavigationMenuItemDisplayOrder
     {
         CodeExplorer,
-        //ToDoExplorer,
         RegexSearchReplace,
         FindSymbol,
         FindAllReferences,

diff --git a/RetailCoder.VBE/UI/Command/MenuItems/RegexAssistantCommand.cs b/RetailCoder.VBE/UI/Command/MenuItems/RegexAssistantCommand.cs
@@ -0,0 +1,25 @@
+using NLog;
+using Rubberduck.UI.RegexAssistant;
+using System.Runtime.InteropServices;
+
+namespace Rubberduck.UI.Command
+{
+    /// <summary>
+    /// A command that displays the RegexAssistantDialog
+    /// </summary>
+    [ComVisible(false)]
+    class RegexAssistantCommand : CommandBase
+    {
+        public RegexAssistantCommand() : base (LogManager.GetCurrentClassLogger())
+        {
+        }
+
+        protected override void ExecuteImpl(object parameter)
+        {
+            using (var window = new RegexAssistantDialog())
+            {
+                window.ShowDialog();
+            }
+        }
+    }
+}
diff --git a/RetailCoder.VBE/UI/Command/MenuItems/ToolsParentMenu.cs b/RetailCoder.VBE/UI/Command/MenuItems/ToolsParentMenu.cs
@@ -0,0 +1,29 @@
+using System.Collections.Generic;
+
+namespace Rubberduck.UI.Command.MenuItems.ParentMenus
+{
+    public class ToolsParentMenu : ParentMenuItemBase
+    {
+        public ToolsParentMenu(IEnumerable<IMenuItem> items)
+            : base("ToolsMenu", items)
+        {
+        }
+
+        public override int DisplayOrder
+        {
+            get
+            {
+                return (int)RubberduckMenuItemDisplayOrder.Tools;
+            }
+        }
+
+
+    }
+
+    public enum ToolsMenuItemDisplayOrder
+    {
+        SourceControl,
+        ToDoExplorer,
+        RegexAssistant,
+    }
+}