Changeset 8331 for branches/ScatterSearch (trunk integration)/HeuristicLab.Clients.Hive.JobManager/3.3/Views/HiveResourceSelector.cs
- Timestamp:
- 07/26/12 09:51:13 (12 years ago)
- Location:
- branches/ScatterSearch (trunk integration)
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/ScatterSearch (trunk integration)
- Property svn:ignore
-
old new 21 21 protoc.exe 22 22 _ReSharper.HeuristicLab 3.3 Tests 23 Google.ProtocolBuffers-2.4.1.473.dll
-
- Property svn:mergeinfo changed
- Property svn:ignore
-
branches/ScatterSearch (trunk integration)/HeuristicLab.Clients.Hive.JobManager/3.3/Views/HiveResourceSelector.cs
r8086 r8331 42 42 private ISet<TreeNode> filteredTreeNodes; 43 43 private ISet<TreeNode> nodeStore; 44 private Progress progress; 45 private ProgressView progressView; 44 46 45 47 private ISet<Resource> selectedResources; … … 47 49 get { return selectedResources; } 48 50 set { selectedResources = value; } 49 }50 51 private ProgressView progressView;52 public ProgressView ProgressView {53 get { return progressView; }54 set { progressView = value; }55 51 } 56 52 … … 68 64 imageList.Images.Add(HeuristicLab.Common.Resources.VSImageLibrary.MonitorLarge); 69 65 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); 70 84 } 71 85 … … 74 88 Invoke(new Action(StartProgressView)); 75 89 } else { 76 if (progressView == null) { 77 IProgress prog = new Progress(); 78 prog.Status = "Downloading resources. Please be patient."; 79 progressView = new ProgressView(this, prog); 80 } 90 progress.Status = "Downloading resources. Please be patient."; 91 progress.ProgressState = ProgressState.Started; 81 92 } 82 93 } … … 86 97 Invoke(new Action(FinishProgressView)); 87 98 } else { 88 if (progressView != null) { 89 progressView.Finish(); 90 progressView = null; 91 SetEnabledStateOfControls(); 92 } 99 progress.Finish(); 93 100 } 94 101 }
Note: See TracChangeset
for help on using the changeset viewer.