From 318d91d5b8ec912b6174b7fa1d65f8fd7cf71eea Mon Sep 17 00:00:00 2001
From: alcexhim <alcexhim@gmail.com>
Date: Fri, 19 Dec 2014 16:13:18 -0500
Subject: [PATCH 1/2] Added WindowLayouts to Content

---
 ...lEditor.Content.PlatformIndependent.csproj |  2 +
 .../WindowLayouts/Default.xml                 | 24 +++++++++++
 .../WindowLayouts/VisualStudio2013.xml        | 41 +++++++++++++++++++
 3 files changed, 67 insertions(+)
 create mode 100644 CSharp/Content/UniversalEditor.Content.PlatformIndependent/WindowLayouts/Default.xml
 create mode 100644 CSharp/Content/UniversalEditor.Content.PlatformIndependent/WindowLayouts/VisualStudio2013.xml

diff --git a/CSharp/Content/UniversalEditor.Content.PlatformIndependent/UniversalEditor.Content.PlatformIndependent.csproj b/CSharp/Content/UniversalEditor.Content.PlatformIndependent/UniversalEditor.Content.PlatformIndependent.csproj
index fb0875f0..52eb0038 100644
--- a/CSharp/Content/UniversalEditor.Content.PlatformIndependent/UniversalEditor.Content.PlatformIndependent.csproj
+++ b/CSharp/Content/UniversalEditor.Content.PlatformIndependent/UniversalEditor.Content.PlatformIndependent.csproj
@@ -557,6 +557,8 @@
     <Content Include="Themes\VisualStudio2012\Dark\Images\TreeView\Reference.png" />
     <Content Include="Themes\VisualStudio2012\Dark\Images\TreeView\Resources.png" />
     <Content Include="Themes\VisualStudio2012\Dark\Images\TreeView\UserControl.png" />
+    <Content Include="WindowLayouts\Default.xml" />
+    <Content Include="WindowLayouts\VisualStudio2013.xml" />
   </ItemGroup>
   <ItemGroup>
     <Content Include="Configuration\Application.upl" />
diff --git a/CSharp/Content/UniversalEditor.Content.PlatformIndependent/WindowLayouts/Default.xml b/CSharp/Content/UniversalEditor.Content.PlatformIndependent/WindowLayouts/Default.xml
new file mode 100644
index 00000000..24aacae1
--- /dev/null
+++ b/CSharp/Content/UniversalEditor.Content.PlatformIndependent/WindowLayouts/Default.xml
@@ -0,0 +1,24 @@
+<UniversalEditor Version="4.0">
+	<WindowLayouts>
+		<WindowLayout ID="{001DBD52-9A54-4CE9-88B7-72F4CB0CAC0B}" Title="Default">
+			<TopDockingArea></TopDockingArea>
+			<BottomDockingArea></BottomDockingArea>
+			<LeftDockingArea>
+				<!-- Server Explorer -->
+				<WindowReference ID="{71A3D54D-2ED6-443C-BA02-26FE6B754449}" />
+				<!-- Toolbox -->
+				<WindowReference ID="{43D85182-177E-4431-8198-92C936C5A63A}" />
+			</LeftDockingArea>
+			<RightDockingArea>
+				<!-- Solution Explorer -->
+				<WindowReference ID="{CE28B4D3-84AB-4270-9B8E-A818D1B60028}" />
+				<!-- Class View (Object Explorer) -->
+				<WindowReference ID="{823B0B5F-61E1-421F-94DC-6C7D756A21A0}" />
+			</RightDockingArea>
+			<CenterDockingArea>
+				<!-- This is where document windows go -->
+				<DocumentWindows />
+			</CenterDockingArea>
+		</WindowLayout>
+	</WindowLayouts>
+</UniversalEditor>
\ No newline at end of file
diff --git a/CSharp/Content/UniversalEditor.Content.PlatformIndependent/WindowLayouts/VisualStudio2013.xml b/CSharp/Content/UniversalEditor.Content.PlatformIndependent/WindowLayouts/VisualStudio2013.xml
new file mode 100644
index 00000000..286591b7
--- /dev/null
+++ b/CSharp/Content/UniversalEditor.Content.PlatformIndependent/WindowLayouts/VisualStudio2013.xml
@@ -0,0 +1,41 @@
+<UniversalEditor Version="4.0">
+	<WindowLayouts>
+		<WindowLayout ID="{2F068F76-4B28-4C55-AC40-F65B426EBBE7}" Title="Visual Studio 2013">
+			<TopDockingArea></TopDockingArea>
+			<BottomDockingArea>
+				<!-- Error List -->
+				<WindowReference ID="{28A22652-3652-49B0-B8D1-B3745ECD6844}" Selected="True" />
+				<!-- Output -->
+				<WindowReference ID="{7B90CF86-466F-4637-8046-AD62C06641F2}" />
+				<!-- Find/Replace -->
+				<WindowReference ID="{CE862D7E-B84C-4298-8E24-CC43825F022E}" />
+			</BottomDockingArea>
+			<LeftDockingArea>
+				<!-- Server Explorer -->
+				<WindowReference ID="{71A3D54D-2ED6-443C-BA02-26FE6B754449}" />
+				<!-- Toolbox -->
+				<WindowReference ID="{43D85182-177E-4431-8198-92C936C5A63A}" />
+			</LeftDockingArea>
+			<RightDockingArea>
+				<DockingContainer>
+					<TopDockingArea>
+						<!-- Solution Explorer -->
+						<WindowReference ID="{CE28B4D3-84AB-4270-9B8E-A818D1B60028}" />
+						<!-- Team Explorer -->
+						<WindowReference ID="{5CF57102-7225-4C8B-9096-076EED067A95}" />
+						<!-- Class View (Object Explorer) -->
+						<WindowReference ID="{823B0B5F-61E1-421F-94DC-6C7D756A21A0}" />
+					</TopDockingArea>
+					<BottomDockingArea>
+						<!-- Properties -->
+						<WindowReference ID="{A4B38DE4-CB15-4713-9276-93580784CC22}" />
+					</BottomDockingArea>
+				</DockingContainer>
+			</RightDockingArea>
+			<CenterDockingArea>
+				<!-- This is where document windows go -->
+				<DocumentWindows />
+			</CenterDockingArea>
+		</WindowLayout>
+	</WindowLayouts>
+</UniversalEditor>
\ No newline at end of file

From db98a533e5ae804cece75d379c9e48811f2ef493 Mon Sep 17 00:00:00 2001
From: alcexhim <alcexhim@gmail.com>
Date: Fri, 19 Dec 2014 16:15:05 -0500
Subject: [PATCH 2/2] Partially implement dynamic loading of View->Toolbar->...
 commands

---
 .../UniversalEditor.UserInterface/Engine.cs   | 33 ++++++++++++++++++-
 1 file changed, 32 insertions(+), 1 deletion(-)

diff --git a/CSharp/Libraries/UniversalEditor.UserInterface/Engine.cs b/CSharp/Libraries/UniversalEditor.UserInterface/Engine.cs
index 04e64378..4c957a86 100644
--- a/CSharp/Libraries/UniversalEditor.UserInterface/Engine.cs
+++ b/CSharp/Libraries/UniversalEditor.UserInterface/Engine.cs
@@ -180,7 +180,6 @@ namespace UniversalEditor.UserInterface
 				LastWindow.FullScreen = !LastWindow.FullScreen;
 				cmd.Checked = LastWindow.FullScreen;
 			});
-
 			#region Perspective
 			AttachCommandEventHandler("ViewPerspective1", delegate(object sender, EventArgs e)
 			{
@@ -249,6 +248,31 @@ namespace UniversalEditor.UserInterface
 				ShowAboutDialog();
 			});
 			#endregion
+
+
+			#region Dynamic Commands
+			#region View
+			#region Panels
+			for (int i = mvarCommandBars.Count - 1; i >= 0; i--)
+			{
+				Command cmdViewToolbarsToolbar = new Command();
+				cmdViewToolbarsToolbar.ID = "ViewToolbars" + i.ToString();
+				cmdViewToolbarsToolbar.Title = mvarCommandBars[i].Title;
+				cmdViewToolbarsToolbar.Executed += cmdViewToolbarsToolbar_Executed;
+				mvarCommands.Add(cmdViewToolbarsToolbar);
+				mvarCommands["ViewToolbars"].Items.Insert(0, new CommandReferenceCommandItem(cmdViewToolbarsToolbar.ID));
+			}
+			#endregion
+			#region Panels
+			Command cmdViewPanels1 = new Command();
+			cmdViewPanels1.ID = "ViewPanels1";
+			mvarCommands.Add(cmdViewPanels1);
+			mvarCommands["ViewPanels"].Items.Add(new CommandReferenceCommandItem("ViewPanels1"));
+			#endregion
+			#endregion
+			#endregion
+
+			#region Language Strings
 			#region Help
 			Command helpAboutPlatform = mvarCommands["HelpAboutPlatform"];
 			if (helpAboutPlatform != null)
@@ -274,6 +298,13 @@ namespace UniversalEditor.UserInterface
 				}
 			}
 			#endregion
+			#endregion
+		}
+
+		void cmdViewToolbarsToolbar_Executed(object sender, EventArgs e)
+		{
+			Command cmd = (sender as Command);
+			
 		}
 
 		private IHostApplicationWindowCollection mvarWindows = new IHostApplicationWindowCollection();