CP-36392: Refactor property names so they have unique names in SummaryPanel.cs

Signed-off-by: Danilo Del Busso <Danilo.Del.Busso@citrix.com>
This commit is contained in:
Danilo Del Busso 2021-09-17 16:21:07 +01:00
parent a61f61d66f
commit 24e1b146ae
No known key found for this signature in database
GPG Key ID: 55F556F9A25CB037
3 changed files with 67 additions and 61 deletions

View File

@ -33,15 +33,15 @@
this.titleLabel = new System.Windows.Forms.Label(); this.titleLabel = new System.Windows.Forms.Label();
this.information = new System.Windows.Forms.LinkLabel(); this.information = new System.Windows.Forms.LinkLabel();
this.tableLayoutPanel2 = new System.Windows.Forms.TableLayoutPanel(); this.tableLayoutPanel2 = new System.Windows.Forms.TableLayoutPanel();
this.warningIcon = new System.Windows.Forms.PictureBox(); this.warningImage = new System.Windows.Forms.PictureBox();
this.warningText = new System.Windows.Forms.Label(); this.warningLabel = new System.Windows.Forms.Label();
this.informationLayoutPanel = new System.Windows.Forms.TableLayoutPanel(); this.informationLayoutPanel = new System.Windows.Forms.TableLayoutPanel();
this.informationImage = new System.Windows.Forms.PictureBox(); this.informationImage = new System.Windows.Forms.PictureBox();
this.informationMessage = new System.Windows.Forms.Label(); this.informationLabel = new System.Windows.Forms.Label();
this.helperLink = new System.Windows.Forms.LinkLabel(); this.helperLink = new System.Windows.Forms.LinkLabel();
this.tableLayoutPanel1.SuspendLayout(); this.tableLayoutPanel1.SuspendLayout();
this.tableLayoutPanel2.SuspendLayout(); this.tableLayoutPanel2.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.warningIcon)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.warningImage)).BeginInit();
this.informationLayoutPanel.SuspendLayout(); this.informationLayoutPanel.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.informationImage)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.informationImage)).BeginInit();
this.SuspendLayout(); this.SuspendLayout();
@ -70,27 +70,27 @@
// tableLayoutPanel2 // tableLayoutPanel2
// //
resources.ApplyResources(this.tableLayoutPanel2, "tableLayoutPanel2"); resources.ApplyResources(this.tableLayoutPanel2, "tableLayoutPanel2");
this.tableLayoutPanel2.Controls.Add(this.warningIcon, 0, 0); this.tableLayoutPanel2.Controls.Add(this.warningImage, 0, 0);
this.tableLayoutPanel2.Controls.Add(this.warningText, 1, 0); this.tableLayoutPanel2.Controls.Add(this.warningLabel, 1, 0);
this.tableLayoutPanel2.Name = "tableLayoutPanel2"; this.tableLayoutPanel2.Name = "tableLayoutPanel2";
// //
// warningIcon // warningImage
// //
resources.ApplyResources(this.warningIcon, "warningIcon"); resources.ApplyResources(this.warningImage, "warningImage");
this.warningIcon.Name = "warningIcon"; this.warningImage.Name = "warningImage";
this.warningIcon.TabStop = false; this.warningImage.TabStop = false;
// //
// warningText // warningLabel
// //
resources.ApplyResources(this.warningText, "warningText"); resources.ApplyResources(this.warningLabel, "warningLabel");
this.warningText.AutoEllipsis = true; this.warningLabel.AutoEllipsis = true;
this.warningText.Name = "warningText"; this.warningLabel.Name = "warningLabel";
// //
// informationLayoutPanel // informationLayoutPanel
// //
resources.ApplyResources(this.informationLayoutPanel, "informationLayoutPanel"); resources.ApplyResources(this.informationLayoutPanel, "informationLayoutPanel");
this.informationLayoutPanel.Controls.Add(this.informationImage, 0, 0); this.informationLayoutPanel.Controls.Add(this.informationImage, 0, 0);
this.informationLayoutPanel.Controls.Add(this.informationMessage, 1, 0); this.informationLayoutPanel.Controls.Add(this.informationLabel, 1, 0);
this.informationLayoutPanel.Name = "informationLayoutPanel"; this.informationLayoutPanel.Name = "informationLayoutPanel";
// //
// informationImage // informationImage
@ -99,11 +99,11 @@
this.informationImage.Name = "informationImage"; this.informationImage.Name = "informationImage";
this.informationImage.TabStop = false; this.informationImage.TabStop = false;
// //
// informationMessage // informationLabel
// //
resources.ApplyResources(this.informationMessage, "informationMessage"); resources.ApplyResources(this.informationLabel, "informationLabel");
this.informationMessage.AutoEllipsis = true; this.informationLabel.AutoEllipsis = true;
this.informationMessage.Name = "informationMessage"; this.informationLabel.Name = "informationLabel";
// //
// helperLink // helperLink
// //
@ -121,7 +121,7 @@
this.tableLayoutPanel1.PerformLayout(); this.tableLayoutPanel1.PerformLayout();
this.tableLayoutPanel2.ResumeLayout(false); this.tableLayoutPanel2.ResumeLayout(false);
this.tableLayoutPanel2.PerformLayout(); this.tableLayoutPanel2.PerformLayout();
((System.ComponentModel.ISupportInitialize)(this.warningIcon)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.warningImage)).EndInit();
this.informationLayoutPanel.ResumeLayout(false); this.informationLayoutPanel.ResumeLayout(false);
this.informationLayoutPanel.PerformLayout(); this.informationLayoutPanel.PerformLayout();
((System.ComponentModel.ISupportInitialize)(this.informationImage)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.informationImage)).EndInit();
@ -132,14 +132,14 @@
#endregion #endregion
private System.Windows.Forms.TableLayoutPanel tableLayoutPanel1; private System.Windows.Forms.TableLayoutPanel tableLayoutPanel1;
private System.Windows.Forms.PictureBox warningIcon; private System.Windows.Forms.PictureBox warningImage;
private System.Windows.Forms.Label warningText; private System.Windows.Forms.Label warningLabel;
private System.Windows.Forms.TableLayoutPanel tableLayoutPanel2; private System.Windows.Forms.TableLayoutPanel tableLayoutPanel2;
private System.Windows.Forms.LinkLabel helperLink; private System.Windows.Forms.LinkLabel helperLink;
private System.Windows.Forms.Label titleLabel; private System.Windows.Forms.Label titleLabel;
private System.Windows.Forms.LinkLabel information; private System.Windows.Forms.LinkLabel information;
private System.Windows.Forms.TableLayoutPanel informationLayoutPanel; private System.Windows.Forms.TableLayoutPanel informationLayoutPanel;
private System.Windows.Forms.PictureBox informationImage; private System.Windows.Forms.PictureBox informationImage;
private System.Windows.Forms.Label informationMessage; private System.Windows.Forms.Label informationLabel;
} }
} }

View File

@ -119,13 +119,13 @@ namespace XenAdmin.Controls.SummaryPanel
[EditorBrowsable(EditorBrowsableState.Never)] [EditorBrowsable(EditorBrowsableState.Never)]
public string DrawWarningMessage public string DrawWarningMessage
{ {
set { warningText.Text = value; } set { warningLabel.Text = value; }
} }
[EditorBrowsable(EditorBrowsableState.Never)] [EditorBrowsable(EditorBrowsableState.Never)]
public Bitmap DrawWarningIcon public Bitmap DrawWarningIcon
{ {
set { warningIcon.Image = value; } set { warningImage.Image = value; }
} }
[EditorBrowsable(EditorBrowsableState.Never)] [EditorBrowsable(EditorBrowsableState.Never)]
@ -143,13 +143,13 @@ namespace XenAdmin.Controls.SummaryPanel
[EditorBrowsable(EditorBrowsableState.Never)] [EditorBrowsable(EditorBrowsableState.Never)]
public bool WarningTextVisiblity public bool WarningTextVisiblity
{ {
set { warningText.Visible = value; } set { warningLabel.Visible = value; }
} }
[EditorBrowsable(EditorBrowsableState.Never)] [EditorBrowsable(EditorBrowsableState.Never)]
public bool WarningIconVisiblity public bool WarningIconVisiblity
{ {
set { warningIcon.Visible = value; } set { warningImage.Visible = value; }
} }
[EditorBrowsable(EditorBrowsableState.Never)] [EditorBrowsable(EditorBrowsableState.Never)]
@ -189,7 +189,7 @@ namespace XenAdmin.Controls.SummaryPanel
[EditorBrowsable(EditorBrowsableState.Never)] [EditorBrowsable(EditorBrowsableState.Never)]
public string DrawInformationText public string DrawInformationText
{ {
set { informationMessage.Text = value; } set { informationLabel.Text = value; }
} }
#endregion #endregion

View File

@ -186,61 +186,64 @@
<data name="tableLayoutPanel2.ColumnCount" type="System.Int32, mscorlib"> <data name="tableLayoutPanel2.ColumnCount" type="System.Int32, mscorlib">
<value>2</value> <value>2</value>
</data> </data>
<data name="warningIcon.Location" type="System.Drawing.Point, System.Drawing"> <data name="warningImage.Location" type="System.Drawing.Point, System.Drawing">
<value>3, 0</value> <value>3, 0</value>
</data> </data>
<data name="warningIcon.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms"> <data name="warningImage.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
<value>3, 0, 3, 0</value> <value>3, 0, 3, 0</value>
</data> </data>
<data name="warningIcon.Size" type="System.Drawing.Size, System.Drawing"> <data name="warningImage.Size" type="System.Drawing.Size, System.Drawing">
<value>16, 45</value> <value>16, 45</value>
</data> </data>
<data name="warningIcon.SizeMode" type="System.Windows.Forms.PictureBoxSizeMode, System.Windows.Forms"> <data name="warningImage.SizeMode" type="System.Windows.Forms.PictureBoxSizeMode, System.Windows.Forms">
<value>CenterImage</value> <value>CenterImage</value>
</data> </data>
<data name="warningIcon.TabIndex" type="System.Int32, mscorlib"> <data name="warningImage.TabIndex" type="System.Int32, mscorlib">
<value>0</value> <value>0</value>
</data> </data>
<data name="&gt;&gt;warningIcon.Name" xml:space="preserve"> <data name="&gt;&gt;warningImage.Name" xml:space="preserve">
<value>warningIcon</value> <value>warningImage</value>
</data> </data>
<data name="&gt;&gt;warningIcon.Type" xml:space="preserve"> <data name="&gt;&gt;warningImage.Type" xml:space="preserve">
<value>System.Windows.Forms.PictureBox, System.Windows.Forms, Version=4.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>
<data name="&gt;&gt;warningIcon.Parent" xml:space="preserve"> <data name="&gt;&gt;warningImage.Parent" xml:space="preserve">
<value>tableLayoutPanel2</value> <value>tableLayoutPanel2</value>
</data> </data>
<data name="&gt;&gt;warningIcon.ZOrder" xml:space="preserve"> <data name="&gt;&gt;warningImage.ZOrder" xml:space="preserve">
<value>0</value> <value>0</value>
</data> </data>
<data name="warningText.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms"> <data name="warningLabel.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
<value>Left, Right</value> <value>Left, Right</value>
</data> </data>
<data name="warningText.AutoSize" type="System.Boolean, mscorlib"> <data name="warningLabel.AutoSize" type="System.Boolean, mscorlib">
<value>True</value> <value>True</value>
</data> </data>
<data name="warningText.Font" type="System.Drawing.Font, System.Drawing"> <data name="warningLabel.Font" type="System.Drawing.Font, System.Drawing">
<value>Microsoft Sans Serif, 8.25pt, style=Bold</value> <value>Microsoft Sans Serif, 8.25pt, style=Bold</value>
</data> </data>
<data name="warningText.Location" type="System.Drawing.Point, System.Drawing"> <data name="warningLabel.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
<value>NoControl</value>
</data>
<data name="warningLabel.Location" type="System.Drawing.Point, System.Drawing">
<value>25, 16</value> <value>25, 16</value>
</data> </data>
<data name="warningText.Size" type="System.Drawing.Size, System.Drawing"> <data name="warningLabel.Size" type="System.Drawing.Size, System.Drawing">
<value>201, 13</value> <value>201, 13</value>
</data> </data>
<data name="warningText.TabIndex" type="System.Int32, mscorlib"> <data name="warningLabel.TabIndex" type="System.Int32, mscorlib">
<value>1</value> <value>1</value>
</data> </data>
<data name="&gt;&gt;warningText.Name" xml:space="preserve"> <data name="&gt;&gt;warningLabel.Name" xml:space="preserve">
<value>warningText</value> <value>warningLabel</value>
</data> </data>
<data name="&gt;&gt;warningText.Type" xml:space="preserve"> <data name="&gt;&gt;warningLabel.Type" xml:space="preserve">
<value>System.Windows.Forms.Label, System.Windows.Forms, Version=4.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>
<data name="&gt;&gt;warningText.Parent" xml:space="preserve"> <data name="&gt;&gt;warningLabel.Parent" xml:space="preserve">
<value>tableLayoutPanel2</value> <value>tableLayoutPanel2</value>
</data> </data>
<data name="&gt;&gt;warningText.ZOrder" xml:space="preserve"> <data name="&gt;&gt;warningLabel.ZOrder" xml:space="preserve">
<value>1</value> <value>1</value>
</data> </data>
<data name="tableLayoutPanel2.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms"> <data name="tableLayoutPanel2.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
@ -274,7 +277,7 @@
<value>2</value> <value>2</value>
</data> </data>
<data name="tableLayoutPanel2.LayoutSettings" type="System.Windows.Forms.TableLayoutSettings, System.Windows.Forms"> <data name="tableLayoutPanel2.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="warningIcon" Row="0" RowSpan="1" Column="0" ColumnSpan="1" /&gt;&lt;Control Name="warningText" Row="0" RowSpan="1" Column="1" ColumnSpan="1" /&gt;&lt;/Controls&gt;&lt;Columns Styles="AutoSize,0,Percent,100" /&gt;&lt;Rows Styles="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="warningImage" Row="0" RowSpan="1" Column="0" ColumnSpan="1" /&gt;&lt;Control Name="warningLabel" Row="0" RowSpan="1" Column="1" ColumnSpan="1" /&gt;&lt;/Controls&gt;&lt;Columns Styles="AutoSize,0,Percent,100" /&gt;&lt;Rows Styles="Percent,100" /&gt;&lt;/TableLayoutSettings&gt;</value>
</data> </data>
<data name="informationLayoutPanel.ColumnCount" type="System.Int32, mscorlib"> <data name="informationLayoutPanel.ColumnCount" type="System.Int32, mscorlib">
<value>2</value> <value>2</value>
@ -306,31 +309,34 @@
<data name="&gt;&gt;informationImage.ZOrder" xml:space="preserve"> <data name="&gt;&gt;informationImage.ZOrder" xml:space="preserve">
<value>0</value> <value>0</value>
</data> </data>
<data name="informationMessage.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms"> <data name="informationLabel.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
<value>Left</value> <value>Left</value>
</data> </data>
<data name="informationMessage.AutoSize" type="System.Boolean, mscorlib"> <data name="informationLabel.AutoSize" type="System.Boolean, mscorlib">
<value>True</value> <value>True</value>
</data> </data>
<data name="informationMessage.Location" type="System.Drawing.Point, System.Drawing"> <data name="informationLabel.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
<value>NoControl</value>
</data>
<data name="informationLabel.Location" type="System.Drawing.Point, System.Drawing">
<value>25, 13</value> <value>25, 13</value>
</data> </data>
<data name="informationMessage.Size" type="System.Drawing.Size, System.Drawing"> <data name="informationLabel.Size" type="System.Drawing.Size, System.Drawing">
<value>0, 13</value> <value>0, 13</value>
</data> </data>
<data name="informationMessage.TabIndex" type="System.Int32, mscorlib"> <data name="informationLabel.TabIndex" type="System.Int32, mscorlib">
<value>1</value> <value>1</value>
</data> </data>
<data name="&gt;&gt;informationMessage.Name" xml:space="preserve"> <data name="&gt;&gt;informationLabel.Name" xml:space="preserve">
<value>informationMessage</value> <value>informationLabel</value>
</data> </data>
<data name="&gt;&gt;informationMessage.Type" xml:space="preserve"> <data name="&gt;&gt;informationLabel.Type" xml:space="preserve">
<value>System.Windows.Forms.Label, System.Windows.Forms, Version=4.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>
<data name="&gt;&gt;informationMessage.Parent" xml:space="preserve"> <data name="&gt;&gt;informationLabel.Parent" xml:space="preserve">
<value>informationLayoutPanel</value> <value>informationLayoutPanel</value>
</data> </data>
<data name="&gt;&gt;informationMessage.ZOrder" xml:space="preserve"> <data name="&gt;&gt;informationLabel.ZOrder" xml:space="preserve">
<value>1</value> <value>1</value>
</data> </data>
<data name="informationLayoutPanel.Location" type="System.Drawing.Point, System.Drawing"> <data name="informationLayoutPanel.Location" type="System.Drawing.Point, System.Drawing">
@ -358,7 +364,7 @@
<value>3</value> <value>3</value>
</data> </data>
<data name="informationLayoutPanel.LayoutSettings" type="System.Windows.Forms.TableLayoutSettings, System.Windows.Forms"> <data name="informationLayoutPanel.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="informationImage" Row="0" RowSpan="1" Column="0" ColumnSpan="1" /&gt;&lt;Control Name="informationMessage" Row="0" RowSpan="1" Column="1" ColumnSpan="1" /&gt;&lt;/Controls&gt;&lt;Columns Styles="AutoSize,0,Percent,100" /&gt;&lt;Rows Styles="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="informationImage" Row="0" RowSpan="1" Column="0" ColumnSpan="1" /&gt;&lt;Control Name="informationLabel" Row="0" RowSpan="1" Column="1" ColumnSpan="1" /&gt;&lt;/Controls&gt;&lt;Columns Styles="AutoSize,0,Percent,100" /&gt;&lt;Rows Styles="Percent,100" /&gt;&lt;/TableLayoutSettings&gt;</value>
</data> </data>
<data name="helperLink.AutoSize" type="System.Boolean, mscorlib"> <data name="helperLink.AutoSize" type="System.Boolean, mscorlib">
<value>True</value> <value>True</value>