Merge pull request 'Development' (#450 ) from Development into master

Merging all development items into master after successful testing.
Merge pull request 'B2024-077 When searching Referenced Objects Reports, pick the RO and select a procedure set and the selection panel refreshes and you lose your selection. If the set has to be selected first then it should be at the top of the report panel.' (#449 ) from B2024-077 into Development
2024-10-31 09:11:59 -04:00 · 2024-10-29 16:13:51 -04:00 · 2024-10-29 15:46:12 -04:00 · 2024-10-29 09:54:06 -04:00 · 2024-10-29 09:41:02 -04:00 · 2024-10-29 09:40:00 -04:00
370 changed files with 10713 additions and 5868 deletions
@@ -241,6 +241,21 @@ namespace JR.Utils.GUI.Forms
            return FlexibleMessageBoxForm.Show(owner, text, caption, buttons, icon, defaultButton);
        }

+        /// <summary>
+        /// Shows the specified message box.
+        /// </summary>
+        /// <param name="owner">The owner.</param>
+        /// <param name="text">The text.</param>
+        /// <param name="caption">The caption.</param>
+        /// <param name="buttons">The buttons.</param>
+        /// <param name="icon">The icon.</param>
+        /// <param name="defaultButton">The default button.</param>
+        /// <returns>The dialog result.</returns>
+        public static DialogResult ShowCustom(IWin32Window owner, string text, string caption, MessageBoxButtons buttons, MessageBoxIcon icon)
+        {
+            return FlexibleMessageBoxForm.ShowCustom(null, text, caption, buttons, icon);
+        }
+
        #endregion

        #region Internal form class
@@ -420,15 +435,15 @@ namespace JR.Utils.GUI.Forms
            private static readonly String STANDARD_MESSAGEBOX_SEPARATOR_SPACES = "   ";

            //These are the possible buttons (in a standard MessageBox)
-            private enum ButtonID { OK = 0, CANCEL, YES, NO, ABORT, RETRY, IGNORE };
-            
+            private enum ButtonID { OK = 0, CANCEL, YES, NO, ABORT, RETRY, IGNORE, OVERWRITE, RENAME };
+
            //These are the buttons texts for different languages. 
            //If you want to add a new language, add it here and in the GetButtonText-Function
            private enum TwoLetterISOLanguageID { en, de, es, it };
-            private static readonly String[] BUTTON_TEXTS_ENGLISH_EN = { "OK", "Cancel", "&Yes", "&No", "&Abort", "&Retry", "&Ignore" }; //Note: This is also the fallback language
-            private static readonly String[] BUTTON_TEXTS_GERMAN_DE = { "OK", "Abbrechen", "&Ja", "&Nein", "&Abbrechen", "&Wiederholen", "&Ignorieren" };
-            private static readonly String[] BUTTON_TEXTS_SPANISH_ES = { "Aceptar", "Cancelar", "&Sí", "&No", "&Abortar", "&Reintentar", "&Ignorar" };
-            private static readonly String[] BUTTON_TEXTS_ITALIAN_IT = { "OK", "Annulla", "&Sì", "&No", "&Interrompi", "&Riprova", "&Ignora" };
+            private static readonly String[] BUTTON_TEXTS_ENGLISH_EN = { "OK", "Cancel", "&Yes", "&No", "&Abort", "&Retry", "&Ignore", "&Overwrite", "&Rename" }; //Note: This is also the fallback language
+            private static readonly String[] BUTTON_TEXTS_GERMAN_DE = { "OK", "Abbrechen", "&Ja", "&Nein", "&Abbrechen", "&Wiederholen", "&Ignorieren", "&Overwrite", "&Rename" };
+            private static readonly String[] BUTTON_TEXTS_SPANISH_ES = { "Aceptar", "Cancelar", "&Sí", "&No", "&Abortar", "&Reintentar", "&Ignorar", "&Overwrite", "&Rename" };
+            private static readonly String[] BUTTON_TEXTS_ITALIAN_IT = { "OK", "Annulla", "&Sì", "&No", "&Interrompi", "&Riprova", "&Ignora", "&Overwrite", "&Rename" };

            #endregion

@@ -693,6 +708,7 @@ namespace JR.Utils.GUI.Forms

                        flexibleMessageBoxForm.CancelButton = flexibleMessageBoxForm.button3;
                        break;
+             

                    case MessageBoxButtons.OK:
                    default:
@@ -709,16 +725,38 @@ namespace JR.Utils.GUI.Forms
                flexibleMessageBoxForm.defaultButton = defaultButton;
            }

-            #endregion
+            private static void SetDialogButtonsCustom(FlexibleMessageBoxForm flexibleMessageBoxForm)
+            {
+                flexibleMessageBoxForm.visibleButtonsCount = 3;

-            #region Private event handlers
+                flexibleMessageBoxForm.button1.Visible = true;
+                flexibleMessageBoxForm.button1.Text = flexibleMessageBoxForm.GetButtonText(ButtonID.CANCEL);
+                flexibleMessageBoxForm.button1.DialogResult = DialogResult.Abort;

-            /// <summary>
-            /// Handles the Shown event of the FlexibleMessageBoxForm control.
-            /// </summary>
-            /// <param name="sender">The source of the event.</param>
-            /// <param name="e">The <see cref="System.EventArgs"/> instance containing the event data.</param>
-            private void FlexibleMessageBoxForm_Shown(object sender, EventArgs e)
+                flexibleMessageBoxForm.button2.Visible = true;
+                flexibleMessageBoxForm.button2.Text = flexibleMessageBoxForm.GetButtonText(ButtonID.OVERWRITE);
+                flexibleMessageBoxForm.button2.DialogResult = DialogResult.Retry;
+
+                flexibleMessageBoxForm.button3.Visible = true;
+                flexibleMessageBoxForm.button3.Text = flexibleMessageBoxForm.GetButtonText(ButtonID.RENAME);
+                flexibleMessageBoxForm.button3.DialogResult = DialogResult.Ignore;
+
+                flexibleMessageBoxForm.ControlBox = false;
+            }
+
+
+
+
+                #endregion
+
+                #region Private event handlers
+
+                /// <summary>
+                /// Handles the Shown event of the FlexibleMessageBoxForm control.
+                /// </summary>
+                /// <param name="sender">The source of the event.</param>
+                /// <param name="e">The <see cref="System.EventArgs"/> instance containing the event data.</param>
+                private void FlexibleMessageBoxForm_Shown(object sender, EventArgs e)
            {
                int buttonIndexToFocus = 1;
                Button buttonToFocus;
@@ -866,6 +904,46 @@ namespace JR.Utils.GUI.Forms
                return flexibleMessageBoxForm.ShowDialog(owner);
            }

+            /// <summary>
+            /// Shows the specified message box.
+            /// </summary>
+            /// <param name="owner">The owner.</param>
+            /// <param name="text">The text.</param>
+            /// <param name="caption">The caption.</param>
+            /// <param name="buttons">The buttons.</param>
+            /// <param name="icon">The icon.</param>
+            /// <param name="defaultButton">The default button.</param>
+            /// <returns>The dialog result.</returns>
+            public static DialogResult ShowCustom(IWin32Window owner, string text, string caption, MessageBoxButtons buttons, MessageBoxIcon icon)
+            {
+                //Create a new instance of the FlexibleMessageBox form
+                var flexibleMessageBoxForm = new FlexibleMessageBoxForm();
+                flexibleMessageBoxForm.ShowInTaskbar = false;
+
+                //Bind the caption and the message text
+                flexibleMessageBoxForm.CaptionText = caption;
+                flexibleMessageBoxForm.MessageText = text;
+                flexibleMessageBoxForm.FlexibleMessageBoxFormBindingSource.DataSource = flexibleMessageBoxForm;
+
+                //Set the buttons visibilities and texts. Also set a default button.
+                SetDialogButtonsCustom(flexibleMessageBoxForm);
+
+                //Set the dialogs icon. When no icon is used: Correct placement and width of rich text box.
+                SetDialogIcon(flexibleMessageBoxForm, icon);
+
+                //Set the font for all controls
+                flexibleMessageBoxForm.Font = FONT;
+                flexibleMessageBoxForm.richTextBoxMessage.Font = FONT;
+
+                //Calculate the dialogs start size (Try to auto-size width to show longest text row). Also set the maximum dialog size. 
+                SetDialogSizes(flexibleMessageBoxForm, text, caption);
+
+				//Set the dialogs start position when given. Otherwise center the dialog on the current screen.
+				SetDialogStartPosition(flexibleMessageBoxForm, owner);
+				//Show the dialog
+				return flexibleMessageBoxForm.ShowDialog(owner);
+			}
+
            #endregion
        } //class FlexibleMessageBoxForm

@@ -126,6 +126,7 @@
    <Content Include="fmtall\BVPSAOPall.xml" />
    <Content Include="fmtall\BVPSAtchall.xml" />
    <Content Include="fmtall\BVPSBCKall.xml" />
+    <Content Include="fmtall\BVPSAOPDEVall.xml" />
    <Content Include="fmtall\BVPSFlexDEVall.xml" />
    <Content Include="fmtall\BVPSDEVall.xml" />
    <Content Include="fmtall\BVPSNIBCKall.xml" />
@@ -406,6 +407,7 @@
    <Content Include="genmacall\BVPSAOP.svg" />
    <Content Include="genmacall\BVPSAtch.svg" />
    <Content Include="genmacall\BVPSbck.svg" />
+    <Content Include="genmacall\BVPSAOPdev.svg" />
    <Content Include="genmacall\BVPSFlexdev.svg" />
    <Content Include="genmacall\BVPSdev.svg" />
    <Content Include="genmacall\BVPSNIBCK.svg" />
--- a/Show More
+++ b/Show More