diff --git a/Documents/Help/Changelog.md b/Documents/Help/Changelog.md index 39d6cd24c..7b7c789c0 100644 --- a/Documents/Help/Changelog.md +++ b/Documents/Help/Changelog.md @@ -5,7 +5,10 @@ ======= ## 2022-11-xx - Build 2211 - November 2022 +* Implemented [#728](https://github.com/Krypton-Suite/Standard-Toolkit/issues/728), Bring MessageBox `States` inline with latest .Net 6 * Made enumeration `SchemeOfficeColors` public, so they can be used to make external themes +* Resolved [#722](https://github.com/Krypton-Suite/Standard-Toolkit/issues/722), KryptonRichTextBox disabled colour cannot be set +* Resolved [#662](https://github.com/Krypton-Suite/Standard-Toolkit/issues/662), Can not "Control / Set Disabled" Background Colour Of Comboboxes, in DropDown mode * Resolved [#737](https://github.com/Krypton-Suite/Standard-Toolkit/issues/737), `Office 2013 - Dark Grey` for `PaletteMode` in designer causes a crash * Resolved [#578](https://github.com/Krypton-Suite/Standard-Toolkit/issues/578), ComboBox Center no longer draws text centered * Resolved [#20](https://github.com/Krypton-Suite/Standard-Toolkit/issues/20), Selected text in ComboBox is drawn in a different font @@ -29,8 +32,6 @@ * Blue dark mode themes now have a darker alternate colour * Added new `GetPaletteModeManager()` method to the `ThemeManager` API, to return the current `PaletteModeManager` of the selected `KryptonManager` * Update documentation for `PaletteMode` and `PaletteModeManager` -* Resolved [#722](https://github.com/Krypton-Suite/Standard-Toolkit/issues/722), KryptonRichTextBox disabled colour cannot be set -* Resolved [#662](https://github.com/Krypton-Suite/Standard-Toolkit/issues/662), Can not "Control / Set Disabled" Background Colour Of Comboboxes, in DropDown mode * Resolved [#701](https://github.com/Krypton-Suite/Standard-Toolkit/issues/701), `CueHint` in `KryptonPalette` does not work * Resolved [#697](https://github.com/Krypton-Suite/Standard-Toolkit/issues/697), Number 9 is handled in ribbon textbox/richtextbox. * Resolved [#693](https://github.com/Krypton-Suite/Standard-Toolkit/issues/693), Docked controls are rendered with smaller size which hides the caption/title text. diff --git a/Source/Krypton Components/Krypton.Toolkit/Controls Visuals/KryptonMessageBoxForm.cs b/Source/Krypton Components/Krypton.Toolkit/Controls Visuals/KryptonMessageBoxForm.cs index f5bf20b74..b521bc903 100644 --- a/Source/Krypton Components/Krypton.Toolkit/Controls Visuals/KryptonMessageBoxForm.cs +++ b/Source/Krypton Components/Krypton.Toolkit/Controls Visuals/KryptonMessageBoxForm.cs @@ -319,6 +319,22 @@ private void UpdateButtons() _button3.Enabled = true; ControlBox = false; break; +#if NET6_0_OR_GREATER + case MessageBoxButtons.CancelTryContinue: + _button1.Text = KryptonManager.Strings.Cancel; + _button2.Text = KryptonManager.Strings.TryAgain; + _button3.Text = KryptonManager.Strings.Continue; + _button1.DialogResult = DialogResult.Cancel; + _button2.DialogResult = DialogResult.TryAgain; + _button3.DialogResult = DialogResult.Continue; + _button1.Visible = true; + _button1.Enabled = true; + _button2.Visible = true; + _button2.Enabled = true; + _button3.Visible = true; + _button3.Enabled = true; + break; +#endif } // Do we ignore the Alt+F4 on the buttons? diff --git a/Source/Krypton Components/Krypton.Toolkit/Controls Visuals/VisualForm.cs b/Source/Krypton Components/Krypton.Toolkit/Controls Visuals/VisualForm.cs index 9e4e50344..55ce84318 100644 --- a/Source/Krypton Components/Krypton.Toolkit/Controls Visuals/VisualForm.cs +++ b/Source/Krypton Components/Krypton.Toolkit/Controls Visuals/VisualForm.cs @@ -619,7 +619,25 @@ public void RecalcNonClient() PI.SWP_.NOOWNERZORDER | PI.SWP_.FRAMECHANGED); } } - #endregion + +#if NET6_0_OR_GREATER + /// Gets or sets the anchoring for minimized MDI children. + /// true to anchor minimized MDI children to the bottom left of the parent form; false to anchor to the top left of the parent form. + [Category(@"Window Style")] + [Description(@"Gets or sets the anchoring for minimized MDI children.")] + [DefaultValue(true)] + public new bool MdiChildrenMinimizedAnchorBottom + { + get => base.MdiChildrenMinimizedAnchorBottom; + + set + { + base.MdiChildrenMinimizedAnchorBottom = value; + throw new NotSupportedException(@"Please use .NET 6 or newer to use this feature."); + } + } +#endif +#endregion #region Public Chrome /// diff --git a/Source/Krypton Components/Krypton.Toolkit/General/GlobalStrings.cs b/Source/Krypton Components/Krypton.Toolkit/General/GlobalStrings.cs index f21f5f4e4..a0ac01220 100644 --- a/Source/Krypton Components/Krypton.Toolkit/General/GlobalStrings.cs +++ b/Source/Krypton Components/Krypton.Toolkit/General/GlobalStrings.cs @@ -33,6 +33,10 @@ public class GlobalStrings : GlobalId private const string DEFAULT_CLOSE = "Cl&ose"; private const string DEFAULT_TODAY = "T&oday"; private const string DEFAULT_HELP = "H&elp"; + + // NET 6 & newer + private const string DEFAULT_CONTINUE = "Co&ntinue"; + private const string DEFAULT_TRY_AGAIN = "&Try Again"; #endregion #region Instance Fields @@ -57,6 +61,7 @@ public GlobalStrings() #endregion #region Public + /// /// Gets a value indicating if all the strings are default values. /// @@ -71,7 +76,9 @@ public GlobalStrings() Ignore.Equals(DEFAULT_IGNORE) && Close.Equals(DEFAULT_CLOSE) && Today.Equals(DEFAULT_TODAY) && - Help.Equals(DEFAULT_HELP); + Help.Equals(DEFAULT_HELP) && + Continue.Equals(DEFAULT_CONTINUE) && + TryAgain.Equals(DEFAULT_TRY_AGAIN); /// /// Reset all strings to default values. @@ -88,6 +95,10 @@ public void Reset() Close = DEFAULT_CLOSE; Today = DEFAULT_TODAY; Help = DEFAULT_HELP; + + // NET 6 & newer + Continue = DEFAULT_CONTINUE; + TryAgain = DEFAULT_TRY_AGAIN; } /// @@ -190,6 +201,24 @@ public void Reset() [DefaultValue(DEFAULT_HELP)] [RefreshProperties(RefreshProperties.All)] public string Help { get; set; } - #endregion + + /// + /// Gets and sets the Continue string used in calendars. + /// + [Localizable(true)] + [Category(@"Visuals")] + [Description(@"Continue string used for Message Box Buttons.")] + [DefaultValue(DEFAULT_CONTINUE)] + public string Continue { get; set; } + + /// + /// Gets and sets the Try Again string used in calendars. + /// + [Localizable(true)] + [Category(@"Visuals")] + [Description(@"Try Again string used for Message Box Buttons.")] + [DefaultValue(DEFAULT_TRY_AGAIN)] + public string TryAgain { get; set; } +#endregion } }