Merge pull request #1075 from geosharath/VMSS

CA-213493: [VMSS] Quiesce info icon and alert icon in VMSS wizard are not aligned properly
This commit is contained in:
Mihaela Stoica 2016-07-21 12:22:26 +01:00 committed by GitHub
commit 7ad31b60be
2 changed files with 53 additions and 44 deletions

View File

@ -37,13 +37,13 @@ namespace XenAdmin.Wizards.NewPolicyWizard
this.quiesceCheckBox = new System.Windows.Forms.CheckBox();
this.radioButtonDiskAndMemory = new System.Windows.Forms.RadioButton();
this.label2 = new System.Windows.Forms.Label();
this.label3 = new System.Windows.Forms.Label();
this.checkpointInfoPictureBox = new System.Windows.Forms.PictureBox();
this.toolTip = new System.Windows.Forms.ToolTip(this.components);
this.tableLayoutPanel1 = new System.Windows.Forms.TableLayoutPanel();
this.labelWarning = new System.Windows.Forms.Label();
this.pictureBoxWarning = new System.Windows.Forms.PictureBox();
this.pictureBoxVSS = new System.Windows.Forms.PictureBox();
this.label3 = new System.Windows.Forms.Label();
((System.ComponentModel.ISupportInitialize)(this.checkpointInfoPictureBox)).BeginInit();
this.tableLayoutPanel1.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.pictureBoxWarning)).BeginInit();
@ -82,11 +82,6 @@ namespace XenAdmin.Wizards.NewPolicyWizard
resources.ApplyResources(this.label2, "label2");
this.label2.Name = "label2";
//
// label3
//
resources.ApplyResources(this.label3, "label3");
this.label3.Name = "label3";
//
// checkpointInfoPictureBox
//
this.checkpointInfoPictureBox.Cursor = System.Windows.Forms.Cursors.Hand;
@ -100,7 +95,6 @@ namespace XenAdmin.Wizards.NewPolicyWizard
// tableLayoutPanel1
//
resources.ApplyResources(this.tableLayoutPanel1, "tableLayoutPanel1");
this.tableLayoutPanel1.Controls.Add(this.label3, 0, 0);
this.tableLayoutPanel1.Controls.Add(this.labelWarning, 1, 1);
this.tableLayoutPanel1.Controls.Add(this.pictureBoxWarning, 0, 1);
this.tableLayoutPanel1.Name = "tableLayoutPanel1";
@ -127,10 +121,16 @@ namespace XenAdmin.Wizards.NewPolicyWizard
this.pictureBoxVSS.Click += new System.EventHandler(this.pictureBoxVSS_Click);
this.pictureBoxVSS.MouseLeave += new System.EventHandler(this.pictureBoxVSS_MouseLeave);
//
// label3
//
resources.ApplyResources(this.label3, "label3");
this.label3.Name = "label3";
//
// NewPolicySnapshotTypePage
//
resources.ApplyResources(this, "$this");
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Dpi;
this.Controls.Add(this.label3);
this.Controls.Add(this.pictureBoxVSS);
this.Controls.Add(this.tableLayoutPanel1);
this.Controls.Add(this.checkpointInfoPictureBox);
@ -157,12 +157,12 @@ namespace XenAdmin.Wizards.NewPolicyWizard
protected System.Windows.Forms.RadioButton radioButtonDiskAndMemory;
protected System.Windows.Forms.CheckBox quiesceCheckBox;
protected System.Windows.Forms.Label label2;
protected System.Windows.Forms.Label label3;
protected System.Windows.Forms.PictureBox checkpointInfoPictureBox;
protected System.Windows.Forms.ToolTip toolTip;
protected System.Windows.Forms.TableLayoutPanel tableLayoutPanel1;
protected System.Windows.Forms.PictureBox pictureBoxWarning;
protected System.Windows.Forms.Label labelWarning;
protected System.Windows.Forms.PictureBox pictureBoxVSS;
protected System.Windows.Forms.Label label3;
}
}

View File

@ -148,7 +148,7 @@
<value>$this</value>
</data>
<data name="&gt;&gt;label1.ZOrder" xml:space="preserve">
<value>7</value>
<value>8</value>
</data>
<data name="radioButtonDiskOnly.AutoSize" type="System.Boolean, mscorlib">
<value>True</value>
@ -178,7 +178,7 @@
<value>$this</value>
</data>
<data name="&gt;&gt;radioButtonDiskOnly.ZOrder" xml:space="preserve">
<value>5</value>
<value>6</value>
</data>
<data name="quiesceCheckBox.Location" type="System.Drawing.Point, System.Drawing">
<value>29, 87</value>
@ -202,7 +202,7 @@
<value>$this</value>
</data>
<data name="&gt;&gt;quiesceCheckBox.ZOrder" xml:space="preserve">
<value>6</value>
<value>7</value>
</data>
<data name="radioButtonDiskAndMemory.AutoSize" type="System.Boolean, mscorlib">
<value>True</value>
@ -232,7 +232,7 @@
<value>$this</value>
</data>
<data name="&gt;&gt;radioButtonDiskAndMemory.ZOrder" xml:space="preserve">
<value>4</value>
<value>5</value>
</data>
<data name="label2.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
<value>Top, Left, Right</value>
@ -259,28 +259,7 @@
<value>$this</value>
</data>
<data name="&gt;&gt;label2.ZOrder" xml:space="preserve">
<value>3</value>
</data>
<data name="label3.Location" type="System.Drawing.Point, System.Drawing">
<value>3, 0</value>
</data>
<data name="label3.Size" type="System.Drawing.Size, System.Drawing">
<value>100, 23</value>
</data>
<data name="label3.TabIndex" type="System.Int32, mscorlib">
<value>0</value>
</data>
<data name="&gt;&gt;label3.Name" xml:space="preserve">
<value>label3</value>
</data>
<data name="&gt;&gt;label3.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="&gt;&gt;label3.Parent" xml:space="preserve">
<value>tableLayoutPanel1</value>
</data>
<data name="&gt;&gt;label3.ZOrder" xml:space="preserve">
<value>0</value>
<value>4</value>
</data>
<data name="checkpointInfoPictureBox.Font" type="System.Drawing.Font, System.Drawing">
<value>Segoe UI, 9pt</value>
@ -307,7 +286,7 @@
<value>$this</value>
</data>
<data name="&gt;&gt;checkpointInfoPictureBox.ZOrder" xml:space="preserve">
<value>2</value>
<value>3</value>
</data>
<metadata name="toolTip.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>17, 17</value>
@ -322,13 +301,13 @@
<value>True</value>
</data>
<data name="labelWarning.Location" type="System.Drawing.Point, System.Drawing">
<value>109, 26</value>
<value>25, 3</value>
</data>
<data name="labelWarning.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
<value>3, 3, 3, 3</value>
</data>
<data name="labelWarning.Size" type="System.Drawing.Size, System.Drawing">
<value>335, 78</value>
<value>427, 78</value>
</data>
<data name="labelWarning.TabIndex" type="System.Int32, mscorlib">
<value>1</value>
@ -350,10 +329,10 @@
<value>tableLayoutPanel1</value>
</data>
<data name="&gt;&gt;labelWarning.ZOrder" xml:space="preserve">
<value>1</value>
<value>0</value>
</data>
<data name="pictureBoxWarning.Location" type="System.Drawing.Point, System.Drawing">
<value>3, 26</value>
<value>3, 3</value>
</data>
<data name="pictureBoxWarning.Size" type="System.Drawing.Size, System.Drawing">
<value>16, 16</value>
@ -371,10 +350,10 @@
<value>tableLayoutPanel1</value>
</data>
<data name="&gt;&gt;pictureBoxWarning.ZOrder" xml:space="preserve">
<value>2</value>
<value>1</value>
</data>
<data name="tableLayoutPanel1.Location" type="System.Drawing.Point, System.Drawing">
<value>25, 151</value>
<value>24, 214</value>
</data>
<data name="tableLayoutPanel1.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
<value>0, 0, 0, 0</value>
@ -383,7 +362,7 @@
<value>2</value>
</data>
<data name="tableLayoutPanel1.Size" type="System.Drawing.Size, System.Drawing">
<value>457, 257</value>
<value>457, 113</value>
</data>
<data name="tableLayoutPanel1.TabIndex" type="System.Int32, mscorlib">
<value>9</value>
@ -398,10 +377,10 @@
<value>$this</value>
</data>
<data name="&gt;&gt;tableLayoutPanel1.ZOrder" xml:space="preserve">
<value>1</value>
<value>2</value>
</data>
<data name="tableLayoutPanel1.LayoutSettings" type="System.Windows.Forms.TableLayoutSettings, System.Windows.Forms">
<value>&lt;?xml version="1.0" encoding="utf-16"?&gt;&lt;TableLayoutSettings&gt;&lt;Controls&gt;&lt;Control Name="label3" Row="0" RowSpan="1" Column="0" ColumnSpan="1" /&gt;&lt;Control Name="labelWarning" Row="1" RowSpan="1" Column="1" ColumnSpan="1" /&gt;&lt;Control Name="pictureBoxWarning" Row="1" RowSpan="1" Column="0" ColumnSpan="1" /&gt;&lt;/Controls&gt;&lt;Columns Styles="AutoSize,50,Percent,100" /&gt;&lt;Rows Styles="AutoSize,0,Percent,100" /&gt;&lt;/TableLayoutSettings&gt;</value>
<value>&lt;?xml version="1.0" encoding="utf-16"?&gt;&lt;TableLayoutSettings&gt;&lt;Controls&gt;&lt;Control Name="labelWarning" Row="1" RowSpan="1" Column="1" ColumnSpan="1" /&gt;&lt;Control Name="pictureBoxWarning" Row="1" RowSpan="1" Column="0" ColumnSpan="1" /&gt;&lt;/Controls&gt;&lt;Columns Styles="AutoSize,50,Percent,100" /&gt;&lt;Rows Styles="AutoSize,0,Percent,100" /&gt;&lt;/TableLayoutSettings&gt;</value>
</data>
<data name="pictureBoxVSS.Font" type="System.Drawing.Font, System.Drawing">
<value>Segoe UI, 9pt</value>
@ -428,6 +407,36 @@
<value>$this</value>
</data>
<data name="&gt;&gt;pictureBoxVSS.ZOrder" xml:space="preserve">
<value>1</value>
</data>
<data name="label3.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
<value>Top, Left, Right</value>
</data>
<data name="label3.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
<value>NoControl</value>
</data>
<data name="label3.Location" type="System.Drawing.Point, System.Drawing">
<value>24, 148</value>
</data>
<data name="label3.Size" type="System.Drawing.Size, System.Drawing">
<value>453, 52</value>
</data>
<data name="label3.TabIndex" type="System.Int32, mscorlib">
<value>12</value>
</data>
<data name="label3.Text" xml:space="preserve">
<value>In addition to the VM's disks and metadata, this type of snapshot also stores the VM's memory state (RAM). Note that this type of snapshot can be very large and you should ensure that you make sufficient disk space available for all your scheduled snapshots. </value>
</data>
<data name="&gt;&gt;label3.Name" xml:space="preserve">
<value>label3</value>
</data>
<data name="&gt;&gt;label3.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="&gt;&gt;label3.Parent" xml:space="preserve">
<value>$this</value>
</data>
<data name="&gt;&gt;label3.ZOrder" xml:space="preserve">
<value>0</value>
</data>
<metadata name="$this.Localizable" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">