Removed ThemeBase.Apply overloading. Modified the sample to simplify …

…tool strip rendering.
dockpanelsuite · Oct 5, 2015 · 2e6d016 · 2e6d016
1 parent 75e1578
commit 2e6d016
Show file tree

Hide file tree

Showing 14 changed files with 54 additions and 266 deletions.
diff --git a/DockSample/DockSample.csproj b/DockSample/DockSample.csproj
@@ -98,20 +98,14 @@
       <DependentUpon>SplashScreen.cs</DependentUpon>
     </Compile>
     <Compile Include="VS2012ColorTable.cs" />
-    <Compile Include="VS2012ToolStripExtender.cs">
+    <Compile Include="VSToolStripExtender.cs">
       <SubType>Component</SubType>
     </Compile>
-    <Compile Include="VS2012ToolStripExtender.Designer.cs">
-      <DependentUpon>VS2012ToolStripExtender.cs</DependentUpon>
+    <Compile Include="VSToolStripExtender.Designer.cs">
+      <DependentUpon>VSToolStripExtender.cs</DependentUpon>
     </Compile>
     <Compile Include="VS2012ToolStripRenderer.cs" />
     <Compile Include="VS2013ColorTable.cs" />
-    <Compile Include="VS2013ToolStripExtender.cs">
-      <SubType>Component</SubType>
-    </Compile>
-    <Compile Include="VS2013ToolStripExtender.Designer.cs">
-      <DependentUpon>VS2013ToolStripExtender.cs</DependentUpon>
-    </Compile>
     <Compile Include="VS2013ToolStripRenderer.cs" />
     <EmbeddedResource Include="AboutDialog.resx">
       <SubType>Designer</SubType>

diff --git a/DockSample/MainForm.Designer.cs b/DockSample/MainForm.Designer.cs
diff --git a/DockSample/MainForm.cs b/DockSample/MainForm.cs
@@ -36,9 +36,7 @@ public MainForm()
 
             vS2012ToolStripExtender1.DefaultRenderer = _toolStripProfessionalRenderer;
             vS2012ToolStripExtender1.VS2012Renderer = _vs2012ToolStripRenderer;
-
-            vS2013ToolStripExtender1.DefaultRenderer = _toolStripProfessionalRenderer;
-            vS2013ToolStripExtender1.Vs2013Renderer = _vs2013ToolStripRenderer;
+            vS2012ToolStripExtender1.VS2013Renderer = _vs2013ToolStripRenderer;
 
             this.topBar.BackColor = this.bottomBar.BackColor = Color.FromArgb(0xFF, 41, 57, 85);
 
@@ -166,57 +164,42 @@ private void SetSchema(object sender, System.EventArgs e)
             dockPanel.SaveAsXml(configFile);
             CloseAllContents();
 
-            if (sender == menuItemSchemaVS2005)
+            if (sender == this.menuItemSchemaVS2005)
             {
-                dockPanel.Theme = vS2005Theme1;
-                EnableVS2012Renderer(false);
+                this.dockPanel.Theme = this.vS2005Theme1;
+                this.EnableVSRenderer(VSToolStripExtender.VsVersion.Vs2005);
             }
-            else if (sender == menuItemSchemaVS2003)
+            else if (sender == this.menuItemSchemaVS2003)
             {
-                dockPanel.Theme = vS2003Theme1;
-                EnableVS2012Renderer(false);
+                this.dockPanel.Theme = this.vS2003Theme1;
+                this.EnableVSRenderer(VSToolStripExtender.VsVersion.Vs2003);
             }
-            else if (sender == menuItemSchemaVS2012Light)
+            else if (sender == this.menuItemSchemaVS2012Light)
             {
-                dockPanel.Theme = vS2012LightTheme1;
-                EnableVS2012Renderer(true);
+                this.dockPanel.Theme = this.vS2012LightTheme1;
+                this.EnableVSRenderer(VSToolStripExtender.VsVersion.Vs2012);
             }
             else if (sender == this.menuItemSchemaVS2013Blue)
             {
-                SetTheme(this.vS2013BlueTheme1);
-                EnableVs2013Renderer(true);
+                this.dockPanel.Theme = this.vS2013BlueTheme1;
+                this.EnableVSRenderer(VSToolStripExtender.VsVersion.Vs2013);
             }
 
             menuItemSchemaVS2005.Checked = (sender == menuItemSchemaVS2005);
             menuItemSchemaVS2003.Checked = (sender == menuItemSchemaVS2003);
             menuItemSchemaVS2012Light.Checked = (sender == menuItemSchemaVS2012Light);
             this.menuItemSchemaVS2013Blue.Checked = (sender == this.menuItemSchemaVS2013Blue);
             this.topBar.Visible = this.bottomBar.Visible = (sender == this.menuItemSchemaVS2013Blue);
+
             if (File.Exists(configFile))
                 dockPanel.LoadFromXml(configFile, m_deserializeDockContent);
         }
 
-        private void SetTheme(ThemeBase theme)
-        {
-            dockPanel.Theme         = theme;
-            m_solutionExplorer.Theme = theme;
-            m_propertyWindow.Theme   = theme;
-            m_toolbox.Theme          = theme;
-            m_outputWindow.Theme     = theme;
-            m_taskList.Theme         = theme;
-        }
-
-        private void EnableVS2012Renderer(bool enable)
-        {
-            vS2012ToolStripExtender1.SetEnableVS2012Style(this.mainMenu, enable);
-            vS2012ToolStripExtender1.SetEnableVS2012Style(this.toolBar, enable);
-        }
-
-        private void EnableVs2013Renderer(bool enable)
+        private void EnableVSRenderer(VSToolStripExtender.VsVersion version)
         {
-            vS2013ToolStripExtender1.SetEnableVs2013Style(mainMenu, enable);
-            vS2013ToolStripExtender1.SetEnableVs2013Style(toolBar, enable);
-            vS2013ToolStripExtender1.SetEnableVs2013Style(statusBar, enable);
+            vS2012ToolStripExtender1.SetStyle(this.mainMenu, version);
+            vS2012ToolStripExtender1.SetStyle(this.toolBar, version);
+            vS2012ToolStripExtender1.SetStyle(this.statusBar, version);
         }
 
         private void SetDocumentStyle(object sender, System.EventArgs e)

diff --git a/DockSample/MainForm.resx b/DockSample/MainForm.resx
@@ -131,7 +131,7 @@
         AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj0yLjAuMC4w
         LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0
         ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAADY
-        DAAAAk1TRnQBSQFMAgEBCQEAAZwBAAGcAQABEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo
+        DAAAAk1TRnQBSQFMAgEBCQEAAaQBAAGkAQABEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo
         AwABQAMAATADAAEBAQABCAYAAQwYAAGAAgABgAMAAoABAAGAAwABgAEAAYABAAKAAgADwAEAAcAB3AHA
         AQAB8AHKAaYBAAEzBQABMwEAATMBAAEzAQACMwIAAxYBAAMcAQADIgEAAykBAANVAQADTQEAA0IBAAM5
         AQABgAF8Af8BAAJQAf8BAAGTAQAB1gEAAf8B7AHMAQABxgHWAe8BAAHWAucBAAGQAakBrQIAAf8BMwMA
@@ -220,10 +220,7 @@
     <value>17, 17</value>
   </metadata>
   <metadata name="vS2012ToolStripExtender1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>1208, 17</value>
-  </metadata>
-  <metadata name="vS2013ToolStripExtender1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>179, 17</value>
+    <value>17, 56</value>
   </metadata>
   <data name="$this.Icon" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>

diff --git a/DockSample/VS2013ToolStripExtender.Designer.cs b/DockSample/VS2013ToolStripExtender.Designer.cs
diff --git a/DockSample/VS2013ToolStripExtender.cs b/DockSample/VS2013ToolStripExtender.cs
diff --git a/...ample/VS2012ToolStripExtender.Designer.cs → DockSample/VSToolStripExtender.Designer.cs b/...ample/VS2012ToolStripExtender.Designer.cs → DockSample/VSToolStripExtender.Designer.cs