Changeset 8206 for branches/GP-MoveOperators/HeuristicLab.Clients.Access.Views/3.3/ClientViews

Timestamp:

07/03/12 16:46:35 (12 years ago)

Author:

gkronber

Message:

#1847: merged r8084:8205 from trunk into GP move operators branch

Location:

branches/GP-MoveOperators

Files:

• . (modified) (1 prop)
• HeuristicLab.Clients.Access.Views/3.3/ClientViews/ClientView.cs (modified) (4 diffs)

branches/GP-MoveOperators/HeuristicLab.Clients.Access.Views/3.3/ClientViews/ClientView.cs

@@ -35 +35 @@
 
     private ProgressView progressView;
+    private Progress progress;
 
     public ClientView() {
       InitializeComponent();
+      progress = new Progress() {
+        CanBeCanceled = false,
+        ProgressState = ProgressState.Finished
+      };
+    }
+
+    protected override void DeregisterContentEvents() {
+      if (progressView != null) {
+        progressView.Content = null;
+        progressView.Dispose();
+        progressView = null;
+      }
+      base.DeregisterContentEvents();
+    }
+
+    protected override void RegisterContentEvents() {
+      base.RegisterContentEvents();
+      progressView = new ProgressView(this, progress);
     }
 
@@ -58 +77 @@
       } else {
         if (Content.ClientConfiguration != null) {
-          txtClientConfiguration.Text = Content.ClientConfiguration.Description; //??
+          txtClientConfiguration.Text = Content.ClientConfiguration.Hash;
         }
         if (Content.ClientType != null) {
@@ -82 +101 @@
         Invoke(new Action(StartProgressView));
       } else {
-        if (progressView == null) {
-          IProgress prog = new Progress();
-          prog.Status = "Downloading client information. Please be patient.";
-          progressView = new ProgressView(this, prog);
-        }
+        progress.Status = "Downloading client information. Please be patient.";
+        progress.ProgressState = ProgressState.Started;
       }
     }
@@ -94 +110 @@
         Invoke(new Action(FinishProgressView));
       } else {
-        if (progressView != null) {
-          progressView.Finish();
-          progressView = null;
-          SetEnabledStateOfControls();
-        }
+        progress.Finish();
       }
     }