From 399dbca6d69afa1dc28d0d74db458a3a49cb9309 Mon Sep 17 00:00:00 2001
From: kudzu_cp <6d05c8c8ef5431987001abfdb2eadc9593ac9498>
Date: Fri, 6 Jan 2012 01:12:16 +0000
Subject: [PATCH] Menu changes

---
 .../Cosmos.VS.Windows/Cosmos.VS.Windows.vsct  | 102 ++++++++++++------
 source2/VSIP/Cosmos.VS.Windows/Guids.cs       |  23 ++--
 2 files changed, 80 insertions(+), 45 deletions(-)

diff --git a/source2/VSIP/Cosmos.VS.Windows/Cosmos.VS.Windows.vsct b/source2/VSIP/Cosmos.VS.Windows/Cosmos.VS.Windows.vsct
index 0fb4e7e48..05b025ff0 100644
--- a/source2/VSIP/Cosmos.VS.Windows/Cosmos.VS.Windows.vsct
+++ b/source2/VSIP/Cosmos.VS.Windows/Cosmos.VS.Windows.vsct
@@ -25,6 +25,9 @@
 
   <!--The Commands section is where we the commands, menus and menu groups are defined.
       This section uses a Guid to identify the package that provides the command defined inside it. -->
+
+  <!-- http://www.adrianetilston.com/Blog/post/2009/08/20/VSX-Adding-a-top-level-menu-command.aspx -->
+  
   <Commands package="guidCosmos_VS_WindowsPkg">
     <!-- Inside this section we have different sub-sections: one for the menus, another  
     for the menu groups, one for the buttons (the actual commands), one for the combos 
@@ -35,6 +38,15 @@
     with command ids defined by other packages. -->
 
     <Menus>
+      <!-- Cosmos menu on VS main menu -->
+      <Menu guid="guidCosmosMenu" id="TopLevelMenu" priority="0x100" type="Menu">
+        <Parent guid="guidSHLMainMenu" id="IDG_VS_MM_TOOLSADDINS" />
+        <Strings>
+          <ButtonText>Cosmos</ButtonText>
+          <CommandName>Cosmos</CommandName>
+        </Strings>
+      </Menu>
+      
       <Menu guid="guidIDEToolbarCmdSet" id="Toolbar" type="Toolbar" >
         <CommandFlag>DefaultDocked</CommandFlag>
         <Strings>
@@ -42,6 +54,7 @@
           <CommandName>Cosmos Debugger Toolbar</CommandName>
         </Strings>
       </Menu>
+      
       <Menu guid="guidAsmToolbarCmdSet" id="AsmToolbar" type="ToolWindowToolbar" >
         <CommandFlag>DefaultDocked</CommandFlag>
         <Strings>
@@ -50,20 +63,25 @@
         </Strings>
       </Menu>
     </Menus>
+    
     <!-- In this section you can define new menu groups. A menu group is a container for 
          other menus or buttons (commands); from a visual point of view you can see the 
          group as the part of a menu contained between two lines. The parent of a group 
          must be a menu. -->
     <Groups>
+      <Group guid="guidCosmosMenu" id="TopLevelMenuGroup" priority="0x0600">
+        <Parent guid="guidCosmosMenu" id="TopLevelMenu"/>
+      </Group>
+
       <Group guid="guidIDEToolbarCmdSet" id="ToolbarGroup" priority="0x0000">
         <Parent guid="guidIDEToolbarCmdSet" id="Toolbar"/>
       </Group>
+      
       <Group guid="guidAsmToolbarCmdSet" id="AsmToolbarGroup" priority="0x0000">
         <Parent guid="guidAsmToolbarCmdSet" id="AsmToolbar"/>
       </Group>
     </Groups>
 
-    <!--Buttons section. -->
     <!--This section defines the elements the user can interact with, like a menu command or a button 
         or combo box in a toolbar. -->
     <Buttons>
@@ -75,6 +93,49 @@
               <CommandFlag>DynamicVisibility</CommandFlag>
               
           If you do not want an image next to your command, remove the Icon node or set it to <Icon guid="guidOfficeIcon" id="msotcidNoIcon" /> -->
+
+      <!--Cosmos Main Menu -->
+      <Button guid="guidCosmosMenu" id="cmdidMyCommand" priority="0x0100" type="Button">
+        <Parent guid="guidCosmosMenu" id="TopLevelMenuGroup" />
+        <Icon guid="guidImages" id="bmpPic1" />
+        <Strings>
+          <CommandName>cmdidMyCommand</CommandName>
+          <ButtonText>Sub Menu Command</ButtonText>
+        </Strings>
+      </Button>
+      <Button guid="guidCosmos_VS_WindowsCmdSet" id="cmdidCosmosAssembly" priority="0x0100" type="Button">
+        <Parent guid="guidSHLMainMenu" id="IDG_VS_WNDO_OTRWNDWS1"/>
+        <Icon guid="guidImages" id="bmpAssemblyIcon" />
+        <Strings>
+          <CommandName>cmdidCosmosAssembly</CommandName>
+          <ButtonText>Cosmos - Assembly</ButtonText>
+        </Strings>
+      </Button>
+      <Button guid="guidCosmos_VS_WindowsCmdSet" id="cmdidCosmosRegisters" priority="0x0100" type="Button">
+        <Parent guid="guidSHLMainMenu" id="IDG_VS_WNDO_OTRWNDWS1"/>
+        <Icon guid="guidImages" id="bmpRegisterIcon" />
+        <Strings>
+          <CommandName>cmdidCosmosRegisters</CommandName>
+          <ButtonText>Cosmos - Registers</ButtonText>
+        </Strings>
+      </Button>
+      <Button guid="guidCosmos_VS_WindowsCmdSet" id="cmdidCosmosStack" priority="0x0100" type="Button">
+        <Parent guid="guidSHLMainMenu" id="IDG_VS_WNDO_OTRWNDWS1"/>
+        <Icon guid="guidImages" id="bmpStackIcon" />
+        <Strings>
+          <CommandName>cmdidCosmosStack</CommandName>
+          <ButtonText>Cosmos - Stack</ButtonText>
+        </Strings>
+      </Button>
+      <Button guid="guidCosmos_VS_WindowsCmdSet" id="cmdidCosmosShowAll" priority="0x0100" type="Button">
+        <Parent guid="guidSHLMainMenu" id="IDG_VS_WNDO_OTRWNDWS1"/>
+        <Icon guid="guidImages" id="bmpAllIcon" />
+        <Strings>
+          <CommandName>cmdidCosmosShowAll</CommandName>
+          <ButtonText>Cosmos - Show All Windows</ButtonText>
+        </Strings>
+      </Button>
+
       <Button guid="guidCosmos_VS_WindowsCmdSet" id="cmdidCosmosAssembly" priority="0x0100" type="Button">
         <Parent guid="guidIDEToolbarCmdSet" id="ToolbarGroup" />
         <Icon guid="guidImages" id="bmpAssemblyIcon" />
@@ -107,38 +168,7 @@
           <ButtonText>Cosmos - Show All Windows</ButtonText>
         </Strings>
       </Button>
-      <Button guid="guidCosmos_VS_WindowsCmdSet" id="cmdidCosmosAssembly" priority="0x0100" type="Button">
-        <Parent guid="guidSHLMainMenu" id="IDG_VS_WNDO_OTRWNDWS1"/>
-        <Icon guid="guidImages" id="bmpAssemblyIcon" />
-        <Strings>
-          <CommandName>cmdidCosmosAssembly</CommandName>
-          <ButtonText>Cosmos - Assembly</ButtonText>
-        </Strings>
-      </Button>
-      <Button guid="guidCosmos_VS_WindowsCmdSet" id="cmdidCosmosRegisters" priority="0x0100" type="Button">
-        <Parent guid="guidSHLMainMenu" id="IDG_VS_WNDO_OTRWNDWS1"/>
-        <Icon guid="guidImages" id="bmpRegisterIcon" />
-        <Strings>
-          <CommandName>cmdidCosmosRegisters</CommandName>
-          <ButtonText>Cosmos - Registers</ButtonText>
-        </Strings>
-      </Button>
-      <Button guid="guidCosmos_VS_WindowsCmdSet" id="cmdidCosmosStack" priority="0x0100" type="Button">
-        <Parent guid="guidSHLMainMenu" id="IDG_VS_WNDO_OTRWNDWS1"/>
-        <Icon guid="guidImages" id="bmpStackIcon" />
-        <Strings>
-          <CommandName>cmdidCosmosStack</CommandName>
-          <ButtonText>Cosmos - Stack</ButtonText>
-        </Strings>
-      </Button>
-      <Button guid="guidCosmos_VS_WindowsCmdSet" id="cmdidCosmosShowAll" priority="0x0100" type="Button">
-        <Parent guid="guidSHLMainMenu" id="IDG_VS_WNDO_OTRWNDWS1"/>
-        <Icon guid="guidImages" id="bmpAllIcon" />
-        <Strings>
-          <CommandName>cmdidCosmosShowAll</CommandName>
-          <ButtonText>Cosmos - Show All Windows</ButtonText>
-        </Strings>
-      </Button>
+      
       <Button guid="guidAsmToolbarCmdSet" id="cmdidAsmFilter" priority="0x0100" type="Button">
         <Parent guid="guidAsmToolbarCmdSet" id="AsmToolbarGroup"/>
         <Icon guid="guidImages" id="bmpAllIcon" />
@@ -180,6 +210,12 @@
     <!-- This is the package guid. -->
     <GuidSymbol name="guidCosmos_VS_WindowsPkg" value="{a82b45e9-2a89-43bd-925d-c7f0edd212aa}" />
 
+    <GuidSymbol name="guidCosmosMenu" value="{3247C3E4-34B8-4DB0-8748-AD62495A5222}">
+      <IDSymbol name="TopLevelMenu" value="0x0100" />
+      <IDSymbol name="TopLevelMenuGroup" value="0x0200" />
+      <IDSymbol name="cmdidMyCommand" value="0x0300" />
+    </GuidSymbol>
+
     <GuidSymbol name="guidIDEToolbarCmdSet" value="{3d4b3f35-36e7-4cea-8acc-d9601e45c0b5}">
       <IDSymbol name="Toolbar" value="0x1000" />
       <IDSymbol name="ToolbarGroup" value="0x1050" />
diff --git a/source2/VSIP/Cosmos.VS.Windows/Guids.cs b/source2/VSIP/Cosmos.VS.Windows/Guids.cs
index f1f1fdc22..fa26740d3 100644
--- a/source2/VSIP/Cosmos.VS.Windows/Guids.cs
+++ b/source2/VSIP/Cosmos.VS.Windows/Guids.cs
@@ -1,17 +1,16 @@
 // Guids.cs
-// MUST match guids.h
+// MUST match guids.h - There is no such file????
 using System;
 
-namespace Cosmos.VS.Windows
-{
-    static class GuidList
-    {
-        public const string guidCosmos_VS_WindowsPkgString = "a82b45e9-2a89-43bd-925d-c7f0edd212aa";
-        public const string guidCosmos_VS_WindowsCmdSetString = "3d4b3f35-36e7-4cea-8acc-d9601e45c0b9";
-        public const string guidToolWindowPersistanceString = "f019fb29-c2c2-4d27-9abf-739533c939be";
-        public const string guidAsmToolbarCmdSetString = "A875EA24-689A-4EAB-B9C2-DAC3EACB9501";
+namespace Cosmos.VS.Windows {
+  static class GuidList {
+    public const string guidCosmos_VS_WindowsPkgString = "a82b45e9-2a89-43bd-925d-c7f0edd212aa";
+    public const string guidCosmos_VS_WindowsCmdSetString = "3d4b3f35-36e7-4cea-8acc-d9601e45c0b9";
+    public const string guidToolWindowPersistanceString = "f019fb29-c2c2-4d27-9abf-739533c939be";
+    public const string guidAsmToolbarCmdSetString = "A875EA24-689A-4EAB-B9C2-DAC3EACB9501";
+    public const string guidCosmosMenu = "3247C3E4-34B8-4DB0-8748-AD62495A5222";
 
-        public static readonly Guid guidCosmos_VS_WindowsCmdSet = new Guid(guidCosmos_VS_WindowsCmdSetString);
-        public static readonly Guid guidAsmToolbarCmdSet = new Guid(guidAsmToolbarCmdSetString);
-    };
+    public static readonly Guid guidCosmos_VS_WindowsCmdSet = new Guid(guidCosmos_VS_WindowsCmdSetString);
+    public static readonly Guid guidAsmToolbarCmdSet = new Guid(guidAsmToolbarCmdSetString);
+  };
 }
\ No newline at end of file