Changeset 8159

Timestamp:

06/29/12 12:58:51 (12 years ago)

Author:

ascheibe

Message:

#1762 removed blind disabling of controls

Location:

trunk/sources

Files:

• HeuristicLab.Clients.Hive.JobManager/3.3/Views/RefreshableHiveJobView.cs (modified) (2 diffs)
• HeuristicLab.Clients.Hive/3.3/HiveClient.cs (modified) (2 diffs)
• HeuristicLab.MainForm.WindowsForms/3.3/Views/ProgressView.cs (modified) (2 diffs)

trunk/sources/HeuristicLab.Clients.Hive.JobManager/3.3/Views/RefreshableHiveJobView.cs

@@ -149 +149 @@
         bool alreadyUploaded = Content.Id != Guid.Empty;
         bool jobsLoaded = Content.HiveTasks != null && Content.HiveTasks.All(x => x.Task.Id != Guid.Empty);
-
-        this.nameTextBox.ReadOnly = !Content.IsControllable || Content.ExecutionState != ExecutionState.Prepared || alreadyUploaded;
-        this.resourceNamesTextBox.ReadOnly = !Content.IsControllable || Content.ExecutionState != ExecutionState.Prepared || alreadyUploaded;
-        this.searchButton.Enabled = Content.IsControllable && !(Content.ExecutionState != ExecutionState.Prepared || alreadyUploaded);
-        this.jobsTreeView.ReadOnly = !Content.IsControllable || Content.ExecutionState != ExecutionState.Prepared || alreadyUploaded;
-
-        this.isPrivilegedCheckBox.Enabled = Content.IsAllowedPrivileged && Content.IsControllable && !(Content.ExecutionState != ExecutionState.Prepared || alreadyUploaded); // TODO: check if user has the rights to do this
-        this.refreshAutomaticallyCheckBox.Enabled = Content.IsControllable && alreadyUploaded && jobsLoaded && Content.ExecutionState == ExecutionState.Started;
-        this.refreshButton.Enabled = Content.IsDownloadable && alreadyUploaded;
-        this.Locked = !Content.IsControllable || Content.ExecutionState == ExecutionState.Started;
+        tabControl.Enabled = !Content.IsProgressing;
+
+        this.nameTextBox.ReadOnly = !Content.IsControllable || Content.ExecutionState != ExecutionState.Prepared || alreadyUploaded || Content.IsProgressing;
+        this.resourceNamesTextBox.ReadOnly = !Content.IsControllable || Content.ExecutionState != ExecutionState.Prepared || alreadyUploaded || Content.IsProgressing;
+        this.searchButton.Enabled = (Content.IsControllable && !(Content.ExecutionState != ExecutionState.Prepared || alreadyUploaded)) || !Content.IsProgressing;
+        this.jobsTreeView.ReadOnly = !Content.IsControllable || Content.ExecutionState != ExecutionState.Prepared || alreadyUploaded || Content.IsProgressing;
+
+        this.isPrivilegedCheckBox.Enabled = Content.IsAllowedPrivileged && Content.IsControllable && !(Content.ExecutionState != ExecutionState.Prepared || alreadyUploaded) && !Content.IsProgressing;
+        this.refreshAutomaticallyCheckBox.Enabled = Content.IsControllable && alreadyUploaded && jobsLoaded && Content.ExecutionState == ExecutionState.Started && !Content.IsProgressing;
+        this.refreshButton.Enabled = Content.IsDownloadable && alreadyUploaded && !Content.IsProgressing;
+        this.Locked = !Content.IsControllable || Content.ExecutionState == ExecutionState.Started || Content.IsProgressing;
       }
       SetEnabledStateOfExecutableButtons();
@@ -451 +452 @@
         startButton.Enabled = pauseButton.Enabled = stopButton.Enabled = resetButton.Enabled = false;
       } else {
-        startButton.Enabled = Content.IsControllable && Content.HiveTasks != null && Content.HiveTasks.Count > 0 && (Content.ExecutionState == ExecutionState.Prepared || Content.ExecutionState == ExecutionState.Paused);
-        pauseButton.Enabled = Content.IsControllable && Content.ExecutionState == ExecutionState.Started;
-        stopButton.Enabled = Content.IsControllable && Content.ExecutionState == ExecutionState.Started;
+        startButton.Enabled = Content.IsControllable && Content.HiveTasks != null && Content.HiveTasks.Count > 0 && (Content.ExecutionState == ExecutionState.Prepared || Content.ExecutionState == ExecutionState.Paused) && !Content.IsProgressing;
+        pauseButton.Enabled = Content.IsControllable && Content.ExecutionState == ExecutionState.Started && !Content.IsProgressing;
+        stopButton.Enabled = Content.IsControllable && Content.ExecutionState == ExecutionState.Started && !Content.IsProgressing;
         resetButton.Enabled = false;
       }

trunk/sources/HeuristicLab.Clients.Hive/3.3/HiveClient.cs

@@ -315 +315 @@
       }
       finally {
+        refreshableJob.IsProgressing = false;
         refreshableJob.Progress.Finish();
-        refreshableJob.IsProgressing = false;
       }
     }
@@ -471 +471 @@
       }
       finally {
+        refreshableJob.IsProgressing = false;
         refreshableJob.Progress.Finish();
-        refreshableJob.IsProgressing = false;
       }
     }

trunk/sources/HeuristicLab.MainForm.WindowsForms/3.3/Views/ProgressView.cs

@@ -115 +115 @@
         parentView.Locked = true;
         parentView.ReadOnly = true;
-        foreach (Control c in this.parentView.Controls)
-          c.Enabled = false;
         Enabled = true;
         ReadOnly = false;
@@ -156 +154 @@
         parentView.Locked = false;
         parentView.ReadOnly = false;
-        foreach (Control c in this.parentView.Controls)
-          c.Enabled = true;
         DeregisterProgressEvents();
         progress = null;
-        this.Visible = false;
+        Visible = false;
       }
     }