Changeset 15417 for branches/EnhancedProgress/HeuristicLab.MainForm.WindowsForms

Timestamp:

10/11/17 10:00:34 (7 years ago)

Author:

pfleck

Message:

#2845 Removed Visible property and hide on "Finished".

Location:

branches/EnhancedProgress/HeuristicLab.MainForm.WindowsForms/3.3/Controls

Files:

• ProgressView.cs (modified) (5 diffs)
• ProgressView.designer.cs (modified) (1 diff)

branches/EnhancedProgress/HeuristicLab.MainForm.WindowsForms/3.3/Controls/ProgressView.cs

@@ -48 +48 @@
       this.content = content;
 
-      UpdateButtonsState();
-      if (content.Visible) ShowProgress();
+      if (content.ProgressState != ProgressState.Finished)
+        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();
@@ -72 +68 @@
       content.ProgressBarModeChanged += new EventHandler(Content_ProgressBarModeChanged);
       content.ProgressValueChanged += new EventHandler(Content_ProgressValueChanged);
-      content.VisibleChanged += new EventHandler(Content_VisibleChanged);
       content.CanBeStoppedChanged += new EventHandler(Content_CanBeStoppedChanged);
       content.CanBeCanceledChanged += new EventHandler(Content_CanBeCanceledChanged);
@@ -81 +76 @@
       content.ProgressBarModeChanged -= new EventHandler(Content_ProgressBarModeChanged);
       content.ProgressValueChanged -= new EventHandler(Content_ProgressValueChanged);
-      content.VisibleChanged -= new EventHandler(Content_VisibleChanged);
       content.CanBeStoppedChanged -= new EventHandler(Content_CanBeStoppedChanged);
       content.CanBeCanceledChanged -= new EventHandler(Content_CanBeCanceledChanged);
@@ -102 +96 @@
     }
 
-    private void Content_VisibleChanged(object sender, EventArgs e) {
-      if (content.Visible)
+    private void Content_CanBeStoppedChanged(object sender, EventArgs e) {
+      UpdateButtonsState();
+    }
+    private void Content_CanBeCanceledChanged(object sender, EventArgs e) {
+      UpdateButtonsState();
+    }
+
+    private void ShowProgress() {
+      if (control.InvokeRequired) {
+        control.Invoke((Action)ShowProgress);
+        return;
+      }
+      if (Parent != null) return;
+
+      int height = (content.CanBeStopped || content.CanBeCanceled) ? Height : collapsedControlHeight;
+      Left = (control.ClientRectangle.Width / 2) - (Width / 2);
+      Top = (control.ClientRectangle.Height / 2) - (height / 2);
+      Anchor = AnchorStyles.None;
+
+      UpdateProgressMessage();
+      UpdateProgressValue();
+      UpdateButtonsState();
+
+      control.Enabled = false;
+      Parent = control.Parent;
+      BringToFront();
+      Visible = true;
+    }
+
+    private void HideProgress() {
+      if (control.InvokeRequired) {
+        control.Invoke((Action)HideProgress);
+        return;
+      }
+      if (Parent == null) return;
+
+      Visible = false;
+      control.Enabled = true;
+      Parent = null;
+    }
+
+    private void UpdateProgressState() {
+      if (control.InvokeRequired) {
+        control.Invoke((Action)UpdateProgressState);
+        return;
+      }
+
+      if (content.ProgressState != ProgressState.Finished)
         ShowProgress();
       else
         HideProgress();
-    }
-
-    private void Content_CanBeStoppedChanged(object sender, EventArgs e) {
-      UpdateButtonsState();
-    }
-    private void Content_CanBeCanceledChanged(object sender, EventArgs e) {
-      UpdateButtonsState();
-    }
-
-    private void ShowProgress() {
-      if (control.InvokeRequired) {
-        control.Invoke((Action)ShowProgress);
-        return;
-      }
-
-      int height = (content.CanBeStopped || content.CanBeCanceled) ? Height : collapsedControlHeight;
-
-      Left = (control.ClientRectangle.Width / 2) - (Width / 2);
-      Top = (control.ClientRectangle.Height / 2) - (height / 2);
-      Anchor = AnchorStyles.None;
-
-      control.Enabled = false;
-      Parent = control.Parent;
-      BringToFront();
-
-      UpdateProgressValue();
-      UpdateProgressMessage();
-      UpdateButtonsState();
-      Visible = true;
-    }
-
-    private void HideProgress() {
-      if (control.InvokeRequired) {
-        control.Invoke((Action)HideProgress);
-        return;
-      }
-
-      control.Enabled = true;
-      Parent = null;
-      Visible = false;
-    }
-
-    private void UpdateProgressState() {
-      if (control.InvokeRequired) {
-        control.Invoke((Action)UpdateProgressState);
-        return;
-      }
 
       switch (content.ProgressState) {
         case ProgressState.Started:
+        case ProgressState.Finished:
           progressBar.SetState(ProgressBarState.Normal);
           break;
-        case ProgressState.Finished:
-          HideProgress();
-          progressBar.SetState(ProgressBarState.Normal);
-          break;
-        case ProgressState.Stopped:
+        case ProgressState.StopRequested:
           progressBar.SetState(ProgressBarState.Warning);
           break;
-        case ProgressState.Canceled:
+        case ProgressState.CancelRequested:
           progressBar.SetState(ProgressBarState.Error);
           break;
@@ -211 +201 @@
 
       stopButton.Visible = content.CanBeStopped;
-      stopButton.Enabled = content.ProgressState == ProgressState.Started && content.CanBeStopped;
+      stopButton.Enabled = content.CanBeStopped && content.ProgressState == ProgressState.Started;
 
       cancelButton.Visible = content.CanBeCanceled;
-      cancelButton.Enabled = content.ProgressState == ProgressState.Started && content.CanBeCanceled;
+      cancelButton.Enabled = content.CanBeCanceled && content.ProgressState == ProgressState.Started;
 
       if (content.CanBeStopped || content.CanBeCanceled) {

branches/EnhancedProgress/HeuristicLab.MainForm.WindowsForms/3.3/Controls/ProgressView.designer.cs

@@ -103 +103 @@
       // stopButton
       // 
-      this.stopButton.Dock = System.Windows.Forms.DockStyle.Left;
       this.stopButton.Location = new System.Drawing.Point(193, 3);
       this.stopButton.Name = "stopButton";