Ignore:
Timestamp:
09/21/15 16:35:55 (7 years ago)
Author:
ascheibe
Message:

#2355 merged r12926, r12927 and r12959 into stable

Location:
stable
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • stable

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

    r12009 r12963  
    7070      this.toolTip = new System.Windows.Forms.ToolTip(this.components);
    7171      this.refreshButton = new System.Windows.Forms.Button();
    72       this.isPrivilegedCheckBox = new System.Windows.Forms.CheckBox();
    7372      this.UnloadButton = new System.Windows.Forms.Button();
    7473      this.refreshAutomaticallyCheckBox = new System.Windows.Forms.CheckBox();
     
    332331      this.resourceNamesTextBox.Location = new System.Drawing.Point(70, 52);
    333332      this.resourceNamesTextBox.Name = "resourceNamesTextBox";
    334       this.resourceNamesTextBox.Size = new System.Drawing.Size(385, 20);
     333      this.resourceNamesTextBox.Size = new System.Drawing.Size(471, 20);
    335334      this.resourceNamesTextBox.TabIndex = 2;
    336335      this.resourceNamesTextBox.Validated += new System.EventHandler(this.resourceNamesTextBox_Validated);
     
    365364      this.refreshButton.UseVisualStyleBackColor = true;
    366365      this.refreshButton.Click += new System.EventHandler(this.refreshButton_Click);
    367       //
    368       // isPrivilegedCheckBox
    369       //
    370       this.isPrivilegedCheckBox.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
    371       this.isPrivilegedCheckBox.AutoSize = true;
    372       this.isPrivilegedCheckBox.Location = new System.Drawing.Point(491, 54);
    373       this.isPrivilegedCheckBox.Name = "isPrivilegedCheckBox";
    374       this.isPrivilegedCheckBox.Size = new System.Drawing.Size(72, 17);
    375       this.isPrivilegedCheckBox.TabIndex = 3;
    376       this.isPrivilegedCheckBox.Text = "Privileged";
    377       this.toolTip.SetToolTip(this.isPrivilegedCheckBox, "If checked, the task will be executed in a privileged sandbox on the slave.");
    378       this.isPrivilegedCheckBox.UseVisualStyleBackColor = true;
    379       this.isPrivilegedCheckBox.CheckedChanged += new System.EventHandler(this.isPrivilegedCheckBox_CheckChanged);
    380366      //
    381367      // UnloadButton
     
    475461      this.searchButton.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
    476462      this.searchButton.Image = HeuristicLab.Common.Resources.VSImageLibrary.Zoom;
    477       this.searchButton.Location = new System.Drawing.Point(461, 50);
     463      this.searchButton.Location = new System.Drawing.Point(547, 50);
    478464      this.searchButton.Name = "searchButton";
    479465      this.searchButton.Size = new System.Drawing.Size(24, 24);
     
    487473      this.Controls.Add(this.UnloadButton);
    488474      this.Controls.Add(this.searchButton);
    489       this.Controls.Add(this.isPrivilegedCheckBox);
    490475      this.Controls.Add(this.infoGroupBox);
    491476      this.Controls.Add(this.refreshAutomaticallyCheckBox);
     
    542527    private System.Windows.Forms.Label calculatingLabel;
    543528    private System.Windows.Forms.Label jobsLabel;
    544     private System.Windows.Forms.CheckBox isPrivilegedCheckBox;
    545529    private System.Windows.Forms.TabPage stateTabPage;
    546530    private HeuristicLab.MainForm.WindowsForms.ViewHost stateLogViewHost;
  • stable/HeuristicLab.Clients.Hive.JobManager/3.3/Views/RefreshableHiveJobView.cs

    r12009 r12963  
    119119          executionTimeTextBox.Text = string.Empty;
    120120          resourceNamesTextBox.Text = string.Empty;
    121           isPrivilegedCheckBox.Checked = false;
    122121          refreshAutomaticallyCheckBox.Checked = false;
    123122          lock (runCollectionViewLocker) {
     
    132131          executionTimeTextBox.Text = Content.ExecutionTime.ToString();
    133132          resourceNamesTextBox.Text = Content.Job.ResourceNames;
    134           isPrivilegedCheckBox.Checked = Content.Job.IsPrivileged;
    135133          refreshAutomaticallyCheckBox.Checked = Content.RefreshAutomatically;
    136134          logView.Content = Content.Log;
     
    163161      searchButton.Enabled = !Locked;
    164162      jobsTreeView.Enabled = !Locked;
    165       isPrivilegedCheckBox.Enabled = !Locked;
    166163      refreshAutomaticallyCheckBox.Enabled = !Locked;
    167164      refreshButton.Enabled = !Locked;
     
    191188          this.jobsTreeView.ReadOnly = !Content.IsControllable || Content.ExecutionState != ExecutionState.Prepared || alreadyUploaded || Content.IsProgressing;
    192189
    193           this.isPrivilegedCheckBox.Enabled = HiveClient.Instance.IsAllowedPrivileged && Content.IsControllable && !(Content.ExecutionState != ExecutionState.Prepared || alreadyUploaded) && !Content.IsProgressing;
    194190          this.refreshAutomaticallyCheckBox.Enabled = Content.IsControllable && alreadyUploaded && jobsLoaded && Content.ExecutionState == ExecutionState.Started && !Content.IsProgressing;
    195191          this.refreshButton.Enabled = Content.IsDownloadable && alreadyUploaded && !Content.IsProgressing;
     
    279275      lock (runCollectionViewLocker) {
    280276        runCollectionViewHost.Content = GetAllRunsFromJob(Content);
    281       }
    282       if (InvokeRequired) {
    283         Invoke(new Action(() => { isPrivilegedCheckBox.Checked = Content.Job.IsPrivileged; }));
    284       } else {
    285         isPrivilegedCheckBox.Checked = Content.Job.IsPrivileged;
    286277      }
    287278    }
     
    423414    }
    424415
    425     private void isPrivilegedCheckBox_CheckChanged(object sender, EventArgs e) {
    426       if (Content != null && !SuppressEvents) Content.Job.IsPrivileged = isPrivilegedCheckBox.Checked;
    427     }
    428 
    429416    private void refreshButton_Click(object sender, EventArgs e) {
    430417      var invoker = new Action<RefreshableJob>(HiveClient.LoadJob);
Note: See TracChangeset for help on using the changeset viewer.