From 8a67dabe5910c458ed8e583d84e1a027788d2f02 Mon Sep 17 00:00:00 2001
From: kudzu_cp <6d05c8c8ef5431987001abfdb2eadc9593ac9498>
Date: Fri, 6 Jan 2012 02:08:10 +0000
Subject: [PATCH]

---
 .../Cosmos.VS.Windows/Cosmos.VS.Windows.vsct  | 14 +++++++--
 .../Cosmos.VS.WindowsPackage.cs               | 23 +++++++--------
 source2/VSIP/Cosmos.VS.Windows/PkgCmdID.cs    | 29 ++++++++++---------
 3 files changed, 36 insertions(+), 30 deletions(-)

diff --git a/source2/VSIP/Cosmos.VS.Windows/Cosmos.VS.Windows.vsct b/source2/VSIP/Cosmos.VS.Windows/Cosmos.VS.Windows.vsct
index 0c2f468d1..bfd1d7751 100644
--- a/source2/VSIP/Cosmos.VS.Windows/Cosmos.VS.Windows.vsct
+++ b/source2/VSIP/Cosmos.VS.Windows/Cosmos.VS.Windows.vsct
@@ -103,7 +103,7 @@
           <ButtonText>Assembly Window</ButtonText>
         </Strings>
       </Button>
-      <Button guid="guidCosmosMenu" id="cmdidCosmosRegisters" priority="0x0100" type="Button">
+      <Button guid="guidCosmosMenu" id="cmdidCosmosRegisters" priority="0x0101" type="Button">
         <Parent guid="guidCosmosMenu" id="TopLevelMenuGroup" />
         <Icon guid="guidImages" id="bmpRegisterIcon" />
         <Strings>
@@ -111,7 +111,7 @@
           <ButtonText>Registers Window</ButtonText>
         </Strings>
       </Button>
-      <Button guid="guidCosmosMenu" id="cmdidCosmosStack" priority="0x0100" type="Button">
+      <Button guid="guidCosmosMenu" id="cmdidCosmosStack" priority="0x0102" type="Button">
         <Parent guid="guidCosmosMenu" id="TopLevelMenuGroup" />
         <Icon guid="guidImages" id="bmpStackIcon" />
         <Strings>
@@ -119,7 +119,14 @@
           <ButtonText>Stack Window</ButtonText>
         </Strings>
       </Button>
-      <Button guid="guidCosmosMenu" id="cmdidCosmosShowAll" priority="0x0100" type="Button">
+      <Button guid="guidCosmosMenu" id="cmdidCosmosInternal" priority="0x0103" type="Button">
+        <Parent guid="guidCosmosMenu" id="TopLevelMenuGroup" />
+        <Strings>
+          <CommandName>cmdidCosmosInternal</CommandName>
+          <ButtonText>Internal VSIP Debug Window</ButtonText>
+        </Strings>
+      </Button>
+      <Button guid="guidCosmosMenu" id="cmdidCosmosShowAll" priority="0x0104" type="Button">
         <Parent guid="guidCosmosMenu" id="TopLevelMenuGroup" />
         <Icon guid="guidImages" id="bmpAllIcon" />
         <Strings>
@@ -208,6 +215,7 @@
       <IDSymbol name="cmdidCosmosAssembly" value="0x0101" />
       <IDSymbol name="cmdidCosmosRegisters" value="0x0102" />
       <IDSymbol name="cmdidCosmosStack" value="0x0103" />
+      <IDSymbol name="cmdidCosmosInternal" value="0x0108" />
       <IDSymbol name="cmdidCosmosShowAll" value="0x0104"/>
     </GuidSymbol>
 
diff --git a/source2/VSIP/Cosmos.VS.Windows/Cosmos.VS.WindowsPackage.cs b/source2/VSIP/Cosmos.VS.Windows/Cosmos.VS.WindowsPackage.cs
index 5d06d304d..4c9873aea 100644
--- a/source2/VSIP/Cosmos.VS.Windows/Cosmos.VS.WindowsPackage.cs
+++ b/source2/VSIP/Cosmos.VS.Windows/Cosmos.VS.WindowsPackage.cs
@@ -83,7 +83,6 @@ namespace Cosmos.VS.Windows {
       var xWindow = FindWindow(aWindowType);
       var xFrame = (IVsWindowFrame)xWindow.Frame;
       Microsoft.VisualStudio.ErrorHandler.ThrowOnFailure(xFrame.Show());
-      //return xFrame.IsVisible() == 0;
     }
 
     protected void UpdateWindow(Type aWindowType, string aTag, byte[] aData) {
@@ -91,30 +90,27 @@ namespace Cosmos.VS.Windows {
       xWindow.UserControl.Update(aTag, aData);
     }
 
-    // This function is called when the user clicks the menu item that shows the 
-    // tool window. See the Initialize method to see how the menu item is associated to 
-    // this function using the OleMenuCommandService service and the MenuCommand class.
-    private void ShowWindowAssembly(object sender, EventArgs e) {
+    private void ShowWindowAssembly(object aCommand, EventArgs e) {
       ShowWindow(typeof(AssemblyTW));
     }
 
-    private void ShowWindowInternal(object sender, EventArgs e) {
+    private void ShowWindowInternal(object aCommand, EventArgs e) {
       ShowWindow(typeof(InternalTW));
     }
 
-    private void ShowWindowRegisters(object sender, EventArgs e) {
+    private void ShowWindowRegisters(object aCommand, EventArgs e) {
       ShowWindow(typeof(RegistersTW));
     }
 
-    private void ShowWindowStack(object sender, EventArgs e) {
+    private void ShowWindowStack(object aCommand, EventArgs e) {
       ShowWindow(typeof(StackTW));
     }
 
-    private void ShowWindowAll(object sender, EventArgs e) {
-      ShowWindowAssembly(sender, e);
-      ShowWindowRegisters(sender, e);
-      ShowWindowStack(sender, e);
-      ShowWindowInternal(sender, e);
+    private void ShowWindowAll(object aCommand, EventArgs e) {
+      ShowWindowAssembly(aCommand, e);
+      ShowWindowRegisters(aCommand, e);
+      ShowWindowStack(aCommand, e);
+      // Dont show Internal Window, most Cosmos users wont use it.
     }
 
     protected void AddCommand(OleMenuCommandService aMcs, uint aCmdID, EventHandler aHandler) {
@@ -135,6 +131,7 @@ namespace Cosmos.VS.Windows {
         AddCommand(xMcs, PkgCmdIDList.cmdidCosmosAssembly, ShowWindowAssembly);
         AddCommand(xMcs, PkgCmdIDList.cmdidCosmosRegisters, ShowWindowRegisters);
         AddCommand(xMcs, PkgCmdIDList.cmdidCosmosStack, ShowWindowStack);
+        AddCommand(xMcs, PkgCmdIDList.cmdidCosmosInternal, ShowWindowInternal);
         AddCommand(xMcs, PkgCmdIDList.cmdidCosmosShowAll, ShowWindowAll);
       }
     }
diff --git a/source2/VSIP/Cosmos.VS.Windows/PkgCmdID.cs b/source2/VSIP/Cosmos.VS.Windows/PkgCmdID.cs
index ea4b51082..353f5d5df 100644
--- a/source2/VSIP/Cosmos.VS.Windows/PkgCmdID.cs
+++ b/source2/VSIP/Cosmos.VS.Windows/PkgCmdID.cs
@@ -2,18 +2,19 @@
 // MUST match PkgCmdID.h
 using System;
 
-namespace Cosmos.VS.Windows
-{
-    static class PkgCmdIDList
-    {
-        public const uint cmdidCosmosAssembly = 0x101;
-        public const uint cmdidCosmosRegisters = 0x102;
-        public const uint cmdidCosmosStack = 0x103;
-        public const uint cmdidCosmosShowAll = 0x104;
-        public const uint cmdidAsmFilter = 0x0105;
-        public const uint cmdidAsmStep = 0x0106;
-        public const uint cmdidAsmCopy = 0x0107;
-        public const int AsmToolbar = 0x1001;
-        public const uint AsmToolbarGroup = 0x1002;
-    };
+namespace Cosmos.VS.Windows {
+  static class PkgCmdIDList {
+    public const uint cmdidCosmosAssembly = 0x101;
+    public const uint cmdidCosmosRegisters = 0x102;
+    public const uint cmdidCosmosStack = 0x103;
+    public const uint cmdidCosmosInternal = 0x108;
+    public const uint cmdidCosmosShowAll = 0x104;
+    //
+    public const uint cmdidAsmFilter = 0x0105;
+    public const uint cmdidAsmStep = 0x0106;
+    public const uint cmdidAsmCopy = 0x0107;
+    //
+    public const int AsmToolbar = 0x1001;
+    public const uint AsmToolbarGroup = 0x1002;
+  };
 }
\ No newline at end of file