Disabling all buttons (except Abort) when execution. Resolves #1081

rappen · rappen · commit 3f9a3916764c · 2025-02-27T20:25:12.000+01:00
diff --git a/FetchXmlBuilder/FXBGui.cs b/FetchXmlBuilder/FXBGui.cs
@@ -55,18 +55,26 @@ internal void EnableControls()
 
         /// <summary>Enables or disables all buttons on the form</summary>
         /// <param name="enabled"></param>
-        internal void EnableControls(bool enabled)
+        internal void EnableControls(bool enabled, bool toolstripmenuenabled = false)
         {
             MethodInvoker mi = delegate
             {
                 try
                 {
                     // Menus
-                    toolStripMain.Enabled = enabled;
+                    toolStripMain.Enabled = enabled || toolstripmenuenabled;
 
                     // Main menu items
+                    tsbNew.Enabled = enabled;
+                    tsbOpen.Enabled = enabled;
+                    tsbSave.Enabled = enabled;
+                    tsbRepo.Enabled = enabled;
                     tsbExecute.Enabled = enabled && Service != null;
                     tsbAbort.Visible = settings.ExecuteOptions.AllPages;
+                    tsbSend.Enabled = enabled;
+                    tsbConvert.Enabled = enabled;
+                    tsbView.Enabled = enabled;
+                    tsbOptions.Enabled = enabled;
 
                     // Sub menu Open items
                     tsmiOpenView.Enabled = enabled && Service != null;
diff --git a/FetchXmlBuilder/FXBQueries.cs b/FetchXmlBuilder/FXBQueries.cs
@@ -284,7 +284,7 @@ private void RetrieveMultiple(string fetch)
         {
             working = true;
             SendMessageToStatusBar(this, new StatusBarMessageEventArgs("Retrieving..."));
-            tsbExecute.Enabled = false;
+            EnableControls(false, true);
             tsbAbort.Enabled = true;
             dockControlGrid?.SetQueryChanged(true);
             WorkAsync(new WorkAsyncInfo
@@ -330,7 +330,7 @@ private void RetrieveMultiple(string fetch)
                 {
                     working = false;
                     tsbAbort.Enabled = false;
-                    tsbExecute.Enabled = true;
+                    EnableControls(true);
                     Enabled = true;
                     Cursor = Cursors.Default;
                     SendMessageToStatusBar(this, new StatusBarMessageEventArgs(""));
