Free cookie consent management tool by TermsFeed Policy Generator

Changeset 1030


Ignore:
Timestamp:
12/18/08 15:33:37 (15 years ago)
Author:
aleitner
Message:

jobs in groups offline, calculating, finished - more than one job can be added (#380)

Location:
trunk/sources/HeuristicLab.Hive.Server.Console
Files:
1 deleted
9 edited

Legend:

Unmodified
Added
Removed

  • trunk/sources/HeuristicLab.Hive.Server.Console/AddJobForm.Designer.cs

    r1018 r1030  
    1 namespace HeuristicLab.Hive.Server.Console {
     1#region License Information
     2/* HeuristicLab
     3 * Copyright (C) 2002-2008 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
     22namespace HeuristicLab.Hive.Server.Console {
    223  partial class AddJobForm {
    324    /// <summary>
    … …  
    2849      this.btnAdd = new System.Windows.Forms.Button();
    2950      this.btnClose = new System.Windows.Forms.Button();
     51      this.lblNumJobs = new System.Windows.Forms.Label();
     52      this.tbNumJobs = new System.Windows.Forms.TextBox();
     53      this.lblError = new System.Windows.Forms.Label();
    3054      this.SuspendLayout();
    3155      //
    … …  
    3357      //
    3458      this.lblParentJob.AutoSize = true;
    35       this.lblParentJob.Location = new System.Drawing.Point(12, 9);
     59      this.lblParentJob.Location = new System.Drawing.Point(9, 36);
    3660      this.lblParentJob.Name = "lblParentJob";
    3761      this.lblParentJob.Size = new System.Drawing.Size(58, 13);
    … …  
    4266      //
    4367      this.cbParJob.FormattingEnabled = true;
    44       this.cbParJob.Location = new System.Drawing.Point(120, 6);
     68      this.cbParJob.Location = new System.Drawing.Point(117, 33);
    4569      this.cbParJob.Name = "cbParJob";
    4670      this.cbParJob.Size = new System.Drawing.Size(212, 21);
    … …  
    4973      // btnAdd
    5074      //
    51       this.btnAdd.Location = new System.Drawing.Point(15, 38);
     75      this.btnAdd.Location = new System.Drawing.Point(12, 65);
    5276      this.btnAdd.Name = "btnAdd";
    5377      this.btnAdd.Size = new System.Drawing.Size(75, 23);
    … …  
    5983      // btnClose
    6084      //
    61       this.btnClose.Location = new System.Drawing.Point(257, 38);
     85      this.btnClose.Location = new System.Drawing.Point(254, 65);
    6286      this.btnClose.Name = "btnClose";
    6387      this.btnClose.Size = new System.Drawing.Size(75, 23);
    … …  
    6791      this.btnClose.Click += new System.EventHandler(this.btnClose_Click);
    6892      //
     93      // lblNumJobs
     94      //
     95      this.lblNumJobs.AutoSize = true;
     96      this.lblNumJobs.Location = new System.Drawing.Point(12, 9);
     97      this.lblNumJobs.Name = "lblNumJobs";
     98      this.lblNumJobs.Size = new System.Drawing.Size(78, 13);
     99      this.lblNumJobs.TabIndex = 6;
     100      this.lblNumJobs.Text = "Number of jobs";
     101      //
     102      // tbNumJobs
     103      //
     104      this.tbNumJobs.Location = new System.Drawing.Point(117, 6);
     105      this.tbNumJobs.Name = "tbNumJobs";
     106      this.tbNumJobs.Size = new System.Drawing.Size(212, 20);
     107      this.tbNumJobs.TabIndex = 7;
     108      this.tbNumJobs.Text = "1";
     109      //
     110      // lblError
     111      //
     112      this.lblError.AutoSize = true;
     113      this.lblError.Location = new System.Drawing.Point(94, 74);
     114      this.lblError.Name = "lblError";
     115      this.lblError.Size = new System.Drawing.Size(0, 13);
     116      this.lblError.TabIndex = 8;
     117      //
    69118      // AddJobForm
    70119      //
    71120      this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
    72121      this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
    73       this.ClientSize = new System.Drawing.Size(344, 68);
     122      this.ClientSize = new System.Drawing.Size(344, 100);
     123      this.Controls.Add(this.lblError);
     124      this.Controls.Add(this.tbNumJobs);
     125      this.Controls.Add(this.lblNumJobs);
    74126      this.Controls.Add(this.btnClose);
    75127      this.Controls.Add(this.btnAdd);
    … …  
    89141    private System.Windows.Forms.Button btnAdd;
    90142    private System.Windows.Forms.Button btnClose;
     143    private System.Windows.Forms.Label lblNumJobs;
     144    private System.Windows.Forms.TextBox tbNumJobs;
     145    private System.Windows.Forms.Label lblError;
    91146  }
    92147}

  • trunk/sources/HeuristicLab.Hive.Server.Console/AddJobForm.cs

    r1018 r1030  
    1 using System;
     1#region License Information
     2/* HeuristicLab
     3 * Copyright (C) 2002-2008 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.ComponentModel;
    … …  
    3556
    3657    private void btnAdd_Click(object sender, EventArgs e) {
    37       if (cbParJob.SelectedIndex != 0) {
    38         foreach (Job pjob in jobGroups.List) {
    39           if (cbParJob.SelectedItem.ToString().Equals(pjob.Id.ToString())) {
    40             Job job = new Job { ParentJob = pjob };
    41             Response resp = jobManager.AddNewJob(job);
     58      try {
     59        lblError.Text = "";
     60        int numJobs = Convert.ToInt32(tbNumJobs.Text);
     61        if (numJobs > 0) {
     62          for (int i = 0; i < numJobs; i++) {
     63            if (cbParJob.SelectedIndex != 0) {
     64              foreach (Job pjob in jobGroups.List) {
     65                if (cbParJob.SelectedItem.ToString().Equals(pjob.Id.ToString())) {
     66                  Job job = new Job { ParentJob = pjob, State = State.offline };
     67                  Response resp = jobManager.AddNewJob(job);
     68                }
     69              }
     70            } else {
     71              Job job = new Job { State = State.offline };
     72              Response resp = jobManager.AddNewJob(job);
     73            }
    4274          }
     75          this.Close();
     76        } else {
     77          lblError.Text = "Wrong number of Jobs";
    4378        }
    44       } else {
    45         Job job = new Job();
    46         Response resp = jobManager.AddNewJob(job);
     79
     80      }
     81      catch {
     82        lblError.Text = "There should be a number";
    4783      }
    4884    }

  • trunk/sources/HeuristicLab.Hive.Server.Console/AddUserForm.Designer.cs

    r1018 r1030  
    1 namespace HeuristicLab.Hive.Server.Console {
     1#region License Information
     2/* HeuristicLab
     3 * Copyright (C) 2002-2008 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
     22namespace HeuristicLab.Hive.Server.Console {
    223  partial class AddUserForm {
    324    /// <summary>

  • trunk/sources/HeuristicLab.Hive.Server.Console/AddUserForm.cs

    r1018 r1030  
    1 using System;
     1#region License Information
     2/* HeuristicLab
     3 * Copyright (C) 2002-2008 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.ComponentModel;
    … …  
    7798        }
    7899      }
     100      this.Close();
    79101    }
    80102

  • trunk/sources/HeuristicLab.Hive.Server.Console/HeuristicLab.Hive.Server.Console.csproj

    r1018 r1030  
    9999    </Compile>
    100100    <Compile Include="HiveServerConsolePlugin.cs" />
    101     <Compile Include="IPAdressTextBox.cs">
    102     </Compile>
    103101    <Compile Include="Properties\AssemblyInfo.cs" />
    104102    <EmbeddedResource Include="AddUserForm.resx">

  • trunk/sources/HeuristicLab.Hive.Server.Console/HiveServerConsole.cs

    r1018 r1030  
    6262      newIp = newIp.Replace(" ", "");
    6363
    64       ServiceLocator.Address = newIp;
    65       ServiceLocator.Port = this.tbPort.Text;
     64        ServiceLocator.Address = newIp;
     65        ServiceLocator.Port = this.tbPort.Text;
    6666
    67       if (isValid()) {
    68         this.Visible = false;
    69         information = new HiveServerManagementConsole();
    70         information.closeFormEvent += new closeForm(enableForm);
    71         information.Show();
    72       }
     67        if (isValid()) {
     68          this.Visible = false;
     69          information = new HiveServerManagementConsole();
     70          information.closeFormEvent += new closeForm(enableForm);
     71          information.Show();
     72        }
    7373    }
    7474
    … …  
    111111    }
    112112
    113     private void enableForm(bool cf) {
     113    private void enableForm(bool cf, bool error) {
    114114      if (cf) {
    115115        this.Visible = true;
     116        if (error == true) {
     117          lblError.Text = "Something went wrong with the server";
     118        }
    116119      }
    117120    }

  • trunk/sources/HeuristicLab.Hive.Server.Console/HiveServerManagementConsole.Designer.cs

    r1018 r1030  
    2525    private void InitializeComponent() {
    2626      this.components = new System.ComponentModel.Container();
    27       System.Windows.Forms.ListViewItem listViewItem2 = new System.Windows.Forms.ListViewItem(new string[] {
     27      System.Windows.Forms.ListViewItem listViewItem1 = new System.Windows.Forms.ListViewItem(new string[] {
    2828            "",
    2929            "Test"}, -1);
    … …  
    4747      this.tvJobControl = new System.Windows.Forms.TreeView();
    4848      this.lvJobControl = new System.Windows.Forms.ListView();
     49      this.imageList3 = new System.Windows.Forms.ImageList(this.components);
    4950      this.tpUserControl = new System.Windows.Forms.TabPage();
    5051      this.scUserControl = new System.Windows.Forms.SplitContainer();
    … …  
    5657      this.directorySearcher1 = new System.DirectoryServices.DirectorySearcher();
    5758      this.timerSyncronize = new System.Windows.Forms.Timer(this.components);
    58       this.imageList3 = new System.Windows.Forms.ImageList(this.components);
    5959      this.menuStrip1.SuspendLayout();
    6060      this.tcManagementConsole.SuspendLayout();
    … …  
    111111      //
    112112      this.jobToolStripMenuItem.Name = "jobToolStripMenuItem";
    113       this.jobToolStripMenuItem.Size = new System.Drawing.Size(152, 22);
     113      this.jobToolStripMenuItem.Size = new System.Drawing.Size(107, 22);
    114114      this.jobToolStripMenuItem.Text = "Job";
    115115      this.jobToolStripMenuItem.Click += new System.EventHandler(this.jobToolStripMenuItem1_Click);
    … …  
    189189      // lvClientControl
    190190      //
     191      this.lvClientControl.AllowDrop = true;
    191192      this.lvClientControl.Dock = System.Windows.Forms.DockStyle.Fill;
    192193      this.lvClientControl.ImeMode = System.Windows.Forms.ImeMode.Off;
    193194      this.lvClientControl.Items.AddRange(new System.Windows.Forms.ListViewItem[] {
    194             listViewItem2});
     195            listViewItem1});
    195196      this.lvClientControl.LargeImageList = this.imageList1;
    196197      this.lvClientControl.Location = new System.Drawing.Point(0, 0);
    … …  
    246247      // lvJobControl
    247248      //
     249      this.lvJobControl.AllowDrop = true;
    248250      this.lvJobControl.Dock = System.Windows.Forms.DockStyle.Fill;
    249251      this.lvJobControl.LargeImageList = this.imageList3;
    … …  
    253255      this.lvJobControl.TabIndex = 0;
    254256      this.lvJobControl.UseCompatibleStateImageBehavior = false;
     257      //
     258      // imageList3
     259      //
     260      this.imageList3.ImageStream = ((System.Windows.Forms.ImageListStreamer)(resources.GetObject("imageList3.ImageStream")));
     261      this.imageList3.TransparentColor = System.Drawing.Color.Transparent;
     262      this.imageList3.Images.SetKeyName(0, "PlayHS.bmp");
    255263      //
    256264      // tpUserControl
    … …  
    292300      // lvUserControl
    293301      //
     302      this.lvUserControl.AllowDrop = true;
    294303      this.lvUserControl.Dock = System.Windows.Forms.DockStyle.Fill;
    295304      this.lvUserControl.LargeImageList = this.imageList2;
    … …  
    333342      //
    334343      this.timerSyncronize.Interval = 10000;
    335       //
    336       // imageList3
    337       //
    338       this.imageList3.ImageStream = ((System.Windows.Forms.ImageListStreamer)(resources.GetObject("imageList3.ImageStream")));
    339       this.imageList3.TransparentColor = System.Drawing.Color.Transparent;
    340       this.imageList3.Images.SetKeyName(0, "PlayHS.bmp");
    341344      //
    342345      // HiveServerManagementConsole

  • trunk/sources/HeuristicLab.Hive.Server.Console/HiveServerManagementConsole.cs

    r1018 r1030  
    3434namespace HeuristicLab.Hive.Server.Console {
    3535
    36   public delegate void closeForm(bool cf);
     36  public delegate void closeForm(bool cf, bool error);
    3737
    3838  public partial class HiveServerManagementConsole : Form {
    … …  
    6363
    6464    private void addClients() {
    65       IClientManager clientManager =
    66         ServiceLocator.GetClientManager();
    67 
    68       clients = clientManager.GetAllClientGroups();
    69 
    70       lvClientControl.Items.Clear();
    71       tvClientControl.Nodes.Clear();
    72       int count = 0;
    73       foreach (ClientGroup cg in clients.List) {
    74         tvClientControl.Nodes.Add(cg.Name);
    75         ListViewGroup lvg = new ListViewGroup(cg.Name, HorizontalAlignment.Left);
    76         foreach (ClientInfo ci in clientManager.GetAllClients().List) {
    77           tvClientControl.Nodes[tvClientControl.Nodes.Count - 1].Nodes.Add(ci.Name);
    78           lvClientControl.Items.Add(new ListViewItem(ci.Name, count, lvg));
     65      try {
     66        IClientManager clientManager =
     67          ServiceLocator.GetClientManager();
     68
     69        clients = clientManager.GetAllClientGroups();
     70
     71        lvClientControl.Items.Clear();
     72        tvClientControl.Nodes.Clear();
     73        int count = 0;
     74        foreach (ClientGroup cg in clients.List) {
     75          tvClientControl.Nodes.Add(cg.Name);
     76          ListViewGroup lvg = new ListViewGroup(cg.Name, HorizontalAlignment.Left);
     77          foreach (ClientInfo ci in clientManager.GetAllClients().List) {
     78            tvClientControl.Nodes[tvClientControl.Nodes.Count - 1].Nodes.Add(ci.Name);
     79            lvClientControl.Items.Add(new ListViewItem(ci.Name, count, lvg));
     80            count = (count + 1) % 3;
     81          }
     82          lvClientControl.Groups.Add(lvg);
     83        } // Groups
     84
     85        clientInfo = clientManager.GetAllClients();
     86        ListViewGroup lvunsorted = new ListViewGroup("unsorted", HorizontalAlignment.Left);
     87        foreach (ClientInfo ci in clientInfo.List) {
     88          tvClientControl.Nodes.Add(ci.Name);
     89          lvClientControl.Items.Add(new ListViewItem(ci.Name, count, lvunsorted));
    7990          count = (count + 1) % 3;
    8091        }
    81         lvClientControl.Groups.Add(lvg);
    82       } // Groups
    83 
    84       clientInfo = clientManager.GetAllClients();
    85       ListViewGroup lvunsorted = new ListViewGroup("unsorted", HorizontalAlignment.Left);
    86       foreach (ClientInfo ci in clientInfo.List) {
    87         tvClientControl.Nodes.Add(ci.Name);
    88         lvClientControl.Items.Add(new ListViewItem(ci.Name, count, lvunsorted));
    89         count = (count + 1) % 3;
    90       }
    91       lvClientControl.Groups.Add(lvunsorted);
     92        lvClientControl.Groups.Add(lvunsorted);
     93      }
     94      catch (Exception ex) {
     95        closeFormEvent(true, true);
     96        this.Close();
     97      }
    9298    }
    9399
    94100    private void addJobs() {
    95       IJobManager jobManager =
    96         ServiceLocator.GetJobManager();
    97       jobs = jobManager.GetAllJobs();
    98 
    99       lvJobControl.Items.Clear();
    100       tvJobControl.Nodes.Clear();
    101 
    102       foreach (Job job in jobs.List) {
    103         tvJobControl.Nodes.Add(job.Id.ToString());
    104         lvJobControl.Items.Add(new ListViewItem(job.Id.ToString(), 0));
    105       } // Jobs
    106 
     101      try {
     102        IJobManager jobManager =
     103          ServiceLocator.GetJobManager();
     104        jobs = jobManager.GetAllJobs();
     105
     106        lvJobControl.Items.Clear();
     107        tvJobControl.Nodes.Clear();
     108
     109        ListViewGroup lvJobFinished = new ListViewGroup("finished", HorizontalAlignment.Left);
     110        ListViewGroup lvJobOffline = new ListViewGroup("offline", HorizontalAlignment.Left);
     111        ListViewGroup lvJobCalculating = new ListViewGroup("calculating", HorizontalAlignment.Left);
     112        tvJobControl.Nodes.Add("finished");
     113        tvJobControl.Nodes.Add("offline");
     114        tvJobControl.Nodes.Add("calculating");
     115        foreach (Job job in jobs.List) {
     116          if (job.State == State.finished) {
     117            tvJobControl.Nodes[0].Nodes.Add(job.Id.ToString());
     118            lvJobControl.Items.Add(new ListViewItem(job.Id.ToString(), 0, lvJobFinished));
     119          } else if (job.State == State.offline) {
     120            tvJobControl.Nodes[1].Nodes.Add(job.Id.ToString());
     121            lvJobControl.Items.Add(new ListViewItem(job.Id.ToString(), 0, lvJobOffline));
     122          } else if (job.State == State.calculating) {
     123            tvJobControl.Nodes[2].Nodes.Add(job.Id.ToString());
     124            lvJobControl.Items.Add(new ListViewItem(job.Id.ToString(), 0, lvJobCalculating));
     125          }
     126        } // Jobs
     127        lvJobControl.Groups.Add(lvJobFinished);
     128        lvJobControl.Groups.Add(lvJobOffline);
     129        lvJobControl.Groups.Add(lvJobCalculating);
     130      }
     131      catch (Exception ex) {
     132        closeFormEvent(true, true);
     133        this.Close();
     134      }
    107135    }
    108136
    109137    private void addUsers() {
    110       IUserRoleManager userRoleManager =
    111         ServiceLocator.GetUserRoleManager();
    112 
    113       userGroups = userRoleManager.GetAllUserGroups();
    114 
    115       lvUserControl.Items.Clear();
    116       tvUserControl.Nodes.Clear();
    117 
    118       foreach (UserGroup ug in userGroups.List) {
    119         tvUserControl.Nodes.Add(ug.Name);
    120         ListViewGroup lvg = new ListViewGroup(ug.Name, HorizontalAlignment.Left);
    121 
    122         foreach (PermissionOwner permOwner in ug.Members) {
    123           if (permOwner is User) {
    124             User users = permOwner as User;
    125             tvUserControl.Nodes[tvUserControl.Nodes.Count - 1].Nodes.Add(users.Name);
    126             lvUserControl.Items.Add(new ListViewItem(users.Name, 0, lvg));
     138      try {
     139        IUserRoleManager userRoleManager =
     140          ServiceLocator.GetUserRoleManager();
     141
     142        userGroups = userRoleManager.GetAllUserGroups();
     143
     144        lvUserControl.Items.Clear();
     145        tvUserControl.Nodes.Clear();
     146
     147        foreach (UserGroup ug in userGroups.List) {
     148          tvUserControl.Nodes.Add(ug.Name);
     149          ListViewGroup lvg = new ListViewGroup(ug.Name, HorizontalAlignment.Left);
     150
     151          foreach (PermissionOwner permOwner in ug.Members) {
     152            if (permOwner is User) {
     153              User users = permOwner as User;
     154              tvUserControl.Nodes[tvUserControl.Nodes.Count - 1].Nodes.Add(users.Name);
     155              lvUserControl.Items.Add(new ListViewItem(users.Name, 0, lvg));
     156            }
    127157          }
     158          lvUserControl.Groups.Add(lvg);
     159
     160        } // Users
     161        usersList = userRoleManager.GetAllUsers();
     162        ListViewGroup lvunsorted = new ListViewGroup("unsorted", HorizontalAlignment.Left);
     163        foreach (User u in usersList.List) {
     164          tvUserControl.Nodes.Add(u.Name);
     165          lvUserControl.Items.Add(new ListViewItem(u.Name, 0, lvunsorted));
    128166        }
    129         lvUserControl.Groups.Add(lvg);
    130 
    131       } // Users
    132       usersList = userRoleManager.GetAllUsers();
    133       ListViewGroup lvunsorted = new ListViewGroup("unsorted", HorizontalAlignment.Left);
    134       foreach (User u in usersList.List) {
    135         tvUserControl.Nodes.Add(u.Name);
    136         lvUserControl.Items.Add(new ListViewItem(u.Name, 0, lvunsorted));
    137       }
    138       lvUserControl.Groups.Add(lvunsorted);
     167        lvUserControl.Groups.Add(lvunsorted);
     168      }
     169      catch (Exception ex) {
     170        closeFormEvent(true, true);
     171        this.Close();
     172      }
     173
    139174    }
    140175
    … …  
    146181    private void close_Click(object sender, EventArgs e) {
    147182      if (closeFormEvent != null) {
    148         closeFormEvent(true);
     183        closeFormEvent(true, false);
    149184      }
    150185      this.Close();
    … …  
    158193    private void HiveServerConsoleInformation_FormClosing(object sender, FormClosingEventArgs e) {
    159194      if (closeFormEvent != null) {
    160         closeFormEvent(true);
     195        closeFormEvent(true, false);
    161196      }
    162197

  • trunk/sources/HeuristicLab.Hive.Server.Console/HiveServerManagementConsole.resx

    r1018 r1030  
    119119  </resheader>
    120120  <metadata name="menuStrip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
    121     <value>139, 17</value>
     121    <value>32, 12</value>
    122122  </metadata>
    123123  <metadata name="imageList1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
    124     <value>248, 17</value>
     124    <value>129, 12</value>
    125125  </metadata>
    126126  <data name="imageList1.ImageStream" mimetype="application/x-microsoft.net.object.binary.base64">
    … …  
    216216  </data>
    217217  <metadata name="imageList3.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
    218     <value>17, 54</value>
     218    <value>587, 13</value>
    219219  </metadata>
    220220  <data name="imageList3.ImageStream" mimetype="application/x-microsoft.net.object.binary.base64">
    … …  
    223223        LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0
    224224        ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAAAG
    225         CQAAAk1TRnQBSQFMAwEBAAEFAQABBAEAASABAAEgAQAE/wEJAQAI/wFCAU0BNgEEBgABNgEEAgABKAMA
     225        CQAAAk1TRnQBSQFMAwEBAAEEAQABBAEAASABAAEgAQAE/wEJAQAI/wFCAU0BNgEEBgABNgEEAgABKAMA
    226226        AYADAAEgAwABAQEAAQgGAAEQGAABgAIAAYADAAKAAQABgAMAAYABAAGAAQACgAIAA8ABAAHAAdwBwAEA
    227227        AfABygGmAQABMwUAATMBAAEzAQABMwEAAjMCAAMWAQADHAEAAyIBAAMpAQADVQEAA00BAANCAQADOQEA
    … …  
    265265  </data>
    266266  <metadata name="imageList2.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
    267     <value>353, 17</value>
     267    <value>231, 9</value>
    268268  </metadata>
    269269  <data name="imageList2.ImageStream" mimetype="application/x-microsoft.net.object.binary.base64">
    … …  
    344344  </data>
    345345  <metadata name="directorySearcher1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
    346     <value>458, 17</value>
     346    <value>333, 11</value>
    347347  </metadata>
    348348  <metadata name="timerSyncronize.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
    349     <value>603, 17</value>
     349    <value>464, 11</value>
    350350  </metadata>
    351351</root>
Note: See TracChangeset for help on using the changeset viewer.