Free cookie consent management tool by TermsFeed Policy Generator

Ignore:
Timestamp:
03/08/11 17:58:42 (13 years ago)
Author:
ascheibe
Message:

#1233 worked on Administration UI

Location:
branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive.Views/3.4
Files:
13 added
3 deleted
5 edited

Legend:

Unmodified
Added
Removed

  • branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive.Views/3.4/Administration/HiveAdministrationView.Designer.cs

    r5538 r5638  
    2323  partial class HiveAdministrationView {
    2424    private System.Windows.Forms.TabControl tabAdmin;
    25     private System.Windows.Forms.TabPage tabSlaves;
    26     private System.Windows.Forms.SplitContainer splitSlaves;
    27     private System.Windows.Forms.TreeView treeSlaveGroup;
    28     private System.Windows.Forms.TabControl tabSlaveGroup;
    29     private System.Windows.Forms.TabPage tabDetails;
    30     private System.Windows.Forms.TabPage tabSchedule;
    31     private System.Windows.Forms.TabPage tabJobs;
    3225    private System.Windows.Forms.TabPage tabUsers;
    3326
    … …  
    3528    private void InitializeComponent() {
    3629      this.components = new System.ComponentModel.Container();
    37       System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(HiveAdministrationView));
    3830      this.tabAdmin = new System.Windows.Forms.TabControl();
    3931      this.tabSlaves = new System.Windows.Forms.TabPage();
    40       this.splitSlaves = new System.Windows.Forms.SplitContainer();
    41       this.updateSlaveGroups = new HeuristicLab.Clients.Hive.Views.Common.UpdateControl();
    42       this.btnRemoveGroup = new System.Windows.Forms.Button();
    43       this.btnAddGroup = new System.Windows.Forms.Button();
    44       this.treeSlaveGroup = new System.Windows.Forms.TreeView();
    45       this.imageListSlaveGroups = new System.Windows.Forms.ImageList(this.components);
    46       this.tabSlaveGroup = new System.Windows.Forms.TabControl();
    47       this.tabDetails = new System.Windows.Forms.TabPage();
    48       this.txtSlaveState = new System.Windows.Forms.TextBox();
    49       this.txtOS = new System.Windows.Forms.TextBox();
    50       this.label15 = new System.Windows.Forms.Label();
    51       this.label14 = new System.Windows.Forms.Label();
    52       this.txtDetailsDescription = new System.Windows.Forms.TextBox();
    53       this.label13 = new System.Windows.Forms.Label();
    54       this.txtName = new System.Windows.Forms.TextBox();
    55       this.txtCPU = new System.Windows.Forms.TextBox();
    56       this.txtMemory = new System.Windows.Forms.TextBox();
    57       this.txtDetailsCalculatedJobs = new System.Windows.Forms.TextBox();
    58       this.label12 = new System.Windows.Forms.Label();
    59       this.label11 = new System.Windows.Forms.Label();
    60       this.label10 = new System.Windows.Forms.Label();
    61       this.label9 = new System.Windows.Forms.Label();
    62       this.tabSchedule = new System.Windows.Forms.TabPage();
    63       this.scheduleControl1 = new HeuristicLab.Clients.Hive.Views.Administration.ScheduleControl();
    64       this.tabJobs = new System.Windows.Forms.TabPage();
    65       this.updateControl1 = new HeuristicLab.Clients.Hive.Views.Common.UpdateControl();
    66       this.hiveJobListViewSlaves = new HeuristicLab.Clients.Hive.Views.HiveJobListView();
     32      this.resourcesView = new HeuristicLab.Clients.Hive.Views.Administration.ResourcesView();
    6733      this.tabUsers = new System.Windows.Forms.TabPage();
    6834      this.splitUsers = new System.Windows.Forms.SplitContainer();
    … …  
    9258      this.tabAdmin.SuspendLayout();
    9359      this.tabSlaves.SuspendLayout();
    94       ((System.ComponentModel.ISupportInitialize)(this.splitSlaves)).BeginInit();
    95       this.splitSlaves.Panel1.SuspendLayout();
    96       this.splitSlaves.Panel2.SuspendLayout();
    97       this.splitSlaves.SuspendLayout();
    98       this.tabSlaveGroup.SuspendLayout();
    99       this.tabDetails.SuspendLayout();
    100       this.tabSchedule.SuspendLayout();
    101       this.tabJobs.SuspendLayout();
    10260      this.tabUsers.SuspendLayout();
    10361      ((System.ComponentModel.ISupportInitialize)(this.splitUsers)).BeginInit();
    … …  
    12785      // tabSlaves
    12886      //
    129       this.tabSlaves.Controls.Add(this.splitSlaves);
     87      this.tabSlaves.Controls.Add(this.resourcesView);
    13088      this.tabSlaves.Location = new System.Drawing.Point(4, 22);
    13189      this.tabSlaves.Name = "tabSlaves";
    13290      this.tabSlaves.Padding = new System.Windows.Forms.Padding(3);
    13391      this.tabSlaves.Size = new System.Drawing.Size(734, 520);
    134       this.tabSlaves.TabIndex = 0;
     92      this.tabSlaves.TabIndex = 3;
    13593      this.tabSlaves.Text = "Slaves";
    13694      this.tabSlaves.UseVisualStyleBackColor = true;
    13795      //
    138       // splitSlaves
    139       //
    140       this.splitSlaves.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
    141                   | System.Windows.Forms.AnchorStyles.Left)
    142                   | System.Windows.Forms.AnchorStyles.Right)));
    143       this.splitSlaves.Location = new System.Drawing.Point(3, 6);
    144       this.splitSlaves.Name = "splitSlaves";
    145       //
    146       // splitSlaves.Panel1
    147       //
    148       this.splitSlaves.Panel1.Controls.Add(this.updateSlaveGroups);
    149       this.splitSlaves.Panel1.Controls.Add(this.btnRemoveGroup);
    150       this.splitSlaves.Panel1.Controls.Add(this.btnAddGroup);
    151       this.splitSlaves.Panel1.Controls.Add(this.treeSlaveGroup);
    152       //
    153       // splitSlaves.Panel2
    154       //
    155       this.splitSlaves.Panel2.Controls.Add(this.tabSlaveGroup);
    156       this.splitSlaves.Size = new System.Drawing.Size(725, 508);
    157       this.splitSlaves.SplitterDistance = 215;
    158       this.splitSlaves.TabIndex = 2;
    159       //
    160       // updateSlaveGroups
    161       //
    162       this.updateSlaveGroups.Location = new System.Drawing.Point(63, 3);
    163       this.updateSlaveGroups.Name = "updateSlaveGroups";
    164       this.updateSlaveGroups.Size = new System.Drawing.Size(75, 24);
    165       this.updateSlaveGroups.TabIndex = 4;
    166       this.updateSlaveGroups.UpdateAction = null;
    167       //
    168       // btnRemoveGroup
    169       //
    170       this.btnRemoveGroup.Image = ((System.Drawing.Image)(resources.GetObject("btnRemoveGroup.Image")));
    171       this.btnRemoveGroup.Location = new System.Drawing.Point(33, 3);
    172       this.btnRemoveGroup.Name = "btnRemoveGroup";
    173       this.btnRemoveGroup.Size = new System.Drawing.Size(24, 24);
    174       this.btnRemoveGroup.TabIndex = 2;
    175       this.btnRemoveGroup.UseVisualStyleBackColor = true;
    176       //
    177       // btnAddGroup
    178       //
    179       this.btnAddGroup.Image = ((System.Drawing.Image)(resources.GetObject("btnAddGroup.Image")));
    180       this.btnAddGroup.Location = new System.Drawing.Point(3, 3);
    181       this.btnAddGroup.Name = "btnAddGroup";
    182       this.btnAddGroup.Size = new System.Drawing.Size(24, 24);
    183       this.btnAddGroup.TabIndex = 1;
    184       this.btnAddGroup.UseVisualStyleBackColor = true;
    185       //
    186       // treeSlaveGroup
    187       //
    188       this.treeSlaveGroup.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
    189                   | System.Windows.Forms.AnchorStyles.Left)
    190                   | System.Windows.Forms.AnchorStyles.Right)));
    191       this.treeSlaveGroup.ImageIndex = 0;
    192       this.treeSlaveGroup.ImageList = this.imageListSlaveGroups;
    193       this.treeSlaveGroup.Location = new System.Drawing.Point(3, 33);
    194       this.treeSlaveGroup.Name = "treeSlaveGroup";
    195       this.treeSlaveGroup.SelectedImageIndex = 0;
    196       this.treeSlaveGroup.Size = new System.Drawing.Size(209, 472);
    197       this.treeSlaveGroup.TabIndex = 0;
    198       this.treeSlaveGroup.NodeMouseClick += new System.Windows.Forms.TreeNodeMouseClickEventHandler(this.treeSlaveGroup_NodeMouseClick);
    199       //
    200       // imageListSlaveGroups
    201       //
    202       this.imageListSlaveGroups.ColorDepth = System.Windows.Forms.ColorDepth.Depth32Bit;
    203       this.imageListSlaveGroups.ImageSize = new System.Drawing.Size(16, 16);
    204       this.imageListSlaveGroups.TransparentColor = System.Drawing.Color.Transparent;
    205       //
    206       // tabSlaveGroup
    207       //
    208       this.tabSlaveGroup.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
    209                   | System.Windows.Forms.AnchorStyles.Left)
    210                   | System.Windows.Forms.AnchorStyles.Right)));
    211       this.tabSlaveGroup.Controls.Add(this.tabDetails);
    212       this.tabSlaveGroup.Controls.Add(this.tabSchedule);
    213       this.tabSlaveGroup.Controls.Add(this.tabJobs);
    214       this.tabSlaveGroup.Location = new System.Drawing.Point(3, 3);
    215       this.tabSlaveGroup.Name = "tabSlaveGroup";
    216       this.tabSlaveGroup.SelectedIndex = 0;
    217       this.tabSlaveGroup.Size = new System.Drawing.Size(500, 502);
    218       this.tabSlaveGroup.TabIndex = 1;
    219       //
    220       // tabDetails
    221       //
    222       this.tabDetails.Controls.Add(this.txtSlaveState);
    223       this.tabDetails.Controls.Add(this.txtOS);
    224       this.tabDetails.Controls.Add(this.label15);
    225       this.tabDetails.Controls.Add(this.label14);
    226       this.tabDetails.Controls.Add(this.txtDetailsDescription);
    227       this.tabDetails.Controls.Add(this.label13);
    228       this.tabDetails.Controls.Add(this.txtName);
    229       this.tabDetails.Controls.Add(this.txtCPU);
    230       this.tabDetails.Controls.Add(this.txtMemory);
    231       this.tabDetails.Controls.Add(this.txtDetailsCalculatedJobs);
    232       this.tabDetails.Controls.Add(this.label12);
    233       this.tabDetails.Controls.Add(this.label11);
    234       this.tabDetails.Controls.Add(this.label10);
    235       this.tabDetails.Controls.Add(this.label9);
    236       this.tabDetails.Location = new System.Drawing.Point(4, 22);
    237       this.tabDetails.Name = "tabDetails";
    238       this.tabDetails.Padding = new System.Windows.Forms.Padding(3);
    239       this.tabDetails.Size = new System.Drawing.Size(492, 476);
    240       this.tabDetails.TabIndex = 0;
    241       this.tabDetails.Text = "Details";
    242       this.tabDetails.UseVisualStyleBackColor = true;
    243       //
    244       // txtSlaveState
    245       //
    246       this.txtSlaveState.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
    247                   | System.Windows.Forms.AnchorStyles.Right)));
    248       this.txtSlaveState.Location = new System.Drawing.Point(134, 145);
    249       this.txtSlaveState.Name = "txtSlaveState";
    250       this.txtSlaveState.Size = new System.Drawing.Size(352, 20);
    251       this.txtSlaveState.TabIndex = 13;
    252       this.txtSlaveState.Text = "Offline";
    253       //
    254       // txtOS
    255       //
    256       this.txtOS.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
    257                   | System.Windows.Forms.AnchorStyles.Right)));
    258       this.txtOS.Location = new System.Drawing.Point(134, 119);
    259       this.txtOS.Name = "txtOS";
    260       this.txtOS.Size = new System.Drawing.Size(352, 20);
    261       this.txtOS.TabIndex = 12;
    262       this.txtOS.Text = "Windows 7";
    263       //
    264       // label15
    265       //
    266       this.label15.AutoSize = true;
    267       this.label15.Location = new System.Drawing.Point(16, 152);
    268       this.label15.Name = "label15";
    269       this.label15.Size = new System.Drawing.Size(32, 13);
    270       this.label15.TabIndex = 11;
    271       this.label15.Text = "State";
    272       //
    273       // label14
    274       //
    275       this.label14.AutoSize = true;
    276       this.label14.Location = new System.Drawing.Point(14, 126);
    277       this.label14.Name = "label14";
    278       this.label14.Size = new System.Drawing.Size(90, 13);
    279       this.label14.TabIndex = 10;
    280       this.label14.Text = "Operating System";
    281       //
    282       // txtDetailsDescription
    283       //
    284       this.txtDetailsDescription.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
    285                   | System.Windows.Forms.AnchorStyles.Right)));
    286       this.txtDetailsDescription.Location = new System.Drawing.Point(133, 41);
    287       this.txtDetailsDescription.Name = "txtDetailsDescription";
    288       this.txtDetailsDescription.Size = new System.Drawing.Size(353, 20);
    289       this.txtDetailsDescription.TabIndex = 9;
    290       this.txtDetailsDescription.Text = "ascheibepc Description";
    291       //
    292       // label13
    293       //
    294       this.label13.AutoSize = true;
    295       this.label13.Location = new System.Drawing.Point(17, 48);
    296       this.label13.Name = "label13";
    297       this.label13.Size = new System.Drawing.Size(60, 13);
    298       this.label13.TabIndex = 8;
    299       this.label13.Text = "Description";
    300       //
    301       // txtName
    302       //
    303       this.txtName.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
    304                   | System.Windows.Forms.AnchorStyles.Right)));
    305       this.txtName.Location = new System.Drawing.Point(133, 15);
    306       this.txtName.Name = "txtName";
    307       this.txtName.Size = new System.Drawing.Size(353, 20);
    308       this.txtName.TabIndex = 7;
    309       this.txtName.Text = "ascheibepc";
    310       //
    311       // txtCPU
    312       //
    313       this.txtCPU.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
    314                   | System.Windows.Forms.AnchorStyles.Right)));
    315       this.txtCPU.Location = new System.Drawing.Point(133, 67);
    316       this.txtCPU.Name = "txtCPU";
    317       this.txtCPU.Size = new System.Drawing.Size(353, 20);
    318       this.txtCPU.TabIndex = 6;
    319       this.txtCPU.Text = "Intel Core 2 Duo @ 2.4 Ghz";
    320       //
    321       // txtMemory
    322       //
    323       this.txtMemory.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
    324                   | System.Windows.Forms.AnchorStyles.Right)));
    325       this.txtMemory.Location = new System.Drawing.Point(133, 93);
    326       this.txtMemory.Name = "txtMemory";
    327       this.txtMemory.Size = new System.Drawing.Size(353, 20);
    328       this.txtMemory.TabIndex = 5;
    329       this.txtMemory.Text = "2048 MB";
    330       //
    331       // txtDetailsCalculatedJobs
    332       //
    333       this.txtDetailsCalculatedJobs.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
    334                   | System.Windows.Forms.AnchorStyles.Right)));
    335       this.txtDetailsCalculatedJobs.Location = new System.Drawing.Point(134, 171);
    336       this.txtDetailsCalculatedJobs.Name = "txtDetailsCalculatedJobs";
    337       this.txtDetailsCalculatedJobs.Size = new System.Drawing.Size(352, 20);
    338       this.txtDetailsCalculatedJobs.TabIndex = 4;
    339       this.txtDetailsCalculatedJobs.Text = "33";
    340       //
    341       // label12
    342       //
    343       this.label12.AutoSize = true;
    344       this.label12.Location = new System.Drawing.Point(17, 178);
    345       this.label12.Name = "label12";
    346       this.label12.Size = new System.Drawing.Size(82, 13);
    347       this.label12.TabIndex = 3;
    348       this.label12.Text = "Calculated Jobs";
    349       //
    350       // label11
    351       //
    352       this.label11.AutoSize = true;
    353       this.label11.Location = new System.Drawing.Point(17, 100);
    354       this.label11.Name = "label11";
    355       this.label11.Size = new System.Drawing.Size(44, 13);
    356       this.label11.TabIndex = 2;
    357       this.label11.Text = "Memory";
    358       //
    359       // label10
    360       //
    361       this.label10.AutoSize = true;
    362       this.label10.Location = new System.Drawing.Point(17, 74);
    363       this.label10.Name = "label10";
    364       this.label10.Size = new System.Drawing.Size(29, 13);
    365       this.label10.TabIndex = 1;
    366       this.label10.Text = "CPU";
    367       //
    368       // label9
    369       //
    370       this.label9.AutoSize = true;
    371       this.label9.Location = new System.Drawing.Point(16, 22);
    372       this.label9.Name = "label9";
    373       this.label9.Size = new System.Drawing.Size(35, 13);
    374       this.label9.TabIndex = 0;
    375       this.label9.Text = "Name";
    376       //
    377       // tabSchedule
    378       //
    379       this.tabSchedule.Controls.Add(this.scheduleControl1);
    380       this.tabSchedule.Location = new System.Drawing.Point(4, 22);
    381       this.tabSchedule.Name = "tabSchedule";
    382       this.tabSchedule.Padding = new System.Windows.Forms.Padding(3);
    383       this.tabSchedule.Size = new System.Drawing.Size(492, 476);
    384       this.tabSchedule.TabIndex = 1;
    385       this.tabSchedule.Text = "Schedule";
    386       this.tabSchedule.UseVisualStyleBackColor = true;
    387       //
    388       // scheduleControl1
    389       //
    390       this.scheduleControl1.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
    391                   | System.Windows.Forms.AnchorStyles.Left)
    392                   | System.Windows.Forms.AnchorStyles.Right)));
    393       this.scheduleControl1.Location = new System.Drawing.Point(7, 7);
    394       this.scheduleControl1.Name = "scheduleControl1";
    395       this.scheduleControl1.Size = new System.Drawing.Size(862, 562);
    396       this.scheduleControl1.TabIndex = 0;
    397       //
    398       // tabJobs
    399       //
    400       this.tabJobs.Controls.Add(this.updateControl1);
    401       this.tabJobs.Controls.Add(this.hiveJobListViewSlaves);
    402       this.tabJobs.Location = new System.Drawing.Point(4, 22);
    403       this.tabJobs.Name = "tabJobs";
    404       this.tabJobs.Padding = new System.Windows.Forms.Padding(3);
    405       this.tabJobs.Size = new System.Drawing.Size(492, 476);
    406       this.tabJobs.TabIndex = 2;
    407       this.tabJobs.Text = "Jobs";
    408       this.tabJobs.UseVisualStyleBackColor = true;
    409       //
    410       // updateControl1
    411       //
    412       this.updateControl1.Location = new System.Drawing.Point(7, 3);
    413       this.updateControl1.Name = "updateControl1";
    414       this.updateControl1.Size = new System.Drawing.Size(75, 24);
    415       this.updateControl1.TabIndex = 1;
    416       this.updateControl1.UpdateAction = null;
    417       //
    418       // hiveJobListViewSlaves
    419       //
    420       this.hiveJobListViewSlaves.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
    421                   | System.Windows.Forms.AnchorStyles.Left)
    422                   | System.Windows.Forms.AnchorStyles.Right)));
    423       this.hiveJobListViewSlaves.Caption = "JobItemList View";
    424       this.hiveJobListViewSlaves.Content = null;
    425       this.hiveJobListViewSlaves.Location = new System.Drawing.Point(7, 26);
    426       this.hiveJobListViewSlaves.Name = "hiveJobListViewSlaves";
    427       this.hiveJobListViewSlaves.ReadOnly = false;
    428       this.hiveJobListViewSlaves.Size = new System.Drawing.Size(485, 450);
    429       this.hiveJobListViewSlaves.TabIndex = 0;
     96      // resourcesView
     97      //
     98      this.resourcesView.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
     99                  | System.Windows.Forms.AnchorStyles.Left)
     100                  | System.Windows.Forms.AnchorStyles.Right)));
     101      this.resourcesView.Caption = "ResourcesView";
     102      this.resourcesView.Content = null;
     103      this.resourcesView.Location = new System.Drawing.Point(0, 0);
     104      this.resourcesView.Name = "resourcesView";
     105      this.resourcesView.ReadOnly = false;
     106      this.resourcesView.Size = new System.Drawing.Size(734, 520);
     107      this.resourcesView.TabIndex = 0;
    430108      //
    431109      // tabUsers
    … …  
    712390      this.tabAdmin.ResumeLayout(false);
    713391      this.tabSlaves.ResumeLayout(false);
    714       this.splitSlaves.Panel1.ResumeLayout(false);
    715       this.splitSlaves.Panel2.ResumeLayout(false);
    716       ((System.ComponentModel.ISupportInitialize)(this.splitSlaves)).EndInit();
    717       this.splitSlaves.ResumeLayout(false);
    718       this.tabSlaveGroup.ResumeLayout(false);
    719       this.tabDetails.ResumeLayout(false);
    720       this.tabDetails.PerformLayout();
    721       this.tabSchedule.ResumeLayout(false);
    722       this.tabJobs.ResumeLayout(false);
    723392      this.tabUsers.ResumeLayout(false);
    724393      this.splitUsers.Panel1.ResumeLayout(false);
    … …  
    738407    #endregion
    739408
    740     private ScheduleControl scheduleControl1;
    741409    private System.Windows.Forms.SplitContainer splitUsers;
    742410    private System.Windows.Forms.ListView lstUsers;
    743     private HiveJobListView hiveJobListViewSlaves;
    744411    private System.Windows.Forms.Label label3;
    745412    private System.Windows.Forms.Label label2;
    … …  
    761428    private System.Windows.Forms.TabPage tabUserInformation;
    762429    private System.Windows.Forms.TabPage tabUserJobs;
    763     private System.Windows.Forms.Label label12;
    764     private System.Windows.Forms.Label label11;
    765     private System.Windows.Forms.Label label10;
    766     private System.Windows.Forms.Label label9;
    767     private System.Windows.Forms.TextBox txtName;
    768     private System.Windows.Forms.TextBox txtCPU;
    769     private System.Windows.Forms.TextBox txtMemory;
    770     private System.Windows.Forms.TextBox txtDetailsCalculatedJobs;
    771     private System.Windows.Forms.Button btnAddGroup;
    772     private System.Windows.Forms.Button btnRemoveGroup;
    773430    private HiveExperimentManagerView hiveExperimentManagerView;
    774     private System.Windows.Forms.TextBox txtDetailsDescription;
    775     private System.Windows.Forms.Label label13;
    776     private System.Windows.Forms.TextBox txtOS;
    777     private System.Windows.Forms.Label label15;
    778     private System.Windows.Forms.Label label14;
    779     private System.Windows.Forms.TextBox txtSlaveState;
    780     private System.Windows.Forms.ImageList imageListSlaveGroups;
    781431    private System.ComponentModel.IContainer components;
    782432    private System.Windows.Forms.ImageList imageListUsers;
    783     private Common.UpdateControl updateSlaveGroups;
    784     private Common.UpdateControl updateControl1;
    785433    private Common.UpdateControl updateControl2;
     434    private System.Windows.Forms.TabPage tabSlaves;
     435    private ResourcesView resourcesView;
    786436  }
    787437}

  • branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive.Views/3.4/Administration/HiveAdministrationView.cs

    r5602 r5638  
    2020#endregion
    2121
    22 using System;
    2322using System.Windows.Forms;
    2423using HeuristicLab.Clients.Hive.Administration;
     24using HeuristicLab.Core;
    2525using HeuristicLab.Core.Views;
    2626using HeuristicLab.MainForm;
    … …  
    5050    #endregion
    5151
     52    private void UpdateResources() {
     53      IItemList<Resource> resources = new ItemList<Resource>();
     54
     55      foreach (SlaveGroup g in Content.SlaveGroups) {
     56        resources.Add(g);
     57      }
     58      foreach (Slave g in Content.Slaves) {
     59        resources.Add(g);
     60      }
     61      resourcesView.Content = resources;
     62    }
    5263
    5364    protected override void OnContentChanged() {
    5465      base.OnContentChanged();
    5566      if (Content == null) {
    56         // TODO: Put code here when content is null
     67        resourcesView.Content = null;
     68
    5769      } else {
    58         updateSlaveGroups.UpdateAction = new Action(Content.UpdateSlaveGroups);
    59         treeSlaveGroup.ImageList.Images.Add(HiveImageLibrary.Slave);
    60         treeSlaveGroup.ImageList.Images.Add(HiveImageLibrary.SlaveGroup);
    61 
    62         foreach (SlaveGroup g in Content.SlaveGroups) {
    63           TreeNode tn = new TreeNode();
    64           tn.ImageIndex = treeSlaveGroup.ImageList.Images.Count - 1;
    65           tn.SelectedImageIndex = tn.ImageIndex;
    66 
    67           tn.Tag = g;
    68           tn.Text = g.Name;
    69           foreach (Slave s in Content.Slaves.FindAll(s => s.ParentResourceId != null && s.ParentResourceId == g.Id)) {
    70             var stn = new TreeNode(s.Name);
    71             stn.ImageIndex = 0;
    72             stn.SelectedImageIndex = stn.ImageIndex;
    73             stn.Tag = s;
    74             tn.Nodes.Add(stn);
    75           }
    76           treeSlaveGroup.Nodes.Add(tn);
    77         }
    78 
    79         TreeNode ungrp = new TreeNode("UNGROUPED");
    80         ungrp.ImageIndex = treeSlaveGroup.ImageList.Images.Count - 1;
    81         ungrp.SelectedImageIndex = ungrp.ImageIndex;
    82         var newGroup = new SlaveGroup();
    83         newGroup.Name = "UNGROUPED";
    84         newGroup.Id = Guid.NewGuid();
    85         newGroup.Description = "Contains slaves which are in no group";
    86         ungrp.Tag = newGroup;
    87 
    88         foreach (Slave s in Content.Slaves.FindAll(s => s.ParentResourceId == null)) {
    89           var stn = new TreeNode(s.Name);
    90           stn.ImageIndex = 0;
    91           stn.SelectedImageIndex = stn.ImageIndex;
    92           stn.Tag = s;
    93           ungrp.Nodes.Add(stn);
    94         }
    95         treeSlaveGroup.Nodes.Add(ungrp);
     70        //updateSlaveGroups.UpdateAction = new Action(Content.UpdateSlaveGroups);  //??
     71        UpdateResources();
    9672
    9773        ShowUsers();
    … …  
    12298    }
    12399
    124     private void treeSlaveGroup_NodeMouseClick(object sender, TreeNodeMouseClickEventArgs e) {
    125       if (e.Node != null) {
    126         if (e.Node.Tag.GetType() == typeof(Slave)) {
    127           Slave s = e.Node.Tag as Slave;
    128           txtName.Text = s.Name;
    129           txtDetailsDescription.Text = s.Description;
    130           txtCPU.Text = s.CpuArchitecture + ", " + s.Cores + " Cores @ " + s.CpuSpeed.ToString();
    131           txtMemory.Text = s.Memory.ToString();
    132           txtDetailsCalculatedJobs.Clear();
    133           txtOS.Text = s.OperatingSystem;
    134           txtSlaveState.Text = s.SlaveState.ToString();
    135         } else if (e.Node.Tag.GetType() == typeof(SlaveGroup)) {
    136           SlaveGroup s = e.Node.Tag as SlaveGroup;
    137           txtName.Text = s.Name;
    138           txtDetailsDescription.Text = s.Description;
    139           txtCPU.Clear();
    140           txtMemory.Clear();
    141           txtDetailsCalculatedJobs.Clear();
    142           txtOS.Clear();
    143           txtSlaveState.Clear();
    144         }
    145       }
    146     }
    147 
    148 
    149100    #region Event Handlers
    150101    // TODO: Put event handlers here

  • branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive.Views/3.4/Administration/HiveAdministrationView.resx

    r5538 r5638  
    118118    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
    119119  </resheader>
    120   <assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
    121   <data name="btnRemoveGroup.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
    122     <value>
    123         iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGOfPtRkwAAACBjSFJNAACH
    124         DwAAjA8AAP1SAACBQAAAfXkAAOmLAAA85QAAGcxzPIV3AAAKOWlDQ1BQaG90b3Nob3AgSUNDIHByb2Zp
    125         bGUAAEjHnZZ3VFTXFofPvXd6oc0wAlKG3rvAANJ7k15FYZgZYCgDDjM0sSGiAhFFRJoiSFDEgNFQJFZE
    126         sRAUVLAHJAgoMRhFVCxvRtaLrqy89/Ly++Osb+2z97n77L3PWhcAkqcvl5cGSwGQyhPwgzyc6RGRUXTs
    127         AIABHmCAKQBMVka6X7B7CBDJy82FniFyAl8EAfB6WLwCcNPQM4BOB/+fpFnpfIHomAARm7M5GSwRF4g4
    128         JUuQLrbPipgalyxmGCVmvihBEcuJOWGRDT77LLKjmNmpPLaIxTmns1PZYu4V8bZMIUfEiK+ICzO5nCwR
    129         3xKxRoowlSviN+LYVA4zAwAUSWwXcFiJIjYRMYkfEuQi4uUA4EgJX3HcVyzgZAvEl3JJS8/hcxMSBXQd
    130         li7d1NqaQffkZKVwBALDACYrmcln013SUtOZvBwAFu/8WTLi2tJFRbY0tba0NDQzMv2qUP91829K3NtF
    131         ehn4uWcQrf+L7a/80hoAYMyJarPziy2uCoDOLQDI3fti0zgAgKSobx3Xv7oPTTwviQJBuo2xcVZWlhGX
    132         wzISF/QP/U+Hv6GvvmckPu6P8tBdOfFMYYqALq4bKy0lTcinZ6QzWRy64Z+H+B8H/nUeBkGceA6fwxNF
    133         hImmjMtLELWbx+YKuGk8Opf3n5r4D8P+pMW5FonS+BFQY4yA1HUqQH7tBygKESDR+8Vd/6NvvvgwIH55
    134         4SqTi3P/7zf9Z8Gl4iWDm/A5ziUohM4S8jMX98TPEqABAUgCKpAHykAd6ABDYAasgC1wBG7AG/iDEBAJ
    135         VgMWSASpgA+yQB7YBApBMdgJ9oBqUAcaQTNoBcdBJzgFzoNL4Bq4AW6D+2AUTIBnYBa8BgsQBGEhMkSB
    136         5CEVSBPSh8wgBmQPuUG+UBAUCcVCCRAPEkJ50GaoGCqDqqF6qBn6HjoJnYeuQIPQXWgMmoZ+h97BCEyC
    137         qbASrAUbwwzYCfaBQ+BVcAK8Bs6FC+AdcCXcAB+FO+Dz8DX4NjwKP4PnEIAQERqiihgiDMQF8UeikHiE
    138         j6xHipAKpAFpRbqRPuQmMorMIG9RGBQFRUcZomxRnqhQFAu1BrUeVYKqRh1GdaB6UTdRY6hZ1Ec0Ga2I
    139         1kfboL3QEegEdBa6EF2BbkK3oy+ib6Mn0K8xGAwNo42xwnhiIjFJmLWYEsw+TBvmHGYQM46Zw2Kx8lh9
    140         rB3WH8vECrCF2CrsUexZ7BB2AvsGR8Sp4Mxw7rgoHA+Xj6vAHcGdwQ3hJnELeCm8Jt4G749n43PwpfhG
    141         fDf+On4Cv0CQJmgT7AghhCTCJkIloZVwkfCA8JJIJKoRrYmBRC5xI7GSeIx4mThGfEuSIemRXEjRJCFp
    142         B+kQ6RzpLuklmUzWIjuSo8gC8g5yM/kC+RH5jQRFwkjCS4ItsUGiRqJDYkjiuSReUlPSSXK1ZK5kheQJ
    143         yeuSM1J4KS0pFymm1HqpGqmTUiNSc9IUaVNpf+lU6RLpI9JXpKdksDJaMm4ybJkCmYMyF2TGKQhFneJC
    144         YVE2UxopFykTVAxVm+pFTaIWU7+jDlBnZWVkl8mGyWbL1sielh2lITQtmhcthVZKO04bpr1borTEaQln
    145         yfYlrUuGlszLLZVzlOPIFcm1yd2WeydPl3eTT5bfJd8p/1ABpaCnEKiQpbBf4aLCzFLqUtulrKVFS48v
    146         vacIK+opBimuVTyo2K84p6Ss5KGUrlSldEFpRpmm7KicpFyufEZ5WoWiYq/CVSlXOavylC5Ld6Kn0Cvp
    147         vfRZVUVVT1Whar3qgOqCmrZaqFq+WpvaQ3WCOkM9Xr1cvUd9VkNFw08jT6NF454mXpOhmai5V7NPc15L
    148         Wytca6tWp9aUtpy2l3audov2Ax2yjoPOGp0GnVu6GF2GbrLuPt0berCehV6iXo3edX1Y31Kfq79Pf9AA
    149         bWBtwDNoMBgxJBk6GWYathiOGdGMfI3yjTqNnhtrGEcZ7zLuM/5oYmGSYtJoct9UxtTbNN+02/R3Mz0z
    150         llmN2S1zsrm7+QbzLvMXy/SXcZbtX3bHgmLhZ7HVosfig6WVJd+y1XLaSsMq1qrWaoRBZQQwShiXrdHW
    151         ztYbrE9Zv7WxtBHYHLf5zdbQNtn2iO3Ucu3lnOWNy8ft1OyYdvV2o/Z0+1j7A/ajDqoOTIcGh8eO6o5s
    152         xybHSSddpySno07PnU2c+c7tzvMuNi7rXM65Iq4erkWuA24ybqFu1W6P3NXcE9xb3Gc9LDzWepzzRHv6
    153         eO7yHPFS8mJ5NXvNelt5r/Pu9SH5BPtU+zz21fPl+3b7wX7efrv9HqzQXMFb0ekP/L38d/s/DNAOWBPw
    154         YyAmMCCwJvBJkGlQXlBfMCU4JvhI8OsQ55DSkPuhOqHC0J4wybDosOaw+XDX8LLw0QjjiHUR1yIVIrmR
    155         XVHYqLCopqi5lW4r96yciLaILoweXqW9KnvVldUKq1NWn46RjGHGnIhFx4bHHol9z/RnNjDn4rziauNm
    156         WS6svaxnbEd2OXuaY8cp40zG28WXxU8l2CXsTphOdEisSJzhunCruS+SPJPqkuaT/ZMPJX9KCU9pS8Wl
    157         xqae5Mnwknm9acpp2WmD6frphemja2zW7Fkzy/fhN2VAGasyugRU0c9Uv1BHuEU4lmmfWZP5Jiss60S2
    158         dDYvuz9HL2d7zmSue+63a1FrWWt78lTzNuWNrXNaV78eWh+3vmeD+oaCDRMbPTYe3kTYlLzpp3yT/LL8
    159         V5vDN3cXKBVsLBjf4rGlpVCikF84stV2a9021DbutoHt5turtn8sYhddLTYprih+X8IqufqN6TeV33za
    160         Eb9joNSydP9OzE7ezuFdDrsOl0mX5ZaN7/bb3VFOLy8qf7UnZs+VimUVdXsJe4V7Ryt9K7uqNKp2Vr2v
    161         Tqy+XeNc01arWLu9dn4fe9/Qfsf9rXVKdcV17w5wD9yp96jvaNBqqDiIOZh58EljWGPft4xvm5sUmoqb
    162         PhziHRo9HHS4t9mqufmI4pHSFrhF2DJ9NProje9cv+tqNWytb6O1FR8Dx4THnn4f+/3wcZ/jPScYJ1p/
    163         0Pyhtp3SXtQBdeR0zHYmdo52RXYNnvQ+2dNt293+o9GPh06pnqo5LXu69AzhTMGZT2dzz86dSz83cz7h
    164         /HhPTM/9CxEXbvUG9g5c9Ll4+ZL7pQt9Tn1nL9tdPnXF5srJq4yrndcsr3X0W/S3/2TxU/uA5UDHdavr
    165         XTesb3QPLh88M+QwdP6m681Lt7xuXbu94vbgcOjwnZHokdE77DtTd1PuvriXeW/h/sYH6AdFD6UeVjxS
    166         fNTws+7PbaOWo6fHXMf6Hwc/vj/OGn/2S8Yv7ycKnpCfVEyqTDZPmU2dmnafvvF05dOJZ+nPFmYKf5X+
    167         tfa5zvMffnP8rX82YnbiBf/Fp99LXsq/PPRq2aueuYC5R69TXy/MF72Rf3P4LeNt37vwd5MLWe+x7ys/
    168         6H7o/ujz8cGn1E+f/gUDmPP8usTo0wAAAAlwSFlzAAALDAAACwwBP0AiyAAAAbVJREFUOE+lk7lLA0EU
    169         xuMRcdeYyIBRQcmxURTiEXE8ECQqpAkpJJVNihSKjVjbW1lJChuxtBGUNGKRwj9AvA9QEMRGS01M4YYZ
    170         v9nN5twgavGDt/tmvn3HtxbOueU/6JcpGQEpMAfqfyMoLjeAZbYU5iw2ryJe0N6ZVUZJI3JesGrkhYB4
    171         GQdHLB7iIId4vUqEkmZRIYvNiY/sFAX0FrrApCYSHeNscZojToKWfIsSm/UkkROXN4GtXMAol5ImJNdY
    172         qFcVQoj3wBBI5EUTiB2l7VVvgJI6HBoA51pLkaEvkMbzAZAqZ1N7hZQEWZSqLDIoKnkCxGyw5gKUuHHh
    173         CrBsoI2nA3Yh8vCzgPAAJS5wy6c7c69+u/DGmBjum18TWQF1tWdASSefcp5nZt381ic/prqsQW0TOtsX
    174         Xkm9ViRMt+jeYgtiz1Md+yBz5pE+Tl3N0cJB3QP2lwHb450iHyfbG3qMgZYKhLMTTn7plfi1Ih8WPFBc
    175         sWjPd9Jt/UR144g1yxv/gtj/xnO/jd8o8j3iPuNA2eBg8fdhxy5ytFxAd+Mo2AIzoLVyWCXtCOvL5k78
    176         w6/9DUORY3pvwx7IAAAAAElFTkSuQmCC
    177 </value>
    178   </data>
    179   <data name="btnAddGroup.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
    180     <value>
    181         iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGOfPtRkwAAACBjSFJNAACH
    182         DwAAjA8AAP1SAACBQAAAfXkAAOmLAAA85QAAGcxzPIV3AAAKOWlDQ1BQaG90b3Nob3AgSUNDIHByb2Zp
    183         bGUAAEjHnZZ3VFTXFofPvXd6oc0wAlKG3rvAANJ7k15FYZgZYCgDDjM0sSGiAhFFRJoiSFDEgNFQJFZE
    184         sRAUVLAHJAgoMRhFVCxvRtaLrqy89/Ly++Osb+2z97n77L3PWhcAkqcvl5cGSwGQyhPwgzyc6RGRUXTs
    185         AIABHmCAKQBMVka6X7B7CBDJy82FniFyAl8EAfB6WLwCcNPQM4BOB/+fpFnpfIHomAARm7M5GSwRF4g4
    186         JUuQLrbPipgalyxmGCVmvihBEcuJOWGRDT77LLKjmNmpPLaIxTmns1PZYu4V8bZMIUfEiK+ICzO5nCwR
    187         3xKxRoowlSviN+LYVA4zAwAUSWwXcFiJIjYRMYkfEuQi4uUA4EgJX3HcVyzgZAvEl3JJS8/hcxMSBXQd
    188         li7d1NqaQffkZKVwBALDACYrmcln013SUtOZvBwAFu/8WTLi2tJFRbY0tba0NDQzMv2qUP91829K3NtF
    189         ehn4uWcQrf+L7a/80hoAYMyJarPziy2uCoDOLQDI3fti0zgAgKSobx3Xv7oPTTwviQJBuo2xcVZWlhGX
    190         wzISF/QP/U+Hv6GvvmckPu6P8tBdOfFMYYqALq4bKy0lTcinZ6QzWRy64Z+H+B8H/nUeBkGceA6fwxNF
    191         hImmjMtLELWbx+YKuGk8Opf3n5r4D8P+pMW5FonS+BFQY4yA1HUqQH7tBygKESDR+8Vd/6NvvvgwIH55
    192         4SqTi3P/7zf9Z8Gl4iWDm/A5ziUohM4S8jMX98TPEqABAUgCKpAHykAd6ABDYAasgC1wBG7AG/iDEBAJ
    193         VgMWSASpgA+yQB7YBApBMdgJ9oBqUAcaQTNoBcdBJzgFzoNL4Bq4AW6D+2AUTIBnYBa8BgsQBGEhMkSB
    194         5CEVSBPSh8wgBmQPuUG+UBAUCcVCCRAPEkJ50GaoGCqDqqF6qBn6HjoJnYeuQIPQXWgMmoZ+h97BCEyC
    195         qbASrAUbwwzYCfaBQ+BVcAK8Bs6FC+AdcCXcAB+FO+Dz8DX4NjwKP4PnEIAQERqiihgiDMQF8UeikHiE
    196         j6xHipAKpAFpRbqRPuQmMorMIG9RGBQFRUcZomxRnqhQFAu1BrUeVYKqRh1GdaB6UTdRY6hZ1Ec0Ga2I
    197         1kfboL3QEegEdBa6EF2BbkK3oy+ib6Mn0K8xGAwNo42xwnhiIjFJmLWYEsw+TBvmHGYQM46Zw2Kx8lh9
    198         rB3WH8vECrCF2CrsUexZ7BB2AvsGR8Sp4Mxw7rgoHA+Xj6vAHcGdwQ3hJnELeCm8Jt4G749n43PwpfhG
    199         fDf+On4Cv0CQJmgT7AghhCTCJkIloZVwkfCA8JJIJKoRrYmBRC5xI7GSeIx4mThGfEuSIemRXEjRJCFp
    200         B+kQ6RzpLuklmUzWIjuSo8gC8g5yM/kC+RH5jQRFwkjCS4ItsUGiRqJDYkjiuSReUlPSSXK1ZK5kheQJ
    201         yeuSM1J4KS0pFymm1HqpGqmTUiNSc9IUaVNpf+lU6RLpI9JXpKdksDJaMm4ybJkCmYMyF2TGKQhFneJC
    202         YVE2UxopFykTVAxVm+pFTaIWU7+jDlBnZWVkl8mGyWbL1sielh2lITQtmhcthVZKO04bpr1borTEaQln
    203         yfYlrUuGlszLLZVzlOPIFcm1yd2WeydPl3eTT5bfJd8p/1ABpaCnEKiQpbBf4aLCzFLqUtulrKVFS48v
    204         vacIK+opBimuVTyo2K84p6Ss5KGUrlSldEFpRpmm7KicpFyufEZ5WoWiYq/CVSlXOavylC5Ld6Kn0Cvp
    205         vfRZVUVVT1Whar3qgOqCmrZaqFq+WpvaQ3WCOkM9Xr1cvUd9VkNFw08jT6NF454mXpOhmai5V7NPc15L
    206         Wytca6tWp9aUtpy2l3audov2Ax2yjoPOGp0GnVu6GF2GbrLuPt0berCehV6iXo3edX1Y31Kfq79Pf9AA
    207         bWBtwDNoMBgxJBk6GWYathiOGdGMfI3yjTqNnhtrGEcZ7zLuM/5oYmGSYtJoct9UxtTbNN+02/R3Mz0z
    208         llmN2S1zsrm7+QbzLvMXy/SXcZbtX3bHgmLhZ7HVosfig6WVJd+y1XLaSsMq1qrWaoRBZQQwShiXrdHW
    209         ztYbrE9Zv7WxtBHYHLf5zdbQNtn2iO3Ucu3lnOWNy8ft1OyYdvV2o/Z0+1j7A/ajDqoOTIcGh8eO6o5s
    210         xybHSSddpySno07PnU2c+c7tzvMuNi7rXM65Iq4erkWuA24ybqFu1W6P3NXcE9xb3Gc9LDzWepzzRHv6
    211         eO7yHPFS8mJ5NXvNelt5r/Pu9SH5BPtU+zz21fPl+3b7wX7efrv9HqzQXMFb0ekP/L38d/s/DNAOWBPw
    212         YyAmMCCwJvBJkGlQXlBfMCU4JvhI8OsQ55DSkPuhOqHC0J4wybDosOaw+XDX8LLw0QjjiHUR1yIVIrmR
    213         XVHYqLCopqi5lW4r96yciLaILoweXqW9KnvVldUKq1NWn46RjGHGnIhFx4bHHol9z/RnNjDn4rziauNm
    214         WS6svaxnbEd2OXuaY8cp40zG28WXxU8l2CXsTphOdEisSJzhunCruS+SPJPqkuaT/ZMPJX9KCU9pS8Wl
    215         xqae5Mnwknm9acpp2WmD6frphemja2zW7Fkzy/fhN2VAGasyugRU0c9Uv1BHuEU4lmmfWZP5Jiss60S2
    216         dDYvuz9HL2d7zmSue+63a1FrWWt78lTzNuWNrXNaV78eWh+3vmeD+oaCDRMbPTYe3kTYlLzpp3yT/LL8
    217         V5vDN3cXKBVsLBjf4rGlpVCikF84stV2a9021DbutoHt5turtn8sYhddLTYprih+X8IqufqN6TeV33za
    218         Eb9joNSydP9OzE7ezuFdDrsOl0mX5ZaN7/bb3VFOLy8qf7UnZs+VimUVdXsJe4V7Ryt9K7uqNKp2Vr2v
    219         Tqy+XeNc01arWLu9dn4fe9/Qfsf9rXVKdcV17w5wD9yp96jvaNBqqDiIOZh58EljWGPft4xvm5sUmoqb
    220         PhziHRo9HHS4t9mqufmI4pHSFrhF2DJ9NProje9cv+tqNWytb6O1FR8Dx4THnn4f+/3wcZ/jPScYJ1p/
    221         0Pyhtp3SXtQBdeR0zHYmdo52RXYNnvQ+2dNt293+o9GPh06pnqo5LXu69AzhTMGZT2dzz86dSz83cz7h
    222         /HhPTM/9CxEXbvUG9g5c9Ll4+ZL7pQt9Tn1nL9tdPnXF5srJq4yrndcsr3X0W/S3/2TxU/uA5UDHdavr
    223         XTesb3QPLh88M+QwdP6m681Lt7xuXbu94vbgcOjwnZHokdE77DtTd1PuvriXeW/h/sYH6AdFD6UeVjxS
    224         fNTws+7PbaOWo6fHXMf6Hwc/vj/OGn/2S8Yv7ycKnpCfVEyqTDZPmU2dmnafvvF05dOJZ+nPFmYKf5X+
    225         tfa5zvMffnP8rX82YnbiBf/Fp99LXsq/PPRq2aueuYC5R69TXy/MF72Rf3P4LeNt37vwd5MLWe+x7ys/
    226         6H7o/ujz8cGn1E+f/gUDmPP8usTo0wAAAAlwSFlzAAALDAAACwwBP0AiyAAAAX5JREFUOE9j+P//PwMl
    227         mCLNIItxGcBzdwH7mVvzOM9cncN15uIM3gO4XInLAObrc7j+/3nU+P/Pw4b/JycL/CHVAIbz03nhBhzs
    228         EQHqxx5WOMPg+CTBD38e1v3/86Dq/452cZAB/NgMgRtwaSbPgbNT+c6cnCR45ki/0Jl93SJ//jwo///3
    229         XtH/9Q0y/1fVyP1fWqn4f36p8v9ZRaoPYYbBDTg1WQBoYz3Qxlogrvz/514JEOf9/3s38//fO8n//96O
    230         +//vZgQQh/yflKOJacChXmGgjVX//94vBWosAGrMBmpMBWpM+P/vVjRQY9j/fzeC/v+77ve/K033FYYL
    231         drZL/N/SLPV/XYPM7VU18meWVCj+/3srBqgx/P/UPI3/E7K0/ndn6P5vT9X/35xo+AHDAPQAml2k+g3k
    232         3H83Av73ZOigx4IiQQOA/nz774Y/0AC//63J+qRHY3e67kOQf0G4Ps6IdANakgwuNcQb/q+JNf5fGW1C
    233         ugHE5lCKcyMAN07j92U5+iMAAAAASUVORK5CYII=
    234 </value>
    235   </data>
    236   <metadata name="imageListSlaveGroups.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
    237     <value>17, 17</value>
    238   </metadata>
    239120  <metadata name="imageListUsers.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
    240     <value>120, 17</value>
     121    <value>46, 23</value>
    241122  </metadata>
    242123</root>

  • branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive.Views/3.4/Administration/HiveAppointment.cs

    r5614 r5638  
    2828  public class HiveAppointment : Calendar.Appointment {
    2929    private Guid recurringId = Guid.Empty;
     30
     31    [XmlIgnore]
     32    public bool Changed { get; set; }
     33
     34    public HiveAppointment()
     35      : base() {
     36      Changed = false;
     37    }
    3038
    3139    [XmlIgnore]
    … …  
    7482    public bool AllDayEvent {
    7583      get { return base.AllDayEvent; }
    76       set { base.AllDayEvent = value; }
     84      set { base.AllDayEvent = value; Changed = true; }
    7785    }
    7886
    … …  
    8088    public bool Recurring {
    8189      get { return base.Recurring; }
    82       set { base.Recurring = value; }
     90      set { base.Recurring = value; Changed = true; }
    8391    }
    8492
    … …  
    8694    public Guid RecurringId {
    8795      get { return recurringId; }
    88       set { recurringId = value; }
     96      set { recurringId = value; Changed = true; }
    8997    }
    9098
    … …  
    92100    public DateTime EndDate {
    93101      get { return base.EndDate; }
    94       set { base.EndDate = value; }
     102      set { base.EndDate = value; Changed = true; }
     103    }
     104
     105    [XmlAttribute("StartDate")]
     106    public DateTime StartDate {
     107      get { return base.StartDate; }
     108      set { base.StartDate = value; Changed = true; }
    95109    }
    96110

  • branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive.Views/3.4/HeuristicLab.Clients.Hive.Views-3.4.csproj

    r5637 r5638  
    8383      <HintPath>..\..\..\..\..\..\..\..\Program Files\HeuristicLab 3.3\HeuristicLab.Common.Resources-3.3.dll</HintPath>
    8484    </Reference>
    85     <Reference Include="HeuristicLab.Core-3.3">
    86       <HintPath>..\..\..\..\..\..\..\..\..\..\..\Program Files\HeuristicLab 3.3\HeuristicLab.Core-3.3.dll</HintPath>
     85    <Reference Include="HeuristicLab.Core-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
     86      <HintPath>..\..\..\..\..\..\..\Program Files\HeuristicLab 3.3\HeuristicLab.Core-3.3.dll</HintPath>
    8787    </Reference>
    8888    <Reference Include="HeuristicLab.Core.Views-3.3">
    … …  
    126126  <ItemGroup>
    127127    <Compile Include="Administration\HiveAppointment.cs" />
     128    <Compile Include="Administration\Recurrence.cs">
     129      <SubType>Form</SubType>
     130    </Compile>
     131    <Compile Include="Administration\Recurrence.designer.cs">
     132      <DependentUpon>Recurrence.cs</DependentUpon>
     133    </Compile>
     134    <Compile Include="Administration\RecurrentEvent.cs" />
     135    <Compile Include="Administration\ResourcesView.cs">
     136      <SubType>UserControl</SubType>
     137    </Compile>
     138    <Compile Include="Administration\ResourcesView.Designer.cs">
     139      <DependentUpon>ResourcesView.cs</DependentUpon>
     140    </Compile>
     141    <Compile Include="Administration\ScheduleView.cs">
     142      <SubType>UserControl</SubType>
     143    </Compile>
     144    <Compile Include="Administration\ScheduleView.Designer.cs">
     145      <DependentUpon>ScheduleView.cs</DependentUpon>
     146    </Compile>
     147    <Compile Include="Administration\SlaveView.cs">
     148      <SubType>UserControl</SubType>
     149    </Compile>
     150    <Compile Include="Administration\SlaveView.Designer.cs">
     151      <DependentUpon>SlaveView.cs</DependentUpon>
     152    </Compile>
    128153    <Compile Include="Common\UpdateControl.cs">
    129154      <SubType>UserControl</SubType>
    … …  
    199224    </Compile>
    200225    <Compile Include="Administration\MenuItems\AdministrationMenuItem.cs" />
    201     <Compile Include="Administration\ScheduleControl.cs">
    202       <SubType>UserControl</SubType>
    203     </Compile>
    204     <Compile Include="Administration\ScheduleControl.Designer.cs">
    205       <DependentUpon>ScheduleControl.cs</DependentUpon>
    206     </Compile>
    207226    <Compile Include="ExperimentManager\HiveExperimentListView.cs">
    208227      <SubType>UserControl</SubType>
    … …  
    247266      <DependentUpon>HiveAdministrationView.cs</DependentUpon>
    248267    </EmbeddedResource>
    249     <EmbeddedResource Include="Administration\ScheduleControl.resx">
    250       <DependentUpon>ScheduleControl.cs</DependentUpon>
     268    <EmbeddedResource Include="Administration\Recurrence.resx">
     269      <DependentUpon>Recurrence.cs</DependentUpon>
     270    </EmbeddedResource>
     271    <EmbeddedResource Include="Administration\ResourcesView.resx">
     272      <DependentUpon>ResourcesView.cs</DependentUpon>
     273    </EmbeddedResource>
     274    <EmbeddedResource Include="Administration\ScheduleView.resx">
     275      <DependentUpon>ScheduleView.cs</DependentUpon>
     276    </EmbeddedResource>
     277    <EmbeddedResource Include="Administration\SlaveView.resx">
     278      <DependentUpon>SlaveView.cs</DependentUpon>
    251279    </EmbeddedResource>
    252280    <EmbeddedResource Include="Common\UpdateControl.resx">
    … …  
    320348    <None Include="Images\status_anim.gif" />
    321349  </ItemGroup>
     350  <ItemGroup>
     351    <WCFMetadata Include="Service References\" />
     352  </ItemGroup>
    322353  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
    323354  <PropertyGroup>
Note: See TracChangeset for help on using the changeset viewer.