CA-116494: Improvements on the server status report contents list: made the list

sortable; substituted balloon warning with tooltip; moved privace statement link
to the bottom of the page; reordered select/clear all buttons.

Signed-off-by: Konstantina Chremmou <konstantina.chremmou@citrix.com>
This commit is contained in:
Konstantina Chremmou 2013-11-04 14:09:50 +00:00
parent 5f400c08d9
commit 58062b024c
6 changed files with 369 additions and 431 deletions

View File

@ -110,7 +110,7 @@ namespace XenAdmin.Wizards.BugToolWizardFiles
}
public List<Host> SelectedHosts { private get; set; }
public List<Capability> CapabilityList { private get; set; }
public IEnumerable<Capability> CapabilityList { private get; set; }
/// <summary>
/// Must be called on the event thread.
@ -125,7 +125,7 @@ namespace XenAdmin.Wizards.BugToolWizardFiles
_action = null;
}
private void RunAction(List<Capability> capabilities, List<Host> hosts)
private void RunAction(IEnumerable<Capability> capabilities, List<Host> hosts)
{
OnPageUpdated();
_hostList.Clear();

View File

@ -28,18 +28,17 @@ namespace XenAdmin.Wizards.BugToolWizardFiles
/// </summary>
private void InitializeComponent()
{
this.components = new System.ComponentModel.Container();
System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(BugToolPageSelectCapabilities));
this.splitContainer1 = new System.Windows.Forms.SplitContainer();
this.tableLayoutPanel1 = new System.Windows.Forms.TableLayoutPanel();
this.label3 = new System.Windows.Forms.Label();
this.CapabilitiesCheckedListBox = new XenAdmin.Controls.FlickerFreeListBox();
this.label2 = new System.Windows.Forms.Label();
this.flowLayoutPanel1 = new System.Windows.Forms.FlowLayoutPanel();
this.dataGridViewItems = new XenAdmin.Controls.DataGridViewEx.DataGridViewEx();
this.columnCheck = new System.Windows.Forms.DataGridViewCheckBoxColumn();
this.columnItem = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.columnImage = new System.Windows.Forms.DataGridViewImageColumn();
this.SelectButton = new System.Windows.Forms.Button();
this.ClearButton = new System.Windows.Forms.Button();
this.tableLayoutPanel4 = new System.Windows.Forms.TableLayoutPanel();
this.linkLabel1 = new System.Windows.Forms.LinkLabel();
this.tableLayoutPanel4 = new System.Windows.Forms.TableLayoutPanel();
this.DescriptionLabel = new System.Windows.Forms.Label();
this.DescriptionValue = new System.Windows.Forms.Label();
this.SizeLabel = new System.Windows.Forms.Label();
@ -50,14 +49,13 @@ namespace XenAdmin.Wizards.BugToolWizardFiles
this.TotalSizeValue = new System.Windows.Forms.Label();
this.TotalTimeLabel = new System.Windows.Forms.Label();
this.TotalTimeValue = new System.Windows.Forms.Label();
this.PiiTooltip = new System.Windows.Forms.ToolTip(this.components);
this.tableLayoutPanel3 = new System.Windows.Forms.TableLayoutPanel();
this.label1 = new System.Windows.Forms.Label();
this.splitContainer1.Panel1.SuspendLayout();
this.splitContainer1.Panel2.SuspendLayout();
this.splitContainer1.SuspendLayout();
this.tableLayoutPanel1.SuspendLayout();
this.flowLayoutPanel1.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.dataGridViewItems)).BeginInit();
this.tableLayoutPanel4.SuspendLayout();
this.tableLayoutPanel3.SuspendLayout();
this.SuspendLayout();
@ -79,43 +77,47 @@ namespace XenAdmin.Wizards.BugToolWizardFiles
// tableLayoutPanel1
//
resources.ApplyResources(this.tableLayoutPanel1, "tableLayoutPanel1");
this.tableLayoutPanel1.Controls.Add(this.label3, 1, 0);
this.tableLayoutPanel1.Controls.Add(this.CapabilitiesCheckedListBox, 0, 1);
this.tableLayoutPanel1.Controls.Add(this.label2, 0, 0);
this.tableLayoutPanel1.Controls.Add(this.flowLayoutPanel1, 0, 2);
this.tableLayoutPanel1.Controls.Add(this.dataGridViewItems, 0, 0);
this.tableLayoutPanel1.Controls.Add(this.SelectButton, 1, 1);
this.tableLayoutPanel1.Controls.Add(this.ClearButton, 2, 1);
this.tableLayoutPanel1.Controls.Add(this.linkLabel1, 0, 2);
this.tableLayoutPanel1.Name = "tableLayoutPanel1";
//
// label3
// dataGridViewItems
//
resources.ApplyResources(this.label3, "label3");
this.label3.Name = "label3";
this.dataGridViewItems.BackgroundColor = System.Drawing.SystemColors.Window;
this.dataGridViewItems.CellBorderStyle = System.Windows.Forms.DataGridViewCellBorderStyle.None;
this.dataGridViewItems.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.DisableResizing;
this.dataGridViewItems.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] {
this.columnCheck,
this.columnItem,
this.columnImage});
this.tableLayoutPanel1.SetColumnSpan(this.dataGridViewItems, 3);
resources.ApplyResources(this.dataGridViewItems, "dataGridViewItems");
this.dataGridViewItems.GridColor = System.Drawing.SystemColors.Control;
this.dataGridViewItems.Name = "dataGridViewItems";
this.dataGridViewItems.SortCompare += new System.Windows.Forms.DataGridViewSortCompareEventHandler(this.dataGridViewItems_SortCompare);
this.dataGridViewItems.CellClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.dataGridViewItems_CellClick);
this.dataGridViewItems.SelectionChanged += new System.EventHandler(this.dataGridViewItems_SelectionChanged);
//
// CapabilitiesCheckedListBox
// columnCheck
//
this.tableLayoutPanel1.SetColumnSpan(this.CapabilitiesCheckedListBox, 2);
resources.ApplyResources(this.CapabilitiesCheckedListBox, "CapabilitiesCheckedListBox");
this.CapabilitiesCheckedListBox.DrawMode = System.Windows.Forms.DrawMode.OwnerDrawFixed;
this.CapabilitiesCheckedListBox.FormattingEnabled = true;
this.CapabilitiesCheckedListBox.Name = "CapabilitiesCheckedListBox";
this.PiiTooltip.SetToolTip(this.CapabilitiesCheckedListBox, resources.GetString("CapabilitiesCheckedListBox.ToolTip"));
this.CapabilitiesCheckedListBox.MouseUp += new System.Windows.Forms.MouseEventHandler(this.CapabilitiesCheckedListBox_MouseUp);
this.CapabilitiesCheckedListBox.DrawItem += new System.Windows.Forms.DrawItemEventHandler(this.CapabilitiesCheckedListBox_DrawItem);
this.CapabilitiesCheckedListBox.SelectedIndexChanged += new System.EventHandler(this.CapabilitiesCheckedListBox_SelectedIndexChanged);
this.CapabilitiesCheckedListBox.MouseMove += new System.Windows.Forms.MouseEventHandler(this.CapabilitiesCheckedListBox_MouseMove);
this.CapabilitiesCheckedListBox.KeyUp += new System.Windows.Forms.KeyEventHandler(this.CapabilitiesCheckedListBox_KeyUp);
this.columnCheck.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.AllCells;
resources.ApplyResources(this.columnCheck, "columnCheck");
this.columnCheck.Name = "columnCheck";
this.columnCheck.Resizable = System.Windows.Forms.DataGridViewTriState.False;
this.columnCheck.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.Automatic;
//
// label2
// columnItem
//
resources.ApplyResources(this.label2, "label2");
this.label2.Name = "label2";
resources.ApplyResources(this.columnItem, "columnItem");
this.columnItem.Name = "columnItem";
//
// flowLayoutPanel1
// columnImage
//
resources.ApplyResources(this.flowLayoutPanel1, "flowLayoutPanel1");
this.tableLayoutPanel1.SetColumnSpan(this.flowLayoutPanel1, 2);
this.flowLayoutPanel1.Controls.Add(this.SelectButton);
this.flowLayoutPanel1.Controls.Add(this.ClearButton);
this.flowLayoutPanel1.Name = "flowLayoutPanel1";
resources.ApplyResources(this.columnImage, "columnImage");
this.columnImage.Name = "columnImage";
this.columnImage.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.Automatic;
//
// SelectButton
//
@ -131,31 +133,29 @@ namespace XenAdmin.Wizards.BugToolWizardFiles
this.ClearButton.UseVisualStyleBackColor = true;
this.ClearButton.Click += new System.EventHandler(this.ClearButton_Click);
//
// tableLayoutPanel4
//
resources.ApplyResources(this.tableLayoutPanel4, "tableLayoutPanel4");
this.tableLayoutPanel4.Controls.Add(this.linkLabel1, 0, 0);
this.tableLayoutPanel4.Controls.Add(this.DescriptionLabel, 0, 1);
this.tableLayoutPanel4.Controls.Add(this.DescriptionValue, 0, 2);
this.tableLayoutPanel4.Controls.Add(this.SizeLabel, 0, 3);
this.tableLayoutPanel4.Controls.Add(this.SizeValue, 0, 4);
this.tableLayoutPanel4.Controls.Add(this.TimeLabel, 0, 5);
this.tableLayoutPanel4.Controls.Add(this.TimeValue, 0, 6);
this.tableLayoutPanel4.Controls.Add(this.TotalSizeLabel, 0, 7);
this.tableLayoutPanel4.Controls.Add(this.TotalSizeValue, 1, 7);
this.tableLayoutPanel4.Controls.Add(this.TotalTimeLabel, 0, 8);
this.tableLayoutPanel4.Controls.Add(this.TotalTimeValue, 1, 8);
this.tableLayoutPanel4.Name = "tableLayoutPanel4";
//
// linkLabel1
//
resources.ApplyResources(this.linkLabel1, "linkLabel1");
this.linkLabel1.AutoEllipsis = true;
this.tableLayoutPanel4.SetColumnSpan(this.linkLabel1, 2);
resources.ApplyResources(this.linkLabel1, "linkLabel1");
this.linkLabel1.Name = "linkLabel1";
this.linkLabel1.TabStop = true;
this.linkLabel1.LinkClicked += new System.Windows.Forms.LinkLabelLinkClickedEventHandler(this.linkLabel1_LinkClicked);
//
// tableLayoutPanel4
//
resources.ApplyResources(this.tableLayoutPanel4, "tableLayoutPanel4");
this.tableLayoutPanel4.Controls.Add(this.DescriptionLabel, 0, 0);
this.tableLayoutPanel4.Controls.Add(this.DescriptionValue, 0, 1);
this.tableLayoutPanel4.Controls.Add(this.SizeLabel, 0, 2);
this.tableLayoutPanel4.Controls.Add(this.SizeValue, 0, 3);
this.tableLayoutPanel4.Controls.Add(this.TimeLabel, 0, 4);
this.tableLayoutPanel4.Controls.Add(this.TimeValue, 0, 5);
this.tableLayoutPanel4.Controls.Add(this.TotalSizeLabel, 0, 6);
this.tableLayoutPanel4.Controls.Add(this.TotalSizeValue, 1, 6);
this.tableLayoutPanel4.Controls.Add(this.TotalTimeLabel, 0, 7);
this.tableLayoutPanel4.Controls.Add(this.TotalTimeValue, 1, 7);
this.tableLayoutPanel4.Name = "tableLayoutPanel4";
//
// DescriptionLabel
//
resources.ApplyResources(this.DescriptionLabel, "DescriptionLabel");
@ -209,12 +209,6 @@ namespace XenAdmin.Wizards.BugToolWizardFiles
resources.ApplyResources(this.TotalTimeValue, "TotalTimeValue");
this.TotalTimeValue.Name = "TotalTimeValue";
//
// PiiTooltip
//
this.PiiTooltip.IsBalloon = true;
this.PiiTooltip.ShowAlways = true;
this.PiiTooltip.ToolTipIcon = System.Windows.Forms.ToolTipIcon.Warning;
//
// tableLayoutPanel3
//
resources.ApplyResources(this.tableLayoutPanel3, "tableLayoutPanel3");
@ -238,7 +232,7 @@ namespace XenAdmin.Wizards.BugToolWizardFiles
this.splitContainer1.ResumeLayout(false);
this.tableLayoutPanel1.ResumeLayout(false);
this.tableLayoutPanel1.PerformLayout();
this.flowLayoutPanel1.ResumeLayout(false);
((System.ComponentModel.ISupportInitialize)(this.dataGridViewItems)).EndInit();
this.tableLayoutPanel4.ResumeLayout(false);
this.tableLayoutPanel4.PerformLayout();
this.tableLayoutPanel3.ResumeLayout(false);
@ -251,7 +245,6 @@ namespace XenAdmin.Wizards.BugToolWizardFiles
#endregion
private System.Windows.Forms.TableLayoutPanel tableLayoutPanel1;
private XenAdmin.Controls.FlickerFreeListBox CapabilitiesCheckedListBox;
private System.Windows.Forms.Label DescriptionLabel;
private System.Windows.Forms.Label SizeLabel;
private System.Windows.Forms.Label TimeLabel;
@ -260,18 +253,18 @@ namespace XenAdmin.Wizards.BugToolWizardFiles
private System.Windows.Forms.Label TimeValue;
private System.Windows.Forms.Label TotalSizeLabel;
private System.Windows.Forms.Label TotalSizeValue;
private System.Windows.Forms.ToolTip PiiTooltip;
private System.Windows.Forms.LinkLabel linkLabel1;
private System.Windows.Forms.Label TotalTimeLabel;
private System.Windows.Forms.Label TotalTimeValue;
private System.Windows.Forms.FlowLayoutPanel flowLayoutPanel1;
private System.Windows.Forms.Button ClearButton;
private System.Windows.Forms.Button SelectButton;
private System.Windows.Forms.Label label2;
private System.Windows.Forms.Label label3;
private System.Windows.Forms.SplitContainer splitContainer1;
private System.Windows.Forms.TableLayoutPanel tableLayoutPanel3;
private System.Windows.Forms.Label label1;
private System.Windows.Forms.TableLayoutPanel tableLayoutPanel4;
private XenAdmin.Controls.DataGridViewEx.DataGridViewEx dataGridViewItems;
private System.Windows.Forms.DataGridViewCheckBoxColumn columnCheck;
private System.Windows.Forms.DataGridViewTextBoxColumn columnItem;
private System.Windows.Forms.DataGridViewImageColumn columnImage;
}
}

View File

@ -31,19 +31,15 @@
using System;
using System.Collections.Generic;
using System.ComponentModel;
using System.Drawing;
using System.Data;
using System.IO;
using System.Text;
using System.Linq;
using System.Text.RegularExpressions;
using System.Windows.Forms;
using System.Windows.Forms.VisualStyles;
using System.Xml;
using XenAdmin.Controls;
using XenAdmin.Core;
using XenAdmin.Network;
using XenAPI;
using XenAdmin.Actions;
using XenAdmin.Dialogs;
@ -61,7 +57,6 @@ namespace XenAdmin.Wizards.BugToolWizardFiles
private List<GetSystemStatusCapabilities> actions;
private ActionProgressDialog dialog;
private bool cancelled;
private int oldIndex = -1;
#endregion
public BugToolPageSelectCapabilities()
@ -71,10 +66,6 @@ namespace XenAdmin.Wizards.BugToolWizardFiles
//set this here due to a framework bug
splitContainer1.Panel1MinSize = 250;
splitContainer1.Panel2MinSize = 200;
// Due to a Visual Studio bug, ToolTipTitle is not put in the resx, even though the form is Localizable=true
// so we have to set it here instead.
PiiTooltip.ToolTipTitle = Messages.PRIVACY_WARNING;
}
public override string Text{get { return Messages.BUGTOOL_PAGE_CAPABILITIES_TEXT; }}
@ -100,18 +91,24 @@ namespace XenAdmin.Wizards.BugToolWizardFiles
private bool wizardCheckAnyChecked()
{
foreach (Capability c in _capabilities)
if (c.Checked)
foreach (DataGridViewRow row in dataGridViewItems.Rows)
{
var capRow = row as CapabilityRow;
if (capRow != null && capRow.Capability.Checked)
return true;
}
return false;
}
private bool wizardCheckAnyUnchecked()
{
foreach (Capability c in _capabilities)
if (!c.Checked)
return true;
return false;
foreach (DataGridViewRow row in dataGridViewItems.Rows)
{
var capRow = row as CapabilityRow;
if (capRow != null && !capRow.Capability.Checked)
return true;
}
return false;
}
/// <summary>
@ -125,7 +122,7 @@ namespace XenAdmin.Wizards.BugToolWizardFiles
return true;
_hostList = HostList;
CapabilitiesCheckedListBox.Items.Clear();
dataGridViewItems.Rows.Clear();
if (dialog != null && dialog.Visible)
dialog.Close();
@ -290,29 +287,36 @@ namespace XenAdmin.Wizards.BugToolWizardFiles
}));
}
private void OnCheckedCapabilitiesChanged(bool refreshList)
private void OnCheckedCapabilitiesChanged()
{
TotalSizeValue.Text = getShoppingCartTotalSize();
TotalTimeValue.Text = getShoppingCartTotalTime();
OnPageUpdated();
string totalSize, totalTime;
CalculateTotalSizeAndTime(out totalSize, out totalTime);
TotalSizeValue.Text = totalSize;
TotalTimeValue.Text = totalTime;
ClearButton.Enabled = wizardCheckAnyChecked();
SelectButton.Enabled = wizardCheckAnyUnchecked();
if (refreshList)
CapabilitiesCheckedListBox.Refresh();
OnPageUpdated();
}
private void buildList()
{
CapabilitiesCheckedListBox.Items.Clear();
foreach (Capability c in _capabilities)
try
{
CapabilitiesCheckedListBox.Items.Add(c);
if (CapabilitiesCheckedListBox.SelectedIndex == -1)
CapabilitiesCheckedListBox.SelectedItem = c;
dataGridViewItems.SuspendLayout();
dataGridViewItems.Rows.Clear();
var list = new List<DataGridViewRow>();
foreach (Capability c in _capabilities)
list.Add(new CapabilityRow(c));
dataGridViewItems.Rows.AddRange(list.ToArray());
}
OnCheckedCapabilitiesChanged(false);
finally
{
dataGridViewItems.ResumeLayout();
}
OnCheckedCapabilitiesChanged();
}
private long getLogSize()
@ -340,140 +344,86 @@ namespace XenAdmin.Wizards.BugToolWizardFiles
}
}
private string getShoppingCartTotalSize()
private void CalculateTotalSizeAndTime(out string totalSize, out string totalTime)
{
List<long> minList = new List<long>();
List<long> maxList = new List<long>();
foreach (Capability c in CapabilitiesCheckedListBox.Items)
var sizeMinList = new List<long>();
var sizeMaxList = new List<long>();
var timeMinList = new List<long>();
var timeMaxList = new List<long>();
foreach (var row in dataGridViewItems.Rows)
{
if (c.Checked)
var capRow = row as CapabilityRow;
if (capRow != null && capRow.Capability.Checked)
{
var c = capRow.Capability;
int m = c.Key == "client-logs" ? 1 : _hostList.Count;
minList.Add(c.MinSize * m);
maxList.Add(c.MaxSize * m);
sizeMinList.Add(c.MinSize * m);
sizeMaxList.Add(c.MaxSize * m);
timeMinList.Add(c.MinTime * m);
timeMaxList.Add(c.MaxTime * m);
}
}
return Helpers.StringFromMaxMinSizeList(minList, maxList);
totalSize = Helpers.StringFromMaxMinSizeList(sizeMinList, sizeMaxList);
totalTime = Helpers.StringFromMaxMinTimeList(timeMinList, timeMaxList);
}
private string getShoppingCartTotalTime()
{
List<long> minList = new List<long>();
List<long> maxList = new List<long>();
foreach (Capability c in CapabilitiesCheckedListBox.Items)
{
if (c.Checked)
{
int m = c.Key == "client-logs" ? 1 : _hostList.Count;
minList.Add(c.MinTime * m);
maxList.Add(c.MaxTime * m);
}
}
return Helpers.StringFromMaxMinTimeList(minList, maxList);
}
public List<Capability> Capabilities
public IEnumerable<Capability> Capabilities
{
get
{
List<Capability> list = new List<Capability>();
foreach (Capability c in CapabilitiesCheckedListBox.Items)
{
if(c.Checked)
list.Add(c);
}
return list;
return from DataGridViewRow row in dataGridViewItems.Rows
let capRow = row as CapabilityRow
where capRow != null && capRow.Capability.Checked
select capRow.Capability;
}
}
#region Control event handlers
private void CapabilitiesCheckedListBox_SelectedIndexChanged(object sender, EventArgs e)
private void dataGridViewItems_SortCompare(object sender, DataGridViewSortCompareEventArgs e)
{
if (CapabilitiesCheckedListBox.SelectedIndex == -1)
var row1 = dataGridViewItems.Rows[e.RowIndex1] as CapabilityRow;
var row2 = dataGridViewItems.Rows[e.RowIndex2] as CapabilityRow;
if (row1 != null && row2 != null && e.Column.Index == columnImage.Index)
{
e.SortResult = row1.Capability.PII.CompareTo(row2.Capability.PII);
e.Handled = true;
}
}
private void dataGridViewItems_SelectionChanged(object sender, EventArgs e)
{
if (dataGridViewItems.SelectedRows.Count > 0)
{
var row = dataGridViewItems.SelectedRows[0] as CapabilityRow;
if (row == null)
return;
DescriptionValue.Text = row.Capability.Description;
SizeValue.Text = row.Capability.EstimatedSize;
TimeValue.Text = row.Capability.EstimatedTime;
}
}
private void dataGridViewItems_CellClick(object sender, DataGridViewCellEventArgs e)
{
if (e.ColumnIndex != columnCheck.Index)
return;
if (e.RowIndex < 0 || e.RowIndex >= dataGridViewItems.RowCount)
return;
Capability c = CapabilitiesCheckedListBox.SelectedItem as Capability;
DescriptionValue.Text = c.Description;
SizeValue.Text = c.EstimatedSize;
TimeValue.Text = c.EstimatedTime;
}
private void CapabilitiesCheckedListBox_DrawItem(object sender, DrawItemEventArgs e)
{
if (e.Index == -1)
var row = dataGridViewItems.Rows[e.RowIndex] as CapabilityRow;
if (row == null)
return;
Capability c = CapabilitiesCheckedListBox.Items[e.Index] as Capability;
using (SolidBrush backBrush = new SolidBrush(e.BackColor))
{
e.Graphics.FillRectangle(backBrush, e.Bounds);
CheckBoxRenderer.DrawCheckBox(e.Graphics, new Point(e.Bounds.Left + 1, e.Bounds.Top + 1), c.Checked ? CheckBoxState.CheckedNormal : CheckBoxState.UncheckedNormal);
Drawing.DrawText(e.Graphics, c.ToString(), Font, new Point(e.Bounds.Left + e.Bounds.Height, e.Bounds.Top + 1), e.ForeColor);
e.Graphics.FillRectangle(backBrush, new Rectangle(e.Bounds.Right - 15, e.Bounds.Top, 15, e.Bounds.Height));
}
if (c.PII == PrivateInformationIncluded.customized)
{
e.Graphics.DrawImage(Properties.Resources._000_PiiCustomised_h32bit_16, new Rectangle(e.Bounds.Right - 15, e.Bounds.Top, 15, 15));
}
else if (c.PII == PrivateInformationIncluded.maybe)
{
e.Graphics.DrawImage(Properties.Resources._000_PiiMaybe_h32bit_16, new Rectangle(e.Bounds.Right - 15, e.Bounds.Top, 15, 15));
}
else if (c.PII == PrivateInformationIncluded.no)
{
e.Graphics.DrawImage(Properties.Resources._000_PiiNo_h32bit_16, new Rectangle(e.Bounds.Right - 15, e.Bounds.Top, 15, 15));
}
else
{
e.Graphics.DrawImage(Properties.Resources._000_PiiYes_h32bit_16, new Rectangle(e.Bounds.Right - 15, e.Bounds.Top, 15, 15));
}
}
private void CapabilitiesCheckedListBox_MouseMove(object sender, MouseEventArgs e)
{
Point point = CapabilitiesCheckedListBox.PointToClient(MousePosition);
int imageLeft = CapabilitiesCheckedListBox.Height > CapabilitiesCheckedListBox.ItemHeight * CapabilitiesCheckedListBox.Items.Count ? 19 : 37;
if (point.X < CapabilitiesCheckedListBox.Width - imageLeft)
{
PiiTooltip.RemoveAll();
return;
}
int hoverIndex = CapabilitiesCheckedListBox.IndexFromPoint(point);
if (hoverIndex >= 0 && hoverIndex < CapabilitiesCheckedListBox.Items.Count)
{
if ((CapabilitiesCheckedListBox.Items[hoverIndex] as Capability).PiiText != PiiTooltip.GetToolTip(CapabilitiesCheckedListBox) || hoverIndex != oldIndex)
{
oldIndex = hoverIndex;
PiiTooltip.Active = false;
PiiTooltip.SetToolTip(CapabilitiesCheckedListBox, (CapabilitiesCheckedListBox.Items[hoverIndex] as Capability).PiiText);
PiiTooltip.Active = true;
}
}
}
private void CapabilitiesCheckedListBox_MouseUp(object sender, MouseEventArgs e)
{
Point point = CapabilitiesCheckedListBox.PointToClient(MousePosition);
if (point.X < 15)
{
Capability c = CapabilitiesCheckedListBox.SelectedItem as Capability;
c.Checked = !c.Checked;
OnCheckedCapabilitiesChanged(true);
}
}
private void CapabilitiesCheckedListBox_KeyUp(object sender, KeyEventArgs e)
{
if (e.KeyCode == Keys.Space)
{
Capability c = CapabilitiesCheckedListBox.SelectedItem as Capability;
if (c != null)
{
c.Checked = !c.Checked;
OnCheckedCapabilitiesChanged(true);
}
}
row.Capability.Checked = !row.Capability.Checked;
row.Update();
OnCheckedCapabilitiesChanged();
}
private void linkLabel1_LinkClicked(object sender, LinkLabelLinkClickedEventArgs e)
@ -494,21 +444,74 @@ namespace XenAdmin.Wizards.BugToolWizardFiles
private void SelectButton_Click(object sender, EventArgs e)
{
foreach (Capability c in _capabilities)
c.Checked = true;
OnCheckedCapabilitiesChanged(true);
foreach (DataGridViewRow row in dataGridViewItems.Rows)
{
var capRow = row as CapabilityRow;
if (capRow != null && !capRow.Capability.Checked)
{
capRow.Capability.Checked = true;
capRow.Update();
}
}
OnCheckedCapabilitiesChanged();
}
private void ClearButton_Click(object sender, EventArgs e)
{
foreach (Capability c in _capabilities)
c.Checked = false;
OnCheckedCapabilitiesChanged(true);
foreach (DataGridViewRow row in dataGridViewItems.Rows)
{
var capRow = row as CapabilityRow;
if (capRow != null && capRow.Capability.Checked)
{
capRow.Capability.Checked = false;
capRow.Update();
}
}
OnCheckedCapabilitiesChanged();
}
#endregion
private class CapabilityRow : DataGridViewRow
{
public readonly Capability Capability;
private readonly DataGridViewCheckBoxCell cellCheck = new DataGridViewCheckBoxCell();
private readonly DataGridViewTextBoxCell cellItem = new DataGridViewTextBoxCell();
private readonly DataGridViewImageCell cellImage = new DataGridViewImageCell();
public CapabilityRow(Capability capability)
{
Capability = capability;
Cells.AddRange(cellCheck, cellItem, cellImage);
Update();
}
public void Update()
{
cellCheck.Value = Capability.Checked;
cellItem.Value = Capability.Name;
switch(Capability.PII)
{
case PrivateInformationIncluded.maybe:
cellImage.Value = Properties.Resources._000_PiiMaybe_h32bit_16;
break;
case PrivateInformationIncluded.customized:
cellImage.Value = Properties.Resources._000_PiiCustomised_h32bit_16;
break;
case PrivateInformationIncluded.no:
cellImage.Value = Properties.Resources._000_PiiNo_h32bit_16;
break;
case PrivateInformationIncluded.yes:
default:
cellImage.Value = Properties.Resources._000_PiiYes_h32bit_16;
break;
}
cellImage.ToolTipText = Capability.PiiText;
}
}
}
public enum ContentType { text_plain, application_data };
@ -519,12 +522,14 @@ namespace XenAdmin.Wizards.BugToolWizardFiles
{
public ContentType ContentType;
bool _defaultChecked;
public string Key;
public long MaxSize;
public long MinSize;
public long MaxTime;
public long MinTime;
public PrivateInformationIncluded PII;
private string _key;
private string _name;
private string _description;
public bool Checked;
@ -545,25 +550,48 @@ namespace XenAdmin.Wizards.BugToolWizardFiles
{
get
{
if (PII == PrivateInformationIncluded.yes)
return Messages.PII_YES;
else if(PII == PrivateInformationIncluded.maybe)
return Messages.PII_MAYBE;
else if(PII == PrivateInformationIncluded.customized)
return Messages.PII_CUSTOMISED;
else
return Messages.PII_NO;
switch (PII)
{
case PrivateInformationIncluded.yes:
return Messages.PII_YES;
case PrivateInformationIncluded.maybe:
return Messages.PII_MAYBE;
case PrivateInformationIncluded.customized:
return Messages.PII_CUSTOMISED;
case PrivateInformationIncluded.no:
default:
return Messages.PII_NO;
}
}
}
public string Description
public string Key
{
get
{
return Core.PropertyManager.GetFriendlyName(
string.Format("Description-host.system_status-{0}", Key));
return _key;
}
set
{
_key = value;
_name = Core.PropertyManager.GetFriendlyName(string.Format("Label-host.system_status-{0}", _key));
if (string.IsNullOrEmpty(_name))
_name = _key;
_description = Core.PropertyManager.GetFriendlyName(string.Format("Description-host.system_status-{0}", _key));
}
}
public string Name
{
get { return _name; }
}
public string Description
{
get { return _description; }
}
public string EstimatedSize
@ -584,9 +612,7 @@ namespace XenAdmin.Wizards.BugToolWizardFiles
public override string ToString()
{
string result = Core.PropertyManager.GetFriendlyName(
string.Format("Label-host.system_status-{0}", Key));
return result == null ? Key : result;
return _name;
}
public int CompareTo(Capability other)
@ -599,4 +625,4 @@ namespace XenAdmin.Wizards.BugToolWizardFiles
return this.Key.Equals(other.Key);
}
}
}
}

View File

@ -127,112 +127,58 @@
</data>
<assembly alias="mscorlib" name="mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
<data name="tableLayoutPanel1.ColumnCount" type="System.Int32, mscorlib">
<value>2</value>
<value>3</value>
</data>
<data name="label3.AutoSize" type="System.Boolean, mscorlib">
<metadata name="columnCheck.UserAddedColumn" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</data>
<data name="label3.Location" type="System.Drawing.Point, System.Drawing">
<value>252, 3</value>
</data>
<data name="label3.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
<value>3, 3, 3, 3</value>
</data>
<data name="label3.Size" type="System.Drawing.Size, System.Drawing">
<value>106, 13</value>
</data>
<data name="label3.TabIndex" type="System.Int32, mscorlib">
<value>0</value>
</data>
<data name="label3.Text" xml:space="preserve">
<value>Confidentiality Rating</value>
</data>
<data name="&gt;&gt;label3.Name" xml:space="preserve">
<value>label3</value>
</data>
<data name="&gt;&gt;label3.Type" xml:space="preserve">
<value>System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="&gt;&gt;label3.Parent" xml:space="preserve">
<value>tableLayoutPanel1</value>
</data>
<data name="&gt;&gt;label3.ZOrder" xml:space="preserve">
<value>0</value>
</data>
<data name="CapabilitiesCheckedListBox.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
<value>Fill</value>
</data>
<data name="CapabilitiesCheckedListBox.IntegralHeight" type="System.Boolean, mscorlib">
<value>False</value>
</data>
<data name="CapabilitiesCheckedListBox.ItemHeight" type="System.Int32, mscorlib">
<value>18</value>
</data>
<data name="CapabilitiesCheckedListBox.Location" type="System.Drawing.Point, System.Drawing">
<value>3, 22</value>
</data>
<data name="CapabilitiesCheckedListBox.Size" type="System.Drawing.Size, System.Drawing">
<value>355, 318</value>
</data>
<data name="CapabilitiesCheckedListBox.TabIndex" type="System.Int32, mscorlib">
<value>0</value>
</data>
<metadata name="PiiTooltip.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>120, 54</value>
</metadata>
<data name="CapabilitiesCheckedListBox.ToolTip" xml:space="preserve">
<value>1</value>
<data name="columnCheck.HeaderText" xml:space="preserve">
<value />
</data>
<data name="&gt;&gt;CapabilitiesCheckedListBox.Name" xml:space="preserve">
<value>CapabilitiesCheckedListBox</value>
<data name="columnCheck.Width" type="System.Int32, mscorlib">
<value>19</value>
</data>
<data name="&gt;&gt;CapabilitiesCheckedListBox.Type" xml:space="preserve">
<value>XenAdmin.Controls.FlickerFreeListBox, XenCenterMain, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null</value>
</data>
<data name="&gt;&gt;CapabilitiesCheckedListBox.Parent" xml:space="preserve">
<value>tableLayoutPanel1</value>
</data>
<data name="&gt;&gt;CapabilitiesCheckedListBox.ZOrder" xml:space="preserve">
<value>1</value>
</data>
<data name="label2.AutoSize" type="System.Boolean, mscorlib">
<metadata name="columnItem.UserAddedColumn" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</data>
<data name="label2.Location" type="System.Drawing.Point, System.Drawing">
<value>3, 3</value>
</data>
<data name="label2.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
<value>3, 3, 3, 3</value>
</data>
<data name="label2.Size" type="System.Drawing.Size, System.Drawing">
<value>102, 13</value>
</data>
<data name="label2.TabIndex" type="System.Int32, mscorlib">
<value>0</value>
</data>
<data name="label2.Text" xml:space="preserve">
</metadata>
<data name="columnItem.HeaderText" xml:space="preserve">
<value>Report Content Item</value>
</data>
<data name="&gt;&gt;label2.Name" xml:space="preserve">
<value>label2</value>
<metadata name="columnImage.UserAddedColumn" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<data name="columnImage.HeaderText" xml:space="preserve">
<value>Confidentiality Rating</value>
</data>
<data name="&gt;&gt;label2.Type" xml:space="preserve">
<value>System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
<data name="columnImage.MinimumWidth" type="System.Int32, mscorlib">
<value>20</value>
</data>
<data name="&gt;&gt;label2.Parent" xml:space="preserve">
<data name="dataGridViewItems.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
<value>Fill</value>
</data>
<data name="dataGridViewItems.Location" type="System.Drawing.Point, System.Drawing">
<value>3, 3</value>
</data>
<data name="dataGridViewItems.Size" type="System.Drawing.Size, System.Drawing">
<value>355, 324</value>
</data>
<data name="dataGridViewItems.TabIndex" type="System.Int32, mscorlib">
<value>1</value>
</data>
<data name="&gt;&gt;dataGridViewItems.Name" xml:space="preserve">
<value>dataGridViewItems</value>
</data>
<data name="&gt;&gt;dataGridViewItems.Type" xml:space="preserve">
<value>XenAdmin.Controls.DataGridViewEx.DataGridViewEx, XenCenterMain, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null</value>
</data>
<data name="&gt;&gt;dataGridViewItems.Parent" xml:space="preserve">
<value>tableLayoutPanel1</value>
</data>
<data name="&gt;&gt;label2.ZOrder" xml:space="preserve">
<value>2</value>
</data>
<data name="flowLayoutPanel1.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
<value>Top, Right</value>
</data>
<data name="flowLayoutPanel1.AutoSize" type="System.Boolean, mscorlib">
<value>True</value>
<data name="&gt;&gt;dataGridViewItems.ZOrder" xml:space="preserve">
<value>0</value>
</data>
<data name="SelectButton.Location" type="System.Drawing.Point, System.Drawing">
<value>84, 3</value>
<value>202, 333</value>
</data>
<data name="SelectButton.Size" type="System.Drawing.Size, System.Drawing">
<value>75, 23</value>
@ -250,13 +196,13 @@
<value>System.Windows.Forms.Button, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="&gt;&gt;SelectButton.Parent" xml:space="preserve">
<value>flowLayoutPanel1</value>
<value>tableLayoutPanel1</value>
</data>
<data name="&gt;&gt;SelectButton.ZOrder" xml:space="preserve">
<value>0</value>
<value>1</value>
</data>
<data name="ClearButton.Location" type="System.Drawing.Point, System.Drawing">
<value>3, 3</value>
<value>283, 333</value>
</data>
<data name="ClearButton.Size" type="System.Drawing.Size, System.Drawing">
<value>75, 23</value>
@ -274,39 +220,36 @@
<value>System.Windows.Forms.Button, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="&gt;&gt;ClearButton.Parent" xml:space="preserve">
<value>flowLayoutPanel1</value>
</data>
<data name="&gt;&gt;ClearButton.ZOrder" xml:space="preserve">
<value>1</value>
</data>
<data name="flowLayoutPanel1.FlowDirection" type="System.Windows.Forms.FlowDirection, System.Windows.Forms">
<value>RightToLeft</value>
</data>
<data name="flowLayoutPanel1.Location" type="System.Drawing.Point, System.Drawing">
<value>199, 343</value>
</data>
<data name="flowLayoutPanel1.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
<value>0, 0, 0, 0</value>
</data>
<data name="flowLayoutPanel1.Size" type="System.Drawing.Size, System.Drawing">
<value>162, 29</value>
</data>
<data name="flowLayoutPanel1.TabIndex" type="System.Int32, mscorlib">
<value>3</value>
</data>
<data name="flowLayoutPanel1.WrapContents" type="System.Boolean, mscorlib">
<value>False</value>
</data>
<data name="&gt;&gt;flowLayoutPanel1.Name" xml:space="preserve">
<value>flowLayoutPanel1</value>
</data>
<data name="&gt;&gt;flowLayoutPanel1.Type" xml:space="preserve">
<value>System.Windows.Forms.FlowLayoutPanel, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="&gt;&gt;flowLayoutPanel1.Parent" xml:space="preserve">
<value>tableLayoutPanel1</value>
</data>
<data name="&gt;&gt;flowLayoutPanel1.ZOrder" xml:space="preserve">
<data name="&gt;&gt;ClearButton.ZOrder" xml:space="preserve">
<value>2</value>
</data>
<data name="linkLabel1.AutoSize" type="System.Boolean, mscorlib">
<value>True</value>
</data>
<data name="linkLabel1.Location" type="System.Drawing.Point, System.Drawing">
<value>3, 359</value>
</data>
<data name="linkLabel1.Size" type="System.Drawing.Size, System.Drawing">
<value>118, 13</value>
</data>
<data name="linkLabel1.TabIndex" type="System.Int32, mscorlib">
<value>2</value>
</data>
<data name="linkLabel1.Text" xml:space="preserve">
<value>Citrix Privacy Statement</value>
</data>
<data name="&gt;&gt;linkLabel1.Name" xml:space="preserve">
<value>linkLabel1</value>
</data>
<data name="&gt;&gt;linkLabel1.Type" xml:space="preserve">
<value>System.Windows.Forms.LinkLabel, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="&gt;&gt;linkLabel1.Parent" xml:space="preserve">
<value>tableLayoutPanel1</value>
</data>
<data name="&gt;&gt;linkLabel1.ZOrder" xml:space="preserve">
<value>3</value>
</data>
<data name="tableLayoutPanel1.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
@ -316,7 +259,7 @@
<value>0, 0</value>
</data>
<data name="tableLayoutPanel1.RowCount" type="System.Int32, mscorlib">
<value>4</value>
<value>3</value>
</data>
<data name="tableLayoutPanel1.Size" type="System.Drawing.Size, System.Drawing">
<value>361, 372</value>
@ -337,7 +280,7 @@
<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="label3" Row="0" RowSpan="1" Column="1" ColumnSpan="1" /&gt;&lt;Control Name="CapabilitiesCheckedListBox" Row="1" RowSpan="1" Column="0" ColumnSpan="2" /&gt;&lt;Control Name="label2" Row="0" RowSpan="1" Column="0" ColumnSpan="1" /&gt;&lt;Control Name="flowLayoutPanel1" Row="2" RowSpan="1" Column="0" ColumnSpan="2" /&gt;&lt;/Controls&gt;&lt;Columns Styles="Percent,100,AutoSize,0" /&gt;&lt;Rows Styles="AutoSize,0,Percent,100,AutoSize,0,AutoSize,0" /&gt;&lt;/TableLayoutSettings&gt;</value>
<value>&lt;?xml version="1.0" encoding="utf-16"?&gt;&lt;TableLayoutSettings&gt;&lt;Controls&gt;&lt;Control Name="dataGridViewItems" Row="0" RowSpan="1" Column="0" ColumnSpan="3" /&gt;&lt;Control Name="SelectButton" Row="1" RowSpan="1" Column="1" ColumnSpan="1" /&gt;&lt;Control Name="ClearButton" Row="1" RowSpan="1" Column="2" ColumnSpan="1" /&gt;&lt;Control Name="linkLabel1" Row="2" RowSpan="1" Column="0" ColumnSpan="1" /&gt;&lt;/Controls&gt;&lt;Columns Styles="Percent,100,AutoSize,0,AutoSize,0" /&gt;&lt;Rows Styles="Percent,100,AutoSize,0,AutoSize,0,Absolute,20" /&gt;&lt;/TableLayoutSettings&gt;</value>
</data>
<data name="&gt;&gt;splitContainer1.Panel1.Name" xml:space="preserve">
<value>splitContainer1.Panel1</value>
@ -354,42 +297,6 @@
<data name="tableLayoutPanel4.ColumnCount" type="System.Int32, mscorlib">
<value>2</value>
</data>
<data name="linkLabel1.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
<value>Top, Right</value>
</data>
<data name="linkLabel1.AutoSize" type="System.Boolean, mscorlib">
<value>True</value>
</data>
<data name="linkLabel1.Location" type="System.Drawing.Point, System.Drawing">
<value>133, 3</value>
</data>
<data name="linkLabel1.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
<value>3, 3, 3, 10</value>
</data>
<data name="linkLabel1.Size" type="System.Drawing.Size, System.Drawing">
<value>118, 13</value>
</data>
<data name="linkLabel1.TabIndex" type="System.Int32, mscorlib">
<value>2</value>
</data>
<data name="linkLabel1.Text" xml:space="preserve">
<value>Citrix Privacy Statement</value>
</data>
<data name="linkLabel1.TextAlign" type="System.Drawing.ContentAlignment, System.Drawing">
<value>MiddleRight</value>
</data>
<data name="&gt;&gt;linkLabel1.Name" xml:space="preserve">
<value>linkLabel1</value>
</data>
<data name="&gt;&gt;linkLabel1.Type" xml:space="preserve">
<value>System.Windows.Forms.LinkLabel, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="&gt;&gt;linkLabel1.Parent" xml:space="preserve">
<value>tableLayoutPanel4</value>
</data>
<data name="&gt;&gt;linkLabel1.ZOrder" xml:space="preserve">
<value>0</value>
</data>
<data name="DescriptionLabel.AutoSize" type="System.Boolean, mscorlib">
<value>True</value>
</data>
@ -397,7 +304,7 @@
<value>Microsoft Sans Serif, 8.25pt, style=Bold</value>
</data>
<data name="DescriptionLabel.Location" type="System.Drawing.Point, System.Drawing">
<value>3, 29</value>
<value>3, 3</value>
</data>
<data name="DescriptionLabel.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
<value>3, 3, 3, 3</value>
@ -421,7 +328,7 @@
<value>tableLayoutPanel4</value>
</data>
<data name="&gt;&gt;DescriptionLabel.ZOrder" xml:space="preserve">
<value>1</value>
<value>0</value>
</data>
<data name="DescriptionValue.AutoSize" type="System.Boolean, mscorlib">
<value>True</value>
@ -430,7 +337,7 @@
<value>Microsoft Sans Serif, 8.25pt</value>
</data>
<data name="DescriptionValue.Location" type="System.Drawing.Point, System.Drawing">
<value>15, 48</value>
<value>15, 22</value>
</data>
<data name="DescriptionValue.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
<value>15, 3, 3, 3</value>
@ -451,7 +358,7 @@
<value>tableLayoutPanel4</value>
</data>
<data name="&gt;&gt;DescriptionValue.ZOrder" xml:space="preserve">
<value>2</value>
<value>1</value>
</data>
<data name="SizeLabel.AutoSize" type="System.Boolean, mscorlib">
<value>True</value>
@ -460,7 +367,7 @@
<value>Microsoft Sans Serif, 8.25pt, style=Bold</value>
</data>
<data name="SizeLabel.Location" type="System.Drawing.Point, System.Drawing">
<value>3, 67</value>
<value>3, 41</value>
</data>
<data name="SizeLabel.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
<value>3, 3, 3, 3</value>
@ -484,7 +391,7 @@
<value>tableLayoutPanel4</value>
</data>
<data name="&gt;&gt;SizeLabel.ZOrder" xml:space="preserve">
<value>3</value>
<value>2</value>
</data>
<data name="SizeValue.AutoSize" type="System.Boolean, mscorlib">
<value>True</value>
@ -493,7 +400,7 @@
<value>Microsoft Sans Serif, 8.25pt</value>
</data>
<data name="SizeValue.Location" type="System.Drawing.Point, System.Drawing">
<value>15, 86</value>
<value>15, 60</value>
</data>
<data name="SizeValue.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
<value>15, 3, 3, 3</value>
@ -514,7 +421,7 @@
<value>tableLayoutPanel4</value>
</data>
<data name="&gt;&gt;SizeValue.ZOrder" xml:space="preserve">
<value>4</value>
<value>3</value>
</data>
<data name="TimeLabel.AutoSize" type="System.Boolean, mscorlib">
<value>True</value>
@ -523,7 +430,7 @@
<value>Microsoft Sans Serif, 8.25pt, style=Bold</value>
</data>
<data name="TimeLabel.Location" type="System.Drawing.Point, System.Drawing">
<value>3, 105</value>
<value>3, 79</value>
</data>
<data name="TimeLabel.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
<value>3, 3, 3, 3</value>
@ -547,7 +454,7 @@
<value>tableLayoutPanel4</value>
</data>
<data name="&gt;&gt;TimeLabel.ZOrder" xml:space="preserve">
<value>5</value>
<value>4</value>
</data>
<data name="TimeValue.AutoSize" type="System.Boolean, mscorlib">
<value>True</value>
@ -556,7 +463,7 @@
<value>Microsoft Sans Serif, 8.25pt</value>
</data>
<data name="TimeValue.Location" type="System.Drawing.Point, System.Drawing">
<value>15, 124</value>
<value>15, 98</value>
</data>
<data name="TimeValue.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
<value>15, 3, 3, 3</value>
@ -577,7 +484,7 @@
<value>tableLayoutPanel4</value>
</data>
<data name="&gt;&gt;TimeValue.ZOrder" xml:space="preserve">
<value>6</value>
<value>5</value>
</data>
<data name="TotalSizeLabel.AutoSize" type="System.Boolean, mscorlib">
<value>True</value>
@ -610,7 +517,7 @@
<value>tableLayoutPanel4</value>
</data>
<data name="&gt;&gt;TotalSizeLabel.ZOrder" xml:space="preserve">
<value>7</value>
<value>6</value>
</data>
<data name="TotalSizeValue.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
<value>Top, Right</value>
@ -643,7 +550,7 @@
<value>tableLayoutPanel4</value>
</data>
<data name="&gt;&gt;TotalSizeValue.ZOrder" xml:space="preserve">
<value>8</value>
<value>7</value>
</data>
<data name="TotalTimeLabel.AutoSize" type="System.Boolean, mscorlib">
<value>True</value>
@ -676,7 +583,7 @@
<value>tableLayoutPanel4</value>
</data>
<data name="&gt;&gt;TotalTimeLabel.ZOrder" xml:space="preserve">
<value>9</value>
<value>8</value>
</data>
<data name="TotalTimeValue.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
<value>Top, Right</value>
@ -709,7 +616,7 @@
<value>tableLayoutPanel4</value>
</data>
<data name="&gt;&gt;TotalTimeValue.ZOrder" xml:space="preserve">
<value>10</value>
<value>9</value>
</data>
<data name="tableLayoutPanel4.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
<value>Fill</value>
@ -718,7 +625,7 @@
<value>5, 0</value>
</data>
<data name="tableLayoutPanel4.RowCount" type="System.Int32, mscorlib">
<value>9</value>
<value>8</value>
</data>
<data name="tableLayoutPanel4.Size" type="System.Drawing.Size, System.Drawing">
<value>254, 369</value>
@ -739,7 +646,7 @@
<value>0</value>
</data>
<data name="tableLayoutPanel4.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="0" RowSpan="1" Column="0" ColumnSpan="2" /&gt;&lt;Control Name="DescriptionLabel" Row="1" RowSpan="1" Column="0" ColumnSpan="1" /&gt;&lt;Control Name="DescriptionValue" Row="2" RowSpan="1" Column="0" ColumnSpan="2" /&gt;&lt;Control Name="SizeLabel" Row="3" RowSpan="1" Column="0" ColumnSpan="1" /&gt;&lt;Control Name="SizeValue" Row="4" RowSpan="1" Column="0" ColumnSpan="2" /&gt;&lt;Control Name="TimeLabel" Row="5" RowSpan="1" Column="0" ColumnSpan="1" /&gt;&lt;Control Name="TimeValue" Row="6" RowSpan="1" Column="0" ColumnSpan="2" /&gt;&lt;Control Name="TotalSizeLabel" Row="7" RowSpan="1" Column="0" ColumnSpan="1" /&gt;&lt;Control Name="TotalSizeValue" Row="7" RowSpan="1" Column="1" ColumnSpan="1" /&gt;&lt;Control Name="TotalTimeLabel" Row="8" RowSpan="1" Column="0" ColumnSpan="1" /&gt;&lt;Control Name="TotalTimeValue" Row="8" RowSpan="1" Column="1" ColumnSpan="1" /&gt;&lt;/Controls&gt;&lt;Columns Styles="AutoSize,0,Percent,100" /&gt;&lt;Rows Styles="AutoSize,0,AutoSize,0,AutoSize,0,AutoSize,0,AutoSize,0,AutoSize,0,Percent,100,AutoSize,0,AutoSize,0" /&gt;&lt;/TableLayoutSettings&gt;</value>
<value>&lt;?xml version="1.0" encoding="utf-16"?&gt;&lt;TableLayoutSettings&gt;&lt;Controls&gt;&lt;Control Name="DescriptionLabel" Row="0" RowSpan="1" Column="0" ColumnSpan="1" /&gt;&lt;Control Name="DescriptionValue" Row="1" RowSpan="1" Column="0" ColumnSpan="2" /&gt;&lt;Control Name="SizeLabel" Row="2" RowSpan="1" Column="0" ColumnSpan="1" /&gt;&lt;Control Name="SizeValue" Row="3" RowSpan="1" Column="0" ColumnSpan="2" /&gt;&lt;Control Name="TimeLabel" Row="4" RowSpan="1" Column="0" ColumnSpan="1" /&gt;&lt;Control Name="TimeValue" Row="5" RowSpan="1" Column="0" ColumnSpan="2" /&gt;&lt;Control Name="TotalSizeLabel" Row="6" RowSpan="1" Column="0" ColumnSpan="1" /&gt;&lt;Control Name="TotalSizeValue" Row="6" RowSpan="1" Column="1" ColumnSpan="1" /&gt;&lt;Control Name="TotalTimeLabel" Row="7" RowSpan="1" Column="0" ColumnSpan="1" /&gt;&lt;Control Name="TotalTimeValue" Row="7" RowSpan="1" Column="1" ColumnSpan="1" /&gt;&lt;/Controls&gt;&lt;Columns Styles="AutoSize,0,Percent,100" /&gt;&lt;Rows Styles="AutoSize,0,AutoSize,0,AutoSize,0,AutoSize,0,AutoSize,0,Percent,100,AutoSize,0,AutoSize,0,Absolute,20" /&gt;&lt;/TableLayoutSettings&gt;</value>
</data>
<data name="splitContainer1.Panel2.Padding" type="System.Windows.Forms.Padding, System.Windows.Forms">
<value>5, 0, 0, 3</value>
@ -861,11 +768,23 @@
<data name="$this.Size" type="System.Drawing.Size, System.Drawing">
<value>624, 422</value>
</data>
<data name="&gt;&gt;PiiTooltip.Name" xml:space="preserve">
<value>PiiTooltip</value>
<data name="&gt;&gt;columnCheck.Name" xml:space="preserve">
<value>columnCheck</value>
</data>
<data name="&gt;&gt;PiiTooltip.Type" xml:space="preserve">
<value>System.Windows.Forms.ToolTip, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
<data name="&gt;&gt;columnCheck.Type" xml:space="preserve">
<value>System.Windows.Forms.DataGridViewCheckBoxColumn, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="&gt;&gt;columnItem.Name" xml:space="preserve">
<value>columnItem</value>
</data>
<data name="&gt;&gt;columnItem.Type" xml:space="preserve">
<value>System.Windows.Forms.DataGridViewTextBoxColumn, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="&gt;&gt;columnImage.Name" xml:space="preserve">
<value>columnImage</value>
</data>
<data name="&gt;&gt;columnImage.Type" xml:space="preserve">
<value>System.Windows.Forms.DataGridViewImageColumn, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="&gt;&gt;$this.Name" xml:space="preserve">
<value>BugToolPageSelectCapabilities</value>

View File

@ -23928,7 +23928,7 @@ namespace XenAdmin {
}
/// <summary>
/// Looks up a localized string similar to These files may contain personally identifiable information if customized.
/// Looks up a localized string similar to These files may contain personally identifiable information if customized..
/// </summary>
public static string PII_CUSTOMISED {
get {
@ -23937,7 +23937,7 @@ namespace XenAdmin {
}
/// <summary>
/// Looks up a localized string similar to These files may contain personally identifiable information.
/// Looks up a localized string similar to These files may contain personally identifiable information..
/// </summary>
public static string PII_MAYBE {
get {
@ -23946,7 +23946,7 @@ namespace XenAdmin {
}
/// <summary>
/// Looks up a localized string similar to These files will contain no personally identifiable information.
/// Looks up a localized string similar to These files will contain no personally identifiable information..
/// </summary>
public static string PII_NO {
get {
@ -23955,7 +23955,7 @@ namespace XenAdmin {
}
/// <summary>
/// Looks up a localized string similar to These files will contain personally identifiable information.
/// Looks up a localized string similar to These files will contain personally identifiable information..
/// </summary>
public static string PII_YES {
get {

View File

@ -8335,16 +8335,16 @@ File not found</value>
<value>Unknown</value>
</data>
<data name="PII_CUSTOMISED" xml:space="preserve">
<value>These files may contain personally identifiable information if customized</value>
<value>These files may contain personally identifiable information if customized.</value>
</data>
<data name="PII_MAYBE" xml:space="preserve">
<value>These files may contain personally identifiable information</value>
<value>These files may contain personally identifiable information.</value>
</data>
<data name="PII_NO" xml:space="preserve">
<value>These files will contain no personally identifiable information</value>
<value>These files will contain no personally identifiable information.</value>
</data>
<data name="PII_YES" xml:space="preserve">
<value>These files will contain personally identifiable information</value>
<value>These files will contain personally identifiable information.</value>
</data>
<data name="PLANACTION_VMS_MIGRATE" xml:space="preserve">
<value>Migrate VMs from Server</value>