Changeset 6791 for branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive.ExperimentManager

Timestamp:

09/16/11 20:19:53 (13 years ago)

Author:

ascheibe

Message:

#1233 implemented Experiment Manager review comments

Location:

branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive.ExperimentManager/3.3/Views

Files:

• HiveExperimentPermissionListView.cs (modified) (1 diff)
• HiveExperimentPermissionView.Designer.cs (modified) (3 diffs)
• HiveExperimentPermissionView.resx (modified) (1 diff)
• RefreshableHiveExperimentListView.cs (modified) (3 diffs)
• RefreshableHiveExperimentView.Designer.cs (modified) (19 diffs)
• RefreshableHiveExperimentView.cs (modified) (5 diffs)

branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive.ExperimentManager/3.3/Views/HiveExperimentPermissionListView.cs

@@ -34 +34 @@
       get { return hiveExperimentId; }
       set { hiveExperimentId = value; }
-    }    
+    }
 
     public HiveExperimentPermissionListView() {
       InitializeComponent();
+      itemsGroupBox.Text = "Permissions";
     }
 

branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive.ExperimentManager/3.3/Views/HiveExperimentPermissionView.Designer.cs

@@ -48 +48 @@
       this.permissionLabel.Location = new System.Drawing.Point(4, 57);
       this.permissionLabel.Name = "permissionLabel";
-      this.permissionLabel.Size = new System.Drawing.Size(57, 13);
+      this.permissionLabel.Size = new System.Drawing.Size(60, 13);
       this.permissionLabel.TabIndex = 2;
-      this.permissionLabel.Text = "Permission";
+      this.permissionLabel.Text = "Permission:";
       // 
       // usernameTextBox
@@ -56 +56 @@
       this.usernameTextBox.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
                   | System.Windows.Forms.AnchorStyles.Right)));
-      this.usernameTextBox.Location = new System.Drawing.Point(67, 28);
+      this.usernameTextBox.Location = new System.Drawing.Point(70, 28);
       this.usernameTextBox.Name = "usernameTextBox";
-      this.usernameTextBox.Size = new System.Drawing.Size(284, 20);
+      this.usernameTextBox.Size = new System.Drawing.Size(281, 20);
       this.usernameTextBox.TabIndex = 3;
       this.usernameTextBox.Validated += new System.EventHandler(this.usernameTextBox_Validated);
-      this.usernameTextBox.Validating += new System.ComponentModel.CancelEventHandler(usernameTextBox_Validating);
       // 
       // permissionComboBox
@@ -67 +66 @@
       this.permissionComboBox.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
                   | System.Windows.Forms.AnchorStyles.Right)));
+      this.permissionComboBox.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
       this.permissionComboBox.FormattingEnabled = true;
-      this.permissionComboBox.Location = new System.Drawing.Point(67, 54);
+      this.permissionComboBox.Location = new System.Drawing.Point(70, 54);
       this.permissionComboBox.Name = "permissionComboBox";
-      this.permissionComboBox.Size = new System.Drawing.Size(284, 21);
-      this.permissionComboBox.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
+      this.permissionComboBox.Size = new System.Drawing.Size(281, 21);
       this.permissionComboBox.TabIndex = 4;
       this.permissionComboBox.Validated += new System.EventHandler(this.permissionComboBox_Validated);
-      this.permissionComboBox.Validating += new System.ComponentModel.CancelEventHandler(permissionComboBox_Validating);
       // 
       // HiveExperimentPermissionView

branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive.ExperimentManager/3.3/Views/HiveExperimentPermissionView.resx

@@ -121 +121 @@
     <value>17, 17</value>
   </metadata>
-  <metadata name="toolTip.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>17, 17</value>
-  </metadata>
 </root>

branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive.ExperimentManager/3.3/Views/RefreshableHiveExperimentListView.cs

@@ -22 +22 @@
 using System;
 using System.Windows.Forms;
+using HeuristicLab.Collections;
 using HeuristicLab.Core;
-using HeuristicLab.Core.Views;
 using HeuristicLab.MainForm;
 
@@ -29 +29 @@
   [View("HiveExperimentList View")]
   [Content(typeof(ItemCollection<RefreshableJob>), false)]
-  public partial class RefreshableHiveExperimentListView : ItemCollectionView<RefreshableJob> {
+  public partial class RefreshableHiveExperimentListView : HeuristicLab.Core.Views.ItemCollectionView<RefreshableJob> {
 
     public RefreshableHiveExperimentListView() {
       InitializeComponent();
+      itemsGroupBox.Text = "Jobs";
       this.itemsListView.View = View.Details;
       this.itemsListView.Columns.Clear();
       this.itemsListView.Columns.Add(new ColumnHeader("Date") { Text = "Date" });
       this.itemsListView.Columns.Add(new ColumnHeader("Name") { Text = "Name" });
+      foreach (ColumnHeader c in this.itemsListView.Columns) {
+        c.AutoResize(ColumnHeaderAutoResizeStyle.HeaderSize);
+      }
       this.itemsListView.HeaderStyle = ColumnHeaderStyle.Clickable;
       this.itemsListView.FullRowSelect = true;
@@ -56 +60 @@
     protected override void Content_ItemsAdded(object sender, Collections.CollectionItemsChangedEventArgs<RefreshableJob> e) {
       base.Content_ItemsAdded(sender, e);
+      foreach (ColumnHeader c in this.itemsListView.Columns) {
+        c.AutoResize(ColumnHeaderAutoResizeStyle.ColumnContent);
+      }
+    }
 
+    protected override void Content_ItemsRemoved(object sender, CollectionItemsChangedEventArgs<RefreshableJob> e) {
+      base.Content_ItemsRemoved(sender, e);
+      if (Content != null && Content.Count == 0) {
+        foreach (ColumnHeader c in this.itemsListView.Columns) {
+          c.AutoResize(ColumnHeaderAutoResizeStyle.HeaderSize);
+        }
+      }
     }
 

branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive.ExperimentManager/3.3/Views/RefreshableHiveExperimentView.Designer.cs

@@ -1 @@
-#region License Information
-/* HeuristicLab
- * Copyright (C) 2002-2011 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
- *
- * This file is part of HeuristicLab.
- *
- * HeuristicLab is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * HeuristicLab is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with HeuristicLab. If not, see <http://www.gnu.org/licenses/>.
- */
-#endregion
-
-using HeuristicLab.Clients.Hive.Views.ExperimentManager;
-using HeuristicLab.MainForm.WindowsForms;
-namespace HeuristicLab.Clients.Hive.ExperimentManager.Views {
+namespace HeuristicLab.Clients.Hive.ExperimentManager.Views {
   partial class RefreshableHiveExperimentView {
     /// <summary> 
@@ -50 +27 @@
       System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(RefreshableHiveExperimentView));
       this.tabControl = new System.Windows.Forms.TabControl();
-      this.jobsTabPage = new System.Windows.Forms.TabPage();
+      this.tasksTabPage = new System.Windows.Forms.TabPage();
       this.jobsTreeView = new HeuristicLab.Clients.Hive.Views.ExperimentManager.HiveTaskItemTreeView();
+      this.permissionTabPage = new System.Windows.Forms.TabPage();
+      this.refreshPermissionsButton = new System.Windows.Forms.Button();
+      this.hiveExperimentPermissionListView = new HeuristicLab.Clients.Hive.ExperimentManager.Views.HiveExperimentPermissionListView();
+      this.runsTabPage = new System.Windows.Forms.TabPage();
       this.stateTabPage = new System.Windows.Forms.TabPage();
       this.stateLogViewHost = new HeuristicLab.MainForm.WindowsForms.ViewHost();
-      this.sharingTabPage = new System.Windows.Forms.TabPage();
-      this.refreshPermissionsButton = new System.Windows.Forms.Button();
-      this.hiveExperimentPermissionListView = new HeuristicLab.Clients.Hive.ExperimentManager.Views.HiveExperimentPermissionListView();
       this.logTabPage = new System.Windows.Forms.TabPage();
       this.logView = new HeuristicLab.Core.Views.LogView();
@@ -81 +59 @@
       this.jobsLabel = new System.Windows.Forms.Label();
       this.tabControl.SuspendLayout();
-      this.jobsTabPage.SuspendLayout();
+      this.tasksTabPage.SuspendLayout();
+      this.permissionTabPage.SuspendLayout();
       this.stateTabPage.SuspendLayout();
-      this.sharingTabPage.SuspendLayout();
       this.logTabPage.SuspendLayout();
       this.infoGroupBox.SuspendLayout();
@@ -93 +71 @@
                   | System.Windows.Forms.AnchorStyles.Left)
                   | System.Windows.Forms.AnchorStyles.Right)));
-      this.tabControl.Controls.Add(this.jobsTabPage);
+      this.tabControl.Controls.Add(this.tasksTabPage);
+      this.tabControl.Controls.Add(this.permissionTabPage);
+      this.tabControl.Controls.Add(this.runsTabPage);
       this.tabControl.Controls.Add(this.stateTabPage);
-      this.tabControl.Controls.Add(this.sharingTabPage);
       this.tabControl.Controls.Add(this.logTabPage);
       this.tabControl.Location = new System.Drawing.Point(0, 78);
@@ -104 +83 @@
       this.tabControl.SelectedIndexChanged += new System.EventHandler(this.tabControl_SelectedIndexChanged);
       // 
-      // jobsTabPage
-      // 
-      this.jobsTabPage.Controls.Add(this.jobsTreeView);
-      this.jobsTabPage.Location = new System.Drawing.Point(4, 22);
-      this.jobsTabPage.Name = "jobsTabPage";
-      this.jobsTabPage.Size = new System.Drawing.Size(709, 426);
-      this.jobsTabPage.TabIndex = 5;
-      this.jobsTabPage.Text = "Jobs";
-      this.jobsTabPage.UseVisualStyleBackColor = true;
+      // tasksTabPage
+      // 
+      this.tasksTabPage.Controls.Add(this.jobsTreeView);
+      this.tasksTabPage.Location = new System.Drawing.Point(4, 22);
+      this.tasksTabPage.Name = "tasksTabPage";
+      this.tasksTabPage.Size = new System.Drawing.Size(709, 426);
+      this.tasksTabPage.TabIndex = 5;
+      this.tasksTabPage.Text = "Tasks";
+      this.tasksTabPage.UseVisualStyleBackColor = true;
       // 
       // jobsTreeView
@@ -131 +110 @@
       this.jobsTreeView.DragOver += new System.Windows.Forms.DragEventHandler(this.jobsTreeView_DragOver);
       // 
-      // stateTabPage
-      // 
-      this.stateTabPage.Controls.Add(this.stateLogViewHost);
-      this.stateTabPage.Location = new System.Drawing.Point(4, 22);
-      this.stateTabPage.Name = "stateTabPage";
-      this.stateTabPage.Size = new System.Drawing.Size(709, 426);
-      this.stateTabPage.TabIndex = 6;
-      this.stateTabPage.Text = "States";
-      this.stateTabPage.UseVisualStyleBackColor = true;
-      // 
-      // stateLogViewHost
-      // 
-      this.stateLogViewHost.Caption = "StateLog View";
-      this.stateLogViewHost.Content = null;
-      this.stateLogViewHost.Dock = System.Windows.Forms.DockStyle.Fill;
-      this.stateLogViewHost.Enabled = false;
-      this.stateLogViewHost.Location = new System.Drawing.Point(0, 0);
-      this.stateLogViewHost.Name = "stateLogViewHost";
-      this.stateLogViewHost.ReadOnly = false;
-      this.stateLogViewHost.Size = new System.Drawing.Size(709, 426);
-      this.stateLogViewHost.TabIndex = 0;
-      this.stateLogViewHost.ViewsLabelVisible = true;
-      this.stateLogViewHost.ViewType = null;
-      // 
-      // sharingTabPage
-      // 
-      this.sharingTabPage.Controls.Add(this.refreshPermissionsButton);
-      this.sharingTabPage.Controls.Add(this.hiveExperimentPermissionListView);
-      this.sharingTabPage.Location = new System.Drawing.Point(4, 22);
-      this.sharingTabPage.Name = "sharingTabPage";
-      this.sharingTabPage.Size = new System.Drawing.Size(709, 426);
-      this.sharingTabPage.TabIndex = 7;
-      this.sharingTabPage.Text = "Sharing";
-      this.sharingTabPage.UseVisualStyleBackColor = true;
+      // permissionTabPage
+      // 
+      this.permissionTabPage.Controls.Add(this.refreshPermissionsButton);
+      this.permissionTabPage.Controls.Add(this.hiveExperimentPermissionListView);
+      this.permissionTabPage.Location = new System.Drawing.Point(4, 22);
+      this.permissionTabPage.Name = "permissionTabPage";
+      this.permissionTabPage.Size = new System.Drawing.Size(709, 426);
+      this.permissionTabPage.TabIndex = 7;
+      this.permissionTabPage.Text = "Permissions";
+      this.permissionTabPage.UseVisualStyleBackColor = true;
       // 
       // refreshPermissionsButton
@@ -188 +143 @@
       this.hiveExperimentPermissionListView.Name = "hiveExperimentPermissionListView";
       this.hiveExperimentPermissionListView.ReadOnly = false;
+      this.hiveExperimentPermissionListView.ShowDetails = true;
       this.hiveExperimentPermissionListView.Size = new System.Drawing.Size(703, 390);
       this.hiveExperimentPermissionListView.TabIndex = 0;
+      // 
+      // runsTabPage
+      // 
+      this.runsTabPage.Location = new System.Drawing.Point(4, 22);
+      this.runsTabPage.Name = "runsTabPage";
+      this.runsTabPage.Padding = new System.Windows.Forms.Padding(3);
+      this.runsTabPage.Size = new System.Drawing.Size(709, 426);
+      this.runsTabPage.TabIndex = 8;
+      this.runsTabPage.Text = "Runs";
+      this.runsTabPage.UseVisualStyleBackColor = true;
+      // 
+      // stateTabPage
+      // 
+      this.stateTabPage.Controls.Add(this.stateLogViewHost);
+      this.stateTabPage.Location = new System.Drawing.Point(4, 22);
+      this.stateTabPage.Name = "stateTabPage";
+      this.stateTabPage.Size = new System.Drawing.Size(709, 426);
+      this.stateTabPage.TabIndex = 6;
+      this.stateTabPage.Text = "Execution History";
+      this.stateTabPage.UseVisualStyleBackColor = true;
+      // 
+      // stateLogViewHost
+      // 
+      this.stateLogViewHost.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
+                  | System.Windows.Forms.AnchorStyles.Left)
+                  | System.Windows.Forms.AnchorStyles.Right)));
+      this.stateLogViewHost.Caption = "StateLog View";
+      this.stateLogViewHost.Content = null;
+      this.stateLogViewHost.Enabled = false;
+      this.stateLogViewHost.Location = new System.Drawing.Point(3, 3);
+      this.stateLogViewHost.Name = "stateLogViewHost";
+      this.stateLogViewHost.ReadOnly = false;
+      this.stateLogViewHost.Size = new System.Drawing.Size(703, 420);
+      this.stateLogViewHost.TabIndex = 0;
+      this.stateLogViewHost.ViewsLabelVisible = true;
+      this.stateLogViewHost.ViewType = null;
       // 
       // logTabPage
@@ -203 +195 @@
       // logView
       // 
+      this.logView.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
+                  | System.Windows.Forms.AnchorStyles.Left)
+                  | System.Windows.Forms.AnchorStyles.Right)));
       this.logView.Caption = "Log View";
       this.logView.Content = null;
-      this.logView.Dock = System.Windows.Forms.DockStyle.Fill;
-      this.logView.Location = new System.Drawing.Point(0, 0);
+      this.logView.Location = new System.Drawing.Point(3, 3);
       this.logView.Name = "logView";
       this.logView.ReadOnly = false;
-      this.logView.Size = new System.Drawing.Size(709, 426);
+      this.logView.Size = new System.Drawing.Size(703, 420);
       this.logView.TabIndex = 0;
       // 
@@ -284 +278 @@
       // 
       this.resourceIdsLabel.AutoSize = true;
-      this.resourceIdsLabel.Location = new System.Drawing.Point(4, 56);
+      this.resourceIdsLabel.Location = new System.Drawing.Point(3, 56);
       this.resourceIdsLabel.Name = "resourceIdsLabel";
-      this.resourceIdsLabel.Size = new System.Drawing.Size(70, 13);
+      this.resourceIdsLabel.Size = new System.Drawing.Size(61, 13);
       this.resourceIdsLabel.TabIndex = 12;
-      this.resourceIdsLabel.Text = "ResourceIds:";
+      this.resourceIdsLabel.Text = "Resources:";
       // 
       // resourceNamesTextBox
@@ -294 +288 @@
       this.resourceNamesTextBox.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
                   | System.Windows.Forms.AnchorStyles.Right)));
-      this.resourceNamesTextBox.Location = new System.Drawing.Point(73, 53);
+      this.resourceNamesTextBox.Location = new System.Drawing.Point(70, 52);
       this.resourceNamesTextBox.Name = "resourceNamesTextBox";
       this.resourceNamesTextBox.Size = new System.Drawing.Size(415, 20);
@@ -303 +297 @@
       // 
       this.nameLabel.AutoSize = true;
-      this.nameLabel.Location = new System.Drawing.Point(1, 27);
+      this.nameLabel.Location = new System.Drawing.Point(3, 30);
       this.nameLabel.Name = "nameLabel";
       this.nameLabel.Size = new System.Drawing.Size(38, 13);
@@ -313 +307 @@
       this.nameTextBox.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
                   | System.Windows.Forms.AnchorStyles.Right)));
-      this.nameTextBox.Location = new System.Drawing.Point(73, 27);
+      this.nameTextBox.Location = new System.Drawing.Point(70, 27);
       this.nameTextBox.Name = "nameTextBox";
       this.nameTextBox.Size = new System.Drawing.Size(501, 20);
@@ -334 +328 @@
       this.isPrivilegedCheckBox.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
       this.isPrivilegedCheckBox.AutoSize = true;
-      this.isPrivilegedCheckBox.Location = new System.Drawing.Point(494, 55);
+      this.isPrivilegedCheckBox.Location = new System.Drawing.Point(491, 53);
       this.isPrivilegedCheckBox.Name = "isPrivilegedCheckBox";
-      this.isPrivilegedCheckBox.Size = new System.Drawing.Size(80, 17);
+      this.isPrivilegedCheckBox.Size = new System.Drawing.Size(72, 17);
       this.isPrivilegedCheckBox.TabIndex = 26;
-      this.isPrivilegedCheckBox.Text = "IsPrivileged";
+      this.isPrivilegedCheckBox.Text = "Privileged";
       this.toolTip.SetToolTip(this.isPrivilegedCheckBox, "If checked, the task will be executed in a privileged sandbox on the slave.");
       this.isPrivilegedCheckBox.UseVisualStyleBackColor = true;
@@ -348 +342 @@
       this.refreshAutomaticallyCheckBox.Location = new System.Drawing.Point(30, 5);
       this.refreshAutomaticallyCheckBox.Name = "refreshAutomaticallyCheckBox";
-      this.refreshAutomaticallyCheckBox.Size = new System.Drawing.Size(128, 17);
+      this.refreshAutomaticallyCheckBox.Size = new System.Drawing.Size(127, 17);
       this.refreshAutomaticallyCheckBox.TabIndex = 24;
-      this.refreshAutomaticallyCheckBox.Text = "&Refresh Automatically";
+      this.refreshAutomaticallyCheckBox.Text = "&Refresh automatically";
       this.refreshAutomaticallyCheckBox.UseVisualStyleBackColor = true;
       this.refreshAutomaticallyCheckBox.Validated += new System.EventHandler(this.refreshAutomaticallyCheckBox_Validated);
@@ -368 +362 @@
       this.infoGroupBox.TabIndex = 25;
       this.infoGroupBox.TabStop = false;
-      this.infoGroupBox.Text = "Info";
+      this.infoGroupBox.Text = "Tasks";
       // 
       // finishedTextBox
@@ -420 +414 @@
       this.jobsLabel.Location = new System.Drawing.Point(6, 19);
       this.jobsLabel.Name = "jobsLabel";
-      this.jobsLabel.Size = new System.Drawing.Size(32, 13);
+      this.jobsLabel.Size = new System.Drawing.Size(46, 13);
       this.jobsLabel.TabIndex = 0;
-      this.jobsLabel.Text = "Jobs:";
+      this.jobsLabel.Text = "Waiting:";
       // 
       // RefreshableHiveExperimentView
@@ -446 +440 @@
       this.Size = new System.Drawing.Size(717, 560);
       this.tabControl.ResumeLayout(false);
-      this.jobsTabPage.ResumeLayout(false);
+      this.tasksTabPage.ResumeLayout(false);
+      this.permissionTabPage.ResumeLayout(false);
       this.stateTabPage.ResumeLayout(false);
-      this.sharingTabPage.ResumeLayout(false);
       this.logTabPage.ResumeLayout(false);
       this.infoGroupBox.ResumeLayout(false);
@@ -469 +463 @@
     private System.Windows.Forms.TabPage logTabPage;
     private Core.Views.LogView logView;
-    private System.Windows.Forms.TabPage jobsTabPage;
-    private HiveTaskItemTreeView jobsTreeView;
+    private System.Windows.Forms.TabPage tasksTabPage;
+    private HeuristicLab.Clients.Hive.Views.ExperimentManager.HiveTaskItemTreeView jobsTreeView;
     private System.Windows.Forms.Label nameLabel;
     private System.Windows.Forms.TextBox nameTextBox;
@@ -485 +479 @@
     private System.Windows.Forms.CheckBox isPrivilegedCheckBox;
     private System.Windows.Forms.TabPage stateTabPage;
-    private ViewHost stateLogViewHost;
-    private System.Windows.Forms.TabPage sharingTabPage;
+    private HeuristicLab.MainForm.WindowsForms.ViewHost stateLogViewHost;
+    private System.Windows.Forms.TabPage permissionTabPage;
     private HiveExperimentPermissionListView hiveExperimentPermissionListView;
     private System.Windows.Forms.Button refreshPermissionsButton;
+    private System.Windows.Forms.TabPage runsTabPage;
 
   }

branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive.ExperimentManager/3.3/Views/RefreshableHiveExperimentView.cs

@@ -40 +40 @@
   [View("Hive Experiment View")]
   [Content(typeof(RefreshableJob), true)]
-  public sealed partial class RefreshableHiveExperimentView : ItemView {
+  public partial class RefreshableHiveExperimentView : HeuristicLab.Core.Views.ItemView {
     private ProgressView progressView;
 
@@ -87 +87 @@
       Content.Job.PropertyChanged += new PropertyChangedEventHandler(HiveExperiment_PropertyChanged);
     }
-    
+
     private void DeregisterHiveExperimentEvents() {
       Content.Job.PropertyChanged -= new PropertyChangedEventHandler(HiveExperiment_PropertyChanged);
@@ -253 +253 @@
       else {
         if (Content != null) {
-          jobsTextBox.Text = Content.Job.JobCount.ToString();
+          jobsTextBox.Text = (Content.Job.JobCount - Content.Job.CalculatingCount - Content.Job.FinishedCount).ToString();
           calculatingTextBox.Text = Content.Job.CalculatingCount.ToString();
           finishedTextBox.Text = Content.Job.FinishedCount.ToString();
@@ -291 +291 @@
 
     private void HiveExperiment_PropertyChanged(object sender, PropertyChangedEventArgs e) {
-      if(this.Content != null && e.PropertyName == "Id") this.hiveExperimentPermissionListView.HiveExperimentId = this.Content.Job.Id;
+      if (this.Content != null && e.PropertyName == "Id") this.hiveExperimentPermissionListView.HiveExperimentId = this.Content.Job.Id;
     }
     #endregion
@@ -413 +413 @@
 
     private void tabControl_SelectedIndexChanged(object sender, EventArgs e) {
-      if (tabControl.SelectedTab == sharingTabPage) {
+      if (tabControl.SelectedTab == permissionTabPage) {
         if (!Content.IsSharable) {
           MessageBox.Show("Unable to load tab. You have insufficient access privileges.");
-          tabControl.SelectedTab = jobsTabPage;
+          tabControl.SelectedTab = tasksTabPage;
         }
       }