Fixed Next button state when re-landing on the page. Usability enhancements.

Property modernisation.

Signed-off-by: Konstantina Chremmou <konstantina.chremmou@citrix.com>
This commit is contained in:
Konstantina Chremmou 2021-01-09 04:46:11 +00:00
parent d1f73a6ba0
commit abd6b41926
3 changed files with 135 additions and 110 deletions

View File

@ -109,7 +109,6 @@
resources.ApplyResources(this.sectionHeaderLabel3, "sectionHeaderLabel3");
this.sectionHeaderLabel3.LineColor = System.Drawing.SystemColors.Window;
this.sectionHeaderLabel3.LineLocation = XenAdmin.Controls.SectionHeaderLabel.VerticalAlignment.Middle;
this.sectionHeaderLabel3.MinimumSize = new System.Drawing.Size(0, 14);
this.sectionHeaderLabel3.Name = "sectionHeaderLabel3";
//
// m_tableLayoutPanelEncryption
@ -165,7 +164,6 @@
resources.ApplyResources(this.sectionHeaderLabel2, "sectionHeaderLabel2");
this.sectionHeaderLabel2.LineColor = System.Drawing.SystemColors.Window;
this.sectionHeaderLabel2.LineLocation = XenAdmin.Controls.SectionHeaderLabel.VerticalAlignment.Middle;
this.sectionHeaderLabel2.MinimumSize = new System.Drawing.Size(0, 14);
this.sectionHeaderLabel2.Name = "sectionHeaderLabel2";
//
// sectionHeaderLabel1
@ -173,7 +171,6 @@
resources.ApplyResources(this.sectionHeaderLabel1, "sectionHeaderLabel1");
this.sectionHeaderLabel1.LineColor = System.Drawing.SystemColors.Window;
this.sectionHeaderLabel1.LineLocation = XenAdmin.Controls.SectionHeaderLabel.VerticalAlignment.Middle;
this.sectionHeaderLabel1.MinimumSize = new System.Drawing.Size(0, 14);
this.sectionHeaderLabel1.Name = "sectionHeaderLabel1";
//
// tableLayoutPanel2
@ -189,12 +186,12 @@
this.m_tableLayoutPanelManifest.Controls.Add(this.m_labelCertificate, 2, 1);
this.m_tableLayoutPanelManifest.Controls.Add(this.m_labelPrivateKeyPwd, 2, 2);
this.m_tableLayoutPanelManifest.Controls.Add(this.m_checkBoxSign, 1, 0);
this.m_tableLayoutPanelManifest.Controls.Add(this.m_buttonBrowseCert, 5, 1);
this.m_tableLayoutPanelManifest.Controls.Add(this.m_buttonBrowseCert, 4, 1);
this.m_tableLayoutPanelManifest.Controls.Add(this.m_textBoxPrivateKeyPwd, 3, 2);
this.m_tableLayoutPanelManifest.Controls.Add(this.m_textBoxCertificate, 3, 1);
this.m_tableLayoutPanelManifest.Controls.Add(this.m_ctrlErrorCert, 3, 3);
this.m_tableLayoutPanelManifest.Controls.Add(this.m_buttonValidate, 5, 2);
this.m_tableLayoutPanelManifest.Controls.Add(this.m_pictureBoxTickValidate, 6, 2);
this.m_tableLayoutPanelManifest.Controls.Add(this.m_buttonValidate, 4, 2);
this.m_tableLayoutPanelManifest.Controls.Add(this.m_pictureBoxTickValidate, 5, 2);
this.m_tableLayoutPanelManifest.Name = "m_tableLayoutPanelManifest";
//
// m_labelCertificate
@ -224,7 +221,6 @@
//
// m_textBoxPrivateKeyPwd
//
this.m_tableLayoutPanelManifest.SetColumnSpan(this.m_textBoxPrivateKeyPwd, 2);
resources.ApplyResources(this.m_textBoxPrivateKeyPwd, "m_textBoxPrivateKeyPwd");
this.m_textBoxPrivateKeyPwd.Name = "m_textBoxPrivateKeyPwd";
this.m_textBoxPrivateKeyPwd.UseSystemPasswordChar = true;
@ -232,7 +228,6 @@
//
// m_textBoxCertificate
//
this.m_tableLayoutPanelManifest.SetColumnSpan(this.m_textBoxCertificate, 2);
resources.ApplyResources(this.m_textBoxCertificate, "m_textBoxCertificate");
this.m_textBoxCertificate.Name = "m_textBoxCertificate";
this.m_textBoxCertificate.TextChanged += new System.EventHandler(this.m_textBoxCertificate_TextChanged);
@ -240,7 +235,6 @@
// m_ctrlErrorCert
//
resources.ApplyResources(this.m_ctrlErrorCert, "m_ctrlErrorCert");
this.m_tableLayoutPanelManifest.SetColumnSpan(this.m_ctrlErrorCert, 2);
this.m_ctrlErrorCert.Name = "m_ctrlErrorCert";
//
// m_buttonValidate

View File

@ -54,6 +54,7 @@ namespace XenAdmin.Wizards.ExportWizard
private bool m_isEncryptionOk = true;
private bool m_isSignatureOk = true;
private bool m_buttonNextEnabled;
private bool _updating;
public ExportOptionsPage()
{
@ -63,7 +64,6 @@ namespace XenAdmin.Wizards.ExportWizard
m_labelStrength.Visible = false;
m_pictureBoxTick.Visible = false;
m_pictureBoxTickValidate.Visible = false;
m_tableLayoutPanelManifest.Enabled = m_checkBoxManifest.Checked;
//CA-59159: encryption is not supported for Boston
sectionHeaderLabel2.Visible = false;
@ -75,12 +75,12 @@ namespace XenAdmin.Wizards.ExportWizard
/// <summary>
/// Gets a value indicating whether to create a manifest file
/// </summary>
public bool CreateManifest { get { return m_checkBoxManifest.Checked; } }
public bool CreateManifest => m_checkBoxManifest.Checked;
/// <summary>
/// Gets a value indicating whether to sign the appliance
/// </summary>
public bool SignAppliance { get { return m_checkBoxSign.Checked; } }
public bool SignAppliance => m_checkBoxSign.Checked;
/// <summary>
/// Gets the certificate used to create the signature
@ -90,22 +90,22 @@ namespace XenAdmin.Wizards.ExportWizard
/// <summary>
/// Gets a value indicating whether to encrypt the files reference in the OVF package.
/// </summary>
public bool EncryptFiles { get { return m_checkBoxEncrypt.Checked; } }
public bool EncryptFiles => m_checkBoxEncrypt.Checked;
/// <summary>
/// Gets the password used for the encryption of the OVF files
/// </summary>
public string EncryptPassword { get { return m_textBoxPwd.Text; } }
public string EncryptPassword => m_textBoxPwd.Text;
/// <summary>
/// Gets a value indicating whether the appliance will be exproted as a single OVA file
/// </summary>
public bool CreateOVA { get { return m_checkBoxCreateOVA.Checked; } }
public bool CreateOVA => m_checkBoxCreateOVA.Checked;
/// <summary>
/// Gets a value indicating whether the OVF files should be compressed
/// </summary>
public bool CompressOVFfiles { get { return m_checkBoxCompressFiles.Checked; } }
public bool CompressOVFfiles => m_checkBoxCompressFiles.Checked;
#endregion
@ -114,21 +114,21 @@ namespace XenAdmin.Wizards.ExportWizard
/// <summary>
/// Gets the page's title (headline)
/// </summary>
public override string PageTitle { get { return Messages.EXPORT_OPTIONS_PAGE_TITLE; } }
public override string PageTitle => Messages.EXPORT_OPTIONS_PAGE_TITLE;
/// <summary>
/// Gets the page's label in the (left hand side) wizard progress panel
/// </summary>
public override string Text { get { return Messages.EXPORT_OPTIONS_PAGE_TEXT; } }
public override string Text => Messages.EXPORT_OPTIONS_PAGE_TEXT;
/// <summary>
/// Gets the value by which the help files section for this page is identified
/// </summary>
public override string HelpID { get { return "ExportOptions"; } }
public override string HelpID => "ExportOptions";
protected override void PageLoadedCore(PageLoadedDirection direction)
{
SetButtonNextEnabled(true);
SetButtonNextEnabled(!IsDirty || m_isEncryptionOk && m_isSignatureOk);
}
protected override void PageLeaveCore(PageLoadedDirection direction, ref bool cancel)
@ -151,17 +151,6 @@ namespace XenAdmin.Wizards.ExportWizard
#region Private methods
/// <summary>
/// Performs certain checks on the pages's input data and shows/hides an error accordingly
/// </summary>
/// <param name="checks">The checks to perform</param>
private bool PerformCheck(params CheckDelegate[] checks)
{
bool success = m_ctrlErrorCert.PerformCheck(checks);
SetButtonNextEnabled(success);
return m_buttonNextEnabled;
}
private void SetButtonNextEnabled(bool enabled)
{
m_buttonNextEnabled = enabled;
@ -198,7 +187,7 @@ namespace XenAdmin.Wizards.ExportWizard
SetButtonNextEnabled(m_isEncryptionOk && m_isSignatureOk);
}
private void CalculatePassordStrength()
private void CalculatePasswordStrength()
{
if (String.IsNullOrEmpty(m_textBoxPwd.Text))
{
@ -276,8 +265,8 @@ namespace XenAdmin.Wizards.ExportWizard
{
if (m_checkBoxManifest.Checked && m_checkBoxSign.Checked)
{
if (String.IsNullOrEmpty(m_textBoxCertificate.Text) || String.IsNullOrEmpty(m_textBoxPrivateKeyPwd.Text)
|| !PerformCheck(CheckCertificatePathValid, CheckCertificatePathExists, CheckSignPasswordValid, CheckCertificateValid))
if (string.IsNullOrEmpty(m_textBoxCertificate.Text) || string.IsNullOrEmpty(m_textBoxPrivateKeyPwd.Text)
|| !m_ctrlErrorCert.PerformCheck(CheckCertificatePathValid, CheckCertificatePathExists, CheckSignPasswordValid, CheckCertificateValid))
{
m_pictureBoxTickValidate.Visible = false;
m_isSignatureOk = false;
@ -358,13 +347,28 @@ namespace XenAdmin.Wizards.ExportWizard
private void m_checkBoxManifest_CheckedChanged(object sender, EventArgs e)
{
m_tableLayoutPanelManifest.Enabled = m_checkBoxManifest.Checked;
if (_updating)
return;
_updating = true;
if (!m_checkBoxManifest.Checked)
m_checkBoxSign.Checked = false;
_updating = false;
OnSignatureChanged();
IsDirty = true;
}
private void m_checkBoxSign_CheckedChanged(object sender, EventArgs e)
{
if (_updating)
return;
_updating = true;
if (m_checkBoxSign.Checked)
m_checkBoxManifest.Checked = true;
_updating = false;
OnSignatureChanged();
IsDirty = true;
}
@ -412,7 +416,7 @@ namespace XenAdmin.Wizards.ExportWizard
private void m_textBoxPwd_TextChanged(object sender, EventArgs e)
{
ToggleEncryptionCheckBoxCheckedState();
CalculatePassordStrength();
CalculatePasswordStrength();
OnEncryptionChanged();
IsDirty = true;
}

View File

@ -112,12 +112,12 @@
<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_checkBoxEncrypt.AutoSize" type="System.Boolean, mscorlib">
<value>True</value>
</data>
@ -127,14 +127,14 @@
<data name="m_tableLayoutPanelEncryption.ColumnCount" type="System.Int32, mscorlib">
<value>4</value>
</data>
<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="m_labelPwd.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
<value>Left</value>
</data>
<data name="m_labelPwd.AutoSize" type="System.Boolean, mscorlib">
<value>True</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_labelPwd.Location" type="System.Drawing.Point, System.Drawing">
<value>23, 29</value>
</data>
@ -142,7 +142,7 @@
<value>56, 13</value>
</data>
<data name="m_labelPwd.TabIndex" type="System.Int32, mscorlib">
<value>32</value>
<value>1</value>
</data>
<data name="m_labelPwd.Text" xml:space="preserve">
<value>P&amp;assword:</value>
@ -151,7 +151,7 @@
<value>m_labelPwd</value>
</data>
<data name="&gt;&gt;m_labelPwd.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;m_labelPwd.Parent" xml:space="preserve">
<value>m_tableLayoutPanelEncryption</value>
@ -169,13 +169,13 @@
<value>194, 20</value>
</data>
<data name="m_textBoxPwd.TabIndex" type="System.Int32, mscorlib">
<value>33</value>
<value>2</value>
</data>
<data name="&gt;&gt;m_textBoxPwd.Name" xml:space="preserve">
<value>m_textBoxPwd</value>
</data>
<data name="&gt;&gt;m_textBoxPwd.Type" xml:space="preserve">
<value>System.Windows.Forms.TextBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
<value>System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="&gt;&gt;m_textBoxPwd.Parent" xml:space="preserve">
<value>m_tableLayoutPanelEncryption</value>
@ -193,13 +193,13 @@
<value>194, 20</value>
</data>
<data name="m_textBoxReEnterPwd.TabIndex" type="System.Int32, mscorlib">
<value>36</value>
<value>5</value>
</data>
<data name="&gt;&gt;m_textBoxReEnterPwd.Name" xml:space="preserve">
<value>m_textBoxReEnterPwd</value>
</data>
<data name="&gt;&gt;m_textBoxReEnterPwd.Type" xml:space="preserve">
<value>System.Windows.Forms.TextBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
<value>System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="&gt;&gt;m_textBoxReEnterPwd.Parent" xml:space="preserve">
<value>m_tableLayoutPanelEncryption</value>
@ -220,7 +220,7 @@
<value>99, 13</value>
</data>
<data name="m_labelReEnterPwd.TabIndex" type="System.Int32, mscorlib">
<value>35</value>
<value>4</value>
</data>
<data name="m_labelReEnterPwd.Text" xml:space="preserve">
<value>&amp;Re-enter password:</value>
@ -229,7 +229,7 @@
<value>m_labelReEnterPwd</value>
</data>
<data name="&gt;&gt;m_labelReEnterPwd.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;m_labelReEnterPwd.Parent" xml:space="preserve">
<value>m_tableLayoutPanelEncryption</value>
@ -253,7 +253,7 @@
<value>m_pictureBoxTick</value>
</data>
<data name="&gt;&gt;m_pictureBoxTick.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;m_pictureBoxTick.Parent" xml:space="preserve">
<value>m_tableLayoutPanelEncryption</value>
@ -274,7 +274,7 @@
<value>257, 26</value>
</data>
<data name="m_labelStrength.TabIndex" type="System.Int32, mscorlib">
<value>34</value>
<value>3</value>
</data>
<data name="m_labelStrength.Text" xml:space="preserve">
<value>label1</value>
@ -286,7 +286,7 @@
<value>m_labelStrength</value>
</data>
<data name="&gt;&gt;m_labelStrength.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;m_labelStrength.Parent" xml:space="preserve">
<value>m_tableLayoutPanelEncryption</value>
@ -298,7 +298,7 @@
<value>Fill</value>
</data>
<data name="m_tableLayoutPanelEncryption.Location" type="System.Drawing.Point, System.Drawing">
<value>3, 181</value>
<value>3, 194</value>
</data>
<data name="m_tableLayoutPanelEncryption.RowCount" type="System.Int32, mscorlib">
<value>3</value>
@ -307,13 +307,13 @@
<value>588, 75</value>
</data>
<data name="m_tableLayoutPanelEncryption.TabIndex" type="System.Int32, mscorlib">
<value>4</value>
<value>3</value>
</data>
<data name="&gt;&gt;m_tableLayoutPanelEncryption.Name" xml:space="preserve">
<value>m_tableLayoutPanelEncryption</value>
</data>
<data name="&gt;&gt;m_tableLayoutPanelEncryption.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;m_tableLayoutPanelEncryption.Parent" xml:space="preserve">
<value>tableLayoutPanel1</value>
@ -331,7 +331,7 @@
<value>151, 17</value>
</data>
<data name="m_checkBoxEncrypt.TabIndex" type="System.Int32, mscorlib">
<value>31</value>
<value>0</value>
</data>
<data name="m_checkBoxEncrypt.Text" xml:space="preserve">
<value>&amp;Encrypt the exported file(s)</value>
@ -340,7 +340,7 @@
<value>m_checkBoxEncrypt</value>
</data>
<data name="&gt;&gt;m_checkBoxEncrypt.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_checkBoxEncrypt.Parent" xml:space="preserve">
<value>m_tableLayoutPanelEncryption</value>
@ -358,7 +358,7 @@
<value>108, 17</value>
</data>
<data name="m_checkBoxManifest.TabIndex" type="System.Int32, mscorlib">
<value>11</value>
<value>0</value>
</data>
<data name="m_checkBoxManifest.Text" xml:space="preserve">
<value>Create a &amp;manifest</value>
@ -367,7 +367,7 @@
<value>m_checkBoxManifest</value>
</data>
<data name="&gt;&gt;m_checkBoxManifest.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_checkBoxManifest.Parent" xml:space="preserve">
<value>tableLayoutPanel2</value>
@ -388,13 +388,13 @@
<value>NoControl</value>
</data>
<data name="m_checkBoxCompressFiles.Location" type="System.Drawing.Point, System.Drawing">
<value>3, 305</value>
<value>3, 318</value>
</data>
<data name="m_checkBoxCompressFiles.Size" type="System.Drawing.Size, System.Drawing">
<value>588, 17</value>
</data>
<data name="m_checkBoxCompressFiles.TabIndex" type="System.Int32, mscorlib">
<value>7</value>
<value>6</value>
</data>
<data name="m_checkBoxCompressFiles.Text" xml:space="preserve">
<value>C&amp;ompress OVF files</value>
@ -403,7 +403,7 @@
<value>m_checkBoxCompressFiles</value>
</data>
<data name="&gt;&gt;m_checkBoxCompressFiles.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_checkBoxCompressFiles.Parent" xml:space="preserve">
<value>tableLayoutPanel1</value>
@ -421,13 +421,13 @@
<value>NoControl</value>
</data>
<data name="m_checkBoxCreateOVA.Location" type="System.Drawing.Point, System.Drawing">
<value>3, 282</value>
<value>3, 295</value>
</data>
<data name="m_checkBoxCreateOVA.Size" type="System.Drawing.Size, System.Drawing">
<value>588, 17</value>
</data>
<data name="m_checkBoxCreateOVA.TabIndex" type="System.Int32, mscorlib">
<value>6</value>
<value>5</value>
</data>
<data name="m_checkBoxCreateOVA.Text" xml:space="preserve">
<value>Create OVA pac&amp;kage (single OVA export file)</value>
@ -436,7 +436,7 @@
<value>m_checkBoxCreateOVA</value>
</data>
<data name="&gt;&gt;m_checkBoxCreateOVA.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_checkBoxCreateOVA.Parent" xml:space="preserve">
<value>tableLayoutPanel1</value>
@ -450,6 +450,9 @@
<data name="sectionHeaderLabel3.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
<value>Top</value>
</data>
<data name="sectionHeaderLabel3.FocusControl" type="System.Resources.ResXNullRef, System.Windows.Forms">
<value />
</data>
<data name="sectionHeaderLabel3.LabelHorizontalAlignment" type="System.Windows.Forms.HorizontalAlignment, System.Windows.Forms">
<value>Left</value>
</data>
@ -463,13 +466,19 @@
<value>0, 0, 0, 0</value>
</data>
<data name="sectionHeaderLabel3.Location" type="System.Drawing.Point, System.Drawing">
<value>3, 262</value>
<value>3, 275</value>
</data>
<data name="sectionHeaderLabel3.MinimumSize" type="System.Drawing.Size, System.Drawing">
<value>0, 14</value>
</data>
<data name="sectionHeaderLabel3.Size" type="System.Drawing.Size, System.Drawing">
<value>588, 14</value>
</data>
<data name="sectionHeaderLabel3.TabIndex" type="System.Int32, mscorlib">
<value>5</value>
<value>4</value>
</data>
<data name="sectionHeaderLabel3.UseMnemonic" type="System.Boolean, mscorlib">
<value>False</value>
</data>
<data name="&gt;&gt;sectionHeaderLabel3.Name" xml:space="preserve">
<value>sectionHeaderLabel3</value>
@ -489,6 +498,9 @@
<data name="sectionHeaderLabel2.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
<value>Top</value>
</data>
<data name="sectionHeaderLabel2.FocusControl" type="System.Resources.ResXNullRef, System.Windows.Forms">
<value />
</data>
<data name="sectionHeaderLabel2.LabelHorizontalAlignment" type="System.Windows.Forms.HorizontalAlignment, System.Windows.Forms">
<value>Left</value>
</data>
@ -502,13 +514,19 @@
<value>0, 0, 0, 0</value>
</data>
<data name="sectionHeaderLabel2.Location" type="System.Drawing.Point, System.Drawing">
<value>3, 161</value>
<value>3, 174</value>
</data>
<data name="sectionHeaderLabel2.MinimumSize" type="System.Drawing.Size, System.Drawing">
<value>0, 14</value>
</data>
<data name="sectionHeaderLabel2.Size" type="System.Drawing.Size, System.Drawing">
<value>588, 14</value>
</data>
<data name="sectionHeaderLabel2.TabIndex" type="System.Int32, mscorlib">
<value>3</value>
<value>2</value>
</data>
<data name="sectionHeaderLabel2.UseMnemonic" type="System.Boolean, mscorlib">
<value>False</value>
</data>
<data name="&gt;&gt;sectionHeaderLabel2.Name" xml:space="preserve">
<value>sectionHeaderLabel2</value>
@ -528,6 +546,9 @@
<data name="sectionHeaderLabel1.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
<value>Top</value>
</data>
<data name="sectionHeaderLabel1.FocusControl" type="System.Resources.ResXNullRef, System.Windows.Forms">
<value />
</data>
<data name="sectionHeaderLabel1.LabelHorizontalAlignment" type="System.Windows.Forms.HorizontalAlignment, System.Windows.Forms">
<value>Left</value>
</data>
@ -543,11 +564,17 @@
<data name="sectionHeaderLabel1.Location" type="System.Drawing.Point, System.Drawing">
<value>3, 3</value>
</data>
<data name="sectionHeaderLabel1.MinimumSize" type="System.Drawing.Size, System.Drawing">
<value>0, 14</value>
</data>
<data name="sectionHeaderLabel1.Size" type="System.Drawing.Size, System.Drawing">
<value>588, 14</value>
</data>
<data name="sectionHeaderLabel1.TabIndex" type="System.Int32, mscorlib">
<value>1</value>
<value>0</value>
</data>
<data name="sectionHeaderLabel1.UseMnemonic" type="System.Boolean, mscorlib">
<value>False</value>
</data>
<data name="&gt;&gt;sectionHeaderLabel1.Name" xml:space="preserve">
<value>sectionHeaderLabel1</value>
@ -574,7 +601,7 @@
<value>True</value>
</data>
<data name="m_tableLayoutPanelManifest.ColumnCount" type="System.Int32, mscorlib">
<value>7</value>
<value>6</value>
</data>
<data name="m_labelCertificate.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
<value>Left</value>
@ -592,7 +619,7 @@
<value>81, 13</value>
</data>
<data name="m_labelCertificate.TabIndex" type="System.Int32, mscorlib">
<value>22</value>
<value>1</value>
</data>
<data name="m_labelCertificate.Text" xml:space="preserve">
<value>&amp;Certificate path:</value>
@ -601,7 +628,7 @@
<value>m_labelCertificate</value>
</data>
<data name="&gt;&gt;m_labelCertificate.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;m_labelCertificate.Parent" xml:space="preserve">
<value>m_tableLayoutPanelManifest</value>
@ -625,7 +652,7 @@
<value>111, 13</value>
</data>
<data name="m_labelPrivateKeyPwd.TabIndex" type="System.Int32, mscorlib">
<value>25</value>
<value>4</value>
</data>
<data name="m_labelPrivateKeyPwd.Text" xml:space="preserve">
<value>Private key pass&amp;word:</value>
@ -634,7 +661,7 @@
<value>m_labelPrivateKeyPwd</value>
</data>
<data name="&gt;&gt;m_labelPrivateKeyPwd.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;m_labelPrivateKeyPwd.Parent" xml:space="preserve">
<value>m_tableLayoutPanelManifest</value>
@ -658,7 +685,7 @@
<value>134, 17</value>
</data>
<data name="m_checkBoxSign.TabIndex" type="System.Int32, mscorlib">
<value>21</value>
<value>0</value>
</data>
<data name="m_checkBoxSign.Text" xml:space="preserve">
<value>&amp;Sign the OVF package</value>
@ -667,7 +694,7 @@
<value>m_checkBoxSign</value>
</data>
<data name="&gt;&gt;m_checkBoxSign.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_checkBoxSign.Parent" xml:space="preserve">
<value>m_tableLayoutPanelManifest</value>
@ -679,13 +706,13 @@
<value>NoControl</value>
</data>
<data name="m_buttonBrowseCert.Location" type="System.Drawing.Point, System.Drawing">
<value>474, 26</value>
<value>482, 26</value>
</data>
<data name="m_buttonBrowseCert.Size" type="System.Drawing.Size, System.Drawing">
<value>75, 23</value>
</data>
<data name="m_buttonBrowseCert.TabIndex" type="System.Int32, mscorlib">
<value>24</value>
<value>3</value>
</data>
<data name="m_buttonBrowseCert.Text" xml:space="preserve">
<value>&amp;Browse...</value>
@ -694,7 +721,7 @@
<value>m_buttonBrowseCert</value>
</data>
<data name="&gt;&gt;m_buttonBrowseCert.Type" xml:space="preserve">
<value>System.Windows.Forms.Button, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
<value>System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="&gt;&gt;m_buttonBrowseCert.Parent" xml:space="preserve">
<value>m_tableLayoutPanelManifest</value>
@ -702,23 +729,23 @@
<data name="&gt;&gt;m_buttonBrowseCert.ZOrder" xml:space="preserve">
<value>3</value>
</data>
<data name="m_textBoxPrivateKeyPwd.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
<value>Fill</value>
<data name="m_textBoxPrivateKeyPwd.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
<value>Left, Right</value>
</data>
<data name="m_textBoxPrivateKeyPwd.Location" type="System.Drawing.Point, System.Drawing">
<value>163, 55</value>
<value>163, 56</value>
</data>
<data name="m_textBoxPrivateKeyPwd.Size" type="System.Drawing.Size, System.Drawing">
<value>305, 20</value>
<value>313, 20</value>
</data>
<data name="m_textBoxPrivateKeyPwd.TabIndex" type="System.Int32, mscorlib">
<value>26</value>
<value>5</value>
</data>
<data name="&gt;&gt;m_textBoxPrivateKeyPwd.Name" xml:space="preserve">
<value>m_textBoxPrivateKeyPwd</value>
</data>
<data name="&gt;&gt;m_textBoxPrivateKeyPwd.Type" xml:space="preserve">
<value>System.Windows.Forms.TextBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
<value>System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="&gt;&gt;m_textBoxPrivateKeyPwd.Parent" xml:space="preserve">
<value>m_tableLayoutPanelManifest</value>
@ -726,23 +753,23 @@
<data name="&gt;&gt;m_textBoxPrivateKeyPwd.ZOrder" xml:space="preserve">
<value>4</value>
</data>
<data name="m_textBoxCertificate.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
<value>Fill</value>
<data name="m_textBoxCertificate.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
<value>Left, Right</value>
</data>
<data name="m_textBoxCertificate.Location" type="System.Drawing.Point, System.Drawing">
<value>163, 26</value>
<value>163, 27</value>
</data>
<data name="m_textBoxCertificate.Size" type="System.Drawing.Size, System.Drawing">
<value>305, 20</value>
<value>313, 20</value>
</data>
<data name="m_textBoxCertificate.TabIndex" type="System.Int32, mscorlib">
<value>23</value>
<value>2</value>
</data>
<data name="&gt;&gt;m_textBoxCertificate.Name" xml:space="preserve">
<value>m_textBoxCertificate</value>
</data>
<data name="&gt;&gt;m_textBoxCertificate.Type" xml:space="preserve">
<value>System.Windows.Forms.TextBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
<value>System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="&gt;&gt;m_textBoxCertificate.Parent" xml:space="preserve">
<value>m_tableLayoutPanelManifest</value>
@ -769,10 +796,10 @@
<value>0, 0, 0, 0</value>
</data>
<data name="m_ctrlErrorCert.Size" type="System.Drawing.Size, System.Drawing">
<value>311, 22</value>
<value>319, 35</value>
</data>
<data name="m_ctrlErrorCert.TabIndex" type="System.Int32, mscorlib">
<value>28</value>
<value>7</value>
</data>
<data name="&gt;&gt;m_ctrlErrorCert.Name" xml:space="preserve">
<value>m_ctrlErrorCert</value>
@ -787,13 +814,13 @@
<value>6</value>
</data>
<data name="m_buttonValidate.Location" type="System.Drawing.Point, System.Drawing">
<value>474, 55</value>
<value>482, 55</value>
</data>
<data name="m_buttonValidate.Size" type="System.Drawing.Size, System.Drawing">
<value>75, 23</value>
</data>
<data name="m_buttonValidate.TabIndex" type="System.Int32, mscorlib">
<value>27</value>
<value>6</value>
</data>
<data name="m_buttonValidate.Text" xml:space="preserve">
<value>&amp;Validate</value>
@ -802,7 +829,7 @@
<value>m_buttonValidate</value>
</data>
<data name="&gt;&gt;m_buttonValidate.Type" xml:space="preserve">
<value>System.Windows.Forms.Button, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
<value>System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="&gt;&gt;m_buttonValidate.Parent" xml:space="preserve">
<value>m_tableLayoutPanelManifest</value>
@ -814,7 +841,7 @@
<value>Left</value>
</data>
<data name="m_pictureBoxTickValidate.Location" type="System.Drawing.Point, System.Drawing">
<value>555, 58</value>
<value>563, 58</value>
</data>
<data name="m_pictureBoxTickValidate.Size" type="System.Drawing.Size, System.Drawing">
<value>16, 16</value>
@ -826,7 +853,7 @@
<value>m_pictureBoxTickValidate</value>
</data>
<data name="&gt;&gt;m_pictureBoxTickValidate.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;m_pictureBoxTickValidate.Parent" xml:space="preserve">
<value>m_tableLayoutPanelManifest</value>
@ -844,16 +871,16 @@
<value>4</value>
</data>
<data name="m_tableLayoutPanelManifest.Size" type="System.Drawing.Size, System.Drawing">
<value>582, 103</value>
<value>582, 116</value>
</data>
<data name="m_tableLayoutPanelManifest.TabIndex" type="System.Int32, mscorlib">
<value>12</value>
<value>1</value>
</data>
<data name="&gt;&gt;m_tableLayoutPanelManifest.Name" xml:space="preserve">
<value>m_tableLayoutPanelManifest</value>
</data>
<data name="&gt;&gt;m_tableLayoutPanelManifest.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;m_tableLayoutPanelManifest.Parent" xml:space="preserve">
<value>tableLayoutPanel2</value>
@ -862,7 +889,7 @@
<value>1</value>
</data>
<data name="m_tableLayoutPanelManifest.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_labelCertificate" Row="1" RowSpan="1" Column="2" ColumnSpan="1" /&gt;&lt;Control Name="m_labelPrivateKeyPwd" Row="2" RowSpan="1" Column="2" ColumnSpan="1" /&gt;&lt;Control Name="m_checkBoxSign" Row="0" RowSpan="1" Column="1" ColumnSpan="2" /&gt;&lt;Control Name="m_buttonBrowseCert" Row="1" RowSpan="1" Column="5" ColumnSpan="1" /&gt;&lt;Control Name="m_textBoxPrivateKeyPwd" Row="2" RowSpan="1" Column="3" ColumnSpan="2" /&gt;&lt;Control Name="m_textBoxCertificate" Row="1" RowSpan="1" Column="3" ColumnSpan="2" /&gt;&lt;Control Name="m_ctrlErrorCert" Row="3" RowSpan="1" Column="3" ColumnSpan="2" /&gt;&lt;Control Name="m_buttonValidate" Row="2" RowSpan="1" Column="5" ColumnSpan="1" /&gt;&lt;Control Name="m_pictureBoxTickValidate" Row="2" RowSpan="1" Column="6" ColumnSpan="1" /&gt;&lt;/Controls&gt;&lt;Columns Styles="Absolute,20,Absolute,20,AutoSize,0,AutoSize,0,Percent,100,AutoSize,0,Absolute,30" /&gt;&lt;Rows Styles="AutoSize,0,AutoSize,0,AutoSize,0,AutoSize,0,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_labelCertificate" Row="1" RowSpan="1" Column="2" ColumnSpan="1" /&gt;&lt;Control Name="m_labelPrivateKeyPwd" Row="2" RowSpan="1" Column="2" ColumnSpan="1" /&gt;&lt;Control Name="m_checkBoxSign" Row="0" RowSpan="1" Column="1" ColumnSpan="2" /&gt;&lt;Control Name="m_buttonBrowseCert" Row="1" RowSpan="1" Column="4" ColumnSpan="1" /&gt;&lt;Control Name="m_textBoxPrivateKeyPwd" Row="2" RowSpan="1" Column="3" ColumnSpan="1" /&gt;&lt;Control Name="m_textBoxCertificate" Row="1" RowSpan="1" Column="3" ColumnSpan="1" /&gt;&lt;Control Name="m_ctrlErrorCert" Row="3" RowSpan="1" Column="3" ColumnSpan="1" /&gt;&lt;Control Name="m_buttonValidate" Row="2" RowSpan="1" Column="4" ColumnSpan="1" /&gt;&lt;Control Name="m_pictureBoxTickValidate" Row="2" RowSpan="1" Column="5" ColumnSpan="1" /&gt;&lt;/Controls&gt;&lt;Columns Styles="Absolute,20,Absolute,20,AutoSize,0,Percent,100,AutoSize,0,AutoSize,0" /&gt;&lt;Rows Styles="AutoSize,0,AutoSize,0,AutoSize,0,Absolute,35" /&gt;&lt;/TableLayoutSettings&gt;</value>
</data>
<data name="tableLayoutPanel2.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
<value>Fill</value>
@ -874,16 +901,16 @@
<value>2</value>
</data>
<data name="tableLayoutPanel2.Size" type="System.Drawing.Size, System.Drawing">
<value>588, 132</value>
<value>588, 145</value>
</data>
<data name="tableLayoutPanel2.TabIndex" type="System.Int32, mscorlib">
<value>2</value>
<value>1</value>
</data>
<data name="&gt;&gt;tableLayoutPanel2.Name" xml:space="preserve">
<value>tableLayoutPanel2</value>
</data>
<data name="&gt;&gt;tableLayoutPanel2.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;tableLayoutPanel2.Parent" xml:space="preserve">
<value>tableLayoutPanel1</value>
@ -907,13 +934,13 @@
<value>594, 370</value>
</data>
<data name="tableLayoutPanel1.TabIndex" type="System.Int32, mscorlib">
<value>1</value>
<value>0</value>
</data>
<data name="&gt;&gt;tableLayoutPanel1.Name" xml:space="preserve">
<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>
@ -924,7 +951,7 @@
<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_checkBoxCompressFiles" Row="6" RowSpan="1" Column="0" ColumnSpan="1" /&gt;&lt;Control Name="m_checkBoxCreateOVA" Row="5" RowSpan="1" Column="0" ColumnSpan="1" /&gt;&lt;Control Name="sectionHeaderLabel3" Row="4" RowSpan="1" Column="0" ColumnSpan="1" /&gt;&lt;Control Name="m_tableLayoutPanelEncryption" Row="3" RowSpan="1" Column="0" ColumnSpan="1" /&gt;&lt;Control Name="sectionHeaderLabel2" Row="2" RowSpan="1" Column="0" ColumnSpan="1" /&gt;&lt;Control Name="sectionHeaderLabel1" Row="0" RowSpan="1" Column="0" ColumnSpan="1" /&gt;&lt;Control Name="tableLayoutPanel2" Row="1" RowSpan="1" Column="0" ColumnSpan="1" /&gt;&lt;/Controls&gt;&lt;Columns Styles="Percent,100" /&gt;&lt;Rows Styles="AutoSize,0,AutoSize,0,AutoSize,0,AutoSize,0,AutoSize,0,AutoSize,0,AutoSize,0,Absolute,20" /&gt;&lt;/TableLayoutSettings&gt;</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">
@ -940,6 +967,6 @@
<value>ExportOptionsPage</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>