Changeset 2203 for trunk/eraser

Timestamp:

6/19/2010 2:48:37 AM (3 years ago)

Author:

lowjoel

Message:

Allow tasks to report that their progress is indeterminate, and reflect this in the UI appropriately.

Location:

trunk/eraser/Eraser

Files:

• ProgressForm.cs (modified) (2 diffs)
• SchedulerPanel.cs (modified) (1 diff)

trunk/eraser/Eraser/ProgressForm.cs

@@ -165 +165 @@
                 timeLeft.Text = S._("Unknown");
 
-            if (targetProgress.Progress >= 0.0f)
+            if (!targetProgress.ProgressIndeterminate)
             {
                 itemProgress.Style = ProgressBarStyle.Continuous;
@@ -178 +178 @@
             }
 
-            overallProgress.Value = (int)(task.Progress.Progress * 1000);
-            overallProgressLbl.Text = S._("Total: {0,2:#0.00%}", task.Progress.Progress);
+            if (!task.Progress.ProgressIndeterminate)
+            {
+                overallProgress.Style = ProgressBarStyle.Continuous;
+                overallProgress.Value = (int)(task.Progress.Progress * 1000);
+                overallProgressLbl.Text = S._("Total: {0,2:#0.00%}", task.Progress.Progress);
+            }
+            else
+            {
+                overallProgress.Style = ProgressBarStyle.Marquee;
+                overallProgressLbl.Text = S._("Total: Unknown");
+            }
         }
 

trunk/eraser/Eraser/SchedulerPanel.cs

@@ -231 +231 @@
             //Update the progress bar
             ErasureTarget target = (ErasureTarget)sender;
-            schedulerProgress.Value = (int)(target.Task.Progress.Progress * 1000.0);
+            SteppedProgressManager progress = target.Task.Progress;
+            schedulerProgress.Style = progress.ProgressIndeterminate ?
+                ProgressBarStyle.Marquee : ProgressBarStyle.Continuous;
+            
+            if (!progress.ProgressIndeterminate)
+                schedulerProgress.Value = (int)(progress.Progress * 1000.0);
         }