diff --git a/XenAdmin/Controls/HaNtolControl.cs b/XenAdmin/Controls/HaNtolControl.cs
index bac2e56e0..1a9f7b0c9 100644
--- a/XenAdmin/Controls/HaNtolControl.cs
+++ b/XenAdmin/Controls/HaNtolControl.cs
@@ -44,7 +44,7 @@ using XenAPI;
namespace XenAdmin.Controls
{
- public abstract class HaNtolControl : UserControl
+ public class HaNtolControl : UserControl
{
private static readonly log4net.ILog log = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType);
@@ -243,9 +243,11 @@ namespace XenAdmin.Controls
log.Debug("Thread exiting");
}
- protected abstract void LoadCalculatingMode();
- protected abstract void LoadCalculationSucceededMode(decimal value);
- protected abstract void LoadCalculationFailedMode();
+ // These functions should be abstract, but the Designer can't display
+ // a control that is derived from an abstract base class.
+ protected virtual void LoadCalculatingMode() { }
+ protected virtual void LoadCalculationSucceededMode(decimal value) { }
+ protected virtual void LoadCalculationFailedMode() { }
internal void StartNtolUpdate()
{
diff --git a/XenAdmin/Controls/HaNtolIndicator.Designer.cs b/XenAdmin/Controls/HaNtolIndicator.Designer.cs
index 976e945f3..24778ce30 100644
--- a/XenAdmin/Controls/HaNtolIndicator.Designer.cs
+++ b/XenAdmin/Controls/HaNtolIndicator.Designer.cs
@@ -33,12 +33,12 @@ namespace XenAdmin.Controls
this.tableServerFailureLimit = new System.Windows.Forms.TableLayoutPanel();
this.tableStatus = new System.Windows.Forms.TableLayoutPanel();
this.pictureBoxStatus = new System.Windows.Forms.PictureBox();
+ this.labelStatus = new XenAdmin.Controls.Common.AutoHeightLabel();
this.label1 = new System.Windows.Forms.Label();
this.labelMax = new System.Windows.Forms.Label();
this.spinner = new System.Windows.Forms.PictureBox();
this.numericUpDownCapacity = new System.Windows.Forms.NumericUpDown();
this.labelNumberOfServers = new System.Windows.Forms.Label();
- this.labelStatus = new XenAdmin.Controls.Common.AutoHeightLabel();
this.groupBoxControls.SuspendLayout();
this.tableServerFailureLimit.SuspendLayout();
this.tableStatus.SuspendLayout();
@@ -81,6 +81,12 @@ namespace XenAdmin.Controls
this.pictureBoxStatus.Name = "pictureBoxStatus";
this.pictureBoxStatus.TabStop = false;
//
+ // labelStatus
+ //
+ resources.ApplyResources(this.labelStatus, "labelStatus");
+ this.labelStatus.ForeColor = System.Drawing.Color.Red;
+ this.labelStatus.Name = "labelStatus";
+ //
// label1
//
resources.ApplyResources(this.label1, "label1");
@@ -114,12 +120,6 @@ namespace XenAdmin.Controls
resources.ApplyResources(this.labelNumberOfServers, "labelNumberOfServers");
this.labelNumberOfServers.Name = "labelNumberOfServers";
//
- // labelStatus
- //
- resources.ApplyResources(this.labelStatus, "labelStatus");
- this.labelStatus.ForeColor = System.Drawing.Color.Red;
- this.labelStatus.Name = "labelStatus";
- //
// HaNtolIndicator
//
resources.ApplyResources(this, "$this");
diff --git a/XenAdmin/Controls/HaNtolIndicator.resx b/XenAdmin/Controls/HaNtolIndicator.resx
index 1531f958e..f5fefb469 100644
--- a/XenAdmin/Controls/HaNtolIndicator.resx
+++ b/XenAdmin/Controls/HaNtolIndicator.resx
@@ -112,19 +112,19 @@
2.0
- System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+ System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
- System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
+
GrowAndShrink
Top, Bottom, Left, Right
-
+
True
@@ -149,7 +149,7 @@
NoControl
-
+
0, 0
@@ -169,7 +169,7 @@
pictureBoxStatus
- System.Windows.Forms.PictureBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+ System.Windows.Forms.PictureBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
tableStatus
@@ -190,7 +190,7 @@
19, 0
- 330, 16
+ 326, 16
4
@@ -220,7 +220,7 @@
1
- 352, 16
+ 348, 16
13
@@ -232,7 +232,7 @@
tableStatus
- System.Windows.Forms.TableLayoutPanel, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+ System.Windows.Forms.TableLayoutPanel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
tableServerFailureLimit
@@ -262,19 +262,19 @@
0, 4, 0, 6
- 358, 36
+ 354, 36
14
- You can limit the number of server failures allowed in the pool under this HA plan.
+ You can specify the number of server failures you need to be able to tolerate in the pool.
label1
- System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+ System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
tableServerFailureLimit
@@ -292,7 +292,7 @@
NoControl
- 155, 36
+ 160, 36
1, 26
@@ -307,7 +307,7 @@
labelMax
- System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+ System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
tableServerFailureLimit
@@ -322,7 +322,7 @@
NoControl
- 161, 41
+ 166, 41
16, 16
@@ -337,7 +337,7 @@
spinner
- System.Windows.Forms.PictureBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+ System.Windows.Forms.PictureBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
tableServerFailureLimit
@@ -349,7 +349,7 @@
Left
- 94, 39
+ 99, 39
55, 20
@@ -364,7 +364,7 @@
numericUpDownCapacity
- System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+ System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
tableServerFailureLimit
@@ -385,19 +385,19 @@
3, 42
- 85, 13
+ 90, 13
0
- &Failures allowed:
+ &Failures tolerated:
labelNumberOfServers
- System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+ System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
tableServerFailureLimit
@@ -415,7 +415,7 @@
3
- 358, 84
+ 354, 84
0
@@ -424,7 +424,7 @@
tableServerFailureLimit
- System.Windows.Forms.TableLayoutPanel, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+ System.Windows.Forms.TableLayoutPanel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
groupBoxControls
@@ -448,7 +448,7 @@
3, 3, 6, 0
- 368, 101
+ 364, 101
13
@@ -460,7 +460,7 @@
groupBoxControls
- System.Windows.Forms.GroupBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+ System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
$this
@@ -468,7 +468,7 @@
0
-
+
True
@@ -484,6 +484,6 @@
HaNtolIndicator
- System.Windows.Forms.UserControl, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+ XenAdmin.Controls.HaNtolControl, XenCenterMain, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null
\ No newline at end of file