Merge branch 'alpha' into alpha-fr#728

Krypton-Suite · Jun 11, 2022 · 3aef414 · 3aef414
2 parents 7d8ce13 + fb36e1d
commit 3aef414
Show file tree

Hide file tree

Showing 4 changed files with 82 additions and 57 deletions.
diff --git a/Documents/Help/Changelog.md b/Documents/Help/Changelog.md
@@ -9,6 +9,7 @@
 * Made enumeration `SchemeOfficeColors` public, so they can be used to make external themes
 * Resolved [#722](https://github.com/Krypton-Suite/Standard-Toolkit/issues/722), KryptonRichTextBox disabled colour cannot be set
 * Resolved [#662](https://github.com/Krypton-Suite/Standard-Toolkit/issues/662), Can not "Control / Set Disabled" Background Colour Of Comboboxes, in DropDown mode
+* Resolved [#737](https://github.com/Krypton-Suite/Standard-Toolkit/issues/737), `Office 2013 - Dark Grey` for `PaletteMode` in designer causes a crash
 * Resolved [#578](https://github.com/Krypton-Suite/Standard-Toolkit/issues/578), ComboBox Center no longer draws text centered
 * Resolved [#20](https://github.com/Krypton-Suite/Standard-Toolkit/issues/20), Selected text in ComboBox is drawn in a different font
 * Resolved [#308](https://github.com/Krypton-Suite/Standard-Toolkit/issues/308), Panel AntiAlias Border Problem

diff --git a/Source/Krypton Components/Krypton.Toolkit/Converters/PaletteModeConverter.cs b/Source/Krypton Components/Krypton.Toolkit/Converters/PaletteModeConverter.cs
@@ -24,8 +24,9 @@ internal class PaletteModeConverter : StringLookupConverter
         {
             new(PaletteMode.ProfessionalSystem, "Professional - System"),
             new(PaletteMode.ProfessionalOffice2003, "Professional - Office 2003"),
-            new(PaletteMode.Office2007DarkGray, "Office 2007 - Dark Grey"),
-            new(PaletteMode.Office2007LightGray, "Office 2007 - Light Grey"),
+            // Note: Re-enable when the gray themes are completed
+            //new(PaletteMode.Office2007DarkGray, "Office 2007 - Dark Grey"),
+            //new(PaletteMode.Office2007LightGray, "Office 2007 - Light Grey"),
             new(PaletteMode.Office2007Blue, "Office 2007 - Blue"),
             new(PaletteMode.Office2007BlueDarkMode, "Office 2007 - Blue (Dark Mode)"),
             new(PaletteMode.Office2007BlueLightMode, "Office 2007 - Blue (Light Mode)"),
@@ -35,8 +36,9 @@ internal class PaletteModeConverter : StringLookupConverter
             new(PaletteMode.Office2007White, "Office 2007 - White"),
             new(PaletteMode.Office2007Black, "Office 2007 - Black"),
             new(PaletteMode.Office2007BlackDarkMode, "Office 2007 - Black (Dark Mode)"),
-            new(PaletteMode.Office2010DarkGray, "Office 2010 - Dark Grey"),
-            new(PaletteMode.Office2010LightGray, "Office 2010 - Light Grey"),
+            // Note: Re-enable when the gray themes are completed
+            //new(PaletteMode.Office2010DarkGray, "Office 2010 - Dark Grey"),
+            //new(PaletteMode.Office2010LightGray, "Office 2010 - Light Grey"),
             new(PaletteMode.Office2010Blue, "Office 2010 - Blue"),
             new(PaletteMode.Office2010BlueDarkMode, "Office 2010 - Blue (Dark Mode)"),
             new(PaletteMode.Office2010BlueLightMode, "Office 2010 - Blue (Light Mode)"),
@@ -46,11 +48,13 @@ internal class PaletteModeConverter : StringLookupConverter
             new(PaletteMode.Office2010White, "Office 2010 - White"),
             new(PaletteMode.Office2010Black, "Office 2010 - Black"),
             new(PaletteMode.Office2010BlackDarkMode, "Office 2010 - Black (Dark Mode)"),
-            new(PaletteMode.Office2013DarkGray, "Office 2013 - Dark Grey"),
-            new(PaletteMode.Office2013LightGray, "Office 2013 - Light Grey"),
+            // Note: Re-enable when the gray themes are completed
+            //new(PaletteMode.Office2013DarkGray, "Office 2013 - Dark Grey"),
+            //new(PaletteMode.Office2013LightGray, "Office 2013 - Light Grey"),
             new(PaletteMode.Office2013White, "Office 2013 - White"),
-            new(PaletteMode.Office365DarkGray, "Office 365 - Dark Grey"),
-            new(PaletteMode.Office365LightGray, "Office 365 - Light Grey"),
+            // Note: Re-enable when the gray themes are completed
+            //new(PaletteMode.Office365DarkGray, "Office 365 - Dark Grey"),
+            //new(PaletteMode.Office365LightGray, "Office 365 - Light Grey"),
             new(PaletteMode.Office365Black, "Office 365 - Black"),
             new(PaletteMode.Office365BlackDarkMode, "Office 365 - Black (Dark Mode)"),
             new(PaletteMode.Office365Blue, "Office 365 - Blue"),

diff --git a/Source/Krypton Components/Krypton.Toolkit/Converters/PaletteModeManagerConverter.cs b/Source/Krypton Components/Krypton.Toolkit/Converters/PaletteModeManagerConverter.cs
@@ -23,8 +23,9 @@ internal class PaletteModeManagerConverter : StringLookupConverter
         {
             new(PaletteModeManager.ProfessionalSystem, "Professional - System"),
             new(PaletteModeManager.ProfessionalOffice2003, "Professional - Office 2003"),
-            new(PaletteModeManager.Office2007DarkGray, "Office 2007 - Dark Grey"),
-            new(PaletteModeManager.Office2007LightGray, "Office 2007 - Light Grey"),
+            // Note: Re-enable when the gray themes are completed
+            //new(PaletteModeManager.Office2007DarkGray, "Office 2007 - Dark Grey"),
+            //new(PaletteModeManager.Office2007LightGray, "Office 2007 - Light Grey"),
             new(PaletteModeManager.Office2007Blue, "Office 2007 - Blue"),
             new(PaletteModeManager.Office2007BlueDarkMode, "Office 2007 - Blue (Dark Mode)"),
             new(PaletteModeManager.Office2007BlueLightMode, "Office 2007 - Blue (Light Mode)"),
@@ -34,8 +35,9 @@ internal class PaletteModeManagerConverter : StringLookupConverter
             new(PaletteModeManager.Office2007White, "Office 2007 - White"),
             new(PaletteModeManager.Office2007Black, "Office 2007 - Black"),
             new(PaletteModeManager.Office2007BlackDarkMode, "Office 2007 - Black (Dark Mode)"),
-            new(PaletteModeManager.Office2010DarkGray, "Office 2010 - Dark Grey"),
-            new(PaletteModeManager.Office2010LightGray, "Office 2010 - Light Grey"),
+            // Note: Re-enable when the gray themes are completed
+            //new(PaletteModeManager.Office2010DarkGray, "Office 2010 - Dark Grey"),
+            //new(PaletteModeManager.Office2010LightGray, "Office 2010 - Light Grey"),
             new(PaletteModeManager.Office2010Blue, "Office 2010 - Blue"),
             new(PaletteModeManager.Office2010BlueDarkMode, "Office 2010 - Blue (Dark Mode)"),
             new(PaletteModeManager.Office2010BlueLightMode, "Office 2010 - Blue (Light Mode)"),
@@ -45,11 +47,13 @@ internal class PaletteModeManagerConverter : StringLookupConverter
             new(PaletteModeManager.Office2010White, "Office 2010 - White"),
             new(PaletteModeManager.Office2010Black, "Office 2010 - Black"),
             new(PaletteModeManager.Office2010BlackDarkMode, "Office 2010 - Black (Dark Mode)"),
-            new(PaletteModeManager.Office2013DarkGray, "Office 2013 - Dark Grey"),
-            new(PaletteModeManager.Office2013LightGray, "Office 2013 - Light Grey"),
+            // Note: Re-enable when the gray themes are completed
+            //new(PaletteModeManager.Office2013DarkGray, "Office 2013 - Dark Grey"),
+            //new(PaletteModeManager.Office2013LightGray, "Office 2013 - Light Grey"),
             new(PaletteModeManager.Office2013White, "Office 2013 - White"),
-            new(PaletteModeManager.Office365DarkGray, "Office 365 - Dark Grey"),
-            new(PaletteModeManager.Office365LightGray, "Office 365 - Light Grey"),
+            // Note: Re-enable when the gray themes are completed
+            //new(PaletteModeManager.Office365DarkGray, "Office 365 - Dark Grey"),
+            //new(PaletteModeManager.Office365LightGray, "Office 365 - Light Grey"),
             new(PaletteModeManager.Office365Black, "Office 365 - Black"),
             new(PaletteModeManager.Office365BlackDarkMode, "Office 365 - Black (Dark Mode)"),
             new(PaletteModeManager.Office365Blue, "Office 365 - Blue"),

diff --git a/Source/Krypton Components/Krypton.Toolkit/Palette Base/PaletteDefinitions.cs b/Source/Krypton Components/Krypton.Toolkit/Palette Base/PaletteDefinitions.cs
@@ -2083,6 +2083,8 @@ public enum PaletteMode
 		/// </summary>
 		ProfessionalOffice2003,
 
+        // Note: Re-enable when the gray themes are completed
+        /*
         /// <summary>
         /// Specifies the dark Grey color variant of the Office 2007 appearance.
         /// </summary>
@@ -2091,12 +2093,12 @@ public enum PaletteMode
         /// <summary>
         /// Specifies the light Grey color variant of the Office 2007 appearance.
         /// </summary>
-		Office2007LightGray,
+		Office2007LightGray,*/
 
-		/// <summary>
-		/// Specifies the Blue color variant of the Office 2007 appearance.
-		/// </summary>
-		Office2007Blue,
+        /// <summary>
+        /// Specifies the Blue color variant of the Office 2007 appearance.
+        /// </summary>
+        Office2007Blue,
 
 		/// <summary>
 		/// Specifies the dark Blue color variant of the Office 2007 appearance.
@@ -2138,6 +2140,8 @@ public enum PaletteMode
 		/// </summary>
 		Office2007BlackDarkMode,
 
+        // Note: Re-enable when the gray themes are completed
+        /*
         /// <summary>
         /// Specifies the dark Grey color variant of the Office 2010 appearance.
         /// </summary>
@@ -2146,12 +2150,12 @@ public enum PaletteMode
         /// <summary>
         /// Specifies the light Grey color variant of the Office 2010 appearance.
         /// </summary>
-        Office2010LightGray,
+        Office2010LightGray,*/
 
-		/// <summary>
-		/// Specifies the Blue color variant of the Office 2010 appearance.
-		/// </summary>
-		Office2010Blue,
+        /// <summary>
+        /// Specifies the Blue color variant of the Office 2010 appearance.
+        /// </summary>
+        Office2010Blue,
 
 		/// <summary>
 		/// Specifies the dark Blue color variant of the Office 2010 appearance.
@@ -2193,6 +2197,8 @@ public enum PaletteMode
         /// </summary>
 		Office2010BlackDarkMode,
 
+        // Note: Re-enable when the gray themes are completed
+        /*
         /// <summary>
         /// Specifies the dark Grey color variant of the Office 2013 appearance.
         /// </summary>
@@ -2201,13 +2207,15 @@ public enum PaletteMode
         /// <summary>
         /// Specifies the light Grey color variant of the Office 2013 appearance.
         /// </summary>
-		Office2013LightGray,
+		Office2013LightGray,*/
 
-		/// <summary>
-		/// Specifies the White color variant of the Office 2013 appearance.
-		/// </summary>
-		Office2013White,
+        /// <summary>
+        /// Specifies the White color variant of the Office 2013 appearance.
+        /// </summary>
+        Office2013White,
 
+        // Note: Re-enable when the gray themes are completed
+        /*
 		/// <summary>
 		/// Specifies the dark Grey color variant of the Office 365 appearance.
 		/// </summary>
@@ -2216,12 +2224,12 @@ public enum PaletteMode
 		/// <summary>
 		/// Specifies the light Grey color variant of the Office 365 appearance.
 		/// </summary>
-		Office365LightGray,
+		Office365LightGray,*/
 
-		/// <summary>
-		/// Specifies the Black color variant of the Office 365 appearance.
-		/// </summary>
-		Office365Black,
+        /// <summary>
+        /// Specifies the Black color variant of the Office 365 appearance.
+        /// </summary>
+        Office365Black,
 
         /// <summary>
         /// Specifies the dark Black color variant of the Office 365 appearance.
@@ -2340,6 +2348,8 @@ public enum PaletteModeManager
 		/// </summary>
 		ProfessionalOffice2003,
 
+        // Note: Re-enable when the gray themes are completed
+        /*
 		/// <summary>
 		/// Specifies the dark Grey color variant of the Office 2007 appearance.
 		/// </summary>
@@ -2348,12 +2358,12 @@ public enum PaletteModeManager
 		/// <summary>
 		/// Specifies the light Grey color variant of the Office 2007 appearance.
 		/// </summary>
-		Office2007LightGray,
+		Office2007LightGray,*/
 
-		/// <summary>
-		/// Specifies the Blue color variant of the Office 2007 appearance.
-		/// </summary>
-		Office2007Blue,
+        /// <summary>
+        /// Specifies the Blue color variant of the Office 2007 appearance.
+        /// </summary>
+        Office2007Blue,
 
 		/// <summary>
 		/// Specifies the dark Blue color variant of the Office 2007 appearance.
@@ -2395,6 +2405,8 @@ public enum PaletteModeManager
 		/// </summary>
 		Office2007BlackDarkMode,
 
+        // Note: Re-enable when the gray themes are completed
+        /*
 		/// <summary>
 		/// Specifies the dark Grey color variant of the Office 2010 appearance.
 		/// </summary>
@@ -2403,12 +2415,12 @@ public enum PaletteModeManager
 		/// <summary>
 		/// Specifies the light Grey color variant of the Office 2010 appearance.
 		/// </summary>
-		Office2010LightGray,
+		Office2010LightGray,*/
 
-		/// <summary>
-		/// Specifies the Blue color variant of the Office 2010 appearance.
-		/// </summary>
-		Office2010Blue,
+        /// <summary>
+        /// Specifies the Blue color variant of the Office 2010 appearance.
+        /// </summary>
+        Office2010Blue,
 
 		/// <summary>
 		/// Specifies the dark Blue color variant of the Office 2010 appearance.
@@ -2450,6 +2462,8 @@ public enum PaletteModeManager
 		/// </summary>
 		Office2010BlackDarkMode,
 
+        // Note: Re-enable when the gray themes are completed
+        /*
 		/// <summary>
 		/// Specifies the dark Grey color variant of the Office 2013 appearance.
 		/// </summary>
@@ -2458,13 +2472,15 @@ public enum PaletteModeManager
 		/// <summary>
 		/// Specifies the light Grey color variant of the Office 2013 appearance.
 		/// </summary>
-		Office2013LightGray,
+		Office2013LightGray,*/
 
-		/// <summary>
-		/// Specifies the White color variant of the Office 2013 appearance.
-		/// </summary>
-		Office2013White,
+        /// <summary>
+        /// Specifies the White color variant of the Office 2013 appearance.
+        /// </summary>
+        Office2013White,
 
+        // Note: Re-enable when the gray themes are completed
+        /*
 		/// <summary>
 		/// Specifies the dark Grey color variant of the Office 365 appearance.
 		/// </summary>
@@ -2473,12 +2489,12 @@ public enum PaletteModeManager
 		/// <summary>
 		/// Specifies the light Grey color variant of the Office 365 appearance.
 		/// </summary>
-		Office365LightGray,
-		
-		/// <summary>
-		/// Specifies the Black color variant of the Office 365 appearance.
-		/// </summary>
-		Office365Black,
+		Office365LightGray,*/
+
+        /// <summary>
+        /// Specifies the Black color variant of the Office 365 appearance.
+        /// </summary>
+        Office365Black,
 
 		/// <summary>
 		/// Specifies the dark Black color variant of the Office 365 appearance.