Remove-the-Disable-commands-feature

remove the calls to CommandController
Caphyon · Oct 19, 2017 · 2155508 · 2155508
2 parents 50c0c0e + 8e1c011
commit 2155508
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 11 deletions.
diff --git a/ClangPowerTools/ClangPowerTools/ClangPowerTools.csproj b/ClangPowerTools/ClangPowerTools/ClangPowerTools.csproj
@@ -247,6 +247,7 @@
     <Reference Include="System" />
     <Reference Include="System.Collections.Immutable, Version=1.2.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL" />
     <Reference Include="System.Design" />
+    <Reference Include="System.Windows.Forms" />
     <Reference Include="System.Xml" />
     <Reference Include="WindowsBase" />
   </ItemGroup>

diff --git a/ClangPowerTools/ClangPowerTools/CommandsController.cs b/ClangPowerTools/ClangPowerTools/CommandsController.cs
@@ -3,6 +3,7 @@
 using System;
 using System.Collections.Generic;
 using System.ComponentModel.Design;
+using System.Windows.Forms;
 using System.Windows.Interop;
 using System.Windows.Threading;
 
@@ -48,6 +49,7 @@ public void QueryCommandHandler(object sender, EventArgs e)
       {
         if (sender is OleMenuCommand command)
         {
+          //MessageBox.Show(command.CommandID.ID.ToString());
           command.Enabled = !Running;
           command.Visible = true;
         }

diff --git a/ClangPowerTools/ClangPowerTools/CompileCommand.cs b/ClangPowerTools/ClangPowerTools/CompileCommand.cs
@@ -66,9 +66,9 @@ private CompileCommand(Package aPackage, DTE2 aDte, string aEdition,
       if (this.ServiceProvider.GetService(typeof(IMenuCommandService)) is OleMenuCommandService commandService)
       {
         var menuCommandID = new CommandID(CommandSet, CommandId);
-        var menuItem = new OleMenuCommand(this.MenuItemCallback, menuCommandID);
-        menuItem.BeforeQueryStatus += mCommandsController.QueryCommandHandler;
-        commandService.AddCommand(menuItem);
+        var menuCommand = new OleMenuCommand(this.MenuItemCallback, menuCommandID);
+        //menuCommand.BeforeQueryStatus += mCommandsController.QueryCommandHandler;
+        commandService.AddCommand(menuCommand);
       }
     }
 
@@ -109,7 +109,7 @@ public static void Initialize(Package aPackage, DTE2 aDte, string aEdition,
     /// <param name="e">Event args.</param>
     private void MenuItemCallback(object sender, EventArgs e)
     {
-      mCommandsController.Running = true;
+      //mCommandsController.Running = true;
       var task = System.Threading.Tasks.Task.Run(() =>
       {
         GeneralOptions generalOptions = (GeneralOptions)mPackage.GetDialogPage(typeof(GeneralOptions));
@@ -162,7 +162,7 @@ private void MenuItemCallback(object sender, EventArgs e)
           VsShellUtilities.ShowMessageBox(mPackage, exception.Message, "Error",
             OLEMSGICON.OLEMSGICON_CRITICAL, OLEMSGBUTTON.OLEMSGBUTTON_OK, OLEMSGDEFBUTTON.OLEMSGDEFBUTTON_FIRST);
         }
-      }).ContinueWith(tsk => mCommandsController.AfterExecute());
+      });//.ContinueWith(tsk => mCommandsController.AfterExecute());
     }
 
     #endregion

diff --git a/ClangPowerTools/ClangPowerTools/TidyCommand.cs b/ClangPowerTools/ClangPowerTools/TidyCommand.cs
@@ -73,9 +73,9 @@ private TidyCommand(Package aPackage, DTE2 aDte, string aEdition,
       if (this.ServiceProvider.GetService(typeof(IMenuCommandService)) is OleMenuCommandService commandService)
       {
         var menuCommandID = new CommandID(CommandSet, CommandId);
-        var menuItem = new OleMenuCommand(this.MenuItemCallback, menuCommandID);
-        menuItem.BeforeQueryStatus += mCommandsController.QueryCommandHandler;
-        commandService.AddCommand(menuItem);
+        var menuCommand = new OleMenuCommand(this.MenuItemCallback, menuCommandID);
+        //menuCommand.BeforeQueryStatus += mCommandsController.QueryCommandHandler;
+        commandService.AddCommand(menuCommand);
       }
     }
 
@@ -116,7 +116,7 @@ public static void Initialize(Package aPackage, DTE2 aDte, string aEdition,
     /// <param name="e">Event args.</param>
     private void MenuItemCallback(object sender, EventArgs e)
     {
-      mCommandsController.Running = true;
+      //mCommandsController.Running = true;
       System.Threading.Tasks.Task.Run(() =>
       {
         GeneralOptions generalOptions = (GeneralOptions)mPackage.GetDialogPage(typeof(GeneralOptions));
@@ -145,7 +145,7 @@ private void MenuItemCallback(object sender, EventArgs e)
           }
           using (var guard = new SilentFileChangerGuard())
           {
-            if(tidyPage.Fix)
+            if (tidyPage.Fix)
             {
               WatchFiles();
               SilentFiles(guard);
@@ -180,7 +180,7 @@ private void MenuItemCallback(object sender, EventArgs e)
           VsShellUtilities.ShowMessageBox(mPackage, exception.Message, "Error",
             OLEMSGICON.OLEMSGICON_CRITICAL, OLEMSGBUTTON.OLEMSGBUTTON_OK, OLEMSGDEFBUTTON.OLEMSGDEFBUTTON_FIRST);
         }
-      }).ContinueWith(tsk => mCommandsController.AfterExecute()); ;
+      });//.ContinueWith(tsk => mCommandsController.AfterExecute()); ;
     }
 
     #endregion