Changeset 16317 for branches/2845_EnhancedProgress/HeuristicLab.Clients.Hive.JobManager

Timestamp:

11/22/18 12:37:04 (6 years ago)

Author:

pfleck

Message:

#2845 Combined separate Show methods into single one with enum parameter specifying the ProgressMode. Renamed Continuous and Marquee to Determinate and Indeterminate.

Location:

branches/2845_EnhancedProgress/HeuristicLab.Clients.Hive.JobManager/3.3

Files:

• MenuItems/RunInHiveMenuItem.cs (modified) (1 diff)
• Views/HiveResourceSelectorDialog.cs (modified) (2 diffs)
• Views/RefreshableHiveJobListView.cs (modified) (1 diff)
• Views/RefreshableHiveJobView.cs (modified) (3 diffs)

branches/2845_EnhancedProgress/HeuristicLab.Clients.Hive.JobManager/3.3/MenuItems/RunInHiveMenuItem.cs

@@ -99 +99 @@
           rJob.Job.ResourceIds = hiveResourceSelectorDialog.SelectedResources.Select(x => x.Id).ToList();
 
-          progress = Progress.ShowMarquee(this.content, "Uploading to Hive...");
+          progress = Progress.Show(this.content, "Uploading to Hive...", ProgressMode.Indeterminate);
           rJob.Progress = progress;
           progress.ProgressStateChanged += progress_ProgressStateChanged;

branches/2845_EnhancedProgress/HeuristicLab.Clients.Hive.JobManager/3.3/Views/HiveResourceSelectorDialog.cs

@@ -96 +96 @@
       if (InvokeRequired) Invoke((Action<object, EventArgs>)HiveClient_Instance_Refreshing, sender, e);
       else {
-        Progress.ShowMarquee(this, "Refreshing");
+        Progress.ShowOnControl(this, "Refreshing", ProgressMode.Indeterminate);
         refreshButton.Enabled = false;
       }
@@ -104 +104 @@
       if (InvokeRequired) Invoke((Action<object, EventArgs>)HiveClient_Instance_Refreshed, sender, e);
       else {
-        Progress.Hide(this);
+        Progress.HideFromControl(this);
         refreshButton.Enabled = true;
       }

branches/2845_EnhancedProgress/HeuristicLab.Clients.Hive.JobManager/3.3/Views/RefreshableHiveJobListView.cs

@@ -131 +131 @@
 
     private void DeleteHiveJobsAsync(object items) {
-      Progress.ShowMarquee(this, "Deleting job...");
+      Progress.Show(this, "Deleting job...", ProgressMode.Indeterminate);
       foreach (RefreshableJob item in (List<RefreshableJob>)items) {
         Content.Remove(item);

branches/2845_EnhancedProgress/HeuristicLab.Clients.Hive.JobManager/3.3/Views/RefreshableHiveJobView.cs

@@ -493 +493 @@
 
     private void PauseJobAsync(object job) {
-      Content.Progress.StartMarquee("Pausing job...");
+      Content.Progress.Start("Pausing job...", ProgressMode.Indeterminate);
       HiveClient.PauseJob((RefreshableJob)job);
       Content.Progress.Finish();
@@ -499 +499 @@
 
     private void StopJobAsync(object job) {
-      Content.Progress.StartMarquee("Stopping job...");
+      Content.Progress.Start("Stopping job...", ProgressMode.Indeterminate);
       HiveClient.StopJob((RefreshableJob)job);
       Content.Progress.Finish();
@@ -505 +505 @@
 
     private void ResumeJobAsync(object job) {
-      Content.Progress.StartMarquee("Resuming job...");
+      Content.Progress.Start("Resuming job...", ProgressMode.Indeterminate);
       HiveClient.ResumeJob((RefreshableJob)job);
       Content.Progress.Finish();