From abd6b4192609b803587d41793f5717001eefb1db Mon Sep 17 00:00:00 2001 From: Konstantina Chremmou Date: Sat, 9 Jan 2021 04:46:11 +0000 Subject: [PATCH] Fixed Next button state when re-landing on the page. Usability enhancements. Property modernisation. Signed-off-by: Konstantina Chremmou --- .../ExportOptionsPage.Designer.cs | 12 +- .../Wizards/ExportWizard/ExportOptionsPage.cs | 58 +++--- .../ExportWizard/ExportOptionsPage.resx | 175 ++++++++++-------- 3 files changed, 135 insertions(+), 110 deletions(-) diff --git a/XenAdmin/Wizards/ExportWizard/ExportOptionsPage.Designer.cs b/XenAdmin/Wizards/ExportWizard/ExportOptionsPage.Designer.cs index 1150e7e23..1720519e4 100644 --- a/XenAdmin/Wizards/ExportWizard/ExportOptionsPage.Designer.cs +++ b/XenAdmin/Wizards/ExportWizard/ExportOptionsPage.Designer.cs @@ -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 diff --git a/XenAdmin/Wizards/ExportWizard/ExportOptionsPage.cs b/XenAdmin/Wizards/ExportWizard/ExportOptionsPage.cs index 7a7aa4136..b644c0b44 100644 --- a/XenAdmin/Wizards/ExportWizard/ExportOptionsPage.cs +++ b/XenAdmin/Wizards/ExportWizard/ExportOptionsPage.cs @@ -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 /// /// Gets a value indicating whether to create a manifest file /// - public bool CreateManifest { get { return m_checkBoxManifest.Checked; } } + public bool CreateManifest => m_checkBoxManifest.Checked; /// /// Gets a value indicating whether to sign the appliance /// - public bool SignAppliance { get { return m_checkBoxSign.Checked; } } + public bool SignAppliance => m_checkBoxSign.Checked; /// /// Gets the certificate used to create the signature @@ -90,22 +90,22 @@ namespace XenAdmin.Wizards.ExportWizard /// /// Gets a value indicating whether to encrypt the files reference in the OVF package. /// - public bool EncryptFiles { get { return m_checkBoxEncrypt.Checked; } } + public bool EncryptFiles => m_checkBoxEncrypt.Checked; /// /// Gets the password used for the encryption of the OVF files /// - public string EncryptPassword { get { return m_textBoxPwd.Text; } } + public string EncryptPassword => m_textBoxPwd.Text; /// /// Gets a value indicating whether the appliance will be exproted as a single OVA file /// - public bool CreateOVA { get { return m_checkBoxCreateOVA.Checked; } } + public bool CreateOVA => m_checkBoxCreateOVA.Checked; /// /// Gets a value indicating whether the OVF files should be compressed /// - public bool CompressOVFfiles { get { return m_checkBoxCompressFiles.Checked; } } + public bool CompressOVFfiles => m_checkBoxCompressFiles.Checked; #endregion @@ -114,21 +114,21 @@ namespace XenAdmin.Wizards.ExportWizard /// /// Gets the page's title (headline) /// - public override string PageTitle { get { return Messages.EXPORT_OPTIONS_PAGE_TITLE; } } + public override string PageTitle => Messages.EXPORT_OPTIONS_PAGE_TITLE; /// /// Gets the page's label in the (left hand side) wizard progress panel /// - public override string Text { get { return Messages.EXPORT_OPTIONS_PAGE_TEXT; } } + public override string Text => Messages.EXPORT_OPTIONS_PAGE_TEXT; /// /// Gets the value by which the help files section for this page is identified /// - 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 - /// - /// Performs certain checks on the pages's input data and shows/hides an error accordingly - /// - /// The checks to perform - 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; } diff --git a/XenAdmin/Wizards/ExportWizard/ExportOptionsPage.resx b/XenAdmin/Wizards/ExportWizard/ExportOptionsPage.resx index 76452a3e8..0b9c28ce7 100644 --- a/XenAdmin/Wizards/ExportWizard/ExportOptionsPage.resx +++ b/XenAdmin/Wizards/ExportWizard/ExportOptionsPage.resx @@ -112,12 +112,12 @@ 2.0 - System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - + True @@ -127,14 +127,14 @@ 4 - + Left True - + 23, 29 @@ -142,7 +142,7 @@ 56, 13 - 32 + 1 P&assword: @@ -151,7 +151,7 @@ m_labelPwd - System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 m_tableLayoutPanelEncryption @@ -169,13 +169,13 @@ 194, 20 - 33 + 2 m_textBoxPwd - System.Windows.Forms.TextBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 m_tableLayoutPanelEncryption @@ -193,13 +193,13 @@ 194, 20 - 36 + 5 m_textBoxReEnterPwd - System.Windows.Forms.TextBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 m_tableLayoutPanelEncryption @@ -220,7 +220,7 @@ 99, 13 - 35 + 4 &Re-enter password: @@ -229,7 +229,7 @@ m_labelReEnterPwd - System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 m_tableLayoutPanelEncryption @@ -253,7 +253,7 @@ m_pictureBoxTick - System.Windows.Forms.PictureBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + System.Windows.Forms.PictureBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 m_tableLayoutPanelEncryption @@ -274,7 +274,7 @@ 257, 26 - 34 + 3 label1 @@ -286,7 +286,7 @@ m_labelStrength - System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 m_tableLayoutPanelEncryption @@ -298,7 +298,7 @@ Fill - 3, 181 + 3, 194 3 @@ -307,13 +307,13 @@ 588, 75 - 4 + 3 m_tableLayoutPanelEncryption - System.Windows.Forms.TableLayoutPanel, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + System.Windows.Forms.TableLayoutPanel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 tableLayoutPanel1 @@ -331,7 +331,7 @@ 151, 17 - 31 + 0 &Encrypt the exported file(s) @@ -340,7 +340,7 @@ m_checkBoxEncrypt - System.Windows.Forms.CheckBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 m_tableLayoutPanelEncryption @@ -358,7 +358,7 @@ 108, 17 - 11 + 0 Create a &manifest @@ -367,7 +367,7 @@ m_checkBoxManifest - System.Windows.Forms.CheckBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 tableLayoutPanel2 @@ -388,13 +388,13 @@ NoControl - 3, 305 + 3, 318 588, 17 - 7 + 6 C&ompress OVF files @@ -403,7 +403,7 @@ m_checkBoxCompressFiles - System.Windows.Forms.CheckBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 tableLayoutPanel1 @@ -421,13 +421,13 @@ NoControl - 3, 282 + 3, 295 588, 17 - 6 + 5 Create OVA pac&kage (single OVA export file) @@ -436,7 +436,7 @@ m_checkBoxCreateOVA - System.Windows.Forms.CheckBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 tableLayoutPanel1 @@ -450,6 +450,9 @@ Top + + + Left @@ -463,13 +466,19 @@ 0, 0, 0, 0 - 3, 262 + 3, 275 + + + 0, 14 588, 14 - 5 + 4 + + + False sectionHeaderLabel3 @@ -489,6 +498,9 @@ Top + + + Left @@ -502,13 +514,19 @@ 0, 0, 0, 0 - 3, 161 + 3, 174 + + + 0, 14 588, 14 - 3 + 2 + + + False sectionHeaderLabel2 @@ -528,6 +546,9 @@ Top + + + Left @@ -543,11 +564,17 @@ 3, 3 + + 0, 14 + 588, 14 - 1 + 0 + + + False sectionHeaderLabel1 @@ -574,7 +601,7 @@ True - 7 + 6 Left @@ -592,7 +619,7 @@ 81, 13 - 22 + 1 &Certificate path: @@ -601,7 +628,7 @@ m_labelCertificate - System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 m_tableLayoutPanelManifest @@ -625,7 +652,7 @@ 111, 13 - 25 + 4 Private key pass&word: @@ -634,7 +661,7 @@ m_labelPrivateKeyPwd - System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 m_tableLayoutPanelManifest @@ -658,7 +685,7 @@ 134, 17 - 21 + 0 &Sign the OVF package @@ -667,7 +694,7 @@ m_checkBoxSign - System.Windows.Forms.CheckBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 m_tableLayoutPanelManifest @@ -679,13 +706,13 @@ NoControl - 474, 26 + 482, 26 75, 23 - 24 + 3 &Browse... @@ -694,7 +721,7 @@ m_buttonBrowseCert - System.Windows.Forms.Button, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 m_tableLayoutPanelManifest @@ -702,23 +729,23 @@ 3 - - Fill + + Left, Right - 163, 55 + 163, 56 - 305, 20 + 313, 20 - 26 + 5 m_textBoxPrivateKeyPwd - System.Windows.Forms.TextBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 m_tableLayoutPanelManifest @@ -726,23 +753,23 @@ 4 - - Fill + + Left, Right - 163, 26 + 163, 27 - 305, 20 + 313, 20 - 23 + 2 m_textBoxCertificate - System.Windows.Forms.TextBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 m_tableLayoutPanelManifest @@ -769,10 +796,10 @@ 0, 0, 0, 0 - 311, 22 + 319, 35 - 28 + 7 m_ctrlErrorCert @@ -787,13 +814,13 @@ 6 - 474, 55 + 482, 55 75, 23 - 27 + 6 &Validate @@ -802,7 +829,7 @@ m_buttonValidate - System.Windows.Forms.Button, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 m_tableLayoutPanelManifest @@ -814,7 +841,7 @@ Left - 555, 58 + 563, 58 16, 16 @@ -826,7 +853,7 @@ m_pictureBoxTickValidate - System.Windows.Forms.PictureBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + System.Windows.Forms.PictureBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 m_tableLayoutPanelManifest @@ -844,16 +871,16 @@ 4 - 582, 103 + 582, 116 - 12 + 1 m_tableLayoutPanelManifest - System.Windows.Forms.TableLayoutPanel, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + System.Windows.Forms.TableLayoutPanel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 tableLayoutPanel2 @@ -862,7 +889,7 @@ 1 - <?xml version="1.0" encoding="utf-16"?><TableLayoutSettings><Controls><Control Name="m_labelCertificate" Row="1" RowSpan="1" Column="2" ColumnSpan="1" /><Control Name="m_labelPrivateKeyPwd" Row="2" RowSpan="1" Column="2" ColumnSpan="1" /><Control Name="m_checkBoxSign" Row="0" RowSpan="1" Column="1" ColumnSpan="2" /><Control Name="m_buttonBrowseCert" Row="1" RowSpan="1" Column="5" ColumnSpan="1" /><Control Name="m_textBoxPrivateKeyPwd" Row="2" RowSpan="1" Column="3" ColumnSpan="2" /><Control Name="m_textBoxCertificate" Row="1" RowSpan="1" Column="3" ColumnSpan="2" /><Control Name="m_ctrlErrorCert" Row="3" RowSpan="1" Column="3" ColumnSpan="2" /><Control Name="m_buttonValidate" Row="2" RowSpan="1" Column="5" ColumnSpan="1" /><Control Name="m_pictureBoxTickValidate" Row="2" RowSpan="1" Column="6" ColumnSpan="1" /></Controls><Columns Styles="Absolute,20,Absolute,20,AutoSize,0,AutoSize,0,Percent,100,AutoSize,0,Absolute,30" /><Rows Styles="AutoSize,0,AutoSize,0,AutoSize,0,AutoSize,0,Absolute,20" /></TableLayoutSettings> + <?xml version="1.0" encoding="utf-16"?><TableLayoutSettings><Controls><Control Name="m_labelCertificate" Row="1" RowSpan="1" Column="2" ColumnSpan="1" /><Control Name="m_labelPrivateKeyPwd" Row="2" RowSpan="1" Column="2" ColumnSpan="1" /><Control Name="m_checkBoxSign" Row="0" RowSpan="1" Column="1" ColumnSpan="2" /><Control Name="m_buttonBrowseCert" Row="1" RowSpan="1" Column="4" ColumnSpan="1" /><Control Name="m_textBoxPrivateKeyPwd" Row="2" RowSpan="1" Column="3" ColumnSpan="1" /><Control Name="m_textBoxCertificate" Row="1" RowSpan="1" Column="3" ColumnSpan="1" /><Control Name="m_ctrlErrorCert" Row="3" RowSpan="1" Column="3" ColumnSpan="1" /><Control Name="m_buttonValidate" Row="2" RowSpan="1" Column="4" ColumnSpan="1" /><Control Name="m_pictureBoxTickValidate" Row="2" RowSpan="1" Column="5" ColumnSpan="1" /></Controls><Columns Styles="Absolute,20,Absolute,20,AutoSize,0,Percent,100,AutoSize,0,AutoSize,0" /><Rows Styles="AutoSize,0,AutoSize,0,AutoSize,0,Absolute,35" /></TableLayoutSettings> Fill @@ -874,16 +901,16 @@ 2 - 588, 132 + 588, 145 - 2 + 1 tableLayoutPanel2 - System.Windows.Forms.TableLayoutPanel, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + System.Windows.Forms.TableLayoutPanel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 tableLayoutPanel1 @@ -907,13 +934,13 @@ 594, 370 - 1 + 0 tableLayoutPanel1 - System.Windows.Forms.TableLayoutPanel, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + System.Windows.Forms.TableLayoutPanel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 $this @@ -924,7 +951,7 @@ <?xml version="1.0" encoding="utf-16"?><TableLayoutSettings><Controls><Control Name="m_checkBoxCompressFiles" Row="6" RowSpan="1" Column="0" ColumnSpan="1" /><Control Name="m_checkBoxCreateOVA" Row="5" RowSpan="1" Column="0" ColumnSpan="1" /><Control Name="sectionHeaderLabel3" Row="4" RowSpan="1" Column="0" ColumnSpan="1" /><Control Name="m_tableLayoutPanelEncryption" Row="3" RowSpan="1" Column="0" ColumnSpan="1" /><Control Name="sectionHeaderLabel2" Row="2" RowSpan="1" Column="0" ColumnSpan="1" /><Control Name="sectionHeaderLabel1" Row="0" RowSpan="1" Column="0" ColumnSpan="1" /><Control Name="tableLayoutPanel2" Row="1" RowSpan="1" Column="0" ColumnSpan="1" /></Controls><Columns Styles="Percent,100" /><Rows Styles="AutoSize,0,AutoSize,0,AutoSize,0,AutoSize,0,AutoSize,0,AutoSize,0,AutoSize,0,Absolute,20" /></TableLayoutSettings> - + True @@ -940,6 +967,6 @@ ExportOptionsPage - XenAdmin.Wizards.GenericPages.ImExPortPage, XenCenterMain, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null + XenAdmin.Controls.XenTabPage, XenCenterMain, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null \ No newline at end of file