Free cookie consent management tool by TermsFeed Policy Generator

Changeset 6791


Ignore:
Timestamp:
09/16/11 20:19:53 (11 years ago)
Author:
ascheibe
Message:

#1233 implemented Experiment Manager review comments

Location:
branches/HeuristicLab.Hive-3.4/sources
Files:
10 edited

Legend:

Unmodified
Added
Removed
  • branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive.ExperimentManager/3.3/Views/HiveExperimentPermissionListView.cs

    r6723 r6791  
    3434      get { return hiveExperimentId; }
    3535      set { hiveExperimentId = value; }
    36     }   
     36    }
    3737
    3838    public HiveExperimentPermissionListView() {
    3939      InitializeComponent();
     40      itemsGroupBox.Text = "Permissions";
    4041    }
    4142
  • branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive.ExperimentManager/3.3/Views/HiveExperimentPermissionView.Designer.cs

    r6479 r6791  
    4848      this.permissionLabel.Location = new System.Drawing.Point(4, 57);
    4949      this.permissionLabel.Name = "permissionLabel";
    50       this.permissionLabel.Size = new System.Drawing.Size(57, 13);
     50      this.permissionLabel.Size = new System.Drawing.Size(60, 13);
    5151      this.permissionLabel.TabIndex = 2;
    52       this.permissionLabel.Text = "Permission";
     52      this.permissionLabel.Text = "Permission:";
    5353      //
    5454      // usernameTextBox
     
    5656      this.usernameTextBox.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
    5757                  | System.Windows.Forms.AnchorStyles.Right)));
    58       this.usernameTextBox.Location = new System.Drawing.Point(67, 28);
     58      this.usernameTextBox.Location = new System.Drawing.Point(70, 28);
    5959      this.usernameTextBox.Name = "usernameTextBox";
    60       this.usernameTextBox.Size = new System.Drawing.Size(284, 20);
     60      this.usernameTextBox.Size = new System.Drawing.Size(281, 20);
    6161      this.usernameTextBox.TabIndex = 3;
    6262      this.usernameTextBox.Validated += new System.EventHandler(this.usernameTextBox_Validated);
    63       this.usernameTextBox.Validating += new System.ComponentModel.CancelEventHandler(usernameTextBox_Validating);
    6463      //
    6564      // permissionComboBox
     
    6766      this.permissionComboBox.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
    6867                  | System.Windows.Forms.AnchorStyles.Right)));
     68      this.permissionComboBox.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
    6969      this.permissionComboBox.FormattingEnabled = true;
    70       this.permissionComboBox.Location = new System.Drawing.Point(67, 54);
     70      this.permissionComboBox.Location = new System.Drawing.Point(70, 54);
    7171      this.permissionComboBox.Name = "permissionComboBox";
    72       this.permissionComboBox.Size = new System.Drawing.Size(284, 21);
    73       this.permissionComboBox.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
     72      this.permissionComboBox.Size = new System.Drawing.Size(281, 21);
    7473      this.permissionComboBox.TabIndex = 4;
    7574      this.permissionComboBox.Validated += new System.EventHandler(this.permissionComboBox_Validated);
    76       this.permissionComboBox.Validating += new System.ComponentModel.CancelEventHandler(permissionComboBox_Validating);
    7775      //
    7876      // HiveExperimentPermissionView
  • branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive.ExperimentManager/3.3/Views/HiveExperimentPermissionView.resx

    r6463 r6791  
    121121    <value>17, 17</value>
    122122  </metadata>
    123   <metadata name="toolTip.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
    124     <value>17, 17</value>
    125   </metadata>
    126123</root>
  • branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive.ExperimentManager/3.3/Views/RefreshableHiveExperimentListView.cs

    r6725 r6791  
    2222using System;
    2323using System.Windows.Forms;
     24using HeuristicLab.Collections;
    2425using HeuristicLab.Core;
    25 using HeuristicLab.Core.Views;
    2626using HeuristicLab.MainForm;
    2727
     
    2929  [View("HiveExperimentList View")]
    3030  [Content(typeof(ItemCollection<RefreshableJob>), false)]
    31   public partial class RefreshableHiveExperimentListView : ItemCollectionView<RefreshableJob> {
     31  public partial class RefreshableHiveExperimentListView : HeuristicLab.Core.Views.ItemCollectionView<RefreshableJob> {
    3232
    3333    public RefreshableHiveExperimentListView() {
    3434      InitializeComponent();
     35      itemsGroupBox.Text = "Jobs";
    3536      this.itemsListView.View = View.Details;
    3637      this.itemsListView.Columns.Clear();
    3738      this.itemsListView.Columns.Add(new ColumnHeader("Date") { Text = "Date" });
    3839      this.itemsListView.Columns.Add(new ColumnHeader("Name") { Text = "Name" });
     40      foreach (ColumnHeader c in this.itemsListView.Columns) {
     41        c.AutoResize(ColumnHeaderAutoResizeStyle.HeaderSize);
     42      }
    3943      this.itemsListView.HeaderStyle = ColumnHeaderStyle.Clickable;
    4044      this.itemsListView.FullRowSelect = true;
     
    5660    protected override void Content_ItemsAdded(object sender, Collections.CollectionItemsChangedEventArgs<RefreshableJob> e) {
    5761      base.Content_ItemsAdded(sender, e);
     62      foreach (ColumnHeader c in this.itemsListView.Columns) {
     63        c.AutoResize(ColumnHeaderAutoResizeStyle.ColumnContent);
     64      }
     65    }
    5866
     67    protected override void Content_ItemsRemoved(object sender, CollectionItemsChangedEventArgs<RefreshableJob> e) {
     68      base.Content_ItemsRemoved(sender, e);
     69      if (Content != null && Content.Count == 0) {
     70        foreach (ColumnHeader c in this.itemsListView.Columns) {
     71          c.AutoResize(ColumnHeaderAutoResizeStyle.HeaderSize);
     72        }
     73      }
    5974    }
    6075
  • branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive.ExperimentManager/3.3/Views/RefreshableHiveExperimentView.Designer.cs

    r6727 r6791  
    1 #region License Information
    2 /* HeuristicLab
    3  * Copyright (C) 2002-2011 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    4  *
    5  * This file is part of HeuristicLab.
    6  *
    7  * HeuristicLab is free software: you can redistribute it and/or modify
    8  * it under the terms of the GNU General Public License as published by
    9  * the Free Software Foundation, either version 3 of the License, or
    10  * (at your option) any later version.
    11  *
    12  * HeuristicLab is distributed in the hope that it will be useful,
    13  * but WITHOUT ANY WARRANTY; without even the implied warranty of
    14  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
    15  * GNU General Public License for more details.
    16  *
    17  * You should have received a copy of the GNU General Public License
    18  * along with HeuristicLab. If not, see <http://www.gnu.org/licenses/>.
    19  */
    20 #endregion
    21 
    22 using HeuristicLab.Clients.Hive.Views.ExperimentManager;
    23 using HeuristicLab.MainForm.WindowsForms;
    24 namespace HeuristicLab.Clients.Hive.ExperimentManager.Views {
     1namespace HeuristicLab.Clients.Hive.ExperimentManager.Views {
    252  partial class RefreshableHiveExperimentView {
    263    /// <summary>
     
    5027      System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(RefreshableHiveExperimentView));
    5128      this.tabControl = new System.Windows.Forms.TabControl();
    52       this.jobsTabPage = new System.Windows.Forms.TabPage();
     29      this.tasksTabPage = new System.Windows.Forms.TabPage();
    5330      this.jobsTreeView = new HeuristicLab.Clients.Hive.Views.ExperimentManager.HiveTaskItemTreeView();
     31      this.permissionTabPage = new System.Windows.Forms.TabPage();
     32      this.refreshPermissionsButton = new System.Windows.Forms.Button();
     33      this.hiveExperimentPermissionListView = new HeuristicLab.Clients.Hive.ExperimentManager.Views.HiveExperimentPermissionListView();
     34      this.runsTabPage = new System.Windows.Forms.TabPage();
    5435      this.stateTabPage = new System.Windows.Forms.TabPage();
    5536      this.stateLogViewHost = new HeuristicLab.MainForm.WindowsForms.ViewHost();
    56       this.sharingTabPage = new System.Windows.Forms.TabPage();
    57       this.refreshPermissionsButton = new System.Windows.Forms.Button();
    58       this.hiveExperimentPermissionListView = new HeuristicLab.Clients.Hive.ExperimentManager.Views.HiveExperimentPermissionListView();
    5937      this.logTabPage = new System.Windows.Forms.TabPage();
    6038      this.logView = new HeuristicLab.Core.Views.LogView();
     
    8159      this.jobsLabel = new System.Windows.Forms.Label();
    8260      this.tabControl.SuspendLayout();
    83       this.jobsTabPage.SuspendLayout();
     61      this.tasksTabPage.SuspendLayout();
     62      this.permissionTabPage.SuspendLayout();
    8463      this.stateTabPage.SuspendLayout();
    85       this.sharingTabPage.SuspendLayout();
    8664      this.logTabPage.SuspendLayout();
    8765      this.infoGroupBox.SuspendLayout();
     
    9371                  | System.Windows.Forms.AnchorStyles.Left)
    9472                  | System.Windows.Forms.AnchorStyles.Right)));
    95       this.tabControl.Controls.Add(this.jobsTabPage);
     73      this.tabControl.Controls.Add(this.tasksTabPage);
     74      this.tabControl.Controls.Add(this.permissionTabPage);
     75      this.tabControl.Controls.Add(this.runsTabPage);
    9676      this.tabControl.Controls.Add(this.stateTabPage);
    97       this.tabControl.Controls.Add(this.sharingTabPage);
    9877      this.tabControl.Controls.Add(this.logTabPage);
    9978      this.tabControl.Location = new System.Drawing.Point(0, 78);
     
    10483      this.tabControl.SelectedIndexChanged += new System.EventHandler(this.tabControl_SelectedIndexChanged);
    10584      //
    106       // jobsTabPage
    107       //
    108       this.jobsTabPage.Controls.Add(this.jobsTreeView);
    109       this.jobsTabPage.Location = new System.Drawing.Point(4, 22);
    110       this.jobsTabPage.Name = "jobsTabPage";
    111       this.jobsTabPage.Size = new System.Drawing.Size(709, 426);
    112       this.jobsTabPage.TabIndex = 5;
    113       this.jobsTabPage.Text = "Jobs";
    114       this.jobsTabPage.UseVisualStyleBackColor = true;
     85      // tasksTabPage
     86      //
     87      this.tasksTabPage.Controls.Add(this.jobsTreeView);
     88      this.tasksTabPage.Location = new System.Drawing.Point(4, 22);
     89      this.tasksTabPage.Name = "tasksTabPage";
     90      this.tasksTabPage.Size = new System.Drawing.Size(709, 426);
     91      this.tasksTabPage.TabIndex = 5;
     92      this.tasksTabPage.Text = "Tasks";
     93      this.tasksTabPage.UseVisualStyleBackColor = true;
    11594      //
    11695      // jobsTreeView
     
    131110      this.jobsTreeView.DragOver += new System.Windows.Forms.DragEventHandler(this.jobsTreeView_DragOver);
    132111      //
    133       // stateTabPage
    134       //
    135       this.stateTabPage.Controls.Add(this.stateLogViewHost);
    136       this.stateTabPage.Location = new System.Drawing.Point(4, 22);
    137       this.stateTabPage.Name = "stateTabPage";
    138       this.stateTabPage.Size = new System.Drawing.Size(709, 426);
    139       this.stateTabPage.TabIndex = 6;
    140       this.stateTabPage.Text = "States";
    141       this.stateTabPage.UseVisualStyleBackColor = true;
    142       //
    143       // stateLogViewHost
    144       //
    145       this.stateLogViewHost.Caption = "StateLog View";
    146       this.stateLogViewHost.Content = null;
    147       this.stateLogViewHost.Dock = System.Windows.Forms.DockStyle.Fill;
    148       this.stateLogViewHost.Enabled = false;
    149       this.stateLogViewHost.Location = new System.Drawing.Point(0, 0);
    150       this.stateLogViewHost.Name = "stateLogViewHost";
    151       this.stateLogViewHost.ReadOnly = false;
    152       this.stateLogViewHost.Size = new System.Drawing.Size(709, 426);
    153       this.stateLogViewHost.TabIndex = 0;
    154       this.stateLogViewHost.ViewsLabelVisible = true;
    155       this.stateLogViewHost.ViewType = null;
    156       //
    157       // sharingTabPage
    158       //
    159       this.sharingTabPage.Controls.Add(this.refreshPermissionsButton);
    160       this.sharingTabPage.Controls.Add(this.hiveExperimentPermissionListView);
    161       this.sharingTabPage.Location = new System.Drawing.Point(4, 22);
    162       this.sharingTabPage.Name = "sharingTabPage";
    163       this.sharingTabPage.Size = new System.Drawing.Size(709, 426);
    164       this.sharingTabPage.TabIndex = 7;
    165       this.sharingTabPage.Text = "Sharing";
    166       this.sharingTabPage.UseVisualStyleBackColor = true;
     112      // permissionTabPage
     113      //
     114      this.permissionTabPage.Controls.Add(this.refreshPermissionsButton);
     115      this.permissionTabPage.Controls.Add(this.hiveExperimentPermissionListView);
     116      this.permissionTabPage.Location = new System.Drawing.Point(4, 22);
     117      this.permissionTabPage.Name = "permissionTabPage";
     118      this.permissionTabPage.Size = new System.Drawing.Size(709, 426);
     119      this.permissionTabPage.TabIndex = 7;
     120      this.permissionTabPage.Text = "Permissions";
     121      this.permissionTabPage.UseVisualStyleBackColor = true;
    167122      //
    168123      // refreshPermissionsButton
     
    188143      this.hiveExperimentPermissionListView.Name = "hiveExperimentPermissionListView";
    189144      this.hiveExperimentPermissionListView.ReadOnly = false;
     145      this.hiveExperimentPermissionListView.ShowDetails = true;
    190146      this.hiveExperimentPermissionListView.Size = new System.Drawing.Size(703, 390);
    191147      this.hiveExperimentPermissionListView.TabIndex = 0;
     148      //
     149      // runsTabPage
     150      //
     151      this.runsTabPage.Location = new System.Drawing.Point(4, 22);
     152      this.runsTabPage.Name = "runsTabPage";
     153      this.runsTabPage.Padding = new System.Windows.Forms.Padding(3);
     154      this.runsTabPage.Size = new System.Drawing.Size(709, 426);
     155      this.runsTabPage.TabIndex = 8;
     156      this.runsTabPage.Text = "Runs";
     157      this.runsTabPage.UseVisualStyleBackColor = true;
     158      //
     159      // stateTabPage
     160      //
     161      this.stateTabPage.Controls.Add(this.stateLogViewHost);
     162      this.stateTabPage.Location = new System.Drawing.Point(4, 22);
     163      this.stateTabPage.Name = "stateTabPage";
     164      this.stateTabPage.Size = new System.Drawing.Size(709, 426);
     165      this.stateTabPage.TabIndex = 6;
     166      this.stateTabPage.Text = "Execution History";
     167      this.stateTabPage.UseVisualStyleBackColor = true;
     168      //
     169      // stateLogViewHost
     170      //
     171      this.stateLogViewHost.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
     172                  | System.Windows.Forms.AnchorStyles.Left)
     173                  | System.Windows.Forms.AnchorStyles.Right)));
     174      this.stateLogViewHost.Caption = "StateLog View";
     175      this.stateLogViewHost.Content = null;
     176      this.stateLogViewHost.Enabled = false;
     177      this.stateLogViewHost.Location = new System.Drawing.Point(3, 3);
     178      this.stateLogViewHost.Name = "stateLogViewHost";
     179      this.stateLogViewHost.ReadOnly = false;
     180      this.stateLogViewHost.Size = new System.Drawing.Size(703, 420);
     181      this.stateLogViewHost.TabIndex = 0;
     182      this.stateLogViewHost.ViewsLabelVisible = true;
     183      this.stateLogViewHost.ViewType = null;
    192184      //
    193185      // logTabPage
     
    203195      // logView
    204196      //
     197      this.logView.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
     198                  | System.Windows.Forms.AnchorStyles.Left)
     199                  | System.Windows.Forms.AnchorStyles.Right)));
    205200      this.logView.Caption = "Log View";
    206201      this.logView.Content = null;
    207       this.logView.Dock = System.Windows.Forms.DockStyle.Fill;
    208       this.logView.Location = new System.Drawing.Point(0, 0);
     202      this.logView.Location = new System.Drawing.Point(3, 3);
    209203      this.logView.Name = "logView";
    210204      this.logView.ReadOnly = false;
    211       this.logView.Size = new System.Drawing.Size(709, 426);
     205      this.logView.Size = new System.Drawing.Size(703, 420);
    212206      this.logView.TabIndex = 0;
    213207      //
     
    284278      //
    285279      this.resourceIdsLabel.AutoSize = true;
    286       this.resourceIdsLabel.Location = new System.Drawing.Point(4, 56);
     280      this.resourceIdsLabel.Location = new System.Drawing.Point(3, 56);
    287281      this.resourceIdsLabel.Name = "resourceIdsLabel";
    288       this.resourceIdsLabel.Size = new System.Drawing.Size(70, 13);
     282      this.resourceIdsLabel.Size = new System.Drawing.Size(61, 13);
    289283      this.resourceIdsLabel.TabIndex = 12;
    290       this.resourceIdsLabel.Text = "ResourceIds:";
     284      this.resourceIdsLabel.Text = "Resources:";
    291285      //
    292286      // resourceNamesTextBox
     
    294288      this.resourceNamesTextBox.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
    295289                  | System.Windows.Forms.AnchorStyles.Right)));
    296       this.resourceNamesTextBox.Location = new System.Drawing.Point(73, 53);
     290      this.resourceNamesTextBox.Location = new System.Drawing.Point(70, 52);
    297291      this.resourceNamesTextBox.Name = "resourceNamesTextBox";
    298292      this.resourceNamesTextBox.Size = new System.Drawing.Size(415, 20);
     
    303297      //
    304298      this.nameLabel.AutoSize = true;
    305       this.nameLabel.Location = new System.Drawing.Point(1, 27);
     299      this.nameLabel.Location = new System.Drawing.Point(3, 30);
    306300      this.nameLabel.Name = "nameLabel";
    307301      this.nameLabel.Size = new System.Drawing.Size(38, 13);
     
    313307      this.nameTextBox.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
    314308                  | System.Windows.Forms.AnchorStyles.Right)));
    315       this.nameTextBox.Location = new System.Drawing.Point(73, 27);
     309      this.nameTextBox.Location = new System.Drawing.Point(70, 27);
    316310      this.nameTextBox.Name = "nameTextBox";
    317311      this.nameTextBox.Size = new System.Drawing.Size(501, 20);
     
    334328      this.isPrivilegedCheckBox.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
    335329      this.isPrivilegedCheckBox.AutoSize = true;
    336       this.isPrivilegedCheckBox.Location = new System.Drawing.Point(494, 55);
     330      this.isPrivilegedCheckBox.Location = new System.Drawing.Point(491, 53);
    337331      this.isPrivilegedCheckBox.Name = "isPrivilegedCheckBox";
    338       this.isPrivilegedCheckBox.Size = new System.Drawing.Size(80, 17);
     332      this.isPrivilegedCheckBox.Size = new System.Drawing.Size(72, 17);
    339333      this.isPrivilegedCheckBox.TabIndex = 26;
    340       this.isPrivilegedCheckBox.Text = "IsPrivileged";
     334      this.isPrivilegedCheckBox.Text = "Privileged";
    341335      this.toolTip.SetToolTip(this.isPrivilegedCheckBox, "If checked, the task will be executed in a privileged sandbox on the slave.");
    342336      this.isPrivilegedCheckBox.UseVisualStyleBackColor = true;
     
    348342      this.refreshAutomaticallyCheckBox.Location = new System.Drawing.Point(30, 5);
    349343      this.refreshAutomaticallyCheckBox.Name = "refreshAutomaticallyCheckBox";
    350       this.refreshAutomaticallyCheckBox.Size = new System.Drawing.Size(128, 17);
     344      this.refreshAutomaticallyCheckBox.Size = new System.Drawing.Size(127, 17);
    351345      this.refreshAutomaticallyCheckBox.TabIndex = 24;
    352       this.refreshAutomaticallyCheckBox.Text = "&Refresh Automatically";
     346      this.refreshAutomaticallyCheckBox.Text = "&Refresh automatically";
    353347      this.refreshAutomaticallyCheckBox.UseVisualStyleBackColor = true;
    354348      this.refreshAutomaticallyCheckBox.Validated += new System.EventHandler(this.refreshAutomaticallyCheckBox_Validated);
     
    368362      this.infoGroupBox.TabIndex = 25;
    369363      this.infoGroupBox.TabStop = false;
    370       this.infoGroupBox.Text = "Info";
     364      this.infoGroupBox.Text = "Tasks";
    371365      //
    372366      // finishedTextBox
     
    420414      this.jobsLabel.Location = new System.Drawing.Point(6, 19);
    421415      this.jobsLabel.Name = "jobsLabel";
    422       this.jobsLabel.Size = new System.Drawing.Size(32, 13);
     416      this.jobsLabel.Size = new System.Drawing.Size(46, 13);
    423417      this.jobsLabel.TabIndex = 0;
    424       this.jobsLabel.Text = "Jobs:";
     418      this.jobsLabel.Text = "Waiting:";
    425419      //
    426420      // RefreshableHiveExperimentView
     
    446440      this.Size = new System.Drawing.Size(717, 560);
    447441      this.tabControl.ResumeLayout(false);
    448       this.jobsTabPage.ResumeLayout(false);
     442      this.tasksTabPage.ResumeLayout(false);
     443      this.permissionTabPage.ResumeLayout(false);
    449444      this.stateTabPage.ResumeLayout(false);
    450       this.sharingTabPage.ResumeLayout(false);
    451445      this.logTabPage.ResumeLayout(false);
    452446      this.infoGroupBox.ResumeLayout(false);
     
    469463    private System.Windows.Forms.TabPage logTabPage;
    470464    private Core.Views.LogView logView;
    471     private System.Windows.Forms.TabPage jobsTabPage;
    472     private HiveTaskItemTreeView jobsTreeView;
     465    private System.Windows.Forms.TabPage tasksTabPage;
     466    private HeuristicLab.Clients.Hive.Views.ExperimentManager.HiveTaskItemTreeView jobsTreeView;
    473467    private System.Windows.Forms.Label nameLabel;
    474468    private System.Windows.Forms.TextBox nameTextBox;
     
    485479    private System.Windows.Forms.CheckBox isPrivilegedCheckBox;
    486480    private System.Windows.Forms.TabPage stateTabPage;
    487     private ViewHost stateLogViewHost;
    488     private System.Windows.Forms.TabPage sharingTabPage;
     481    private HeuristicLab.MainForm.WindowsForms.ViewHost stateLogViewHost;
     482    private System.Windows.Forms.TabPage permissionTabPage;
    489483    private HiveExperimentPermissionListView hiveExperimentPermissionListView;
    490484    private System.Windows.Forms.Button refreshPermissionsButton;
     485    private System.Windows.Forms.TabPage runsTabPage;
    491486
    492487  }
  • branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive.ExperimentManager/3.3/Views/RefreshableHiveExperimentView.cs

    r6743 r6791  
    4040  [View("Hive Experiment View")]
    4141  [Content(typeof(RefreshableJob), true)]
    42   public sealed partial class RefreshableHiveExperimentView : ItemView {
     42  public partial class RefreshableHiveExperimentView : HeuristicLab.Core.Views.ItemView {
    4343    private ProgressView progressView;
    4444
     
    8787      Content.Job.PropertyChanged += new PropertyChangedEventHandler(HiveExperiment_PropertyChanged);
    8888    }
    89    
     89
    9090    private void DeregisterHiveExperimentEvents() {
    9191      Content.Job.PropertyChanged -= new PropertyChangedEventHandler(HiveExperiment_PropertyChanged);
     
    253253      else {
    254254        if (Content != null) {
    255           jobsTextBox.Text = Content.Job.JobCount.ToString();
     255          jobsTextBox.Text = (Content.Job.JobCount - Content.Job.CalculatingCount - Content.Job.FinishedCount).ToString();
    256256          calculatingTextBox.Text = Content.Job.CalculatingCount.ToString();
    257257          finishedTextBox.Text = Content.Job.FinishedCount.ToString();
     
    291291
    292292    private void HiveExperiment_PropertyChanged(object sender, PropertyChangedEventArgs e) {
    293       if(this.Content != null && e.PropertyName == "Id") this.hiveExperimentPermissionListView.HiveExperimentId = this.Content.Job.Id;
     293      if (this.Content != null && e.PropertyName == "Id") this.hiveExperimentPermissionListView.HiveExperimentId = this.Content.Job.Id;
    294294    }
    295295    #endregion
     
    413413
    414414    private void tabControl_SelectedIndexChanged(object sender, EventArgs e) {
    415       if (tabControl.SelectedTab == sharingTabPage) {
     415      if (tabControl.SelectedTab == permissionTabPage) {
    416416        if (!Content.IsSharable) {
    417417          MessageBox.Show("Unable to load tab. You have insufficient access privileges.");
    418           tabControl.SelectedTab = jobsTabPage;
     418          tabControl.SelectedTab = tasksTabPage;
    419419        }
    420420      }
  • branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive.Views/3.3/HiveTasks/HiveTaskView.cs

    r6743 r6791  
    9393          this.jobIdTextBox.Text = Content.Task.Id.ToString();
    9494          this.dateCreatedTextBox.Text = Content.Task.DateCreated.HasValue ? Content.Task.DateCreated.ToString() : string.Empty;
    95           this.priorityTextBox.Text = Content.Task.Priority.ToString();
    96           this.coresNeededTextBox.Text = Content.Task.CoresNeeded.ToString();
    97           this.memoryNeededTextBox.Text = Content.Task.MemoryNeeded.ToString();
     95          this.priorityComboBox.Text = Content.Task.Priority.ToString();
     96          this.coresNeededComboBox.Text = Content.Task.CoresNeeded.ToString();
     97          this.memoryNeededComboBox.Text = Content.Task.MemoryNeeded.ToString();
    9898        } else {
    9999          this.jobIdTextBox.Text = string.Empty;
    100100          this.dateCreatedTextBox.Text = string.Empty;
    101           this.priorityTextBox.Text = string.Empty;
    102           this.coresNeededTextBox.Text = string.Empty;
    103           this.memoryNeededTextBox.Text = string.Empty;
     101          this.priorityComboBox.Text = "3";
     102          this.coresNeededComboBox.Text = "1";
     103          this.memoryNeededComboBox.Text = "256";
    104104        }
    105105      }
     
    113113    protected virtual void Job_ItemChanged(object sender, EventArgs e) {
    114114      if (Content != null && Content.Task != null && Content.ItemTask.Item != null) {
    115         optimizerItemView.Content = Content.ItemTask.Item;
    116       } else {
    117         optimizerItemView.Content = null;
     115      } else {
    118116      }
    119117    }
     
    196194      this.lastUpdatedTextBox.ReadOnly = true;
    197195
    198       this.priorityTextBox.ReadOnly = this.ReadOnly;
    199       this.coresNeededTextBox.ReadOnly = this.ReadOnly;
    200       this.memoryNeededTextBox.ReadOnly = this.ReadOnly;
     196      this.priorityComboBox.Enabled = !this.ReadOnly;
     197      this.coresNeededComboBox.Enabled = !this.ReadOnly;
     198      this.memoryNeededComboBox.Enabled = !this.ReadOnly;
    201199      this.computeInParallelCheckBox.Enabled = !this.ReadOnly && this.Content != null && this.Content.ItemTask != null && this.Content.ItemTask.IsParallelizable;
    202200
    203201      this.modifyItemButton.Enabled = (Content != null && Content.ItemTask.Item != null && (Content.Task.State == TaskState.Paused || Content.Task.State == TaskState.Offline || Content.Task.State == TaskState.Finished || Content.Task.State == TaskState.Failed || Content.Task.State == TaskState.Aborted));
    204 
    205       optimizerItemView.ReadOnly = true;
    206202    }
    207203  }
  • branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive.Views/3.3/HiveTasks/HiveTaskView.designer.cs

    r6727 r6791  
    2828      this.detailsTabPage = new System.Windows.Forms.TabPage();
    2929      this.splitContainer1 = new System.Windows.Forms.SplitContainer();
     30      this.splitContainer2 = new System.Windows.Forms.SplitContainer();
     31      this.groupBoxGenerel = new System.Windows.Forms.GroupBox();
     32      this.jobIdLabel = new System.Windows.Forms.Label();
     33      this.jobIdTextBox = new System.Windows.Forms.TextBox();
     34      this.lastUpdatedLabel = new System.Windows.Forms.Label();
     35      this.lastUpdatedTextBox = new System.Windows.Forms.TextBox();
     36      this.priorityLabel = new System.Windows.Forms.Label();
    3037      this.configurationGroupBox = new System.Windows.Forms.GroupBox();
    31       this.priorityTextBox = new System.Windows.Forms.TextBox();
    32       this.priorityLabel = new System.Windows.Forms.Label();
    33       this.coresNeededTextBox = new System.Windows.Forms.TextBox();
    34       this.memoryNeededTextBox = new System.Windows.Forms.TextBox();
    3538      this.memoryNeededLabel = new System.Windows.Forms.Label();
    3639      this.coresNeededLabel = new System.Windows.Forms.Label();
     
    3841      this.computeInParallelCheckBox = new System.Windows.Forms.CheckBox();
    3942      this.jobStatusGroupBox = new System.Windows.Forms.GroupBox();
     43      this.commandTextBox = new System.Windows.Forms.TextBox();
     44      this.commandLabel = new System.Windows.Forms.Label();
    4045      this.stateTextBox = new System.Windows.Forms.TextBox();
    4146      this.dateCalculatedLabel = new System.Windows.Forms.Label();
     
    5055      this.dateFinishedLabel = new System.Windows.Forms.Label();
    5156      this.exceptionTextBox = new System.Windows.Forms.TextBox();
    52       this.optimizerGroupBox = new System.Windows.Forms.GroupBox();
    5357      this.modifyItemButton = new System.Windows.Forms.Button();
    54       this.lastUpdatedTextBox = new System.Windows.Forms.TextBox();
    55       this.lastUpdatedLabel = new System.Windows.Forms.Label();
    56       this.optimizerItemView = new HeuristicLab.Core.Views.ItemView();
    57       this.jobIdLabel = new System.Windows.Forms.Label();
    58       this.jobIdTextBox = new System.Windows.Forms.TextBox();
    5958      this.tabControl = new System.Windows.Forms.TabControl();
    60       this.commandTextBox = new System.Windows.Forms.TextBox();
    61       this.commandLabel = new System.Windows.Forms.Label();
     59      this.priorityComboBox = new System.Windows.Forms.ComboBox();
     60      this.coresNeededComboBox = new System.Windows.Forms.ComboBox();
     61      this.memoryNeededComboBox = new System.Windows.Forms.ComboBox();
    6262      this.stateLogTabPage.SuspendLayout();
    6363      this.detailsTabPage.SuspendLayout();
     
    6666      this.splitContainer1.Panel2.SuspendLayout();
    6767      this.splitContainer1.SuspendLayout();
     68      ((System.ComponentModel.ISupportInitialize)(this.splitContainer2)).BeginInit();
     69      this.splitContainer2.Panel1.SuspendLayout();
     70      this.splitContainer2.Panel2.SuspendLayout();
     71      this.splitContainer2.SuspendLayout();
     72      this.groupBoxGenerel.SuspendLayout();
    6873      this.configurationGroupBox.SuspendLayout();
    6974      this.jobStatusGroupBox.SuspendLayout();
    70       this.optimizerGroupBox.SuspendLayout();
    7175      this.tabControl.SuspendLayout();
    7276      this.SuspendLayout();
     
    8488      // stateLogViewHost
    8589      //
     90      this.stateLogViewHost.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
     91                  | System.Windows.Forms.AnchorStyles.Left)
     92                  | System.Windows.Forms.AnchorStyles.Right)));
    8693      this.stateLogViewHost.Caption = "View";
    8794      this.stateLogViewHost.Content = null;
    88       this.stateLogViewHost.Dock = System.Windows.Forms.DockStyle.Fill;
    8995      this.stateLogViewHost.Enabled = false;
    90       this.stateLogViewHost.Location = new System.Drawing.Point(0, 0);
     96      this.stateLogViewHost.Location = new System.Drawing.Point(3, 3);
    9197      this.stateLogViewHost.Name = "stateLogViewHost";
    9298      this.stateLogViewHost.ReadOnly = false;
    93       this.stateLogViewHost.Size = new System.Drawing.Size(563, 375);
     99      this.stateLogViewHost.Size = new System.Drawing.Size(557, 407);
    94100      this.stateLogViewHost.TabIndex = 0;
    95101      this.stateLogViewHost.ViewsLabelVisible = true;
     
    99105      //
    100106      this.detailsTabPage.Controls.Add(this.splitContainer1);
    101       this.detailsTabPage.Controls.Add(this.optimizerGroupBox);
    102       this.detailsTabPage.Controls.Add(this.jobIdLabel);
    103       this.detailsTabPage.Controls.Add(this.jobIdTextBox);
     107      this.detailsTabPage.Controls.Add(this.modifyItemButton);
    104108      this.detailsTabPage.Location = new System.Drawing.Point(4, 22);
    105109      this.detailsTabPage.Name = "detailsTabPage";
     
    114118      this.splitContainer1.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
    115119                  | System.Windows.Forms.AnchorStyles.Right)));
    116       this.splitContainer1.Location = new System.Drawing.Point(6, 110);
     120      this.splitContainer1.Location = new System.Drawing.Point(6, 6);
    117121      this.splitContainer1.Name = "splitContainer1";
    118122      //
    119123      // splitContainer1.Panel1
    120124      //
    121       this.splitContainer1.Panel1.Controls.Add(this.configurationGroupBox);
     125      this.splitContainer1.Panel1.Controls.Add(this.splitContainer2);
    122126      //
    123127      // splitContainer1.Panel2
    124128      //
    125129      this.splitContainer1.Panel2.Controls.Add(this.jobStatusGroupBox);
    126       this.splitContainer1.Size = new System.Drawing.Size(551, 178);
     130      this.splitContainer1.Size = new System.Drawing.Size(551, 200);
    127131      this.splitContainer1.SplitterDistance = 275;
    128       this.splitContainer1.TabIndex = 33;
     132      this.splitContainer1.TabIndex = 44;
     133      //
     134      // splitContainer2
     135      //
     136      this.splitContainer2.Dock = System.Windows.Forms.DockStyle.Fill;
     137      this.splitContainer2.Location = new System.Drawing.Point(0, 0);
     138      this.splitContainer2.Name = "splitContainer2";
     139      this.splitContainer2.Orientation = System.Windows.Forms.Orientation.Horizontal;
     140      //
     141      // splitContainer2.Panel1
     142      //
     143      this.splitContainer2.Panel1.Controls.Add(this.groupBoxGenerel);
     144      //
     145      // splitContainer2.Panel2
     146      //
     147      this.splitContainer2.Panel2.Controls.Add(this.configurationGroupBox);
     148      this.splitContainer2.Size = new System.Drawing.Size(275, 200);
     149      this.splitContainer2.SplitterDistance = 100;
     150      this.splitContainer2.TabIndex = 0;
     151      //
     152      // groupBoxGenerel
     153      //
     154      this.groupBoxGenerel.Controls.Add(this.priorityComboBox);
     155      this.groupBoxGenerel.Controls.Add(this.jobIdLabel);
     156      this.groupBoxGenerel.Controls.Add(this.jobIdTextBox);
     157      this.groupBoxGenerel.Controls.Add(this.lastUpdatedLabel);
     158      this.groupBoxGenerel.Controls.Add(this.lastUpdatedTextBox);
     159      this.groupBoxGenerel.Controls.Add(this.priorityLabel);
     160      this.groupBoxGenerel.Dock = System.Windows.Forms.DockStyle.Fill;
     161      this.groupBoxGenerel.Location = new System.Drawing.Point(0, 0);
     162      this.groupBoxGenerel.Name = "groupBoxGenerel";
     163      this.groupBoxGenerel.Size = new System.Drawing.Size(275, 100);
     164      this.groupBoxGenerel.TabIndex = 43;
     165      this.groupBoxGenerel.TabStop = false;
     166      this.groupBoxGenerel.Text = "Generel";
     167      //
     168      // jobIdLabel
     169      //
     170      this.jobIdLabel.AutoSize = true;
     171      this.jobIdLabel.Location = new System.Drawing.Point(6, 16);
     172      this.jobIdLabel.Name = "jobIdLabel";
     173      this.jobIdLabel.Size = new System.Drawing.Size(19, 13);
     174      this.jobIdLabel.TabIndex = 25;
     175      this.jobIdLabel.Text = "Id:";
     176      //
     177      // jobIdTextBox
     178      //
     179      this.jobIdTextBox.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
     180                  | System.Windows.Forms.AnchorStyles.Right)));
     181      this.jobIdTextBox.Location = new System.Drawing.Point(87, 13);
     182      this.jobIdTextBox.Name = "jobIdTextBox";
     183      this.jobIdTextBox.Size = new System.Drawing.Size(182, 20);
     184      this.jobIdTextBox.TabIndex = 26;
     185      //
     186      // lastUpdatedLabel
     187      //
     188      this.lastUpdatedLabel.AutoSize = true;
     189      this.lastUpdatedLabel.Location = new System.Drawing.Point(6, 60);
     190      this.lastUpdatedLabel.Name = "lastUpdatedLabel";
     191      this.lastUpdatedLabel.Size = new System.Drawing.Size(75, 13);
     192      this.lastUpdatedLabel.TabIndex = 1;
     193      this.lastUpdatedLabel.Text = "Last changed:";
     194      //
     195      // lastUpdatedTextBox
     196      //
     197      this.lastUpdatedTextBox.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
     198                  | System.Windows.Forms.AnchorStyles.Right)));
     199      this.lastUpdatedTextBox.Location = new System.Drawing.Point(87, 57);
     200      this.lastUpdatedTextBox.Name = "lastUpdatedTextBox";
     201      this.lastUpdatedTextBox.Size = new System.Drawing.Size(182, 20);
     202      this.lastUpdatedTextBox.TabIndex = 2;
     203      //
     204      // priorityLabel
     205      //
     206      this.priorityLabel.AutoSize = true;
     207      this.priorityLabel.Location = new System.Drawing.Point(6, 38);
     208      this.priorityLabel.Name = "priorityLabel";
     209      this.priorityLabel.Size = new System.Drawing.Size(41, 13);
     210      this.priorityLabel.TabIndex = 42;
     211      this.priorityLabel.Text = "Priority:";
    129212      //
    130213      // configurationGroupBox
    131214      //
    132       this.configurationGroupBox.Controls.Add(this.priorityTextBox);
    133       this.configurationGroupBox.Controls.Add(this.priorityLabel);
    134       this.configurationGroupBox.Controls.Add(this.coresNeededTextBox);
    135       this.configurationGroupBox.Controls.Add(this.memoryNeededTextBox);
     215      this.configurationGroupBox.Controls.Add(this.memoryNeededComboBox);
     216      this.configurationGroupBox.Controls.Add(this.coresNeededComboBox);
    136217      this.configurationGroupBox.Controls.Add(this.memoryNeededLabel);
    137218      this.configurationGroupBox.Controls.Add(this.coresNeededLabel);
     
    141222      this.configurationGroupBox.Location = new System.Drawing.Point(0, 0);
    142223      this.configurationGroupBox.Name = "configurationGroupBox";
    143       this.configurationGroupBox.Size = new System.Drawing.Size(275, 178);
     224      this.configurationGroupBox.Size = new System.Drawing.Size(275, 96);
    144225      this.configurationGroupBox.TabIndex = 27;
    145226      this.configurationGroupBox.TabStop = false;
    146       this.configurationGroupBox.Text = "Configuration";
    147       //
    148       // priorityTextBox
    149       //
    150       this.priorityTextBox.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
    151                   | System.Windows.Forms.AnchorStyles.Right)));
    152       this.priorityTextBox.Location = new System.Drawing.Point(108, 66);
    153       this.priorityTextBox.Name = "priorityTextBox";
    154       this.priorityTextBox.Size = new System.Drawing.Size(161, 20);
    155       this.priorityTextBox.TabIndex = 41;
    156       //
    157       // priorityLabel
    158       //
    159       this.priorityLabel.AutoSize = true;
    160       this.priorityLabel.Location = new System.Drawing.Point(7, 66);
    161       this.priorityLabel.Name = "priorityLabel";
    162       this.priorityLabel.Size = new System.Drawing.Size(41, 13);
    163       this.priorityLabel.TabIndex = 42;
    164       this.priorityLabel.Text = "Priority:";
    165       //
    166       // coresNeededTextBox
    167       //
    168       this.coresNeededTextBox.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
    169                   | System.Windows.Forms.AnchorStyles.Right)));
    170       this.coresNeededTextBox.Location = new System.Drawing.Point(108, 20);
    171       this.coresNeededTextBox.Name = "coresNeededTextBox";
    172       this.coresNeededTextBox.Size = new System.Drawing.Size(161, 20);
    173       this.coresNeededTextBox.TabIndex = 37;
    174       //
    175       // memoryNeededTextBox
    176       //
    177       this.memoryNeededTextBox.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
    178                   | System.Windows.Forms.AnchorStyles.Right)));
    179       this.memoryNeededTextBox.Location = new System.Drawing.Point(108, 42);
    180       this.memoryNeededTextBox.Name = "memoryNeededTextBox";
    181       this.memoryNeededTextBox.Size = new System.Drawing.Size(161, 20);
    182       this.memoryNeededTextBox.TabIndex = 38;
     227      this.configurationGroupBox.Text = "Resource demands";
    183228      //
    184229      // memoryNeededLabel
    185230      //
    186231      this.memoryNeededLabel.AutoSize = true;
    187       this.memoryNeededLabel.Location = new System.Drawing.Point(7, 42);
     232      this.memoryNeededLabel.Location = new System.Drawing.Point(6, 38);
    188233      this.memoryNeededLabel.Name = "memoryNeededLabel";
    189       this.memoryNeededLabel.Size = new System.Drawing.Size(85, 13);
     234      this.memoryNeededLabel.Size = new System.Drawing.Size(122, 13);
    190235      this.memoryNeededLabel.TabIndex = 40;
    191       this.memoryNeededLabel.Text = "MemoryNeeded:";
     236      this.memoryNeededLabel.Text = "Memory needed (in MB):";
    192237      //
    193238      // coresNeededLabel
    194239      //
    195240      this.coresNeededLabel.AutoSize = true;
    196       this.coresNeededLabel.Location = new System.Drawing.Point(7, 20);
     241      this.coresNeededLabel.Location = new System.Drawing.Point(6, 16);
    197242      this.coresNeededLabel.Name = "coresNeededLabel";
    198       this.coresNeededLabel.Size = new System.Drawing.Size(75, 13);
     243      this.coresNeededLabel.Size = new System.Drawing.Size(101, 13);
    199244      this.coresNeededLabel.TabIndex = 39;
    200       this.coresNeededLabel.Text = "CoresNeeded:";
     245      this.coresNeededLabel.Text = "Nr. of cores needed";
    201246      //
    202247      // computeInParallelLabel
    203248      //
    204249      this.computeInParallelLabel.AutoSize = true;
    205       this.computeInParallelLabel.Location = new System.Drawing.Point(7, 93);
     250      this.computeInParallelLabel.Location = new System.Drawing.Point(6, 60);
    206251      this.computeInParallelLabel.Name = "computeInParallelLabel";
    207       this.computeInParallelLabel.Size = new System.Drawing.Size(95, 13);
     252      this.computeInParallelLabel.Size = new System.Drawing.Size(122, 13);
    208253      this.computeInParallelLabel.TabIndex = 36;
    209       this.computeInParallelLabel.Text = "ComputeInParallel:";
     254      this.computeInParallelLabel.Text = "Compute task in parallel:";
    210255      //
    211256      // computeInParallelCheckBox
    212257      //
    213258      this.computeInParallelCheckBox.AutoSize = true;
    214       this.computeInParallelCheckBox.Location = new System.Drawing.Point(108, 92);
     259      this.computeInParallelCheckBox.Location = new System.Drawing.Point(135, 61);
    215260      this.computeInParallelCheckBox.Name = "computeInParallelCheckBox";
    216261      this.computeInParallelCheckBox.Size = new System.Drawing.Size(15, 14);
     
    238283      this.jobStatusGroupBox.Location = new System.Drawing.Point(0, 0);
    239284      this.jobStatusGroupBox.Name = "jobStatusGroupBox";
    240       this.jobStatusGroupBox.Size = new System.Drawing.Size(272, 178);
     285      this.jobStatusGroupBox.Size = new System.Drawing.Size(272, 200);
    241286      this.jobStatusGroupBox.TabIndex = 24;
    242287      this.jobStatusGroupBox.TabStop = false;
    243       this.jobStatusGroupBox.Text = "Task Status";
     288      this.jobStatusGroupBox.Text = "Task status";
     289      //
     290      // commandTextBox
     291      //
     292      this.commandTextBox.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
     293                  | System.Windows.Forms.AnchorStyles.Right)));
     294      this.commandTextBox.Location = new System.Drawing.Point(95, 41);
     295      this.commandTextBox.Name = "commandTextBox";
     296      this.commandTextBox.Size = new System.Drawing.Size(171, 20);
     297      this.commandTextBox.TabIndex = 24;
     298      //
     299      // commandLabel
     300      //
     301      this.commandLabel.AutoSize = true;
     302      this.commandLabel.Location = new System.Drawing.Point(7, 41);
     303      this.commandLabel.Name = "commandLabel";
     304      this.commandLabel.Size = new System.Drawing.Size(57, 13);
     305      this.commandLabel.TabIndex = 25;
     306      this.commandLabel.Text = "Command:";
    244307      //
    245308      // stateTextBox
     
    257320      this.dateCalculatedLabel.Location = new System.Drawing.Point(7, 108);
    258321      this.dateCalculatedLabel.Name = "dateCalculatedLabel";
    259       this.dateCalculatedLabel.Size = new System.Drawing.Size(83, 13);
     322      this.dateCalculatedLabel.Size = new System.Drawing.Size(85, 13);
    260323      this.dateCalculatedLabel.TabIndex = 23;
    261       this.dateCalculatedLabel.Text = "DateCalculated:";
     324      this.dateCalculatedLabel.Text = "Date calculated:";
    262325      //
    263326      // stateLabel
     
    311374      this.executionTimeLabel.Location = new System.Drawing.Point(7, 64);
    312375      this.executionTimeLabel.Name = "executionTimeLabel";
    313       this.executionTimeLabel.Size = new System.Drawing.Size(80, 13);
     376      this.executionTimeLabel.Size = new System.Drawing.Size(79, 13);
    314377      this.executionTimeLabel.TabIndex = 13;
    315       this.executionTimeLabel.Text = "ExecutionTime:";
     378      this.executionTimeLabel.Text = "Execution time:";
    316379      //
    317380      // exceptionLabel
     
    329392      this.dateCreatedLabel.Location = new System.Drawing.Point(7, 86);
    330393      this.dateCreatedLabel.Name = "dateCreatedLabel";
    331       this.dateCreatedLabel.Size = new System.Drawing.Size(70, 13);
     394      this.dateCreatedLabel.Size = new System.Drawing.Size(72, 13);
    332395      this.dateCreatedLabel.TabIndex = 14;
    333       this.dateCreatedLabel.Text = "DateCreated:";
     396      this.dateCreatedLabel.Text = "Date created:";
    334397      //
    335398      // dateFinishedLabel
     
    340403      this.dateFinishedLabel.Size = new System.Drawing.Size(72, 13);
    341404      this.dateFinishedLabel.TabIndex = 15;
    342       this.dateFinishedLabel.Text = "DateFinished:";
     405      this.dateFinishedLabel.Text = "Date finished:";
    343406      //
    344407      // exceptionTextBox
     
    352415      this.exceptionTextBox.DoubleClick += new System.EventHandler(this.exceptionTextBox_DoubleClick);
    353416      //
    354       // optimizerGroupBox
    355       //
    356       this.optimizerGroupBox.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
    357                   | System.Windows.Forms.AnchorStyles.Right)));
    358       this.optimizerGroupBox.Controls.Add(this.modifyItemButton);
    359       this.optimizerGroupBox.Controls.Add(this.lastUpdatedTextBox);
    360       this.optimizerGroupBox.Controls.Add(this.lastUpdatedLabel);
    361       this.optimizerGroupBox.Controls.Add(this.optimizerItemView);
    362       this.optimizerGroupBox.Location = new System.Drawing.Point(6, 29);
    363       this.optimizerGroupBox.Name = "optimizerGroupBox";
    364       this.optimizerGroupBox.Size = new System.Drawing.Size(551, 75);
    365       this.optimizerGroupBox.TabIndex = 28;
    366       this.optimizerGroupBox.TabStop = false;
    367       this.optimizerGroupBox.Text = "JobItem";
    368       //
    369417      // modifyItemButton
    370418      //
    371419      this.modifyItemButton.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
    372420                  | System.Windows.Forms.AnchorStyles.Right)));
    373       this.modifyItemButton.Location = new System.Drawing.Point(78, 45);
     421      this.modifyItemButton.Location = new System.Drawing.Point(3, 224);
    374422      this.modifyItemButton.Name = "modifyItemButton";
    375       this.modifyItemButton.Size = new System.Drawing.Size(467, 23);
     423      this.modifyItemButton.Size = new System.Drawing.Size(551, 23);
    376424      this.modifyItemButton.TabIndex = 3;
    377425      this.modifyItemButton.Text = "Modify Item";
    378426      this.modifyItemButton.UseVisualStyleBackColor = true;
    379427      this.modifyItemButton.Click += new System.EventHandler(this.modifyItemButton_Click);
    380       //
    381       // lastUpdatedTextBox
    382       //
    383       this.lastUpdatedTextBox.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
    384                   | System.Windows.Forms.AnchorStyles.Right)));
    385       this.lastUpdatedTextBox.Location = new System.Drawing.Point(78, 19);
    386       this.lastUpdatedTextBox.Name = "lastUpdatedTextBox";
    387       this.lastUpdatedTextBox.Size = new System.Drawing.Size(467, 20);
    388       this.lastUpdatedTextBox.TabIndex = 2;
    389       //
    390       // lastUpdatedLabel
    391       //
    392       this.lastUpdatedLabel.AutoSize = true;
    393       this.lastUpdatedLabel.Location = new System.Drawing.Point(3, 22);
    394       this.lastUpdatedLabel.Name = "lastUpdatedLabel";
    395       this.lastUpdatedLabel.Size = new System.Drawing.Size(71, 13);
    396       this.lastUpdatedLabel.TabIndex = 1;
    397       this.lastUpdatedLabel.Text = "LastUpdated:";
    398       //
    399       // optimizerItemView
    400       //
    401       this.optimizerItemView.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
    402                   | System.Windows.Forms.AnchorStyles.Right)));
    403       this.optimizerItemView.Caption = "NamedItem View";
    404       this.optimizerItemView.Content = null;
    405       this.optimizerItemView.Location = new System.Drawing.Point(6, 20);
    406       this.optimizerItemView.Name = "optimizerItemView";
    407       this.optimizerItemView.ReadOnly = false;
    408       this.optimizerItemView.Size = new System.Drawing.Size(539, 51);
    409       this.optimizerItemView.TabIndex = 0;
    410       //
    411       // jobIdLabel
    412       //
    413       this.jobIdLabel.AutoSize = true;
    414       this.jobIdLabel.Location = new System.Drawing.Point(3, 6);
    415       this.jobIdLabel.Name = "jobIdLabel";
    416       this.jobIdLabel.Size = new System.Drawing.Size(36, 13);
    417       this.jobIdLabel.TabIndex = 25;
    418       this.jobIdLabel.Text = "TaskId:";
    419       //
    420       // jobIdTextBox
    421       //
    422       this.jobIdTextBox.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
    423                   | System.Windows.Forms.AnchorStyles.Right)));
    424       this.jobIdTextBox.Location = new System.Drawing.Point(91, 6);
    425       this.jobIdTextBox.Name = "jobIdTextBox";
    426       this.jobIdTextBox.Size = new System.Drawing.Size(466, 20);
    427       this.jobIdTextBox.TabIndex = 26;
    428428      //
    429429      // tabControl
     
    440440      this.tabControl.TabIndex = 25;
    441441      //
    442       // commandTextBox
    443       //
    444       this.commandTextBox.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
    445                   | System.Windows.Forms.AnchorStyles.Right)));
    446       this.commandTextBox.Location = new System.Drawing.Point(95, 41);
    447       this.commandTextBox.Name = "commandTextBox";
    448       this.commandTextBox.Size = new System.Drawing.Size(171, 20);
    449       this.commandTextBox.TabIndex = 24;
    450       //
    451       // commandLabel
    452       //
    453       this.commandLabel.AutoSize = true;
    454       this.commandLabel.Location = new System.Drawing.Point(7, 41);
    455       this.commandLabel.Name = "commandLabel";
    456       this.commandLabel.Size = new System.Drawing.Size(57, 13);
    457       this.commandLabel.TabIndex = 25;
    458       this.commandLabel.Text = "Command:";
     442      // priorityComboBox
     443      //
     444      this.priorityComboBox.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
     445                  | System.Windows.Forms.AnchorStyles.Right)));
     446      this.priorityComboBox.FormattingEnabled = true;
     447      this.priorityComboBox.Items.AddRange(new object[] {
     448            "1",
     449            "2",
     450            "3",
     451            "4",
     452            "5"});
     453      this.priorityComboBox.Location = new System.Drawing.Point(87, 35);
     454      this.priorityComboBox.Name = "priorityComboBox";
     455      this.priorityComboBox.Size = new System.Drawing.Size(182, 21);
     456      this.priorityComboBox.TabIndex = 43;
     457      //
     458      // coresNeededComboBox
     459      //
     460      this.coresNeededComboBox.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
     461                  | System.Windows.Forms.AnchorStyles.Right)));
     462      this.coresNeededComboBox.FormattingEnabled = true;
     463      this.coresNeededComboBox.Items.AddRange(new object[] {
     464            "1",
     465            "2",
     466            "3",
     467            "4",
     468            "5",
     469            "6",
     470            "7",
     471            "8"});
     472      this.coresNeededComboBox.Location = new System.Drawing.Point(134, 13);
     473      this.coresNeededComboBox.Name = "coresNeededComboBox";
     474      this.coresNeededComboBox.Size = new System.Drawing.Size(134, 21);
     475      this.coresNeededComboBox.TabIndex = 41;
     476      //
     477      // memoryNeededComboBox
     478      //
     479      this.memoryNeededComboBox.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
     480                  | System.Windows.Forms.AnchorStyles.Right)));
     481      this.memoryNeededComboBox.FormattingEnabled = true;
     482      this.memoryNeededComboBox.Items.AddRange(new object[] {
     483            "128",
     484            "256",
     485            "512",
     486            "1024",
     487            "2048"});
     488      this.memoryNeededComboBox.Location = new System.Drawing.Point(134, 35);
     489      this.memoryNeededComboBox.Name = "memoryNeededComboBox";
     490      this.memoryNeededComboBox.Size = new System.Drawing.Size(135, 21);
     491      this.memoryNeededComboBox.TabIndex = 42;
    459492      //
    460493      // HiveTaskView
     
    467500      this.stateLogTabPage.ResumeLayout(false);
    468501      this.detailsTabPage.ResumeLayout(false);
    469       this.detailsTabPage.PerformLayout();
    470502      this.splitContainer1.Panel1.ResumeLayout(false);
    471503      this.splitContainer1.Panel2.ResumeLayout(false);
    472504      ((System.ComponentModel.ISupportInitialize)(this.splitContainer1)).EndInit();
    473505      this.splitContainer1.ResumeLayout(false);
     506      this.splitContainer2.Panel1.ResumeLayout(false);
     507      this.splitContainer2.Panel2.ResumeLayout(false);
     508      ((System.ComponentModel.ISupportInitialize)(this.splitContainer2)).EndInit();
     509      this.splitContainer2.ResumeLayout(false);
     510      this.groupBoxGenerel.ResumeLayout(false);
     511      this.groupBoxGenerel.PerformLayout();
    474512      this.configurationGroupBox.ResumeLayout(false);
    475513      this.configurationGroupBox.PerformLayout();
    476514      this.jobStatusGroupBox.ResumeLayout(false);
    477515      this.jobStatusGroupBox.PerformLayout();
    478       this.optimizerGroupBox.ResumeLayout(false);
    479       this.optimizerGroupBox.PerformLayout();
    480516      this.tabControl.ResumeLayout(false);
    481517      this.ResumeLayout(false);
     
    488524    protected MainForm.WindowsForms.ViewHost stateLogViewHost;
    489525    protected System.Windows.Forms.TabPage detailsTabPage;
    490     protected System.Windows.Forms.GroupBox optimizerGroupBox;
    491     protected Core.Views.ItemView optimizerItemView;
    492     protected System.Windows.Forms.GroupBox configurationGroupBox;
    493     protected System.Windows.Forms.TextBox priorityTextBox;
    494526    protected System.Windows.Forms.Label priorityLabel;
    495     protected System.Windows.Forms.TextBox coresNeededTextBox;
    496     protected System.Windows.Forms.TextBox memoryNeededTextBox;
    497     protected System.Windows.Forms.Label memoryNeededLabel;
    498     protected System.Windows.Forms.Label coresNeededLabel;
    499     protected System.Windows.Forms.Label computeInParallelLabel;
    500     protected System.Windows.Forms.CheckBox computeInParallelCheckBox;
    501527    protected System.Windows.Forms.Label jobIdLabel;
    502528    protected System.Windows.Forms.TextBox jobIdTextBox;
     
    511537    protected System.Windows.Forms.TextBox exceptionTextBox;
    512538    protected System.Windows.Forms.TabControl tabControl;
    513     protected System.Windows.Forms.Button modifyItemButton;
    514     protected System.Windows.Forms.TextBox lastUpdatedTextBox;
    515     protected System.Windows.Forms.Label lastUpdatedLabel;
    516539    protected System.Windows.Forms.Label dateCalculatedLabel;
    517540    protected System.Windows.Forms.TextBox dateCalculatedText;
    518541    protected System.Windows.Forms.TextBox dateCreatedTextBox;
    519542    protected System.Windows.Forms.Label dateCreatedLabel;
    520     protected System.Windows.Forms.SplitContainer splitContainer1;
    521543    protected System.Windows.Forms.TextBox commandTextBox;
    522544    protected System.Windows.Forms.Label commandLabel;
     545    protected System.Windows.Forms.Button modifyItemButton;
     546    protected System.Windows.Forms.TextBox lastUpdatedTextBox;
     547    protected System.Windows.Forms.Label lastUpdatedLabel;
     548    private System.Windows.Forms.GroupBox groupBoxGenerel;
     549    protected System.Windows.Forms.GroupBox configurationGroupBox;
     550    protected System.Windows.Forms.Label memoryNeededLabel;
     551    protected System.Windows.Forms.Label coresNeededLabel;
     552    protected System.Windows.Forms.Label computeInParallelLabel;
     553    protected System.Windows.Forms.CheckBox computeInParallelCheckBox;
     554    private System.Windows.Forms.SplitContainer splitContainer1;
     555    private System.Windows.Forms.SplitContainer splitContainer2;
     556    protected System.Windows.Forms.ComboBox priorityComboBox;
     557    private System.Windows.Forms.ComboBox coresNeededComboBox;
     558    protected System.Windows.Forms.ComboBox memoryNeededComboBox;
    523559
    524560  }
  • branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive.Views/3.3/HiveTasks/OptimizerHiveTaskView.designer.cs

    r6727 r6791  
    3232      this.stateLogTabPage.SuspendLayout();
    3333      this.detailsTabPage.SuspendLayout();
    34       this.optimizerGroupBox.SuspendLayout();
    3534      this.configurationGroupBox.SuspendLayout();
    3635      this.jobStatusGroupBox.SuspendLayout();
    3736      this.tabControl.SuspendLayout();
    38       ((System.ComponentModel.ISupportInitialize)(this.splitContainer1)).BeginInit();
    39       this.splitContainer1.Panel1.SuspendLayout();
    40       this.splitContainer1.Panel2.SuspendLayout();
    41       this.splitContainer1.SuspendLayout();
    4237      this.runsTabPage.SuspendLayout();
    4338      this.SuspendLayout();
     
    4843      this.detailsTabPage.Controls.Add(this.pauseButton);
    4944      this.detailsTabPage.Controls.Add(this.stopButton);
    50       this.detailsTabPage.Controls.SetChildIndex(this.jobIdTextBox, 0);
    51       this.detailsTabPage.Controls.SetChildIndex(this.jobIdLabel, 0);
    52       this.detailsTabPage.Controls.SetChildIndex(this.optimizerGroupBox, 0);
    53       this.detailsTabPage.Controls.SetChildIndex(this.splitContainer1, 0);
    5445      this.detailsTabPage.Controls.SetChildIndex(this.stopButton, 0);
    5546      this.detailsTabPage.Controls.SetChildIndex(this.pauseButton, 0);
     
    6657      //
    6758      this.modifyItemButton.Text = "Modify Optimizer";
    68       //
    69       // splitContainer1
    70       //
    7159      //
    7260      // restartButton
     
    136124      this.detailsTabPage.ResumeLayout(false);
    137125      this.detailsTabPage.PerformLayout();
    138       this.optimizerGroupBox.ResumeLayout(false);
    139       this.optimizerGroupBox.PerformLayout();
    140126      this.configurationGroupBox.ResumeLayout(false);
    141127      this.configurationGroupBox.PerformLayout();
     
    143129      this.jobStatusGroupBox.PerformLayout();
    144130      this.tabControl.ResumeLayout(false);
    145       this.splitContainer1.Panel1.ResumeLayout(false);
    146       this.splitContainer1.Panel2.ResumeLayout(false);
    147       ((System.ComponentModel.ISupportInitialize)(this.splitContainer1)).EndInit();
    148       this.splitContainer1.ResumeLayout(false);
    149131      this.runsTabPage.ResumeLayout(false);
    150132      this.ResumeLayout(false);
  • branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive.Views/3.3/StateLog/StateLogGanttChartListView.designer.cs

    r6373 r6791  
    3232                  | System.Windows.Forms.AnchorStyles.Left)
    3333                  | System.Windows.Forms.AnchorStyles.Right)));
    34       this.ganttChart.Location = new System.Drawing.Point(0, 0);
     34      this.ganttChart.Location = new System.Drawing.Point(3, 3);
    3535      this.ganttChart.Name = "ganttChart";
    36       this.ganttChart.Size = new System.Drawing.Size(493, 293);
     36      this.ganttChart.Size = new System.Drawing.Size(487, 287);
    3737      this.ganttChart.TabIndex = 0;
    3838      //
Note: See TracChangeset for help on using the changeset viewer.