mirror of
https://github.com/xcp-ng/xenadmin.git
synced 2024-11-25 06:16:37 +01:00
CA-198276: Fix tab order on modified pages
This commit is contained in:
Stephen Turner
parent
85c8cf0398
commit
cf5b61ac7e
@ -35,20 +35,20 @@ namespace XenAdmin.SettingsPanels
|
||||
this.lblPriority = new System.Windows.Forms.Label();
|
||||
this.tableLayoutPanel1 = new System.Windows.Forms.TableLayoutPanel();
|
||||
this.labelInvalidVCPUWarning = new System.Windows.Forms.Label();
|
||||
this.comboBoxTopology = new XenAdmin.Controls.CPUTopologyComboBox();
|
||||
this.labelTopology = new System.Windows.Forms.Label();
|
||||
this.MemWarningLabel = new System.Windows.Forms.Label();
|
||||
this.panel2 = new System.Windows.Forms.Panel();
|
||||
this.lblMB = new System.Windows.Forms.Label();
|
||||
this.nudMemory = new System.Windows.Forms.NumericUpDown();
|
||||
this.panel1 = new System.Windows.Forms.Panel();
|
||||
this.transparentTrackBar1 = new XenAdmin.Controls.TransparentTrackBar();
|
||||
this.lblVCPUs = new System.Windows.Forms.Label();
|
||||
this.lblVcpuWarning = new System.Windows.Forms.LinkLabel();
|
||||
this.lblMemory = new System.Windows.Forms.Label();
|
||||
this.VCPUWarningLabel = new System.Windows.Forms.Label();
|
||||
this.label1 = new System.Windows.Forms.Label();
|
||||
this.comboBoxVCPUs = new System.Windows.Forms.ComboBox();
|
||||
this.comboBoxTopology = new XenAdmin.Controls.CPUTopologyComboBox();
|
||||
this.transparentTrackBar1 = new XenAdmin.Controls.TransparentTrackBar();
|
||||
this.tableLayoutPanel1.SuspendLayout();
|
||||
this.panel2.SuspendLayout();
|
||||
((System.ComponentModel.ISupportInitialize)(this.nudMemory)).BeginInit();
|
||||
@ -102,6 +102,15 @@ namespace XenAdmin.SettingsPanels
|
||||
this.labelInvalidVCPUWarning.ForeColor = System.Drawing.Color.Red;
|
||||
this.labelInvalidVCPUWarning.Name = "labelInvalidVCPUWarning";
|
||||
//
|
||||
// comboBoxTopology
|
||||
//
|
||||
this.tableLayoutPanel1.SetColumnSpan(this.comboBoxTopology, 2);
|
||||
this.comboBoxTopology.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
|
||||
resources.ApplyResources(this.comboBoxTopology, "comboBoxTopology");
|
||||
this.comboBoxTopology.FormattingEnabled = true;
|
||||
this.comboBoxTopology.Name = "comboBoxTopology";
|
||||
this.comboBoxTopology.SelectedIndexChanged += new System.EventHandler(this.comboBoxTopology_SelectedIndexChanged);
|
||||
//
|
||||
// labelTopology
|
||||
//
|
||||
resources.ApplyResources(this.labelTopology, "labelTopology");
|
||||
@ -157,6 +166,13 @@ namespace XenAdmin.SettingsPanels
|
||||
this.panel1.Controls.Add(this.transparentTrackBar1);
|
||||
this.panel1.Name = "panel1";
|
||||
//
|
||||
// transparentTrackBar1
|
||||
//
|
||||
resources.ApplyResources(this.transparentTrackBar1, "transparentTrackBar1");
|
||||
this.transparentTrackBar1.BackColor = System.Drawing.Color.Transparent;
|
||||
this.transparentTrackBar1.Name = "transparentTrackBar1";
|
||||
this.transparentTrackBar1.TabStop = false;
|
||||
//
|
||||
// lblVCPUs
|
||||
//
|
||||
resources.ApplyResources(this.lblVCPUs, "lblVCPUs");
|
||||
@ -197,22 +213,6 @@ namespace XenAdmin.SettingsPanels
|
||||
this.comboBoxVCPUs.Name = "comboBoxVCPUs";
|
||||
this.comboBoxVCPUs.SelectedIndexChanged += new System.EventHandler(this.comboBoxVCPUs_SelectedIndexChanged);
|
||||
//
|
||||
// comboBoxTopology
|
||||
//
|
||||
this.tableLayoutPanel1.SetColumnSpan(this.comboBoxTopology, 2);
|
||||
this.comboBoxTopology.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
|
||||
resources.ApplyResources(this.comboBoxTopology, "comboBoxTopology");
|
||||
this.comboBoxTopology.FormattingEnabled = true;
|
||||
this.comboBoxTopology.Name = "comboBoxTopology";
|
||||
this.comboBoxTopology.SelectedIndexChanged += new System.EventHandler(this.comboBoxTopology_SelectedIndexChanged);
|
||||
//
|
||||
// transparentTrackBar1
|
||||
//
|
||||
resources.ApplyResources(this.transparentTrackBar1, "transparentTrackBar1");
|
||||
this.transparentTrackBar1.BackColor = System.Drawing.Color.Transparent;
|
||||
this.transparentTrackBar1.Name = "transparentTrackBar1";
|
||||
this.transparentTrackBar1.TabStop = false;
|
||||
//
|
||||
// CPUMemoryEditPage
|
||||
//
|
||||
resources.ApplyResources(this, "$this");
|
||||
|
||||
@ -247,7 +247,7 @@
|
||||
<value>396, 20</value>
|
||||
</data>
|
||||
<data name="labelInvalidVCPUWarning.TabIndex" type="System.Int32, mscorlib">
|
||||
<value>11</value>
|
||||
<value>7</value>
|
||||
</data>
|
||||
<data name=">>labelInvalidVCPUWarning.Name" xml:space="preserve">
|
||||
<value>labelInvalidVCPUWarning</value>
|
||||
@ -274,7 +274,7 @@
|
||||
<value>250, 21</value>
|
||||
</data>
|
||||
<data name="comboBoxTopology.TabIndex" type="System.Int32, mscorlib">
|
||||
<value>4</value>
|
||||
<value>6</value>
|
||||
</data>
|
||||
<data name=">>comboBoxTopology.Name" xml:space="preserve">
|
||||
<value>comboBoxTopology</value>
|
||||
@ -304,7 +304,7 @@
|
||||
<value>95, 33</value>
|
||||
</data>
|
||||
<data name="labelTopology.TabIndex" type="System.Int32, mscorlib">
|
||||
<value>10</value>
|
||||
<value>5</value>
|
||||
</data>
|
||||
<data name="labelTopology.Text" xml:space="preserve">
|
||||
<value>&Topology:</value>
|
||||
@ -340,7 +340,7 @@
|
||||
<value>298, 47</value>
|
||||
</data>
|
||||
<data name="MemWarningLabel.TabIndex" type="System.Int32, mscorlib">
|
||||
<value>9</value>
|
||||
<value>12</value>
|
||||
</data>
|
||||
<data name="MemWarningLabel.Text" xml:space="preserve">
|
||||
<value>The amount of physical memory allocated to this VM is greater than the total memory of its home server</value>
|
||||
@ -366,6 +366,30 @@
|
||||
<data name="panel2.AutoSizeMode" type="System.Windows.Forms.AutoSizeMode, System.Windows.Forms">
|
||||
<value>GrowAndShrink</value>
|
||||
</data>
|
||||
<data name="lblMB.AutoSize" type="System.Boolean, mscorlib">
|
||||
<value>True</value>
|
||||
</data>
|
||||
<data name="lblMB.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
|
||||
<value>NoControl</value>
|
||||
</data>
|
||||
<data name="lblMB.Location" type="System.Drawing.Point, System.Drawing">
|
||||
<value>72, 2</value>
|
||||
</data>
|
||||
<data name="lblMB.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
|
||||
<value>0, 0, 0, 0</value>
|
||||
</data>
|
||||
<data name="lblMB.Size" type="System.Drawing.Size, System.Drawing">
|
||||
<value>23, 13</value>
|
||||
</data>
|
||||
<data name="lblMB.TabIndex" type="System.Int32, mscorlib">
|
||||
<value>1</value>
|
||||
</data>
|
||||
<data name="lblMB.Text" xml:space="preserve">
|
||||
<value>MB</value>
|
||||
</data>
|
||||
<data name="lblMB.TextAlign" type="System.Drawing.ContentAlignment, System.Drawing">
|
||||
<value>MiddleLeft</value>
|
||||
</data>
|
||||
<data name=">>lblMB.Name" xml:space="preserve">
|
||||
<value>lblMB</value>
|
||||
</data>
|
||||
@ -378,6 +402,18 @@
|
||||
<data name=">>lblMB.ZOrder" xml:space="preserve">
|
||||
<value>0</value>
|
||||
</data>
|
||||
<data name="nudMemory.Location" type="System.Drawing.Point, System.Drawing">
|
||||
<value>1, 0</value>
|
||||
</data>
|
||||
<data name="nudMemory.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
|
||||
<value>0, 0, 0, 0</value>
|
||||
</data>
|
||||
<data name="nudMemory.Size" type="System.Drawing.Size, System.Drawing">
|
||||
<value>71, 20</value>
|
||||
</data>
|
||||
<data name="nudMemory.TabIndex" type="System.Int32, mscorlib">
|
||||
<value>0</value>
|
||||
</data>
|
||||
<data name=">>nudMemory.Name" xml:space="preserve">
|
||||
<value>nudMemory</value>
|
||||
</data>
|
||||
@ -403,7 +439,7 @@
|
||||
<value>95, 20</value>
|
||||
</data>
|
||||
<data name="panel2.TabIndex" type="System.Int32, mscorlib">
|
||||
<value>8</value>
|
||||
<value>11</value>
|
||||
</data>
|
||||
<data name=">>panel2.Name" xml:space="preserve">
|
||||
<value>panel2</value>
|
||||
@ -420,6 +456,18 @@
|
||||
<data name="panel1.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
|
||||
<value>Top, Left, Right</value>
|
||||
</data>
|
||||
<data name="transparentTrackBar1.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
|
||||
<value>Top, Bottom, Left, Right</value>
|
||||
</data>
|
||||
<data name="transparentTrackBar1.Location" type="System.Drawing.Point, System.Drawing">
|
||||
<value>3, -6</value>
|
||||
</data>
|
||||
<data name="transparentTrackBar1.Size" type="System.Drawing.Size, System.Drawing">
|
||||
<value>425, 36</value>
|
||||
</data>
|
||||
<data name="transparentTrackBar1.TabIndex" type="System.Int32, mscorlib">
|
||||
<value>0</value>
|
||||
</data>
|
||||
<data name=">>transparentTrackBar1.Name" xml:space="preserve">
|
||||
<value>transparentTrackBar1</value>
|
||||
</data>
|
||||
@ -445,7 +493,7 @@
|
||||
<value>494, 42</value>
|
||||
</data>
|
||||
<data name="panel1.TabIndex" type="System.Int32, mscorlib">
|
||||
<value>6</value>
|
||||
<value>9</value>
|
||||
</data>
|
||||
<data name=">>panel1.Name" xml:space="preserve">
|
||||
<value>panel1</value>
|
||||
@ -550,7 +598,7 @@
|
||||
<value>95, 18</value>
|
||||
</data>
|
||||
<data name="lblMemory.TabIndex" type="System.Int32, mscorlib">
|
||||
<value>7</value>
|
||||
<value>10</value>
|
||||
</data>
|
||||
<data name="lblMemory.Text" xml:space="preserve">
|
||||
<value>&VM memory:</value>
|
||||
@ -652,7 +700,7 @@
|
||||
<value>50, 21</value>
|
||||
</data>
|
||||
<data name="comboBoxVCPUs.TabIndex" type="System.Int32, mscorlib">
|
||||
<value>1</value>
|
||||
<value>3</value>
|
||||
</data>
|
||||
<data name=">>comboBoxVCPUs.Name" xml:space="preserve">
|
||||
<value>comboBoxVCPUs</value>
|
||||
@ -712,7 +760,7 @@
|
||||
<value>179, 23</value>
|
||||
</data>
|
||||
<data name="lblPriority.TabIndex" type="System.Int32, mscorlib">
|
||||
<value>5</value>
|
||||
<value>8</value>
|
||||
</data>
|
||||
<data name="lblPriority.Text" xml:space="preserve">
|
||||
<value>vCPU priority for this virtual machine:</value>
|
||||
@ -732,90 +780,6 @@
|
||||
<data name=">>lblPriority.ZOrder" xml:space="preserve">
|
||||
<value>6</value>
|
||||
</data>
|
||||
<data name="lblMB.AutoSize" type="System.Boolean, mscorlib">
|
||||
<value>True</value>
|
||||
</data>
|
||||
<data name="lblMB.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
|
||||
<value>NoControl</value>
|
||||
</data>
|
||||
<data name="lblMB.Location" type="System.Drawing.Point, System.Drawing">
|
||||
<value>72, 2</value>
|
||||
</data>
|
||||
<data name="lblMB.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
|
||||
<value>0, 0, 0, 0</value>
|
||||
</data>
|
||||
<data name="lblMB.Size" type="System.Drawing.Size, System.Drawing">
|
||||
<value>23, 13</value>
|
||||
</data>
|
||||
<data name="lblMB.TabIndex" type="System.Int32, mscorlib">
|
||||
<value>1</value>
|
||||
</data>
|
||||
<data name="lblMB.Text" xml:space="preserve">
|
||||
<value>MB</value>
|
||||
</data>
|
||||
<data name="lblMB.TextAlign" type="System.Drawing.ContentAlignment, System.Drawing">
|
||||
<value>MiddleLeft</value>
|
||||
</data>
|
||||
<data name=">>lblMB.Name" xml:space="preserve">
|
||||
<value>lblMB</value>
|
||||
</data>
|
||||
<data name=">>lblMB.Type" xml:space="preserve">
|
||||
<value>System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
|
||||
</data>
|
||||
<data name=">>lblMB.Parent" xml:space="preserve">
|
||||
<value>panel2</value>
|
||||
</data>
|
||||
<data name=">>lblMB.ZOrder" xml:space="preserve">
|
||||
<value>0</value>
|
||||
</data>
|
||||
<data name="nudMemory.Location" type="System.Drawing.Point, System.Drawing">
|
||||
<value>1, 0</value>
|
||||
</data>
|
||||
<data name="nudMemory.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
|
||||
<value>0, 0, 0, 0</value>
|
||||
</data>
|
||||
<data name="nudMemory.Size" type="System.Drawing.Size, System.Drawing">
|
||||
<value>71, 20</value>
|
||||
</data>
|
||||
<data name="nudMemory.TabIndex" type="System.Int32, mscorlib">
|
||||
<value>0</value>
|
||||
</data>
|
||||
<data name=">>nudMemory.Name" xml:space="preserve">
|
||||
<value>nudMemory</value>
|
||||
</data>
|
||||
<data name=">>nudMemory.Type" xml:space="preserve">
|
||||
<value>System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
|
||||
</data>
|
||||
<data name=">>nudMemory.Parent" xml:space="preserve">
|
||||
<value>panel2</value>
|
||||
</data>
|
||||
<data name=">>nudMemory.ZOrder" xml:space="preserve">
|
||||
<value>1</value>
|
||||
</data>
|
||||
<data name="transparentTrackBar1.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
|
||||
<value>Top, Bottom, Left, Right</value>
|
||||
</data>
|
||||
<data name="transparentTrackBar1.Location" type="System.Drawing.Point, System.Drawing">
|
||||
<value>3, -6</value>
|
||||
</data>
|
||||
<data name="transparentTrackBar1.Size" type="System.Drawing.Size, System.Drawing">
|
||||
<value>425, 36</value>
|
||||
</data>
|
||||
<data name="transparentTrackBar1.TabIndex" type="System.Int32, mscorlib">
|
||||
<value>0</value>
|
||||
</data>
|
||||
<data name=">>transparentTrackBar1.Name" xml:space="preserve">
|
||||
<value>transparentTrackBar1</value>
|
||||
</data>
|
||||
<data name=">>transparentTrackBar1.Type" xml:space="preserve">
|
||||
<value>XenAdmin.Controls.TransparentTrackBar, XenCenterMain, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null</value>
|
||||
</data>
|
||||
<data name=">>transparentTrackBar1.Parent" xml:space="preserve">
|
||||
<value>panel1</value>
|
||||
</data>
|
||||
<data name=">>transparentTrackBar1.ZOrder" xml:space="preserve">
|
||||
<value>3</value>
|
||||
</data>
|
||||
<metadata name="$this.Localizable" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
|
||||
<value>True</value>
|
||||
</metadata>
|
||||
|
||||
@ -334,7 +334,7 @@
|
||||
<value>50, 21</value>
|
||||
</data>
|
||||
<data name="comboBoxVCPUs.TabIndex" type="System.Int32, mscorlib">
|
||||
<value>13</value>
|
||||
<value>2</value>
|
||||
</data>
|
||||
<data name=">>comboBoxVCPUs.Name" xml:space="preserve">
|
||||
<value>comboBoxVCPUs</value>
|
||||
|
||||
@ -1728,7 +1728,7 @@ namespace XenAPI
|
||||
{
|
||||
if (noOfVCPUs % coresPerSocket != 0)
|
||||
return Messages.CPU_TOPOLOGY_INVALID_REASON_MULTIPLE;
|
||||
if (noOfVCPUs / coresPerSocket > 16)
|
||||
if (noOfVCPUs / coresPerSocket > MAX_SOCKETS)
|
||||
return Messages.CPU_TOPOLOGY_INVALID_REASON_SOCKETS;
|
||||
}
|
||||
return "";
|
||||
|
||||
Loading…
Reference in New Issue
Block a user