Free cookie consent management tool by TermsFeed Policy Generator

Ignore:
Timestamp:
09/03/13 15:55:36 (11 years ago)
Author:
ascheibe
Message:

#1042 merged r9849, r9851, r9865, r9867, r9868, r9893, r9894, r9895, r9896, r9900, r9901, r9905, r9907 into stable branch

Location:
stable
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • stable

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

    r9456 r9933  
    4242    private ISet<TreeNode> filteredTreeNodes;
    4343    private ISet<TreeNode> nodeStore;
    44     private Progress progress;
    45     private ProgressView progressView;
    46 
     44   
    4745    private ISet<Resource> selectedResources;
    4846    public ISet<Resource> SelectedResources {
     
    6462      imageList.Images.Add(HeuristicLab.Common.Resources.VSImageLibrary.MonitorLarge);
    6563      imageList.Images.Add(HeuristicLab.Common.Resources.VSImageLibrary.NetworkCenterLarge);
    66       progress = new Progress() {
    67         CanBeCanceled = false,
    68         ProgressState = ProgressState.Finished
    69       };
    70     }
    71 
    72     protected override void DeregisterContentEvents() {
    73       if (progressView != null) {
    74         progressView.Content = null;
    75         progressView.Dispose();
    76         progressView = null;
    77       }
    78       base.DeregisterContentEvents();
    79     }
    80 
    81     protected override void RegisterContentEvents() {
    82       base.RegisterContentEvents();
    83       progressView = new ProgressView(this, progress);
    84     }
    85 
     64    }
     65 
    8666    public void StartProgressView() {
    8767      if (InvokeRequired) {
    8868        Invoke(new Action(StartProgressView));
    8969      } else {
    90         progress.Status = "Downloading resources. Please be patient.";
    91         progress.ProgressState = ProgressState.Started;
     70        var message = "Downloading resources. Please be patient.";
     71        MainFormManager.GetMainForm<HeuristicLab.MainForm.WindowsForms.MainForm>().AddOperationProgressToView(this, message);
    9272      }
    9373    }
     
    9777        Invoke(new Action(FinishProgressView));
    9878      } else {
    99         progress.Finish();
     79        MainFormManager.GetMainForm<HeuristicLab.MainForm.WindowsForms.MainForm>().RemoveOperationProgressFromView(this);
    10080      }
    10181    }
Note: See TracChangeset for help on using the changeset viewer.