Changeset 17064


Ignore:
Timestamp:
07/04/19 14:49:00 (2 weeks ago)
Author:
mkommend
Message:

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

Location:
stable
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • stable

  • stable/HeuristicLab.Clients.Hive.JobManager

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

    r17062 r17064  
    9696      if (InvokeRequired) Invoke((Action<object, EventArgs>)HiveClient_Instance_Refreshing, sender, e);
    9797      else {
    98         Progress.ShowOnControl(this, "Refreshing", ProgressMode.Indeterminate);
    9998        refreshButton.Enabled = false;
     99        okButton.Enabled = false;
     100        cancelButton.Enabled = false;
     101        // Progress cannot be shown on dialog (no parent control), thus it is shown on the selector
     102        Progress.Show(hiveResourceSelector, "Refreshing", ProgressMode.Indeterminate);
    100103      }
    101104    }
     
    104107      if (InvokeRequired) Invoke((Action<object, EventArgs>)HiveClient_Instance_Refreshed, sender, e);
    105108      else {
    106         Progress.HideFromControl(this);
     109        Progress.Hide(hiveResourceSelector);
     110        okButton.Enabled = true;
     111        cancelButton.Enabled = true;
    107112        refreshButton.Enabled = true;
    108113      }
  • stable/HeuristicLab.MainForm.WindowsForms/3.3/Controls/ProgressView.cs

    r17062 r17064  
    3838      : base() {
    3939      if (control == null) throw new ArgumentNullException("control");
     40      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.");
    4041      if (content == null) throw new ArgumentNullException("content");
    4142      InitializeComponent();
Note: See TracChangeset for help on using the changeset viewer.