Changeset 17064

Timestamp:

07/04/19 14:49:00 (5 years ago)

Author:

mkommend

Message:

#2845: Merged 16447, 16511, 16512 into stable.

Location:

stable

Files:

• . (modified) (1 prop)
• HeuristicLab.Clients.Hive.JobManager (modified) (1 prop)
• HeuristicLab.Clients.Hive.JobManager/3.3/Views/HiveResourceSelectorDialog.cs (modified) (2 diffs)
• HeuristicLab.MainForm.WindowsForms/3.3/Controls/ProgressView.cs (modified) (1 diff)

stable/HeuristicLab.Clients.Hive.JobManager/3.3/Views/HiveResourceSelectorDialog.cs

@@ -96 +96 @@
       if (InvokeRequired) Invoke((Action<object, EventArgs>)HiveClient_Instance_Refreshing, sender, e);
       else {
-        Progress.ShowOnControl(this, "Refreshing", ProgressMode.Indeterminate);
         refreshButton.Enabled = false;
+        okButton.Enabled = false;
+        cancelButton.Enabled = false;
+        // Progress cannot be shown on dialog (no parent control), thus it is shown on the selector
+        Progress.Show(hiveResourceSelector, "Refreshing", ProgressMode.Indeterminate);
       }
     }
@@ -104 +107 @@
       if (InvokeRequired) Invoke((Action<object, EventArgs>)HiveClient_Instance_Refreshed, sender, e);
       else {
-        Progress.HideFromControl(this);
+        Progress.Hide(hiveResourceSelector);
+        okButton.Enabled = true;
+        cancelButton.Enabled = true;
         refreshButton.Enabled = true;
       }

stable/HeuristicLab.MainForm.WindowsForms/3.3/Controls/ProgressView.cs

@@ -38 +38 @@
       : base() {
       if (control == null) throw new ArgumentNullException("control");
+      if (control.Parent == null) throw new InvalidOperationException("A Progress can only be shown on controls that have a Parent-control. Therefore, Dialogs and Forms cannot have an associated ProgressView.");
       if (content == null) throw new ArgumentNullException("content");
       InitializeComponent();