Free cookie consent management tool by TermsFeed Policy Generator

Changeset 6823


Ignore:
Timestamp:
09/22/11 16:28:59 (11 years ago)
Author:
ascheibe
Message:

#1233

  • implemented administrator ui review comments
  • implemented slave ui review comments
Location:
branches/HeuristicLab.Hive-3.4/sources
Files:
3 added
5 deleted
24 edited

Legend:

Unmodified
Added
Removed
  • branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive.Administrator/3.3/Views/SlaveView.Designer.cs

    r6688 r6823  
    7070                  | System.Windows.Forms.AnchorStyles.Right)));
    7171      this.txtSlaveState.Enabled = false;
    72       this.txtSlaveState.Location = new System.Drawing.Point(120, 186);
     72      this.txtSlaveState.Location = new System.Drawing.Point(102, 190);
    7373      this.txtSlaveState.Name = "txtSlaveState";
    74       this.txtSlaveState.Size = new System.Drawing.Size(249, 20);
     74      this.txtSlaveState.Size = new System.Drawing.Size(267, 20);
    7575      this.txtSlaveState.TabIndex = 27;
    7676      //
     
    8080                  | System.Windows.Forms.AnchorStyles.Right)));
    8181      this.txtOS.Enabled = false;
    82       this.txtOS.Location = new System.Drawing.Point(120, 160);
     82      this.txtOS.Location = new System.Drawing.Point(102, 164);
    8383      this.txtOS.Name = "txtOS";
    84       this.txtOS.Size = new System.Drawing.Size(249, 20);
     84      this.txtOS.Size = new System.Drawing.Size(267, 20);
    8585      this.txtOS.TabIndex = 26;
    8686      //
     
    9090      this.label15.Location = new System.Drawing.Point(3, 193);
    9191      this.label15.Name = "label15";
    92       this.label15.Size = new System.Drawing.Size(32, 13);
     92      this.label15.Size = new System.Drawing.Size(35, 13);
    9393      this.label15.TabIndex = 25;
    94       this.label15.Text = "State";
     94      this.label15.Text = "State:";
    9595      //
    9696      // label14
     
    9999      this.label14.Location = new System.Drawing.Point(3, 167);
    100100      this.label14.Name = "label14";
    101       this.label14.Size = new System.Drawing.Size(90, 13);
     101      this.label14.Size = new System.Drawing.Size(93, 13);
    102102      this.label14.TabIndex = 24;
    103       this.label14.Text = "Operating System";
     103      this.label14.Text = "Operating System:";
    104104      //
    105105      // txtDetailsDescription
     
    108108                  | System.Windows.Forms.AnchorStyles.Right)));
    109109      this.txtDetailsDescription.Enabled = false;
    110       this.txtDetailsDescription.Location = new System.Drawing.Point(120, 56);
     110      this.txtDetailsDescription.Location = new System.Drawing.Point(102, 60);
    111111      this.txtDetailsDescription.Name = "txtDetailsDescription";
    112       this.txtDetailsDescription.Size = new System.Drawing.Size(249, 20);
     112      this.txtDetailsDescription.Size = new System.Drawing.Size(267, 20);
    113113      this.txtDetailsDescription.TabIndex = 23;
    114114      //
     
    118118      this.label13.Location = new System.Drawing.Point(3, 63);
    119119      this.label13.Name = "label13";
    120       this.label13.Size = new System.Drawing.Size(60, 13);
     120      this.label13.Size = new System.Drawing.Size(63, 13);
    121121      this.label13.TabIndex = 22;
    122       this.label13.Text = "Description";
     122      this.label13.Text = "Description:";
    123123      //
    124124      // txtName
     
    126126      this.txtName.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
    127127                  | System.Windows.Forms.AnchorStyles.Right)));
    128       this.txtName.Location = new System.Drawing.Point(120, 4);
     128      this.txtName.Location = new System.Drawing.Point(102, 8);
    129129      this.txtName.Name = "txtName";
    130       this.txtName.Size = new System.Drawing.Size(249, 20);
     130      this.txtName.Size = new System.Drawing.Size(267, 20);
    131131      this.txtName.TabIndex = 21;
    132132      this.txtName.TextChanged += new System.EventHandler(this.txtName_TextChanged);
     
    137137                  | System.Windows.Forms.AnchorStyles.Right)));
    138138      this.txtCPU.Enabled = false;
    139       this.txtCPU.Location = new System.Drawing.Point(120, 82);
     139      this.txtCPU.Location = new System.Drawing.Point(102, 86);
    140140      this.txtCPU.Name = "txtCPU";
    141       this.txtCPU.Size = new System.Drawing.Size(249, 20);
     141      this.txtCPU.Size = new System.Drawing.Size(267, 20);
    142142      this.txtCPU.TabIndex = 20;
    143143      //
     
    147147                  | System.Windows.Forms.AnchorStyles.Right)));
    148148      this.txtMemory.Enabled = false;
    149       this.txtMemory.Location = new System.Drawing.Point(120, 108);
     149      this.txtMemory.Location = new System.Drawing.Point(102, 112);
    150150      this.txtMemory.Name = "txtMemory";
    151       this.txtMemory.Size = new System.Drawing.Size(249, 20);
     151      this.txtMemory.Size = new System.Drawing.Size(267, 20);
    152152      this.txtMemory.TabIndex = 19;
    153153      //
     
    157157                  | System.Windows.Forms.AnchorStyles.Right)));
    158158      this.txtLastHeartbeat.Enabled = false;
    159       this.txtLastHeartbeat.Location = new System.Drawing.Point(120, 212);
     159      this.txtLastHeartbeat.Location = new System.Drawing.Point(102, 216);
    160160      this.txtLastHeartbeat.Name = "txtLastHeartbeat";
    161       this.txtLastHeartbeat.Size = new System.Drawing.Size(249, 20);
     161      this.txtLastHeartbeat.Size = new System.Drawing.Size(267, 20);
    162162      this.txtLastHeartbeat.TabIndex = 18;
    163163      //
     
    167167      this.label12.Location = new System.Drawing.Point(3, 219);
    168168      this.label12.Name = "label12";
    169       this.label12.Size = new System.Drawing.Size(77, 13);
     169      this.label12.Size = new System.Drawing.Size(80, 13);
    170170      this.label12.TabIndex = 17;
    171       this.label12.Text = "Last Heartbeat";
     171      this.label12.Text = "Last Heartbeat:";
    172172      //
    173173      // label11
     
    176176      this.label11.Location = new System.Drawing.Point(3, 115);
    177177      this.label11.Name = "label11";
    178       this.label11.Size = new System.Drawing.Size(44, 13);
     178      this.label11.Size = new System.Drawing.Size(47, 13);
    179179      this.label11.TabIndex = 16;
    180       this.label11.Text = "Memory";
     180      this.label11.Text = "Memory:";
    181181      //
    182182      // label10
     
    185185      this.label10.Location = new System.Drawing.Point(3, 89);
    186186      this.label10.Name = "label10";
    187       this.label10.Size = new System.Drawing.Size(29, 13);
     187      this.label10.Size = new System.Drawing.Size(32, 13);
    188188      this.label10.TabIndex = 15;
    189       this.label10.Text = "CPU";
     189      this.label10.Text = "CPU:";
    190190      //
    191191      // label9
     
    194194      this.label9.Location = new System.Drawing.Point(3, 11);
    195195      this.label9.Name = "label9";
    196       this.label9.Size = new System.Drawing.Size(35, 13);
     196      this.label9.Size = new System.Drawing.Size(38, 13);
    197197      this.label9.TabIndex = 14;
    198       this.label9.Text = "Name";
     198      this.label9.Text = "Name:";
    199199      //
    200200      // label1
     
    203203      this.label1.Location = new System.Drawing.Point(3, 141);
    204204      this.label1.Name = "label1";
    205       this.label1.Size = new System.Drawing.Size(67, 13);
     205      this.label1.Size = new System.Drawing.Size(70, 13);
    206206      this.label1.TabIndex = 28;
    207       this.label1.Text = "Free memory";
     207      this.label1.Text = "Free memory:";
    208208      //
    209209      // txtFreeMemory
     
    212212                  | System.Windows.Forms.AnchorStyles.Right)));
    213213      this.txtFreeMemory.Enabled = false;
    214       this.txtFreeMemory.Location = new System.Drawing.Point(120, 134);
     214      this.txtFreeMemory.Location = new System.Drawing.Point(102, 138);
    215215      this.txtFreeMemory.Name = "txtFreeMemory";
    216       this.txtFreeMemory.Size = new System.Drawing.Size(249, 20);
     216      this.txtFreeMemory.Size = new System.Drawing.Size(267, 20);
    217217      this.txtFreeMemory.TabIndex = 29;
    218218      //
     
    222222                  | System.Windows.Forms.AnchorStyles.Right)));
    223223      this.txtId.Enabled = false;
    224       this.txtId.Location = new System.Drawing.Point(120, 30);
     224      this.txtId.Location = new System.Drawing.Point(102, 34);
    225225      this.txtId.Name = "txtId";
    226       this.txtId.Size = new System.Drawing.Size(249, 20);
     226      this.txtId.Size = new System.Drawing.Size(267, 20);
    227227      this.txtId.TabIndex = 30;
    228228      //
     
    232232      this.label2.Location = new System.Drawing.Point(3, 37);
    233233      this.label2.Name = "label2";
    234       this.label2.Size = new System.Drawing.Size(16, 13);
     234      this.label2.Size = new System.Drawing.Size(19, 13);
    235235      this.label2.TabIndex = 31;
    236       this.label2.Text = "Id";
     236      this.label2.Text = "Id:";
    237237      //
    238238      // SlaveView
     
    259259      this.Controls.Add(this.label9);
    260260      this.Name = "SlaveView";
    261       this.Size = new System.Drawing.Size(372, 236);
     261      this.Size = new System.Drawing.Size(372, 241);
    262262      this.ResumeLayout(false);
    263263      this.PerformLayout();
  • branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive.Slave.App/3.3/HiveSlaveApplication.cs

    r6743 r6823  
    2828  [Application("Hive Slave", "Runs the Hive Slave as a HeuristicLab application")]
    2929  internal class HiveSlaveApplication : ApplicationBase {
     30    private HeuristicLab.Clients.Hive.SlaveCore.Core core;
    3031    public override void Run() {
    31       HeuristicLab.Clients.Hive.SlaveCore.Core core = new HeuristicLab.Clients.Hive.SlaveCore.Core();
     32      core = new HeuristicLab.Clients.Hive.SlaveCore.Core();
    3233      Thread coreThread = new Thread(core.Start);
    3334      coreThread.IsBackground = true;
     
    3637      MainWindow window = new MainWindow();
    3738      window.Content = new SlaveItem();
     39      Application.ApplicationExit += new System.EventHandler(Application_ApplicationExit);
    3840      Application.Run(window);
     41    }
    3942
     43    void Application_ApplicationExit(object sender, System.EventArgs e) {
    4044      core.Shutdown();
    4145    }
  • branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive.Slave.App/3.3/MainWindow.Designer.cs

    r6734 r6823  
    3838      this.slaveMainView.Name = "slaveMainView";
    3939      this.slaveMainView.ReadOnly = false;
    40       this.slaveMainView.Size = new System.Drawing.Size(588, 328);
     40      this.slaveMainView.Size = new System.Drawing.Size(590, 488);
    4141      this.slaveMainView.TabIndex = 0;
    4242      //
     
    4545      this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
    4646      this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
    47       this.ClientSize = new System.Drawing.Size(612, 352);
     47      this.ClientSize = new System.Drawing.Size(614, 512);
    4848      this.Controls.Add(this.slaveMainView);
    4949      this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon")));
    5050      this.Name = "MainWindow";
    5151      this.Text = "Hive Slave";
    52       this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.MainWindow_FormClosing);
    5352      this.ResumeLayout(false);
    5453
  • branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive.Slave.App/3.3/MainWindow.cs

    r6744 r6823  
    4545      }
    4646    }
    47 
    48     private void MainWindow_FormClosing(object sender, FormClosingEventArgs e) {
    49       if (e.CloseReason == CloseReason.UserClosing) {
    50         e.Cancel = true;
    51         Hide();
    52       }
    53     }
    5447  }
    5548}
  • branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive.Slave.TrayIcon/3.3/MainWindow.Designer.cs

    r6734 r6823  
    3939      this.slaveMainView.Name = "slaveMainView";
    4040      this.slaveMainView.ReadOnly = false;
    41       this.slaveMainView.Size = new System.Drawing.Size(588, 328);
     41      this.slaveMainView.Size = new System.Drawing.Size(590, 488);
    4242      this.slaveMainView.TabIndex = 0;
    4343      //
     
    4646      this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
    4747      this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
    48       this.ClientSize = new System.Drawing.Size(612, 352);
     48      this.ClientSize = new System.Drawing.Size(614, 512);
    4949      this.Controls.Add(this.slaveMainView);
    5050      this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon")));
  • branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive.Slave.Views/3.3/HeuristicLab.Clients.Hive.Slave.Views-3.3.csproj

    r6730 r6823  
    123123  </ItemGroup>
    124124  <ItemGroup>
     125    <Compile Include="AboutDialog.cs">
     126      <SubType>Form</SubType>
     127    </Compile>
     128    <Compile Include="AboutDialog.Designer.cs">
     129      <DependentUpon>AboutDialog.cs</DependentUpon>
     130    </Compile>
    125131    <Compile Include="AboutView.cs">
    126132      <SubType>UserControl</SubType>
     
    146152    <Compile Include="SlaveMainViewBase.Designer.cs">
    147153      <DependentUpon>SlaveMainViewBase.cs</DependentUpon>
    148     </Compile>
    149     <Compile Include="SlaveViewTray.cs">
    150       <SubType>UserControl</SubType>
    151     </Compile>
    152     <Compile Include="SlaveViewTray.Designer.cs">
    153       <DependentUpon>SlaveViewTray.cs</DependentUpon>
    154154    </Compile>
    155155    <Compile Include="SlaveCmdsWithKill.cs">
     
    220220  </ItemGroup>
    221221  <ItemGroup>
     222    <EmbeddedResource Include="AboutDialog.resx">
     223      <DependentUpon>AboutDialog.cs</DependentUpon>
     224    </EmbeddedResource>
    222225    <EmbeddedResource Include="AboutView.resx">
    223226      <DependentUpon>AboutView.cs</DependentUpon>
     
    231234    <EmbeddedResource Include="SlaveMainViewBase.resx">
    232235      <DependentUpon>SlaveMainViewBase.cs</DependentUpon>
    233     </EmbeddedResource>
    234     <EmbeddedResource Include="SlaveViewTray.resx">
    235       <DependentUpon>SlaveViewTray.cs</DependentUpon>
    236236    </EmbeddedResource>
    237237    <EmbeddedResource Include="SlaveCmdsWithKill.resx">
  • branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive.Slave.Views/3.3/JobsView.Designer.cs

    r6764 r6823  
    6060      this.lstJobs.Location = new System.Drawing.Point(3, 3);
    6161      this.lstJobs.Name = "lstJobs";
    62       this.lstJobs.Size = new System.Drawing.Size(458, 343);
     62      this.lstJobs.Size = new System.Drawing.Size(380, 164);
    6363      this.lstJobs.TabIndex = 0;
    6464      this.lstJobs.UseCompatibleStateImageBehavior = false;
     
    8181      this.Controls.Add(this.lstJobs);
    8282      this.Name = "JobsView";
    83       this.Size = new System.Drawing.Size(464, 349);
     83      this.Size = new System.Drawing.Size(386, 170);
    8484      this.ResumeLayout(false);
    8585
  • branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive.Slave.Views/3.3/SlaveCmdsBase.Designer.cs

    r6730 r6823  
    4545    /// </summary>
    4646    private void InitializeComponent() {
     47      this.components = new System.ComponentModel.Container();
    4748      System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(SlaveCmdsBase));
    4849      this.btnStart = new System.Windows.Forms.Button();
    4950      this.btnStop = new System.Windows.Forms.Button();
     51      this.toolTip = new System.Windows.Forms.ToolTip(this.components);
    5052      this.SuspendLayout();
    5153      //
     
    5355      //
    5456      this.btnStart.Image = ((System.Drawing.Image)(resources.GetObject("btnStart.Image")));
    55       this.btnStart.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft;
    56       this.btnStart.Location = new System.Drawing.Point(10, 89);
     57      this.btnStart.Location = new System.Drawing.Point(3, 3);
    5758      this.btnStart.Name = "btnStart";
    58       this.btnStart.Size = new System.Drawing.Size(75, 23);
     59      this.btnStart.Size = new System.Drawing.Size(24, 24);
    5960      this.btnStart.TabIndex = 10;
    60       this.btnStart.Text = "Start";
     61      this.toolTip.SetToolTip(this.btnStart, "Start/Resume the slave");
    6162      this.btnStart.UseVisualStyleBackColor = true;
    6263      this.btnStart.Click += new System.EventHandler(this.btnStart_Click);
     
    6566      //
    6667      this.btnStop.Image = ((System.Drawing.Image)(resources.GetObject("btnStop.Image")));
    67       this.btnStop.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft;
    68       this.btnStop.Location = new System.Drawing.Point(10, 60);
     68      this.btnStop.Location = new System.Drawing.Point(33, 3);
    6969      this.btnStop.Name = "btnStop";
    70       this.btnStop.Size = new System.Drawing.Size(75, 23);
     70      this.btnStop.Size = new System.Drawing.Size(24, 24);
    7171      this.btnStop.TabIndex = 11;
    72       this.btnStop.Text = "Stop";
     72      this.toolTip.SetToolTip(this.btnStop, "Pause slave");
    7373      this.btnStop.UseVisualStyleBackColor = true;
    7474      this.btnStop.Click += new System.EventHandler(this.btnStop_Click);
     
    8181      this.Controls.Add(this.btnStart);
    8282      this.Name = "SlaveCmdsBase";
    83       this.Size = new System.Drawing.Size(100, 155);
     83      this.Size = new System.Drawing.Size(92, 30);
    8484      this.ResumeLayout(false);
    8585
     
    9090    private System.Windows.Forms.Button btnStart;
    9191    private System.Windows.Forms.Button btnStop;
     92    protected System.Windows.Forms.ToolTip toolTip;
    9293  }
    9394}
  • branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive.Slave.Views/3.3/SlaveCmdsBase.resx

    r6730 r6823  
    122122    <value>
    123123        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGOfPtRkwAAACBjSFJNAAB6
    124         JQAAgIMAAPn/AACA6QAAdTAAAOpgAAA6mAAAF2+SX8VGAAAACXBIWXMAAAsNAAALDQHtB8AsAAABEElE
    125         QVQ4T2P4//8/AzpO6HnCjE0cmxiGZpAioAEyQMxEjCFYDSic9fx//OS3SsQYgtWA3JnP/id03/sfN+G1
    126         BiHvYDUgY8rT//P2//4f1HDzNdAAW3yG4AqD/7P3/frfufXvf7fSy/+BBtjjMgSrAZFdj/5P2fbrf8nS
    127         v/8Tpv/9b5N7FqchWA0IbH74v3Xte7Bm45Iv/6Wjr/03jlz236HobDy6S7Aa4FF1/3/J3HdwzYouPf+l
    128         fVYHEp0O7Evv/g9seQa2GaJ5pReuNIHVBRZ5d/7bFFyBabbBl6CwGmCYdRusWcpruSuh1IjVAJ20G0Bn
    129         r/ElpBkkj9UAKe+1ftLeK4jKUFgNIMZmmBqKDQAA4djU9Io7KYIAAAAASUVORK5CYII=
     124        JQAAgIMAAPn/AACA6QAAdTAAAOpgAAA6mAAAF2+SX8VGAAAACXBIWXMAAAsRAAALEQF/ZF+RAAAAsElE
     125        QVQ4T2P4//8/AyUYq+ay/dluxBqK1YCEGRH/iTUEpwGWZfpEGYLVgKgpQf833Fr8nxhDsBoQPMEbZDtR
     126        hmA1wKfLGWwACEctCsDrEqwGODZb/M/YEAvWbNus/1+nWOG/RBo3iFZDjx2sBpjX6KFo5k9gwaoZZBhW
     127        A/RKleE249OM0wCVfCmwswlpxmmAdIYgUZpxGiCSzInTz0QFIrbQxpU3KMqJOL1AbE4EqQMAJP3E6eLV
     128        FswAAAAASUVORK5CYII=
    130129</value>
    131130  </data>
     131  <metadata name="toolTip.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     132    <value>17, 17</value>
     133  </metadata>
    132134  <data name="btnStop.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
    133135    <value>
    134136        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGOfPtRkwAAACBjSFJNAAB6
    135         JQAAgIMAAPn/AACA6QAAdTAAAOpgAAA6mAAAF2+SX8VGAAAACXBIWXMAAAsNAAALDQHtB8AsAAABa0lE
    136         QVQ4T82TP0gCYRjGXQoaoq0xWloiISiKlgiCcHIJIaFJCII0GoIyKrCyvxyUKEViZhJKKR5YRtkfarAS
    137         EqHCEBeNDAoRvDTPK57uc7uGC3Ko4Rt/v+d7n5dXAkBSyisJJsH/TEB5P7FIFzDrzkHnZDBhT2N04wXD
    138         5mcMrT5i0JTIfO9LMAKB7+MfuEtwCDwUcHjDwhtk4QqwsPizkCp2eF5YukBAkqNPHIJRrgg6L/JY8+Ww
    139         4mUwZ4+hTr4lLiDfvo1zOAqx2D7Lw8iDemcGY9ZXqKkwarrWxQVk5qsIB/cln3zwjvldAqegMSahGDlF
    140         dbtBXEAK84dZ2E7yWKbfoLWm0W9IQjkTg2xgD1UtS+IC0rbnmoVxP4tJewpqEw/ro5BrQ+jsc6GiUS8u
    141         IKvaPGYwbYtAQ4WgHD/nkz3oUDnQ2mNGWYNOXED23KbyoamXRn23A7UyS3HuyuYFlEunfhb85qj+/ha+
    142         AFwj9H5OYBpkAAAAAElFTkSuQmCC
     137        JQAAgIMAAPn/AACA6QAAdTAAAOpgAAA6mAAAF2+SX8VGAAAACXBIWXMAAAsRAAALEQF/ZF+RAAAAvklE
     138        QVQ4T2P4//8/AyWYIs0giwehAb2b//7v2vDrf97UR59ATkTno4cXhhdAmq8+/PNfN3QVUO1/BnQ+QQPa
     139        1n77f+vp7/+qfovABqDzCRrQuOLz/8sPf/+Xc5sFNgCdT9CA2sXv/5+4/vu/mN0ksAHofIIGVMx79X/3
     140        hZ//+c26wQag8wkaUDL7+f/1J3/+5zRoBRuAzidoQMH0x/8X7Pn8n1WnEWwAOp+gAaD4Z9NtghuAzido
     141        AKkZa+DzAgCRffInJV4/PgAAAABJRU5ErkJggg==
    143142</value>
    144143  </data>
  • branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive.Slave.Views/3.3/SlaveCmdsWithKill.Designer.cs

    r6730 r6823  
    5050      // btnKill
    5151      //
    52       this.btnKill.Location = new System.Drawing.Point(10, 31);
     52      this.btnKill.Location = new System.Drawing.Point(63, 3);
    5353      this.btnKill.Name = "btnKill";
    54       this.btnKill.Size = new System.Drawing.Size(75, 23);
     54      this.btnKill.Size = new System.Drawing.Size(24, 24);
    5555      this.btnKill.TabIndex = 13;
    56       this.btnKill.Text = "Kill";
     56      this.toolTip.SetToolTip(this.btnKill, "Stop the Slave Windows Service. \r\nNote that you must have Administrator rights on" +
     57              " your \r\nmachine to be able to do this. ");
    5758      this.btnKill.UseVisualStyleBackColor = true;
    5859      this.btnKill.Click += new System.EventHandler(this.btnKill_Click);
  • branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive.Slave.Views/3.3/SlaveCmdsWithKill.cs

    r6743 r6823  
    5656      if (CheckRunAsAdmin()) {
    5757        btnKill.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft;
    58         btnKill.Image = HeuristicLab.Common.Resources.VSImageLibrary.BreakpointActive;
     58        btnKill.Image = HeuristicLab.Common.Resources.VSImageLibrary.Stop;
    5959      } else {
    6060        this.btnKill.FlatStyle = FlatStyle.System;
  • branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive.Slave.Views/3.3/SlaveCmdsWithKill.resx

    r6730 r6823  
    118118    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
    119119  </resheader>
     120  <metadata name="toolTip.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     121    <value>17, 17</value>
     122  </metadata>
    120123</root>
  • branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive.Slave.Views/3.3/SlaveMainView.Designer.cs

    r6730 r6823  
    4545    /// </summary>
    4646    private void InitializeComponent() {
    47       this.slaveView = new HeuristicLab.Clients.Hive.SlaveCore.Views.SlaveView();
     47      this.slaveCmdsBase = new HeuristicLab.Clients.Hive.SlaveCore.Views.SlaveCmdsBase();
    4848      this.tabSlaveView.SuspendLayout();
    4949      this.mainTabControl.SuspendLayout();
     50      ((System.ComponentModel.ISupportInitialize)(this.splitContainer)).BeginInit();
     51      this.splitContainer.Panel1.SuspendLayout();
     52      this.splitContainer.Panel2.SuspendLayout();
     53      this.splitContainer.SuspendLayout();
    5054      this.SuspendLayout();
    5155      //
    52       // tabSlaveView
     56      // splitContainer
    5357      //
    54       this.tabSlaveView.Controls.Add(this.slaveView);
    5558      //
    56       // slaveView
     59      // splitContainer.Panel2
    5760      //
    58       this.slaveView.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
    59                   | System.Windows.Forms.AnchorStyles.Left)
    60                   | System.Windows.Forms.AnchorStyles.Right)));
    61       this.slaveView.Caption = "HeuristicLab Slave View";
    62       this.slaveView.Content = null;
    63       this.slaveView.Location = new System.Drawing.Point(6, 6);
    64       this.slaveView.Name = "slaveView";
    65       this.slaveView.ReadOnly = false;
    66       this.slaveView.Size = new System.Drawing.Size(627, 409);
    67       this.slaveView.TabIndex = 0;
     61      this.splitContainer.Panel2.Controls.Add(this.slaveCmdsBase);
     62      //
     63      // slaveCmdsBase
     64      //
     65      this.slaveCmdsBase.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
     66      this.slaveCmdsBase.Caption = "HeuristicLab Slave Cmds View";
     67      this.slaveCmdsBase.Content = null;
     68      this.slaveCmdsBase.Location = new System.Drawing.Point(3, 3);
     69      this.slaveCmdsBase.Name = "slaveCmdsBase";
     70      this.slaveCmdsBase.ReadOnly = false;
     71      this.slaveCmdsBase.Size = new System.Drawing.Size(92, 32);
     72      this.slaveCmdsBase.TabIndex = 0;
    6873      //
    6974      // SlaveMainView
     
    7479      this.tabSlaveView.ResumeLayout(false);
    7580      this.mainTabControl.ResumeLayout(false);
     81      this.splitContainer.Panel1.ResumeLayout(false);
     82      this.splitContainer.Panel2.ResumeLayout(false);
     83      ((System.ComponentModel.ISupportInitialize)(this.splitContainer)).EndInit();
     84      this.splitContainer.ResumeLayout(false);
    7685      this.ResumeLayout(false);
    7786
     
    8089    #endregion
    8190
    82     private SlaveView slaveView;
     91    private SlaveCmdsBase slaveCmdsBase;
    8392
    8493
  • branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive.Slave.Views/3.3/SlaveMainView.cs

    r6734 r6823  
    5555      base.OnContentChanged();
    5656
    57       slaveView.Content = Content;
     57      slaveCmdsBase.Content = Content;
    5858    }
    5959
  • branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive.Slave.Views/3.3/SlaveMainViewBase.Designer.cs

    r6764 r6823  
    4747      this.components = new System.ComponentModel.Container();
    4848      System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(SlaveMainViewBase));
    49       this.mainTabControl = new System.Windows.Forms.TabControl();
    50       this.tabSlaveView = new System.Windows.Forms.TabPage();
    51       this.tabJobs = new System.Windows.Forms.TabPage();
    52       this.jobsView = new HeuristicLab.Clients.Hive.SlaveCore.Views.JobsView();
    53       this.tabLog = new System.Windows.Forms.TabPage();
    54       this.logView = new HeuristicLab.Clients.Hive.SlaveCore.Views.LogView();
    55       this.tabAbout = new System.Windows.Forms.TabPage();
    56       this.aboutView = new HeuristicLab.Clients.Hive.SlaveCore.Views.AboutView();
    5749      this.closeToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
    58       this.showToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
    5950      this.notifyIcon = new System.Windows.Forms.NotifyIcon(this.components);
    6051      this.contextMenuNotifyIcon = new System.Windows.Forms.ContextMenuStrip(this.components);
    6152      this.homepageToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
    6253      this.toolStripSeparator = new System.Windows.Forms.ToolStripSeparator();
     54      this.splitContainer = new System.Windows.Forms.SplitContainer();
     55      this.mainTabControl = new System.Windows.Forms.TabControl();
     56      this.tabSlaveView = new System.Windows.Forms.TabPage();
     57      this.tabLog = new System.Windows.Forms.TabPage();
     58      this.btnAbout = new System.Windows.Forms.Button();
     59      this.slaveView = new HeuristicLab.Clients.Hive.SlaveCore.Views.SlaveView();
     60      this.logView = new HeuristicLab.Clients.Hive.SlaveCore.Views.LogView();
     61      this.contextMenuNotifyIcon.SuspendLayout();
     62      ((System.ComponentModel.ISupportInitialize)(this.splitContainer)).BeginInit();
     63      this.splitContainer.Panel1.SuspendLayout();
     64      this.splitContainer.Panel2.SuspendLayout();
     65      this.splitContainer.SuspendLayout();
    6366      this.mainTabControl.SuspendLayout();
    64       this.tabJobs.SuspendLayout();
     67      this.tabSlaveView.SuspendLayout();
    6568      this.tabLog.SuspendLayout();
    66       this.tabAbout.SuspendLayout();
    67       this.contextMenuNotifyIcon.SuspendLayout();
    6869      this.SuspendLayout();
    69       //
    70       // mainTabControl
    71       //
    72       this.mainTabControl.Controls.Add(this.tabSlaveView);
    73       this.mainTabControl.Controls.Add(this.tabJobs);
    74       this.mainTabControl.Controls.Add(this.tabLog);
    75       this.mainTabControl.Controls.Add(this.tabAbout);
    76       this.mainTabControl.Dock = System.Windows.Forms.DockStyle.Fill;
    77       this.mainTabControl.Location = new System.Drawing.Point(0, 0);
    78       this.mainTabControl.Margin = new System.Windows.Forms.Padding(1);
    79       this.mainTabControl.Name = "mainTabControl";
    80       this.mainTabControl.SelectedIndex = 0;
    81       this.mainTabControl.Size = new System.Drawing.Size(653, 444);
    82       this.mainTabControl.TabIndex = 2;
    83       //
    84       // tabSlaveView
    85       //
    86       this.tabSlaveView.Location = new System.Drawing.Point(4, 22);
    87       this.tabSlaveView.Name = "tabSlaveView";
    88       this.tabSlaveView.Padding = new System.Windows.Forms.Padding(3);
    89       this.tabSlaveView.Size = new System.Drawing.Size(645, 418);
    90       this.tabSlaveView.TabIndex = 0;
    91       this.tabSlaveView.Text = "Overview";
    92       this.tabSlaveView.UseVisualStyleBackColor = true;
    93       //
    94       // tabJobs
    95       //
    96       this.tabJobs.Controls.Add(this.jobsView);
    97       this.tabJobs.Location = new System.Drawing.Point(4, 22);
    98       this.tabJobs.Name = "tabJobs";
    99       this.tabJobs.Size = new System.Drawing.Size(645, 418);
    100       this.tabJobs.TabIndex = 3;
    101       this.tabJobs.Text = "Jobs";
    102       this.tabJobs.UseVisualStyleBackColor = true;
    103       //
    104       // jobsView
    105       //
    106       this.jobsView.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
    107                   | System.Windows.Forms.AnchorStyles.Left)
    108                   | System.Windows.Forms.AnchorStyles.Right)));
    109       this.jobsView.Caption = "JobsView";
    110       this.jobsView.Content = null;
    111       this.jobsView.Location = new System.Drawing.Point(4, 4);
    112       this.jobsView.Name = "jobsView";
    113       this.jobsView.ReadOnly = false;
    114       this.jobsView.Size = new System.Drawing.Size(638, 411);
    115       this.jobsView.TabIndex = 0;
    116       //
    117       // tabLog
    118       //
    119       this.tabLog.Controls.Add(this.logView);
    120       this.tabLog.Location = new System.Drawing.Point(4, 22);
    121       this.tabLog.Name = "tabLog";
    122       this.tabLog.Padding = new System.Windows.Forms.Padding(3);
    123       this.tabLog.Size = new System.Drawing.Size(645, 418);
    124       this.tabLog.TabIndex = 1;
    125       this.tabLog.Text = "Log";
    126       this.tabLog.UseVisualStyleBackColor = true;
    127       //
    128       // logView
    129       //
    130       this.logView.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
    131                   | System.Windows.Forms.AnchorStyles.Left)
    132                   | System.Windows.Forms.AnchorStyles.Right)));
    133       this.logView.Caption = "LogView: Displays logged messages from the slave core.";
    134       this.logView.Content = null;
    135       this.logView.Location = new System.Drawing.Point(7, 7);
    136       this.logView.Name = "logView";
    137       this.logView.ReadOnly = false;
    138       this.logView.Size = new System.Drawing.Size(632, 405);
    139       this.logView.TabIndex = 0;
    140       //
    141       // tabAbout
    142       //
    143       this.tabAbout.Controls.Add(this.aboutView);
    144       this.tabAbout.Location = new System.Drawing.Point(4, 22);
    145       this.tabAbout.Name = "tabAbout";
    146       this.tabAbout.Size = new System.Drawing.Size(645, 418);
    147       this.tabAbout.TabIndex = 2;
    148       this.tabAbout.Text = "About HeuristicLab Hive";
    149       this.tabAbout.UseVisualStyleBackColor = true;
    150       //
    151       // aboutView
    152       //
    153       this.aboutView.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
    154                   | System.Windows.Forms.AnchorStyles.Left)
    155                   | System.Windows.Forms.AnchorStyles.Right)));
    156       this.aboutView.Caption = "AboutView: Shows some information about HeuristicLab Hive";
    157       this.aboutView.Content = null;
    158       this.aboutView.Location = new System.Drawing.Point(3, 3);
    159       this.aboutView.Name = "aboutView";
    160       this.aboutView.ReadOnly = false;
    161       this.aboutView.Size = new System.Drawing.Size(639, 412);
    162       this.aboutView.TabIndex = 0;
    16370      //
    16471      // closeToolStripMenuItem
     
    16875      this.closeToolStripMenuItem.Text = "Close";
    16976      this.closeToolStripMenuItem.Click += new System.EventHandler(this.closeToolStripMenuItem_Click);
    170       //
    171       // showToolStripMenuItem
    172       //
    173       this.showToolStripMenuItem.Name = "showToolStripMenuItem";
    174       this.showToolStripMenuItem.Size = new System.Drawing.Size(209, 22);
    175       this.showToolStripMenuItem.Text = "Show";
    176       this.showToolStripMenuItem.Click += new System.EventHandler(this.showToolStripMenuItem_Click);
    17777      //
    17878      // notifyIcon
     
    18686      this.notifyIcon.Visible = true;
    18787      this.notifyIcon.BalloonTipClicked += new System.EventHandler(this.notifyIcon_BalloonTipClicked);
    188       this.notifyIcon.DoubleClick += new System.EventHandler(this.notifyIcon_DoubleClick);
     88      this.notifyIcon.MouseClick += new System.Windows.Forms.MouseEventHandler(this.notifyIcon_Click);
    18989      //
    19090      // contextMenuNotifyIcon
     
    19393            this.homepageToolStripMenuItem,
    19494            this.toolStripSeparator,
    195             this.showToolStripMenuItem,
    19695            this.closeToolStripMenuItem});
    19796      this.contextMenuNotifyIcon.Name = "contextMenuNotifyIcon";
    198       this.contextMenuNotifyIcon.Size = new System.Drawing.Size(210, 76);
     97      this.contextMenuNotifyIcon.Size = new System.Drawing.Size(210, 54);
    19998      //
    20099      // homepageToolStripMenuItem
     
    211110      this.toolStripSeparator.Size = new System.Drawing.Size(206, 6);
    212111      //
     112      // splitContainer
     113      //
     114      this.splitContainer.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
     115                  | System.Windows.Forms.AnchorStyles.Left)
     116                  | System.Windows.Forms.AnchorStyles.Right)));
     117      this.splitContainer.Location = new System.Drawing.Point(3, 3);
     118      this.splitContainer.Name = "splitContainer";
     119      this.splitContainer.Orientation = System.Windows.Forms.Orientation.Horizontal;
     120      //
     121      // splitContainer.Panel1
     122      //
     123      this.splitContainer.Panel1.Controls.Add(this.mainTabControl);
     124      //
     125      // splitContainer.Panel2
     126      //
     127      this.splitContainer.Panel2.Controls.Add(this.btnAbout);
     128      this.splitContainer.Size = new System.Drawing.Size(647, 438);
     129      this.splitContainer.SplitterDistance = 392;
     130      this.splitContainer.TabIndex = 3;
     131      //
     132      // mainTabControl
     133      //
     134      this.mainTabControl.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
     135                  | System.Windows.Forms.AnchorStyles.Left)
     136                  | System.Windows.Forms.AnchorStyles.Right)));
     137      this.mainTabControl.Controls.Add(this.tabSlaveView);
     138      this.mainTabControl.Controls.Add(this.tabLog);
     139      this.mainTabControl.Location = new System.Drawing.Point(1, 1);
     140      this.mainTabControl.Margin = new System.Windows.Forms.Padding(1);
     141      this.mainTabControl.Name = "mainTabControl";
     142      this.mainTabControl.SelectedIndex = 0;
     143      this.mainTabControl.Size = new System.Drawing.Size(645, 390);
     144      this.mainTabControl.TabIndex = 2;
     145      //
     146      // tabSlaveView
     147      //
     148      this.tabSlaveView.Controls.Add(this.slaveView);
     149      this.tabSlaveView.Location = new System.Drawing.Point(4, 22);
     150      this.tabSlaveView.Name = "tabSlaveView";
     151      this.tabSlaveView.Padding = new System.Windows.Forms.Padding(3);
     152      this.tabSlaveView.Size = new System.Drawing.Size(637, 364);
     153      this.tabSlaveView.TabIndex = 0;
     154      this.tabSlaveView.Text = "Summary";
     155      this.tabSlaveView.UseVisualStyleBackColor = true;
     156      //
     157      // tabLog
     158      //
     159      this.tabLog.Controls.Add(this.logView);
     160      this.tabLog.Location = new System.Drawing.Point(4, 22);
     161      this.tabLog.Name = "tabLog";
     162      this.tabLog.Padding = new System.Windows.Forms.Padding(3);
     163      this.tabLog.Size = new System.Drawing.Size(637, 364);
     164      this.tabLog.TabIndex = 1;
     165      this.tabLog.Text = "Log";
     166      this.tabLog.UseVisualStyleBackColor = true;
     167      //
     168      // btnAbout
     169      //
     170      this.btnAbout.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
     171      this.btnAbout.Image = ((System.Drawing.Image)(resources.GetObject("btnAbout.Image")));
     172      this.btnAbout.Location = new System.Drawing.Point(618, 15);
     173      this.btnAbout.Name = "btnAbout";
     174      this.btnAbout.Size = new System.Drawing.Size(24, 24);
     175      this.btnAbout.TabIndex = 0;
     176      this.btnAbout.UseVisualStyleBackColor = true;
     177      this.btnAbout.Click += new System.EventHandler(this.btnAbout_Click);
     178      //
     179      // slaveView
     180      //
     181      this.slaveView.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
     182                  | System.Windows.Forms.AnchorStyles.Left)
     183                  | System.Windows.Forms.AnchorStyles.Right)));
     184      this.slaveView.Caption = "HeuristicLab Slave View";
     185      this.slaveView.Content = null;
     186      this.slaveView.Location = new System.Drawing.Point(6, 6);
     187      this.slaveView.Name = "slaveView";
     188      this.slaveView.ReadOnly = false;
     189      this.slaveView.Size = new System.Drawing.Size(625, 352);
     190      this.slaveView.TabIndex = 0;
     191      //
     192      // logView
     193      //
     194      this.logView.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
     195                  | System.Windows.Forms.AnchorStyles.Left)
     196                  | System.Windows.Forms.AnchorStyles.Right)));
     197      this.logView.Caption = "LogView: Displays logged messages from the slave core.";
     198      this.logView.Content = null;
     199      this.logView.Location = new System.Drawing.Point(7, 7);
     200      this.logView.Name = "logView";
     201      this.logView.ReadOnly = false;
     202      this.logView.Size = new System.Drawing.Size(624, 351);
     203      this.logView.TabIndex = 0;
     204      //
    213205      // SlaveMainViewBase
    214206      //
    215207      this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
    216208      this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
    217       this.Controls.Add(this.mainTabControl);
     209      this.Controls.Add(this.splitContainer);
    218210      this.Name = "SlaveMainViewBase";
    219211      this.Size = new System.Drawing.Size(653, 444);
     212      this.contextMenuNotifyIcon.ResumeLayout(false);
     213      this.splitContainer.Panel1.ResumeLayout(false);
     214      this.splitContainer.Panel2.ResumeLayout(false);
     215      ((System.ComponentModel.ISupportInitialize)(this.splitContainer)).EndInit();
     216      this.splitContainer.ResumeLayout(false);
    220217      this.mainTabControl.ResumeLayout(false);
    221       this.tabJobs.ResumeLayout(false);
     218      this.tabSlaveView.ResumeLayout(false);
    222219      this.tabLog.ResumeLayout(false);
    223       this.tabAbout.ResumeLayout(false);
    224       this.contextMenuNotifyIcon.ResumeLayout(false);
    225220      this.ResumeLayout(false);
    226221
     
    229224    #endregion
    230225
    231     private System.Windows.Forms.TabPage tabJobs;
    232     private JobsView jobsView;
    233226    private System.Windows.Forms.TabPage tabLog;
    234227    private LogView logView;
    235     private System.Windows.Forms.TabPage tabAbout;
    236     private AboutView aboutView;
    237228    private System.Windows.Forms.ToolStripMenuItem closeToolStripMenuItem;
    238     private System.Windows.Forms.ToolStripMenuItem showToolStripMenuItem;
    239229    private System.Windows.Forms.NotifyIcon notifyIcon;
    240230    private System.Windows.Forms.ContextMenuStrip contextMenuNotifyIcon;
     
    243233    protected System.Windows.Forms.TabPage tabSlaveView;
    244234    protected System.Windows.Forms.TabControl mainTabControl;
     235    protected SlaveView slaveView;
     236    protected System.Windows.Forms.SplitContainer splitContainer;
     237    private System.Windows.Forms.Button btnAbout;
    245238
    246239
  • branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive.Slave.Views/3.3/SlaveMainViewBase.cs

    r6764 r6823  
    7272      base.OnContentChanged();
    7373
    74       jobsView.Content = Content;
    7574      logView.Content = Content;
     75      slaveView.Content = Content;
    7676      if (Content != null) {
    7777        Content.UserVisibleMessageFired += new System.EventHandler<Common.EventArgs<string>>(Content_UserVisibleMessageFired);
     
    8484    }
    8585
    86     private void notifyIcon_DoubleClick(object sender, EventArgs e) {
    87       OnVisibilitySwitched();
     86    private void notifyIcon_Click(object sender, MouseEventArgs e) {
     87      if (e.Button == MouseButtons.Left) {
     88        OnVisibilitySwitched();
     89      }
    8890    }
    8991
    9092    private void closeToolStripMenuItem_Click(object sender, EventArgs e) {
    9193      Application.Exit();
    92     }
    93 
    94     private void showToolStripMenuItem_Click(object sender, EventArgs e) {
    95       OnVisibilitySwitched();
    9694    }
    9795
     
    116114      this.Invoke(new Action(SetEnabledStateOfControls));
    117115    }
     116
     117    private void btnAbout_Click(object sender, EventArgs e) {
     118      AboutDialog dialog = new AboutDialog();
     119      dialog.ShowDialog();
     120    }
    118121  }
    119122}
  • branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive.Slave.Views/3.3/SlaveMainViewBase.resx

    r6730 r6823  
    17911791</value>
    17921792  </data>
     1793  <data name="btnAbout.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     1794    <value>
     1795        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGOfPtRkwAAACBjSFJNAACH
     1796        DwAAjA8AAP1SAACBQAAAfXkAAOmLAAA85QAAGcxzPIV3AAAKOWlDQ1BQaG90b3Nob3AgSUNDIHByb2Zp
     1797        bGUAAEjHnZZ3VFTXFofPvXd6oc0w0hl6ky4wgPQuIB0EURhmBhjKAMMMTWyIqEBEEREBRZCggAGjoUis
     1798        iGIhKKhgD0gQUGIwiqioZEbWSnx5ee/l5ffHvd/aZ+9z99l7n7UuACRPHy4vBZYCIJkn4Ad6ONNXhUfQ
     1799        sf0ABniAAaYAMFnpqb5B7sFAJC83F3q6yAn8i94MAUj8vmXo6U+ng/9P0qxUvgAAyF/E5mxOOkvE+SJO
     1800        yhSkiu0zIqbGJIoZRomZL0pQxHJijlvkpZ99FtlRzOxkHlvE4pxT2clsMfeIeHuGkCNixEfEBRlcTqaI
     1801        b4tYM0mYzBXxW3FsMoeZDgCKJLYLOKx4EZuImMQPDnQR8XIAcKS4LzjmCxZwsgTiQ7mkpGbzuXHxArou
     1802        S49uam3NoHtyMpM4AoGhP5OVyOSz6S4pyalMXjYAi2f+LBlxbemiIluaWltaGpoZmX5RqP+6+Dcl7u0i
     1803        vQr43DOI1veH7a/8UuoAYMyKarPrD1vMfgA6tgIgd/8Pm+YhACRFfWu/8cV5aOJ5iRcIUm2MjTMzM424
     1804        HJaRuKC/6386/A198T0j8Xa/l4fuyollCpMEdHHdWClJKUI+PT2VyeLQDf88xP848K/zWBrIieXwOTxR
     1805        RKhoyri8OFG7eWyugJvCo3N5/6mJ/zDsT1qca5Eo9Z8ANcoISN2gAuTnPoCiEAESeVDc9d/75oMPBeKb
     1806        F6Y6sTj3nwX9+65wifiRzo37HOcSGExnCfkZi2viawnQgAAkARXIAxWgAXSBITADVsAWOAI3sAL4gWAQ
     1807        DtYCFogHyYAPMkEu2AwKQBHYBfaCSlAD6kEjaAEnQAc4DS6Ay+A6uAnugAdgBIyD52AGvAHzEARhITJE
     1808        geQhVUgLMoDMIAZkD7lBPlAgFA5FQ3EQDxJCudAWqAgqhSqhWqgR+hY6BV2ArkID0D1oFJqCfoXewwhM
     1809        gqmwMqwNG8MM2An2hoPhNXAcnAbnwPnwTrgCroOPwe3wBfg6fAcegZ/DswhAiAgNUUMMEQbigvghEUgs
     1810        wkc2IIVIOVKHtCBdSC9yCxlBppF3KAyKgqKjDFG2KE9UCIqFSkNtQBWjKlFHUe2oHtQt1ChqBvUJTUYr
     1811        oQ3QNmgv9Cp0HDoTXYAuRzeg29CX0HfQ4+g3GAyGhtHBWGE8MeGYBMw6TDHmAKYVcx4zgBnDzGKxWHms
     1812        AdYO64dlYgXYAux+7DHsOewgdhz7FkfEqeLMcO64CBwPl4crxzXhzuIGcRO4ebwUXgtvg/fDs/HZ+BJ8
     1813        Pb4LfwM/jp8nSBN0CHaEYEICYTOhgtBCuER4SHhFJBLVidbEACKXuIlYQTxOvEIcJb4jyZD0SS6kSJKQ
     1814        tJN0hHSedI/0ikwma5MdyRFkAXknuZF8kfyY/FaCImEk4SXBltgoUSXRLjEo8UISL6kl6SS5VjJHslzy
     1815        pOQNyWkpvJS2lIsUU2qDVJXUKalhqVlpirSptJ90snSxdJP0VelJGayMtoybDFsmX+awzEWZMQpC0aC4
     1816        UFiULZR6yiXKOBVD1aF6UROoRdRvqP3UGVkZ2WWyobJZslWyZ2RHaAhNm+ZFS6KV0E7QhmjvlygvcVrC
     1817        WbJjScuSwSVzcopyjnIcuUK5Vrk7cu/l6fJu8onyu+U75B8poBT0FQIUMhUOKlxSmFakKtoqshQLFU8o
     1818        3leClfSVApXWKR1W6lOaVVZR9lBOVd6vfFF5WoWm4qiSoFKmclZlSpWiaq/KVS1TPaf6jC5Ld6In0Svo
     1819        PfQZNSU1TzWhWq1av9q8uo56iHqeeqv6Iw2CBkMjVqNMo1tjRlNV01czV7NZ874WXouhFa+1T6tXa05b
     1820        RztMe5t2h/akjpyOl06OTrPOQ12yroNumm6d7m09jB5DL1HvgN5NfVjfQj9ev0r/hgFsYGnANThgMLAU
     1821        vdR6KW9p3dJhQ5Khk2GGYbPhqBHNyMcoz6jD6IWxpnGE8W7jXuNPJhYmSSb1Jg9MZUxXmOaZdpn+aqZv
     1822        xjKrMrttTjZ3N99o3mn+cpnBMs6yg8vuWlAsfC22WXRbfLS0suRbtlhOWWlaRVtVWw0zqAx/RjHjijXa
     1823        2tl6o/Vp63c2ljYCmxM2v9ga2ibaNtlOLtdZzllev3zMTt2OaVdrN2JPt4+2P2Q/4qDmwHSoc3jiqOHI
     1824        dmxwnHDSc0pwOub0wtnEme/c5jznYuOy3uW8K+Lq4Vro2u8m4xbiVun22F3dPc692X3Gw8Jjncd5T7Sn
     1825        t+duz2EvZS+WV6PXzAqrFetX9HiTvIO8K72f+Oj78H26fGHfFb57fB+u1FrJW9nhB/y8/Pb4PfLX8U/z
     1826        /z4AE+AfUBXwNNA0MDewN4gSFBXUFPQm2Dm4JPhBiG6IMKQ7VDI0MrQxdC7MNaw0bGSV8ar1q66HK4Rz
     1827        wzsjsBGhEQ0Rs6vdVu9dPR5pEVkQObRGZ03WmqtrFdYmrT0TJRnFjDoZjY4Oi26K/sD0Y9YxZ2O8Yqpj
     1828        ZlgurH2s52xHdhl7imPHKeVMxNrFlsZOxtnF7YmbineIL4+f5rpwK7kvEzwTahLmEv0SjyQuJIUltSbj
     1829        kqOTT/FkeIm8nhSVlKyUgVSD1ILUkTSbtL1pM3xvfkM6lL4mvVNAFf1M9Ql1hVuFoxn2GVUZbzNDM09m
     1830        SWfxsvqy9bN3ZE/kuOd8vQ61jrWuO1ctd3Pu6Hqn9bUboA0xG7o3amzM3zi+yWPT0c2EzYmbf8gzySvN
     1831        e70lbEtXvnL+pvyxrR5bmwskCvgFw9tst9VsR23nbu/fYb5j/45PhezCa0UmReVFH4pZxde+Mv2q4quF
     1832        nbE7+0ssSw7uwuzi7Rra7bD7aKl0aU7p2B7fPe1l9LLCstd7o/ZeLV9WXrOPsE+4b6TCp6Jzv+b+Xfs/
     1833        VMZX3qlyrmqtVqreUT13gH1g8KDjwZYa5ZqimveHuIfu1nrUttdp15UfxhzOOPy0PrS+92vG140NCg1F
     1834        DR+P8I6MHA082tNo1djYpNRU0gw3C5unjkUeu/mN6zedLYYtta201qLj4Ljw+LNvo78dOuF9ovsk42TL
     1835        d1rfVbdR2grbofbs9pmO+I6RzvDOgVMrTnV32Xa1fW/0/ZHTaqerzsieKTlLOJt/duFczrnZ86nnpy/E
     1836        XRjrjup+cHHVxds9AT39l7wvXbnsfvlir1PvuSt2V05ftbl66hrjWsd1y+vtfRZ9bT9Y/NDWb9nffsPq
     1837        RudN65tdA8sHzg46DF645Xrr8m2v29fvrLwzMBQydHc4cnjkLvvu5L2key/vZ9yff7DpIfph4SOpR+WP
     1838        lR7X/aj3Y+uI5ciZUdfRvidBTx6Mscae/5T+04fx/Kfkp+UTqhONk2aTp6fcp24+W/1s/Hnq8/npgp+l
     1839        f65+ofviu18cf+mbWTUz/pL/cuHX4lfyr468Xva6e9Z/9vGb5Dfzc4Vv5d8efcd41/s+7P3EfOYH7IeK
     1840        j3ofuz55f3q4kLyw8Bv3hPP74uYdwgAAAAlwSFlzAAALEAAACxABrSO9dQAAABl0RVh0U29mdHdhcmUA
     1841        UGFpbnQuTkVUIHYzLjUuODc7gF0AAAK1SURBVDhPnZNrSJNhFMeNvkVEEBT0oY+BUAgSRBhIQmUqKYZ4
     1842        KwudU9MpLLssy5KYlJfc8paWbZlilikiU1dTS2VWy9DwsplM09nu6vbu4ru98998R2vL6kPn0/M855zf
     1843        c86fcwICfrPcOmVwwbOFwlstutorQh2fwZspvlgqZXEqxIG/x/rds6sVW9iCOVZ5l/rT8KxtfUZNYl5H
     1844        Qam24e3oAkoEw7IzecKi1BvPd2wCMXmTW9mPlUWtIwYXhV+2aqWwYnXSDybLGlq6RxGTU9+XlC/c7QfJ
     1845        qpxIfNC1sO6TC7XRhiOsERxivoF+mfC6GtqGEMGsbktgN2ynIYySjzuv1o/1K9UrvvlwOF3gNk6CKxzH
     1846        GumpwmNrYBQ8dUZmVsfTgLTiwfjSRplvBB32XWfD2Fc9VHqzN9VBku6zHeIBmbuKqkEakMDp5FS1yvx+
     1847        37h0vJtD0DkxovMl0Bo9LVBOCtQaAfmUArHZNUs0IJ4jyqp9+XkTQCbX4HDSIEJTe7CoX6b9LrfEdqsJ
     1848        qnkl4vIeqmhA8s3e5PIm2brL5achxmZ1OJosQXiGCJoVEw1wUhQIkwFy+TRic2q1NCC3pDf0dk0/sSGa
     1849        r019MyIkVowohggEaaNdZoKAzaxFr2QYJxmVUzSgRDC0Lb9M1CceVvgBpBM67Al+gf1hzVg0eoQ06rWw
     1850        mVTIKhRsAO55Z4FdKgq9zusmTFa7F9LcI0dgdDMOxDTilWTaraC7DbsGLe2vEXa+QhGX92iv3zCxuO0X
     1851        7tb1OFQajRvigIskYCGXYbEYQBg1IM0qdIr6Ec7gr5xKrzr+x71IvPQkIuWa4Eshrw0fRsdhJ5awapjH
     1852        wKAUl4ub1sPT+NLIjL8k/yRGZdbui0ivKghJKhs6ePrO+6AYrvRYyv2OSGbl2ROp/F3/3Mj/cf4AM8dc
     1853        6+FjaPsAAAAASUVORK5CYII=
     1854</value>
     1855  </data>
    17931856</root>
  • branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive.Slave.Views/3.3/SlaveMainViewTray.Designer.cs

    r6730 r6823  
    4545    /// </summary>
    4646    private void InitializeComponent() {
    47       this.slaveView = new HeuristicLab.Clients.Hive.SlaveCore.Views.SlaveViewTray();
     47      this.slaveCmdsWithKill = new HeuristicLab.Clients.Hive.SlaveCore.Views.SlaveCmdsWithKill();
    4848      this.tabSlaveView.SuspendLayout();
    4949      this.mainTabControl.SuspendLayout();
     50      ((System.ComponentModel.ISupportInitialize)(this.splitContainer)).BeginInit();
     51      this.splitContainer.Panel1.SuspendLayout();
     52      this.splitContainer.Panel2.SuspendLayout();
     53      this.splitContainer.SuspendLayout();
    5054      this.SuspendLayout();
    5155      //
    52       // tabSlaveView
     56      // splitContainer
    5357      //
    54       this.tabSlaveView.Controls.Add(this.slaveView);
    5558      //
    56       // slaveView
     59      // splitContainer.Panel2
    5760      //
    58       this.slaveView.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
    59                   | System.Windows.Forms.AnchorStyles.Left)
    60                   | System.Windows.Forms.AnchorStyles.Right)));
    61       this.slaveView.Caption = "HeuristicLab Slave View";
    62       this.slaveView.Content = null;
    63       this.slaveView.Location = new System.Drawing.Point(6, 6);
    64       this.slaveView.Name = "slaveView";
    65       this.slaveView.ReadOnly = false;
    66       this.slaveView.Size = new System.Drawing.Size(627, 409);
    67       this.slaveView.TabIndex = 0;
     61      this.splitContainer.Panel2.Controls.Add(this.slaveCmdsWithKill);
    6862      //
    69       // SlaveMainView
     63      // slaveCmdsWithKill
     64      //
     65      this.slaveCmdsWithKill.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
     66      this.slaveCmdsWithKill.Caption = "HeuristicLab Slave Cmds with Kill View";
     67      this.slaveCmdsWithKill.Content = null;
     68      this.slaveCmdsWithKill.Location = new System.Drawing.Point(3, 3);
     69      this.slaveCmdsWithKill.Name = "slaveCmdsWithKill";
     70      this.slaveCmdsWithKill.ReadOnly = false;
     71      this.slaveCmdsWithKill.Size = new System.Drawing.Size(92, 35);
     72      this.slaveCmdsWithKill.TabIndex = 0;
     73      //
     74      // SlaveMainViewTray
    7075      //
    7176      this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
    7277      this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
    73       this.Name = "SlaveMainView";
     78      this.Name = "SlaveMainViewTray";
    7479      this.tabSlaveView.ResumeLayout(false);
    7580      this.mainTabControl.ResumeLayout(false);
     81      this.splitContainer.Panel1.ResumeLayout(false);
     82      this.splitContainer.Panel2.ResumeLayout(false);
     83      ((System.ComponentModel.ISupportInitialize)(this.splitContainer)).EndInit();
     84      this.splitContainer.ResumeLayout(false);
    7685      this.ResumeLayout(false);
    7786
     
    8089    #endregion
    8190
    82     private SlaveViewTray slaveView;
     91    private SlaveCmdsWithKill slaveCmdsWithKill;
    8392
    8493
  • branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive.Slave.Views/3.3/SlaveMainViewTray.cs

    r6743 r6823  
    5555      base.OnContentChanged();
    5656
    57       slaveView.Content = Content;
     57      slaveCmdsWithKill.Content = Content;
    5858    }
    5959
  • branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive.Slave.Views/3.3/SlaveStats.Designer.cs

    r6730 r6823  
    4545    /// </summary>
    4646    private void InitializeComponent() {
    47       System.Windows.Forms.DataVisualization.Charting.ChartArea chartArea1 = new System.Windows.Forms.DataVisualization.Charting.ChartArea();
    48       System.Windows.Forms.DataVisualization.Charting.CustomLabel customLabel1 = new System.Windows.Forms.DataVisualization.Charting.CustomLabel();
    49       System.Windows.Forms.DataVisualization.Charting.CustomLabel customLabel2 = new System.Windows.Forms.DataVisualization.Charting.CustomLabel();
    50       System.Windows.Forms.DataVisualization.Charting.CustomLabel customLabel3 = new System.Windows.Forms.DataVisualization.Charting.CustomLabel();
    51       System.Windows.Forms.DataVisualization.Charting.CustomLabel customLabel4 = new System.Windows.Forms.DataVisualization.Charting.CustomLabel();
    52       System.Windows.Forms.DataVisualization.Charting.Legend legend1 = new System.Windows.Forms.DataVisualization.Charting.Legend();
    53       System.Windows.Forms.DataVisualization.Charting.Series series1 = new System.Windows.Forms.DataVisualization.Charting.Series();
    54       System.Windows.Forms.DataVisualization.Charting.Series series2 = new System.Windows.Forms.DataVisualization.Charting.Series();
    55       System.Windows.Forms.DataVisualization.Charting.Series series3 = new System.Windows.Forms.DataVisualization.Charting.Series();
    56       System.Windows.Forms.DataVisualization.Charting.Series series4 = new System.Windows.Forms.DataVisualization.Charting.Series();
    57       System.Windows.Forms.DataVisualization.Charting.Series series5 = new System.Windows.Forms.DataVisualization.Charting.Series();
    58       System.Windows.Forms.DataVisualization.Charting.ChartArea chartArea2 = new System.Windows.Forms.DataVisualization.Charting.ChartArea();
    59       System.Windows.Forms.DataVisualization.Charting.Legend legend2 = new System.Windows.Forms.DataVisualization.Charting.Legend();
    60       System.Windows.Forms.DataVisualization.Charting.Series series6 = new System.Windows.Forms.DataVisualization.Charting.Series();
     47      System.Windows.Forms.DataVisualization.Charting.ChartArea chartArea7 = new System.Windows.Forms.DataVisualization.Charting.ChartArea();
     48      System.Windows.Forms.DataVisualization.Charting.CustomLabel customLabel13 = new System.Windows.Forms.DataVisualization.Charting.CustomLabel();
     49      System.Windows.Forms.DataVisualization.Charting.CustomLabel customLabel14 = new System.Windows.Forms.DataVisualization.Charting.CustomLabel();
     50      System.Windows.Forms.DataVisualization.Charting.CustomLabel customLabel15 = new System.Windows.Forms.DataVisualization.Charting.CustomLabel();
     51      System.Windows.Forms.DataVisualization.Charting.CustomLabel customLabel16 = new System.Windows.Forms.DataVisualization.Charting.CustomLabel();
     52      System.Windows.Forms.DataVisualization.Charting.Legend legend7 = new System.Windows.Forms.DataVisualization.Charting.Legend();
     53      System.Windows.Forms.DataVisualization.Charting.Series series19 = new System.Windows.Forms.DataVisualization.Charting.Series();
     54      System.Windows.Forms.DataVisualization.Charting.Series series20 = new System.Windows.Forms.DataVisualization.Charting.Series();
     55      System.Windows.Forms.DataVisualization.Charting.Series series21 = new System.Windows.Forms.DataVisualization.Charting.Series();
     56      System.Windows.Forms.DataVisualization.Charting.Series series22 = new System.Windows.Forms.DataVisualization.Charting.Series();
     57      System.Windows.Forms.DataVisualization.Charting.Series series23 = new System.Windows.Forms.DataVisualization.Charting.Series();
     58      System.Windows.Forms.DataVisualization.Charting.ChartArea chartArea8 = new System.Windows.Forms.DataVisualization.Charting.ChartArea();
     59      System.Windows.Forms.DataVisualization.Charting.Legend legend8 = new System.Windows.Forms.DataVisualization.Charting.Legend();
     60      System.Windows.Forms.DataVisualization.Charting.Series series24 = new System.Windows.Forms.DataVisualization.Charting.Series();
    6161      this.jobChart = new System.Windows.Forms.DataVisualization.Charting.Chart();
    6262      this.coresChart = new System.Windows.Forms.DataVisualization.Charting.Chart();
    63       this.lblSlaveState = new System.Windows.Forms.Label();
    6463      this.label1 = new System.Windows.Forms.Label();
     64      this.txtSlaveState = new System.Windows.Forms.TextBox();
    6565      ((System.ComponentModel.ISupportInitialize)(this.jobChart)).BeginInit();
    6666      ((System.ComponentModel.ISupportInitialize)(this.coresChart)).BeginInit();
     
    7373                  | System.Windows.Forms.AnchorStyles.Right)));
    7474      this.jobChart.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None;
    75       customLabel1.Text = "Jobs";
    76       customLabel2.Text = "Aborted Jobs";
    77       customLabel3.Text = "Finished Jobs";
    78       customLabel4.Text = "Fetched Jobs";
    79       chartArea1.AxisX.CustomLabels.Add(customLabel1);
    80       chartArea1.AxisX.CustomLabels.Add(customLabel2);
    81       chartArea1.AxisX.CustomLabels.Add(customLabel3);
    82       chartArea1.AxisX.CustomLabels.Add(customLabel4);
    83       chartArea1.AxisX.Enabled = System.Windows.Forms.DataVisualization.Charting.AxisEnabled.True;
    84       chartArea1.AxisX.MajorGrid.Enabled = false;
    85       chartArea1.AxisX.MajorTickMark.Enabled = false;
    86       chartArea1.Name = "ChartArea1";
    87       this.jobChart.ChartAreas.Add(chartArea1);
    88       legend1.Name = "Legend1";
    89       this.jobChart.Legends.Add(legend1);
     75      customLabel13.Text = "Jobs";
     76      customLabel14.Text = "Aborted Jobs";
     77      customLabel15.Text = "Finished Jobs";
     78      customLabel16.Text = "Fetched Jobs";
     79      chartArea7.AxisX.CustomLabels.Add(customLabel13);
     80      chartArea7.AxisX.CustomLabels.Add(customLabel14);
     81      chartArea7.AxisX.CustomLabels.Add(customLabel15);
     82      chartArea7.AxisX.CustomLabels.Add(customLabel16);
     83      chartArea7.AxisX.Enabled = System.Windows.Forms.DataVisualization.Charting.AxisEnabled.True;
     84      chartArea7.AxisX.MajorGrid.Enabled = false;
     85      chartArea7.AxisX.MajorTickMark.Enabled = false;
     86      chartArea7.Name = "ChartArea1";
     87      this.jobChart.ChartAreas.Add(chartArea7);
     88      legend7.Name = "Legend1";
     89      this.jobChart.Legends.Add(legend7);
    9090      this.jobChart.Location = new System.Drawing.Point(3, 121);
    9191      this.jobChart.Name = "jobChart";
    92       series1.ChartArea = "ChartArea1";
    93       series1.Legend = "Legend1";
    94       series1.Name = "Series1";
    95       series2.ChartArea = "ChartArea1";
    96       series2.Legend = "Legend1";
    97       series2.Name = "Series2";
    98       series3.ChartArea = "ChartArea1";
    99       series3.Legend = "Legend1";
    100       series3.Name = "Series3";
    101       series4.ChartArea = "ChartArea1";
    102       series4.Legend = "Legend1";
    103       series4.Name = "Series4";
    104       series5.ChartArea = "ChartArea1";
    105       series5.Legend = "Legend1";
    106       series5.Name = "Series5";
    107       this.jobChart.Series.Add(series1);
    108       this.jobChart.Series.Add(series2);
    109       this.jobChart.Series.Add(series3);
    110       this.jobChart.Series.Add(series4);
    111       this.jobChart.Series.Add(series5);
     92      series19.ChartArea = "ChartArea1";
     93      series19.Legend = "Legend1";
     94      series19.Name = "Series1";
     95      series20.ChartArea = "ChartArea1";
     96      series20.Legend = "Legend1";
     97      series20.Name = "Series2";
     98      series21.ChartArea = "ChartArea1";
     99      series21.Legend = "Legend1";
     100      series21.Name = "Series3";
     101      series22.ChartArea = "ChartArea1";
     102      series22.Legend = "Legend1";
     103      series22.Name = "Series4";
     104      series23.ChartArea = "ChartArea1";
     105      series23.Legend = "Legend1";
     106      series23.Name = "Series5";
     107      this.jobChart.Series.Add(series19);
     108      this.jobChart.Series.Add(series20);
     109      this.jobChart.Series.Add(series21);
     110      this.jobChart.Series.Add(series22);
     111      this.jobChart.Series.Add(series23);
    112112      this.jobChart.Size = new System.Drawing.Size(412, 189);
    113113      this.jobChart.TabIndex = 7;
     
    116116      //
    117117      this.coresChart.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
    118       chartArea2.Name = "ChartArea1";
    119       this.coresChart.ChartAreas.Add(chartArea2);
    120       legend2.Name = "Legend1";
    121       this.coresChart.Legends.Add(legend2);
     118      chartArea8.Name = "ChartArea1";
     119      this.coresChart.ChartAreas.Add(chartArea8);
     120      legend8.Name = "Legend1";
     121      this.coresChart.Legends.Add(legend8);
    122122      this.coresChart.Location = new System.Drawing.Point(186, 3);
    123123      this.coresChart.Name = "coresChart";
    124       series6.ChartArea = "ChartArea1";
    125       series6.ChartType = System.Windows.Forms.DataVisualization.Charting.SeriesChartType.Pie;
    126       series6.Legend = "Legend1";
    127       series6.Name = "Series1";
    128       this.coresChart.Series.Add(series6);
     124      series24.ChartArea = "ChartArea1";
     125      series24.ChartType = System.Windows.Forms.DataVisualization.Charting.SeriesChartType.Pie;
     126      series24.Legend = "Legend1";
     127      series24.Name = "Series1";
     128      this.coresChart.Series.Add(series24);
    129129      this.coresChart.Size = new System.Drawing.Size(229, 80);
    130130      this.coresChart.TabIndex = 9;
    131       //
    132       // lblSlaveState
    133       //
    134       this.lblSlaveState.Location = new System.Drawing.Point(75, 5);
    135       this.lblSlaveState.Name = "lblSlaveState";
    136       this.lblSlaveState.Size = new System.Drawing.Size(78, 13);
    137       this.lblSlaveState.TabIndex = 13;
    138131      //
    139132      // label1
     
    142135      this.label1.Location = new System.Drawing.Point(7, 5);
    143136      this.label1.Name = "label1";
    144       this.label1.Size = new System.Drawing.Size(62, 13);
     137      this.label1.Size = new System.Drawing.Size(65, 13);
    145138      this.label1.TabIndex = 14;
    146       this.label1.Text = "Slave State";
     139      this.label1.Text = "Slave State:";
    147140      //
    148       // SlaveView
     141      // txtSlaveState
     142      //
     143      this.txtSlaveState.Enabled = false;
     144      this.txtSlaveState.Location = new System.Drawing.Point(78, 2);
     145      this.txtSlaveState.Name = "txtSlaveState";
     146      this.txtSlaveState.Size = new System.Drawing.Size(100, 20);
     147      this.txtSlaveState.TabIndex = 15;
     148      //
     149      // SlaveStats
    149150      //
    150151      this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
    151152      this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
     153      this.Controls.Add(this.txtSlaveState);
    152154      this.Controls.Add(this.label1);
    153       this.Controls.Add(this.lblSlaveState);
    154155      this.Controls.Add(this.coresChart);
    155156      this.Controls.Add(this.jobChart);
    156       this.Name = "SlaveView";
     157      this.Name = "SlaveStats";
    157158      this.Size = new System.Drawing.Size(418, 313);
    158159      ((System.ComponentModel.ISupportInitialize)(this.jobChart)).EndInit();
     
    167168    private System.Windows.Forms.DataVisualization.Charting.Chart jobChart;
    168169    private System.Windows.Forms.DataVisualization.Charting.Chart coresChart;
    169     private System.Windows.Forms.Label lblSlaveState;
    170170    private System.Windows.Forms.Label label1;
     171    private System.Windows.Forms.TextBox txtSlaveState;
    171172  }
    172173}
  • branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive.Slave.Views/3.3/SlaveStats.cs

    r6743 r6823  
    4646    public SlaveStats() {
    4747      InitializeComponent();
    48       lblSlaveState.Text = SlaveDisplayStat.NoService.ToString();
     48      txtSlaveState.Text = SlaveDisplayStat.NoService.ToString();
    4949      lastSlaveDisplayStat = SlaveDisplayStat.NoService;
    5050      Content_SlaveDisplayStateChanged(this, new EventArgs<SlaveDisplayStat>(lastSlaveDisplayStat));
     
    9191        Invoke(action, sender, e);
    9292      } else {
    93         lblSlaveState.Text = e.Value.ToString();
     93        txtSlaveState.Text = e.Value.ToString();
    9494        lastSlaveDisplayStat = e.Value;
    9595      }
  • branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive.Slave.Views/3.3/SlaveView.Designer.cs

    r6734 r6823  
    4646    private void InitializeComponent() {
    4747      this.slaveStats = new HeuristicLab.Clients.Hive.SlaveCore.Views.SlaveStats();
    48       this.slaveCmds = new HeuristicLab.Clients.Hive.SlaveCore.Views.SlaveCmdsBase();
     48      this.splitContainer = new System.Windows.Forms.SplitContainer();
     49      this.jobsView = new HeuristicLab.Clients.Hive.SlaveCore.Views.JobsView();
     50      ((System.ComponentModel.ISupportInitialize)(this.splitContainer)).BeginInit();
     51      this.splitContainer.Panel1.SuspendLayout();
     52      this.splitContainer.Panel2.SuspendLayout();
     53      this.splitContainer.SuspendLayout();
    4954      this.SuspendLayout();
    5055      //
    5156      // slaveStats
    5257      //
     58      this.slaveStats.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
     59                  | System.Windows.Forms.AnchorStyles.Left)
     60                  | System.Windows.Forms.AnchorStyles.Right)));
    5361      this.slaveStats.Caption = "HeuristicLab Slave View";
    5462      this.slaveStats.Content = null;
     
    5664      this.slaveStats.Name = "slaveStats";
    5765      this.slaveStats.ReadOnly = false;
    58       this.slaveStats.Size = new System.Drawing.Size(418, 313);
     66      this.slaveStats.Size = new System.Drawing.Size(508, 194);
    5967      this.slaveStats.TabIndex = 0;
    6068      //
    61       // slaveCmds
     69      // splitContainer
    6270      //
    63       this.slaveCmds.Caption = "HeuristicLab Slave View";
    64       this.slaveCmds.Content = null;
    65       this.slaveCmds.Location = new System.Drawing.Point(429, 3);
    66       this.slaveCmds.Name = "slaveCmds";
    67       this.slaveCmds.ReadOnly = false;
    68       this.slaveCmds.Size = new System.Drawing.Size(100, 155);
    69       this.slaveCmds.TabIndex = 1;
     71      this.splitContainer.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
     72                  | System.Windows.Forms.AnchorStyles.Left)
     73                  | System.Windows.Forms.AnchorStyles.Right)));
     74      this.splitContainer.Location = new System.Drawing.Point(3, 3);
     75      this.splitContainer.Name = "splitContainer";
     76      this.splitContainer.Orientation = System.Windows.Forms.Orientation.Horizontal;
     77      //
     78      // splitContainer.Panel1
     79      //
     80      this.splitContainer.Panel1.Controls.Add(this.slaveStats);
     81      //
     82      // splitContainer.Panel2
     83      //
     84      this.splitContainer.Panel2.Controls.Add(this.jobsView);
     85      this.splitContainer.Size = new System.Drawing.Size(514, 314);
     86      this.splitContainer.SplitterDistance = 200;
     87      this.splitContainer.TabIndex = 2;
     88      //
     89      // jobsView
     90      //
     91      this.jobsView.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
     92                  | System.Windows.Forms.AnchorStyles.Left)
     93                  | System.Windows.Forms.AnchorStyles.Right)));
     94      this.jobsView.Caption = "Jobs View";
     95      this.jobsView.Content = null;
     96      this.jobsView.Location = new System.Drawing.Point(3, 3);
     97      this.jobsView.Name = "jobsView";
     98      this.jobsView.ReadOnly = false;
     99      this.jobsView.Size = new System.Drawing.Size(508, 104);
     100      this.jobsView.TabIndex = 0;
    70101      //
    71102      // SlaveView
     
    73104      this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
    74105      this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
    75       this.Controls.Add(this.slaveCmds);
    76       this.Controls.Add(this.slaveStats);
     106      this.Controls.Add(this.splitContainer);
    77107      this.Name = "SlaveView";
    78108      this.Size = new System.Drawing.Size(520, 320);
     109      this.splitContainer.Panel1.ResumeLayout(false);
     110      this.splitContainer.Panel2.ResumeLayout(false);
     111      ((System.ComponentModel.ISupportInitialize)(this.splitContainer)).EndInit();
     112      this.splitContainer.ResumeLayout(false);
    79113      this.ResumeLayout(false);
    80114
     
    84118
    85119    private SlaveStats slaveStats;
    86     private SlaveCmdsBase slaveCmds;
     120    private System.Windows.Forms.SplitContainer splitContainer;
     121    private JobsView jobsView;
    87122
    88123  }
  • branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive.Slave.Views/3.3/SlaveView.cs

    r6734 r6823  
    5252      if (Content == null) {
    5353        slaveStats.Content = null;
    54         slaveCmds.Content = null;
     54        jobsView.Content = null;
    5555      } else {
    5656        slaveStats.Content = (SlaveItem)Content;
    57         slaveCmds.Content = (SlaveItem)Content;
     57        jobsView.Content = (SlaveItem)Content;
    5858      }
    5959    }
  • branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Hive/3.3/HeuristicLabHivePlugin.cs.frame

    r6743 r6823  
    1 using System;
     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
     22using System;
    223using System.Collections.Generic;
    324using System.Linq;
Note: See TracChangeset for help on using the changeset viewer.