Merge pull request #562 from MihaelaStoica/CP-13083

CP-13083 and CP-13081: Add "Show this ..." checkbox and opt-out option to the Health Check dialog
This commit is contained in:
Gabor Apati-Nagy 2015-07-28 15:49:33 +01:00
commit 521901c668
11 changed files with 272 additions and 95 deletions

View File

@ -39,9 +39,10 @@ namespace XenAdmin.Dialogs.CallHome
this.poolNameLabel = new System.Windows.Forms.Label();
this.poolDetailsPanel = new System.Windows.Forms.TableLayoutPanel();
this.healthCheckStatusPanel = new System.Windows.Forms.TableLayoutPanel();
this.disableLinkLabel = new System.Windows.Forms.LinkLabel();
this.uploadRequestLinkLabel = new System.Windows.Forms.LinkLabel();
this.scheduleLabel = new System.Windows.Forms.Label();
this.linkLabel2 = new System.Windows.Forms.LinkLabel();
this.editLinkLabel = new System.Windows.Forms.LinkLabel();
this.issuesLabel = new System.Windows.Forms.Label();
this.lastUploadDateLabel = new System.Windows.Forms.Label();
this.label4 = new System.Windows.Forms.Label();
@ -49,7 +50,7 @@ namespace XenAdmin.Dialogs.CallHome
this.lastUploadLabel = new System.Windows.Forms.Label();
this.ReportAnalysisLinkLabel = new System.Windows.Forms.LinkLabel();
this.previousUploadPanel = new System.Windows.Forms.TableLayoutPanel();
this.linkLabel1 = new System.Windows.Forms.LinkLabel();
this.viewReportLinkLabel = new System.Windows.Forms.LinkLabel();
this.previousUploadDateLabel = new System.Windows.Forms.Label();
this.label3 = new System.Windows.Forms.Label();
this.notEnrolledPanel = new System.Windows.Forms.TableLayoutPanel();
@ -61,6 +62,7 @@ namespace XenAdmin.Dialogs.CallHome
this.policyStatementLabel = new System.Windows.Forms.Label();
this.PolicyStatementLinkLabel = new System.Windows.Forms.LinkLabel();
this.rubricLabel = new System.Windows.Forms.Label();
this.showAgainCheckBox = new System.Windows.Forms.CheckBox();
((System.ComponentModel.ISupportInitialize)(this.splitContainer1)).BeginInit();
this.splitContainer1.Panel1.SuspendLayout();
this.splitContainer1.Panel2.SuspendLayout();
@ -144,9 +146,10 @@ namespace XenAdmin.Dialogs.CallHome
// healthCheckStatusPanel
//
resources.ApplyResources(this.healthCheckStatusPanel, "healthCheckStatusPanel");
this.healthCheckStatusPanel.Controls.Add(this.disableLinkLabel, 0, 9);
this.healthCheckStatusPanel.Controls.Add(this.uploadRequestLinkLabel, 0, 8);
this.healthCheckStatusPanel.Controls.Add(this.scheduleLabel, 0, 6);
this.healthCheckStatusPanel.Controls.Add(this.linkLabel2, 0, 7);
this.healthCheckStatusPanel.Controls.Add(this.editLinkLabel, 0, 7);
this.healthCheckStatusPanel.Controls.Add(this.issuesLabel, 0, 2);
this.healthCheckStatusPanel.Controls.Add(this.lastUploadDateLabel, 1, 1);
this.healthCheckStatusPanel.Controls.Add(this.label4, 0, 5);
@ -156,6 +159,14 @@ namespace XenAdmin.Dialogs.CallHome
this.healthCheckStatusPanel.Controls.Add(this.previousUploadPanel, 0, 4);
this.healthCheckStatusPanel.Name = "healthCheckStatusPanel";
//
// disableLinkLabel
//
resources.ApplyResources(this.disableLinkLabel, "disableLinkLabel");
this.healthCheckStatusPanel.SetColumnSpan(this.disableLinkLabel, 2);
this.disableLinkLabel.Name = "disableLinkLabel";
this.disableLinkLabel.TabStop = true;
this.disableLinkLabel.LinkClicked += new System.Windows.Forms.LinkLabelLinkClickedEventHandler(this.disableLinkLabel_LinkClicked);
//
// uploadRequestLinkLabel
//
resources.ApplyResources(this.uploadRequestLinkLabel, "uploadRequestLinkLabel");
@ -170,13 +181,13 @@ namespace XenAdmin.Dialogs.CallHome
this.healthCheckStatusPanel.SetColumnSpan(this.scheduleLabel, 2);
this.scheduleLabel.Name = "scheduleLabel";
//
// linkLabel2
// editLinkLabel
//
resources.ApplyResources(this.linkLabel2, "linkLabel2");
this.healthCheckStatusPanel.SetColumnSpan(this.linkLabel2, 2);
this.linkLabel2.Name = "linkLabel2";
this.linkLabel2.TabStop = true;
this.linkLabel2.LinkClicked += new System.Windows.Forms.LinkLabelLinkClickedEventHandler(this.linkLabel2_LinkClicked);
resources.ApplyResources(this.editLinkLabel, "editLinkLabel");
this.healthCheckStatusPanel.SetColumnSpan(this.editLinkLabel, 2);
this.editLinkLabel.Name = "editLinkLabel";
this.editLinkLabel.TabStop = true;
this.editLinkLabel.LinkClicked += new System.Windows.Forms.LinkLabelLinkClickedEventHandler(this.editlinkLabel_LinkClicked);
//
// issuesLabel
//
@ -217,17 +228,17 @@ namespace XenAdmin.Dialogs.CallHome
//
resources.ApplyResources(this.previousUploadPanel, "previousUploadPanel");
this.healthCheckStatusPanel.SetColumnSpan(this.previousUploadPanel, 2);
this.previousUploadPanel.Controls.Add(this.linkLabel1, 0, 1);
this.previousUploadPanel.Controls.Add(this.viewReportLinkLabel, 0, 1);
this.previousUploadPanel.Controls.Add(this.previousUploadDateLabel, 1, 0);
this.previousUploadPanel.Controls.Add(this.label3, 0, 0);
this.previousUploadPanel.Name = "previousUploadPanel";
//
// linkLabel1
// viewReportLinkLabel
//
resources.ApplyResources(this.linkLabel1, "linkLabel1");
this.previousUploadPanel.SetColumnSpan(this.linkLabel1, 2);
this.linkLabel1.Name = "linkLabel1";
this.linkLabel1.TabStop = true;
resources.ApplyResources(this.viewReportLinkLabel, "viewReportLinkLabel");
this.previousUploadPanel.SetColumnSpan(this.viewReportLinkLabel, 2);
this.viewReportLinkLabel.Name = "viewReportLinkLabel";
this.viewReportLinkLabel.TabStop = true;
//
// previousUploadDateLabel
//
@ -271,8 +282,8 @@ namespace XenAdmin.Dialogs.CallHome
//
resources.ApplyResources(this.tableLayoutPanel1, "tableLayoutPanel1");
this.tableLayoutPanel1.Controls.Add(this.flowLayoutPanel2, 0, 1);
this.tableLayoutPanel1.Controls.Add(this.rubricLabel, 0, 0);
this.tableLayoutPanel1.Controls.Add(this.splitContainer1, 0, 2);
this.tableLayoutPanel1.Controls.Add(this.rubricLabel, 0, 0);
this.tableLayoutPanel1.Name = "tableLayoutPanel1";
//
// flowLayoutPanel2
@ -298,12 +309,20 @@ namespace XenAdmin.Dialogs.CallHome
resources.ApplyResources(this.rubricLabel, "rubricLabel");
this.rubricLabel.Name = "rubricLabel";
//
// showAgainCheckBox
//
resources.ApplyResources(this.showAgainCheckBox, "showAgainCheckBox");
this.showAgainCheckBox.Name = "showAgainCheckBox";
this.showAgainCheckBox.UseVisualStyleBackColor = true;
this.showAgainCheckBox.CheckedChanged += new System.EventHandler(this.showAgainCheckBox_CheckedChanged);
//
// CallHomeOverviewDialog
//
resources.ApplyResources(this, "$this");
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Dpi;
this.CancelButton = this.buttonCancel;
this.Controls.Add(this.tableLayoutPanel1);
this.Controls.Add(this.showAgainCheckBox);
this.Controls.Add(this.buttonCancel);
this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.Sizable;
this.Name = "CallHomeOverviewDialog";
@ -329,6 +348,7 @@ namespace XenAdmin.Dialogs.CallHome
this.flowLayoutPanel2.ResumeLayout(false);
this.flowLayoutPanel2.PerformLayout();
this.ResumeLayout(false);
this.PerformLayout();
}
@ -350,9 +370,9 @@ namespace XenAdmin.Dialogs.CallHome
private System.Windows.Forms.LinkLabel ReportAnalysisLinkLabel;
private System.Windows.Forms.TableLayoutPanel previousUploadPanel;
private System.Windows.Forms.Label label3;
private System.Windows.Forms.LinkLabel linkLabel1;
private System.Windows.Forms.LinkLabel viewReportLinkLabel;
private System.Windows.Forms.Label previousUploadDateLabel;
private System.Windows.Forms.LinkLabel linkLabel2;
private System.Windows.Forms.LinkLabel editLinkLabel;
private System.Windows.Forms.Label label4;
private System.Windows.Forms.Label scheduleLabel;
private System.Windows.Forms.TableLayoutPanel notEnrolledPanel;
@ -364,6 +384,8 @@ namespace XenAdmin.Dialogs.CallHome
private System.Windows.Forms.Label policyStatementLabel;
private System.Windows.Forms.LinkLabel PolicyStatementLinkLabel;
private System.Windows.Forms.LinkLabel uploadRequestLinkLabel;
private System.Windows.Forms.CheckBox showAgainCheckBox;
private System.Windows.Forms.LinkLabel disableLinkLabel;
}
}

View File

@ -32,7 +32,6 @@
using System;
using System.Collections.Generic;
using System.ComponentModel;
using System.Diagnostics;
using System.Linq;
using System.Windows.Forms;
using XenAdmin.Actions;
@ -243,6 +242,7 @@ namespace XenAdmin.Dialogs.CallHome
{
xenConnection.Cache.RegisterBatchCollectionChanged<Pool>(Pool_BatchCollectionChanged);
}
showAgainCheckBox.Checked = Properties.Settings.Default.ShowHealthCheckEnrollmentReminder;
}
private void dataGridView1_SelectionChanged(object sender, EventArgs e)
@ -264,7 +264,7 @@ namespace XenAdmin.Dialogs.CallHome
Close();
}
private void linkLabel2_LinkClicked(object sender, LinkLabelLinkClickedEventArgs e)
private void editlinkLabel_LinkClicked(object sender, LinkLabelLinkClickedEventArgs e)
{
if (poolsDataGridView.SelectedRows.Count != 1 || !(poolsDataGridView.SelectedRows[0] is PoolRow))
return;
@ -317,5 +317,40 @@ namespace XenAdmin.Dialogs.CallHome
new SaveCallHomeSettingsAction(poolRow.Pool, callHomeSettings, token, user, password, false).RunAsync();
}
}
private void showAgainCheckBox_CheckedChanged(object sender, EventArgs e)
{
if (Properties.Settings.Default.ShowHealthCheckEnrollmentReminder != showAgainCheckBox.Checked)
{
Properties.Settings.Default.ShowHealthCheckEnrollmentReminder = showAgainCheckBox.Checked;
Settings.TrySaveSettings();
}
}
private void disableLinkLabel_LinkClicked(object sender, LinkLabelLinkClickedEventArgs e)
{
if (poolsDataGridView.SelectedRows.Count != 1 || !(poolsDataGridView.SelectedRows[0] is PoolRow))
return;
var poolRow = (PoolRow)poolsDataGridView.SelectedRows[0];
if (poolRow.Pool == null)
return;
var callHomeSettings = poolRow.Pool.CallHomeSettings;
if (callHomeSettings.Status == CallHomeStatus.Enabled)
{
string msg = Helpers.GetPool(poolRow.Pool.Connection) == null
? Messages.CONFIRM_DISABLE_HEALTH_CHECK_SERVER
: Messages.CONFIRM_DISABLE_HEALTH_CHECK_POOL;
using (var dlg = new ThreeButtonDialog(new ThreeButtonDialog.Details(null, msg, Messages.XENCENTER),
ThreeButtonDialog.ButtonYes, ThreeButtonDialog.ButtonNo))
{
if (dlg.ShowDialog(this) != DialogResult.Yes)
return;
}
callHomeSettings.Status = CallHomeStatus.Disabled;
new SaveCallHomeSettingsAction(poolRow.Pool, callHomeSettings, null, null, null, false).RunAsync();
}
}
}
}

View File

@ -154,7 +154,7 @@
<value>0, 0</value>
</data>
<data name="poolsDataGridView.Size" type="System.Drawing.Size, System.Drawing">
<value>488, 319</value>
<value>489, 327</value>
</data>
<data name="poolsDataGridView.TabIndex" type="System.Int32, mscorlib">
<value>11</value>
@ -211,7 +211,7 @@
<value>0, 2, 0, 4</value>
</data>
<data name="poolNameLabel.Size" type="System.Drawing.Size, System.Drawing">
<value>260, 21</value>
<value>262, 21</value>
</data>
<data name="poolNameLabel.TabIndex" type="System.Int32, mscorlib">
<value>15</value>
@ -249,6 +249,42 @@
<data name="healthCheckStatusPanel.ColumnCount" type="System.Int32, mscorlib">
<value>2</value>
</data>
<data name="disableLinkLabel.AutoSize" type="System.Boolean, mscorlib">
<value>True</value>
</data>
<data name="disableLinkLabel.Font" type="System.Drawing.Font, System.Drawing">
<value>Segoe UI, 9pt</value>
</data>
<data name="disableLinkLabel.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
<value>NoControl</value>
</data>
<data name="disableLinkLabel.Location" type="System.Drawing.Point, System.Drawing">
<value>3, 219</value>
</data>
<data name="disableLinkLabel.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
<value>3, 3, 3, 3</value>
</data>
<data name="disableLinkLabel.Size" type="System.Drawing.Size, System.Drawing">
<value>119, 15</value>
</data>
<data name="disableLinkLabel.TabIndex" type="System.Int32, mscorlib">
<value>20</value>
</data>
<data name="disableLinkLabel.Text" xml:space="preserve">
<value>Disable Health Check</value>
</data>
<data name="&gt;&gt;disableLinkLabel.Name" xml:space="preserve">
<value>disableLinkLabel</value>
</data>
<data name="&gt;&gt;disableLinkLabel.Type" xml:space="preserve">
<value>System.Windows.Forms.LinkLabel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="&gt;&gt;disableLinkLabel.Parent" xml:space="preserve">
<value>healthCheckStatusPanel</value>
</data>
<data name="&gt;&gt;disableLinkLabel.ZOrder" xml:space="preserve">
<value>0</value>
</data>
<data name="uploadRequestLinkLabel.AutoSize" type="System.Boolean, mscorlib">
<value>True</value>
</data>
@ -265,7 +301,7 @@
<value>3, 3, 3, 3</value>
</data>
<data name="uploadRequestLinkLabel.Size" type="System.Drawing.Size, System.Drawing">
<value>131, 14</value>
<value>131, 15</value>
</data>
<data name="uploadRequestLinkLabel.TabIndex" type="System.Int32, mscorlib">
<value>19</value>
@ -283,7 +319,7 @@
<value>healthCheckStatusPanel</value>
</data>
<data name="&gt;&gt;uploadRequestLinkLabel.ZOrder" xml:space="preserve">
<value>0</value>
<value>1</value>
</data>
<data name="scheduleLabel.AutoSize" type="System.Boolean, mscorlib">
<value>True</value>
@ -304,7 +340,7 @@
<value>3, 3, 3, 3</value>
</data>
<data name="scheduleLabel.Size" type="System.Drawing.Size, System.Drawing">
<value>248, 15</value>
<value>250, 15</value>
</data>
<data name="scheduleLabel.TabIndex" type="System.Int32, mscorlib">
<value>18</value>
@ -322,43 +358,43 @@
<value>healthCheckStatusPanel</value>
</data>
<data name="&gt;&gt;scheduleLabel.ZOrder" xml:space="preserve">
<value>1</value>
<value>2</value>
</data>
<data name="linkLabel2.AutoSize" type="System.Boolean, mscorlib">
<data name="editLinkLabel.AutoSize" type="System.Boolean, mscorlib">
<value>True</value>
</data>
<data name="linkLabel2.Font" type="System.Drawing.Font, System.Drawing">
<data name="editLinkLabel.Font" type="System.Drawing.Font, System.Drawing">
<value>Segoe UI, 9pt</value>
</data>
<data name="linkLabel2.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
<data name="editLinkLabel.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
<value>NoControl</value>
</data>
<data name="linkLabel2.Location" type="System.Drawing.Point, System.Drawing">
<data name="editLinkLabel.Location" type="System.Drawing.Point, System.Drawing">
<value>3, 177</value>
</data>
<data name="linkLabel2.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
<data name="editLinkLabel.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
<value>3, 3, 3, 3</value>
</data>
<data name="linkLabel2.Size" type="System.Drawing.Size, System.Drawing">
<data name="editLinkLabel.Size" type="System.Drawing.Size, System.Drawing">
<value>145, 15</value>
</data>
<data name="linkLabel2.TabIndex" type="System.Int32, mscorlib">
<data name="editLinkLabel.TabIndex" type="System.Int32, mscorlib">
<value>6</value>
</data>
<data name="linkLabel2.Text" xml:space="preserve">
<data name="editLinkLabel.Text" xml:space="preserve">
<value>Edit Health Check settings</value>
</data>
<data name="&gt;&gt;linkLabel2.Name" xml:space="preserve">
<value>linkLabel2</value>
<data name="&gt;&gt;editLinkLabel.Name" xml:space="preserve">
<value>editLinkLabel</value>
</data>
<data name="&gt;&gt;linkLabel2.Type" xml:space="preserve">
<data name="&gt;&gt;editLinkLabel.Type" xml:space="preserve">
<value>System.Windows.Forms.LinkLabel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="&gt;&gt;linkLabel2.Parent" xml:space="preserve">
<data name="&gt;&gt;editLinkLabel.Parent" xml:space="preserve">
<value>healthCheckStatusPanel</value>
</data>
<data name="&gt;&gt;linkLabel2.ZOrder" xml:space="preserve">
<value>2</value>
<data name="&gt;&gt;editLinkLabel.ZOrder" xml:space="preserve">
<value>3</value>
</data>
<data name="issuesLabel.AutoSize" type="System.Boolean, mscorlib">
<value>True</value>
@ -379,7 +415,7 @@
<value>3, 3, 3, 3</value>
</data>
<data name="issuesLabel.Size" type="System.Drawing.Size, System.Drawing">
<value>248, 15</value>
<value>250, 15</value>
</data>
<data name="issuesLabel.TabIndex" type="System.Int32, mscorlib">
<value>4</value>
@ -397,7 +433,7 @@
<value>healthCheckStatusPanel</value>
</data>
<data name="&gt;&gt;issuesLabel.ZOrder" xml:space="preserve">
<value>3</value>
<value>4</value>
</data>
<data name="lastUploadDateLabel.AutoSize" type="System.Boolean, mscorlib">
<value>True</value>
@ -433,7 +469,7 @@
<value>healthCheckStatusPanel</value>
</data>
<data name="&gt;&gt;lastUploadDateLabel.ZOrder" xml:space="preserve">
<value>4</value>
<value>5</value>
</data>
<data name="label4.AutoSize" type="System.Boolean, mscorlib">
<value>True</value>
@ -469,7 +505,7 @@
<value>healthCheckStatusPanel</value>
</data>
<data name="&gt;&gt;label4.ZOrder" xml:space="preserve">
<value>5</value>
<value>6</value>
</data>
<data name="label1.AutoSize" type="System.Boolean, mscorlib">
<value>True</value>
@ -502,7 +538,7 @@
<value>healthCheckStatusPanel</value>
</data>
<data name="&gt;&gt;label1.ZOrder" xml:space="preserve">
<value>6</value>
<value>7</value>
</data>
<data name="lastUploadLabel.AutoSize" type="System.Boolean, mscorlib">
<value>True</value>
@ -538,7 +574,7 @@
<value>healthCheckStatusPanel</value>
</data>
<data name="&gt;&gt;lastUploadLabel.ZOrder" xml:space="preserve">
<value>7</value>
<value>8</value>
</data>
<data name="ReportAnalysisLinkLabel.AutoSize" type="System.Boolean, mscorlib">
<value>True</value>
@ -574,7 +610,7 @@
<value>healthCheckStatusPanel</value>
</data>
<data name="&gt;&gt;ReportAnalysisLinkLabel.ZOrder" xml:space="preserve">
<value>8</value>
<value>9</value>
</data>
<data name="previousUploadPanel.AutoSize" type="System.Boolean, mscorlib">
<value>True</value>
@ -585,40 +621,40 @@
<data name="previousUploadPanel.ColumnCount" type="System.Int32, mscorlib">
<value>2</value>
</data>
<data name="linkLabel1.AutoSize" type="System.Boolean, mscorlib">
<data name="viewReportLinkLabel.AutoSize" type="System.Boolean, mscorlib">
<value>True</value>
</data>
<data name="linkLabel1.Font" type="System.Drawing.Font, System.Drawing">
<data name="viewReportLinkLabel.Font" type="System.Drawing.Font, System.Drawing">
<value>Segoe UI, 9pt</value>
</data>
<data name="linkLabel1.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
<data name="viewReportLinkLabel.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
<value>NoControl</value>
</data>
<data name="linkLabel1.Location" type="System.Drawing.Point, System.Drawing">
<data name="viewReportLinkLabel.Location" type="System.Drawing.Point, System.Drawing">
<value>3, 24</value>
</data>
<data name="linkLabel1.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
<data name="viewReportLinkLabel.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
<value>3, 3, 3, 3</value>
</data>
<data name="linkLabel1.Size" type="System.Drawing.Size, System.Drawing">
<data name="viewReportLinkLabel.Size" type="System.Drawing.Size, System.Drawing">
<value>159, 15</value>
</data>
<data name="linkLabel1.TabIndex" type="System.Int32, mscorlib">
<data name="viewReportLinkLabel.TabIndex" type="System.Int32, mscorlib">
<value>4</value>
</data>
<data name="linkLabel1.Text" xml:space="preserve">
<data name="viewReportLinkLabel.Text" xml:space="preserve">
<value>View previous report analysis</value>
</data>
<data name="&gt;&gt;linkLabel1.Name" xml:space="preserve">
<value>linkLabel1</value>
<data name="&gt;&gt;viewReportLinkLabel.Name" xml:space="preserve">
<value>viewReportLinkLabel</value>
</data>
<data name="&gt;&gt;linkLabel1.Type" xml:space="preserve">
<data name="&gt;&gt;viewReportLinkLabel.Type" xml:space="preserve">
<value>System.Windows.Forms.LinkLabel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="&gt;&gt;linkLabel1.Parent" xml:space="preserve">
<data name="&gt;&gt;viewReportLinkLabel.Parent" xml:space="preserve">
<value>previousUploadPanel</value>
</data>
<data name="&gt;&gt;linkLabel1.ZOrder" xml:space="preserve">
<data name="&gt;&gt;viewReportLinkLabel.ZOrder" xml:space="preserve">
<value>0</value>
</data>
<data name="previousUploadDateLabel.AutoSize" type="System.Boolean, mscorlib">
@ -703,7 +739,7 @@
<value>2</value>
</data>
<data name="previousUploadPanel.Size" type="System.Drawing.Size, System.Drawing">
<value>248, 42</value>
<value>250, 42</value>
</data>
<data name="previousUploadPanel.TabIndex" type="System.Int32, mscorlib">
<value>17</value>
@ -721,10 +757,10 @@
<value>healthCheckStatusPanel</value>
</data>
<data name="&gt;&gt;previousUploadPanel.ZOrder" xml:space="preserve">
<value>9</value>
<value>10</value>
</data>
<data name="previousUploadPanel.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="linkLabel1" Row="1" RowSpan="1" Column="0" ColumnSpan="2" /&gt;&lt;Control Name="previousUploadDateLabel" Row="0" RowSpan="1" Column="1" ColumnSpan="1" /&gt;&lt;Control Name="label3" Row="0" RowSpan="1" Column="0" ColumnSpan="1" /&gt;&lt;/Controls&gt;&lt;Columns Styles="AutoSize,52,Percent,48" /&gt;&lt;Rows Styles="AutoSize,50,AutoSize,50,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="viewReportLinkLabel" Row="1" RowSpan="1" Column="0" ColumnSpan="2" /&gt;&lt;Control Name="previousUploadDateLabel" Row="0" RowSpan="1" Column="1" ColumnSpan="1" /&gt;&lt;Control Name="label3" Row="0" RowSpan="1" Column="0" ColumnSpan="1" /&gt;&lt;/Controls&gt;&lt;Columns Styles="AutoSize,52,Percent,48" /&gt;&lt;Rows Styles="AutoSize,50,AutoSize,50,Absolute,20" /&gt;&lt;/TableLayoutSettings&gt;</value>
</data>
<data name="healthCheckStatusPanel.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
<value>Fill</value>
@ -736,10 +772,10 @@
<value>3, 3</value>
</data>
<data name="healthCheckStatusPanel.RowCount" type="System.Int32, mscorlib">
<value>9</value>
<value>10</value>
</data>
<data name="healthCheckStatusPanel.Size" type="System.Drawing.Size, System.Drawing">
<value>254, 215</value>
<value>256, 237</value>
</data>
<data name="healthCheckStatusPanel.TabIndex" type="System.Int32, mscorlib">
<value>16</value>
@ -757,7 +793,7 @@
<value>0</value>
</data>
<data name="healthCheckStatusPanel.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="uploadRequestLinkLabel" Row="8" RowSpan="1" Column="0" ColumnSpan="2" /&gt;&lt;Control Name="scheduleLabel" Row="6" RowSpan="1" Column="0" ColumnSpan="2" /&gt;&lt;Control Name="linkLabel2" Row="7" RowSpan="1" Column="0" ColumnSpan="2" /&gt;&lt;Control Name="issuesLabel" Row="2" RowSpan="1" Column="0" ColumnSpan="2" /&gt;&lt;Control Name="lastUploadDateLabel" Row="1" RowSpan="1" Column="1" ColumnSpan="1" /&gt;&lt;Control Name="label4" Row="5" RowSpan="1" Column="0" ColumnSpan="2" /&gt;&lt;Control Name="label1" Row="0" RowSpan="1" Column="0" ColumnSpan="2" /&gt;&lt;Control Name="lastUploadLabel" Row="1" RowSpan="1" Column="0" ColumnSpan="1" /&gt;&lt;Control Name="ReportAnalysisLinkLabel" Row="3" RowSpan="1" Column="0" ColumnSpan="2" /&gt;&lt;Control Name="previousUploadPanel" Row="4" RowSpan="1" Column="0" ColumnSpan="2" /&gt;&lt;/Controls&gt;&lt;Columns Styles="AutoSize,0,Percent,100" /&gt;&lt;Rows Styles="AutoSize,50,AutoSize,50,AutoSize,20,AutoSize,20,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="disableLinkLabel" Row="9" RowSpan="1" Column="0" ColumnSpan="2" /&gt;&lt;Control Name="uploadRequestLinkLabel" Row="8" RowSpan="1" Column="0" ColumnSpan="2" /&gt;&lt;Control Name="scheduleLabel" Row="6" RowSpan="1" Column="0" ColumnSpan="2" /&gt;&lt;Control Name="editLinkLabel" Row="7" RowSpan="1" Column="0" ColumnSpan="2" /&gt;&lt;Control Name="issuesLabel" Row="2" RowSpan="1" Column="0" ColumnSpan="2" /&gt;&lt;Control Name="lastUploadDateLabel" Row="1" RowSpan="1" Column="1" ColumnSpan="1" /&gt;&lt;Control Name="label4" Row="5" RowSpan="1" Column="0" ColumnSpan="2" /&gt;&lt;Control Name="label1" Row="0" RowSpan="1" Column="0" ColumnSpan="2" /&gt;&lt;Control Name="lastUploadLabel" Row="1" RowSpan="1" Column="0" ColumnSpan="1" /&gt;&lt;Control Name="ReportAnalysisLinkLabel" Row="3" RowSpan="1" Column="0" ColumnSpan="2" /&gt;&lt;Control Name="previousUploadPanel" Row="4" RowSpan="1" Column="0" ColumnSpan="2" /&gt;&lt;/Controls&gt;&lt;Columns Styles="AutoSize,0,Percent,100" /&gt;&lt;Rows Styles="AutoSize,50,AutoSize,50,AutoSize,20,AutoSize,20,AutoSize,0,AutoSize,0,AutoSize,0,AutoSize,0,AutoSize,20,AutoSize,20" /&gt;&lt;/TableLayoutSettings&gt;</value>
</data>
<data name="notEnrolledPanel.AutoSize" type="System.Boolean, mscorlib">
<value>True</value>
@ -823,7 +859,7 @@
<value>3, 3, 3, 3</value>
</data>
<data name="label6.Size" type="System.Drawing.Size, System.Drawing">
<value>248, 15</value>
<value>250, 15</value>
</data>
<data name="label6.TabIndex" type="System.Int32, mscorlib">
<value>5</value>
@ -850,13 +886,13 @@
<value>Segoe UI, 9pt</value>
</data>
<data name="notEnrolledPanel.Location" type="System.Drawing.Point, System.Drawing">
<value>3, 224</value>
<value>3, 246</value>
</data>
<data name="notEnrolledPanel.RowCount" type="System.Int32, mscorlib">
<value>2</value>
</data>
<data name="notEnrolledPanel.Size" type="System.Drawing.Size, System.Drawing">
<value>254, 62</value>
<value>256, 48</value>
</data>
<data name="notEnrolledPanel.TabIndex" type="System.Int32, mscorlib">
<value>19</value>
@ -889,7 +925,7 @@
<value>2</value>
</data>
<data name="poolDetailsPanel.Size" type="System.Drawing.Size, System.Drawing">
<value>260, 289</value>
<value>262, 297</value>
</data>
<data name="poolDetailsPanel.TabIndex" type="System.Int32, mscorlib">
<value>20</value>
@ -922,7 +958,7 @@
<value>2</value>
</data>
<data name="tableLayoutPanel2.Size" type="System.Drawing.Size, System.Drawing">
<value>268, 319</value>
<value>270, 327</value>
</data>
<data name="tableLayoutPanel2.TabIndex" type="System.Int32, mscorlib">
<value>0</value>
@ -961,10 +997,10 @@
<value>220</value>
</data>
<data name="splitContainer1.Size" type="System.Drawing.Size, System.Drawing">
<value>760, 319</value>
<value>763, 327</value>
</data>
<data name="splitContainer1.SplitterDistance" type="System.Int32, mscorlib">
<value>488</value>
<value>489</value>
</data>
<data name="splitContainer1.TabIndex" type="System.Int32, mscorlib">
<value>17</value>
@ -979,7 +1015,7 @@
<value>tableLayoutPanel1</value>
</data>
<data name="&gt;&gt;splitContainer1.ZOrder" xml:space="preserve">
<value>2</value>
<value>1</value>
</data>
<data name="buttonCancel.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
<value>Bottom, Right</value>
@ -991,13 +1027,13 @@
<value>NoControl</value>
</data>
<data name="buttonCancel.Location" type="System.Drawing.Point, System.Drawing">
<value>703, 399</value>
<value>703, 407</value>
</data>
<data name="buttonCancel.Size" type="System.Drawing.Size, System.Drawing">
<value>75, 23</value>
</data>
<data name="buttonCancel.TabIndex" type="System.Int32, mscorlib">
<value>8</value>
<value>2</value>
</data>
<data name="buttonCancel.Text" xml:space="preserve">
<value>Close</value>
@ -1012,7 +1048,7 @@
<value>$this</value>
</data>
<data name="&gt;&gt;buttonCancel.ZOrder" xml:space="preserve">
<value>1</value>
<value>2</value>
</data>
<data name="tableLayoutPanel1.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
<value>Top, Bottom, Left, Right</value>
@ -1108,10 +1144,10 @@
<value>0, 0, 0, 4</value>
</data>
<data name="flowLayoutPanel2.Size" type="System.Drawing.Size, System.Drawing">
<value>766, 18</value>
<value>769, 18</value>
</data>
<data name="flowLayoutPanel2.TabIndex" type="System.Int32, mscorlib">
<value>18</value>
<value>13</value>
</data>
<data name="&gt;&gt;flowLayoutPanel2.Name" xml:space="preserve">
<value>flowLayoutPanel2</value>
@ -1147,7 +1183,7 @@
<value>0, 0, 0, 4</value>
</data>
<data name="rubricLabel.Size" type="System.Drawing.Size, System.Drawing">
<value>763, 34</value>
<value>766, 34</value>
</data>
<data name="rubricLabel.TabIndex" type="System.Int32, mscorlib">
<value>12</value>
@ -1165,7 +1201,7 @@
<value>tableLayoutPanel1</value>
</data>
<data name="&gt;&gt;rubricLabel.ZOrder" xml:space="preserve">
<value>1</value>
<value>2</value>
</data>
<data name="tableLayoutPanel1.Font" type="System.Drawing.Font, System.Drawing">
<value>Segoe UI, 9pt</value>
@ -1173,14 +1209,17 @@
<data name="tableLayoutPanel1.Location" type="System.Drawing.Point, System.Drawing">
<value>9, 12</value>
</data>
<data name="tableLayoutPanel1.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
<value>3, 3, 0, 3</value>
</data>
<data name="tableLayoutPanel1.RowCount" type="System.Int32, mscorlib">
<value>3</value>
</data>
<data name="tableLayoutPanel1.Size" type="System.Drawing.Size, System.Drawing">
<value>766, 381</value>
<value>769, 389</value>
</data>
<data name="tableLayoutPanel1.TabIndex" type="System.Int32, mscorlib">
<value>68</value>
<value>1</value>
</data>
<data name="&gt;&gt;tableLayoutPanel1.Name" xml:space="preserve">
<value>tableLayoutPanel1</value>
@ -1195,7 +1234,40 @@
<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="flowLayoutPanel2" Row="1" RowSpan="1" Column="0" ColumnSpan="1" /&gt;&lt;Control Name="rubricLabel" Row="0" RowSpan="1" Column="0" ColumnSpan="1" /&gt;&lt;Control Name="splitContainer1" Row="2" RowSpan="1" Column="0" ColumnSpan="1" /&gt;&lt;/Controls&gt;&lt;Columns Styles="Percent,100" /&gt;&lt;Rows Styles="AutoSize,0,AutoSize,0,Percent,100" /&gt;&lt;/TableLayoutSettings&gt;</value>
<value>&lt;?xml version="1.0" encoding="utf-16"?&gt;&lt;TableLayoutSettings&gt;&lt;Controls&gt;&lt;Control Name="flowLayoutPanel2" Row="1" RowSpan="1" Column="0" ColumnSpan="1" /&gt;&lt;Control Name="splitContainer1" Row="2" RowSpan="1" Column="0" ColumnSpan="1" /&gt;&lt;Control Name="rubricLabel" Row="0" RowSpan="1" Column="0" ColumnSpan="1" /&gt;&lt;/Controls&gt;&lt;Columns Styles="Percent,100" /&gt;&lt;Rows Styles="AutoSize,0,AutoSize,0,Percent,100" /&gt;&lt;/TableLayoutSettings&gt;</value>
</data>
<data name="showAgainCheckBox.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
<value>Bottom, Left</value>
</data>
<data name="showAgainCheckBox.AutoSize" type="System.Boolean, mscorlib">
<value>True</value>
</data>
<data name="showAgainCheckBox.Font" type="System.Drawing.Font, System.Drawing">
<value>Segoe UI, 9pt</value>
</data>
<data name="showAgainCheckBox.Location" type="System.Drawing.Point, System.Drawing">
<value>9, 410</value>
</data>
<data name="showAgainCheckBox.Size" type="System.Drawing.Size, System.Drawing">
<value>469, 19</value>
</data>
<data name="showAgainCheckBox.TabIndex" type="System.Int32, mscorlib">
<value>2</value>
</data>
<data name="showAgainCheckBox.Text" xml:space="preserve">
<value>&amp;Show this dialog when connecting to servers that are not enrolled into Health Check</value>
</data>
<data name="&gt;&gt;showAgainCheckBox.Name" xml:space="preserve">
<value>showAgainCheckBox</value>
</data>
<data name="&gt;&gt;showAgainCheckBox.Type" xml:space="preserve">
<value>System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="&gt;&gt;showAgainCheckBox.Parent" xml:space="preserve">
<value>$this</value>
</data>
<data name="&gt;&gt;showAgainCheckBox.ZOrder" xml:space="preserve">
<value>1</value>
</data>
<metadata name="$this.Localizable" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>

View File

@ -487,7 +487,7 @@
<value>24</value>
</data>
<data name="authenticationRubricLabel.Text" xml:space="preserve">
<value>Authentication with Citrix upload server is required in order to enable this feature. Please register by providing MyCitrix credentials. These credentials will only be used to obtain an upload token and will not be stored on this machine or on your server.</value>
<value>Authentication with Citrix Insight Services is required in order to enable this feature. Please register by providing MyCitrix credentials. These credentials will only be used to obtain an upload token and will not be stored on this machine or on your server.</value>
</data>
<data name="authenticationRubricLabel.TextAlign" type="System.Drawing.ContentAlignment, System.Drawing">
<value>MiddleLeft</value>
@ -751,7 +751,7 @@
<value>4</value>
</data>
<data name="decentGroupBox1.Text" xml:space="preserve">
<value>Authentication with Citrix upload server</value>
<value>Authentication with Citrix Insight Services</value>
</data>
<data name="&gt;&gt;decentGroupBox1.Name" xml:space="preserve">
<value>decentGroupBox1</value>

View File

@ -853,7 +853,8 @@ namespace XenAdmin
if(licenseTimer != null)
licenseTimer.CheckActiveServerLicense(connection, false);
ThreadPool.QueueUserWorkItem(CheckHealthCheckEnrollment, connection);
if (Properties.Settings.Default.ShowHealthCheckEnrollmentReminder)
ThreadPool.QueueUserWorkItem(CheckHealthCheckEnrollment, connection);
ThreadPool.QueueUserWorkItem(InformHealthCheckEnrollment, connection);
Updates.CheckServerPatches();

View File

@ -1,7 +1,7 @@
//------------------------------------------------------------------------------
// <auto-generated>
// This code was generated by a tool.
// Runtime Version:4.0.30319.18052
// Runtime Version:4.0.30319.18444
//
// Changes to this file may cause incorrect behavior and will be lost if
// the code is regenerated.
@ -669,5 +669,18 @@ namespace XenAdmin.Properties {
this["PinConnectionBar"] = value;
}
}
[global::System.Configuration.UserScopedSettingAttribute()]
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.Configuration.DefaultSettingValueAttribute("True")]
[global::System.Configuration.SettingsManageabilityAttribute(global::System.Configuration.SettingsManageability.Roaming)]
public bool ShowHealthCheckEnrollmentReminder {
get {
return ((bool)(this["ShowHealthCheckEnrollmentReminder"]));
}
set {
this["ShowHealthCheckEnrollmentReminder"] = value;
}
}
}
}

View File

@ -155,5 +155,8 @@
<Setting Name="PinConnectionBar" Roaming="true" Type="System.Boolean" Scope="User">
<Value Profile="(Default)">True</Value>
</Setting>
<Setting Name="ShowHealthCheckEnrollmentReminder" Roaming="true" Type="System.Boolean" Scope="User">
<Value Profile="(Default)">True</Value>
</Setting>
</Settings>
</SettingsFile>

View File

@ -2317,6 +2317,7 @@
<SubType>Designer</SubType>
</EmbeddedResource>
<None Include="app.config">
<SubType>Designer</SubType>
</None>
<None Include="Properties\Settings.settings">
<Generator>SettingsSingleFileGenerator</Generator>

View File

@ -17,7 +17,8 @@
</setting>
<setting name="ServerList" serializeAs="Xml">
<value>
<ArrayOfString xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema"/>
<ArrayOfString xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns:xsd="http://www.w3.org/2001/XMLSchema" />
</value>
</setting>
<setting name="LocalSRsVisible" serializeAs="String">
@ -57,7 +58,7 @@
<value>0</value>
</setting>
<setting name="ProxyAddress" serializeAs="String">
<value/>
<value />
</setting>
<setting name="BypassProxyForLocal" serializeAs="String">
<value>False</value>
@ -102,7 +103,7 @@
<value>False</value>
</setting>
<setting name="LatestXenCenterSeen" serializeAs="String">
<value/>
<value />
</setting>
<setting name="SeenAllowUpdatesDialog" serializeAs="String">
<value>False</value>
@ -118,16 +119,18 @@
</setting>
<setting name="DisabledPlugins" serializeAs="Xml">
<value>
<ArrayOfString xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema"/>
<ArrayOfString xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns:xsd="http://www.w3.org/2001/XMLSchema" />
</value>
</setting>
<setting name="IgnoreFirstRunWizards" serializeAs="Xml">
<value>
<ArrayOfString xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema"/>
<ArrayOfString xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns:xsd="http://www.w3.org/2001/XMLSchema" />
</value>
</setting>
<setting name="ServerStatusPath" serializeAs="String">
<value/>
<value />
</setting>
<setting name="RollingUpgradeWizardShowFirstPage" serializeAs="String">
<value>False</value>
@ -136,7 +139,7 @@
<value>True</value>
</setting>
<setting name="ApplicationVersion" serializeAs="String">
<value/>
<value />
</setting>
<setting name="UncaptureShortcutKey" serializeAs="String">
<value>0</value>
@ -147,6 +150,9 @@
<setting name="PinConnectionBar" serializeAs="String">
<value>True</value>
</setting>
<setting name="ShowHealthCheckEnrollmentReminder" serializeAs="String">
<value>True</value>
</setting>
</XenAdmin.Properties.Settings>
</userSettings>

View File

@ -7175,6 +7175,24 @@ namespace XenAdmin {
}
}
/// <summary>
/// Looks up a localized string similar to Are you sure you want to disable Health Check on the selected pool?.
/// </summary>
public static string CONFIRM_DISABLE_HEALTH_CHECK_POOL {
get {
return ResourceManager.GetString("CONFIRM_DISABLE_HEALTH_CHECK_POOL", resourceCulture);
}
}
/// <summary>
/// Looks up a localized string similar to Are you sure you want to disable Health Check on the selected server?.
/// </summary>
public static string CONFIRM_DISABLE_HEALTH_CHECK_SERVER {
get {
return ResourceManager.GetString("CONFIRM_DISABLE_HEALTH_CHECK_SERVER", resourceCulture);
}
}
/// <summary>
/// Looks up a localized string similar to The export file may be larger than your filesystem limit.
///

View File

@ -2600,6 +2600,12 @@ This action is final and unrecoverable.</value>
<data name="CONFIRM_DESTROY_HOST_YES_BUTTON_LABEL" xml:space="preserve">
<value>&amp;Yes, Destroy</value>
</data>
<data name="CONFIRM_DISABLE_HEALTH_CHECK_POOL" xml:space="preserve">
<value>Are you sure you want to disable Health Check on the selected pool?</value>
</data>
<data name="CONFIRM_DISABLE_HEALTH_CHECK_SERVER" xml:space="preserve">
<value>Are you sure you want to disable Health Check on the selected server?</value>
</data>
<data name="CONFIRM_EXPORT_FAT" xml:space="preserve">
<value>The export file may be larger than your filesystem limit.