Changeset 8145 for trunk/sources/HeuristicLab.Clients.Hive.JobManager/3.3
- Timestamp:
- 06/28/12 12:00:51 (12 years ago)
- Location:
- trunk/sources/HeuristicLab.Clients.Hive.JobManager/3.3/Views
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/sources/HeuristicLab.Clients.Hive.JobManager/3.3/Views/HiveResourceSelector.cs
r7928 r8145 42 42 private ISet<TreeNode> filteredTreeNodes; 43 43 private ISet<TreeNode> nodeStore; 44 private IProgress currentProgress; 44 45 45 46 private ISet<Resource> selectedResources; … … 68 69 imageList.Images.Add(HeuristicLab.Common.Resources.VSImageLibrary.MonitorLarge); 69 70 imageList.Images.Add(HeuristicLab.Common.Resources.VSImageLibrary.NetworkCenterLarge); 71 progressView = new ProgressView(this); 70 72 } 71 73 … … 74 76 Invoke(new Action(StartProgressView)); 75 77 } 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 } 78 currentProgress = new Progress(); 79 currentProgress.Status = "Downloading resources. Please be patient."; 80 progressView.Progress = currentProgress; 81 81 } 82 82 } … … 86 86 Invoke(new Action(FinishProgressView)); 87 87 } else { 88 if (progressView != null) { 89 progressView.Finish(); 90 progressView = null; 91 SetEnabledStateOfControls(); 92 } 88 currentProgress.Finish(); 89 SetEnabledStateOfControls(); 93 90 } 94 91 } -
trunk/sources/HeuristicLab.Clients.Hive.JobManager/3.3/Views/RefreshableHiveJobView.cs
r8109 r8145 55 55 public RefreshableHiveJobView() { 56 56 InitializeComponent(); 57 progressView = new ProgressView(this); 57 58 } 58 59 … … 475 476 Invoke(new Action(SetProgressView)); 476 477 } else { 477 if (progressView == null) { 478 progressView = new ProgressView(this, Content.Progress); 479 } else { 480 progressView.Progress = Content.Progress; 481 } 478 progressView.Progress = Content.Progress; 482 479 } 483 480 } … … 487 484 Invoke(new Action<IProgress>(SetProgressView), progress); 488 485 } else { 489 if (progressView == null) { 490 progressView = new ProgressView(this, progress); 491 } else { 492 progressView.Progress = progress; 493 } 486 progressView.Progress = progress; 494 487 } 495 488 } … … 499 492 Invoke(new Action(FinishProgressView)); 500 493 } else { 501 if (progressView != null) { 502 progressView.Finish(); 503 progressView = null; 504 SetEnabledStateOfControls(); 505 } 494 if (Content.Progress != null) 495 Content.Progress.Finish(); 496 SetEnabledStateOfControls(); 506 497 } 507 498 }
Note: See TracChangeset
for help on using the changeset viewer.