Free cookie consent management tool by TermsFeed Policy Generator

Changeset 1037 for trunk/sources


Ignore:
Timestamp:
12/18/08 17:18:26 (16 years ago)
Author:
aleitner
Message:

Refactoring Tab-order, renaming (#380)

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

Legend:

Unmodified
Added
Removed

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

    r1030 r1037  
    6969      this.cbParJob.Name = "cbParJob";
    7070      this.cbParJob.Size = new System.Drawing.Size(212, 21);
    71       this.cbParJob.TabIndex = 3;
     71      this.cbParJob.TabIndex = 2;
    7272      //
    7373      // btnAdd
    … …  
    7676      this.btnAdd.Name = "btnAdd";
    7777      this.btnAdd.Size = new System.Drawing.Size(75, 23);
    78       this.btnAdd.TabIndex = 4;
     78      this.btnAdd.TabIndex = 3;
    7979      this.btnAdd.Text = "Add";
    8080      this.btnAdd.UseVisualStyleBackColor = true;
    81       this.btnAdd.Click += new System.EventHandler(this.btnAdd_Click);
     81      this.btnAdd.Click += new System.EventHandler(this.BtnAdd_Click);
    8282      //
    8383      // btnClose
    … …  
    8686      this.btnClose.Name = "btnClose";
    8787      this.btnClose.Size = new System.Drawing.Size(75, 23);
    88       this.btnClose.TabIndex = 5;
     88      this.btnClose.TabIndex = 4;
    8989      this.btnClose.Text = "Close";
    9090      this.btnClose.UseVisualStyleBackColor = true;
    91       this.btnClose.Click += new System.EventHandler(this.btnClose_Click);
     91      this.btnClose.Click += new System.EventHandler(this.BtnClose_Click);
    9292      //
    9393      // lblNumJobs
    … …  
    105105      this.tbNumJobs.Name = "tbNumJobs";
    106106      this.tbNumJobs.Size = new System.Drawing.Size(212, 20);
    107       this.tbNumJobs.TabIndex = 7;
     107      this.tbNumJobs.TabIndex = 1;
    108108      this.tbNumJobs.Text = "1";
    109109      //

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

    r1030 r1037  
    4040    public AddJobForm() {
    4141      InitializeComponent();
    42       addJob();
     42      AddJob();
    4343    }
    4444
    45     private void addJob() {
     45    private void AddJob() {
    4646      jobManager =
    4747        ServiceLocator.GetJobManager();
    … …  
    5555
    5656
    57     private void btnAdd_Click(object sender, EventArgs e) {
     57    private void BtnAdd_Click(object sender, EventArgs e) {
    5858      try {
    5959        lblError.Text = "";
    … …  
    8484    }
    8585
    86     private void btnClose_Click(object sender, EventArgs e) {
     86    private void BtnClose_Click(object sender, EventArgs e) {
    8787      this.Close();
    8888    }
     89
     90
    8991  }
    9092}

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

    r1030 r1037  
    7878      this.tbOne.Name = "tbOne";
    7979      this.tbOne.Size = new System.Drawing.Size(212, 20);
    80       this.tbOne.TabIndex = 2;
     80      this.tbOne.TabIndex = 1;
    8181      //
    8282      // cbGroups
    … …  
    9696      this.btnAdd.Text = "Add";
    9797      this.btnAdd.UseVisualStyleBackColor = true;
    98       this.btnAdd.Click += new System.EventHandler(this.btnAdd_Click);
     98      this.btnAdd.Click += new System.EventHandler(this.BtnAdd_Click);
    9999      //
    100100      // btnClose
    … …  
    106106      this.btnClose.Text = "Close";
    107107      this.btnClose.UseVisualStyleBackColor = true;
    108       this.btnClose.Click += new System.EventHandler(this.btnClose_Click);
     108      this.btnClose.Click += new System.EventHandler(this.BtnClose_Click);
    109109      //
    110110      // tbPwd
    … …  
    113113      this.tbPwd.Name = "tbPwd";
    114114      this.tbPwd.Size = new System.Drawing.Size(212, 20);
    115       this.tbPwd.TabIndex = 7;
     115      this.tbPwd.TabIndex = 2;
     116      this.tbPwd.UseSystemPasswordChar = true;
    116117      //
    117118      // lblPassword
    … …  
    121122      this.lblPassword.Name = "lblPassword";
    122123      this.lblPassword.Size = new System.Drawing.Size(53, 13);
    123       this.lblPassword.TabIndex = 6;
     124      this.lblPassword.TabIndex = 0;
    124125      this.lblPassword.Text = "Password";
    125126      //
    … …  
    139140      this.Controls.Add(this.lblOne);
    140141      this.Name = "AddUserForm";
    141       this.Text = "AddNewForm";
     142      this.Text = "AddUserForm";
    142143      this.ResumeLayout(false);
    143144      this.PerformLayout();

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

    r1030 r1037  
    5252
    5353      if (addForm == "User") {
    54         addUser();
     54        AddUser();
    5555      }
    5656    }
    5757
    58     private void addUser() {
     58    private void AddUser() {
    5959     userRoleManager = ServiceLocator.GetUserRoleManager();
    6060      userGroups = userRoleManager.GetAllUserGroups();
    … …  
    6666    }
    6767
    68     private void btnAdd_Click(object sender, EventArgs e) {
     68    private void BtnAdd_Click(object sender, EventArgs e) {
    6969      if (!group) {
    7070        if (tbOne.Text != "") {
    … …  
    101101    }
    102102
    103     private void btnClose_Click(object sender, EventArgs e) {
     103    private void BtnClose_Click(object sender, EventArgs e) {
    104104      this.Close();
    105105    }

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

    r1018 r1037  
    5252      this.lblIp = new System.Windows.Forms.Label();
    5353      this.tbPort = new System.Windows.Forms.TextBox();
     54      this.tbIp = new System.Windows.Forms.TextBox();
    5455      this.btnLogin = new System.Windows.Forms.Button();
    5556      this.groupBox1 = new System.Windows.Forms.GroupBox();
    … …  
    5960      this.tbPwd = new System.Windows.Forms.TextBox();
    6061      this.lblError = new System.Windows.Forms.Label();
    61       this.tbIp = new System.Windows.Forms.TextBox();
    6262      this.msServerConsole.SuspendLayout();
    6363      this.gbManager.SuspendLayout();
    … …  
    9999      this.gbManager.Name = "gbManager";
    100100      this.gbManager.Size = new System.Drawing.Size(283, 82);
    101       this.gbManager.TabIndex = 1;
     101      this.gbManager.TabIndex = 4;
    102102      this.gbManager.TabStop = false;
    103103      this.gbManager.Text = "Manager";
    … …  
    126126      this.tbPort.Name = "tbPort";
    127127      this.tbPort.Size = new System.Drawing.Size(189, 20);
    128       this.tbPort.TabIndex = 1;
     128      this.tbPort.TabIndex = 6;
     129      //
     130      // tbIp
     131      //
     132      this.tbIp.Location = new System.Drawing.Point(77, 19);
     133      this.tbIp.Name = "tbIp";
     134      this.tbIp.Size = new System.Drawing.Size(191, 20);
     135      this.tbIp.TabIndex = 5;
    129136      //
    130137      // btnLogin
    … …  
    133140      this.btnLogin.Name = "btnLogin";
    134141      this.btnLogin.Size = new System.Drawing.Size(116, 23);
    135       this.btnLogin.TabIndex = 2;
     142      this.btnLogin.TabIndex = 7;
    136143      this.btnLogin.Text = "Login";
    137144      this.btnLogin.UseVisualStyleBackColor = true;
    138       this.btnLogin.Click += new System.EventHandler(this.btnLogin_Click);
     145      this.btnLogin.Click += new System.EventHandler(this.BtnLogin_Click);
    139146      //
    140147      // groupBox1
    … …  
    147154      this.groupBox1.Name = "groupBox1";
    148155      this.groupBox1.Size = new System.Drawing.Size(283, 82);
    149       this.groupBox1.TabIndex = 4;
     156      this.groupBox1.TabIndex = 1;
    150157      this.groupBox1.TabStop = false;
    151158      this.groupBox1.Text = "Manager";
    … …  
    156163      this.tbUserName.Name = "tbUserName";
    157164      this.tbUserName.Size = new System.Drawing.Size(189, 20);
    158       this.tbUserName.TabIndex = 4;
     165      this.tbUserName.TabIndex = 2;
    159166      //
    160167      // lblPwd
    … …  
    181188      this.tbPwd.Name = "tbPwd";
    182189      this.tbPwd.Size = new System.Drawing.Size(189, 20);
    183       this.tbPwd.TabIndex = 1;
     190      this.tbPwd.TabIndex = 3;
    184191      this.tbPwd.UseSystemPasswordChar = true;
    185192      //
    … …  
    192199      this.lblError.Size = new System.Drawing.Size(0, 13);
    193200      this.lblError.TabIndex = 5;
    194       //
    195       // tbIp
    196       //
    197       this.tbIp.Location = new System.Drawing.Point(77, 19);
    198       this.tbIp.Name = "tbIp";
    199       this.tbIp.Size = new System.Drawing.Size(191, 20);
    200       this.tbIp.TabIndex = 0;
    201201      //
    202202      // HiveServerConsole

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

    r1030 r1037  
    4242    public HiveServerConsole() {
    4343      InitializeComponent();
    44       tbUserName.Text = "Anita";
    45       tbPwd.Text = "Anita";
    46       tbIp.Text = "10.20.53.1";
    47       tbPort.Text = "9000";
    4844    }
    4945
    … …  
    5854    /// <param name="sender"></param>
    5955    /// <param name="e"></param>
    60     private void btnLogin_Click(object sender, EventArgs e) {
     56    private void BtnLogin_Click(object sender, EventArgs e) {
    6157      string newIp = tbIp.Text;
    6258      newIp = newIp.Replace(" ", "");
    … …  
    6561        ServiceLocator.Port = this.tbPort.Text;
    6662
    67         if (isValid()) {
     63        if (IsValid()) {
    6864          this.Visible = false;
    6965          information = new HiveServerManagementConsole();
    70           information.closeFormEvent += new closeForm(enableForm);
     66          information.closeFormEvent += new closeForm(EnableForm);
    7167          information.Show();
    7268        }
    … …  
    7470
    7571
    76     private bool isValid() {
     72    private bool IsValid() {
    7773      if ((tbUserName.Text != "") &&
    7874          (tbPwd.Text != "") &&
    … …  
    111107    }
    112108
    113     private void enableForm(bool cf, bool error) {
     109    private void EnableForm(bool cf, bool error) {
    114110      if (cf) {
    115111        this.Visible = true;
    … …  
    119115      }
    120116    }
    121 
    122     string md5sum(byte[] FileOrText) { //Output: String<-> Input: Byte[]
    123       return BitConverter.ToString(new
    124          MD5CryptoServiceProvider().ComputeHash(FileOrText)).Replace("-", "").ToLower();
    125     }
    126 
    127117  }
    128118}

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

    r1030 r1037  
    2525    private void InitializeComponent() {
    2626      this.components = new System.ComponentModel.Container();
    27       System.Windows.Forms.ListViewItem listViewItem1 = new System.Windows.Forms.ListViewItem(new string[] {
     27      System.Windows.Forms.ListViewItem listViewItem2 = new System.Windows.Forms.ListViewItem(new string[] {
    2828            "",
    2929            "Test"}, -1);
    … …  
    4242      this.tvClientControl = new System.Windows.Forms.TreeView();
    4343      this.lvClientControl = new System.Windows.Forms.ListView();
    44       this.imageList1 = new System.Windows.Forms.ImageList(this.components);
     44      this.ilClientControl = new System.Windows.Forms.ImageList(this.components);
    4545      this.tpJobControl = new System.Windows.Forms.TabPage();
    4646      this.scJobControl = new System.Windows.Forms.SplitContainer();
    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);
     49      this.ilJobControl = new System.Windows.Forms.ImageList(this.components);
    5050      this.tpUserControl = new System.Windows.Forms.TabPage();
    5151      this.scUserControl = new System.Windows.Forms.SplitContainer();
    5252      this.tvUserControl = new System.Windows.Forms.TreeView();
    5353      this.lvUserControl = new System.Windows.Forms.ListView();
    54       this.imageList2 = new System.Windows.Forms.ImageList(this.components);
     54      this.ilUserControl = new System.Windows.Forms.ImageList(this.components);
    5555      this.treeView2 = new System.Windows.Forms.TreeView();
    5656      this.listView2 = new System.Windows.Forms.ListView();
    57       this.directorySearcher1 = new System.DirectoryServices.DirectorySearcher();
    5857      this.timerSyncronize = new System.Windows.Forms.Timer(this.components);
    5958      this.menuStrip1.SuspendLayout();
    … …  
    9594      //
    9695      this.closeToolStripMenuItem.Name = "closeToolStripMenuItem";
    97       this.closeToolStripMenuItem.Size = new System.Drawing.Size(111, 22);
     96      this.closeToolStripMenuItem.Size = new System.Drawing.Size(152, 22);
    9897      this.closeToolStripMenuItem.Text = "Close";
    99       this.closeToolStripMenuItem.Click += new System.EventHandler(this.close_Click);
     98      this.closeToolStripMenuItem.Click += new System.EventHandler(this.Close_Click);
    10099      //
    101100      // addToolStripMenuItem
    … …  
    111110      //
    112111      this.jobToolStripMenuItem.Name = "jobToolStripMenuItem";
    113       this.jobToolStripMenuItem.Size = new System.Drawing.Size(107, 22);
     112      this.jobToolStripMenuItem.Size = new System.Drawing.Size(152, 22);
    114113      this.jobToolStripMenuItem.Text = "Job";
    115       this.jobToolStripMenuItem.Click += new System.EventHandler(this.jobToolStripMenuItem1_Click);
     114      this.jobToolStripMenuItem.Click += new System.EventHandler(this.JobToolStripMenuItem1_Click);
    116115      //
    117116      // userToolStripMenuItem
    … …  
    121120            this.groupToolStripMenuItem2});
    122121      this.userToolStripMenuItem.Name = "userToolStripMenuItem";
    123       this.userToolStripMenuItem.Size = new System.Drawing.Size(107, 22);
     122      this.userToolStripMenuItem.Size = new System.Drawing.Size(152, 22);
    124123      this.userToolStripMenuItem.Text = "User";
    125124      //
    … …  
    127126      //
    128127      this.userToolStripMenuItem1.Name = "userToolStripMenuItem1";
    129       this.userToolStripMenuItem1.Size = new System.Drawing.Size(114, 22);
     128      this.userToolStripMenuItem1.Size = new System.Drawing.Size(152, 22);
    130129      this.userToolStripMenuItem1.Text = "User";
    131       this.userToolStripMenuItem1.Click += new System.EventHandler(this.userToolStripMenuItem1_Click);
     130      this.userToolStripMenuItem1.Click += new System.EventHandler(this.UserToolStripMenuItem1_Click);
    132131      //
    133132      // groupToolStripMenuItem2
    134133      //
    135134      this.groupToolStripMenuItem2.Name = "groupToolStripMenuItem2";
    136       this.groupToolStripMenuItem2.Size = new System.Drawing.Size(114, 22);
     135      this.groupToolStripMenuItem2.Size = new System.Drawing.Size(152, 22);
    137136      this.groupToolStripMenuItem2.Text = "Group";
    138       this.groupToolStripMenuItem2.Click += new System.EventHandler(this.groupToolStripMenuItem2_Click);
     137      this.groupToolStripMenuItem2.Click += new System.EventHandler(this.GroupToolStripMenuItem2_Click);
    139138      //
    140139      // tcManagementConsole
    … …  
    193192      this.lvClientControl.ImeMode = System.Windows.Forms.ImeMode.Off;
    194193      this.lvClientControl.Items.AddRange(new System.Windows.Forms.ListViewItem[] {
    195             listViewItem1});
    196       this.lvClientControl.LargeImageList = this.imageList1;
     194            listViewItem2});
     195      this.lvClientControl.LargeImageList = this.ilClientControl;
    197196      this.lvClientControl.Location = new System.Drawing.Point(0, 0);
    198197      this.lvClientControl.Name = "lvClientControl";
    … …  
    201200      this.lvClientControl.UseCompatibleStateImageBehavior = false;
    202201      //
    203       // imageList1
    204       //
    205       this.imageList1.ImageStream = ((System.Windows.Forms.ImageListStreamer)(resources.GetObject("imageList1.ImageStream")));
    206       this.imageList1.TransparentColor = System.Drawing.Color.Transparent;
    207       this.imageList1.Images.SetKeyName(0, "monitor-green.png");
    208       this.imageList1.Images.SetKeyName(1, "monitor-orange.png");
    209       this.imageList1.Images.SetKeyName(2, "monitor-red.png");
     202      // ilClientControl
     203      //
     204      this.ilClientControl.ImageStream = ((System.Windows.Forms.ImageListStreamer)(resources.GetObject("ilClientControl.ImageStream")));
     205      this.ilClientControl.TransparentColor = System.Drawing.Color.Transparent;
     206      this.ilClientControl.Images.SetKeyName(0, "monitor-green.png");
     207      this.ilClientControl.Images.SetKeyName(1, "monitor-orange.png");
     208      this.ilClientControl.Images.SetKeyName(2, "monitor-red.png");
    210209      //
    211210      // tpJobControl
    … …  
    249248      this.lvJobControl.AllowDrop = true;
    250249      this.lvJobControl.Dock = System.Windows.Forms.DockStyle.Fill;
    251       this.lvJobControl.LargeImageList = this.imageList3;
     250      this.lvJobControl.LargeImageList = this.ilJobControl;
    252251      this.lvJobControl.Location = new System.Drawing.Point(0, 0);
    253252      this.lvJobControl.Name = "lvJobControl";
    … …  
    256255      this.lvJobControl.UseCompatibleStateImageBehavior = false;
    257256      //
    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");
     257      // ilJobControl
     258      //
     259      this.ilJobControl.ImageStream = ((System.Windows.Forms.ImageListStreamer)(resources.GetObject("ilJobControl.ImageStream")));
     260      this.ilJobControl.TransparentColor = System.Drawing.Color.Transparent;
     261      this.ilJobControl.Images.SetKeyName(0, "PlayHS.bmp");
    263262      //
    264263      // tpUserControl
    … …  
    302301      this.lvUserControl.AllowDrop = true;
    303302      this.lvUserControl.Dock = System.Windows.Forms.DockStyle.Fill;
    304       this.lvUserControl.LargeImageList = this.imageList2;
     303      this.lvUserControl.LargeImageList = this.ilUserControl;
    305304      this.lvUserControl.Location = new System.Drawing.Point(0, 0);
    306305      this.lvUserControl.Name = "lvUserControl";
    … …  
    309308      this.lvUserControl.UseCompatibleStateImageBehavior = false;
    310309      //
    311       // imageList2
    312       //
    313       this.imageList2.ImageStream = ((System.Windows.Forms.ImageListStreamer)(resources.GetObject("imageList2.ImageStream")));
    314       this.imageList2.TransparentColor = System.Drawing.Color.Transparent;
    315       this.imageList2.Images.SetKeyName(0, "Users.png");
     310      // ilUserControl
     311      //
     312      this.ilUserControl.ImageStream = ((System.Windows.Forms.ImageListStreamer)(resources.GetObject("ilUserControl.ImageStream")));
     313      this.ilUserControl.TransparentColor = System.Drawing.Color.Transparent;
     314      this.ilUserControl.Images.SetKeyName(0, "Users.png");
    316315      //
    317316      // treeView2
    … …  
    332331      this.listView2.TabIndex = 0;
    333332      this.listView2.UseCompatibleStateImageBehavior = false;
    334       //
    335       // directorySearcher1
    336       //
    337       this.directorySearcher1.ClientTimeout = System.TimeSpan.Parse("-00:00:01");
    338       this.directorySearcher1.ServerPageTimeLimit = System.TimeSpan.Parse("-00:00:01");
    339       this.directorySearcher1.ServerTimeLimit = System.TimeSpan.Parse("-00:00:01");
    340333      //
    341334      // timerSyncronize
    … …  
    394387    private System.Windows.Forms.TreeView tvUserControl;
    395388    private System.Windows.Forms.ListView lvUserControl;
    396     private System.Windows.Forms.ImageList imageList1;
     389    private System.Windows.Forms.ImageList ilClientControl;
    397390    private System.Windows.Forms.ToolStripMenuItem addToolStripMenuItem;
    398391    private System.Windows.Forms.ToolStripMenuItem jobToolStripMenuItem;
    … …  
    400393    private System.Windows.Forms.ToolStripMenuItem userToolStripMenuItem1;
    401394    private System.Windows.Forms.ToolStripMenuItem groupToolStripMenuItem2;
    402     private System.Windows.Forms.ImageList imageList2;
    403     private System.DirectoryServices.DirectorySearcher directorySearcher1;
     395    private System.Windows.Forms.ImageList ilUserControl;
    404396    private System.Windows.Forms.Timer timerSyncronize;
    405     private System.Windows.Forms.ImageList imageList3;
     397    private System.Windows.Forms.ImageList ilJobControl;
    406398  }
    407399}

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

    r1030 r1037  
    4848    public HiveServerManagementConsole() {
    4949      InitializeComponent();
    50       addClients();
    51       addJobs();
    52       addUsers();
    53 
    54       timerSyncronize.Tick += new EventHandler(tickSync);
     50      AddClients();
     51      AddJobs();
     52      AddUsers();
     53
     54      timerSyncronize.Tick += new EventHandler(TickSync);
    5555      timerSyncronize.Start();
    5656    }
    5757
    58     private void tickSync(object obj, EventArgs e) {
    59       addClients();
    60       addJobs();
    61       addUsers();
    62     }
    63 
    64     private void addClients() {
     58    private void TickSync(object obj, EventArgs e) {
     59      AddClients();
     60      AddJobs();
     61      AddUsers();
     62    }
     63
     64    private void AddClients() {
    6565      try {
    6666        IClientManager clientManager =
    … …  
    9898    }
    9999
    100     private void addJobs() {
     100    private void AddJobs() {
    101101      try {
    102102        IJobManager jobManager =
    … …  
    107107        tvJobControl.Nodes.Clear();
    108108
     109        ListViewGroup lvJobCalculating = new ListViewGroup("calculating", HorizontalAlignment.Left);
    109110        ListViewGroup lvJobFinished = new ListViewGroup("finished", HorizontalAlignment.Left);
    110         ListViewGroup lvJobOffline = new ListViewGroup("offline", HorizontalAlignment.Left);
    111         ListViewGroup lvJobCalculating = new ListViewGroup("calculating", HorizontalAlignment.Left);
     111        ListViewGroup lvJobPending = new ListViewGroup("pending", HorizontalAlignment.Left);
     112        tvJobControl.Nodes.Add("calculating");
    112113        tvJobControl.Nodes.Add("finished");
    113         tvJobControl.Nodes.Add("offline");
    114         tvJobControl.Nodes.Add("calculating");
     114        tvJobControl.Nodes.Add("pending");
    115115        foreach (Job job in jobs.List) {
    116           if (job.State == State.finished) {
     116          if (job.State == State.calculating) {
    117117            tvJobControl.Nodes[0].Nodes.Add(job.Id.ToString());
     118            lvJobControl.Items.Add(new ListViewItem(job.Id.ToString(), 0, lvJobCalculating));
     119          } else if (job.State == State.finished) {
     120            tvJobControl.Nodes[1].Nodes.Add(job.Id.ToString());
    118121            lvJobControl.Items.Add(new ListViewItem(job.Id.ToString(), 0, lvJobFinished));
    119122          } 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) {
    123123            tvJobControl.Nodes[2].Nodes.Add(job.Id.ToString());
    124             lvJobControl.Items.Add(new ListViewItem(job.Id.ToString(), 0, lvJobCalculating));
     124            lvJobControl.Items.Add(new ListViewItem(job.Id.ToString(), 0, lvJobPending));
    125125          }
    126126        } // Jobs
     127        lvJobControl.Groups.Add(lvJobCalculating);
    127128        lvJobControl.Groups.Add(lvJobFinished);
    128         lvJobControl.Groups.Add(lvJobOffline);
    129         lvJobControl.Groups.Add(lvJobCalculating);
     129        lvJobControl.Groups.Add(lvJobPending);
    130130      }
    131131      catch (Exception ex) {
    … …  
    135135    }
    136136
    137     private void addUsers() {
     137    private void AddUsers() {
    138138      try {
    139139        IUserRoleManager userRoleManager =
    … …  
    179179    /// <param name="sender"></param>
    180180    /// <param name="e"></param>
    181     private void close_Click(object sender, EventArgs e) {
     181    private void Close_Click(object sender, EventArgs e) {
    182182      if (closeFormEvent != null) {
    183183        closeFormEvent(true, false);
    … …  
    198198    }
    199199
    200     private void jobToolStripMenuItem1_Click(object sender, EventArgs e) {
     200    private void JobToolStripMenuItem1_Click(object sender, EventArgs e) {
    201201      AddJobForm newForm = new AddJobForm();
    202202      newForm.Show();
    203203    }
    204204
    205     private void userToolStripMenuItem1_Click(object sender, EventArgs e) {
     205    private void UserToolStripMenuItem1_Click(object sender, EventArgs e) {
    206206      AddUserForm newForm = new AddUserForm("User", false);
    207207      newForm.Show();
    208208    }
    209209
    210     private void groupToolStripMenuItem2_Click(object sender, EventArgs e) {
     210    private void GroupToolStripMenuItem2_Click(object sender, EventArgs e) {
    211211      AddUserForm newForm = new AddUserForm("User", true);
    212212      newForm.Show();

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

    r1030 r1037  
    121121    <value>32, 12</value>
    122122  </metadata>
    123   <metadata name="imageList1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     123  <metadata name="ilJobControl.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     124    <value>471, 13</value>
     125  </metadata>
     126  <data name="ilJobControl.ImageStream" mimetype="application/x-microsoft.net.object.binary.base64">
     127    <value>
     128        AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj0yLjAuMC4w
     129        LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0
     130        ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAAAG
     131        CQAAAk1TRnQBSQFMAwEBAAEEAQABBAEAASABAAEgAQAE/wEJAQAI/wFCAU0BNgEEBgABNgEEAgABKAMA
     132        AYADAAEgAwABAQEAAQgGAAEQGAABgAIAAYADAAKAAQABgAMAAYABAAGAAQACgAIAA8ABAAHAAdwBwAEA
     133        AfABygGmAQABMwUAATMBAAEzAQABMwEAAjMCAAMWAQADHAEAAyIBAAMpAQADVQEAA00BAANCAQADOQEA
     134        AYABfAH/AQACUAH/AQABkwEAAdYBAAH/AewBzAEAAcYB1gHvAQAB1gLnAQABkAGpAa0CAAH/ATMDAAFm
     135        AwABmQMAAcwCAAEzAwACMwIAATMBZgIAATMBmQIAATMBzAIAATMB/wIAAWYDAAFmATMCAAJmAgABZgGZ
     136        AgABZgHMAgABZgH/AgABmQMAAZkBMwIAAZkBZgIAApkCAAGZAcwCAAGZAf8CAAHMAwABzAEzAgABzAFm
     137        AgABzAGZAgACzAIAAcwB/wIAAf8BZgIAAf8BmQIAAf8BzAEAATMB/wIAAf8BAAEzAQABMwEAAWYBAAEz
     138        AQABmQEAATMBAAHMAQABMwEAAf8BAAH/ATMCAAMzAQACMwFmAQACMwGZAQACMwHMAQACMwH/AQABMwFm
     139        AgABMwFmATMBAAEzAmYBAAEzAWYBmQEAATMBZgHMAQABMwFmAf8BAAEzAZkCAAEzAZkBMwEAATMBmQFm
     140        AQABMwKZAQABMwGZAcwBAAEzAZkB/wEAATMBzAIAATMBzAEzAQABMwHMAWYBAAEzAcwBmQEAATMCzAEA
     141        ATMBzAH/AQABMwH/ATMBAAEzAf8BZgEAATMB/wGZAQABMwH/AcwBAAEzAv8BAAFmAwABZgEAATMBAAFm
     142        AQABZgEAAWYBAAGZAQABZgEAAcwBAAFmAQAB/wEAAWYBMwIAAWYCMwEAAWYBMwFmAQABZgEzAZkBAAFm
     143        ATMBzAEAAWYBMwH/AQACZgIAAmYBMwEAA2YBAAJmAZkBAAJmAcwBAAFmAZkCAAFmAZkBMwEAAWYBmQFm
     144        AQABZgKZAQABZgGZAcwBAAFmAZkB/wEAAWYBzAIAAWYBzAEzAQABZgHMAZkBAAFmAswBAAFmAcwB/wEA
     145        AWYB/wIAAWYB/wEzAQABZgH/AZkBAAFmAf8BzAEAAcwBAAH/AQAB/wEAAcwBAAKZAgABmQEzAZkBAAGZ
     146        AQABmQEAAZkBAAHMAQABmQMAAZkCMwEAAZkBAAFmAQABmQEzAcwBAAGZAQAB/wEAAZkBZgIAAZkBZgEz
     147        AQABmQEzAWYBAAGZAWYBmQEAAZkBZgHMAQABmQEzAf8BAAKZATMBAAKZAWYBAAOZAQACmQHMAQACmQH/
     148        AQABmQHMAgABmQHMATMBAAFmAcwBZgEAAZkBzAGZAQABmQLMAQABmQHMAf8BAAGZAf8CAAGZAf8BMwEA
     149        AZkBzAFmAQABmQH/AZkBAAGZAf8BzAEAAZkC/wEAAcwDAAGZAQABMwEAAcwBAAFmAQABzAEAAZkBAAHM
     150        AQABzAEAAZkBMwIAAcwCMwEAAcwBMwFmAQABzAEzAZkBAAHMATMBzAEAAcwBMwH/AQABzAFmAgABzAFm
     151        ATMBAAGZAmYBAAHMAWYBmQEAAcwBZgHMAQABmQFmAf8BAAHMAZkCAAHMAZkBMwEAAcwBmQFmAQABzAKZ
     152        AQABzAGZAcwBAAHMAZkB/wEAAswCAALMATMBAALMAWYBAALMAZkBAAPMAQACzAH/AQABzAH/AgABzAH/
     153        ATMBAAGZAf8BZgEAAcwB/wGZAQABzAH/AcwBAAHMAv8BAAHMAQABMwEAAf8BAAFmAQAB/wEAAZkBAAHM
     154        ATMCAAH/AjMBAAH/ATMBZgEAAf8BMwGZAQAB/wEzAcwBAAH/ATMB/wEAAf8BZgIAAf8BZgEzAQABzAJm
     155        AQAB/wFmAZkBAAH/AWYBzAEAAcwBZgH/AQAB/wGZAgAB/wGZATMBAAH/AZkBZgEAAf8CmQEAAf8BmQHM
     156        AQAB/wGZAf8BAAH/AcwCAAH/AcwBMwEAAf8BzAFmAQAB/wHMAZkBAAH/AswBAAH/AcwB/wEAAv8BMwEA
     157        AcwB/wFmAQAC/wGZAQAC/wHMAQACZgH/AQABZgH/AWYBAAFmAv8BAAH/AmYBAAH/AWYB/wEAAv8BZgEA
     158        ASEBAAGlAQADXwEAA3cBAAOGAQADlgEAA8sBAAOyAQAD1wEAA90BAAPjAQAD6gEAA/EBAAP4AQAB8AH7
     159        Af8BAAGkAqABAAOAAwAB/wIAAf8DAAL/AQAB/wMAAf8BAAH/AQAC/wIAA/8BAB9fAYV/AAFffwABX38A
     160        AV9pAAEOASEBDhMAAV9pAAEhAUkBIRMAAV9pAAEhAigBIQEOEQABX2kAASEBJwEoAUkBIREAAV9pAAEh
     161        BCgBIQEODwABX2kAASEBKAInASgBSQEhDwABX2kAASEGKAEhAQ4NAAFfaQABIQNJASgBJwEoAUkBIQ0A
     162        AV9pAAEhBEkEKAEhAQ4LAAFfaQABIQJJAU8CSQEoAScBKAFJASELAAFfaQABEAFJA08CSQQoASEBDgkA
     163        AV9pAAEQAUkBTwFyAk8CSQEoAScBKAFJASEJAAFfaQABEQJPAXIBUAJPAkkEKAEhAQ4HAAFfaQABEQFP
     164        AVABlwJyAk8CSQMoAUkBIQcAAV9pAAERAU8BcgOXAVACTwFJAk8BSQEhAQ4HAAFfaQABQwFPAXIElwFy
     165        AU8BSQFQAZcBSQkAAV9pAAFDAVABcgGXAXgBmAFyAU8CUAJJARAJAAFfaQABQwFQAXIBlwGYAQgBcgFJ
     166        AVABlwFJCwABX2kAARUBUAGXAZgBeAJyAVACSQEQCwABX2kAARUBcgF4AQgBcgFJAVABlwFJDQABX2kA
     167        ARUEcgFQAkkBEA0AAV9pAAEVAXIBTwFJAVABlwFJDwABX2kAARUCcgFQAkkBEA8AAV9pAAEVAnIBlwFJ
     168        EQABX2kAAUkBcgFQAUkBEBEAAV9pAAFJAZcBSRMAAV9pAAEQAUkBEBMAAV9/AAFfYAABQgFNAT4HAAE+
     169        AwABKAMAAYADAAEgAwABAQEAAQEGAAECFgAD//8A/wADAAs=
     170</value>
     171  </data>
     172  <metadata name="ilClientControl.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
    124173    <value>129, 12</value>
    125174  </metadata>
    126   <data name="imageList1.ImageStream" mimetype="application/x-microsoft.net.object.binary.base64">
     175  <data name="ilClientControl.ImageStream" mimetype="application/x-microsoft.net.object.binary.base64">
    127176    <value>
    128177        AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj0yLjAuMC4w
    … …  
    215264</value>
    216265  </data>
    217   <metadata name="imageList3.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
    218     <value>587, 13</value>
    219   </metadata>
    220   <data name="imageList3.ImageStream" mimetype="application/x-microsoft.net.object.binary.base64">
    221     <value>
    222         AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj0yLjAuMC4w
    223         LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0
    224         ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAAAG
    225         CQAAAk1TRnQBSQFMAwEBAAEEAQABBAEAASABAAEgAQAE/wEJAQAI/wFCAU0BNgEEBgABNgEEAgABKAMA
    226         AYADAAEgAwABAQEAAQgGAAEQGAABgAIAAYADAAKAAQABgAMAAYABAAGAAQACgAIAA8ABAAHAAdwBwAEA
    227         AfABygGmAQABMwUAATMBAAEzAQABMwEAAjMCAAMWAQADHAEAAyIBAAMpAQADVQEAA00BAANCAQADOQEA
    228         AYABfAH/AQACUAH/AQABkwEAAdYBAAH/AewBzAEAAcYB1gHvAQAB1gLnAQABkAGpAa0CAAH/ATMDAAFm
    229         AwABmQMAAcwCAAEzAwACMwIAATMBZgIAATMBmQIAATMBzAIAATMB/wIAAWYDAAFmATMCAAJmAgABZgGZ
    230         AgABZgHMAgABZgH/AgABmQMAAZkBMwIAAZkBZgIAApkCAAGZAcwCAAGZAf8CAAHMAwABzAEzAgABzAFm
    231         AgABzAGZAgACzAIAAcwB/wIAAf8BZgIAAf8BmQIAAf8BzAEAATMB/wIAAf8BAAEzAQABMwEAAWYBAAEz
    232         AQABmQEAATMBAAHMAQABMwEAAf8BAAH/ATMCAAMzAQACMwFmAQACMwGZAQACMwHMAQACMwH/AQABMwFm
    233         AgABMwFmATMBAAEzAmYBAAEzAWYBmQEAATMBZgHMAQABMwFmAf8BAAEzAZkCAAEzAZkBMwEAATMBmQFm
    234         AQABMwKZAQABMwGZAcwBAAEzAZkB/wEAATMBzAIAATMBzAEzAQABMwHMAWYBAAEzAcwBmQEAATMCzAEA
    235         ATMBzAH/AQABMwH/ATMBAAEzAf8BZgEAATMB/wGZAQABMwH/AcwBAAEzAv8BAAFmAwABZgEAATMBAAFm
    236         AQABZgEAAWYBAAGZAQABZgEAAcwBAAFmAQAB/wEAAWYBMwIAAWYCMwEAAWYBMwFmAQABZgEzAZkBAAFm
    237         ATMBzAEAAWYBMwH/AQACZgIAAmYBMwEAA2YBAAJmAZkBAAJmAcwBAAFmAZkCAAFmAZkBMwEAAWYBmQFm
    238         AQABZgKZAQABZgGZAcwBAAFmAZkB/wEAAWYBzAIAAWYBzAEzAQABZgHMAZkBAAFmAswBAAFmAcwB/wEA
    239         AWYB/wIAAWYB/wEzAQABZgH/AZkBAAFmAf8BzAEAAcwBAAH/AQAB/wEAAcwBAAKZAgABmQEzAZkBAAGZ
    240         AQABmQEAAZkBAAHMAQABmQMAAZkCMwEAAZkBAAFmAQABmQEzAcwBAAGZAQAB/wEAAZkBZgIAAZkBZgEz
    241         AQABmQEzAWYBAAGZAWYBmQEAAZkBZgHMAQABmQEzAf8BAAKZATMBAAKZAWYBAAOZAQACmQHMAQACmQH/
    242         AQABmQHMAgABmQHMATMBAAFmAcwBZgEAAZkBzAGZAQABmQLMAQABmQHMAf8BAAGZAf8CAAGZAf8BMwEA
    243         AZkBzAFmAQABmQH/AZkBAAGZAf8BzAEAAZkC/wEAAcwDAAGZAQABMwEAAcwBAAFmAQABzAEAAZkBAAHM
    244         AQABzAEAAZkBMwIAAcwCMwEAAcwBMwFmAQABzAEzAZkBAAHMATMBzAEAAcwBMwH/AQABzAFmAgABzAFm
    245         ATMBAAGZAmYBAAHMAWYBmQEAAcwBZgHMAQABmQFmAf8BAAHMAZkCAAHMAZkBMwEAAcwBmQFmAQABzAKZ
    246         AQABzAGZAcwBAAHMAZkB/wEAAswCAALMATMBAALMAWYBAALMAZkBAAPMAQACzAH/AQABzAH/AgABzAH/
    247         ATMBAAGZAf8BZgEAAcwB/wGZAQABzAH/AcwBAAHMAv8BAAHMAQABMwEAAf8BAAFmAQAB/wEAAZkBAAHM
    248         ATMCAAH/AjMBAAH/ATMBZgEAAf8BMwGZAQAB/wEzAcwBAAH/ATMB/wEAAf8BZgIAAf8BZgEzAQABzAJm
    249         AQAB/wFmAZkBAAH/AWYBzAEAAcwBZgH/AQAB/wGZAgAB/wGZATMBAAH/AZkBZgEAAf8CmQEAAf8BmQHM
    250         AQAB/wGZAf8BAAH/AcwCAAH/AcwBMwEAAf8BzAFmAQAB/wHMAZkBAAH/AswBAAH/AcwB/wEAAv8BMwEA
    251         AcwB/wFmAQAC/wGZAQAC/wHMAQACZgH/AQABZgH/AWYBAAFmAv8BAAH/AmYBAAH/AWYB/wEAAv8BZgEA
    252         ASEBAAGlAQADXwEAA3cBAAOGAQADlgEAA8sBAAOyAQAD1wEAA90BAAPjAQAD6gEAA/EBAAP4AQAB8AH7
    253         Af8BAAGkAqABAAOAAwAB/wIAAf8DAAL/AQAB/wMAAf8BAAH/AQAC/wIAA/8BAB9fAYV/AAFffwABX38A
    254         AV9pAAEOASEBDhMAAV9pAAEhAUkBIRMAAV9pAAEhAigBIQEOEQABX2kAASEBJwEoAUkBIREAAV9pAAEh
    255         BCgBIQEODwABX2kAASEBKAInASgBSQEhDwABX2kAASEGKAEhAQ4NAAFfaQABIQNJASgBJwEoAUkBIQ0A
    256         AV9pAAEhBEkEKAEhAQ4LAAFfaQABIQJJAU8CSQEoAScBKAFJASELAAFfaQABEAFJA08CSQQoASEBDgkA
    257         AV9pAAEQAUkBTwFyAk8CSQEoAScBKAFJASEJAAFfaQABEQJPAXIBUAJPAkkEKAEhAQ4HAAFfaQABEQFP
    258         AVABlwJyAk8CSQMoAUkBIQcAAV9pAAERAU8BcgOXAVACTwFJAk8BSQEhAQ4HAAFfaQABQwFPAXIElwFy
    259         AU8BSQFQAZcBSQkAAV9pAAFDAVABcgGXAXgBmAFyAU8CUAJJARAJAAFfaQABQwFQAXIBlwGYAQgBcgFJ
    260         AVABlwFJCwABX2kAARUBUAGXAZgBeAJyAVACSQEQCwABX2kAARUBcgF4AQgBcgFJAVABlwFJDQABX2kA
    261         ARUEcgFQAkkBEA0AAV9pAAEVAXIBTwFJAVABlwFJDwABX2kAARUCcgFQAkkBEA8AAV9pAAEVAnIBlwFJ
    262         EQABX2kAAUkBcgFQAUkBEBEAAV9pAAFJAZcBSRMAAV9pAAEQAUkBEBMAAV9/AAFfYAABQgFNAT4HAAE+
    263         AwABKAMAAYADAAEgAwABAQEAAQEGAAECFgAD//8A/wADAAs=
    264 </value>
    265   </data>
    266   <metadata name="imageList2.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     266  <metadata name="ilUserControl.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
    267267    <value>231, 9</value>
    268268  </metadata>
    269   <data name="imageList2.ImageStream" mimetype="application/x-microsoft.net.object.binary.base64">
     269  <data name="ilUserControl.ImageStream" mimetype="application/x-microsoft.net.object.binary.base64">
    270270    <value>
    271271        AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj0yLjAuMC4w
    … …  
    343343</value>
    344344  </data>
    345   <metadata name="directorySearcher1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
    346     <value>333, 11</value>
    347   </metadata>
    348345  <metadata name="timerSyncronize.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
    349     <value>464, 11</value>
     346    <value>341, 9</value>
    350347  </metadata>
    351348</root>
Note: See TracChangeset for help on using the changeset viewer.