Kiu/xenadmin
1
0
Fork 0
mirror of https://github.com/xcp-ng/xenadmin.git synced 2024-11-23 20:36:33 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #35 from stephen-turner/CA-112247-b

Browse Source 
[CA-112247] Improved wording on HA wizard
This commit is contained in:
Gabor Apati-Nagy 2014-04-15 12:37:27 +01:00
commit 5d3d0ff698
3 changed files with 40 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
XenAdmin/Controls/HaNtolControl.cs
View File

@ -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()
{

14
XenAdmin/Controls/HaNtolIndicator.Designer.cs generated
View File

@ -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");

54
XenAdmin/Controls/HaNtolIndicator.resx
View File

@ -112,19 +112,19 @@
<value>2.0</value>
</resheader>
<resheader name="reader">
<value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
<value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<resheader name="writer">
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
<assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
<data name="groupBoxControls.AutoSizeMode" type="System.Windows.Forms.AutoSizeMode, System.Windows.Forms">
<value>GrowAndShrink</value>
</data>
<data name="tableServerFailureLimit.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
<value>Top, Bottom, Left, Right</value>
</data>
<assembly alias="mscorlib" name="mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
<assembly alias="mscorlib" name="mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
<data name="tableServerFailureLimit.AutoSize" type="System.Boolean, mscorlib">
<value>True</value>
</data>
@ -149,7 +149,7 @@
<data name="pictureBoxStatus.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
<value>NoControl</value>
</data>
<assembly alias="System.Drawing" name="System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
<assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
<data name="pictureBoxStatus.Location" type="System.Drawing.Point, System.Drawing">
<value>0, 0</value>
</data>
@ -169,7 +169,7 @@
<value>pictureBoxStatus</value>
</data>
<data name="&gt;&gt;pictureBoxStatus.Type" xml:space="preserve">
<value>System.Windows.Forms.PictureBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
<value>System.Windows.Forms.PictureBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="&gt;&gt;pictureBoxStatus.Parent" xml:space="preserve">
<value>tableStatus</value>
@ -190,7 +190,7 @@
<value>19, 0</value>
</data>
<data name="labelStatus.Size" type="System.Drawing.Size, System.Drawing">
<value>330, 16</value>
<value>326, 16</value>
</data>
<data name="labelStatus.TabIndex" type="System.Int32, mscorlib">
<value>4</value>
@ -220,7 +220,7 @@
<value>1</value>
</data>
<data name="tableStatus.Size" type="System.Drawing.Size, System.Drawing">
<value>352, 16</value>
<value>348, 16</value>
</data>
<data name="tableStatus.TabIndex" type="System.Int32, mscorlib">
<value>13</value>
@ -232,7 +232,7 @@
<value>tableStatus</value>
</data>
<data name="&gt;&gt;tableStatus.Type" xml:space="preserve">
<value>System.Windows.Forms.TableLayoutPanel, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
<value>System.Windows.Forms.TableLayoutPanel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="&gt;&gt;tableStatus.Parent" xml:space="preserve">
<value>tableServerFailureLimit</value>
@ -262,19 +262,19 @@
<value>0, 4, 0, 6</value>
</data>
<data name="label1.Size" type="System.Drawing.Size, System.Drawing">
<value>358, 36</value>
<value>354, 36</value>
</data>
<data name="label1.TabIndex" type="System.Int32, mscorlib">
<value>14</value>
</data>
<data name="label1.Text" xml:space="preserve">
<value>You can limit the number of server failures allowed in the pool under this HA plan.</value>
<value>You can specify the number of server failures you need to be able to tolerate in the pool.</value>
</data>
<data name="&gt;&gt;label1.Name" xml:space="preserve">
<value>label1</value>
</data>
<data name="&gt;&gt;label1.Type" xml:space="preserve">
<value>System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
<value>System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="&gt;&gt;label1.Parent" xml:space="preserve">
<value>tableServerFailureLimit</value>
@ -292,7 +292,7 @@
<value>NoControl</value>
</data>
<data name="labelMax.Location" type="System.Drawing.Point, System.Drawing">
<value>155, 36</value>
<value>160, 36</value>
</data>
<data name="labelMax.Size" type="System.Drawing.Size, System.Drawing">
<value>1, 26</value>
@ -307,7 +307,7 @@
<value>labelMax</value>
</data>
<data name="&gt;&gt;labelMax.Type" xml:space="preserve">
<value>System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
<value>System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="&gt;&gt;labelMax.Parent" xml:space="preserve">
<value>tableServerFailureLimit</value>
@ -322,7 +322,7 @@
<value>NoControl</value>
</data>
<data name="spinner.Location" type="System.Drawing.Point, System.Drawing">
<value>161, 41</value>
<value>166, 41</value>
</data>
<data name="spinner.Size" type="System.Drawing.Size, System.Drawing">
<value>16, 16</value>
@ -337,7 +337,7 @@
<value>spinner</value>
</data>
<data name="&gt;&gt;spinner.Type" xml:space="preserve">
<value>System.Windows.Forms.PictureBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
<value>System.Windows.Forms.PictureBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="&gt;&gt;spinner.Parent" xml:space="preserve">
<value>tableServerFailureLimit</value>
@ -349,7 +349,7 @@
<value>Left</value>
</data>
<data name="numericUpDownCapacity.Location" type="System.Drawing.Point, System.Drawing">
<value>94, 39</value>
<value>99, 39</value>
</data>
<data name="numericUpDownCapacity.Size" type="System.Drawing.Size, System.Drawing">
<value>55, 20</value>
@ -364,7 +364,7 @@
<value>numericUpDownCapacity</value>
</data>
<data name="&gt;&gt;numericUpDownCapacity.Type" xml:space="preserve">
<value>System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
<value>System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="&gt;&gt;numericUpDownCapacity.Parent" xml:space="preserve">
<value>tableServerFailureLimit</value>
@ -385,19 +385,19 @@
<value>3, 42</value>
</data>
<data name="labelNumberOfServers.Size" type="System.Drawing.Size, System.Drawing">
<value>85, 13</value>
<value>90, 13</value>
</data>
<data name="labelNumberOfServers.TabIndex" type="System.Int32, mscorlib">
<value>0</value>
</data>
<data name="labelNumberOfServers.Text" xml:space="preserve">
<value>&amp;Failures allowed:</value>
<value>&amp;Failures tolerated:</value>
</data>
<data name="&gt;&gt;labelNumberOfServers.Name" xml:space="preserve">
<value>labelNumberOfServers</value>
</data>
<data name="&gt;&gt;labelNumberOfServers.Type" xml:space="preserve">
<value>System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
<value>System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="&gt;&gt;labelNumberOfServers.Parent" xml:space="preserve">
<value>tableServerFailureLimit</value>
@ -415,7 +415,7 @@
<value>3</value>
</data>
<data name="tableServerFailureLimit.Size" type="System.Drawing.Size, System.Drawing">
<value>358, 84</value>
<value>354, 84</value>
</data>
<data name="tableServerFailureLimit.TabIndex" type="System.Int32, mscorlib">
<value>0</value>
@ -424,7 +424,7 @@
<value>tableServerFailureLimit</value>
</data>
<data name="&gt;&gt;tableServerFailureLimit.Type" xml:space="preserve">
<value>System.Windows.Forms.TableLayoutPanel, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
<value>System.Windows.Forms.TableLayoutPanel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="&gt;&gt;tableServerFailureLimit.Parent" xml:space="preserve">
<value>groupBoxControls</value>
@ -448,7 +448,7 @@
<value>3, 3, 6, 0</value>
</data>
<data name="groupBoxControls.Size" type="System.Drawing.Size, System.Drawing">
<value>368, 101</value>
<value>364, 101</value>
</data>
<data name="groupBoxControls.TabIndex" type="System.Int32, mscorlib">
<value>13</value>
@ -460,7 +460,7 @@
<value>groupBoxControls</value>
</data>
<data name="&gt;&gt;groupBoxControls.Type" xml:space="preserve">
<value>System.Windows.Forms.GroupBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
<value>System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="&gt;&gt;groupBoxControls.Parent" xml:space="preserve">
<value>$this</value>
@ -468,7 +468,7 @@
<data name="&gt;&gt;groupBoxControls.ZOrder" xml:space="preserve">
<value>0</value>
</data>
<metadata name="$this.Localizable" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<metadata name="$this.Localizable" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<data name="$this.AutoScaleDimensions" type="System.Drawing.SizeF, System.Drawing">
@ -484,6 +484,6 @@
<value>HaNtolIndicator</value>
</data>
<data name="&gt;&gt;$this.Type" xml:space="preserve">
<value>System.Windows.Forms.UserControl, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
<value>XenAdmin.Controls.HaNtolControl, XenCenterMain, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null</value>
</data>
</root>