diff --git a/Documents/Help/Changelog.md b/Documents/Help/Changelog.md
index 9efc3bdf6..03da62759 100644
--- a/Documents/Help/Changelog.md
+++ b/Documents/Help/Changelog.md
@@ -6,6 +6,7 @@
## 2023-11-xx - Build 2311 - November 2023
+* Implemented [#387](https://github.com/Krypton-Suite/Extended-Toolkit/issues/387), Fix fallout from the removal of `IPalette`
* Implemented [#384](https://github.com/Krypton-Suite/Extended-Toolkit/issues/384), Reduce build configurations
* Resolved [#378](https://github.com/Krypton-Suite/Extended-Toolkit/issues/378), `ExtendedMessageBox` does not support `CancelTryContinue` when built for "ANY" of the supported TFM's
* `KryptonMessageBoxExtended` button states now fall in line with .NET 6.0
diff --git a/Source/Krypton Toolkit/Krypton.Toolkit.Suite.Extended.Buttons/Controls Toolkit/Split Button/KryptonSplitButton.cs b/Source/Krypton Toolkit/Krypton.Toolkit.Suite.Extended.Buttons/Controls Toolkit/Split Button/KryptonSplitButton.cs
index d29f8c2a7..580cadf1f 100644
--- a/Source/Krypton Toolkit/Krypton.Toolkit.Suite.Extended.Buttons/Controls Toolkit/Split Button/KryptonSplitButton.cs
+++ b/Source/Krypton Toolkit/Krypton.Toolkit.Suite.Extended.Buttons/Controls Toolkit/Split Button/KryptonSplitButton.cs
@@ -128,7 +128,7 @@ public override Size GetPreferredSize(Size proposedSize)
{
Size preferredSize = base.GetPreferredSize(proposedSize);
- if (ShowSplitOption && !MissingFrameWorkAPIs.IsNullOrWhiteSpace(Text) && TextRenderer.MeasureText(Text, Font).Width + PUSH_BUTTON_WIDTH > preferredSize.Width)
+ if (ShowSplitOption && !string.IsNullOrWhiteSpace(Text) && TextRenderer.MeasureText(Text, Font).Width + PUSH_BUTTON_WIDTH > preferredSize.Width)
{
return preferredSize + new Size(PUSH_BUTTON_WIDTH + BORDER_SIZE * 2, 0);
}
@@ -207,7 +207,7 @@ protected override void OnPaint(PaintEventArgs e)
Rectangle focusRectangle = new Rectangle(internalBorder, internalBorder, bounds.Width - _dropDownRectangle.Width - internalBorder, bounds.Height - (internalBorder * 2));
- IPalette palette = KryptonManager.CurrentGlobalPalette;
+ PaletteBase palette = KryptonManager.CurrentGlobalPalette;
Pen shadow = SystemPens.ButtonShadow, face = SystemPens.ButtonFace;
diff --git a/Source/Krypton Toolkit/Krypton.Toolkit.Suite.Extended.Buttons/Controls Toolkit/UAC Buttons/KryptonUACButtonVersion1.cs b/Source/Krypton Toolkit/Krypton.Toolkit.Suite.Extended.Buttons/Controls Toolkit/UAC Buttons/KryptonUACButtonVersion1.cs
index 267306a23..e612e86b8 100644
--- a/Source/Krypton Toolkit/Krypton.Toolkit.Suite.Extended.Buttons/Controls Toolkit/UAC Buttons/KryptonUACButtonVersion1.cs
+++ b/Source/Krypton Toolkit/Krypton.Toolkit.Suite.Extended.Buttons/Controls Toolkit/UAC Buttons/KryptonUACButtonVersion1.cs
@@ -35,7 +35,7 @@ namespace Krypton.Toolkit.Suite.Extended.Buttons
/// The shield is extracted from the system with LoadImage if possible. Otherwise the shield will be enabled by sending the BCM_SETSHIELD Message to the control.
/// If the operating system is not Windows Vista or higher, no shield will be displayed as there's no such thing as UAC on the target system -> the shield is obsolete.
///
- [DefaultEvent("ExecuteProcessAsAdministrator"), DesignerCategory("code"), Description("Krypton UAC Elevated Button"),
+ [DefaultEvent("ExecuteProcessAsAdministrator"), DesignerCategory("code"), Description("Krypton UAC Elevated Button"),
ToolboxBitmap(typeof(KryptonButton), "ToolboxBitmaps.UACButton.bmp"), ToolboxItem(true)]
public class KryptonUACButtonVersion1 : KryptonButton
{
@@ -136,19 +136,19 @@ protected override void OnClick(EventArgs e)
OnExecuteProcessAsAdministrator(this, administrativeTask);
}
- else if (_assemblyToElevate != null && !MissingFrameWorkAPIs.IsNullOrWhiteSpace(_extraArguments))
+ else if (_assemblyToElevate != null && !string.IsNullOrWhiteSpace(_extraArguments))
{
ExecuteProcessAsAdministratorEventArgs administrativeTaskWithExtraArguments = new ExecuteProcessAsAdministratorEventArgs(Path.GetFullPath(_assemblyToElevate.Location), _extraArguments);
OnExecuteProcessAsAdministrator(this, administrativeTaskWithExtraArguments);
}
- else if (!MissingFrameWorkAPIs.IsNullOrWhiteSpace(_processName))
+ else if (!string.IsNullOrWhiteSpace(_processName))
{
ExecuteProcessAsAdministratorEventArgs administrativeTask = new ExecuteProcessAsAdministratorEventArgs(_processName);
OnExecuteProcessAsAdministrator(this, administrativeTask);
}
- else if (!MissingFrameWorkAPIs.IsNullOrWhiteSpace(_processName) && !MissingFrameWorkAPIs.IsNullOrWhiteSpace(_extraArguments))
+ else if (!string.IsNullOrWhiteSpace(_processName) && !string.IsNullOrWhiteSpace(_extraArguments))
{
ExecuteProcessAsAdministratorEventArgs administrativeTaskWithExtraArguments = new ExecuteProcessAsAdministratorEventArgs(_processName, _extraArguments);
diff --git a/Source/Krypton Toolkit/Krypton.Toolkit.Suite.Extended.Buttons/Events/UAC Elevation/ExecuteProcessAsAdministratorEventArgs.cs b/Source/Krypton Toolkit/Krypton.Toolkit.Suite.Extended.Buttons/Events/UAC Elevation/ExecuteProcessAsAdministratorEventArgs.cs
index 9fa94b0ef..1fa716bb8 100644
--- a/Source/Krypton Toolkit/Krypton.Toolkit.Suite.Extended.Buttons/Events/UAC Elevation/ExecuteProcessAsAdministratorEventArgs.cs
+++ b/Source/Krypton Toolkit/Krypton.Toolkit.Suite.Extended.Buttons/Events/UAC Elevation/ExecuteProcessAsAdministratorEventArgs.cs
@@ -118,7 +118,7 @@ public void ElevateProcessWithAdministrativeRights(string processName, string ar
bool hasAdministrativeRights = principal.IsInRole(WindowsBuiltInRole.Administrator);
- if (MissingFrameWorkAPIs.IsNullOrWhiteSpace(processName)) throw new ArgumentNullException();
+ if (string.IsNullOrWhiteSpace(processName)) throw new ArgumentNullException();
if (!hasAdministrativeRights)
{
diff --git a/Source/Krypton Toolkit/Krypton.Toolkit.Suite.Extended.Calendar/Classes/CalendarKryptonRenderer.cs b/Source/Krypton Toolkit/Krypton.Toolkit.Suite.Extended.Calendar/Classes/CalendarKryptonRenderer.cs
index 6a17762fc..82873283c 100644
--- a/Source/Krypton Toolkit/Krypton.Toolkit.Suite.Extended.Calendar/Classes/CalendarKryptonRenderer.cs
+++ b/Source/Krypton Toolkit/Krypton.Toolkit.Suite.Extended.Calendar/Classes/CalendarKryptonRenderer.cs
@@ -43,7 +43,7 @@ public class CalendarKryptonRenderer : CalendarSystemRenderer
#endregion
#region "Krypton Members"
- private IPalette _palette;
+ private PaletteBase _palette;
//private PaletteRedirect _paletteRedirect;
#endregion
diff --git a/Source/Krypton Toolkit/Krypton.Toolkit.Suite.Extended.Calendar/Controls/KryptonCalendar.cs b/Source/Krypton Toolkit/Krypton.Toolkit.Suite.Extended.Calendar/Controls/KryptonCalendar.cs
index a95dc3582..389f4d7ae 100644
--- a/Source/Krypton Toolkit/Krypton.Toolkit.Suite.Extended.Calendar/Controls/KryptonCalendar.cs
+++ b/Source/Krypton Toolkit/Krypton.Toolkit.Suite.Extended.Calendar/Controls/KryptonCalendar.cs
@@ -39,7 +39,7 @@ private void Calendar_Invalidated(object sender, InvalidateEventArgs e)
#endregion
#region ... Krypton ...
- private IPalette _palette;
+ private PaletteBase _palette;
private PaletteRedirect _paletteRedirect;
//Kripton Palette Events
diff --git a/Source/Krypton Toolkit/Krypton.Toolkit.Suite.Extended.CheckSum.Tools/UX/KryptonComputeFileCheckSum.cs b/Source/Krypton Toolkit/Krypton.Toolkit.Suite.Extended.CheckSum.Tools/UX/KryptonComputeFileCheckSum.cs
index e394fe83c..0a01d9e2f 100644
--- a/Source/Krypton Toolkit/Krypton.Toolkit.Suite.Extended.CheckSum.Tools/UX/KryptonComputeFileCheckSum.cs
+++ b/Source/Krypton Toolkit/Krypton.Toolkit.Suite.Extended.CheckSum.Tools/UX/KryptonComputeFileCheckSum.cs
@@ -693,7 +693,7 @@ private void RunWorkerCompleted(object sender, RunWorkerCompletedEventArgs e)
private void kcmbAlgorithimType_TextChanged(object sender, EventArgs e)
{
- kbtnCancel.Enabled = MissingFrameWorkAPIs.IsNullOrWhiteSpace(kcmbAlgorithimType.Text);
+ kbtnCancel.Enabled = string.IsNullOrWhiteSpace(kcmbAlgorithimType.Text);
}
private void kcbToggleCase_CheckedChanged(object sender, EventArgs e)
diff --git a/Source/Krypton Toolkit/Krypton.Toolkit.Suite.Extended.CheckSum.Tools/UX/KryptonVarifyFileCheckSum.cs b/Source/Krypton Toolkit/Krypton.Toolkit.Suite.Extended.CheckSum.Tools/UX/KryptonVarifyFileCheckSum.cs
index 4317dbc23..90d55079b 100644
--- a/Source/Krypton Toolkit/Krypton.Toolkit.Suite.Extended.CheckSum.Tools/UX/KryptonVarifyFileCheckSum.cs
+++ b/Source/Krypton Toolkit/Krypton.Toolkit.Suite.Extended.CheckSum.Tools/UX/KryptonVarifyFileCheckSum.cs
@@ -698,7 +698,7 @@ private void RunWorkerCompleted(object sender, RunWorkerCompletedEventArgs e)
#endregion
private string UpdateStatus(string status) => tsslStatus.Text = status;
-
+
private void kbtnValidate_Click(object sender, EventArgs e)
{
if (HelperMethods.IsValid(kwlCalculatedCheckSum.Text, ktxtVarifyCheckSum.Text.ToUpper()))
@@ -721,7 +721,7 @@ private void kbtnValidate_Click(object sender, EventArgs e)
private void ktxtVarifyCheckSum_TextChanged(object sender, EventArgs e)
{
- if (MissingFrameWorkAPIs.IsNullOrWhiteSpace(ktxtVarifyCheckSum.Text))
+ if (string.IsNullOrWhiteSpace(ktxtVarifyCheckSum.Text))
{
ktxtVarifyCheckSum.StateCommon.Border.Color1 = _settings.IntermediateColour;
@@ -730,7 +730,7 @@ private void ktxtVarifyCheckSum_TextChanged(object sender, EventArgs e)
kbtnValidate.Enabled = true; // MissingFrameWorkAPIs.IsNullOrWhiteSpace(ktxtVarifyCheckSum.Text);
- clearTextBoxToolStripMenuItem.Enabled = !MissingFrameWorkAPIs.IsNullOrWhiteSpace(ktxtVarifyCheckSum.Text);
+ clearTextBoxToolStripMenuItem.Enabled = !string.IsNullOrWhiteSpace(ktxtVarifyCheckSum.Text);
}
private void kbtnCompute_Click(object sender, EventArgs e)
@@ -833,6 +833,6 @@ private void CalculateHash()
}
}
- private void kcmbAlgorithimType_TextChanged(object sender, EventArgs e) => kbtnCompute.Enabled = MissingFrameWorkAPIs.IsNullOrWhiteSpace(kcmbAlgorithimType.Text);
+ private void kcmbAlgorithimType_TextChanged(object sender, EventArgs e) => kbtnCompute.Enabled = string.IsNullOrWhiteSpace(kcmbAlgorithimType.Text);
}
}
\ No newline at end of file
diff --git a/Source/Krypton Toolkit/Krypton.Toolkit.Suite.Extended.Circular.ProgressBar/Controls/CircularProgressBar.cs b/Source/Krypton Toolkit/Krypton.Toolkit.Suite.Extended.Circular.ProgressBar/Controls/CircularProgressBar.cs
index a70c04359..d1e041da4 100644
--- a/Source/Krypton Toolkit/Krypton.Toolkit.Suite.Extended.Circular.ProgressBar/Controls/CircularProgressBar.cs
+++ b/Source/Krypton Toolkit/Krypton.Toolkit.Suite.Extended.Circular.ProgressBar/Controls/CircularProgressBar.cs
@@ -52,7 +52,7 @@ public class CircularProgressBar : System.Windows.Forms.ProgressBar
private PaletteBorderInheritRedirect _paletteBorder;
private PaletteContentInheritRedirect _paletteContent;
- private IPalette _palette;
+ private PaletteBase _palette;
private PaletteRedirect _paletteRedirect;
#endregion
diff --git a/Source/Krypton Toolkit/Krypton.Toolkit.Suite.Extended.ComboBox/Classes/Internal/MissingFrameWorkAPIs.cs b/Source/Krypton Toolkit/Krypton.Toolkit.Suite.Extended.ComboBox/Classes/Internal/MissingFrameWorkAPIs.cs
index 29006dbc6..5297e5780 100644
--- a/Source/Krypton Toolkit/Krypton.Toolkit.Suite.Extended.ComboBox/Classes/Internal/MissingFrameWorkAPIs.cs
+++ b/Source/Krypton Toolkit/Krypton.Toolkit.Suite.Extended.ComboBox/Classes/Internal/MissingFrameWorkAPIs.cs
@@ -27,6 +27,7 @@
namespace Krypton.Toolkit.Suite.Extended.ComboBox
{
+ [Obsolete("Use 'string.IsNullOrWhiteSpace(string value)' instead")]
internal static class MissingFrameWorkAPIs
{
///
diff --git a/Source/Krypton Toolkit/Krypton.Toolkit.Suite.Extended.Common/Controls/User Controls/CommonKryptonKnobControlEnhanced.cs b/Source/Krypton Toolkit/Krypton.Toolkit.Suite.Extended.Common/Controls/User Controls/CommonKryptonKnobControlEnhanced.cs
index 653e0896f..5abbc8c4b 100644
--- a/Source/Krypton Toolkit/Krypton.Toolkit.Suite.Extended.Common/Controls/User Controls/CommonKryptonKnobControlEnhanced.cs
+++ b/Source/Krypton Toolkit/Krypton.Toolkit.Suite.Extended.Common/Controls/User Controls/CommonKryptonKnobControlEnhanced.cs
@@ -71,7 +71,7 @@ public enum KnobPointerStyles
private KnobPointerStyles _pointerStyle = KnobPointerStyles.CIRCLE;
#region Krypton
- private KryptonManager _manager = new KryptonManager();
+ private KryptonManager _manager = new();
private PaletteBackInheritRedirect _paletteBack;
@@ -79,7 +79,7 @@ public enum KnobPointerStyles
private PaletteContentInheritRedirect _paletteContent;
- private IPalette _palette;
+ private PaletteBase _palette;
private PaletteRedirect _paletteRedirect;
#endregion
diff --git a/Source/Krypton Toolkit/Krypton.Toolkit.Suite.Extended.Controls/Controls Toolkit/KryptonFlowLayoutPanel.cs b/Source/Krypton Toolkit/Krypton.Toolkit.Suite.Extended.Controls/Controls Toolkit/KryptonFlowLayoutPanel.cs
index e84c96768..543455c74 100644
--- a/Source/Krypton Toolkit/Krypton.Toolkit.Suite.Extended.Controls/Controls Toolkit/KryptonFlowLayoutPanel.cs
+++ b/Source/Krypton Toolkit/Krypton.Toolkit.Suite.Extended.Controls/Controls Toolkit/KryptonFlowLayoutPanel.cs
@@ -31,7 +31,7 @@ namespace Krypton.Toolkit.Suite.Extended.Controls
public class KryptonFlowLayoutPanel : FlowLayoutPanel
{
#region Variables
- private IPalette _palette;
+ private PaletteBase _palette;
private PaletteRedirect _paletteRedirect;
private PaletteBackInheritRedirect _paletteBack;
private PaletteBorderInheritRedirect _paletteBorder;
diff --git a/Source/Krypton Toolkit/Krypton.Toolkit.Suite.Extended.Controls/Controls Toolkit/KryptonKnobControlVersion1.cs b/Source/Krypton Toolkit/Krypton.Toolkit.Suite.Extended.Controls/Controls Toolkit/KryptonKnobControlVersion1.cs
index fdb694596..8a6aca8f0 100644
--- a/Source/Krypton Toolkit/Krypton.Toolkit.Suite.Extended.Controls/Controls Toolkit/KryptonKnobControlVersion1.cs
+++ b/Source/Krypton Toolkit/Krypton.Toolkit.Suite.Extended.Controls/Controls Toolkit/KryptonKnobControlVersion1.cs
@@ -52,7 +52,7 @@ public class KryptonKnobControlVersion1 : UserControl
private Brush bKnobPoint;
//Palette State
- private KryptonManager k_manager = new KryptonManager();
+ private KryptonManager k_manager = new();
private PaletteBackInheritRedirect m_paletteBack;
private PaletteBorderInheritRedirect m_paletteBorder;
private PaletteContentInheritRedirect m_paletteContent;
@@ -60,7 +60,7 @@ public class KryptonKnobControlVersion1 : UserControl
//private IDisposable m_mementoBack1;
//private IDisposable m_mementoBack2;
- private IPalette _palette;
+ private PaletteBase _palette;
private PaletteRedirect _paletteRedirect;
// declare Off screen image and Offscreen graphics
diff --git a/Source/Krypton Toolkit/Krypton.Toolkit.Suite.Extended.Controls/Controls Toolkit/KryptonKnobControlVersion2.cs b/Source/Krypton Toolkit/Krypton.Toolkit.Suite.Extended.Controls/Controls Toolkit/KryptonKnobControlVersion2.cs
index 5cc2c5d4a..ee9a44b7c 100644
--- a/Source/Krypton Toolkit/Krypton.Toolkit.Suite.Extended.Controls/Controls Toolkit/KryptonKnobControlVersion2.cs
+++ b/Source/Krypton Toolkit/Krypton.Toolkit.Suite.Extended.Controls/Controls Toolkit/KryptonKnobControlVersion2.cs
@@ -73,7 +73,7 @@ public enum KnobPointerStyles
private KnobPointerStyles _pointerStyle = KnobPointerStyles.CIRCLE;
#region Krypton
- private KryptonManager _manager = new KryptonManager();
+ private KryptonManager _manager = new();
private PaletteBackInheritRedirect _paletteBack;
@@ -81,7 +81,7 @@ public enum KnobPointerStyles
private PaletteContentInheritRedirect _paletteContent;
- private IPalette _palette;
+ private PaletteBase _palette;
private PaletteRedirect _paletteRedirect;
#endregion
diff --git a/Source/Krypton Toolkit/Krypton.Toolkit.Suite.Extended.Core/Classes/Colours/ColourCollection.cs b/Source/Krypton Toolkit/Krypton.Toolkit.Suite.Extended.Core/Classes/Colours/ColourCollection.cs
index d3de5b376..2725130b8 100644
--- a/Source/Krypton Toolkit/Krypton.Toolkit.Suite.Extended.Core/Classes/Colours/ColourCollection.cs
+++ b/Source/Krypton Toolkit/Krypton.Toolkit.Suite.Extended.Core/Classes/Colours/ColourCollection.cs
@@ -42,7 +42,7 @@ public class ColourCollection : Collection, ICloneable, IEquatable _indexedLookup;
diff --git a/Source/Krypton Toolkit/Krypton.Toolkit.Suite.Extended.Core/Classes/Colours/ColourExtensions.cs b/Source/Krypton Toolkit/Krypton.Toolkit.Suite.Extended.Core/Classes/Colours/ColourExtensions.cs
index c7d9dbc9d..ae781e677 100644
--- a/Source/Krypton Toolkit/Krypton.Toolkit.Suite.Extended.Core/Classes/Colours/ColourExtensions.cs
+++ b/Source/Krypton Toolkit/Krypton.Toolkit.Suite.Extended.Core/Classes/Colours/ColourExtensions.cs
@@ -31,7 +31,7 @@ namespace Krypton.Toolkit.Suite.Extended.Core
public static class ColourExtensions
{
#region Variables
- private static Random _randomiser = new Random();
+ private static Random _randomiser = new();
#endregion
#region Structures
diff --git a/Source/Krypton Toolkit/Krypton.Toolkit.Suite.Extended.Core/Classes/Colours/ColourUtility.cs b/Source/Krypton Toolkit/Krypton.Toolkit.Suite.Extended.Core/Classes/Colours/ColourUtility.cs
index 841e1d952..85ab91b4f 100644
--- a/Source/Krypton Toolkit/Krypton.Toolkit.Suite.Extended.Core/Classes/Colours/ColourUtility.cs
+++ b/Source/Krypton Toolkit/Krypton.Toolkit.Suite.Extended.Core/Classes/Colours/ColourUtility.cs
@@ -40,9 +40,9 @@ public class ColourUtility
#region Variables
private Color _colour;
- private Random randomColour = new Random(DateTime.Now.Millisecond);
+ private Random randomColour = new(DateTime.Now.Millisecond);
- private AllMergedColourSettingsManager _colourSettingsManager = new AllMergedColourSettingsManager();
+ private AllMergedColourSettingsManager _colourSettingsManager = new();
#endregion
#region Constructor
diff --git a/Source/Krypton Toolkit/Krypton.Toolkit.Suite.Extended.Core/Classes/Colours/CombineColourSettings.cs b/Source/Krypton Toolkit/Krypton.Toolkit.Suite.Extended.Core/Classes/Colours/CombineColourSettings.cs
index 3c5117fed..c4ad5b9de 100644
--- a/Source/Krypton Toolkit/Krypton.Toolkit.Suite.Extended.Core/Classes/Colours/CombineColourSettings.cs
+++ b/Source/Krypton Toolkit/Krypton.Toolkit.Suite.Extended.Core/Classes/Colours/CombineColourSettings.cs
@@ -33,7 +33,7 @@ public class CombineColourSettings
#region Variables
private Color _baseColour, _darkColour, _middleColour, _lightColour, _lightestColour, _borderColourPreview, _alternativeNormalTextColourPreview, _normalTextColourPreview, _disabledTextColourPreview, _focusedTextColourPreview, _pressedTextColourPreview, _disabledColourPreview, _linkNormalColourPreview, _linkHoverColourPreview, _linkVisitedColourPreview, _customColourOne, _customColourTwo, _customColourThree, _customColourFour, _customColourFive, _customTextColourOne, _customTextColourTwo, _customTextColourThree, _customTextColourFour, _customTextColourFive, _menuTextColour, _statusTextColour, _ribbonTabTextColour;
- private AllMergedColourSettingsManager _colourSettingsManager = new AllMergedColourSettingsManager();
+ private AllMergedColourSettingsManager _colourSettingsManager = new();
#endregion
#region Properties
diff --git a/Source/Krypton Toolkit/Krypton.Toolkit.Suite.Extended.Core/Classes/General/Typeface.cs b/Source/Krypton Toolkit/Krypton.Toolkit.Suite.Extended.Core/Classes/General/Typeface.cs
index 386ca7005..ce9ad7c0e 100644
--- a/Source/Krypton Toolkit/Krypton.Toolkit.Suite.Extended.Core/Classes/General/Typeface.cs
+++ b/Source/Krypton Toolkit/Krypton.Toolkit.Suite.Extended.Core/Classes/General/Typeface.cs
@@ -38,6 +38,6 @@ public Typeface()
/// Gets the default typeface.
/// Microsoft Sans Serif, 8.25
- public static Font GetDefaultTypeface() => new Font("Microsoft Sans Serif", 8.25f, FontStyle.Regular);
+ public static Font GetDefaultTypeface() => new("Microsoft Sans Serif", 8.25f, FontStyle.Regular);
}
}
\ No newline at end of file
diff --git a/Source/Krypton Toolkit/Krypton.Toolkit.Suite.Extended.Core/Classes/General/VisualControlBaseExtended.cs b/Source/Krypton Toolkit/Krypton.Toolkit.Suite.Extended.Core/Classes/General/VisualControlBaseExtended.cs
index faa4a1b1c..75671e522 100644
--- a/Source/Krypton Toolkit/Krypton.Toolkit.Suite.Extended.Core/Classes/General/VisualControlBaseExtended.cs
+++ b/Source/Krypton Toolkit/Krypton.Toolkit.Suite.Extended.Core/Classes/General/VisualControlBaseExtended.cs
@@ -45,8 +45,8 @@ public abstract class VisualControlBaseExtended : Control, IKryptonDebug
private bool _paintTransparent;
private bool _evalTransparent;
private bool _globalEvents;
- private IPalette _localPalette;
- private IPalette _palette;
+ private PaletteBase _localPalette;
+ private PaletteBase _palette;
private PaletteMode _paletteMode;
private readonly SimpleCall _refreshCall;
private readonly SimpleCall _layoutCall;
@@ -345,7 +345,7 @@ public void ResetPaletteMode()
[Category("Visuals")]
[Description("Custom palette applied to drawing.")]
[DefaultValue(null)]
- public IPalette Palette
+ public PaletteBase Palette
{
[DebuggerStepThrough]
get => _localPalette;
@@ -356,7 +356,7 @@ public IPalette Palette
if (_localPalette != value)
{
// Remember the starting palette
- IPalette old = _localPalette;
+ PaletteBase old = _localPalette;
// Use the provided palette value
SetPalette(value);
@@ -459,7 +459,7 @@ public ViewManager GetViewManager()
///
[Browsable(false)]
[EditorBrowsable(EditorBrowsableState.Never)]
- public IPalette GetResolvedPalette()
+ public PaletteBase GetResolvedPalette()
{
return _palette;
}
@@ -1238,7 +1238,7 @@ protected virtual void ContextMenuClosed()
#endregion
#region Implementation
- private void SetPalette(IPalette palette)
+ private void SetPalette(PaletteBase palette)
{
if (palette != _palette)
{
diff --git a/Source/Krypton Toolkit/Krypton.Toolkit.Suite.Extended.Core/Classes/Misc/PaletteImportManager.cs b/Source/Krypton Toolkit/Krypton.Toolkit.Suite.Extended.Core/Classes/Misc/PaletteImportManager.cs
index bf62ebe15..53984b007 100644
--- a/Source/Krypton Toolkit/Krypton.Toolkit.Suite.Extended.Core/Classes/Misc/PaletteImportManager.cs
+++ b/Source/Krypton Toolkit/Krypton.Toolkit.Suite.Extended.Core/Classes/Misc/PaletteImportManager.cs
@@ -31,11 +31,11 @@ namespace Krypton.Toolkit.Suite.Extended.Core
public class PaletteImportManager
{
#region Variables
- private KryptonPalette _palette;
+ private KryptonCustomPaletteBase _palette;
- private AllMergedColourSettingsManager _colourSettingsManager = new AllMergedColourSettingsManager();
+ private AllMergedColourSettingsManager _colourSettingsManager = new();
- private GlobalStringSettingsManager _globalStringSettingsManager = new GlobalStringSettingsManager();
+ private GlobalStringSettingsManager _globalStringSettingsManager = new();
#endregion
#region Constructors
@@ -46,7 +46,7 @@ public PaletteImportManager()
#endregion
#region Methods
- public void ImportColourScheme(KryptonPalette palette)
+ public void ImportColourScheme(KryptonCustomPaletteBase palette)
{
try
{
@@ -112,7 +112,7 @@ public void ImportColourScheme()
{
try
{
- _palette = new KryptonPalette();
+ _palette = new();
_palette.Import();
@@ -169,7 +169,7 @@ public void ImportColourScheme()
}
#region New Methods
- public static void ImportPaletteColourScheme(KryptonPalette palette)
+ public static void ImportPaletteColourScheme(KryptonCustomPaletteBase palette)
{
GlobalStringSettingsManager globalStringSettingsManager = new GlobalStringSettingsManager();
@@ -259,7 +259,7 @@ public static void ImportPaletteColourScheme()
try
{
- KryptonPalette palette = new KryptonPalette();
+ KryptonCustomPaletteBase palette = new();
palette.Import();
diff --git a/Source/Krypton Toolkit/Krypton.Toolkit.Suite.Extended.Core/Classes/Misc/RandomNumberGenerator.cs b/Source/Krypton Toolkit/Krypton.Toolkit.Suite.Extended.Core/Classes/Misc/RandomNumberGenerator.cs
index 724e378a7..8924f32a3 100644
--- a/Source/Krypton Toolkit/Krypton.Toolkit.Suite.Extended.Core/Classes/Misc/RandomNumberGenerator.cs
+++ b/Source/Krypton Toolkit/Krypton.Toolkit.Suite.Extended.Core/Classes/Misc/RandomNumberGenerator.cs
@@ -37,7 +37,7 @@ public class RandomNumberGenerator
#region Variables
private int _alphaValue, _redValue, _greenValue, _blueValue, _hueValue; //, _max = byte.MaxValue + 1;
- private Random _randomColourGenerator = new Random();
+ private Random _randomColourGenerator = new();
#endregion
#region Properties
diff --git a/Source/Krypton Toolkit/Krypton.Toolkit.Suite.Extended.Core/Classes/Misc/SettingsManager.cs b/Source/Krypton Toolkit/Krypton.Toolkit.Suite.Extended.Core/Classes/Misc/SettingsManager.cs
index 12222624a..2f49beca1 100644
--- a/Source/Krypton Toolkit/Krypton.Toolkit.Suite.Extended.Core/Classes/Misc/SettingsManager.cs
+++ b/Source/Krypton Toolkit/Krypton.Toolkit.Suite.Extended.Core/Classes/Misc/SettingsManager.cs
@@ -31,7 +31,7 @@ namespace Krypton.Toolkit.Suite.Extended.Core
public class SettingsManagerAlternative
{
#region Variables
- private CoreSettings _mySettings = new CoreSettings();
+ private CoreSettings _mySettings = new();
#endregion
#region Constructor
diff --git a/Source/Krypton Toolkit/Krypton.Toolkit.Suite.Extended.Core/Classes/Misc/TypefaceHelper.cs b/Source/Krypton Toolkit/Krypton.Toolkit.Suite.Extended.Core/Classes/Misc/TypefaceHelper.cs
index 266a47c4a..7553e2063 100644
--- a/Source/Krypton Toolkit/Krypton.Toolkit.Suite.Extended.Core/Classes/Misc/TypefaceHelper.cs
+++ b/Source/Krypton Toolkit/Krypton.Toolkit.Suite.Extended.Core/Classes/Misc/TypefaceHelper.cs
@@ -47,7 +47,7 @@ public static void InitialiseTypefaceStyles(KryptonListBox typefaceStyleSelectio
}
}
- public static Font DefaultTypeface() => new Font("Microsoft Sans Serif", 8.25f, FontStyle.Regular);
+ public static Font DefaultTypeface() => new("Microsoft Sans Serif", 8.25f, FontStyle.Regular);
public static void UpdateTypefaceStyles()
{
diff --git a/Source/Krypton Toolkit/Krypton.Toolkit.Suite.Extended.Core/Classes/Options/Theming/ThemingLogic.cs b/Source/Krypton Toolkit/Krypton.Toolkit.Suite.Extended.Core/Classes/Options/Theming/ThemingLogic.cs
index 6f5aa35d3..ef0c8b79a 100644
--- a/Source/Krypton Toolkit/Krypton.Toolkit.Suite.Extended.Core/Classes/Options/Theming/ThemingLogic.cs
+++ b/Source/Krypton Toolkit/Krypton.Toolkit.Suite.Extended.Core/Classes/Options/Theming/ThemingLogic.cs
@@ -32,7 +32,7 @@ public class ThemingLogic
{
#region Variables
private IThemeOptions _themeOptions;
- private PaletteThemeSettingsManager _paletteThemeSettingsManager = new PaletteThemeSettingsManager();
+ private PaletteThemeSettingsManager _paletteThemeSettingsManager = new();
#endregion
#region Constructors
diff --git a/Source/Krypton Toolkit/Krypton.Toolkit.Suite.Extended.Core/Classes/Palette/PaletteCompisitionEngine.cs b/Source/Krypton Toolkit/Krypton.Toolkit.Suite.Extended.Core/Classes/Palette/PaletteCompisitionEngine.cs
index ccfab6200..5ebd3bae2 100644
--- a/Source/Krypton Toolkit/Krypton.Toolkit.Suite.Extended.Core/Classes/Palette/PaletteCompisitionEngine.cs
+++ b/Source/Krypton Toolkit/Krypton.Toolkit.Suite.Extended.Core/Classes/Palette/PaletteCompisitionEngine.cs
@@ -35,7 +35,9 @@ public class PaletteCompisitionEngine
#endregion
#region Properties
- public PaletteMode PaletteMode { get => _paletteMode;
+ public PaletteMode PaletteMode
+ {
+ get => _paletteMode;
set => _paletteMode = value;
}
#endregion
@@ -83,9 +85,9 @@ public PaletteCompisitionEngine()
/// The ribbon tab text colour.
/// State of the status.
/// if set to true [invert colours].
- public static void CreatePalette(KryptonPalette palette, PaletteMode paletteMode, Color baseColour, Color darkColour, Color middleColour, Color lightColour, Color lightestColour, Color borderColourPreview, Color alternativeNormalTextColourPreview, Color normalTextColourPreview, Color disabledTextColourPreview, Color focusedTextColourPreview, Color pressedTextColourPreview, Color disabledControlColourPreview, Color linkDisabledColourPreview, Color linkFocusedColour, Color linkNormalColourPreview, Color linkHoverColourPreview, Color linkVisitedColourPreview, Color customColourOne, Color customColourTwo, Color customColourThree, Color customColourFour, Color customColourFive, Color customTextColourOne, Color customTextColourTwo, Color customTextColourThree, Color customTextColourFour, Color customTextColourFive, Color menuTextColour, Color statusTextColour, Color ribbonTabTextColour, ToolStripLabel statusState = null, bool invertColours = false)
+ public static void CreatePalette(KryptonCustomPaletteBase palette, PaletteMode paletteMode, Color baseColour, Color darkColour, Color middleColour, Color lightColour, Color lightestColour, Color borderColourPreview, Color alternativeNormalTextColourPreview, Color normalTextColourPreview, Color disabledTextColourPreview, Color focusedTextColourPreview, Color pressedTextColourPreview, Color disabledControlColourPreview, Color linkDisabledColourPreview, Color linkFocusedColour, Color linkNormalColourPreview, Color linkHoverColourPreview, Color linkVisitedColourPreview, Color customColourOne, Color customColourTwo, Color customColourThree, Color customColourFour, Color customColourFive, Color customTextColourOne, Color customTextColourTwo, Color customTextColourThree, Color customTextColourFour, Color customTextColourFive, Color menuTextColour, Color statusTextColour, Color ribbonTabTextColour, ToolStripLabel statusState = null, bool invertColours = false)
{
- palette = new KryptonPalette();
+ palette = new();
try
{
@@ -661,7 +663,7 @@ public static void CreatePalette(KryptonPalette palette, PaletteMode paletteMode
palette.Export();
- statusState.Text = $"Palette exported to: { palette.GetCustomisedKryptonPaletteFilePath() }";
+ statusState.Text = $"Palette exported to: {palette.GetCustomisedKryptonPaletteFilePath()}";
}
catch (Exception exc)
{
@@ -669,7 +671,7 @@ public static void CreatePalette(KryptonPalette palette, PaletteMode paletteMode
}
}
- public static void ChangeTheme(KryptonComboBox themeChoice, KryptonPalette palette)
+ public static void ChangeTheme(KryptonComboBox themeChoice, KryptonCustomPaletteBase palette)
{
if (themeChoice.Text == "Global")
{
diff --git a/Source/Krypton Toolkit/Krypton.Toolkit.Suite.Extended.Core/Classes/Settings/AllMergedPaletteColourSettingsManager.cs b/Source/Krypton Toolkit/Krypton.Toolkit.Suite.Extended.Core/Classes/Settings/AllMergedPaletteColourSettingsManager.cs
index 8dda243ed..5777bc61e 100644
--- a/Source/Krypton Toolkit/Krypton.Toolkit.Suite.Extended.Core/Classes/Settings/AllMergedPaletteColourSettingsManager.cs
+++ b/Source/Krypton Toolkit/Krypton.Toolkit.Suite.Extended.Core/Classes/Settings/AllMergedPaletteColourSettingsManager.cs
@@ -35,7 +35,7 @@ public class AllMergedPaletteColourSettingsManager
#region Variables
private bool _alwaysUsePrompt = false, _settingsModified = false;
- private PaletteColourSettings _paletteColourSettings = new PaletteColourSettings();
+ private PaletteColourSettings _paletteColourSettings = new();
#endregion
#region Properties
diff --git a/Source/Krypton Toolkit/Krypton.Toolkit.Suite.Extended.Core/Classes/Theming/ThemeManager.cs b/Source/Krypton Toolkit/Krypton.Toolkit.Suite.Extended.Core/Classes/Theming/ThemeManager.cs
index 567d7a792..9fc6d5288 100644
--- a/Source/Krypton Toolkit/Krypton.Toolkit.Suite.Extended.Core/Classes/Theming/ThemeManager.cs
+++ b/Source/Krypton Toolkit/Krypton.Toolkit.Suite.Extended.Core/Classes/Theming/ThemeManager.cs
@@ -33,7 +33,7 @@ internal class ThemeManager
#region Variables
private ArrayList _themeList;
private AutoCompleteStringCollection _themeCollection;
- private PaletteThemeSettingsManager _themeSettingsManager = new PaletteThemeSettingsManager();
+ private PaletteThemeSettingsManager _themeSettingsManager = new();
#endregion
public ThemeManager()
@@ -201,7 +201,7 @@ public static void SwitchTheme(PaletteModeManager mode, KryptonManager manager)
/// The manager.
/// The palette.
/// Name of the palette file.
- public static void SetCustomTheme(KryptonManager manager, KryptonPalette palette, string paletteFileName)
+ public static void SetCustomTheme(KryptonManager manager, KryptonCustomPaletteBase palette, string paletteFileName)
{
PaletteThemeSettingsManager paletteThemeSettingsManager = new PaletteThemeSettingsManager();
diff --git a/Source/Krypton Toolkit/Krypton.Toolkit.Suite.Extended.Core/Controls/Colour Controls/ColourEditorControl.cs b/Source/Krypton Toolkit/Krypton.Toolkit.Suite.Extended.Core/Controls/Colour Controls/ColourEditorControl.cs
index 5d9057c64..a30baa1fb 100644
--- a/Source/Krypton Toolkit/Krypton.Toolkit.Suite.Extended.Core/Controls/Colour Controls/ColourEditorControl.cs
+++ b/Source/Krypton Toolkit/Krypton.Toolkit.Suite.Extended.Core/Controls/Colour Controls/ColourEditorControl.cs
@@ -423,13 +423,13 @@ private void InitializeComponent()
#region Constants
- private static readonly object _eventColourChanged = new object();
+ private static readonly object _eventColourChanged = new();
- private static readonly object _eventOrientationChanged = new object();
+ private static readonly object _eventOrientationChanged = new();
- private static readonly object _eventShowAlphaChannelChanged = new object();
+ private static readonly object _eventShowAlphaChannelChanged = new();
- private static readonly object _eventShowColourSpaceLabelsChanged = new object();
+ private static readonly object _eventShowColourSpaceLabelsChanged = new();
private const int _minimumBarWidth = 30;
diff --git a/Source/Krypton Toolkit/Krypton.Toolkit.Suite.Extended.Core/Controls/Colour Controls/ColourEditorManager.cs b/Source/Krypton Toolkit/Krypton.Toolkit.Suite.Extended.Core/Controls/Colour Controls/ColourEditorManager.cs
index 7fa0d9a3a..68e2326ab 100644
--- a/Source/Krypton Toolkit/Krypton.Toolkit.Suite.Extended.Core/Controls/Colour Controls/ColourEditorManager.cs
+++ b/Source/Krypton Toolkit/Krypton.Toolkit.Suite.Extended.Core/Controls/Colour Controls/ColourEditorManager.cs
@@ -36,17 +36,17 @@ public class ColourEditorManager : Component, IColourEditor
{
#region Constants
- private static readonly object _eventColourChanged = new object();
+ private static readonly object _eventColourChanged = new();
- private static readonly object _eventColourEditorChanged = new object();
+ private static readonly object _eventColourEditorChanged = new();
- private static readonly object _eventColourGridChanged = new object();
+ private static readonly object _eventColourGridChanged = new();
- private static readonly object _eventColourWheelChanged = new object();
+ private static readonly object _eventColourWheelChanged = new();
- private static readonly object _eventLightnessColourSliderChanged = new object();
+ private static readonly object _eventLightnessColourSliderChanged = new();
- private static readonly object _eventScreenColourPickerChanged = new object();
+ private static readonly object _eventScreenColourPickerChanged = new();
#endregion
diff --git a/Source/Krypton Toolkit/Krypton.Toolkit.Suite.Extended.Core/Controls/Colour Controls/ColourGridControl.cs b/Source/Krypton Toolkit/Krypton.Toolkit.Suite.Extended.Core/Controls/Colour Controls/ColourGridControl.cs
index 38e7c1632..a9f7a133f 100644
--- a/Source/Krypton Toolkit/Krypton.Toolkit.Suite.Extended.Core/Controls/Colour Controls/ColourGridControl.cs
+++ b/Source/Krypton Toolkit/Krypton.Toolkit.Suite.Extended.Core/Controls/Colour Controls/ColourGridControl.cs
@@ -42,43 +42,43 @@ public class ColourGridControl : Control, IColourEditor
private readonly IDictionary _colourRegions;
- private static readonly object _eventAutoAddColoursChanged = new object();
+ private static readonly object _eventAutoAddColoursChanged = new();
- private static readonly object _eventAutoFitChanged = new object();
+ private static readonly object _eventAutoFitChanged = new();
- private static readonly object _eventCellBorderColourChanged = new object();
+ private static readonly object _eventCellBorderColourChanged = new();
- private static readonly object _eventCellBorderStyleChanged = new object();
+ private static readonly object _eventCellBorderStyleChanged = new();
- private static readonly object _eventCellContextMenuStripChanged = new object();
+ private static readonly object _eventCellContextMenuStripChanged = new();
- private static readonly object _eventCellSizeChanged = new object();
+ private static readonly object _eventCellSizeChanged = new();
- private static readonly object _eventColourChanged = new object();
+ private static readonly object _eventColourChanged = new();
- private static readonly object _eventColourIndexChanged = new object();
+ private static readonly object _eventColourIndexChanged = new();
- private static readonly object _eventColorsChanged = new object();
+ private static readonly object _eventColorsChanged = new();
- private static readonly object _eventColumnsChanged = new object();
+ private static readonly object _eventColumnsChanged = new();
- private static readonly object _eventCustomColoursChanged = new object();
+ private static readonly object _eventCustomColoursChanged = new();
- private static readonly object _eventEditingColour = new object();
+ private static readonly object _eventEditingColour = new();
- private static readonly object _eventEditModeChanged = new object();
+ private static readonly object _eventEditModeChanged = new();
- private static readonly object _eventHotIndexChanged = new object();
+ private static readonly object _eventHotIndexChanged = new();
- private static readonly object _eventPaletteChanged = new object();
+ private static readonly object _eventPaletteChanged = new();
- private static readonly object _eventSelectedCellStyleChanged = new object();
+ private static readonly object _eventSelectedCellStyleChanged = new();
- private static readonly object _eventShowCustomColoursChanged = new object();
+ private static readonly object _eventShowCustomColoursChanged = new();
- private static readonly object _eventShowToolTipsChanged = new object();
+ private static readonly object _eventShowToolTipsChanged = new();
- private static readonly object _eventSpacingChanged = new object();
+ private static readonly object _eventSpacingChanged = new();
#endregion
diff --git a/Source/Krypton Toolkit/Krypton.Toolkit.Suite.Extended.Core/Controls/Colour Controls/ColourSliderControl.cs b/Source/Krypton Toolkit/Krypton.Toolkit.Suite.Extended.Core/Controls/Colour Controls/ColourSliderControl.cs
index 2da0b3afa..d4e79788d 100644
--- a/Source/Krypton Toolkit/Krypton.Toolkit.Suite.Extended.Core/Controls/Colour Controls/ColourSliderControl.cs
+++ b/Source/Krypton Toolkit/Krypton.Toolkit.Suite.Extended.Core/Controls/Colour Controls/ColourSliderControl.cs
@@ -38,41 +38,41 @@ public class ColourSliderControl : Control
{
#region Constants
- private static readonly object _eventBarBoundsChanged = new object();
+ private static readonly object _eventBarBoundsChanged = new();
- private static readonly object _eventBarPaddingChanged = new object();
+ private static readonly object _eventBarPaddingChanged = new();
- private static readonly object _eventBarStyleChanged = new object();
+ private static readonly object _eventBarStyleChanged = new();
- private static readonly object _eventColour1Changed = new object();
+ private static readonly object _eventColour1Changed = new();
- private static readonly object _eventColour2Changed = new object();
+ private static readonly object _eventColour2Changed = new();
- private static readonly object _eventColour3Changed = new object();
+ private static readonly object _eventColour3Changed = new();
- private static readonly object _eventCustomColoursChanged = new object();
+ private static readonly object _eventCustomColoursChanged = new();
- private static readonly object _eventDividerStyleChanged = new object();
+ private static readonly object _eventDividerStyleChanged = new();
- private static readonly object _eventLargeChangeChanged = new object();
+ private static readonly object _eventLargeChangeChanged = new();
- private static readonly object _eventMaximumChanged = new object();
+ private static readonly object _eventMaximumChanged = new();
- private static readonly object _eventMinimumChanged = new object();
+ private static readonly object _eventMinimumChanged = new();
- private static readonly object _eventNubColourChanged = new object();
+ private static readonly object _eventNubColourChanged = new();
- private static readonly object _eventNubSizeChanged = new object();
+ private static readonly object _eventNubSizeChanged = new();
- private static readonly object _eventNubStyleChanged = new object();
+ private static readonly object _eventNubStyleChanged = new();
- private static readonly object _eventOrientationChanged = new object();
+ private static readonly object _eventOrientationChanged = new();
- private static readonly object _eventShowValueDividerChanged = new object();
+ private static readonly object _eventShowValueDividerChanged = new();
- private static readonly object _eventSmallChangeChanged = new object();
+ private static readonly object _eventSmallChangeChanged = new();
- private static readonly object _eventValueChanged = new object();
+ private static readonly object _eventValueChanged = new();
#endregion
diff --git a/Source/Krypton Toolkit/Krypton.Toolkit.Suite.Extended.Core/Controls/Colour Controls/ColourWheelControl.cs b/Source/Krypton Toolkit/Krypton.Toolkit.Suite.Extended.Core/Controls/Colour Controls/ColourWheelControl.cs
index d25e00840..8602d8c6f 100644
--- a/Source/Krypton Toolkit/Krypton.Toolkit.Suite.Extended.Core/Controls/Colour Controls/ColourWheelControl.cs
+++ b/Source/Krypton Toolkit/Krypton.Toolkit.Suite.Extended.Core/Controls/Colour Controls/ColourWheelControl.cs
@@ -33,17 +33,17 @@ public class ColourWheelControl : Control, IColourEditor
{
#region Constants
- private static readonly object _eventColourChanged = new object();
+ private static readonly object _eventColourChanged = new();
- private static readonly object _eventColourStepChanged = new object();
+ private static readonly object _eventColourStepChanged = new();
- private static readonly object _eventHslColourChanged = new object();
+ private static readonly object _eventHslColourChanged = new();
- private static readonly object _eventLargeChangeChanged = new object();
+ private static readonly object _eventLargeChangeChanged = new();
- private static readonly object _eventSelectionSizeChanged = new object();
+ private static readonly object _eventSelectionSizeChanged = new();
- private static readonly object _eventSmallChangeChanged = new object();
+ private static readonly object _eventSmallChangeChanged = new();
#endregion
diff --git a/Source/Krypton Toolkit/Krypton.Toolkit.Suite.Extended.Core/Controls/Colour Controls/LightnessColourSliderControl.cs b/Source/Krypton Toolkit/Krypton.Toolkit.Suite.Extended.Core/Controls/Colour Controls/LightnessColourSliderControl.cs
index 3a5970a26..7afb35abe 100644
--- a/Source/Krypton Toolkit/Krypton.Toolkit.Suite.Extended.Core/Controls/Colour Controls/LightnessColourSliderControl.cs
+++ b/Source/Krypton Toolkit/Krypton.Toolkit.Suite.Extended.Core/Controls/Colour Controls/LightnessColourSliderControl.cs
@@ -33,7 +33,7 @@ public class LightnessColourSliderControl : ColourSliderControl, IColourEditor
{
#region Constants
- private static readonly object _eventColourChanged = new object();
+ private static readonly object _eventColourChanged = new();
#endregion
diff --git a/Source/Krypton Toolkit/Krypton.Toolkit.Suite.Extended.Core/Controls/Colour Controls/RGBAColourSliderControl.cs b/Source/Krypton Toolkit/Krypton.Toolkit.Suite.Extended.Core/Controls/Colour Controls/RGBAColourSliderControl.cs
index c7be63cb1..345dffd75 100644
--- a/Source/Krypton Toolkit/Krypton.Toolkit.Suite.Extended.Core/Controls/Colour Controls/RGBAColourSliderControl.cs
+++ b/Source/Krypton Toolkit/Krypton.Toolkit.Suite.Extended.Core/Controls/Colour Controls/RGBAColourSliderControl.cs
@@ -32,9 +32,9 @@ public class RGBAColourSliderControl : ColourSliderControl
{
#region Constants
- private static readonly object _eventChannelChanged = new object();
+ private static readonly object _eventChannelChanged = new();
- private static readonly object _eventColourChanged = new object();
+ private static readonly object _eventColourChanged = new();
#endregion
diff --git a/Source/Krypton Toolkit/Krypton.Toolkit.Suite.Extended.Core/Controls/Colour Controls/SaturationColourSliderControl.cs b/Source/Krypton Toolkit/Krypton.Toolkit.Suite.Extended.Core/Controls/Colour Controls/SaturationColourSliderControl.cs
index 9f1cfd2e7..9ccbadeaf 100644
--- a/Source/Krypton Toolkit/Krypton.Toolkit.Suite.Extended.Core/Controls/Colour Controls/SaturationColourSliderControl.cs
+++ b/Source/Krypton Toolkit/Krypton.Toolkit.Suite.Extended.Core/Controls/Colour Controls/SaturationColourSliderControl.cs
@@ -36,7 +36,7 @@ public class SaturationColourSliderControl : ColourSliderControl
{
#region Constants
- private static readonly object _eventColourChanged = new object();
+ private static readonly object _eventColourChanged = new();
#endregion
diff --git a/Source/Krypton Toolkit/Krypton.Toolkit.Suite.Extended.Core/Controls/Colour Controls/ScreenColourPickerControl.cs b/Source/Krypton Toolkit/Krypton.Toolkit.Suite.Extended.Core/Controls/Colour Controls/ScreenColourPickerControl.cs
index 656fe258b..76e28236f 100644
--- a/Source/Krypton Toolkit/Krypton.Toolkit.Suite.Extended.Core/Controls/Colour Controls/ScreenColourPickerControl.cs
+++ b/Source/Krypton Toolkit/Krypton.Toolkit.Suite.Extended.Core/Controls/Colour Controls/ScreenColourPickerControl.cs
@@ -37,17 +37,17 @@ public class ScreenColourPickerControl : Control, IColourEditor
{
#region Constants
- private static readonly object _eventColourChanged = new object();
+ private static readonly object _eventColourChanged = new();
- private static readonly object _eventGridColourChanged = new object();
+ private static readonly object _eventGridColourChanged = new();
- private static readonly object _eventImageChanged = new object();
+ private static readonly object _eventImageChanged = new();
- private static readonly object _eventShowGridChanged = new object();
+ private static readonly object _eventShowGridChanged = new();
- private static readonly object _eventShowTextWithSnapshotChanged = new object();
+ private static readonly object _eventShowTextWithSnapshotChanged = new();
- private static readonly object _eventZoomChanged = new object();
+ private static readonly object _eventZoomChanged = new();
#endregion
diff --git a/Source/Krypton Toolkit/Krypton.Toolkit.Suite.Extended.Core/Controls/Internal/KryptonUACElevatedButton.cs b/Source/Krypton Toolkit/Krypton.Toolkit.Suite.Extended.Core/Controls/Internal/KryptonUACElevatedButton.cs
index 8fb5583ff..8f2dc24e2 100644
--- a/Source/Krypton Toolkit/Krypton.Toolkit.Suite.Extended.Core/Controls/Internal/KryptonUACElevatedButton.cs
+++ b/Source/Krypton Toolkit/Krypton.Toolkit.Suite.Extended.Core/Controls/Internal/KryptonUACElevatedButton.cs
@@ -50,9 +50,9 @@ internal partial class KryptonUACElevatedButton : KryptonButton
private const int BCM_SETSHIELD = 0x160C;
- private GlobalMethods _globalMethods = new GlobalMethods();
+ private GlobalMethods _globalMethods = new();
- private UtilityMethods _utilityMethods = new UtilityMethods();
+ private UtilityMethods _utilityMethods = new();
#endregion
#region Properties
diff --git a/Source/Krypton Toolkit/Krypton.Toolkit.Suite.Extended.Core/Krypton.Toolkit.Suite.Extended.Core 2022.csproj b/Source/Krypton Toolkit/Krypton.Toolkit.Suite.Extended.Core/Krypton.Toolkit.Suite.Extended.Core 2022.csproj
index df92e31d5..930ef8ca8 100644
--- a/Source/Krypton Toolkit/Krypton.Toolkit.Suite.Extended.Core/Krypton.Toolkit.Suite.Extended.Core 2022.csproj
+++ b/Source/Krypton Toolkit/Krypton.Toolkit.Suite.Extended.Core/Krypton.Toolkit.Suite.Extended.Core 2022.csproj
@@ -82,13 +82,13 @@
-
+
-
+
-
+
-
+
diff --git a/Source/Krypton Toolkit/Krypton.Toolkit.Suite.Extended.Core/UX/Colours/ColourHexadecimalToRGBConverter.cs b/Source/Krypton Toolkit/Krypton.Toolkit.Suite.Extended.Core/UX/Colours/ColourHexadecimalToRGBConverter.cs
index 53886ea06..de8006871 100644
--- a/Source/Krypton Toolkit/Krypton.Toolkit.Suite.Extended.Core/UX/Colours/ColourHexadecimalToRGBConverter.cs
+++ b/Source/Krypton Toolkit/Krypton.Toolkit.Suite.Extended.Core/UX/Colours/ColourHexadecimalToRGBConverter.cs
@@ -53,7 +53,7 @@ private void InitializeComponent()
this.kchkAutoUpdate = new Krypton.Toolkit.KryptonCheckBox();
this.kbtnConvert = new Krypton.Toolkit.KryptonButton();
this.kryptonManager1 = new Krypton.Toolkit.KryptonManager(this.components);
- this.kPal = new Krypton.Toolkit.KryptonPalette(this.components);
+ this.kPal = new Krypton.Toolkit.KryptonCustomPaletteBase(this.components);
this.tmrUpdateValues = new System.Windows.Forms.Timer(this.components);
this.ttInformation = new System.Windows.Forms.ToolTip(this.components);
this.ep1 = new System.Windows.Forms.ErrorProvider(this.components);
@@ -184,7 +184,7 @@ private void InitializeComponent()
private Krypton.Toolkit.KryptonCheckBox kchkAutoUpdate;
private Krypton.Toolkit.KryptonButton kbtnConvert;
private Krypton.Toolkit.KryptonManager kryptonManager1;
- private Krypton.Toolkit.KryptonPalette kPal;
+ private Krypton.Toolkit.KryptonCustomPaletteBase kPal;
private System.Windows.Forms.Timer tmrUpdateValues;
private System.Windows.Forms.ToolTip ttInformation;
private System.Windows.Forms.ErrorProvider ep1;
@@ -196,7 +196,7 @@ private void InitializeComponent()
"j", "k", "l", "m", "n", "o", "p", "q", "r", "s", "t", "u", "v", "w", "x", "y", "z", "G", "H",
"I", "J", "K", "L", "M", "N", "O", "P", "Q", "R", "S", "T", "U", "V", "W", "X", "Y", "Z" };
- private ConversionMethods _conversionMethods = new ConversionMethods();
+ private ConversionMethods _conversionMethods = new();
#endregion
#region Properties
@@ -240,7 +240,7 @@ private void ktxtHexColourValue_TextChanged(object sender, EventArgs e)
{
if (content.Contains(disqualifiedCharacter))
{
- ep1.SetError((Control)ktxtHexColourValue, $"Cannot accept values: { DisallowedCharacters.ToString() }");
+ ep1.SetError((Control)ktxtHexColourValue, $"Cannot accept values: {DisallowedCharacters.ToString()}");
}
}
}
@@ -264,7 +264,7 @@ private void UpdateUI()
{
_conversionMethods.ConvertHexadecimalToRGB("#" + ktxtHexColourValue.Text);
- klblRGBOutput.Text = $"RGB Value: Red: { _conversionMethods.GetRed() }, Green: { _conversionMethods.GetGreen() }, Blue: { _conversionMethods.GetBlue() }";
+ klblRGBOutput.Text = $"RGB Value: Red: {_conversionMethods.GetRed()}, Green: {_conversionMethods.GetGreen()}, Blue: {_conversionMethods.GetBlue()}";
pnlPreview.BackColor = Color.FromArgb(_conversionMethods.GetRed(), _conversionMethods.GetGreen(), _conversionMethods.GetBlue());
}
diff --git a/Source/Krypton Toolkit/Krypton.Toolkit.Suite.Extended.Core/UX/Colours/ColourMixer.cs b/Source/Krypton Toolkit/Krypton.Toolkit.Suite.Extended.Core/UX/Colours/ColourMixer.cs
index 0561feebe..712d0ba1d 100644
--- a/Source/Krypton Toolkit/Krypton.Toolkit.Suite.Extended.Core/UX/Colours/ColourMixer.cs
+++ b/Source/Krypton Toolkit/Krypton.Toolkit.Suite.Extended.Core/UX/Colours/ColourMixer.cs
@@ -545,17 +545,17 @@ private void InitializeComponent()
#region Variables
private int _alphaChannelValue, _redColourChannelValue, _greenColourChannelValue, _blueColourChannelValue, _max = byte.MaxValue + 1;
- private ConversionMethods _conversionMethods = new ConversionMethods();
+ private ConversionMethods _conversionMethods = new();
- private RandomNumberGenerator _randomNumberGenerator = new RandomNumberGenerator();
+ private RandomNumberGenerator _randomNumberGenerator = new();
- private AllMergedColourSettingsManager _colourSettingsManager = new AllMergedColourSettingsManager();
+ private AllMergedColourSettingsManager _colourSettingsManager = new();
- private ColourIntegerSettingsManager _colourIntegerSettingsManager = new ColourIntegerSettingsManager();
+ private ColourIntegerSettingsManager _colourIntegerSettingsManager = new();
- private Random randomColour = new Random();
+ private Random randomColour = new();
- private ColourUtility _colourUtility = new ColourUtility();
+ private ColourUtility _colourUtility = new();
private bool _paletteColourSelector;
#endregion
diff --git a/Source/Krypton Toolkit/Krypton.Toolkit.Suite.Extended.Core/UX/Colours/ColourRGBToHexadecimalConverter.cs b/Source/Krypton Toolkit/Krypton.Toolkit.Suite.Extended.Core/UX/Colours/ColourRGBToHexadecimalConverter.cs
index 792ddf2c1..2a1f9aa11 100644
--- a/Source/Krypton Toolkit/Krypton.Toolkit.Suite.Extended.Core/UX/Colours/ColourRGBToHexadecimalConverter.cs
+++ b/Source/Krypton Toolkit/Krypton.Toolkit.Suite.Extended.Core/UX/Colours/ColourRGBToHexadecimalConverter.cs
@@ -60,7 +60,7 @@ private void InitializeComponent()
this.kbtnConvert = new Toolkit.KryptonButton();
this.kryptonLabel1 = new Toolkit.KryptonLabel();
this.kryptonManager1 = new Toolkit.KryptonManager(this.components);
- this.kPal = new Toolkit.KryptonPalette(this.components);
+ this.kPal = new Toolkit.KryptonCustomPaletteBase(this.components);
this.tmrUpdateValues = new System.Windows.Forms.Timer(this.components);
this.ttInformation = new System.Windows.Forms.ToolTip(this.components);
((System.ComponentModel.ISupportInitialize)(this.kryptonPanel1)).BeginInit();
@@ -280,7 +280,7 @@ private void InitializeComponent()
private Toolkit.KryptonNumericUpDown numRed;
private Toolkit.KryptonButton kbtnConvert;
private Toolkit.KryptonManager kryptonManager1;
- private Toolkit.KryptonPalette kPal;
+ private Toolkit.KryptonCustomPaletteBase kPal;
private System.Windows.Forms.Timer tmrUpdateValues;
private Toolkit.KryptonNumericUpDown numAlpha;
private Toolkit.KryptonLabel klblAlpha;
@@ -289,7 +289,7 @@ private void InitializeComponent()
#endregion
#region Variables
- ConversionMethods conversionMethods = new ConversionMethods();
+ ConversionMethods conversionMethods = new();
private bool _enableAlphaChannel = false;
#endregion
@@ -301,7 +301,9 @@ private void InitializeComponent()
///
/// true if [enable alpha channel]; otherwise, false.
///
- public bool EnableAlphaChannel { get => _enableAlphaChannel;
+ public bool EnableAlphaChannel
+ {
+ get => _enableAlphaChannel;
set => _enableAlphaChannel = value;
}
#endregion
@@ -348,7 +350,7 @@ private void tmrUpdateValues_Tick(object sender, EventArgs e)
private void UpdateUI()
{
- klblHexOutput.Text = $"Hex Value: #{ conversionMethods.ConvertRGBToHexadecimal(conversionMethods.ConvertDecimalToInteger(numRed.Value), conversionMethods.ConvertDecimalToInteger(numGreen.Value), conversionMethods.ConvertDecimalToInteger(numBlue.Value)).ToUpper() }";
+ klblHexOutput.Text = $"Hex Value: #{conversionMethods.ConvertRGBToHexadecimal(conversionMethods.ConvertDecimalToInteger(numRed.Value), conversionMethods.ConvertDecimalToInteger(numGreen.Value), conversionMethods.ConvertDecimalToInteger(numBlue.Value)).ToUpper()}";
pnlPreview.BackColor = Color.FromArgb(conversionMethods.ConvertDecimalToInteger(numRed.Value), conversionMethods.ConvertDecimalToInteger(numGreen.Value), conversionMethods.ConvertDecimalToInteger(numBlue.Value));
@@ -361,7 +363,7 @@ private void pnlPreview_MouseEnter(object sender, EventArgs e)
{
string knownName = pnlPreview.BackColor.ToKnownColor().ToString();
- ttInformation.SetToolTip(pnlPreview, $"This colour is: { knownName }");
+ ttInformation.SetToolTip(pnlPreview, $"This colour is: {knownName}");
}
private void kchkEnableAlphaChannel_CheckedChanged(object sender, EventArgs e)
diff --git a/Source/Krypton Toolkit/Krypton.Toolkit.Suite.Extended.Core/UX/Colours/ContrastColourGenerator.cs b/Source/Krypton Toolkit/Krypton.Toolkit.Suite.Extended.Core/UX/Colours/ContrastColourGenerator.cs
index 28b70c93b..e7637d966 100644
--- a/Source/Krypton Toolkit/Krypton.Toolkit.Suite.Extended.Core/UX/Colours/ContrastColourGenerator.cs
+++ b/Source/Krypton Toolkit/Krypton.Toolkit.Suite.Extended.Core/UX/Colours/ContrastColourGenerator.cs
@@ -633,7 +633,7 @@ private void InitializeComponent()
#endregion
#region Variables
- private RandomNumberGenerator _rng = new RandomNumberGenerator();
+ private RandomNumberGenerator _rng = new();
#endregion
#region Constructors
diff --git a/Source/Krypton Toolkit/Krypton.Toolkit.Suite.Extended.Core/UX/Colours/CustomColours.cs b/Source/Krypton Toolkit/Krypton.Toolkit.Suite.Extended.Core/UX/Colours/CustomColours.cs
index 49eb33540..1d9927dbb 100644
--- a/Source/Krypton Toolkit/Krypton.Toolkit.Suite.Extended.Core/UX/Colours/CustomColours.cs
+++ b/Source/Krypton Toolkit/Krypton.Toolkit.Suite.Extended.Core/UX/Colours/CustomColours.cs
@@ -395,7 +395,7 @@ private void InitializeComponent()
#endregion
#region Variables
- private RandomNumberGenerator _randomNumberGenerator = new RandomNumberGenerator();
+ private RandomNumberGenerator _randomNumberGenerator = new();
#endregion
public CustomColours()
diff --git a/Source/Krypton Toolkit/Krypton.Toolkit.Suite.Extended.Core/UX/Colours/DefineIndividualColoursDialog.cs b/Source/Krypton Toolkit/Krypton.Toolkit.Suite.Extended.Core/UX/Colours/DefineIndividualColoursDialog.cs
index 3fe02c48b..d12ceee44 100644
--- a/Source/Krypton Toolkit/Krypton.Toolkit.Suite.Extended.Core/UX/Colours/DefineIndividualColoursDialog.cs
+++ b/Source/Krypton Toolkit/Krypton.Toolkit.Suite.Extended.Core/UX/Colours/DefineIndividualColoursDialog.cs
@@ -46,7 +46,7 @@ private void InitializeComponent()
{
this.components = new System.ComponentModel.Container();
this.kManager = new Krypton.Toolkit.KryptonManager(this.components);
- this.kPal = new Krypton.Toolkit.KryptonPalette(this.components);
+ this.kPal = new Krypton.Toolkit.KryptonCustomPaletteBase(this.components);
this.kryptonPanel1 = new Krypton.Toolkit.KryptonPanel();
this.kbtnOk = new Krypton.Toolkit.KryptonButton();
this.ktbHexadecimal = new Krypton.Toolkit.KryptonTextBox();
@@ -658,7 +658,7 @@ private void InitializeComponent()
private CircularPictureBox cpbLightColourPreview;
private Krypton.Toolkit.KryptonLabel kryptonLabel16;
private Krypton.Toolkit.KryptonLabel kryptonLabel15;
- private Krypton.Toolkit.KryptonPalette kPal;
+ private Krypton.Toolkit.KryptonCustomPaletteBase kPal;
private Krypton.Toolkit.KryptonLabel kryptonLabel1;
private Krypton.Toolkit.KryptonTrackBar ktbRed;
private Krypton.Toolkit.KryptonTrackBar ktbGreen;
@@ -687,15 +687,17 @@ private void InitializeComponent()
#endregion
#region Variables
- private ConversionMethods _conversionMethods = new ConversionMethods();
+ private ConversionMethods _conversionMethods = new();
- private RandomNumberGenerator _randomNumberGenerator = new RandomNumberGenerator();
+ private RandomNumberGenerator _randomNumberGenerator = new();
private BasicPaletteColourDefinitions _basicPaletteColourDefinitions;
#endregion
#region Properties
- public BasicPaletteColourDefinitions BasicPaletteColourDefinition { get => _basicPaletteColourDefinitions;
+ public BasicPaletteColourDefinitions BasicPaletteColourDefinition
+ {
+ get => _basicPaletteColourDefinitions;
set => _basicPaletteColourDefinitions = value;
}
#endregion
@@ -918,7 +920,7 @@ private void ktbHexadecimal_TextChanged(object sender, EventArgs e)
private void ktbHexadecimal_MouseHover(object sender, EventArgs e)
{
- ttInformation.SetToolTip(this, $"Hexadecimal Value: { ktbHexadecimal.Text.ToUpper() }");
+ ttInformation.SetToolTip(this, $"Hexadecimal Value: {ktbHexadecimal.Text.ToUpper()}");
}
private void kbtnOk_Click(object sender, EventArgs e)
diff --git a/Source/Krypton Toolkit/Krypton.Toolkit.Suite.Extended.Core/UX/Colours/InternalBasicPaletteCreator.cs b/Source/Krypton Toolkit/Krypton.Toolkit.Suite.Extended.Core/UX/Colours/InternalBasicPaletteCreator.cs
index c6c9d2102..b538e7c48 100644
--- a/Source/Krypton Toolkit/Krypton.Toolkit.Suite.Extended.Core/UX/Colours/InternalBasicPaletteCreator.cs
+++ b/Source/Krypton Toolkit/Krypton.Toolkit.Suite.Extended.Core/UX/Colours/InternalBasicPaletteCreator.cs
@@ -608,17 +608,17 @@ private void InitializeComponent()
#endregion
#region Variables
- private ConversionMethods _conversionMethods = new ConversionMethods();
+ private ConversionMethods _conversionMethods = new();
- private RandomNumberGenerator _randomNumberGenerator = new RandomNumberGenerator();
+ private RandomNumberGenerator _randomNumberGenerator = new();
- private HSLColour _hslColour = new HSLColour();
+ private HSLColour _hslColour = new();
- private ColourControlManager _colourControlManager = new ColourControlManager();
+ private ColourControlManager _colourControlManager = new();
- private GlobalBooleanSettingsManager _globalBooleanSettingsManager = new GlobalBooleanSettingsManager();
+ private GlobalBooleanSettingsManager _globalBooleanSettingsManager = new();
- private AllMergedPaletteColourSettingsManager _colourSettingsManager = new AllMergedPaletteColourSettingsManager();
+ private AllMergedPaletteColourSettingsManager _colourSettingsManager = new();
private Color _baseColour, _colourDark, _colourNormal, _colourLight, _colourLightness;
diff --git a/Source/Krypton Toolkit/Krypton.Toolkit.Suite.Extended.Core/UX/Colours/PaletteColourCreator.cs b/Source/Krypton Toolkit/Krypton.Toolkit.Suite.Extended.Core/UX/Colours/PaletteColourCreator.cs
index fbb98fc74..cfeb8cab6 100644
--- a/Source/Krypton Toolkit/Krypton.Toolkit.Suite.Extended.Core/UX/Colours/PaletteColourCreator.cs
+++ b/Source/Krypton Toolkit/Krypton.Toolkit.Suite.Extended.Core/UX/Colours/PaletteColourCreator.cs
@@ -801,17 +801,17 @@ private void InitializeComponent()
#endregion
#region Variables
- private ConversionMethods _conversionMethods = new ConversionMethods();
+ private ConversionMethods _conversionMethods = new();
- private RandomNumberGenerator _randomNumberGenerator = new RandomNumberGenerator();
+ private RandomNumberGenerator _randomNumberGenerator = new();
- private HSLColour _hslColour = new HSLColour();
+ private HSLColour _hslColour = new();
- private ColourControlManager _colourControlManager = new ColourControlManager();
+ private ColourControlManager _colourControlManager = new();
- private GlobalBooleanSettingsManager _globalBooleanSettingsManager = new GlobalBooleanSettingsManager();
+ private GlobalBooleanSettingsManager _globalBooleanSettingsManager = new();
- private AllMergedColourSettingsManager _colourSettingsManager = new AllMergedColourSettingsManager();
+ private AllMergedColourSettingsManager _colourSettingsManager = new();
private Color _baseColour, _colourDark, _colourNormal, _colourLight, _colourLightness;
diff --git a/Source/Krypton Toolkit/Krypton.Toolkit.Suite.Extended.Core/UX/Colours/PaletteFileEditor.cs b/Source/Krypton Toolkit/Krypton.Toolkit.Suite.Extended.Core/UX/Colours/PaletteFileEditor.cs
index 998b6bb8a..8bfd22029 100644
--- a/Source/Krypton Toolkit/Krypton.Toolkit.Suite.Extended.Core/UX/Colours/PaletteFileEditor.cs
+++ b/Source/Krypton Toolkit/Krypton.Toolkit.Suite.Extended.Core/UX/Colours/PaletteFileEditor.cs
@@ -180,7 +180,7 @@ private void InitializeComponent()
#endregion
#region Variables
- private FileCreator _fileCreator = new FileCreator();
+ private FileCreator _fileCreator = new();
#endregion
public PaletteFileEditor()
diff --git a/Source/Krypton Toolkit/Krypton.Toolkit.Suite.Extended.Core/UX/Options/ColourBlendingOptions.cs b/Source/Krypton Toolkit/Krypton.Toolkit.Suite.Extended.Core/UX/Options/ColourBlendingOptions.cs
index 515156d2b..7bda0bd0e 100644
--- a/Source/Krypton Toolkit/Krypton.Toolkit.Suite.Extended.Core/UX/Options/ColourBlendingOptions.cs
+++ b/Source/Krypton Toolkit/Krypton.Toolkit.Suite.Extended.Core/UX/Options/ColourBlendingOptions.cs
@@ -31,11 +31,11 @@ namespace Krypton.Toolkit.Suite.Extended.Core
public partial class ColourBlendingOptions : KryptonForm
{
#region Variables
- private ColourIntensitySettingsManager _colourBlendingSettingsManager = new ColourIntensitySettingsManager();
- private GlobalBooleanSettingsManager _globalBooleanSettingsManager = new GlobalBooleanSettingsManager();
- private GlobalStringSettingsManager _globalStringSettingsManager = new GlobalStringSettingsManager();
+ private ColourIntensitySettingsManager _colourBlendingSettingsManager = new();
+ private GlobalBooleanSettingsManager _globalBooleanSettingsManager = new();
+ private GlobalStringSettingsManager _globalStringSettingsManager = new();
- private Timer _updateValues = new Timer();
+ private Timer _updateValues = new();
#endregion
#region System
diff --git a/Source/Krypton Toolkit/Krypton.Toolkit.Suite.Extended.Core/UX/Options/GlobalOptionsMenu.cs b/Source/Krypton Toolkit/Krypton.Toolkit.Suite.Extended.Core/UX/Options/GlobalOptionsMenu.cs
index 0f6852c4b..1badfb657 100644
--- a/Source/Krypton Toolkit/Krypton.Toolkit.Suite.Extended.Core/UX/Options/GlobalOptionsMenu.cs
+++ b/Source/Krypton Toolkit/Krypton.Toolkit.Suite.Extended.Core/UX/Options/GlobalOptionsMenu.cs
@@ -1081,11 +1081,11 @@ private void InitializeComponent()
#endregion
#region Variables
- private KryptonManager _manager = new KryptonManager();
- private KryptonPalette _palette = new KryptonPalette();
- private ThemeManager _themeManager = new ThemeManager();
- private ThemingLogic _themingLogic = new ThemingLogic();
- private PaletteThemeSettingsManager _paletteThemeSettingsManager = new PaletteThemeSettingsManager();
+ private KryptonManager _manager = new();
+ private KryptonCustomPaletteBase _palette = new();
+ private ThemeManager _themeManager = new();
+ private ThemingLogic _themingLogic = new();
+ private PaletteThemeSettingsManager _paletteThemeSettingsManager = new();
#endregion
public GlobalOptionsMenu()
diff --git a/Source/Krypton Toolkit/Krypton.Toolkit.Suite.Extended.Core/UX/Options/SettingsManagementOptions.cs b/Source/Krypton Toolkit/Krypton.Toolkit.Suite.Extended.Core/UX/Options/SettingsManagementOptions.cs
index a9bb90120..8353ec593 100644
--- a/Source/Krypton Toolkit/Krypton.Toolkit.Suite.Extended.Core/UX/Options/SettingsManagementOptions.cs
+++ b/Source/Krypton Toolkit/Krypton.Toolkit.Suite.Extended.Core/UX/Options/SettingsManagementOptions.cs
@@ -31,13 +31,13 @@ namespace Krypton.Toolkit.Suite.Extended.Core
public partial class SettingsManagementOptions : KryptonForm
{
#region Variables
- private ColourIntensitySettingsManager _colourBlendingSettingsManager = new ColourIntensitySettingsManager();
- private ColourIntegerSettingsManager _colourIntegerSettingsManager = new ColourIntegerSettingsManager();
- private AllMergedColourSettingsManager _colourSettingsManager = new AllMergedColourSettingsManager();
- private ColourStringSettingsManager _colourStringSettingsManager = new ColourStringSettingsManager();
- private GlobalBooleanSettingsManager _globalBooleanSettingsManager = new GlobalBooleanSettingsManager();
- private GlobalStringSettingsManager _globalStringSettingsManager = new GlobalStringSettingsManager();
- private PaletteTypefaceSettingsManager _paletteTypefaceSettingsManager = new PaletteTypefaceSettingsManager();
+ private ColourIntensitySettingsManager _colourBlendingSettingsManager = new();
+ private ColourIntegerSettingsManager _colourIntegerSettingsManager = new();
+ private AllMergedColourSettingsManager _colourSettingsManager = new();
+ private ColourStringSettingsManager _colourStringSettingsManager = new();
+ private GlobalBooleanSettingsManager _globalBooleanSettingsManager = new();
+ private GlobalStringSettingsManager _globalStringSettingsManager = new();
+ private PaletteTypefaceSettingsManager _paletteTypefaceSettingsManager = new();
#endregion
#region System
diff --git a/Source/Krypton Toolkit/Krypton.Toolkit.Suite.Extended.Core/UX/Options/ThemeOptions.cs b/Source/Krypton Toolkit/Krypton.Toolkit.Suite.Extended.Core/UX/Options/ThemeOptions.cs
index 99e597a05..e5e0fd054 100644
--- a/Source/Krypton Toolkit/Krypton.Toolkit.Suite.Extended.Core/UX/Options/ThemeOptions.cs
+++ b/Source/Krypton Toolkit/Krypton.Toolkit.Suite.Extended.Core/UX/Options/ThemeOptions.cs
@@ -31,9 +31,9 @@ namespace Krypton.Toolkit.Suite.Extended.Core
public partial class ThemeOptions : KryptonForm
{
#region Variables
- private KryptonManager _manager = new KryptonManager();
- private KryptonPalette _palette = new KryptonPalette();
- private PaletteThemeSettingsManager _paletteThemeSettingsManager = new PaletteThemeSettingsManager();
+ private KryptonManager _manager = new();
+ private KryptonCustomPaletteBase _palette = new();
+ private PaletteThemeSettingsManager _paletteThemeSettingsManager = new();
private PaletteMode _paletteMode;
private Timer _paletteUpdateTimer;
private ArrayList _themeList;
@@ -43,7 +43,9 @@ public partial class ThemeOptions : KryptonForm
#region Properties
/// Gets or sets the palette mode.
/// The palette mode.
- public PaletteMode PaletteMode { get => _paletteMode;
+ public PaletteMode PaletteMode
+ {
+ get => _paletteMode;
set => _paletteMode = value;
}
#endregion
diff --git a/Source/Krypton Toolkit/Krypton.Toolkit.Suite.Extended.Developer.Utilities/Krypton.Toolkit.Suite.Extended.Developer.Utilities 2022.csproj b/Source/Krypton Toolkit/Krypton.Toolkit.Suite.Extended.Developer.Utilities/Krypton.Toolkit.Suite.Extended.Developer.Utilities 2022.csproj
index b980a6c46..2cc7f2689 100644
--- a/Source/Krypton Toolkit/Krypton.Toolkit.Suite.Extended.Developer.Utilities/Krypton.Toolkit.Suite.Extended.Developer.Utilities 2022.csproj
+++ b/Source/Krypton Toolkit/Krypton.Toolkit.Suite.Extended.Developer.Utilities/Krypton.Toolkit.Suite.Extended.Developer.Utilities 2022.csproj
@@ -82,7 +82,7 @@
-
+
diff --git a/Source/Krypton Toolkit/Krypton.Toolkit.Suite.Extended.Dialogs/Controls Toolkit/KryptonSplitButton.cs b/Source/Krypton Toolkit/Krypton.Toolkit.Suite.Extended.Dialogs/Controls Toolkit/KryptonSplitButton.cs
index 06593e3c1..03bd4fa28 100644
--- a/Source/Krypton Toolkit/Krypton.Toolkit.Suite.Extended.Dialogs/Controls Toolkit/KryptonSplitButton.cs
+++ b/Source/Krypton Toolkit/Krypton.Toolkit.Suite.Extended.Dialogs/Controls Toolkit/KryptonSplitButton.cs
@@ -212,7 +212,7 @@ protected override void OnPaint(PaintEventArgs e)
Rectangle focusRectangle = new Rectangle(internalBorder, internalBorder, bounds.Width - _dropDownRectangle.Width - internalBorder, bounds.Height - (internalBorder * 2));
- IPalette palette = KryptonManager.CurrentGlobalPalette;
+ PaletteBase palette = KryptonManager.CurrentGlobalPalette;
Pen shadow = SystemPens.ButtonShadow, face = SystemPens.ButtonFace;
diff --git a/Source/Krypton Toolkit/Krypton.Toolkit.Suite.Extended.Drawing.Utilities/Values/ViewDrawButtonExtended.cs b/Source/Krypton Toolkit/Krypton.Toolkit.Suite.Extended.Drawing.Utilities/Values/ViewDrawButtonExtended.cs
index 977ed903c..b86ead4f8 100644
--- a/Source/Krypton Toolkit/Krypton.Toolkit.Suite.Extended.Drawing.Utilities/Values/ViewDrawButtonExtended.cs
+++ b/Source/Krypton Toolkit/Krypton.Toolkit.Suite.Extended.Drawing.Utilities/Values/ViewDrawButtonExtended.cs
@@ -160,7 +160,7 @@ public ViewDrawButtonExtended(IPaletteTriple paletteDisabled,
public override string ToString()
{
- return $"ViewDrawButtonExtended: { Id }";
+ return $"ViewDrawButtonExtended: {Id}";
}
#endregion
@@ -241,7 +241,7 @@ public VisualOrientation DropDownOrientation
///
/// Gets and sets the drop down capability of the button.
///
- public IPalette DropDownPalette
+ public PaletteBase DropDownPalette
{
get => _drawDropDownButton.Palette;
set => _drawDropDownButton.Palette = value;
diff --git a/Source/Krypton Toolkit/Krypton.Toolkit.Suite.Extended.Drawing/Krypton.Toolkit.Suite.Extended.Drawing 2022.csproj b/Source/Krypton Toolkit/Krypton.Toolkit.Suite.Extended.Drawing/Krypton.Toolkit.Suite.Extended.Drawing 2022.csproj
index 4149f21aa..e6c6fd088 100644
--- a/Source/Krypton Toolkit/Krypton.Toolkit.Suite.Extended.Drawing/Krypton.Toolkit.Suite.Extended.Drawing 2022.csproj
+++ b/Source/Krypton Toolkit/Krypton.Toolkit.Suite.Extended.Drawing/Krypton.Toolkit.Suite.Extended.Drawing 2022.csproj
@@ -82,7 +82,7 @@
-
+
diff --git a/Source/Krypton Toolkit/Krypton.Toolkit.Suite.Extended.Effects/Krypton.Toolkit.Suite.Extended.Effects 2022.csproj b/Source/Krypton Toolkit/Krypton.Toolkit.Suite.Extended.Effects/Krypton.Toolkit.Suite.Extended.Effects 2022.csproj
index c0e4d1256..a6a5848c5 100644
--- a/Source/Krypton Toolkit/Krypton.Toolkit.Suite.Extended.Effects/Krypton.Toolkit.Suite.Extended.Effects 2022.csproj
+++ b/Source/Krypton Toolkit/Krypton.Toolkit.Suite.Extended.Effects/Krypton.Toolkit.Suite.Extended.Effects 2022.csproj
@@ -82,7 +82,7 @@
-
+
diff --git a/Source/Krypton Toolkit/Krypton.Toolkit.Suite.Extended.Forms/ButtonSpec/ButtonSpecFormWindowClose.cs b/Source/Krypton Toolkit/Krypton.Toolkit.Suite.Extended.Forms/ButtonSpec/ButtonSpecFormWindowClose.cs
index 337085076..f0d291ba8 100644
--- a/Source/Krypton Toolkit/Krypton.Toolkit.Suite.Extended.Forms/ButtonSpec/ButtonSpecFormWindowClose.cs
+++ b/Source/Krypton Toolkit/Krypton.Toolkit.Suite.Extended.Forms/ButtonSpec/ButtonSpecFormWindowClose.cs
@@ -78,7 +78,7 @@ public ButtonSpecFormWindowClose(VirtualKryptonFormExtended form)
///
/// Palette to use for inheriting values.
/// Button visibility.
- public override bool GetVisible(IPalette palette)
+ public override bool GetVisible(PaletteBase palette)
{
// We do not show if the custom chrome is combined with composition,
// in which case the form buttons are handled by the composition
@@ -96,14 +96,14 @@ public override bool GetVisible(IPalette palette)
///
/// Palette to use for inheriting values.
/// Button enabled state.
- public override ButtonEnabled GetEnabled(IPalette palette) => KryptonForm.CloseBox && Enabled ? ButtonEnabled.True : ButtonEnabled.False;
+ public override ButtonEnabled GetEnabled(PaletteBase palette) => KryptonForm.CloseBox && Enabled ? ButtonEnabled.True : ButtonEnabled.False;
///
/// Gets the button checked state.
///
/// Palette to use for inheriting values.
/// Button checked state.
- public override ButtonCheckState GetChecked(IPalette palette) =>
+ public override ButtonCheckState GetChecked(PaletteBase palette) =>
// Close button is never shown as checked
ButtonCheckState.NotCheckButton;
diff --git a/Source/Krypton Toolkit/Krypton.Toolkit.Suite.Extended.Forms/ButtonSpec/ButtonSpecFormWindowMax.cs b/Source/Krypton Toolkit/Krypton.Toolkit.Suite.Extended.Forms/ButtonSpec/ButtonSpecFormWindowMax.cs
index 03afa5d94..05ac3bafe 100644
--- a/Source/Krypton Toolkit/Krypton.Toolkit.Suite.Extended.Forms/ButtonSpec/ButtonSpecFormWindowMax.cs
+++ b/Source/Krypton Toolkit/Krypton.Toolkit.Suite.Extended.Forms/ButtonSpec/ButtonSpecFormWindowMax.cs
@@ -49,7 +49,7 @@ public ButtonSpecFormWindowMax(VirtualKryptonFormExtended form)
///
/// Palette to use for inheriting values.
/// Button visibility.
- public override bool GetVisible(IPalette palette)
+ public override bool GetVisible(PaletteBase palette)
{
// We do not show if the custom chrome is combined with composition,
// in which case the form buttons are handled by the composition
@@ -81,7 +81,7 @@ public override bool GetVisible(IPalette palette)
///
/// Palette to use for inheriting values.
/// Button enabled state.
- public override ButtonEnabled GetEnabled(IPalette palette) =>
+ public override ButtonEnabled GetEnabled(PaletteBase palette) =>
// Has the maximize buttons been turned off?
KryptonForm.MaximizeBox ? ButtonEnabled.True : ButtonEnabled.False;
@@ -90,7 +90,7 @@ public override ButtonEnabled GetEnabled(IPalette palette) =>
///
/// Palette to use for inheriting values.
/// Button checked state.
- public override ButtonCheckState GetChecked(IPalette palette) =>
+ public override ButtonCheckState GetChecked(PaletteBase palette) =>
// Close button is never shown as checked
ButtonCheckState.NotCheckButton;
diff --git a/Source/Krypton Toolkit/Krypton.Toolkit.Suite.Extended.Forms/ButtonSpec/ButtonSpecFormWindowMin.cs b/Source/Krypton Toolkit/Krypton.Toolkit.Suite.Extended.Forms/ButtonSpec/ButtonSpecFormWindowMin.cs
index fc6d48715..0b7fa86a4 100644
--- a/Source/Krypton Toolkit/Krypton.Toolkit.Suite.Extended.Forms/ButtonSpec/ButtonSpecFormWindowMin.cs
+++ b/Source/Krypton Toolkit/Krypton.Toolkit.Suite.Extended.Forms/ButtonSpec/ButtonSpecFormWindowMin.cs
@@ -49,7 +49,7 @@ public ButtonSpecFormWindowMin(VirtualKryptonFormExtended form)
///
/// Palette to use for inheriting values.
/// Button visibility.
- public override bool GetVisible(IPalette palette)
+ public override bool GetVisible(PaletteBase palette)
{
// We do not show if the custom chrome is combined with composition,
// in which case the form buttons are handled by the composition
@@ -81,7 +81,7 @@ public override bool GetVisible(IPalette palette)
///
/// Palette to use for inheriting values.
/// Button enabled state.
- public override ButtonEnabled GetEnabled(IPalette palette) =>
+ public override ButtonEnabled GetEnabled(PaletteBase palette) =>
// Has the minimize buttons been turned off?
!KryptonForm.MinimizeBox ? ButtonEnabled.False : ButtonEnabled.True;
@@ -90,7 +90,7 @@ public override ButtonEnabled GetEnabled(IPalette palette) =>
///
/// Palette to use for inheriting values.
/// Button checked state.
- public override ButtonCheckState GetChecked(IPalette palette) =>
+ public override ButtonCheckState GetChecked(PaletteBase palette) =>
// Close button is never shown as checked
ButtonCheckState.NotCheckButton;
diff --git a/Source/Krypton Toolkit/Krypton.Toolkit.Suite.Extended.Forms/Controls Visuals/VirtualForm.cs b/Source/Krypton Toolkit/Krypton.Toolkit.Suite.Extended.Forms/Controls Visuals/VirtualForm.cs
index f447dda80..392ab9405 100644
--- a/Source/Krypton Toolkit/Krypton.Toolkit.Suite.Extended.Forms/Controls Visuals/VirtualForm.cs
+++ b/Source/Krypton Toolkit/Krypton.Toolkit.Suite.Extended.Forms/Controls Visuals/VirtualForm.cs
@@ -55,8 +55,8 @@ public abstract class VirtualForm : Form, IKryptonDebug
private int _compositionHeight;
private int _ignoreCount;
private ViewBase _capturedElement;
- private IPalette _localPalette;
- private IPalette _palette;
+ private PaletteBase _localPalette;
+ private PaletteBase _palette;
private PaletteMode _paletteMode;
private readonly IntPtr _screenDC;
private ShadowValues _shadowValues;
@@ -499,7 +499,7 @@ public FadeValues FadeValues
[Category(@"Visuals")]
[Description(@"Custom palette applied to drawing.")]
[DefaultValue(null)]
- public IPalette Palette
+ public PaletteBase Palette
{
[DebuggerStepThrough]
get => _localPalette;
@@ -510,7 +510,7 @@ public IPalette Palette
if (_localPalette != value)
{
// Remember the starting palette
- IPalette old = _localPalette;
+ PaletteBase old = _localPalette;
// Use the provided palette value
SetPalette(value);
@@ -576,7 +576,7 @@ public IRenderer Renderer
///
[Browsable(false)]
[EditorBrowsable(EditorBrowsableState.Never)]
- public IPalette GetResolvedPalette() => _palette;
+ public PaletteBase GetResolvedPalette() => _palette;
///
/// Create a tool strip renderer appropriate for the current renderer/palette pair.
@@ -1937,7 +1937,7 @@ private void OnUserPreferenceChanged(object sender, UserPreferenceChangedEventAr
}
}
- private void SetPalette(IPalette palette)
+ private void SetPalette(PaletteBase palette)
{
if (palette != _palette)
{
diff --git a/Source/Krypton Toolkit/Krypton.Toolkit.Suite.Extended.Forms/Controls Visuals/VirtualKryptonFormExtended.cs b/Source/Krypton Toolkit/Krypton.Toolkit.Suite.Extended.Forms/Controls Visuals/VirtualKryptonFormExtended.cs
index 481179356..faf69932f 100644
--- a/Source/Krypton Toolkit/Krypton.Toolkit.Suite.Extended.Forms/Controls Visuals/VirtualKryptonFormExtended.cs
+++ b/Source/Krypton Toolkit/Krypton.Toolkit.Suite.Extended.Forms/Controls Visuals/VirtualKryptonFormExtended.cs
@@ -844,7 +844,7 @@ internal class FormPaletteRedirect : PaletteRedirect
{
private readonly VirtualKryptonFormExtended _kryptonForm;
- public FormPaletteRedirect(IPalette palette, VirtualKryptonFormExtended kryptonForm)
+ public FormPaletteRedirect(PaletteBase palette, VirtualKryptonFormExtended kryptonForm)
: base(palette) =>
_kryptonForm = kryptonForm;
diff --git a/Source/Krypton Toolkit/Krypton.Toolkit.Suite.Extended.Global.Utilities/Krypton.Toolkit.Suite.Extended.Global.Utilities 2022.csproj b/Source/Krypton Toolkit/Krypton.Toolkit.Suite.Extended.Global.Utilities/Krypton.Toolkit.Suite.Extended.Global.Utilities 2022.csproj
index 77ba0f2a5..1f5e7f013 100644
--- a/Source/Krypton Toolkit/Krypton.Toolkit.Suite.Extended.Global.Utilities/Krypton.Toolkit.Suite.Extended.Global.Utilities 2022.csproj
+++ b/Source/Krypton Toolkit/Krypton.Toolkit.Suite.Extended.Global.Utilities/Krypton.Toolkit.Suite.Extended.Global.Utilities 2022.csproj
@@ -82,7 +82,7 @@
-
+
diff --git a/Source/Krypton Toolkit/Krypton.Toolkit.Suite.Extended.Language.Model/Krypton.Toolkit.Suite.Extended.Language.Model 2022.csproj b/Source/Krypton Toolkit/Krypton.Toolkit.Suite.Extended.Language.Model/Krypton.Toolkit.Suite.Extended.Language.Model 2022.csproj
index 109a7e601..f401c6044 100644
--- a/Source/Krypton Toolkit/Krypton.Toolkit.Suite.Extended.Language.Model/Krypton.Toolkit.Suite.Extended.Language.Model 2022.csproj
+++ b/Source/Krypton Toolkit/Krypton.Toolkit.Suite.Extended.Language.Model/Krypton.Toolkit.Suite.Extended.Language.Model 2022.csproj
@@ -82,7 +82,7 @@
-
+
diff --git a/Source/Krypton Toolkit/Krypton.Toolkit.Suite.Extended.Navigator/Classes/KryptonNavigatorButton.cs b/Source/Krypton Toolkit/Krypton.Toolkit.Suite.Extended.Navigator/Classes/KryptonNavigatorButton.cs
index afc5cc222..1623f49b4 100644
--- a/Source/Krypton Toolkit/Krypton.Toolkit.Suite.Extended.Navigator/Classes/KryptonNavigatorButton.cs
+++ b/Source/Krypton Toolkit/Krypton.Toolkit.Suite.Extended.Navigator/Classes/KryptonNavigatorButton.cs
@@ -31,7 +31,7 @@ namespace Krypton.Toolkit.Suite.Extended.Navigator
public class KryptonNavigatorButton : KryptonButton
{
- private static IPalette _palette;
+ private static PaletteBase _palette;
private static PaletteRedirect _paletteRedirect;
public KryptonNavigatorButton()
diff --git a/Source/Krypton Toolkit/Krypton.Toolkit.Suite.Extended.Navigator/Controls/KryptonEmptyTabControl.cs b/Source/Krypton Toolkit/Krypton.Toolkit.Suite.Extended.Navigator/Controls/KryptonEmptyTabControl.cs
index b1b63429b..24e37ac54 100644
--- a/Source/Krypton Toolkit/Krypton.Toolkit.Suite.Extended.Navigator/Controls/KryptonEmptyTabControl.cs
+++ b/Source/Krypton Toolkit/Krypton.Toolkit.Suite.Extended.Navigator/Controls/KryptonEmptyTabControl.cs
@@ -30,7 +30,7 @@ namespace Krypton.Toolkit.Suite.Extended.Navigator
[ToolboxBitmap(typeof(TabControl)), ToolboxItem(false)]
public class KryptonEmptyTabControl : TabControl
{
- private IPalette _palette;
+ private PaletteBase _palette;
private PaletteRedirect _paletteRedirect;
private PaletteBorderInheritRedirect _paletteBorder;
private IDisposable _mementoBack;
diff --git a/Source/Krypton Toolkit/Krypton.Toolkit.Suite.Extended.Navigator/Controls/KryptonFlatTabControl.cs b/Source/Krypton Toolkit/Krypton.Toolkit.Suite.Extended.Navigator/Controls/KryptonFlatTabControl.cs
index 952894b35..4b7e6388d 100644
--- a/Source/Krypton Toolkit/Krypton.Toolkit.Suite.Extended.Navigator/Controls/KryptonFlatTabControl.cs
+++ b/Source/Krypton Toolkit/Krypton.Toolkit.Suite.Extended.Navigator/Controls/KryptonFlatTabControl.cs
@@ -65,7 +65,7 @@ private void InitializeComponent()
#endregion
- private IPalette _palette;
+ private PaletteBase _palette;
private PaletteRedirect _paletteRedirect;
public KryptonFlatTabControl()
diff --git a/Source/Krypton Toolkit/Krypton.Toolkit.Suite.Extended.Navigator/Controls/KryptonTabControl.cs b/Source/Krypton Toolkit/Krypton.Toolkit.Suite.Extended.Navigator/Controls/KryptonTabControl.cs
index 1cd79bbb9..69554135d 100644
--- a/Source/Krypton Toolkit/Krypton.Toolkit.Suite.Extended.Navigator/Controls/KryptonTabControl.cs
+++ b/Source/Krypton Toolkit/Krypton.Toolkit.Suite.Extended.Navigator/Controls/KryptonTabControl.cs
@@ -381,7 +381,7 @@ public enum CornSymmetry : int
#region ... Constructor ...
- private IPalette _palette;
+ private PaletteBase _palette;
private PaletteRedirect _paletteRedirect;
private PaletteBackInheritRedirect _paletteBack;
private PaletteBorderInheritRedirect _paletteBorder;
diff --git a/Source/Krypton Toolkit/Krypton.Toolkit.Suite.Extended.Navigator/Controls/KryptonTabControlAlternative.cs b/Source/Krypton Toolkit/Krypton.Toolkit.Suite.Extended.Navigator/Controls/KryptonTabControlAlternative.cs
index 90a636c54..32ee62fb7 100644
--- a/Source/Krypton Toolkit/Krypton.Toolkit.Suite.Extended.Navigator/Controls/KryptonTabControlAlternative.cs
+++ b/Source/Krypton Toolkit/Krypton.Toolkit.Suite.Extended.Navigator/Controls/KryptonTabControlAlternative.cs
@@ -38,7 +38,7 @@ public class KryptonTabControlAlternative : TabControl
private static Font g_TabFontRegular;
#endregion
- private IPalette m_Palette;
+ private PaletteBase m_Palette;
private IRenderer m_Renderer;
private ViewLayoutContext m_ViewLayoutContext;
private PaletteMode m_PaletteMode;
diff --git a/Source/Krypton Toolkit/Krypton.Toolkit.Suite.Extended.Navigator/Controls/KryptonTabControlLite.cs b/Source/Krypton Toolkit/Krypton.Toolkit.Suite.Extended.Navigator/Controls/KryptonTabControlLite.cs
index 4eda10b81..1394a0265 100644
--- a/Source/Krypton Toolkit/Krypton.Toolkit.Suite.Extended.Navigator/Controls/KryptonTabControlLite.cs
+++ b/Source/Krypton Toolkit/Krypton.Toolkit.Suite.Extended.Navigator/Controls/KryptonTabControlLite.cs
@@ -31,7 +31,7 @@ namespace Krypton.Toolkit.Suite.Extended.Navigator
public class KryptonTabControlLite : TabControl
{
private static IRenderer Renderer;
- private static IPalette Palette;
+ private static PaletteBase Palette;
private static ViewLayoutContext ViewLayoutContext;
private static Control ViewLayoutContextControl = new Control();
private static PaletteBackInheritRedirect PaletteTabPageBackground;
diff --git a/Source/Krypton Toolkit/Krypton.Toolkit.Suite.Extended.Navigator/Controls/KryptonTabPage.cs b/Source/Krypton Toolkit/Krypton.Toolkit.Suite.Extended.Navigator/Controls/KryptonTabPage.cs
index d90164ecc..67da78c5e 100644
--- a/Source/Krypton Toolkit/Krypton.Toolkit.Suite.Extended.Navigator/Controls/KryptonTabPage.cs
+++ b/Source/Krypton Toolkit/Krypton.Toolkit.Suite.Extended.Navigator/Controls/KryptonTabPage.cs
@@ -30,7 +30,7 @@ namespace Krypton.Toolkit.Suite.Extended.Navigator
[Designer(typeof(KryptonTabPageDesigner), typeof(IDesigner)), ToolboxBitmap(typeof(TabPage))]
public class KryptonTabPage : TabPage
{
- private IPalette m_Palette;
+ private PaletteBase m_Palette;
private IRenderer m_Renderer;
private PaletteMode m_PaletteMode;
private PaletteRedirect m_PaletteRedirect;
diff --git a/Source/Krypton Toolkit/Krypton.Toolkit.Suite.Extended.Navigator/Controls/OutlookBar.cs b/Source/Krypton Toolkit/Krypton.Toolkit.Suite.Extended.Navigator/Controls/OutlookBar.cs
index d33bb215a..f81e17dc1 100644
--- a/Source/Krypton Toolkit/Krypton.Toolkit.Suite.Extended.Navigator/Controls/OutlookBar.cs
+++ b/Source/Krypton Toolkit/Krypton.Toolkit.Suite.Extended.Navigator/Controls/OutlookBar.cs
@@ -33,7 +33,7 @@ namespace Krypton.Toolkit.Suite.Extended.Navigator
public class OutlookBar : Control
{
- private IPalette _palette;
+ private PaletteBase _palette;
private PaletteRedirect _paletteRedirect;
private PaletteBackInheritRedirect _paletteBack;
private PaletteBorderInheritRedirect _paletteBorder;
diff --git a/Source/Krypton Toolkit/Krypton.Toolkit.Suite.Extended.Navigator/Controls/SystemTabControl.cs b/Source/Krypton Toolkit/Krypton.Toolkit.Suite.Extended.Navigator/Controls/SystemTabControl.cs
index f42555965..3cbaff1e5 100644
--- a/Source/Krypton Toolkit/Krypton.Toolkit.Suite.Extended.Navigator/Controls/SystemTabControl.cs
+++ b/Source/Krypton Toolkit/Krypton.Toolkit.Suite.Extended.Navigator/Controls/SystemTabControl.cs
@@ -30,7 +30,7 @@ namespace Krypton.Toolkit.Suite.Extended.Navigator
[ToolboxBitmap(typeof(TabControl)), ToolboxItem(false)]
public class SystemTabControl : TabControl
{
- private IPalette _palette;
+ private PaletteBase _palette;
private PaletteRedirect _paletteRedirect;
private bool FlagControl = false;
diff --git a/Source/Krypton Toolkit/Krypton.Toolkit.Suite.Extended.Notifications/UX/Alternative/KryptonAlertWindow.cs b/Source/Krypton Toolkit/Krypton.Toolkit.Suite.Extended.Notifications/UX/Alternative/KryptonAlertWindow.cs
index 5bb91ecde..530812238 100644
--- a/Source/Krypton Toolkit/Krypton.Toolkit.Suite.Extended.Notifications/UX/Alternative/KryptonAlertWindow.cs
+++ b/Source/Krypton Toolkit/Krypton.Toolkit.Suite.Extended.Notifications/UX/Alternative/KryptonAlertWindow.cs
@@ -175,7 +175,7 @@ internal void DisplayAlert(string message, AlertType alertType, int interval, Im
for (int i = 1; i < 10; i++)
{
- var windowName = $"Alert { i }";
+ var windowName = $"Alert {i}";
var window = (KryptonAlertWindow)Application.OpenForms[windowName];
@@ -224,7 +224,7 @@ internal void DisplayAlert(string message, AlertType alertType, int interval, Im
break;
}
- if (MissingFrameWorkAPIs.IsNullOrWhiteSpace(headerText))
+ if (string.IsNullOrWhiteSpace(headerText))
{
kwlContent.Visible = true;
diff --git a/Source/Krypton Toolkit/Krypton.Toolkit.Suite.Extended.Outlook.Grid/Classes/General/KryptonOutlookGrid.cs b/Source/Krypton Toolkit/Krypton.Toolkit.Suite.Extended.Outlook.Grid/Classes/General/KryptonOutlookGrid.cs
index a6790ce9d..c4047200b 100644
--- a/Source/Krypton Toolkit/Krypton.Toolkit.Suite.Extended.Outlook.Grid/Classes/General/KryptonOutlookGrid.cs
+++ b/Source/Krypton Toolkit/Krypton.Toolkit.Suite.Extended.Outlook.Grid/Classes/General/KryptonOutlookGrid.cs
@@ -37,7 +37,7 @@ private void InitializeComponent()
#region Variables
private KryptonOutlookGridGroupBox groupBox;
//Krypton
- private IPalette _palette;
+ private PaletteBase _palette;
private PaletteRedirect _paletteRedirect;
private PaletteBackInheritRedirect _paletteBack;
private PaletteBorderInheritRedirect _paletteBorder;
@@ -254,7 +254,7 @@ public int PreviousSelectedGroupRow
/// Gets the Krypton Palette of the OutlookGrid
///
[Browsable(false)]
- public IPalette GridPalette => _palette;
+ public PaletteBase GridPalette => _palette;
///
/// Gets or sets the group collection.
@@ -824,9 +824,9 @@ protected override void OnColumnHeaderMouseClick(DataGridViewCellMouseEventArgs
}
// Note Can we remove this?
-//#if DEBUG
-// internalColumns.DebugOutput();
-//#endif
+ //#if DEBUG
+ // internalColumns.DebugOutput();
+ //#endif
//Refresh the groupBox if the column is grouped
if (col.IsGrouped)
diff --git a/Source/Krypton Toolkit/Krypton.Toolkit.Suite.Extended.Outlook.Grid/User Control/KryptonOutlookGridGroupBox.cs b/Source/Krypton Toolkit/Krypton.Toolkit.Suite.Extended.Outlook.Grid/User Control/KryptonOutlookGridGroupBox.cs
index 5bc2953d0..3d6e059bc 100644
--- a/Source/Krypton Toolkit/Krypton.Toolkit.Suite.Extended.Outlook.Grid/User Control/KryptonOutlookGridGroupBox.cs
+++ b/Source/Krypton Toolkit/Krypton.Toolkit.Suite.Extended.Outlook.Grid/User Control/KryptonOutlookGridGroupBox.cs
@@ -47,7 +47,7 @@ private void InitializeComponent()
private string _dragColumnToGroupText;
//Krypton
- private IPalette _palette;
+ private PaletteBase _palette;
private PaletteRedirect _paletteRedirect;
private PaletteBackInheritRedirect _paletteBack;
private PaletteBorderInheritRedirect _paletteBorder;
diff --git a/Source/Krypton Toolkit/Krypton.Toolkit.Suite.Extended.Resources/Krypton.Toolkit.Suite.Extended.Resources 2022.csproj b/Source/Krypton Toolkit/Krypton.Toolkit.Suite.Extended.Resources/Krypton.Toolkit.Suite.Extended.Resources 2022.csproj
index 45f05fa61..10d1e2e3f 100644
--- a/Source/Krypton Toolkit/Krypton.Toolkit.Suite.Extended.Resources/Krypton.Toolkit.Suite.Extended.Resources 2022.csproj
+++ b/Source/Krypton Toolkit/Krypton.Toolkit.Suite.Extended.Resources/Krypton.Toolkit.Suite.Extended.Resources 2022.csproj
@@ -82,7 +82,7 @@
-
+
diff --git a/Source/Krypton Toolkit/Krypton.Toolkit.Suite.Extended.Settings/Krypton.Toolkit.Suite.Extended.Settings 2022.csproj b/Source/Krypton Toolkit/Krypton.Toolkit.Suite.Extended.Settings/Krypton.Toolkit.Suite.Extended.Settings 2022.csproj
index 70c4ee735..71d00eee2 100644
--- a/Source/Krypton Toolkit/Krypton.Toolkit.Suite.Extended.Settings/Krypton.Toolkit.Suite.Extended.Settings 2022.csproj
+++ b/Source/Krypton Toolkit/Krypton.Toolkit.Suite.Extended.Settings/Krypton.Toolkit.Suite.Extended.Settings 2022.csproj
@@ -82,7 +82,7 @@
-
+
diff --git a/Source/Krypton Toolkit/Krypton.Toolkit.Suite.Extended.Shared/Krypton.Toolkit.Suite.Extended.Shared 2022.csproj b/Source/Krypton Toolkit/Krypton.Toolkit.Suite.Extended.Shared/Krypton.Toolkit.Suite.Extended.Shared 2022.csproj
index f5e8c4928..f7825531c 100644
--- a/Source/Krypton Toolkit/Krypton.Toolkit.Suite.Extended.Shared/Krypton.Toolkit.Suite.Extended.Shared 2022.csproj
+++ b/Source/Krypton Toolkit/Krypton.Toolkit.Suite.Extended.Shared/Krypton.Toolkit.Suite.Extended.Shared 2022.csproj
@@ -82,7 +82,7 @@
-
+
diff --git a/Source/Krypton Toolkit/Krypton.Toolkit.Suite.Extended.Theme.Switcher/UX/ThemeSelector.cs b/Source/Krypton Toolkit/Krypton.Toolkit.Suite.Extended.Theme.Switcher/UX/ThemeSelector.cs
index aac24380f..f4dde9978 100644
--- a/Source/Krypton Toolkit/Krypton.Toolkit.Suite.Extended.Theme.Switcher/UX/ThemeSelector.cs
+++ b/Source/Krypton Toolkit/Krypton.Toolkit.Suite.Extended.Theme.Switcher/UX/ThemeSelector.cs
@@ -189,13 +189,13 @@ private void InitializeComponent()
#endregion
#region Variables
- private SettingsManager _settingsManager = new SettingsManager();
+ private SettingsManager _settingsManager = new();
- ThemeManager _themeManager = new ThemeManager();
+ ThemeManager _themeManager = new();
private KryptonManager _manager;
- private KryptonPalette _palette;
+ private KryptonCustomPaletteBase _palette;
#endregion
#region Constructor
@@ -205,7 +205,7 @@ public ThemeSelector(KryptonManager? manager)
_manager = manager ?? new KryptonManager();
- _palette = new KryptonPalette();
+ _palette = new KryptonCustomPaletteBase();
ThemeManager.PropagateThemeList(kcmbSelectedTheme);
}
diff --git a/Source/Krypton Toolkit/Krypton.Toolkit.Suite.Extended.Theme.Switcher/UX/ThemeSelectorOld.cs b/Source/Krypton Toolkit/Krypton.Toolkit.Suite.Extended.Theme.Switcher/UX/ThemeSelectorOld.cs
index d9c380e57..c75273604 100644
--- a/Source/Krypton Toolkit/Krypton.Toolkit.Suite.Extended.Theme.Switcher/UX/ThemeSelectorOld.cs
+++ b/Source/Krypton Toolkit/Krypton.Toolkit.Suite.Extended.Theme.Switcher/UX/ThemeSelectorOld.cs
@@ -205,7 +205,7 @@ private void InitializeComponent()
private KryptonManager _manager;
- private KryptonPalette _palette;
+ private KryptonCustomPaletteBase _palette;
#endregion
#region Constructor
@@ -215,7 +215,7 @@ public ThemeSelectorOld(KryptonManager manager)
_manager = manager;
- _palette = new KryptonPalette();
+ _palette = new KryptonCustomPaletteBase();
ThemeManager.PropagateThemeList(kcmbPaletteMode);
}
@@ -273,7 +273,7 @@ private void kbtnResetTheme_Click(object sender, EventArgs e)
private void kbtnOptions_Click(object sender, EventArgs e)
{
- ThemeSwitcherOptions options = new ThemeSwitcherOptions(_manager, _palette);
+ ThemeSwitcherOptions options = new(_manager, _palette);
options.Show();
}
diff --git a/Source/Krypton Toolkit/Krypton.Toolkit.Suite.Extended.Theme.Switcher/UX/ThemeSwitcherOptions.cs b/Source/Krypton Toolkit/Krypton.Toolkit.Suite.Extended.Theme.Switcher/UX/ThemeSwitcherOptions.cs
index 956c148ea..0f945917d 100644
--- a/Source/Krypton Toolkit/Krypton.Toolkit.Suite.Extended.Theme.Switcher/UX/ThemeSwitcherOptions.cs
+++ b/Source/Krypton Toolkit/Krypton.Toolkit.Suite.Extended.Theme.Switcher/UX/ThemeSwitcherOptions.cs
@@ -456,29 +456,29 @@ private void InitializeComponent()
#region Variables
private bool _modified;
- private SettingsManager _settingsManager = new SettingsManager();
+ private SettingsManager _settingsManager = new();
- private ThemeManager _themeManager = new ThemeManager();
+ private ThemeManager _themeManager = new();
private KryptonManager _manager;
- private KryptonPalette _palette;
+ private KryptonCustomPaletteBase _palette;
#endregion
#region Properties
public KryptonManager KryptonManager { get => _manager; private set => _manager = value; }
- public KryptonPalette KryptonPalette { get => _palette; private set => _palette = value; }
+ public KryptonCustomPaletteBase KryptonPalette { get => _palette; private set => _palette = value; }
#endregion
#region Constructors
- public ThemeSwitcherOptions(KryptonManager? manager, KryptonPalette? palette)
+ public ThemeSwitcherOptions(KryptonManager? manager, KryptonCustomPaletteBase? palette)
{
InitializeComponent();
_manager = manager ?? new KryptonManager();
- _palette = palette ?? new KryptonPalette();
+ _palette = palette ?? new KryptonCustomPaletteBase();
PropagateThemeLists();
}
diff --git a/Source/Krypton Toolkit/Krypton.Toolkit.Suite.Extended.Theme.Switcher/UX/ThemeSwitcherOptionsOld.cs b/Source/Krypton Toolkit/Krypton.Toolkit.Suite.Extended.Theme.Switcher/UX/ThemeSwitcherOptionsOld.cs
index d71d14701..95ec30e65 100644
--- a/Source/Krypton Toolkit/Krypton.Toolkit.Suite.Extended.Theme.Switcher/UX/ThemeSwitcherOptionsOld.cs
+++ b/Source/Krypton Toolkit/Krypton.Toolkit.Suite.Extended.Theme.Switcher/UX/ThemeSwitcherOptionsOld.cs
@@ -292,26 +292,26 @@ private void InitializeComponent()
#endregion
#region Variables
- private SettingsManager _settingsManager = new SettingsManager();
+ private SettingsManager _settingsManager = new();
- private ThemeManager _themeManager = new ThemeManager();
+ private ThemeManager _themeManager = new();
private KryptonManager _manager = null;
- private KryptonPalette _palette = null;
+ private KryptonCustomPaletteBase _palette = null;
#endregion
#region Properties
public KryptonManager KryptonManager { get => _manager; private set => _manager = value; }
- public KryptonPalette KryptonPalette { get => _palette; private set => _palette = value; }
+ public KryptonCustomPaletteBase KryptonPalette { get => _palette; private set => _palette = value; }
#endregion
#region Constructor
/// Initializes a new instance of the class.
/// The manager.
/// The palette.
- public ThemeSwitcherOptionsOld(KryptonManager manager, KryptonPalette palette)
+ public ThemeSwitcherOptionsOld(KryptonManager manager, KryptonCustomPaletteBase palette)
{
InitializeComponent();
diff --git a/Source/Krypton Toolkit/Krypton.Toolkit.Suite.Extended.Toggle.Switch/Classes/Renderer/Types/Krypton/ToggleSwitchAndroidKryptonRenderer.cs b/Source/Krypton Toolkit/Krypton.Toolkit.Suite.Extended.Toggle.Switch/Classes/Renderer/Types/Krypton/ToggleSwitchAndroidKryptonRenderer.cs
index 448d003ab..72fa02ed0 100644
--- a/Source/Krypton Toolkit/Krypton.Toolkit.Suite.Extended.Toggle.Switch/Classes/Renderer/Types/Krypton/ToggleSwitchAndroidKryptonRenderer.cs
+++ b/Source/Krypton Toolkit/Krypton.Toolkit.Suite.Extended.Toggle.Switch/Classes/Renderer/Types/Krypton/ToggleSwitchAndroidKryptonRenderer.cs
@@ -32,7 +32,7 @@ namespace Krypton.Toolkit.Suite.Extended.Toggle.Switch
public class ToggleSwitchAndroidKryptonRenderer : ToggleSwitchRendererBase, IAndroidValues
{
#region Variables
- private IPalette _palette;
+ private PaletteBase _palette;
private PaletteRedirect _paletteRedirect;
#endregion
diff --git a/Source/Krypton Toolkit/Krypton.Toolkit.Suite.Extended.Toggle.Switch/Classes/Renderer/Types/Vanilla/ToggleSwitchAndroidRenderer.cs b/Source/Krypton Toolkit/Krypton.Toolkit.Suite.Extended.Toggle.Switch/Classes/Renderer/Types/Vanilla/ToggleSwitchAndroidRenderer.cs
index 7fe5c89fa..f65cafc3a 100644
--- a/Source/Krypton Toolkit/Krypton.Toolkit.Suite.Extended.Toggle.Switch/Classes/Renderer/Types/Vanilla/ToggleSwitchAndroidRenderer.cs
+++ b/Source/Krypton Toolkit/Krypton.Toolkit.Suite.Extended.Toggle.Switch/Classes/Renderer/Types/Vanilla/ToggleSwitchAndroidRenderer.cs
@@ -32,7 +32,7 @@ namespace Krypton.Toolkit.Suite.Extended.Toggle.Switch
public class ToggleSwitchAndroidRenderer : ToggleSwitchRendererBase, IAndroidValues
{
#region Variables
- private IPalette _palette;
+ private PaletteBase _palette;
private PaletteRedirect _paletteRedirect;
#endregion
diff --git a/Source/Krypton Toolkit/Krypton.Toolkit.Suite.Extended.Tool.Box/Classes/ToolBoxTab.cs b/Source/Krypton Toolkit/Krypton.Toolkit.Suite.Extended.Tool.Box/Classes/ToolBoxTab.cs
index 4362d3ab9..4b75b003b 100644
--- a/Source/Krypton Toolkit/Krypton.Toolkit.Suite.Extended.Tool.Box/Classes/ToolBoxTab.cs
+++ b/Source/Krypton Toolkit/Krypton.Toolkit.Suite.Extended.Tool.Box/Classes/ToolBoxTab.cs
@@ -69,7 +69,7 @@ public class ToolBoxTab : ToolBoxItem
private PaletteContentInheritRedirect _paletteContent;
- private IPalette _palette;
+ private PaletteBase _palette;
private PaletteRedirect _paletteRedirect;
#endregion
diff --git a/Source/Krypton Toolkit/Krypton.Toolkit.Suite.Extended.Tool.Box/Controls Toolkit/KryptonToolBox.cs b/Source/Krypton Toolkit/Krypton.Toolkit.Suite.Extended.Tool.Box/Controls Toolkit/KryptonToolBox.cs
index 998fc0a96..fa24691ae 100644
--- a/Source/Krypton Toolkit/Krypton.Toolkit.Suite.Extended.Tool.Box/Controls Toolkit/KryptonToolBox.cs
+++ b/Source/Krypton Toolkit/Krypton.Toolkit.Suite.Extended.Tool.Box/Controls Toolkit/KryptonToolBox.cs
@@ -263,7 +263,7 @@ public static void DrawBorders(Graphics g, Rectangle rect, bool bDepressed, Colo
private LayoutFinished _layoutFinished = null;
#region Krypton Variables
- private KryptonManager _manager = new KryptonManager();
+ private KryptonManager _manager = new();
private PaletteBackInheritRedirect _paletteBack;
@@ -271,7 +271,7 @@ public static void DrawBorders(Graphics g, Rectangle rect, bool bDepressed, Colo
private PaletteContentInheritRedirect _paletteContent;
- private IPalette _palette;
+ private PaletteBase _palette;
private PaletteRedirect _paletteRedirect;
#endregion
diff --git a/Source/Krypton Toolkit/Krypton.Toolkit.Suite.Extended.Tool.Strip.Items/Controls/General/KryptonEnhancedToolStripProgressBar.cs b/Source/Krypton Toolkit/Krypton.Toolkit.Suite.Extended.Tool.Strip.Items/Controls/General/KryptonEnhancedToolStripProgressBar.cs
index c1c5a54bf..9d17997d1 100644
--- a/Source/Krypton Toolkit/Krypton.Toolkit.Suite.Extended.Tool.Strip.Items/Controls/General/KryptonEnhancedToolStripProgressBar.cs
+++ b/Source/Krypton Toolkit/Krypton.Toolkit.Suite.Extended.Tool.Strip.Items/Controls/General/KryptonEnhancedToolStripProgressBar.cs
@@ -39,7 +39,7 @@ public class KryptonEnhancedToolStripProgressBar : ToolStripProgressBar
private Color _displayTextColour;
- private IPalette _palette;
+ private PaletteBase _palette;
#endregion
#region Properties
diff --git a/Source/Krypton Toolkit/Krypton.Toolkit.Suite.Extended.Tool.Strip.Items/Controls/General/ToolStripLabelExtended.cs b/Source/Krypton Toolkit/Krypton.Toolkit.Suite.Extended.Tool.Strip.Items/Controls/General/ToolStripLabelExtended.cs
index 4a061fe34..63f1e1012 100644
--- a/Source/Krypton Toolkit/Krypton.Toolkit.Suite.Extended.Tool.Strip.Items/Controls/General/ToolStripLabelExtended.cs
+++ b/Source/Krypton Toolkit/Krypton.Toolkit.Suite.Extended.Tool.Strip.Items/Controls/General/ToolStripLabelExtended.cs
@@ -34,12 +34,12 @@ public class ToolStripLabelExtended : ToolStripStatusLabel
#region Krypton
- private IPalette _palette;
+ private PaletteBase _palette;
private IRenderer _renderer;
// This may not be needed, but oh well...
- private KryptonPalette _kryptonPalette;
+ private KryptonCustomPaletteBase _kryptonPalette;
#endregion
private bool _alert, _enableBlinking, _bkClr, _fadeText;
diff --git a/Source/Krypton Toolkit/Krypton.Toolkit.Suite.Extended.Tool.Strip.Items/Controls/General/ToolStripProgressBarWithValueText.cs b/Source/Krypton Toolkit/Krypton.Toolkit.Suite.Extended.Tool.Strip.Items/Controls/General/ToolStripProgressBarWithValueText.cs
index 9f5b40770..9df4a8e2a 100644
--- a/Source/Krypton Toolkit/Krypton.Toolkit.Suite.Extended.Tool.Strip.Items/Controls/General/ToolStripProgressBarWithValueText.cs
+++ b/Source/Krypton Toolkit/Krypton.Toolkit.Suite.Extended.Tool.Strip.Items/Controls/General/ToolStripProgressBarWithValueText.cs
@@ -37,7 +37,7 @@ public class ToolStripProgressBarWithValueText : ToolStripProgressBar
private Color _displayTextColour;
// ReSharper disable PrivateFieldCanBeConvertedToLocalVariable
- private readonly IPalette _palette;
+ private readonly PaletteBase _palette;
// ReSharper restore PrivateFieldCanBeConvertedToLocalVariable
#endregion
@@ -52,7 +52,7 @@ public class ToolStripProgressBarWithValueText : ToolStripProgressBar
#region Identity
- public ToolStripProgressBarWithValueText(IPalette palette)
+ public ToolStripProgressBarWithValueText(PaletteBase palette)
{
_palette = palette;
_displayTextColour = _palette.ColorTable.StatusStripText;
diff --git a/Source/Krypton Toolkit/Krypton.Toolkit.Suite.Extended.Tool.Strip.Items/Controls/Internal/KryptonSliderButton.cs b/Source/Krypton Toolkit/Krypton.Toolkit.Suite.Extended.Tool.Strip.Items/Controls/Internal/KryptonSliderButton.cs
index ff7f8853b..1cfa8f995 100644
--- a/Source/Krypton Toolkit/Krypton.Toolkit.Suite.Extended.Tool.Strip.Items/Controls/Internal/KryptonSliderButton.cs
+++ b/Source/Krypton Toolkit/Krypton.Toolkit.Suite.Extended.Tool.Strip.Items/Controls/Internal/KryptonSliderButton.cs
@@ -123,7 +123,7 @@ public KryptonSliderButton()
private IDisposable m_mementoBack1;
private IDisposable m_mementoBack2;
- private IPalette _palette;
+ private PaletteBase _palette;
private PaletteRedirect _paletteRedirect;
//Colors
diff --git a/Source/Krypton Toolkit/Krypton.Toolkit.Suite.Extended.Tool.Strip.Items/Controls/Internal/KryptonToolbarSlider.cs b/Source/Krypton Toolkit/Krypton.Toolkit.Suite.Extended.Tool.Strip.Items/Controls/Internal/KryptonToolbarSlider.cs
index 031ba380f..a099ee20d 100644
--- a/Source/Krypton Toolkit/Krypton.Toolkit.Suite.Extended.Tool.Strip.Items/Controls/Internal/KryptonToolbarSlider.cs
+++ b/Source/Krypton Toolkit/Krypton.Toolkit.Suite.Extended.Tool.Strip.Items/Controls/Internal/KryptonToolbarSlider.cs
@@ -150,7 +150,7 @@ public KryptonToolbarSlider()
private Color m_sliderlinebottom = Color.FromArgb(222, 226, 236);
//Krypton
- private IPalette _palette;
+ private PaletteBase _palette;
private PaletteRedirect _paletteRedirect;
private PaletteBackInheritRedirect m_paletteBack;
diff --git a/Source/Krypton Toolkit/Krypton.Toolkit.Suite.Extended.Tools/Classes/General/MissingFrameWorkAPIs.cs b/Source/Krypton Toolkit/Krypton.Toolkit.Suite.Extended.Tools/Classes/General/MissingFrameWorkAPIs.cs
index e42668b82..aaf1e0035 100644
--- a/Source/Krypton Toolkit/Krypton.Toolkit.Suite.Extended.Tools/Classes/General/MissingFrameWorkAPIs.cs
+++ b/Source/Krypton Toolkit/Krypton.Toolkit.Suite.Extended.Tools/Classes/General/MissingFrameWorkAPIs.cs
@@ -28,6 +28,7 @@
namespace Krypton.Toolkit.Suite.Extended.Tools
{
+ [Obsolete("Use 'string.IsNullOrWhiteSpace(string value)' instead")]
public static class MissingFrameWorkAPIs
{
///
diff --git a/Source/Krypton Toolkit/Krypton.Toolkit.Suite.Extended.Tools/Krypton.Toolkit.Suite.Extended.Tools 2022.csproj b/Source/Krypton Toolkit/Krypton.Toolkit.Suite.Extended.Tools/Krypton.Toolkit.Suite.Extended.Tools 2022.csproj
index 38b7fc4bb..00e60d413 100644
--- a/Source/Krypton Toolkit/Krypton.Toolkit.Suite.Extended.Tools/Krypton.Toolkit.Suite.Extended.Tools 2022.csproj
+++ b/Source/Krypton Toolkit/Krypton.Toolkit.Suite.Extended.Tools/Krypton.Toolkit.Suite.Extended.Tools 2022.csproj
@@ -82,7 +82,7 @@
-
+
diff --git a/Source/Krypton Toolkit/Krypton.Toolkit.Suite.Extended.Utilities/Krypton.Toolkit.Suite.Extended.Utilities 2022.csproj b/Source/Krypton Toolkit/Krypton.Toolkit.Suite.Extended.Utilities/Krypton.Toolkit.Suite.Extended.Utilities 2022.csproj
index a4ffad502..82a596947 100644
--- a/Source/Krypton Toolkit/Krypton.Toolkit.Suite.Extended.Utilities/Krypton.Toolkit.Suite.Extended.Utilities 2022.csproj
+++ b/Source/Krypton Toolkit/Krypton.Toolkit.Suite.Extended.Utilities/Krypton.Toolkit.Suite.Extended.Utilities 2022.csproj
@@ -82,7 +82,7 @@
-
+