Fixed labels; removed unnecessary control disablement.

The blurbs should be user-centric rather than developer-centric.
No need to disable the page controls in the absence of signature/manifest
since the whole page becomes disabled in that case.

Signed-off-by: Konstantina Chremmou <konstantina.chremmou@citrix.com>
This commit is contained in:
Konstantina Chremmou 2019-07-25 09:07:24 +01:00 committed by Mihaela Stoica
parent fd95530e4f
commit 38fcc83874
5 changed files with 76 additions and 116 deletions

View File

@ -34,16 +34,14 @@
this.lblSecurityIntro = new XenAdmin.Controls.Common.AutoHeightLabel();
this.m_linkCertificate = new System.Windows.Forms.LinkLabel();
this.tableLayoutPanel1 = new System.Windows.Forms.TableLayoutPanel();
this.m_tlpManifest = new System.Windows.Forms.TableLayoutPanel();
this.m_ctrlError = new XenAdmin.Controls.Common.PasswordFailure();
this.tableLayoutPanel1.SuspendLayout();
this.m_tlpManifest.SuspendLayout();
this.SuspendLayout();
//
// m_labelVerify
//
resources.ApplyResources(this.m_labelVerify, "m_labelVerify");
this.m_tlpManifest.SetColumnSpan(this.m_labelVerify, 2);
this.tableLayoutPanel1.SetColumnSpan(this.m_labelVerify, 2);
this.m_labelVerify.Name = "m_labelVerify";
//
// m_checkBoxVerify
@ -56,6 +54,7 @@
// lblSecurityIntro
//
resources.ApplyResources(this.lblSecurityIntro, "lblSecurityIntro");
this.tableLayoutPanel1.SetColumnSpan(this.lblSecurityIntro, 2);
this.lblSecurityIntro.Name = "lblSecurityIntro";
//
// m_linkCertificate
@ -68,22 +67,17 @@
// tableLayoutPanel1
//
resources.ApplyResources(this.tableLayoutPanel1, "tableLayoutPanel1");
this.tableLayoutPanel1.Controls.Add(this.m_tlpManifest, 0, 2);
this.tableLayoutPanel1.Controls.Add(this.m_linkCertificate, 1, 2);
this.tableLayoutPanel1.Controls.Add(this.m_checkBoxVerify, 0, 2);
this.tableLayoutPanel1.Controls.Add(this.m_labelVerify, 0, 1);
this.tableLayoutPanel1.Controls.Add(this.lblSecurityIntro, 0, 0);
this.tableLayoutPanel1.Controls.Add(this.m_ctrlError, 0, 3);
this.tableLayoutPanel1.Controls.Add(this.m_ctrlError, 0, 4);
this.tableLayoutPanel1.Name = "tableLayoutPanel1";
//
// m_tlpManifest
//
resources.ApplyResources(this.m_tlpManifest, "m_tlpManifest");
this.m_tlpManifest.Controls.Add(this.m_linkCertificate, 1, 2);
this.m_tlpManifest.Controls.Add(this.m_labelVerify, 0, 0);
this.m_tlpManifest.Controls.Add(this.m_checkBoxVerify, 0, 2);
this.m_tlpManifest.Name = "m_tlpManifest";
//
// m_ctrlError
//
resources.ApplyResources(this.m_ctrlError, "m_ctrlError");
this.tableLayoutPanel1.SetColumnSpan(this.m_ctrlError, 2);
this.m_ctrlError.Name = "m_ctrlError";
//
// ImportSecurityPage
@ -94,8 +88,6 @@
this.Name = "ImportSecurityPage";
this.tableLayoutPanel1.ResumeLayout(false);
this.tableLayoutPanel1.PerformLayout();
this.m_tlpManifest.ResumeLayout(false);
this.m_tlpManifest.PerformLayout();
this.ResumeLayout(false);
}
@ -107,7 +99,6 @@
private XenAdmin.Controls.Common.AutoHeightLabel lblSecurityIntro;
private System.Windows.Forms.LinkLabel m_linkCertificate;
private System.Windows.Forms.TableLayoutPanel tableLayoutPanel1;
private System.Windows.Forms.TableLayoutPanel m_tlpManifest;
private XenAdmin.Controls.Common.PasswordFailure m_ctrlError;
}
}

View File

@ -61,17 +61,17 @@ namespace XenAdmin.Wizards.ImportWizard
/// <summary>
/// Gets the page's title (headline)
/// </summary>
public override string PageTitle { get { return Messages.IMPORT_SECURITY_PAGE_TITLE; } }
public override string PageTitle => Messages.IMPORT_SECURITY_PAGE_TITLE;
/// <summary>
/// Gets the page's label in the (left hand side) wizard progress panel
/// </summary>
public override string Text { get { return Messages.IMPORT_SECURITY_PAGE_TEXT; } }
public override string Text => Messages.IMPORT_SECURITY_PAGE_TEXT;
/// <summary>
/// Gets the value by which the help files section for this page is identified
/// </summary>
public override string HelpID { get { return "Security"; } }
public override string HelpID => "Security";
protected override bool ImplementsIsDirty()
{
@ -102,7 +102,6 @@ namespace XenAdmin.Wizards.ImportWizard
if (DisableStep)//defensive check
return;
m_tlpManifest.Enabled = m_hasManifest || m_hasSignature;
m_linkCertificate.Visible = m_hasSignature;
if (m_hasSignature)//check for signature first because m_hasManifest is True if m_hasSignature is True
@ -131,9 +130,9 @@ namespace XenAdmin.Wizards.ImportWizard
/// </summary>
public string Password { get; private set; }
public bool VerifyManifest { get { return m_hasManifest && m_tlpManifest.Enabled && m_checkBoxVerify.Checked; } }
public bool VerifyManifest => m_hasManifest && m_checkBoxVerify.Checked;
public bool VerifySignature { get { return m_hasSignature && m_tlpManifest.Enabled && m_checkBoxVerify.Checked; } }
public bool VerifySignature => m_hasSignature && m_checkBoxVerify.Checked;
/// <summary>
/// Package containing the selected OVF appliance.

View File

@ -112,25 +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="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="m_labelVerify.AutoSize" type="System.Boolean, mscorlib">
<value>True</value>
</data>
<data name="m_tlpManifest.AutoSize" type="System.Boolean, mscorlib">
<value>True</value>
</data>
<assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
<data name="m_tlpManifest.AutoSizeMode" type="System.Windows.Forms.AutoSizeMode, System.Windows.Forms">
<value>GrowAndShrink</value>
</data>
<data name="m_tlpManifest.ColumnCount" type="System.Int32, mscorlib">
<data name="tableLayoutPanel1.ColumnCount" type="System.Int32, mscorlib">
<value>2</value>
</data>
<assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
<data name="m_linkCertificate.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
<value>Left</value>
</data>
@ -140,9 +134,9 @@
<data name="m_linkCertificate.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="m_linkCertificate.Location" type="System.Drawing.Point, System.Drawing">
<value>109, 28</value>
<value>115, 57</value>
</data>
<data name="m_linkCertificate.Size" type="System.Drawing.Size, System.Drawing">
<value>80, 13</value>
@ -163,10 +157,10 @@
<value>m_linkCertificate</value>
</data>
<data name="&gt;&gt;m_linkCertificate.Type" xml:space="preserve">
<value>System.Windows.Forms.LinkLabel, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
<value>System.Windows.Forms.LinkLabel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="&gt;&gt;m_linkCertificate.Parent" xml:space="preserve">
<value>m_tlpManifest</value>
<value>tableLayoutPanel1</value>
</data>
<data name="&gt;&gt;m_linkCertificate.ZOrder" xml:space="preserve">
<value>0</value>
@ -181,10 +175,13 @@
<value>NoControl</value>
</data>
<data name="m_checkBoxVerify.Location" type="System.Drawing.Point, System.Drawing">
<value>3, 26</value>
<value>3, 55</value>
</data>
<data name="m_checkBoxVerify.Padding" type="System.Windows.Forms.Padding, System.Windows.Forms">
<value>6, 0, 0, 0</value>
</data>
<data name="m_checkBoxVerify.Size" type="System.Drawing.Size, System.Drawing">
<value>100, 17</value>
<value>106, 17</value>
</data>
<data name="m_checkBoxVerify.TabIndex" type="System.Int32, mscorlib">
<value>60</value>
@ -196,72 +193,12 @@
<value>m_checkBoxVerify</value>
</data>
<data name="&gt;&gt;m_checkBoxVerify.Type" xml:space="preserve">
<value>System.Windows.Forms.CheckBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
<value>System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="&gt;&gt;m_checkBoxVerify.Parent" xml:space="preserve">
<value>m_tlpManifest</value>
</data>
<data name="&gt;&gt;m_checkBoxVerify.ZOrder" xml:space="preserve">
<value>2</value>
</data>
<data name="m_tlpManifest.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
<value>Fill</value>
</data>
<data name="m_tlpManifest.Location" type="System.Drawing.Point, System.Drawing">
<value>3, 36</value>
</data>
<data name="m_tlpManifest.RowCount" type="System.Int32, mscorlib">
<value>3</value>
</data>
<data name="m_tlpManifest.Size" type="System.Drawing.Size, System.Drawing">
<value>509, 46</value>
</data>
<data name="m_tlpManifest.TabIndex" type="System.Int32, mscorlib">
<value>0</value>
</data>
<data name="&gt;&gt;m_tlpManifest.Name" xml:space="preserve">
<value>m_tlpManifest</value>
</data>
<data name="&gt;&gt;m_tlpManifest.Type" xml:space="preserve">
<value>System.Windows.Forms.TableLayoutPanel, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="&gt;&gt;m_tlpManifest.Parent" xml:space="preserve">
<value>tableLayoutPanel1</value>
</data>
<data name="&gt;&gt;m_tlpManifest.ZOrder" xml:space="preserve">
<value>0</value>
</data>
<data name="m_tlpManifest.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="m_linkCertificate" Row="2" RowSpan="1" Column="1" ColumnSpan="1" /&gt;&lt;Control Name="m_labelVerify" Row="0" RowSpan="1" Column="0" ColumnSpan="2" /&gt;&lt;Control Name="m_checkBoxVerify" Row="2" RowSpan="1" Column="0" ColumnSpan="1" /&gt;&lt;/Controls&gt;&lt;Columns Styles="AutoSize,0,Percent,100,Absolute,20,Absolute,20" /&gt;&lt;Rows Styles="AutoSize,0,Absolute,10,AutoSize,0,Absolute,20,Absolute,20" /&gt;&lt;/TableLayoutSettings&gt;</value>
</data>
<data name="m_labelVerify.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
<value>Fill</value>
</data>
<data name="m_labelVerify.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
<value>NoControl</value>
</data>
<data name="m_labelVerify.Location" type="System.Drawing.Point, System.Drawing">
<value>3, 0</value>
</data>
<data name="m_labelVerify.Size" type="System.Drawing.Size, System.Drawing">
<value>503, 13</value>
</data>
<data name="m_labelVerify.TabIndex" type="System.Int32, mscorlib">
<value>62</value>
</data>
<data name="m_labelVerify.Text" xml:space="preserve">
<value>labelVerify</value>
</data>
<data name="&gt;&gt;m_labelVerify.Name" xml:space="preserve">
<value>m_labelVerify</value>
</data>
<data name="&gt;&gt;m_labelVerify.Type" xml:space="preserve">
<value>XenAdmin.Controls.Common.AutoHeightLabel, XenCenterMain, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null</value>
</data>
<data name="&gt;&gt;m_labelVerify.Parent" xml:space="preserve">
<value>m_tlpManifest</value>
</data>
<data name="&gt;&gt;m_labelVerify.ZOrder" xml:space="preserve">
<data name="&gt;&gt;m_checkBoxVerify.ZOrder" xml:space="preserve">
<value>1</value>
</data>
<data name="lblSecurityIntro.AutoSize" type="System.Boolean, mscorlib">
@ -273,6 +210,9 @@
<data name="lblSecurityIntro.Location" type="System.Drawing.Point, System.Drawing">
<value>3, 0</value>
</data>
<data name="lblSecurityIntro.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
<value>3, 0, 3, 20</value>
</data>
<data name="lblSecurityIntro.Size" type="System.Drawing.Size, System.Drawing">
<value>509, 13</value>
</data>
@ -280,7 +220,7 @@
<value>65</value>
</data>
<data name="lblSecurityIntro.Text" xml:space="preserve">
<value>Security settings allow you to validate OVF/OVA package you are importing.</value>
<value>Security settings allow you to validate the OVF/OVA package you are importing.</value>
</data>
<data name="&gt;&gt;lblSecurityIntro.Name" xml:space="preserve">
<value>lblSecurityIntro</value>
@ -292,10 +232,7 @@
<value>tableLayoutPanel1</value>
</data>
<data name="&gt;&gt;lblSecurityIntro.ZOrder" xml:space="preserve">
<value>1</value>
</data>
<data name="tableLayoutPanel1.ColumnCount" type="System.Int32, mscorlib">
<value>1</value>
<value>3</value>
</data>
<data name="m_ctrlError.AutoSize" type="System.Boolean, mscorlib">
<value>True</value>
@ -331,7 +268,7 @@
<value>tableLayoutPanel1</value>
</data>
<data name="&gt;&gt;m_ctrlError.ZOrder" xml:space="preserve">
<value>2</value>
<value>4</value>
</data>
<data name="tableLayoutPanel1.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
<value>Fill</value>
@ -340,7 +277,7 @@
<value>0, 0</value>
</data>
<data name="tableLayoutPanel1.RowCount" type="System.Int32, mscorlib">
<value>5</value>
<value>6</value>
</data>
<data name="tableLayoutPanel1.Size" type="System.Drawing.Size, System.Drawing">
<value>515, 286</value>
@ -352,7 +289,7 @@
<value>tableLayoutPanel1</value>
</data>
<data name="&gt;&gt;tableLayoutPanel1.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;tableLayoutPanel1.Parent" xml:space="preserve">
<value>$this</value>
@ -361,9 +298,42 @@
<value>0</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="m_tlpManifest" Row="2" RowSpan="1" Column="0" ColumnSpan="1" /&gt;&lt;Control Name="lblSecurityIntro" Row="0" RowSpan="1" Column="0" ColumnSpan="1" /&gt;&lt;Control Name="m_ctrlError" Row="3" RowSpan="1" Column="0" ColumnSpan="1" /&gt;&lt;/Controls&gt;&lt;Columns Styles="Percent,100" /&gt;&lt;Rows Styles="AutoSize,0,Absolute,20,AutoSize,0,AutoSize,0,Percent,100,Absolute,20,Absolute,20" /&gt;&lt;/TableLayoutSettings&gt;</value>
<value>&lt;?xml version="1.0" encoding="utf-16"?&gt;&lt;TableLayoutSettings&gt;&lt;Controls&gt;&lt;Control Name="m_linkCertificate" Row="2" RowSpan="1" Column="1" ColumnSpan="1" /&gt;&lt;Control Name="m_checkBoxVerify" Row="2" RowSpan="1" Column="0" ColumnSpan="1" /&gt;&lt;Control Name="m_labelVerify" Row="1" RowSpan="1" Column="0" ColumnSpan="2" /&gt;&lt;Control Name="lblSecurityIntro" Row="0" RowSpan="1" Column="0" ColumnSpan="2" /&gt;&lt;Control Name="m_ctrlError" Row="4" RowSpan="1" Column="0" ColumnSpan="2" /&gt;&lt;/Controls&gt;&lt;Columns Styles="AutoSize,0,Percent,100" /&gt;&lt;Rows Styles="AutoSize,0,AutoSize,0,AutoSize,0,Absolute,10,AutoSize,0,Percent,100" /&gt;&lt;/TableLayoutSettings&gt;</value>
</data>
<metadata name="$this.Localizable" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<data name="m_labelVerify.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
<value>Fill</value>
</data>
<data name="m_labelVerify.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
<value>NoControl</value>
</data>
<data name="m_labelVerify.Location" type="System.Drawing.Point, System.Drawing">
<value>3, 33</value>
</data>
<data name="m_labelVerify.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
<value>3, 0, 3, 6</value>
</data>
<data name="m_labelVerify.Size" type="System.Drawing.Size, System.Drawing">
<value>509, 13</value>
</data>
<data name="m_labelVerify.TabIndex" type="System.Int32, mscorlib">
<value>62</value>
</data>
<data name="m_labelVerify.Text" xml:space="preserve">
<value>labelVerify</value>
</data>
<data name="&gt;&gt;m_labelVerify.Name" xml:space="preserve">
<value>m_labelVerify</value>
</data>
<data name="&gt;&gt;m_labelVerify.Type" xml:space="preserve">
<value>XenAdmin.Controls.Common.AutoHeightLabel, XenCenterMain, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null</value>
</data>
<data name="&gt;&gt;m_labelVerify.Parent" xml:space="preserve">
<value>tableLayoutPanel1</value>
</data>
<data name="&gt;&gt;m_labelVerify.ZOrder" xml:space="preserve">
<value>2</value>
</data>
<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">
@ -376,6 +346,6 @@
<value>ImportSecurityPage</value>
</data>
<data name="&gt;&gt;$this.Type" xml:space="preserve">
<value>XenAdmin.Wizards.GenericPages.ImExPortPage, XenCenterMain, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null</value>
<value>XenAdmin.Controls.XenTabPage, XenCenterMain, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null</value>
</data>
</root>

View File

@ -18933,7 +18933,7 @@ namespace XenAdmin {
}
/// <summary>
/// Looks up a localized string similar to Verify the manifest matches the appliance files. This option will only activate if the appliance has a manifest file..
/// Looks up a localized string similar to The appliance has a manifest file. You can choose to verify the manifest matches the appliance files..
/// </summary>
public static string IMPORT_SECURITY_PAGE_VERIFY_CONTENT_DESCRIPTION {
get {
@ -18951,7 +18951,7 @@ namespace XenAdmin {
}
/// <summary>
/// Looks up a localized string similar to Verify the digital signature of the appliance is valid. This option will activate only if the appliance has been digitally signed..
/// Looks up a localized string similar to The appliance has been digitally signed. You can choose to verify the digital signature of the appliance is valid..
/// </summary>
public static string IMPORT_SECURITY_PAGE_VERIFY_PRODUCER_DESCRIPTION {
get {

View File

@ -6651,13 +6651,13 @@ This might result in failure to migrate VMs to this server during the RPU or to
<value>&amp;Verify manifest content</value>
</data>
<data name="IMPORT_SECURITY_PAGE_VERIFY_CONTENT_DESCRIPTION" xml:space="preserve">
<value>Verify the manifest matches the appliance files. This option will only activate if the appliance has a manifest file.</value>
<value>The appliance has a manifest file. You can choose to verify the manifest matches the appliance files.</value>
</data>
<data name="IMPORT_SECURITY_PAGE_VERIFY_PRODUCER" xml:space="preserve">
<value>&amp;Verify digital signature</value>
</data>
<data name="IMPORT_SECURITY_PAGE_VERIFY_PRODUCER_DESCRIPTION" xml:space="preserve">
<value>Verify the digital signature of the appliance is valid. This option will activate only if the appliance has been digitally signed.</value>
<value>The appliance has been digitally signed. You can choose to verify the digital signature of the appliance is valid.</value>
</data>
<data name="IMPORT_SELECT_APPLIANCE_PAGE_ERROR_CORRUPT_OVA" xml:space="preserve">
<value>OVA file is corrupt or contains invalid data.</value>