Kiu/xenadmin
1
0
Fork 0
mirror of https://github.com/xcp-ng/xenadmin.git synced 2024-11-23 20:36:33 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #1208 from MihaelaStoica/CA-224567

Browse Source 
CA-224567: PVS Site renaming plus some other improvements
This commit is contained in:
Konstantina Chremmou 2016-10-17 22:06:48 +01:00 committed by GitHub
commit 38bf5b86d3
16 changed files with 424 additions and 422 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
XenAdmin/Controls/PvsCacheStorageRow.cs
View File

@ -186,7 +186,8 @@ namespace XenAdmin.Controls
var selectedSr = CacheSr;
if (selectedSr != null)
{
var maxSize = (decimal)Util.ToGB(selectedSr.GetSRType(false) == SR.SRTypes.tmpfs ? Host.dom0_memory_extra : selectedSr.FreeSpace, 1, RoundingBehaviour.Down); ;
var maxSize = (decimal)Util.ToGB(selectedSr.GetSRType(false) == SR.SRTypes.tmpfs ? Host.dom0_memory_extra : selectedSr.FreeSpace, 1, RoundingBehaviour.Down);
maxSize = Math.Min(maxSize, MAX_CACHE_SIZE_GB);
if (maxSize != numericUpDownCacheSize.Maximum)
SetupCacheSizeSpinner(numericUpDownCacheSize.Value, numericUpDownCacheSize.Minimum, maxSize);
}

64
XenAdmin/Dialogs/EnablePvsReadCachingDialog.Designer.cs generated
View File

@ -29,55 +29,27 @@ namespace XenAdmin.Dialogs
private void InitializeComponent()
{
System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(EnablePvsReadCachingDialog));
this.enableButton = new System.Windows.Forms.Button();
this.cancel = new System.Windows.Forms.Button();
this.tableLayoutPanel1 = new System.Windows.Forms.TableLayoutPanel();
this.rubricLabel = new System.Windows.Forms.Label();
this.panel1 = new System.Windows.Forms.Panel();
this.pvsSiteList = new System.Windows.Forms.ComboBox();
this.rubricLabel = new System.Windows.Forms.Label();
this.pvsSiteLabel = new System.Windows.Forms.Label();
this.flowLayoutPanel1 = new System.Windows.Forms.FlowLayoutPanel();
this.cancel = new System.Windows.Forms.Button();
this.enableButton = new System.Windows.Forms.Button();
this.readonlyCheckboxToolTipContainer = new XenAdmin.Controls.ToolTipContainer();
this.tableLayoutPanel1.SuspendLayout();
this.panel1.SuspendLayout();
this.flowLayoutPanel1.SuspendLayout();
this.SuspendLayout();
//
// enableButton
//
resources.ApplyResources(this.enableButton, "enableButton");
this.enableButton.DialogResult = System.Windows.Forms.DialogResult.Yes;
this.enableButton.Name = "enableButton";
this.enableButton.UseVisualStyleBackColor = true;
this.enableButton.Click += new System.EventHandler(this.enableButton_Click);
//
// cancel
//
resources.ApplyResources(this.cancel, "cancel");
this.cancel.DialogResult = System.Windows.Forms.DialogResult.Cancel;
this.cancel.Name = "cancel";
this.cancel.UseVisualStyleBackColor = true;
//
// tableLayoutPanel1
//
resources.ApplyResources(this.tableLayoutPanel1, "tableLayoutPanel1");
this.tableLayoutPanel1.Controls.Add(this.pvsSiteList, 1, 1);
this.tableLayoutPanel1.Controls.Add(this.rubricLabel, 0, 0);
this.tableLayoutPanel1.Controls.Add(this.panel1, 0, 1);
this.tableLayoutPanel1.Controls.Add(this.pvsSiteLabel, 0, 1);
this.tableLayoutPanel1.Controls.Add(this.flowLayoutPanel1, 0, 2);
this.tableLayoutPanel1.Name = "tableLayoutPanel1";
//
// rubricLabel
//
resources.ApplyResources(this.rubricLabel, "rubricLabel");
this.rubricLabel.Name = "rubricLabel";
//
// panel1
//
resources.ApplyResources(this.panel1, "panel1");
this.panel1.Controls.Add(this.pvsSiteList);
this.panel1.Controls.Add(this.pvsSiteLabel);
this.panel1.Name = "panel1";
//
// pvsSiteList
//
this.pvsSiteList.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
@ -85,6 +57,12 @@ namespace XenAdmin.Dialogs
this.pvsSiteList.FormattingEnabled = true;
this.pvsSiteList.Name = "pvsSiteList";
//
// rubricLabel
//
resources.ApplyResources(this.rubricLabel, "rubricLabel");
this.tableLayoutPanel1.SetColumnSpan(this.rubricLabel, 2);
this.rubricLabel.Name = "rubricLabel";
//
// pvsSiteLabel
//
resources.ApplyResources(this.pvsSiteLabel, "pvsSiteLabel");
@ -93,10 +71,26 @@ namespace XenAdmin.Dialogs
// flowLayoutPanel1
//
resources.ApplyResources(this.flowLayoutPanel1, "flowLayoutPanel1");
this.tableLayoutPanel1.SetColumnSpan(this.flowLayoutPanel1, 2);
this.flowLayoutPanel1.Controls.Add(this.cancel);
this.flowLayoutPanel1.Controls.Add(this.enableButton);
this.flowLayoutPanel1.Name = "flowLayoutPanel1";
//
// cancel
//
resources.ApplyResources(this.cancel, "cancel");
this.cancel.DialogResult = System.Windows.Forms.DialogResult.Cancel;
this.cancel.Name = "cancel";
this.cancel.UseVisualStyleBackColor = true;
//
// enableButton
//
this.enableButton.DialogResult = System.Windows.Forms.DialogResult.Yes;
resources.ApplyResources(this.enableButton, "enableButton");
this.enableButton.Name = "enableButton";
this.enableButton.UseVisualStyleBackColor = true;
this.enableButton.Click += new System.EventHandler(this.enableButton_Click);
//
// readonlyCheckboxToolTipContainer
//
resources.ApplyResources(this.readonlyCheckboxToolTipContainer, "readonlyCheckboxToolTipContainer");
@ -110,13 +104,10 @@ namespace XenAdmin.Dialogs
this.CancelButton = this.cancel;
this.Controls.Add(this.tableLayoutPanel1);
this.Controls.Add(this.readonlyCheckboxToolTipContainer);
this.HelpButton = false;
this.Name = "EnablePvsReadCachingDialog";
this.tableLayoutPanel1.ResumeLayout(false);
this.tableLayoutPanel1.PerformLayout();
this.panel1.ResumeLayout(false);
this.flowLayoutPanel1.ResumeLayout(false);
this.flowLayoutPanel1.PerformLayout();
this.ResumeLayout(false);
this.PerformLayout();
@ -127,7 +118,6 @@ namespace XenAdmin.Dialogs
private XenAdmin.Controls.ToolTipContainer readonlyCheckboxToolTipContainer;
private System.Windows.Forms.TableLayoutPanel tableLayoutPanel1;
private System.Windows.Forms.Label rubricLabel;
private System.Windows.Forms.Panel panel1;
private System.Windows.Forms.ComboBox pvsSiteList;
private System.Windows.Forms.Label pvsSiteLabel;
private System.Windows.Forms.FlowLayoutPanel flowLayoutPanel1;

283
XenAdmin/Dialogs/EnablePvsReadCachingDialog.resx
View File

@ -118,47 +118,122 @@
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<assembly alias="mscorlib" name="mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
<data name="enableButton.AutoSize" type="System.Boolean, mscorlib">
<data name="tableLayoutPanel1.AutoSize" type="System.Boolean, mscorlib">
<value>True</value>
</data>
<data name="tableLayoutPanel1.ColumnCount" type="System.Int32, mscorlib">
<value>2</value>
</data>
<assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
<data name="enableButton.Font" type="System.Drawing.Font, System.Drawing">
<data name="pvsSiteList.Font" type="System.Drawing.Font, System.Drawing">
<value>Segoe UI, 9pt</value>
</data>
<data name="pvsSiteList.Location" type="System.Drawing.Point, System.Drawing">
<value>64, 38</value>
</data>
<data name="pvsSiteList.Size" type="System.Drawing.Size, System.Drawing">
<value>356, 23</value>
</data>
<data name="pvsSiteList.TabIndex" type="System.Int32, mscorlib">
<value>1</value>
</data>
<data name="&gt;&gt;pvsSiteList.Name" xml:space="preserve">
<value>pvsSiteList</value>
</data>
<data name="&gt;&gt;pvsSiteList.Type" xml:space="preserve">
<value>System.Windows.Forms.ComboBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="&gt;&gt;pvsSiteList.Parent" xml:space="preserve">
<value>tableLayoutPanel1</value>
</data>
<data name="&gt;&gt;pvsSiteList.ZOrder" xml:space="preserve">
<value>0</value>
</data>
<data name="rubricLabel.AutoSize" type="System.Boolean, mscorlib">
<value>True</value>
</data>
<assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
<data name="enableButton.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
<data name="rubricLabel.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
<value>Fill</value>
</data>
<data name="rubricLabel.Font" type="System.Drawing.Font, System.Drawing">
<value>Segoe UI, 9pt</value>
</data>
<data name="rubricLabel.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
<value>NoControl</value>
</data>
<data name="enableButton.Location" type="System.Drawing.Point, System.Drawing">
<value>591, 3</value>
<data name="rubricLabel.Location" type="System.Drawing.Point, System.Drawing">
<value>3, 0</value>
</data>
<data name="enableButton.Size" type="System.Drawing.Size, System.Drawing">
<value>353, 51</value>
<data name="rubricLabel.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
<value>3, 0, 3, 20</value>
</data>
<data name="enableButton.TabIndex" type="System.Int32, mscorlib">
<data name="rubricLabel.Size" type="System.Drawing.Size, System.Drawing">
<value>417, 15</value>
</data>
<data name="rubricLabel.TabIndex" type="System.Int32, mscorlib">
<value>3</value>
</data>
<data name="&gt;&gt;rubricLabel.Name" xml:space="preserve">
<value>rubricLabel</value>
</data>
<data name="&gt;&gt;rubricLabel.Type" xml:space="preserve">
<value>System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="&gt;&gt;rubricLabel.Parent" xml:space="preserve">
<value>tableLayoutPanel1</value>
</data>
<data name="&gt;&gt;rubricLabel.ZOrder" xml:space="preserve">
<value>1</value>
</data>
<data name="enableButton.Text" xml:space="preserve">
<value>E&amp;nable PVS read caching</value>
<data name="pvsSiteLabel.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
<value>Left</value>
</data>
<data name="&gt;&gt;enableButton.Name" xml:space="preserve">
<value>enableButton</value>
<data name="pvsSiteLabel.AutoSize" type="System.Boolean, mscorlib">
<value>True</value>
</data>
<data name="&gt;&gt;enableButton.Type" xml:space="preserve">
<value>System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
<data name="pvsSiteLabel.Font" type="System.Drawing.Font, System.Drawing">
<value>Segoe UI, 9pt</value>
</data>
<data name="&gt;&gt;enableButton.Parent" xml:space="preserve">
<value>flowLayoutPanel1</value>
<data name="pvsSiteLabel.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
<value>NoControl</value>
</data>
<data name="&gt;&gt;enableButton.ZOrder" xml:space="preserve">
<value>1</value>
<data name="pvsSiteLabel.Location" type="System.Drawing.Point, System.Drawing">
<value>3, 42</value>
</data>
<data name="pvsSiteLabel.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
<value>3, 3, 3, 3</value>
</data>
<data name="pvsSiteLabel.Padding" type="System.Windows.Forms.Padding, System.Windows.Forms">
<value>0, 0, 3, 0</value>
</data>
<data name="pvsSiteLabel.Size" type="System.Drawing.Size, System.Drawing">
<value>55, 15</value>
</data>
<data name="pvsSiteLabel.TabIndex" type="System.Int32, mscorlib">
<value>0</value>
</data>
<data name="pvsSiteLabel.Text" xml:space="preserve">
<value>PVS &amp;Site:</value>
</data>
<data name="&gt;&gt;pvsSiteLabel.Name" xml:space="preserve">
<value>pvsSiteLabel</value>
</data>
<data name="&gt;&gt;pvsSiteLabel.Type" xml:space="preserve">
<value>System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="&gt;&gt;pvsSiteLabel.Parent" xml:space="preserve">
<value>tableLayoutPanel1</value>
</data>
<data name="&gt;&gt;pvsSiteLabel.ZOrder" xml:space="preserve">
<value>2</value>
</data>
<data name="flowLayoutPanel1.AutoSize" type="System.Boolean, mscorlib">
<value>True</value>
</data>
<data name="cancel.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
<value>Bottom, Right</value>
</data>
<data name="cancel.AutoSize" type="System.Boolean, mscorlib">
<value>True</value>
</data>
<data name="cancel.Font" type="System.Drawing.Font, System.Drawing">
<value>Segoe UI, 9pt</value>
</data>
@ -166,10 +241,10 @@
<value>NoControl</value>
</data>
<data name="cancel.Location" type="System.Drawing.Point, System.Drawing">
<value>950, 3</value>
<value>339, 3</value>
</data>
<data name="cancel.Size" type="System.Drawing.Size, System.Drawing">
<value>134, 51</value>
<value>75, 24</value>
</data>
<data name="cancel.TabIndex" type="System.Int32, mscorlib">
<value>2</value>
@ -189,144 +264,36 @@
<data name="&gt;&gt;cancel.ZOrder" xml:space="preserve">
<value>0</value>
</data>
<data name="tableLayoutPanel1.AutoSize" type="System.Boolean, mscorlib">
<value>True</value>
</data>
<data name="tableLayoutPanel1.ColumnCount" type="System.Int32, mscorlib">
<value>1</value>
</data>
<data name="rubricLabel.AutoSize" type="System.Boolean, mscorlib">
<value>True</value>
</data>
<data name="rubricLabel.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
<value>Fill</value>
</data>
<data name="rubricLabel.Font" type="System.Drawing.Font, System.Drawing">
<data name="enableButton.Font" type="System.Drawing.Font, System.Drawing">
<value>Segoe UI, 9pt</value>
</data>
<data name="rubricLabel.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
<data name="enableButton.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
<value>NoControl</value>
</data>
<data name="rubricLabel.Location" type="System.Drawing.Point, System.Drawing">
<value>3, 0</value>
<data name="enableButton.Location" type="System.Drawing.Point, System.Drawing">
<value>170, 3</value>
</data>
<data name="rubricLabel.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
<value>3, 0, 3, 35</value>
<data name="enableButton.Size" type="System.Drawing.Size, System.Drawing">
<value>163, 24</value>
</data>
<data name="rubricLabel.Size" type="System.Drawing.Size, System.Drawing">
<value>1087, 41</value>
</data>
<data name="rubricLabel.TabIndex" type="System.Int32, mscorlib">
<value>3</value>
</data>
<data name="rubricLabel.Text" xml:space="preserve">
<value>rubric</value>
</data>
<data name="&gt;&gt;rubricLabel.Name" xml:space="preserve">
<value>rubricLabel</value>
</data>
<data name="&gt;&gt;rubricLabel.Type" xml:space="preserve">
<value>System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="&gt;&gt;rubricLabel.Parent" xml:space="preserve">
<value>tableLayoutPanel1</value>
</data>
<data name="&gt;&gt;rubricLabel.ZOrder" xml:space="preserve">
<value>0</value>
</data>
<data name="panel1.AutoSize" type="System.Boolean, mscorlib">
<value>True</value>
</data>
<data name="pvsSiteList.Font" type="System.Drawing.Font, System.Drawing">
<value>Segoe UI, 9pt</value>
</data>
<data name="pvsSiteList.Location" type="System.Drawing.Point, System.Drawing">
<value>168, 0</value>
</data>
<data name="pvsSiteList.Size" type="System.Drawing.Size, System.Drawing">
<value>782, 49</value>
</data>
<data name="pvsSiteList.TabIndex" type="System.Int32, mscorlib">
<data name="enableButton.TabIndex" type="System.Int32, mscorlib">
<value>1</value>
</data>
<data name="&gt;&gt;pvsSiteList.Name" xml:space="preserve">
<value>pvsSiteList</value>
<data name="enableButton.Text" xml:space="preserve">
<value>E&amp;nable PVS read caching</value>
</data>
<data name="&gt;&gt;pvsSiteList.Type" xml:space="preserve">
<value>System.Windows.Forms.ComboBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
<data name="&gt;&gt;enableButton.Name" xml:space="preserve">
<value>enableButton</value>
</data>
<data name="&gt;&gt;pvsSiteList.Parent" xml:space="preserve">
<value>panel1</value>
<data name="&gt;&gt;enableButton.Type" xml:space="preserve">
<value>System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="&gt;&gt;pvsSiteList.ZOrder" xml:space="preserve">
<value>0</value>
<data name="&gt;&gt;enableButton.Parent" xml:space="preserve">
<value>flowLayoutPanel1</value>
</data>
<data name="pvsSiteLabel.Font" type="System.Drawing.Font, System.Drawing">
<value>Segoe UI, 9pt</value>
</data>
<data name="pvsSiteLabel.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
<value>NoControl</value>
</data>
<data name="pvsSiteLabel.Location" type="System.Drawing.Point, System.Drawing">
<value>0, 0</value>
</data>
<data name="pvsSiteLabel.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
<value>3, 0, 3, 3</value>
</data>
<data name="pvsSiteLabel.Size" type="System.Drawing.Size, System.Drawing">
<value>162, 49</value>
</data>
<data name="pvsSiteLabel.TabIndex" type="System.Int32, mscorlib">
<value>0</value>
</data>
<data name="pvsSiteLabel.Text" xml:space="preserve">
<value>PVS &amp;Site:</value>
</data>
<data name="&gt;&gt;pvsSiteLabel.Name" xml:space="preserve">
<value>pvsSiteLabel</value>
</data>
<data name="&gt;&gt;pvsSiteLabel.Type" xml:space="preserve">
<value>System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="&gt;&gt;pvsSiteLabel.Parent" xml:space="preserve">
<value>panel1</value>
</data>
<data name="&gt;&gt;pvsSiteLabel.ZOrder" xml:space="preserve">
<data name="&gt;&gt;enableButton.ZOrder" xml:space="preserve">
<value>1</value>
</data>
<data name="panel1.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
<value>Fill</value>
</data>
<data name="panel1.Font" type="System.Drawing.Font, System.Drawing">
<value>Segoe UI, 9pt</value>
</data>
<data name="panel1.Location" type="System.Drawing.Point, System.Drawing">
<value>3, 79</value>
</data>
<data name="panel1.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
<value>3, 3, 3, 35</value>
</data>
<data name="panel1.Size" type="System.Drawing.Size, System.Drawing">
<value>1087, 52</value>
</data>
<data name="panel1.TabIndex" type="System.Int32, mscorlib">
<value>4</value>
</data>
<data name="&gt;&gt;panel1.Name" xml:space="preserve">
<value>panel1</value>
</data>
<data name="&gt;&gt;panel1.Type" xml:space="preserve">
<value>System.Windows.Forms.Panel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="&gt;&gt;panel1.Parent" xml:space="preserve">
<value>tableLayoutPanel1</value>
</data>
<data name="&gt;&gt;panel1.ZOrder" xml:space="preserve">
<value>1</value>
</data>
<data name="flowLayoutPanel1.AutoSize" type="System.Boolean, mscorlib">
<value>True</value>
</data>
<data name="flowLayoutPanel1.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
<value>Bottom</value>
</data>
@ -337,10 +304,10 @@
<value>Segoe UI, 9pt</value>
</data>
<data name="flowLayoutPanel1.Location" type="System.Drawing.Point, System.Drawing">
<value>3, 172</value>
<value>3, 80</value>
</data>
<data name="flowLayoutPanel1.Size" type="System.Drawing.Size, System.Drawing">
<value>1087, 57</value>
<value>417, 30</value>
</data>
<data name="flowLayoutPanel1.TabIndex" type="System.Int32, mscorlib">
<value>5</value>
@ -355,7 +322,7 @@
<value>tableLayoutPanel1</value>
</data>
<data name="&gt;&gt;flowLayoutPanel1.ZOrder" xml:space="preserve">
<value>2</value>
<value>3</value>
</data>
<data name="tableLayoutPanel1.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
<value>Fill</value>
@ -364,13 +331,13 @@
<value>Segoe UI, 9pt</value>
</data>
<data name="tableLayoutPanel1.Location" type="System.Drawing.Point, System.Drawing">
<value>25, 25</value>
<value>10, 10</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>1093, 232</value>
<value>423, 113</value>
</data>
<data name="tableLayoutPanel1.TabIndex" type="System.Int32, mscorlib">
<value>4</value>
@ -388,7 +355,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="rubricLabel" Row="0" RowSpan="1" Column="0" ColumnSpan="1" /&gt;&lt;Control Name="panel1" Row="1" RowSpan="1" Column="0" ColumnSpan="1" /&gt;&lt;Control Name="flowLayoutPanel1" 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="pvsSiteList" Row="1" RowSpan="1" Column="1" ColumnSpan="1" /&gt;&lt;Control Name="rubricLabel" Row="0" RowSpan="1" Column="0" ColumnSpan="2" /&gt;&lt;Control Name="pvsSiteLabel" Row="1" 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="AutoSize,33.33333,Percent,66.66666" /&gt;&lt;Rows Styles="AutoSize,0,AutoSize,20,AutoSize,0" /&gt;&lt;/TableLayoutSettings&gt;</value>
</data>
<data name="readonlyCheckboxToolTipContainer.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
<value>Bottom, Left</value>
@ -427,25 +394,25 @@
<value>True</value>
</metadata>
<data name="$this.AutoScaleDimensions" type="System.Drawing.SizeF, System.Drawing">
<value>240, 240</value>
<value>96, 96</value>
</data>
<data name="$this.AutoSizeMode" type="System.Windows.Forms.AutoSizeMode, System.Windows.Forms">
<value>GrowAndShrink</value>
</data>
<data name="$this.ClientSize" type="System.Drawing.Size, System.Drawing">
<value>1143, 282</value>
<value>443, 133</value>
</data>
<data name="$this.Font" type="System.Drawing.Font, System.Drawing">
<value>Segoe UI, 9pt</value>
</data>
<data name="$this.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
<value>20, 20, 20, 20</value>
<value>8, 8, 8, 8</value>
</data>
<data name="$this.MinimumSize" type="System.Drawing.Size, System.Drawing">
<value>944, 370</value>
<value>387, 171</value>
</data>
<data name="$this.Padding" type="System.Windows.Forms.Padding, System.Windows.Forms">
<value>25, 25, 25, 25</value>
<value>10, 10, 10, 10</value>
</data>
<data name="$this.Text" xml:space="preserve">
<value>Enable PVS read caching</value>

12
XenAdmin/Dialogs/PvsCacheConfigurationDialog.resx
View File

@ -139,19 +139,19 @@
<value>NoControl</value>
</data>
<data name="addSiteButton.Location" type="System.Drawing.Point, System.Drawing">
<value>215, 111</value>
<value>194, 111</value>
</data>
<data name="addSiteButton.Padding" type="System.Windows.Forms.Padding, System.Windows.Forms">
<value>5, 0, 3, 0</value>
</data>
<data name="addSiteButton.Size" type="System.Drawing.Size, System.Drawing">
<value>108, 25</value>
<value>156, 25</value>
</data>
<data name="addSiteButton.TabIndex" type="System.Int32, mscorlib">
<value>10</value>
</data>
<data name="addSiteButton.Text" xml:space="preserve">
<value>A&amp;dd PVS Site</value>
<value>A&amp;dd Site for Caching</value>
</data>
<data name="addSiteButton.TextImageRelation" type="System.Windows.Forms.TextImageRelation, System.Windows.Forms">
<value>ImageBeforeText</value>
@ -268,13 +268,13 @@
<value>5, 0, 3, 0</value>
</data>
<data name="AddButton.Size" type="System.Drawing.Size, System.Drawing">
<value>108, 25</value>
<value>150, 25</value>
</data>
<data name="AddButton.TabIndex" type="System.Int32, mscorlib">
<value>9</value>
</data>
<data name="AddButton.Text" xml:space="preserve">
<value>A&amp;dd PVS Site</value>
<value>A&amp;dd Site for Caching</value>
</data>
<data name="AddButton.TextAlign" type="System.Drawing.ContentAlignment, System.Drawing">
<value>MiddleLeft</value>
@ -370,7 +370,7 @@
<value>8</value>
</data>
<data name="BlurbLabel.Text" xml:space="preserve">
<value>Specify the PVS cache configuration by choosing either memory or a storage repository and the amount of space to be allocated for each server.</value>
<value>Specify the PVS cache configuration by choosing either memory or a storage repository and the amount of space to be allocated for each site and each [XenServer].</value>
</data>
<data name="&gt;&gt;BlurbLabel.Name" xml:space="preserve">
<value>BlurbLabel</value>

65
XenAdmin/Dialogs/PvsPages/PvsCacheConfigurationPage.Designer.cs generated
View File

@ -30,26 +30,42 @@ namespace XenAdmin.Dialogs
{
System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(PvsCacheConfigurationPage));
this.tableLayoutPanel1 = new System.Windows.Forms.TableLayoutPanel();
this.memoryOnlyInfoLabel = new System.Windows.Forms.Label();
this.deleteButton = new System.Windows.Forms.Button();
this.label1 = new System.Windows.Forms.Label();
this.label7 = new System.Windows.Forms.Label();
this.textBox1 = new System.Windows.Forms.TextBox();
this.viewPvsServersButton = new System.Windows.Forms.Button();
this.hostsPanel = new XenAdmin.Controls.FlickerFreePanel();
this.viewPvsServersButton = new System.Windows.Forms.Button();
this.pvsConfigInfoIcon = new System.Windows.Forms.PictureBox();
this.pvsConfigInfoLabel = new System.Windows.Forms.Label();
this.memoryOnlyInfoIcon = new System.Windows.Forms.PictureBox();
this.tableLayoutPanel1.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.pvsConfigInfoIcon)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.memoryOnlyInfoIcon)).BeginInit();
this.SuspendLayout();
//
// tableLayoutPanel1
//
resources.ApplyResources(this.tableLayoutPanel1, "tableLayoutPanel1");
this.tableLayoutPanel1.Controls.Add(this.deleteButton, 3, 3);
this.tableLayoutPanel1.Controls.Add(this.memoryOnlyInfoLabel, 1, 3);
this.tableLayoutPanel1.Controls.Add(this.deleteButton, 4, 5);
this.tableLayoutPanel1.Controls.Add(this.label1, 0, 1);
this.tableLayoutPanel1.Controls.Add(this.label7, 0, 0);
this.tableLayoutPanel1.Controls.Add(this.textBox1, 1, 0);
this.tableLayoutPanel1.Controls.Add(this.textBox1, 2, 0);
this.tableLayoutPanel1.Controls.Add(this.hostsPanel, 0, 2);
this.tableLayoutPanel1.Controls.Add(this.viewPvsServersButton, 1, 3);
this.tableLayoutPanel1.Controls.Add(this.viewPvsServersButton, 2, 5);
this.tableLayoutPanel1.Controls.Add(this.pvsConfigInfoIcon, 0, 4);
this.tableLayoutPanel1.Controls.Add(this.pvsConfigInfoLabel, 1, 4);
this.tableLayoutPanel1.Controls.Add(this.memoryOnlyInfoIcon, 0, 3);
this.tableLayoutPanel1.Name = "tableLayoutPanel1";
//
// memoryOnlyInfoLabel
//
resources.ApplyResources(this.memoryOnlyInfoLabel, "memoryOnlyInfoLabel");
this.tableLayoutPanel1.SetColumnSpan(this.memoryOnlyInfoLabel, 3);
this.memoryOnlyInfoLabel.Name = "memoryOnlyInfoLabel";
//
// deleteButton
//
resources.ApplyResources(this.deleteButton, "deleteButton");
@ -61,12 +77,13 @@ namespace XenAdmin.Dialogs
// label1
//
resources.ApplyResources(this.label1, "label1");
this.tableLayoutPanel1.SetColumnSpan(this.label1, 3);
this.tableLayoutPanel1.SetColumnSpan(this.label1, 4);
this.label1.Name = "label1";
//
// label7
//
resources.ApplyResources(this.label7, "label7");
this.tableLayoutPanel1.SetColumnSpan(this.label7, 2);
this.label7.Name = "label7";
//
// textBox1
@ -76,6 +93,14 @@ namespace XenAdmin.Dialogs
this.textBox1.Name = "textBox1";
this.textBox1.TextChanged += new System.EventHandler(this.SomethingChanged);
//
// hostsPanel
//
resources.ApplyResources(this.hostsPanel, "hostsPanel");
this.hostsPanel.BorderColor = System.Drawing.Color.Black;
this.hostsPanel.BorderWidth = 1;
this.tableLayoutPanel1.SetColumnSpan(this.hostsPanel, 4);
this.hostsPanel.Name = "hostsPanel";
//
// viewPvsServersButton
//
resources.ApplyResources(this.viewPvsServersButton, "viewPvsServersButton");
@ -83,13 +108,25 @@ namespace XenAdmin.Dialogs
this.viewPvsServersButton.UseVisualStyleBackColor = true;
this.viewPvsServersButton.Click += new System.EventHandler(this.viewServersButton_Click);
//
// hostsPanel
// pvsConfigInfoIcon
//
resources.ApplyResources(this.hostsPanel, "hostsPanel");
this.hostsPanel.BorderColor = System.Drawing.Color.Black;
this.hostsPanel.BorderWidth = 1;
this.tableLayoutPanel1.SetColumnSpan(this.hostsPanel, 3);
this.hostsPanel.Name = "hostsPanel";
resources.ApplyResources(this.pvsConfigInfoIcon, "pvsConfigInfoIcon");
this.pvsConfigInfoIcon.Image = global::XenAdmin.Properties.Resources._000_Alert2_h32bit_16;
this.pvsConfigInfoIcon.Name = "pvsConfigInfoIcon";
this.pvsConfigInfoIcon.TabStop = false;
//
// pvsConfigInfoLabel
//
resources.ApplyResources(this.pvsConfigInfoLabel, "pvsConfigInfoLabel");
this.tableLayoutPanel1.SetColumnSpan(this.pvsConfigInfoLabel, 3);
this.pvsConfigInfoLabel.Name = "pvsConfigInfoLabel";
//
// memoryOnlyInfoIcon
//
resources.ApplyResources(this.memoryOnlyInfoIcon, "memoryOnlyInfoIcon");
this.memoryOnlyInfoIcon.Image = global::XenAdmin.Properties.Resources._000_Info3_h32bit_16;
this.memoryOnlyInfoIcon.Name = "memoryOnlyInfoIcon";
this.memoryOnlyInfoIcon.TabStop = false;
//
// PvsCacheConfigurationPage
//
@ -100,6 +137,8 @@ namespace XenAdmin.Dialogs
this.Name = "PvsCacheConfigurationPage";
this.tableLayoutPanel1.ResumeLayout(false);
this.tableLayoutPanel1.PerformLayout();
((System.ComponentModel.ISupportInitialize)(this.pvsConfigInfoIcon)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.memoryOnlyInfoIcon)).EndInit();
this.ResumeLayout(false);
}
@ -113,5 +152,9 @@ namespace XenAdmin.Dialogs
private System.Windows.Forms.Label label1;
private System.Windows.Forms.Button deleteButton;
public System.Windows.Forms.Button viewPvsServersButton;
private System.Windows.Forms.Label pvsConfigInfoLabel;
private System.Windows.Forms.PictureBox pvsConfigInfoIcon;
private System.Windows.Forms.Label memoryOnlyInfoLabel;
private System.Windows.Forms.PictureBox memoryOnlyInfoIcon;
}
}

3
XenAdmin/Dialogs/PvsPages/PvsCacheConfigurationPage.cs
View File

@ -72,7 +72,10 @@ namespace XenAdmin.Dialogs
{
PvsSite = (PVS_site) clone;
if (PvsSite != null)
{
textBox1.Text = PvsSite.Name;
pvsConfigInfoIcon.Visible = pvsConfigInfoLabel.Visible = string.IsNullOrEmpty(PvsSite.PVS_uuid);
}
else
{
// Generate list of all taken PVS_site names

177
XenAdmin/Dialogs/PvsPages/PvsCacheConfigurationPage.resx
View File

@ -119,9 +119,47 @@
</resheader>
<assembly alias="mscorlib" name="mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
<data name="tableLayoutPanel1.ColumnCount" type="System.Int32, mscorlib">
<value>3</value>
<value>4</value>
</data>
<data name="memoryOnlyInfoLabel.AutoSize" type="System.Boolean, mscorlib">
<value>True</value>
</data>
<assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
<data name="memoryOnlyInfoLabel.Font" type="System.Drawing.Font, System.Drawing">
<value>Segoe UI, 9pt</value>
</data>
<assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
<data name="memoryOnlyInfoLabel.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
<value>NoControl</value>
</data>
<data name="memoryOnlyInfoLabel.Location" type="System.Drawing.Point, System.Drawing">
<value>22, 241</value>
</data>
<data name="memoryOnlyInfoLabel.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
<value>3, 3, 3, 3</value>
</data>
<data name="memoryOnlyInfoLabel.Size" type="System.Drawing.Size, System.Drawing">
<value>393, 45</value>
</data>
<data name="memoryOnlyInfoLabel.TabIndex" type="System.Int32, mscorlib">
<value>18</value>
</data>
<data name="memoryOnlyInfoLabel.Text" xml:space="preserve">
<value>The cache size recommendation is at least 5GB per vDisk version.
If Memory only is chosen, the allowed cache size depends on the server's Control Domain memory.</value>
</data>
<data name="&gt;&gt;memoryOnlyInfoLabel.Name" xml:space="preserve">
<value>memoryOnlyInfoLabel</value>
</data>
<data name="&gt;&gt;memoryOnlyInfoLabel.Type" xml:space="preserve">
<value>System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="&gt;&gt;memoryOnlyInfoLabel.Parent" xml:space="preserve">
<value>tableLayoutPanel1</value>
</data>
<data name="&gt;&gt;memoryOnlyInfoLabel.ZOrder" xml:space="preserve">
<value>0</value>
</data>
<data name="deleteButton.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
<value>Bottom, Right</value>
</data>
@ -131,7 +169,6 @@
<data name="deleteButton.AutoSizeMode" type="System.Windows.Forms.AutoSizeMode, System.Windows.Forms">
<value>GrowAndShrink</value>
</data>
<assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
<data name="deleteButton.ImageAlign" type="System.Drawing.ContentAlignment, System.Drawing">
<value>MiddleLeft</value>
</data>
@ -139,19 +176,22 @@
<value>NoControl</value>
</data>
<data name="deleteButton.Location" type="System.Drawing.Point, System.Drawing">
<value>309, 330</value>
<value>255, 330</value>
</data>
<data name="deleteButton.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
<value>3, 5, 3, 3</value>
</data>
<data name="deleteButton.Padding" type="System.Windows.Forms.Padding, System.Windows.Forms">
<value>5, 0, 5, 0</value>
</data>
<data name="deleteButton.Size" type="System.Drawing.Size, System.Drawing">
<value>128, 23</value>
<value>182, 23</value>
</data>
<data name="deleteButton.TabIndex" type="System.Int32, mscorlib">
<value>6</value>
</data>
<data name="deleteButton.Text" xml:space="preserve">
<value>&amp;Remove PVS Site</value>
<value>&amp;Remove Cache Configuration</value>
</data>
<data name="deleteButton.TextImageRelation" type="System.Windows.Forms.TextImageRelation, System.Windows.Forms">
<value>ImageBeforeText</value>
@ -166,7 +206,7 @@
<value>tableLayoutPanel1</value>
</data>
<data name="&gt;&gt;deleteButton.ZOrder" xml:space="preserve">
<value>0</value>
<value>1</value>
</data>
<data name="label1.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
<value>Top, Left, Right</value>
@ -202,7 +242,7 @@
<value>tableLayoutPanel1</value>
</data>
<data name="&gt;&gt;label1.ZOrder" xml:space="preserve">
<value>1</value>
<value>2</value>
</data>
<data name="label7.AutoSize" type="System.Boolean, mscorlib">
<value>True</value>
@ -241,7 +281,7 @@
<value>tableLayoutPanel1</value>
</data>
<data name="&gt;&gt;label7.ZOrder" xml:space="preserve">
<value>2</value>
<value>3</value>
</data>
<data name="textBox1.Location" type="System.Drawing.Point, System.Drawing">
<value>69, 13</value>
@ -262,7 +302,7 @@
<value>tableLayoutPanel1</value>
</data>
<data name="&gt;&gt;textBox1.ZOrder" xml:space="preserve">
<value>3</value>
<value>4</value>
</data>
<data name="hostsPanel.AutoScroll" type="System.Boolean, mscorlib">
<value>True</value>
@ -274,7 +314,7 @@
<value>3, 72</value>
</data>
<data name="hostsPanel.Size" type="System.Drawing.Size, System.Drawing">
<value>434, 252</value>
<value>434, 163</value>
</data>
<data name="hostsPanel.TabIndex" type="System.Int32, mscorlib">
<value>4</value>
@ -289,7 +329,7 @@
<value>tableLayoutPanel1</value>
</data>
<data name="&gt;&gt;hostsPanel.ZOrder" xml:space="preserve">
<value>4</value>
<value>5</value>
</data>
<data name="viewPvsServersButton.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
<value>Bottom, Right</value>
@ -301,13 +341,16 @@
<value>NoControl</value>
</data>
<data name="viewPvsServersButton.Location" type="System.Drawing.Point, System.Drawing">
<value>175, 330</value>
<value>127, 330</value>
</data>
<data name="viewPvsServersButton.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
<value>3, 5, 3, 3</value>
</data>
<data name="viewPvsServersButton.Padding" type="System.Windows.Forms.Padding, System.Windows.Forms">
<value>5, 0, 5, 0</value>
</data>
<data name="viewPvsServersButton.Size" type="System.Drawing.Size, System.Drawing">
<value>128, 23</value>
<value>122, 23</value>
</data>
<data name="viewPvsServersButton.TabIndex" type="System.Int32, mscorlib">
<value>5</value>
@ -325,7 +368,109 @@
<value>tableLayoutPanel1</value>
</data>
<data name="&gt;&gt;viewPvsServersButton.ZOrder" xml:space="preserve">
<value>5</value>
<value>6</value>
</data>
<data name="pvsConfigInfoIcon.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
<value>Top, Bottom, Left</value>
</data>
<data name="pvsConfigInfoIcon.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
<value>NoControl</value>
</data>
<data name="pvsConfigInfoIcon.Location" type="System.Drawing.Point, System.Drawing">
<value>3, 292</value>
</data>
<data name="pvsConfigInfoIcon.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
<value>3, 3, 0, 3</value>
</data>
<data name="pvsConfigInfoIcon.Size" type="System.Drawing.Size, System.Drawing">
<value>16, 30</value>
</data>
<data name="pvsConfigInfoIcon.SizeMode" type="System.Windows.Forms.PictureBoxSizeMode, System.Windows.Forms">
<value>AutoSize</value>
</data>
<data name="pvsConfigInfoIcon.TabIndex" type="System.Int32, mscorlib">
<value>17</value>
</data>
<data name="&gt;&gt;pvsConfigInfoIcon.Name" xml:space="preserve">
<value>pvsConfigInfoIcon</value>
</data>
<data name="&gt;&gt;pvsConfigInfoIcon.Type" xml:space="preserve">
<value>System.Windows.Forms.PictureBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="&gt;&gt;pvsConfigInfoIcon.Parent" xml:space="preserve">
<value>tableLayoutPanel1</value>
</data>
<data name="&gt;&gt;pvsConfigInfoIcon.ZOrder" xml:space="preserve">
<value>7</value>
</data>
<data name="pvsConfigInfoLabel.AutoSize" type="System.Boolean, mscorlib">
<value>True</value>
</data>
<data name="pvsConfigInfoLabel.Font" type="System.Drawing.Font, System.Drawing">
<value>Segoe UI, 9pt</value>
</data>
<data name="pvsConfigInfoLabel.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
<value>NoControl</value>
</data>
<data name="pvsConfigInfoLabel.Location" type="System.Drawing.Point, System.Drawing">
<value>22, 292</value>
</data>
<data name="pvsConfigInfoLabel.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
<value>3, 3, 3, 3</value>
</data>
<data name="pvsConfigInfoLabel.Size" type="System.Drawing.Size, System.Drawing">
<value>381, 30</value>
</data>
<data name="pvsConfigInfoLabel.TabIndex" type="System.Int32, mscorlib">
<value>16</value>
</data>
<data name="pvsConfigInfoLabel.Text" xml:space="preserve">
<value>The cache configuration for this site must be completed using the PVS console or MCLI.</value>
</data>
<data name="&gt;&gt;pvsConfigInfoLabel.Name" xml:space="preserve">
<value>pvsConfigInfoLabel</value>
</data>
<data name="&gt;&gt;pvsConfigInfoLabel.Type" xml:space="preserve">
<value>System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="&gt;&gt;pvsConfigInfoLabel.Parent" xml:space="preserve">
<value>tableLayoutPanel1</value>
</data>
<data name="&gt;&gt;pvsConfigInfoLabel.ZOrder" xml:space="preserve">
<value>8</value>
</data>
<data name="memoryOnlyInfoIcon.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
<value>Top, Bottom, Left</value>
</data>
<data name="memoryOnlyInfoIcon.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
<value>NoControl</value>
</data>
<data name="memoryOnlyInfoIcon.Location" type="System.Drawing.Point, System.Drawing">
<value>3, 243</value>
</data>
<data name="memoryOnlyInfoIcon.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
<value>3, 5, 0, 3</value>
</data>
<data name="memoryOnlyInfoIcon.Size" type="System.Drawing.Size, System.Drawing">
<value>16, 43</value>
</data>
<data name="memoryOnlyInfoIcon.SizeMode" type="System.Windows.Forms.PictureBoxSizeMode, System.Windows.Forms">
<value>AutoSize</value>
</data>
<data name="memoryOnlyInfoIcon.TabIndex" type="System.Int32, mscorlib">
<value>19</value>
</data>
<data name="&gt;&gt;memoryOnlyInfoIcon.Name" xml:space="preserve">
<value>memoryOnlyInfoIcon</value>
</data>
<data name="&gt;&gt;memoryOnlyInfoIcon.Type" xml:space="preserve">
<value>System.Windows.Forms.PictureBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="&gt;&gt;memoryOnlyInfoIcon.Parent" xml:space="preserve">
<value>tableLayoutPanel1</value>
</data>
<data name="&gt;&gt;memoryOnlyInfoIcon.ZOrder" xml:space="preserve">
<value>9</value>
</data>
<data name="tableLayoutPanel1.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
<value>Fill</value>
@ -337,7 +482,7 @@
<value>0, 10, 0, 0</value>
</data>
<data name="tableLayoutPanel1.RowCount" type="System.Int32, mscorlib">
<value>4</value>
<value>6</value>
</data>
<data name="tableLayoutPanel1.Size" type="System.Drawing.Size, System.Drawing">
<value>440, 356</value>
@ -358,7 +503,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="deleteButton" Row="3" RowSpan="1" Column="3" ColumnSpan="1" /&gt;&lt;Control Name="label1" Row="1" RowSpan="1" Column="0" ColumnSpan="3" /&gt;&lt;Control Name="label7" Row="0" RowSpan="1" Column="0" ColumnSpan="1" /&gt;&lt;Control Name="textBox1" Row="0" RowSpan="1" Column="1" ColumnSpan="2" /&gt;&lt;Control Name="hostsPanel" Row="2" RowSpan="1" Column="0" ColumnSpan="3" /&gt;&lt;Control Name="viewPvsServersButton" Row="3" RowSpan="1" Column="1" ColumnSpan="1" /&gt;&lt;/Controls&gt;&lt;Columns Styles="AutoSize,0,Percent,100,AutoSize,0" /&gt;&lt;Rows Styles="AutoSize,0,AutoSize,0,Percent,100,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="memoryOnlyInfoLabel" Row="3" RowSpan="1" Column="1" ColumnSpan="3" /&gt;&lt;Control Name="deleteButton" Row="5" RowSpan="1" Column="4" ColumnSpan="1" /&gt;&lt;Control Name="label1" Row="1" RowSpan="1" Column="0" ColumnSpan="4" /&gt;&lt;Control Name="label7" Row="0" RowSpan="1" Column="0" ColumnSpan="2" /&gt;&lt;Control Name="textBox1" Row="0" RowSpan="1" Column="2" ColumnSpan="2" /&gt;&lt;Control Name="hostsPanel" Row="2" RowSpan="1" Column="0" ColumnSpan="4" /&gt;&lt;Control Name="viewPvsServersButton" Row="5" RowSpan="1" Column="2" ColumnSpan="1" /&gt;&lt;Control Name="pvsConfigInfoIcon" Row="4" RowSpan="1" Column="0" ColumnSpan="1" /&gt;&lt;Control Name="pvsConfigInfoLabel" Row="4" RowSpan="1" Column="1" ColumnSpan="3" /&gt;&lt;Control Name="memoryOnlyInfoIcon" Row="3" RowSpan="1" Column="0" ColumnSpan="1" /&gt;&lt;/Controls&gt;&lt;Columns Styles="AutoSize,0,AutoSize,0,Percent,100,AutoSize,0" /&gt;&lt;Rows Styles="AutoSize,0,AutoSize,0,Percent,100,AutoSize,21,AutoSize,0,AutoSize,0,Absolute,20" /&gt;&lt;/TableLayoutSettings&gt;</value>
</data>
<metadata name="$this.Localizable" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>

17
XenAdmin/Dialogs/PvsSiteDialog.Designer.cs generated
View File

@ -32,10 +32,10 @@ namespace XenAdmin.Dialogs
this.closeButton = new System.Windows.Forms.Button();
this.mainPanel = new System.Windows.Forms.Panel();
this.gridView = new XenAdmin.Controls.DataGridViewEx.DataGridViewEx();
this.bottomPanel = new System.Windows.Forms.Panel();
this.ipAddressesColumn = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.firstPortColumn = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.lastPortColumn = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.bottomPanel = new System.Windows.Forms.Panel();
this.mainPanel.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.gridView)).BeginInit();
this.bottomPanel.SuspendLayout();
@ -68,12 +68,6 @@ namespace XenAdmin.Dialogs
this.gridView.Name = "gridView";
this.gridView.ReadOnly = true;
//
// bottomPanel
//
this.bottomPanel.Controls.Add(this.closeButton);
resources.ApplyResources(this.bottomPanel, "bottomPanel");
this.bottomPanel.Name = "bottomPanel";
//
// ipAddressesColumn
//
this.ipAddressesColumn.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.Fill;
@ -98,6 +92,12 @@ namespace XenAdmin.Dialogs
this.lastPortColumn.Name = "lastPortColumn";
this.lastPortColumn.ReadOnly = true;
//
// bottomPanel
//
this.bottomPanel.Controls.Add(this.closeButton);
resources.ApplyResources(this.bottomPanel, "bottomPanel");
this.bottomPanel.Name = "bottomPanel";
//
// PvsSiteDialog
//
resources.ApplyResources(this, "$this");
@ -106,9 +106,6 @@ namespace XenAdmin.Dialogs
this.Controls.Add(this.mainPanel);
this.Controls.Add(this.bottomPanel);
this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.Sizable;
this.HelpButton = false;
this.MaximizeBox = true;
this.MinimizeBox = true;
this.Name = "PvsSiteDialog";
this.ShowInTaskbar = true;
this.mainPanel.ResumeLayout(false);

178
XenAdmin/Dialogs/PvsSiteDialog.resx
View File

@ -282,182 +282,6 @@
<data name="$this.Font" type="System.Drawing.Font, System.Drawing">
<value>Tahoma, 8pt</value>
</data>
<data name="$this.Icon" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
AAABAAYAICAQAAAAAADoAgAAZgAAABAQEAAAAAAAKAEAAE4DAAAgIAAAAQAIAKgIAAB2BAAAEBAAAAEA
CABoBQAAHg0AACAgAAABACAAqBAAAIYSAAAQEAAAAQAgAGgEAAAuIwAAKAAAACAAAABAAAAAAQAEAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIAAAAAAAACAgACAAAAAgACAAICAAACAgIAAwMDAAAAA
/wAA/wAAAP//AP8AAAD/AP8A//8AAP///wAiIiIiIiIiIiIiIiIiIiIiIiIiIiIiIiIiIiIiIiIiIoiI
iIiIiIiIiIiIiIiIiIiCIigiIiIozMzMzMzMyCIogiIoIiIiKM7m5ubm5sgiKIIiKCIiIijObm5ubm7I
IiiCIigiIiIozubm5ubmyCIogiIoIiIiKM5ubm5ubsgiKIIiKCIiIijO5ubm5ubIIiiIiIiIiIiIzm5u
bm5uyCIogRERERERGM7u7u7u7sgiKIHZWVlZWRjMzMzMzMzIIiiB1ZWVlZUYiIiIiIiIiIiIgdlZWVlZ
GDMzMzMzMzMzOIHVlZWVlRg/uLi4uLi4uDiB2VlZWVkYP7uLi4uLi4s4gdWVlZWVGD+4uLi4uLi4OIHZ
WVlZWRg/u4uLi4uLiziB1ZWVlZUYP7i4uLi4uLg4gdlZWVlZGD+7i4uLi4uLOIHVlZWVlRg/uLi4uLi4
uDiB3d3d3d0YP7uLi4uLi4s4gRERERERGD+4uLi4uLi4OIiIiIiIiIg/u4uLi4uLiziCIiIiIiIoP7i4
uLi4uLg4giIiIiIiKD+7i4uLi4uLOIIiIiIiIig/uLi4uLi4uDiCIiIiIiIoP7u7u7u7u7s4giIiIiIi
KD//////////OIIiIiIiIigzMzMzMzMzMziIiIiIiIiIiIiIiIiIiIiIIiIiIiIiIiIiIiIiIiIiIv//
////////AAAAAHv4AA57+AAOe/gADnv4AA57+AAOe/gADgAAAA4AAAAOAAAADgAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAH/4AAB/+AAAf/gAAH/4AAB/+AAAf/gAAAAA
AAD/////KAAAABAAAAAgAAAAAQAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIAAAAAAAACA
gACAAAAAgACAAICAAACAgIAAwMDAAAAA/wAA/wAAAP//AP8AAAD/AP8A//8AAP///wAiIiIiIiIiIoiI
iIiIiIiIgigijMzMyCiCKCKM5mbIKIiIiIzu7sgogRERjMzMyCiB2ZGIiIiIiIHZkYMzMzM4gdmRg/u7
uziB3dGD+7u7OIEREYP7u7s4iIiIg/u7uziCIiKD+7u7OIIiIoP///84giIigzMzMziIiIiIiIiIiP//
KCIAACjObALm5mwCIigAAoiIAAKIzgAAbm4AACIoAAAREQAAGM4AAO7uAAAiKHwAWVl8ABjMfADMzAAA
IigoAAAAIAAAAEAAAAABAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAgAAAAICAAIAA
AACAAIAAgIAAAICAgADA3MAA8MqmAKo/KgD/PyoAAF8qAFVfKgCqXyoA/18qAAB/KgBVfyoAqn8qAP9/
KgAAnyoAVZ8qAKqfKgD/nyoAAL8qAFW/KgCqvyoA/78qAADfKgBV3yoAqt8qAP/fKgAA/yoAVf8qAKr/
KgD//yoAAABVAFUAVQCqAFUA/wBVAAAfVQBVH1UAqh9VAP8fVQAAP1UAVT9VAKo/VQD/P1UAAF9VAFVf
VQCqX1UA/19VAAB/VQBVf1UAqn9VAP9/VQAAn1UAVZ9VAKqfVQD/n1UAAL9VAFW/VQCqv1UA/79VAADf
VQBV31UAqt9VAP/fVQAA/1UAVf9VAKr/VQD//1UAAAB/AFUAfwCqAH8A/wB/AAAffwBVH38Aqh9/AP8f
fwAAP38AVT9/AKo/fwD/P38AAF9/AFVffwCqX38A/19/AAB/fwBVf38Aqn9/AP9/fwAAn38AVZ9/AKqf
fwD/n38AAL9/AFW/fwCqv38A/79/AADffwBV338Aqt9/AP/ffwAA/38AVf9/AKr/fwD//38AAACqAFUA
qgCqAKoA/wCqAAAfqgBVH6oAqh+qAP8fqgAAP6oAVT+qAKo/qgD/P6oAAF+qAFVfqgCqX6oA/1+qAAB/
qgBVf6oAqn+qAP9/qgAAn6oAVZ+qAKqfqgD/n6oAAL+qAFW/qgCqv6oA/7+qAADfqgBV36oAqt+qAP/f
qgAA/6oAVf+qAKr/qgD//6oAAADUAFUA1ACqANQA/wDUAAAf1ABVH9QAqh/UAP8f1AAAP9QAVT/UAKo/
1AD/P9QAAF/UAFVf1ACqX9QA/1/UAAB/1ABVf9QAqn/UAP9/1AAAn9QAVZ/UAKqf1AD/n9QAAL/UAFW/
1ACqv9QA/7/UAADf1ABV39QAqt/UAP/f1AAA/9QAVf/UAKr/1AD//9QAVQD/AKoA/wAAH/8AVR//AKof
/wD/H/8AAD//AFU//wCqP/8A/z//AABf/wBVX/8Aql//AP9f/wAAf/8AVX//AKp//wD/f/8AAJ//AFWf
/wCqn/8A/5//AAC//wBVv/8Aqr//AP+//wAA3/8AVd//AKrf/wD/3/8AVf//AKr//wD/zMwA/8z/AP//
MwD//2YA//+ZAP//zAAAfwAAVX8AAKp/AAD/fwAAAJ8AAFWfAACqnwAA/58AAAC/AABVvwAAqr8AAP+/
AAAA3wAAVd8AAKrfAAD/3wAAVf8AAKr/AAAAACoAVQAqAKoAKgD/ACoAAB8qAFUfKgCqHyoA/x8qAAA/
KgBVPyoA8Pv/AKSgoACAgIAAAAD/AAD/AAAA//8A/wAAAAAAAAD//wAA////AP39/f39/f39/f39/f39
/f39/f39/f39/f39/f39/f39/f39/f39/f39/f39/f39/f39/f39/f39/f39/f39/f39/f39/f39/f39
/f39/f39/f39/f39/f39/f39/f39/f39qoYIqoYIhqoIqgiqCaoIqgiqhqqGhoYIhoYIqv39/f0I/f39
/ar9/f39/YY2Ng4yDg4ODgoOCgoKCgqG/f39/Yb9/f39CP39/f39qjY7Ozs3Nzc3NjMSMjIOCqr9/f39
qv39/f2G/f39/f0IN19fOzs3Nzc3NjcODg4KCP39/f0I/f39/ar9/f39/ao6X19fXzs7Ozc3NzY3NgqG
/f39/Yb9/f39CP39/f39hl9jY19jX187Ozs7Nzc3Dqr9/f39qv39/f2G/f39/f0IOodjh19jX19fXztf
OzcOCP39/f0ICAmqCAiqCKoICapfCYdjh2ODY19fXzs7Ow6q/f39/QhITEwoSCUoKSQoqmMJCYcJCWNj
Y2NfY19fNgj9/f39qkyZmZmYmJRwlCmqX19fXl9fX186WzY3Njc2gv39/f0JcJ2dmZmZlJmUJAmqCaoJ
hggIqggICKoIqggI/f39/YZwnp2dnZmZmJVMqnx8fHx8fFR8VHhUVFRUVKr9/f39CHChoZ2dnZ2ZmUwJ
fKSkxqSkxqSkpKSkpKBUCP39/f2qcKLDoqGdnZ2ZTKp8ysakxqSkxqSkxqSkpFSq/f39/QiUpqbDoqHE
nZ1Mq3ykqMakyqSkxqSkpKSkVAj9/f39hpTIyKbHoqGhoXAIfMrLpMqkxqSkxqTGpKRUqv39/f0IlMym
yKbIpcShcAh8y6jKpMqkxsqkpKSkxlQI/f39/aqUzMzMyKbIpqJwqnzLy8qpxsqkpMakxqSkeAj9/f39
CJSUlJSUlJSUlJQJgMupy8qpysqkyqSkxqRUqv39/f2GCKoIqgiqCKoIhgigrcvPqcuoy8qkxsqkxnyG
/f39/ar9/f39/f39/f39qnzPz6nLy8uoyqnKpKTKVAj9/f39CP39/f39/f39/f0IfNDPz8+py8upyqjG
yqR8hv39/f2G/f39/f39/f39/Qik0K7P0M+ty8vLy6jKpXyq/f39/ar9/f39/f39/f39CHzQ09Ctz8/P
qcupy6jKeAj9/f39CP39/f39/f39/f2qoNPQ0NPQ0M/Qz8vLy6l8CP39/f2G/f39/f39/f39/QmkfKR8
oHx8fHx8fHx8fHyG/f39/aoIqgiqCKoIqgiqCKoIqgiqCKoIqgiqCKoIqgj9/f39/f39/f39/f39/f39
/f39/f39/f39/f39/f39/f39/f39/f39/f39/f39/f39/f39/f39/f39/f39/f39/f3/////////////
///AAAAD3vgAA974AAPe+AAD3vgAA974AAPe+AADwAAAA8AAAAPAAAADwAAAA8AAAAPAAAADwAAAA8AA
AAPAAAADwAAAA8AAAAPAAAADwAAAA9/4AAPf+AAD3/gAA9/4AAPf+AAD3/gAA8AAAAP//////////ygA
AAAQAAAAIAAAAAEACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACAAACAAAAAgIAAgAAAAIAA
gACAgAAAgICAAMDcwADwyqYAqj8qAP8/KgAAXyoAVV8qAKpfKgD/XyoAAH8qAFV/KgCqfyoA/38qAACf
KgBVnyoAqp8qAP+fKgAAvyoAVb8qAKq/KgD/vyoAAN8qAFXfKgCq3yoA/98qAAD/KgBV/yoAqv8qAP//
KgAAAFUAVQBVAKoAVQD/AFUAAB9VAFUfVQCqH1UA/x9VAAA/VQBVP1UAqj9VAP8/VQAAX1UAVV9VAKpf
VQD/X1UAAH9VAFV/VQCqf1UA/39VAACfVQBVn1UAqp9VAP+fVQAAv1UAVb9VAKq/VQD/v1UAAN9VAFXf
VQCq31UA/99VAAD/VQBV/1UAqv9VAP//VQAAAH8AVQB/AKoAfwD/AH8AAB9/AFUffwCqH38A/x9/AAA/
fwBVP38Aqj9/AP8/fwAAX38AVV9/AKpffwD/X38AAH9/AFV/fwCqf38A/39/AACffwBVn38Aqp9/AP+f
fwAAv38AVb9/AKq/fwD/v38AAN9/AFXffwCq338A/99/AAD/fwBV/38Aqv9/AP//fwAAAKoAVQCqAKoA
qgD/AKoAAB+qAFUfqgCqH6oA/x+qAAA/qgBVP6oAqj+qAP8/qgAAX6oAVV+qAKpfqgD/X6oAAH+qAFV/
qgCqf6oA/3+qAACfqgBVn6oAqp+qAP+fqgAAv6oAVb+qAKq/qgD/v6oAAN+qAFXfqgCq36oA/9+qAAD/
qgBV/6oAqv+qAP//qgAAANQAVQDUAKoA1AD/ANQAAB/UAFUf1ACqH9QA/x/UAAA/1ABVP9QAqj/UAP8/
1AAAX9QAVV/UAKpf1AD/X9QAAH/UAFV/1ACqf9QA/3/UAACf1ABVn9QAqp/UAP+f1AAAv9QAVb/UAKq/
1AD/v9QAAN/UAFXf1ACq39QA/9/UAAD/1ABV/9QAqv/UAP//1ABVAP8AqgD/AAAf/wBVH/8Aqh//AP8f
/wAAP/8AVT//AKo//wD/P/8AAF//AFVf/wCqX/8A/1//AAB//wBVf/8Aqn//AP9//wAAn/8AVZ//AKqf
/wD/n/8AAL//AFW//wCqv/8A/7//AADf/wBV3/8Aqt//AP/f/wBV//8Aqv//AP/MzAD/zP8A//8zAP//
ZgD//5kA///MAAB/AABVfwAAqn8AAP9/AAAAnwAAVZ8AAKqfAAD/nwAAAL8AAFW/AACqvwAA/78AAADf
AABV3wAAqt8AAP/fAABV/wAAqv8AAAAAKgBVACoAqgAqAP8AKgAAHyoAVR8qAKofKgD/HyoAAD8qAFU/
KgDw+/8ApKCgAICAgAAAAP8AAP8AAAD//wD/AAAAAAAAAP//AAD///8A/f39/f39/f39/f39/f39/f0I
hgiqCKoICKoICKaGCP39qv39hv2GNg4ODjII/ar9/Yb9/ar9qjdjXzsOCP2G/f0IhquGCAleCWNfNob9
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
bv+3d0n/wr/B/wAAAAAAAAAAAAAAAAAAAADCv8H/FRqE/0dN1v8/RNL/Nz3Q/y40zv8nLcz/ISfK/xwh
yf8WHMf/GxJh/8K/wf/gr3r/4K96/+Cvev/gr3r/3614/9yqdf/apnL/16Nw/9Sea//Rmmj/zZZk/8qR
X//GjFz/w4dW/7+CUv/Cv8H/AAAAAAAAAAAAAAAAAAAAAMK/wf8SHZD/WF3a/05U1/9FS9X/PUPS/zU7
0P8uM83/JyzL/yAmyf8aFGn/wr/B/8K/wf/Cv8H/wr/B/8K/wf/Cv8H/wr/B/8K/wf/Cv8H/wr/B/8K/
wf/Cv8H/wr/B/8K/wf/Cv8H/wr/B/8K/wf8AAAAAAAAAAAAAAAAAAAAAwr/B/xAfnP9obt7/YGTc/1Zb
2f9NU9f/RUrU/ztB0v80OdD/LDHO/xgWcv/Cv8H/Dn+n/w18pP8MeqH/DHie/wt1m/8Kc5j/CXGV/wlv
k/8JbJD/CGqN/wdpi/8HZ4j/BmWH/wZkhf8GYoP/wr/B/wAAAAAAAAAAAAAAAAAAAADCv8H/DiKp/3l+
4/9vdeH/Zmze/11i2/9UWtn/S1HW/0NI1P86P9H/Fhh9/8K/wf8Ogar/Barp/wGo6P8Apef/AKPm/wCi
5P8An+L/AJ7h/wCd3/8AnN7/AJnc/wCY2/8AmNn/AJbX/wZjhP/Cv8H/AAAAAAAAAAAAAAAAAAAAAMK/
wf8MJbX/iI7n/4CF5v93fOP/bnPg/2Vr3f9bYdv/UljY/0lP1v8UGoj/wr/B/w+Erf8Lrur/Bqvq/wOo
6f8Apuf/AKTm/wCi5f8AoOT/AJ/i/wCd4f8AnN//AJrd/wCZ2/8AmNr/BmWH/8K/wf8AAAAAAAAAAAAA
AAAAAAAAwr/B/wkowP+WnOz/jpTq/4aL6P9+hOX/dXri/2xx4P9jaN3/WV/b/xEek//Cv8H/EIaw/xay
7P8Or+z/Cavr/wWq6v8Bp+j/AKbn/wCj5f8AoeT/AJ/j/wCe4f8AnOD/AJve/wCa3f8HZ4n/wr/B/wAA
AAAAAAAAAAAAAAAAAADCv8H/CCrK/6Ko7/+coe7/lZrr/42T6f+Fiub/fIHl/3N54v9rcN//ECGg/8K/
wf8QiLP/I7nu/xq07f8Ssez/C63r/war6v8Cqen/AKbo/wCk5v8AouX/AKHk/wCf4f8AneH/AJzf/who
i//Cv8H/AAAAAAAAAAAAAAAAAAAAAMK/wf8GLNP/q7Hy/6as8P+hpu//mp/u/5OY6/+LkOj/g4nm/3qA
5P8NI6z/wr/B/xCKtv8xvvD/J7rv/x627f8Vsuz/Dq/s/wmr6/8Equn/Aafo/wCl5/8Ao+X/AKHk/wCf
4v8AnuH/CGqO/8K/wf8AAAAAAAAAAAAAAAAAAAAAwr/B/wUu2/+vtPP/r7Tz/6qv8v+mq/D/oKXv/5me
7f+Sl+v/io/p/wsmt//Cv8H/Eo24/0HF8f82wfD/LLzv/yK47v8atO3/EbHs/wut6/8Gq+r/A6np/wCm
6P8Apeb/AKLl/wCh5P8IbJD/wr/B/wAAAAAAAAAAAAAAAAAAAADCv8H/BC/h/wQv3/8FL9z/BS3Z/wYt
1v8GLNL/ByvP/wgqy/8IKcb/CSnC/8K/wf8Sjrv/Uszy/0fH8f87w/H/Mb7v/ye67/8et+7/FbPt/w6v
6/8IrOv/BKnp/wGo6P8Apef/AKPl/wluk//Cv8H/AAAAAAAAAAAAAAAAAAAAAMK/wf/Cv8H/wr/B/8K/
wf/Cv8H/wr/B/8K/wf/Cv8H/wr/B/8K/wf/Cv8H/wr/B/xKRvf9j0/P/WM/z/0zK8f9BxfH/N8Hw/yy8
7/8iuO7/GbTt/xGx7P8Lruv/Bqrq/wOo6f8Apuf/CnGV/8K/wf8AAAAAAAAAAAAAAAAAAAAAwr/B/wAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADCv8H/E5LA/3Ta8/9q1fP/XtHz/1LM
8v9Hx/H/O8Pw/zG+7/8nu+//Hrbt/xay7f8Or+v/CKzq/wSq6f8Kc5j/wr/B/wAAAAAAAAAAAAAAAAAA
AADCv8H/AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAMK/wf8UlMH/hOD1/3rc
9f9v2PP/ZNTy/1jO8v9NyvH/Qsbx/zbB8P8svO//I7ju/xm07f8SsOz/C67r/wt2m//Cv8H/AAAAAAAA
AAAAAAAAAAAAAMK/wf8AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAwr/B/xSW
w/+T5vb/iuL1/3/e9P912vT/adbz/13R8/9SzPL/R8jx/zzD8P8xvvD/J7rv/x627v8Vsuz/C3ie/8K/
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
</value>
</data>
<data name="$this.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
<value>NoControl</value>
</data>
<data name="$this.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
<value>0, 0, 0, 0</value>
</data>
@ -468,7 +292,7 @@
<value>8, 8, 8, 8</value>
</data>
<data name="$this.Text" xml:space="preserve">
<value>PVS Sites</value>
<value>PVS Servers</value>
</data>
<data name="&gt;&gt;ipAddressesColumn.Name" xml:space="preserve">
<value>ipAddressesColumn</value>

15
XenAdmin/Help/HelpManager.resx
View File

@ -1110,4 +1110,19 @@
<data name="Dom0MemoryDemandUsageMessageAlert" xml:space="preserve">
<value>7016</value>
</data>
<data name="ControlDomainMemoryDialog" xml:space="preserve">
<value>9909</value>
</data>
<data name="EnablePvsReadCachingDialog" xml:space="preserve">
<value>9908</value>
</data>
<data name="PvsCacheConfigurationDialog" xml:space="preserve">
<value>9907</value>
</data>
<data name="TabPagePvs" xml:space="preserve">
<value>9906</value>
</data>
<data name="PvsSiteDialog" xml:space="preserve">
<value>9910</value>
</data>
</root>

2
XenAdmin/MainWindow.cs
View File

@ -2446,6 +2446,8 @@ namespace XenAdmin
return "TabPageDockerProcess" + modelObj;
if (TheTabControl.SelectedTab == TabPageDockerDetails)
return "TabPageDockerDetails" + modelObj;
if (TheTabControl.SelectedTab == TabPagePvs)
return "TabPagePvs" + modelObj;
return "TabPageUnknown";
}

5
XenAdmin/TabPages/GeneralTabPage.cs
View File

@ -1494,7 +1494,10 @@ namespace XenAdmin.TabPages
PDSection s = pdSectionReadCaching;
if (vm.ReadCachingEnabled)
var pvsProxy = vm.PvsProxy;
if (pvsProxy != null)
s.AddEntry(FriendlyName("VM.pvs_read_caching_status"), pvs_proxy_status_extensions.ToFriendlyString(pvsProxy.status));
else if (vm.ReadCachingEnabled)
{
s.AddEntry(FriendlyName("VM.read_caching_status"), Messages.VM_READ_CACHING_ENABLED);
var vdiList = vm.ReadCachingVDIs.Select(vdi => vdi.NameWithLocation).ToArray();

11
XenModel/FriendlyNames.Designer.cs generated
View File

@ -1,7 +1,7 @@
//------------------------------------------------------------------------------
// <auto-generated>
// This code was generated by a tool.
// Runtime Version:4.0.30319.34209
// Runtime Version:4.0.30319.42000
//
// Changes to this file may cause incorrect behavior and will be lost if
// the code is regenerated.
@ -3264,6 +3264,15 @@ namespace XenAdmin {
}
}
/// <summary>
/// Looks up a localized string similar to PVS Read Caching Status.
/// </summary>
public static string Label_VM_pvs_read_caching_status {
get {
return ResourceManager.GetString("Label-VM.pvs_read_caching_status", resourceCulture);
}
}
/// <summary>
/// Looks up a localized string similar to Disks.
/// </summary>

3
XenModel/FriendlyNames.resx
View File

@ -1901,4 +1901,7 @@
<data name="Label-performance.pvscache_traffic_server_sent" xml:space="preserve">
<value>PVS Cache observed network traffic from servers</value>
</data>
<data name="Label-VM.pvs_read_caching_status" xml:space="preserve">
<value>PVS Read Caching Status</value>
</data>
</root>

4
XenModel/Messages.Designer.cs generated
View File

@ -13343,7 +13343,7 @@ namespace XenAdmin {
}
/// <summary>
/// Looks up a localized string similar to Choose the PVS site where the selected VMs should be cached..
/// Looks up a localized string similar to Choose the PVS site from which the selected VMs are streamed..
/// </summary>
public static string ENABLE_PVS_READ_CACHING_RUBRIC_MULTIPLE {
get {
@ -13352,7 +13352,7 @@ namespace XenAdmin {
}
/// <summary>
/// Looks up a localized string similar to Choose the PVS site where the selected VM should be cached..
/// Looks up a localized string similar to Choose the PVS site from which the selected VM is streamed..
/// </summary>
public static string ENABLE_PVS_READ_CACHING_RUBRIC_SINGLE {
get {

4
XenModel/Messages.resx
View File

@ -4726,10 +4726,10 @@ Would you like to eject these ISOs before continuing?</value>
<value>Ena&amp;ble PVS Read Caching...</value>
</data>
<data name="ENABLE_PVS_READ_CACHING_RUBRIC_MULTIPLE" xml:space="preserve">
<value>Choose the PVS site where the selected VMs should be cached.</value>
<value>Choose the PVS site from which the selected VMs are streamed.</value>
</data>
<data name="ENABLE_PVS_READ_CACHING_RUBRIC_SINGLE" xml:space="preserve">
<value>Choose the PVS site where the selected VM should be cached.</value>
<value>Choose the PVS site from which the selected VM is streamed.</value>
</data>
<data name="ENABLE_WLB_ELLIPSIS" xml:space="preserve">
<value>Res&amp;ume</value>