Changeset 15445

Timestamp:

11/03/17 09:45:03 (7 years ago)

Author:

pfleck

Message:

#2845: Removed progressbar state (green/orange/red).

Location:

branches/EnhancedProgress

Files:

• HeuristicLab.MainForm.WindowsForms/3.3/Controls/ProgressView.cs (modified) (5 diffs)
• HeuristicLab.MainForm/3.3/Progress.cs (modified) (2 diffs)

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

@@ -21 +21 @@
 
 using System;
-using System.Runtime.InteropServices;
 using System.Windows.Forms;
 
@@ -147 +146 @@
       else
         HideProgress();
-
-      switch (content.ProgressState) {
-        case ProgressState.Started:
-        case ProgressState.Finished:
-          progressBar.SetState(ProgressBarState.Normal);
-          break;
-        case ProgressState.StopRequested:
-          progressBar.SetState(ProgressBarState.Warning);
-          break;
-        case ProgressState.CancelRequested:
-          progressBar.SetState(ProgressBarState.Error);
-          break;
-        default: throw new NotSupportedException("The progress state " + content.ProgressState + " is not supported by the ProgressView.");
-      }
     }
 
@@ -171 +156 @@
       messageLabel.Text = content.Message;
     }
-
 
     private void UpdateProgressValue() {
@@ -191 +175 @@
       } else {
         progressBar.Style = ProgressBarStyle.Marquee;
+        progressBar.Value = 0;
       }
     }
@@ -220 +205 @@
     }
   }
-
-  // https://stackoverflow.com/a/9753302
-  internal enum ProgressBarState {
-    Normal = 1, Error = 2, Warning = 3
-  }
-  internal static class ProgressBarStateExtension {
-    [DllImport("user32.dll", CharSet = CharSet.Auto, SetLastError = false)]
-    private static extern IntPtr SendMessage(IntPtr hWnd, uint msg, IntPtr w, IntPtr l);
-    public static void SetState(this ProgressBar pBar, ProgressBarState state) {
-      SendMessage(pBar.Handle, 1040, (IntPtr)state, IntPtr.Zero);
-    }
-  }
 }

branches/EnhancedProgress/HeuristicLab.MainForm/3.3/Progress.cs

@@ -100 +100 @@
     }
 
+    /// <summary>
+    /// Starts an "undefined" progress in marquee-mode
+    /// </summary>
     public void Start(string message) {
       ProgressState = ProgressState.Started;
@@ -105 +108 @@
       Message = message;
     }
+    /// <summary>
+    /// Starts a progress in continuous-mode
+    /// </summary>
     public void Start(string message, double progressValue) {
       ProgressState = ProgressState.Started;