Ignore:
Timestamp:
07/16/17 13:08:06 (5 years ago)
Author:
jkarder
Message:

#2784: merged r14901 and r15121 into stable

Location:
stable
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • stable

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

    r14186 r15262  
    6060      this.startButton = new System.Windows.Forms.Button();
    6161      this.stopButton = new System.Windows.Forms.Button();
    62       this.resetButton = new System.Windows.Forms.Button();
    6362      this.executionTimeLabel = new System.Windows.Forms.Label();
    6463      this.executionTimeTextBox = new System.Windows.Forms.TextBox();
     
    271270      this.stopButton.Click += new System.EventHandler(this.stopButton_Click);
    272271      //
    273       // resetButton
    274       //
    275       this.resetButton.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
    276       this.resetButton.Enabled = false;
    277       this.resetButton.Image = HeuristicLab.Common.Resources.VSImageLibrary.Restart;
    278       this.resetButton.Location = new System.Drawing.Point(90, 536);
    279       this.resetButton.Name = "resetButton";
    280       this.resetButton.Size = new System.Drawing.Size(24, 24);
    281       this.resetButton.TabIndex = 8;
    282       this.toolTip.SetToolTip(this.resetButton, "Reset Experiment");
    283       this.resetButton.UseVisualStyleBackColor = true;
    284       this.resetButton.Click += new System.EventHandler(this.resetButton_Click);
    285       //
    286272      // executionTimeLabel
    287273      //
     
    486472      this.Controls.Add(this.resourceIdsLabel);
    487473      this.Controls.Add(this.stopButton);
    488       this.Controls.Add(this.resetButton);
    489474      this.Name = "RefreshableHiveJobView";
    490475      this.Size = new System.Drawing.Size(717, 560);
     
    505490    private System.Windows.Forms.Button startButton;
    506491    private System.Windows.Forms.Button stopButton;
    507     private System.Windows.Forms.Button resetButton;
    508492    private System.Windows.Forms.Label executionTimeLabel;
    509493    private System.Windows.Forms.TextBox executionTimeTextBox;
  • stable/HeuristicLab.Clients.Hive.JobManager/3.3/Views/RefreshableHiveJobView.cs

    r14186 r15262  
    167167      pauseButton.Enabled = !Locked;
    168168      stopButton.Enabled = !Locked;
    169       resetButton.Enabled = !Locked;
    170169    }
    171170
     
    188187          this.jobsTreeView.ReadOnly = !Content.IsControllable || Content.ExecutionState != ExecutionState.Prepared || alreadyUploaded || Content.IsProgressing;
    189188
    190           this.refreshAutomaticallyCheckBox.Enabled = Content.IsControllable && alreadyUploaded && jobsLoaded && Content.ExecutionState == ExecutionState.Started && !Content.IsProgressing;
     189          this.refreshAutomaticallyCheckBox.Enabled = Content.IsControllable && alreadyUploaded && jobsLoaded && (Content.ExecutionState == ExecutionState.Started || Content.ExecutionState == ExecutionState.Paused) && !Content.IsProgressing;
    191190          this.refreshButton.Enabled = Content.IsDownloadable && alreadyUploaded && !Content.IsProgressing;
    192191
     
    380379      }, TaskContinuationOptions.OnlyOnFaulted);
    381380    }
    382     private void resetButton_Click(object sender, EventArgs e) { }
    383381
    384382    private void PauseJobAsync(object job) {
     
    438436    private void SetEnabledStateOfExecutableButtons() {
    439437      if (Content == null) {
    440         startButton.Enabled = pauseButton.Enabled = stopButton.Enabled = resetButton.Enabled = false;
     438        startButton.Enabled = pauseButton.Enabled = stopButton.Enabled = false;
    441439      } else {
    442440        startButton.Enabled = Content.IsControllable && Content.HiveTasks != null && Content.HiveTasks.Count > 0 && (Content.ExecutionState == ExecutionState.Prepared || Content.ExecutionState == ExecutionState.Paused) && !Content.IsProgressing;
    443441        pauseButton.Enabled = Content.IsControllable && Content.ExecutionState == ExecutionState.Started && !Content.IsProgressing;
    444         stopButton.Enabled = Content.IsControllable && Content.ExecutionState == ExecutionState.Started && !Content.IsProgressing;
    445         resetButton.Enabled = false;
     442        stopButton.Enabled = Content.IsControllable && (Content.ExecutionState == ExecutionState.Started || Content.ExecutionState == ExecutionState.Paused) && !Content.IsProgressing;
    446443      }
    447444    }
Note: See TracChangeset for help on using the changeset viewer.