Changeset 12963 for stable/HeuristicLab.Clients.Hive.JobManager/3.3/Views

Timestamp:

09/21/15 16:35:55 (9 years ago)

Author:

ascheibe

Message:

#2355 merged r12926, r12927 and r12959 into stable

Location:

stable

Files:

• . (modified) (1 prop)
• HeuristicLab.Clients.Hive.JobManager/3.3/Views/RefreshableHiveJobView.Designer.cs (modified) (6 diffs)
• HeuristicLab.Clients.Hive.JobManager/3.3/Views/RefreshableHiveJobView.cs (modified) (6 diffs)

stable/HeuristicLab.Clients.Hive.JobManager/3.3/Views/RefreshableHiveJobView.Designer.cs

@@ -70 +70 @@
       this.toolTip = new System.Windows.Forms.ToolTip(this.components);
       this.refreshButton = new System.Windows.Forms.Button();
-      this.isPrivilegedCheckBox = new System.Windows.Forms.CheckBox();
       this.UnloadButton = new System.Windows.Forms.Button();
       this.refreshAutomaticallyCheckBox = new System.Windows.Forms.CheckBox();
@@ -332 +331 @@
       this.resourceNamesTextBox.Location = new System.Drawing.Point(70, 52);
       this.resourceNamesTextBox.Name = "resourceNamesTextBox";
-      this.resourceNamesTextBox.Size = new System.Drawing.Size(385, 20);
+      this.resourceNamesTextBox.Size = new System.Drawing.Size(471, 20);
       this.resourceNamesTextBox.TabIndex = 2;
       this.resourceNamesTextBox.Validated += new System.EventHandler(this.resourceNamesTextBox_Validated);
@@ -365 +364 @@
       this.refreshButton.UseVisualStyleBackColor = true;
       this.refreshButton.Click += new System.EventHandler(this.refreshButton_Click);
-      // 
-      // isPrivilegedCheckBox
-      // 
-      this.isPrivilegedCheckBox.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
-      this.isPrivilegedCheckBox.AutoSize = true;
-      this.isPrivilegedCheckBox.Location = new System.Drawing.Point(491, 54);
-      this.isPrivilegedCheckBox.Name = "isPrivilegedCheckBox";
-      this.isPrivilegedCheckBox.Size = new System.Drawing.Size(72, 17);
-      this.isPrivilegedCheckBox.TabIndex = 3;
-      this.isPrivilegedCheckBox.Text = "Privileged";
-      this.toolTip.SetToolTip(this.isPrivilegedCheckBox, "If checked, the task will be executed in a privileged sandbox on the slave.");
-      this.isPrivilegedCheckBox.UseVisualStyleBackColor = true;
-      this.isPrivilegedCheckBox.CheckedChanged += new System.EventHandler(this.isPrivilegedCheckBox_CheckChanged);
       // 
       // UnloadButton
@@ -475 +461 @@
       this.searchButton.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
       this.searchButton.Image = HeuristicLab.Common.Resources.VSImageLibrary.Zoom;
-      this.searchButton.Location = new System.Drawing.Point(461, 50);
+      this.searchButton.Location = new System.Drawing.Point(547, 50);
       this.searchButton.Name = "searchButton";
       this.searchButton.Size = new System.Drawing.Size(24, 24);
@@ -487 +473 @@
       this.Controls.Add(this.UnloadButton);
       this.Controls.Add(this.searchButton);
-      this.Controls.Add(this.isPrivilegedCheckBox);
       this.Controls.Add(this.infoGroupBox);
       this.Controls.Add(this.refreshAutomaticallyCheckBox);
@@ -542 +527 @@
     private System.Windows.Forms.Label calculatingLabel;
     private System.Windows.Forms.Label jobsLabel;
-    private System.Windows.Forms.CheckBox isPrivilegedCheckBox;
     private System.Windows.Forms.TabPage stateTabPage;
     private HeuristicLab.MainForm.WindowsForms.ViewHost stateLogViewHost;

stable/HeuristicLab.Clients.Hive.JobManager/3.3/Views/RefreshableHiveJobView.cs

@@ -119 +119 @@
           executionTimeTextBox.Text = string.Empty;
           resourceNamesTextBox.Text = string.Empty;
-          isPrivilegedCheckBox.Checked = false;
           refreshAutomaticallyCheckBox.Checked = false;
           lock (runCollectionViewLocker) {
@@ -132 +131 @@
           executionTimeTextBox.Text = Content.ExecutionTime.ToString();
           resourceNamesTextBox.Text = Content.Job.ResourceNames;
-          isPrivilegedCheckBox.Checked = Content.Job.IsPrivileged;
           refreshAutomaticallyCheckBox.Checked = Content.RefreshAutomatically;
           logView.Content = Content.Log;
@@ -163 +161 @@
       searchButton.Enabled = !Locked;
       jobsTreeView.Enabled = !Locked;
-      isPrivilegedCheckBox.Enabled = !Locked;
       refreshAutomaticallyCheckBox.Enabled = !Locked;
       refreshButton.Enabled = !Locked;
@@ -191 +188 @@
           this.jobsTreeView.ReadOnly = !Content.IsControllable || Content.ExecutionState != ExecutionState.Prepared || alreadyUploaded || Content.IsProgressing;
 
-          this.isPrivilegedCheckBox.Enabled = HiveClient.Instance.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;
@@ -279 +275 @@
       lock (runCollectionViewLocker) {
         runCollectionViewHost.Content = GetAllRunsFromJob(Content);
-      }
-      if (InvokeRequired) {
-        Invoke(new Action(() => { isPrivilegedCheckBox.Checked = Content.Job.IsPrivileged; }));
-      } else {
-        isPrivilegedCheckBox.Checked = Content.Job.IsPrivileged;
       }
     }
@@ -423 +414 @@
     }
 
-    private void isPrivilegedCheckBox_CheckChanged(object sender, EventArgs e) {
-      if (Content != null && !SuppressEvents) Content.Job.IsPrivileged = isPrivilegedCheckBox.Checked;
-    }
-
     private void refreshButton_Click(object sender, EventArgs e) {
       var invoker = new Action<RefreshableJob>(HiveClient.LoadJob);