Merge pull request #1199 from Krypton-Suite/alpha-dialogs

* Some cleanup + #1166
Krypton-Suite · Dec 1, 2023 · 21af67c · 21af67c
2 parents 8c92764 + 91012c3
commit 21af67c
Show file tree

Hide file tree

Showing 38 changed files with 1,933 additions and 1,511 deletions.
diff --git a/Documents/Help/Changelog.md b/Documents/Help/Changelog.md
@@ -7,6 +7,7 @@
 * Resolved [#1189](https://github.com/Krypton-Suite/Standard-Toolkit/issues/1189), The Context and Next/Pervious buttons of the `KryptonDockableNavigator` cannot be used
 * Resolved [#1176](https://github.com/Krypton-Suite/Standard-Toolkit/issues/1176), KryptonProgressBar: small values escape drawing area
 * Resolved [#1169](https://github.com/Krypton-Suite/Standard-Toolkit/issues/1169), Button Spec Krypton Context Menu (Canary)
+* Implemented [#1166](https://github.com/Krypton-Suite/Standard-Toolkit/issues/1166), Use a struct to contain `KryptonMessageBox` data
 * Implemented [#1161](https://github.com/Krypton-Suite/Standard-Toolkit/issues/1161), A proper about box
 * New adjusting the size of a `KryptonComboBox` also changes the `DropDownWidth`
     - Note: The `DropDownWidth` can still be set independently from the `Size` property

diff --git a/Source/Krypton Components/Krypton.Toolkit/Controls Toolkit/KryptonAboutBox.cs b/Source/Krypton Components/Krypton.Toolkit/Controls Toolkit/KryptonAboutBox.cs
@@ -9,23 +9,23 @@
 
 namespace Krypton.Toolkit
 {
-    /// <summary>The public interface to the <see cref="VisualKryptonAboutBoxForm"/> class.</summary>
+    /// <summary>The public interface to the <see cref="VisualAboutBoxForm"/> class.</summary>
     [ToolboxItem(false)]
     [DesignerCategory(@"code")]
     public static class KryptonAboutBox
     {
         #region Implementation
 
-        /// <summary>Shows a new <see cref="VisualKryptonAboutBoxForm"/>.</summary>
+        /// <summary>Shows a new <see cref="VisualAboutBoxForm"/>.</summary>
         /// <param name="aboutBoxData">The data to pass through.</param>
-        /// <returns>A new <see cref="VisualKryptonAboutBoxForm"/> with the specified data.</returns>
+        /// <returns>A new <see cref="VisualAboutBoxForm"/> with the specified data.</returns>
         public static DialogResult Show(KryptonAboutBoxData aboutBoxData)
             => ShowCore(aboutBoxData);
 
-        /// <summary>Shows a new <see cref="VisualKryptonAboutBoxForm"/></summary>
+        /// <summary>Shows a new <see cref="VisualAboutBoxForm"/></summary>
         /// <param name="aboutBoxData">The about box data.</param>
         /// <param name="aboutToolkitData">The about toolkit data.</param>
-        /// <returns>A new <see cref="VisualKryptonAboutBoxForm"/> with the specified data.</returns>
+        /// <returns>A new <see cref="VisualAboutBoxForm"/> with the specified data.</returns>
         public static DialogResult Show(KryptonAboutBoxData aboutBoxData, KryptonAboutToolkitData aboutToolkitData) =>
             ShowCore(aboutBoxData, aboutToolkitData);
 
@@ -35,14 +35,14 @@ public static DialogResult Show(KryptonAboutBoxData aboutBoxData, KryptonAboutTo
 
         private static DialogResult ShowCore(KryptonAboutBoxData aboutBoxData)
         {
-            using var kab = new VisualKryptonAboutBoxForm(aboutBoxData);
+            using var kab = new VisualAboutBoxForm(aboutBoxData);
 
             return kab.ShowDialog();
         }
 
         private static DialogResult ShowCore(KryptonAboutBoxData aboutBoxData, KryptonAboutToolkitData aboutToolkitData)
         {
-            using var kab = new VisualKryptonAboutBoxForm(aboutBoxData, aboutToolkitData);
+            using var kab = new VisualAboutBoxForm(aboutBoxData, aboutToolkitData);
 
             return kab.ShowDialog();
         }

diff --git a/Source/Krypton Components/Krypton.Toolkit/Controls Toolkit/KryptonAboutToolkit.cs b/Source/Krypton Components/Krypton.Toolkit/Controls Toolkit/KryptonAboutToolkit.cs
diff --git a/Source/Krypton Components/Krypton.Toolkit/Controls Toolkit/KryptonButton.cs b/Source/Krypton Components/Krypton.Toolkit/Controls Toolkit/KryptonButton.cs
@@ -698,7 +698,7 @@ protected override void OnClick(EventArgs e)
                 catch (InvalidEnumArgumentException)
                 {
                     // Is it https://github.com/Krypton-Suite/Standard-Toolkit/issues/728
-                    if (owner is VisualKryptonMessageBoxForm)
+                    if (owner is VisualMessageBoxForm)
                     {
                         // need to gain access to `dialogResult` and set it forcefully
                         FieldInfo? fi = typeof(Form).GetField("dialogResult", BindingFlags.NonPublic | BindingFlags.Instance);

diff --git a/Source/Krypton Components/Krypton.Toolkit/Controls Toolkit/KryptonInputBox.cs b/Source/Krypton Components/Krypton.Toolkit/Controls Toolkit/KryptonInputBox.cs
@@ -62,7 +62,7 @@ private static string InternalShow(IWin32Window? owner,
             Color cueColour,
             Font? cueTypeface,
             bool usePasswordOption) =>
-            VisualKryptonInputBoxForm.InternalShow(owner, prompt, caption, defaultResponse, cueText, cueColour,
+            VisualInputBoxForm.InternalShow(owner, prompt, caption, defaultResponse, cueText, cueColour,
                 cueTypeface, usePasswordOption);
 
         #endregion