From a8329a2e1c45bcac26b5ef19cc38397d40feccc1 Mon Sep 17 00:00:00 2001 From: alcexhim Date: Fri, 25 Sep 2015 15:39:35 -0400 Subject: [PATCH] Use themable AwesomeControls.Window for most (not all?) top-level windows --- .../Dialogs/AboutDialog.cs | 4 +++- .../Dialogs/NewDialog.Designer.cs | 1 - .../Dialogs/NewDialog.cs | 2 +- .../Dialogs/OptionsDialog.cs | 2 +- .../WindowsFormsEngine.cs | 7 ++++++- 5 files changed, 11 insertions(+), 5 deletions(-) diff --git a/CSharp/V5/Engines/WindowsForms/Engines/UniversalEditor.Engines.WindowsForms/Dialogs/AboutDialog.cs b/CSharp/V5/Engines/WindowsForms/Engines/UniversalEditor.Engines.WindowsForms/Dialogs/AboutDialog.cs index 4d32b75a..d47faf3a 100644 --- a/CSharp/V5/Engines/WindowsForms/Engines/UniversalEditor.Engines.WindowsForms/Dialogs/AboutDialog.cs +++ b/CSharp/V5/Engines/WindowsForms/Engines/UniversalEditor.Engines.WindowsForms/Dialogs/AboutDialog.cs @@ -6,9 +6,11 @@ using System.Text; using System.Windows.Forms; using UniversalEditor.UserInterface; +using AwesomeControls; + namespace UniversalEditor.Engines.WindowsForms.Dialogs { - public partial class AboutDialog : Glue.GlueWindow + public partial class AboutDialog : Window { public AboutDialog() { diff --git a/CSharp/V5/Engines/WindowsForms/Engines/UniversalEditor.Engines.WindowsForms/Dialogs/NewDialog.Designer.cs b/CSharp/V5/Engines/WindowsForms/Engines/UniversalEditor.Engines.WindowsForms/Dialogs/NewDialog.Designer.cs index f7a0976a..1efecae1 100644 --- a/CSharp/V5/Engines/WindowsForms/Engines/UniversalEditor.Engines.WindowsForms/Dialogs/NewDialog.Designer.cs +++ b/CSharp/V5/Engines/WindowsForms/Engines/UniversalEditor.Engines.WindowsForms/Dialogs/NewDialog.Designer.cs @@ -314,7 +314,6 @@ namespace UniversalEditor.Engines.WindowsForms.Dialogs this.Name = "NewDialogBase"; this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent; this.Text = "Create New"; - this.UseThemeBackground = false; this.sc.Panel1.ResumeLayout(false); this.sc.Panel2.ResumeLayout(false); this.sc.ResumeLayout(false); diff --git a/CSharp/V5/Engines/WindowsForms/Engines/UniversalEditor.Engines.WindowsForms/Dialogs/NewDialog.cs b/CSharp/V5/Engines/WindowsForms/Engines/UniversalEditor.Engines.WindowsForms/Dialogs/NewDialog.cs index eee3f6c9..7ea39874 100644 --- a/CSharp/V5/Engines/WindowsForms/Engines/UniversalEditor.Engines.WindowsForms/Dialogs/NewDialog.cs +++ b/CSharp/V5/Engines/WindowsForms/Engines/UniversalEditor.Engines.WindowsForms/Dialogs/NewDialog.cs @@ -8,7 +8,7 @@ using UniversalEditor.UserInterface; namespace UniversalEditor.Engines.WindowsForms.Dialogs { - internal partial class NewDialogBase : AwesomeControls.Dialog + internal partial class NewDialogBase : AwesomeControls.Window { public NewDialogBase() { diff --git a/CSharp/V5/Engines/WindowsForms/Engines/UniversalEditor.Engines.WindowsForms/Dialogs/OptionsDialog.cs b/CSharp/V5/Engines/WindowsForms/Engines/UniversalEditor.Engines.WindowsForms/Dialogs/OptionsDialog.cs index 5ef09459..33bb5f5d 100644 --- a/CSharp/V5/Engines/WindowsForms/Engines/UniversalEditor.Engines.WindowsForms/Dialogs/OptionsDialog.cs +++ b/CSharp/V5/Engines/WindowsForms/Engines/UniversalEditor.Engines.WindowsForms/Dialogs/OptionsDialog.cs @@ -9,7 +9,7 @@ using UniversalEditor.UserInterface.WindowsForms; namespace UniversalEditor.Engines.WindowsForms.Dialogs { - public partial class OptionsDialog : AwesomeControls.Dialog + public partial class OptionsDialog : AwesomeControls.Window { public OptionsDialog() { diff --git a/CSharp/V5/Engines/WindowsForms/Engines/UniversalEditor.Engines.WindowsForms/WindowsFormsEngine.cs b/CSharp/V5/Engines/WindowsForms/Engines/UniversalEditor.Engines.WindowsForms/WindowsFormsEngine.cs index 57635d9e..7eb1f1b0 100644 --- a/CSharp/V5/Engines/WindowsForms/Engines/UniversalEditor.Engines.WindowsForms/WindowsFormsEngine.cs +++ b/CSharp/V5/Engines/WindowsForms/Engines/UniversalEditor.Engines.WindowsForms/WindowsFormsEngine.cs @@ -183,7 +183,12 @@ namespace UniversalEditor.Engines.WindowsForms // AwesomeControls.Theming.BuiltinThemes.OfficeXPTheme theme = new AwesomeControls.Theming.BuiltinThemes.OfficeXPTheme(); // AwesomeControls.Theming.BuiltinThemes.SlickTheme theme = new AwesomeControls.Theming.BuiltinThemes.SlickTheme(); - AwesomeControls.Theming.Theme theme = AwesomeControls.Theming.Theme.GetByID(new Guid("{25134C94-B1EB-4C38-9B5B-A2E29FC57AE1}")); + // Office 2007 = {4D86F538-E277-4E6F-9CAC-60F82D49A19D} + // VS2012-Dark = {25134C94-B1EB-4C38-9B5B-A2E29FC57AE1} + // VS2012-Light = {54CE64B1-2DE3-4147-B499-03F0934AFD37} + // VS2012-Blue = {898A65FC-8D08-46F1-BB94-2BF666AC996E} + + AwesomeControls.Theming.Theme theme = AwesomeControls.Theming.Theme.GetByID(new Guid("{54CE64B1-2DE3-4147-B499-03F0934AFD37}")); if (theme != null) AwesomeControls.Theming.Theme.CurrentTheme = theme; // AwesomeControls.Theming.Theme.CurrentTheme.Properties["UseAllCapsMenus"] = false;