Added a global blueprint manager command which displays the globally …

…configured blueprint manager rather than the per-project one
malware-dev · Aug 12, 2017 · 40a0f0e · 40a0f0e
1 parent 21894be
commit 40a0f0e
Show file tree

Hide file tree

Showing 8 changed files with 73 additions and 19 deletions.
diff --git a/Source/MDK/Commands/CommandIds.cs b/Source/MDK/Commands/CommandIds.cs
@@ -8,5 +8,6 @@ static class CommandIds
         public const int CheckForUpdates = 0x103;
         public const int DeployProject = 0x0104;
         public const int BlueprintManager = 0x0105;
+        public const int GlobalBlueprintManager = 0x106;
     }
 }
diff --git a/Source/MDK/Commands/GlobalBlueprintManagerCommand.cs b/Source/MDK/Commands/GlobalBlueprintManagerCommand.cs
@@ -0,0 +1,33 @@
+using System;
+using Malware.MDKServices;
+using MDK.Resources;
+using MDK.Views.BlueprintManager;
+using MDK.VisualStudio;
+using Microsoft.VisualStudio.Shell;
+using Microsoft.VisualStudio.Shell.Interop;
+
+namespace MDK.Commands
+{
+    sealed class GlobalBlueprintManagerCommand : Command
+    {
+        public GlobalBlueprintManagerCommand(ExtendedPackage package) : base(package)
+        { }
+
+        public override Guid GroupId { get; } = CommandGroups.MDKGroup;
+
+        public override int Id { get; } = CommandIds.GlobalBlueprintManager;
+
+        protected override void OnBeforeQueryStatus()
+        { }
+
+        protected override void OnExecute()
+        {
+            var package = (MDKPackage)Package;
+            var model = new BlueprintManagerDialogModel
+            {
+                BlueprintPath =  package.Options.GetActualOutputPath()
+            };
+            BlueprintManagerDialog.ShowDialog(model);
+        }
+    }
+}
diff --git a/Source/MDK/MDK.csproj b/Source/MDK/MDK.csproj
@@ -67,6 +67,7 @@
     <Compile Include="Build\ScriptPart.cs" />
     <Compile Include="Build\UsingDirectiveComparer.cs" />
     <Compile Include="Build\WeightedPartSorter.cs" />
+    <Compile Include="Commands\GlobalBlueprintManagerCommand.cs" />
     <Compile Include="Commands\BlueprintManagerCommand.cs" />
     <Compile Include="Commands\CommandGroups.cs" />
     <Compile Include="Commands\CheckForUpdatesCommand.cs" />
@@ -159,6 +160,7 @@
   <ItemGroup>
     <VSCTCompile Include="MDKPackage.vsct">
       <ResourceName>Menus.ctmenu</ResourceName>
+      <SubType>Designer</SubType>
     </VSCTCompile>
     <Content Include="MIT License.txt">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>

diff --git a/Source/MDK/MDKPackage.GeneratedInfo.cs b/Source/MDK/MDKPackage.GeneratedInfo.cs
@@ -8,7 +8,7 @@ public partial class MDKPackage
 	    /// <summary>
 		/// The current package version
 		/// </summary>
-		public static readonly Version Version = new Version("0.9.34");
+		public static readonly Version Version = new Version("0.9.36");
 
 	    /// <summary>
 		/// Determines whether this version is a prerelease version

diff --git a/Source/MDK/MDKPackage.cs b/Source/MDK/MDKPackage.cs
@@ -124,7 +124,8 @@ protected override void Initialize()
                 new RefreshWhitelistCacheCommand(this),
                 new CheckForUpdatesCommand(this),
                 new ProjectOptionsCommand(this),
-                new BlueprintManagerCommand(this)
+                new BlueprintManagerCommand(this),
+                new GlobalBlueprintManagerCommand(this)
             );
 
             base.Initialize();

diff --git a/Source/MDK/MDKPackage.vsct b/Source/MDK/MDKPackage.vsct
@@ -70,6 +70,29 @@
           <ButtonText>Deploy All MDK Scripts</ButtonText>
         </Strings>
       </Button>
+      <Button guid="guidMDKCmdSet" id="GlobalBlueprintManagerCommandId" priority="0x0101" type="Button">
+        <Parent guid="guidMDKCmdSet" id="MDKMenuGroup" />
+        <CommandFlag>DynamicVisibility</CommandFlag>
+        <!--<Icon guid="guidImages" id="bmpPic1" />-->
+        <Strings>
+          <ButtonText>Blueprint Manager</ButtonText>
+        </Strings>
+      </Button>
+      <Button guid="guidMDKCmdSet" id="RefreshWhitelistCacheCommandId" priority="0x0102" type="Button">
+        <Parent guid="guidMDKCmdSet" id="MDKMenuGroup" />
+        <CommandFlag>DynamicVisibility</CommandFlag>
+        <!--<Icon guid="guidImages" id="bmpPic1" />-->
+        <Strings>
+          <ButtonText>Refresh Whitelist Cache</ButtonText>
+        </Strings>
+      </Button>
+      <Button guid="guidMDKCmdSet" id="CheckForUpdatesCommandId" priority="0x0103" type="Button">
+        <Parent guid="guidMDKCmdSet" id="MDKMenuGroup" />
+        <!--<Icon guid="guidImages" id="bmpPic1" />-->
+        <Strings>
+          <ButtonText>Check for Updates</ButtonText>
+        </Strings>
+      </Button>
       <Button guid="guidMDKCmdSet" id="QuickDeploySolutionCommandId" priority="0x0300" type="Button">
         <Parent guid="guidSHLMainMenu" id="IDG_VS_CTXT_SOLUTION_BUILD" />
         <CommandFlag>DynamicVisibility</CommandFlag>
@@ -78,6 +101,14 @@
           <ButtonText>Deploy All MDK Scripts</ButtonText>
         </Strings>
       </Button>
+      <Button guid="guidMDKCmdSet" id="GlobalBlueprintManagerCommandId" priority="0x0400" type="Button">
+        <Parent guid="guidSHLMainMenu" id="IDG_VS_CTXT_SOLUTION_PROPERTIES" />
+        <CommandFlag>DynamicVisibility</CommandFlag>
+        <!--<Icon guid="guidImages" id="bmpPic1" />-->
+        <Strings>
+          <ButtonText>Blueprint Manager</ButtonText>
+        </Strings>
+      </Button>
       <Button guid="guidMDKCmdSet" id="DeployProjectCommandId" priority="0x0300" type="Button">
         <Parent guid="guidSHLMainMenu" id="IDG_VS_CTXT_PROJECT_BUILD" />
         <CommandFlag>DynamicVisibility</CommandFlag>
@@ -102,21 +133,6 @@
           <ButtonText>MDK Script Options</ButtonText>
         </Strings>
       </Button>
-      <Button guid="guidMDKCmdSet" id="RefreshWhitelistCacheCommandId" priority="0x0102" type="Button">
-        <Parent guid="guidMDKCmdSet" id="MDKMenuGroup" />
-        <CommandFlag>DynamicVisibility</CommandFlag>
-        <!--<Icon guid="guidImages" id="bmpPic1" />-->
-        <Strings>
-          <ButtonText>Refresh Whitelist Cache</ButtonText>
-        </Strings>
-      </Button>
-      <Button guid="guidMDKCmdSet" id="CheckForUpdatesCommandId" priority="0x0103" type="Button">
-        <Parent guid="guidMDKCmdSet" id="MDKMenuGroup" />
-        <!--<Icon guid="guidImages" id="bmpPic1" />-->
-        <Strings>
-          <ButtonText>Check for Updates</ButtonText>
-        </Strings>
-      </Button>
     </Buttons>
 
     <!--The bitmaps section is used to define the bitmaps that are used for the commands.-->
@@ -151,6 +167,7 @@
       <IDSymbol name="CheckForUpdatesCommandId" value="0x0103" />
       <IDSymbol name="DeployProjectCommandId" value="0x0104" />
       <IDSymbol name="BlueprintManagerCommandId" value="0x0105" />
+      <IDSymbol name="GlobalBlueprintManagerCommandId" value="0x0106" />
     </GuidSymbol>
 
     <GuidSymbol name="guidImages" value="{016ced72-6df6-4278-a645-5d8a568294d5}" >

diff --git a/Source/MDK/source.extension.vsixmanifest b/Source/MDK/source.extension.vsixmanifest
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <PackageManifest Version="2.0.0" xmlns="http://schemas.microsoft.com/developer/vsx-schema/2011" xmlns:d="http://schemas.microsoft.com/developer/vsx-schema-design/2011">
   <Metadata>
-    <Identity Id="MDK.Morten Aune Lyrstad.e02b602e-3099-44a5-88c6-cb30cab978f6" Version="0.9.34" Language="en-US" Publisher="Morten Aune Lyrstad" />
+    <Identity Id="MDK.Morten Aune Lyrstad.e02b602e-3099-44a5-88c6-cb30cab978f6" Version="0.9.36" Language="en-US" Publisher="Morten Aune Lyrstad" />
     <DisplayName>MDK/SE</DisplayName>
     <Description xml:space="preserve">A toolkit to help with ingame script (programmable block) development for Keen Software House's space sandbox Space Engineers.
 

diff --git a/Source/MDKServices/ProjectScriptInfo.GeneratedInfo.cs b/Source/MDKServices/ProjectScriptInfo.GeneratedInfo.cs
@@ -7,6 +7,6 @@ partial class ProjectScriptInfo
 	    /// <summary>
 		/// The current package version this utility assembly targets
 		/// </summary>
-		public static readonly Version TargetPackageVersion = new Version("0.9.34");
+		public static readonly Version TargetPackageVersion = new Version("0.9.36");
 	}
 }