Changeset 9894 for trunk/sources/HeuristicLab.MainForm.WindowsForms

Timestamp:

08/22/13 11:31:32 (11 years ago)

Author:

ascheibe

Message:

#1042

• changed Hive views to use MainForm for progress handling
• removed Cancel timeout
• setter for ProgressState is now private
• added Start methods to Progress
• removed unused methods from RefreshableHiveJobView

Location:

trunk/sources/HeuristicLab.MainForm.WindowsForms/3.3

Files:

• Controls/ProgressView.cs (modified) (2 diffs)
• Controls/ProgressView.designer.cs (modified) (1 diff)
• MainForms/MainForm.cs (modified) (5 diffs)

trunk/sources/HeuristicLab.MainForm.WindowsForms/3.3/Controls/ProgressView.cs

@@ -24 +24 @@
 
 namespace HeuristicLab.MainForm.WindowsForms {
-  public sealed partial class ProgressView : UserControl {
+  internal sealed partial class ProgressView : UserControl {
     private readonly Control control;
     public Control Control {
@@ -46 +46 @@
         ShowProgress();
       RegisterContentEvents();
+    }
+
+    /// <summary> 
+    /// Clean up any resources being used.
+    /// </summary>
+    /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
+    protected override void Dispose(bool disposing) {
+      DeregisterContentEvents();
+      HideProgress();
+
+      if (disposing && (components != null)) {
+        components.Dispose();
+      }
+      base.Dispose(disposing);
     }
 

trunk/sources/HeuristicLab.MainForm.WindowsForms/3.3/Controls/ProgressView.designer.cs

@@ -27 +27 @@
     private System.ComponentModel.IContainer components = null;
 
-    /// <summary> 
-    /// Clean up any resources being used.
-    /// </summary>
-    /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
-    protected override void Dispose(bool disposing) {
-      DeregisterContentEvents();
-      if (disposing && (components != null)) {
-        components.Dispose();
-      }
-      base.Dispose(disposing);
-    }
-
+   
     #region Component Designer generated code
 

trunk/sources/HeuristicLab.MainForm.WindowsForms/3.3/MainForms/MainForm.cs

@@ -353 +353 @@
     /// Adds a <see cref="ProgressView"/> to the <see cref="ContentView"/>s showing the specified content.
     /// </summary>
-    public void AddOperationProgressToContent(IContent content, string progressMessage, bool addToObjectGraphObjects = true) {
+    public IProgress AddOperationProgressToContent(IContent content, string progressMessage, bool addToObjectGraphObjects = true) {
       if (contentProgressLookup.ContainsKey(content))
         throw new ArgumentException("A progress is already registered for the specified content.", "content");
@@ -373 +373 @@
 
       contentProgressLookup[content] = progress;
+      return progress;
     }
 
@@ -378 +379 @@
     /// Adds a <see cref="ProgressView"/> to the specified view.
     /// </summary>
-    public void AddOperationProgressToView(IView view, string progressMessage) {
-      if (viewProgressLookup.ContainsKey(view))
-        throw new ArgumentException("A progress is already registered for the specified view.", "view");
+    public IProgress AddOperationProgressToView(IView view, string progressMessage) {
+      var progress = new Progress(progressMessage, ProgressState.Started);
+      AddOperationProgressToView(view, progress);
+      return progress;
+    }
+
+    public void AddOperationProgressToView(IView view, IProgress progress) {
+      if (view == null) throw new ArgumentNullException("view", "The view must not be null.");
+      if (progress == null) throw new ArgumentNullException("progress", "The progress must not be null.");
 
       var control = view as Control;
       if (control == null) throw new ArgumentException("The passed view must be a control.", "view");
 
-      var progress = new Progress(progressMessage, ProgressState.Started);
+      IProgress oldProgress;
+      if (viewProgressLookup.TryGetValue(view, out oldProgress)) {
+        foreach (var progressView in progressViews.Where(v => v.Content == oldProgress).ToList()) {
+          progressView.Dispose();
+          progressViews.Remove(progressView);
+        }
+        viewProgressLookup.Remove(view);
+      }
+
       progressViews.Add(new ProgressView(control, progress));
       viewProgressLookup[view] = progress;
@@ -393 +408 @@
     /// Removes an existing <see cref="ProgressView"/> from the <see cref="ContentView"/>s showing the specified content.
     /// </summary>
-    public void RemoveOperationProgressFromContent(IContent content) {
+    public void RemoveOperationProgressFromContent(IContent content, bool finishProgress = true) {
       IProgress progress;
       if (!contentProgressLookup.TryGetValue(content, out progress))
         throw new ArgumentException("No progress is registered for the specified content.", "content");
 
-      progress.Finish();
+      if (finishProgress) progress.Finish();
       foreach (var progressView in progressViews.Where(v => v.Content == progress).ToList()) {
         progressView.Dispose();
@@ -409 +424 @@
     /// Removes an existing <see cref="ProgressView"/> from the specified view.
     /// </summary>
-    public void RemoveOperationProgressFromView(IView view) {
+    public void RemoveOperationProgressFromView(IView view, bool finishProgress = true) {
       IProgress progress;
       if (!viewProgressLookup.TryGetValue(view, out progress))
         throw new ArgumentException("No progress is registered for the specified view.", "view");
 
-      progress.Finish();
+      if (finishProgress) progress.Finish();
       foreach (var progressView in progressViews.Where(v => v.Content == progress).ToList()) {
         progressView.Dispose();