Merge pull request #545 from MihaelaStoica/agimofcarmen-CP-13039

Merge branch 'CP-13039' of https://github.com/agimofcarmen/xenadmin
This commit is contained in:
Mihaela Stoica 2015-07-14 10:05:18 +01:00
commit 2fd728bec3
5 changed files with 481 additions and 88 deletions

View File

@ -37,20 +37,55 @@ namespace XenAdmin.Wizards.PatchingWizard
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle2 = new System.Windows.Forms.DataGridViewCellStyle();
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle3 = new System.Windows.Forms.DataGridViewCellStyle();
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle4 = new System.Windows.Forms.DataGridViewCellStyle();
this.label1 = new System.Windows.Forms.Label();
this.tableLayoutPanel1 = new System.Windows.Forms.TableLayoutPanel();
this.button1 = new System.Windows.Forms.Button();
this.label2 = new System.Windows.Forms.Label();
this.fileNameTextBox = new System.Windows.Forms.TextBox();
this.BrowseButton = new System.Windows.Forms.Button();
this.selectFromDiskRadioButton = new System.Windows.Forms.RadioButton();
this.dataGridViewPatches = new XenAdmin.Controls.DataGridViewEx.DataGridViewEx();
this.button2 = new System.Windows.Forms.Button();
this.downloadUpdateRadioButton = new System.Windows.Forms.RadioButton();
this.label3 = new System.Windows.Forms.Label();
this.ColumnArrow = new System.Windows.Forms.DataGridViewImageColumn();
this.ColumnUpdate = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.ColumnDescription = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.ColumnStatus = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.webPageColumn = new System.Windows.Forms.DataGridViewLinkColumn();
this.tableLayoutPanel1.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.dataGridViewPatches)).BeginInit();
this.SuspendLayout();
//
// label1
// tableLayoutPanel1
//
resources.ApplyResources(this.label1, "label1");
this.label1.Name = "label1";
resources.ApplyResources(this.tableLayoutPanel1, "tableLayoutPanel1");
this.tableLayoutPanel1.Controls.Add(this.button1, 0, 2);
this.tableLayoutPanel1.Controls.Add(this.label2, 0, 3);
this.tableLayoutPanel1.Controls.Add(this.fileNameTextBox, 1, 3);
this.tableLayoutPanel1.Controls.Add(this.BrowseButton, 2, 3);
this.tableLayoutPanel1.Controls.Add(this.selectFromDiskRadioButton, 1, 2);
this.tableLayoutPanel1.Controls.Add(this.dataGridViewPatches, 1, 1);
this.tableLayoutPanel1.Controls.Add(this.button2, 2, 1);
this.tableLayoutPanel1.Controls.Add(this.downloadUpdateRadioButton, 0, 1);
this.tableLayoutPanel1.Controls.Add(this.label3, 1, 0);
this.tableLayoutPanel1.Name = "tableLayoutPanel1";
//
// button1
//
resources.ApplyResources(this.button1, "button1");
this.button1.Name = "button1";
this.button1.UseVisualStyleBackColor = true;
//
// label2
//
resources.ApplyResources(this.label2, "label2");
this.label2.Name = "label2";
//
// fileNameTextBox
//
resources.ApplyResources(this.fileNameTextBox, "fileNameTextBox");
this.fileNameTextBox.Name = "fileNameTextBox";
this.fileNameTextBox.TextChanged += new System.EventHandler(this.textBox1_TextChanged);
//
// BrowseButton
//
@ -59,6 +94,13 @@ namespace XenAdmin.Wizards.PatchingWizard
this.BrowseButton.UseVisualStyleBackColor = true;
this.BrowseButton.Click += new System.EventHandler(this.BrowseButton_Click);
//
// selectFromDiskRadioButton
//
resources.ApplyResources(this.selectFromDiskRadioButton, "selectFromDiskRadioButton");
this.tableLayoutPanel1.SetColumnSpan(this.selectFromDiskRadioButton, 4);
this.selectFromDiskRadioButton.Name = "selectFromDiskRadioButton";
this.selectFromDiskRadioButton.UseVisualStyleBackColor = true;
//
// dataGridViewPatches
//
this.dataGridViewPatches.AllowUserToResizeColumns = false;
@ -71,7 +113,9 @@ namespace XenAdmin.Wizards.PatchingWizard
this.ColumnArrow,
this.ColumnUpdate,
this.ColumnDescription,
this.ColumnStatus});
this.ColumnStatus,
this.webPageColumn});
this.tableLayoutPanel1.SetColumnSpan(this.dataGridViewPatches, 3);
this.dataGridViewPatches.Name = "dataGridViewPatches";
this.dataGridViewPatches.ReadOnly = true;
dataGridViewCellStyle5.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
@ -85,9 +129,31 @@ namespace XenAdmin.Wizards.PatchingWizard
dataGridViewCellStyle6.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
this.dataGridViewPatches.RowsDefaultCellStyle = dataGridViewCellStyle6;
this.dataGridViewPatches.RowTemplate.Resizable = System.Windows.Forms.DataGridViewTriState.True;
this.dataGridViewPatches.CellContentClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.dataGridViewPatches_CellContentClick);
this.dataGridViewPatches.CellMouseClick += new System.Windows.Forms.DataGridViewCellMouseEventHandler(this.dataGridViewPatches_CellMouseClick);
this.dataGridViewPatches.SelectionChanged += new System.EventHandler(this.dataGridViewPatches_SelectionChanged);
//
// button2
//
resources.ApplyResources(this.button2, "button2");
this.button2.Name = "button2";
this.button2.UseVisualStyleBackColor = true;
//
// downloadUpdateRadioButton
//
resources.ApplyResources(this.downloadUpdateRadioButton, "downloadUpdateRadioButton");
this.downloadUpdateRadioButton.Checked = true;
this.tableLayoutPanel1.SetColumnSpan(this.downloadUpdateRadioButton, 3);
this.downloadUpdateRadioButton.Name = "downloadUpdateRadioButton";
this.downloadUpdateRadioButton.TabStop = true;
this.downloadUpdateRadioButton.UseVisualStyleBackColor = true;
//
// label3
//
resources.ApplyResources(this.label3, "label3");
this.tableLayoutPanel1.SetColumnSpan(this.label3, 3);
this.label3.Name = "label3";
//
// ColumnArrow
//
this.ColumnArrow.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.DisplayedCells;
@ -135,14 +201,21 @@ namespace XenAdmin.Wizards.PatchingWizard
this.ColumnStatus.Name = "ColumnStatus";
this.ColumnStatus.ReadOnly = true;
//
// webPageColumn
//
this.webPageColumn.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.AllCells;
resources.ApplyResources(this.webPageColumn, "webPageColumn");
this.webPageColumn.Name = "webPageColumn";
this.webPageColumn.ReadOnly = true;
//
// PatchingWizard_SelectPatchPage
//
resources.ApplyResources(this, "$this");
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Dpi;
this.Controls.Add(this.dataGridViewPatches);
this.Controls.Add(this.BrowseButton);
this.Controls.Add(this.label1);
this.Controls.Add(this.tableLayoutPanel1);
this.Name = "PatchingWizard_SelectPatchPage";
this.tableLayoutPanel1.ResumeLayout(false);
this.tableLayoutPanel1.PerformLayout();
((System.ComponentModel.ISupportInitialize)(this.dataGridViewPatches)).EndInit();
this.ResumeLayout(false);
@ -150,12 +223,20 @@ namespace XenAdmin.Wizards.PatchingWizard
#endregion
private System.Windows.Forms.Label label1;
private System.Windows.Forms.Button BrowseButton;
private DataGridViewEx dataGridViewPatches;
private System.Windows.Forms.TableLayoutPanel tableLayoutPanel1;
private System.Windows.Forms.Label label2;
private System.Windows.Forms.TextBox fileNameTextBox;
private System.Windows.Forms.RadioButton selectFromDiskRadioButton;
private System.Windows.Forms.Button button2;
private System.Windows.Forms.RadioButton downloadUpdateRadioButton;
private System.Windows.Forms.Label label3;
private System.Windows.Forms.Button button1;
private System.Windows.Forms.DataGridViewImageColumn ColumnArrow;
private System.Windows.Forms.DataGridViewTextBoxColumn ColumnUpdate;
private System.Windows.Forms.DataGridViewTextBoxColumn ColumnDescription;
private System.Windows.Forms.DataGridViewTextBoxColumn ColumnStatus;
private System.Windows.Forms.DataGridViewLinkColumn webPageColumn;
}
}

View File

@ -110,15 +110,32 @@ namespace XenAdmin.Wizards.PatchingWizard
{
if (direction == PageLoadedDirection.Forward)
{
if (dataGridViewPatches.SelectedRows.Count > 0 && dataGridViewPatches.SelectedRows[0].Cells[ColumnUpdate.Index].Value.ToString().EndsWith(".xsoem"))
SelectedUpdateType = UpdateType.NewOem;
else if (dataGridViewPatches.SelectedRows.Count > 0 && dataGridViewPatches.SelectedRows[0].Cells[ColumnUpdate.Index].Value.ToString().EndsWith(".xsupdate"))
SelectedUpdateType = UpdateType.NewRetail;
else if (dataGridViewPatches.SelectedRows.Count > 0 && dataGridViewPatches.SelectedRows[0].Cells[ColumnUpdate.Index].Value.ToString().EndsWith(".iso"))
SelectedUpdateType = UpdateType.NewSuppPack;
if (downloadUpdateRadioButton.Checked)
{
if (dataGridViewPatches.SelectedRows.Count > 0 && dataGridViewPatches.SelectedRows[0].Cells[ColumnUpdate.Index].Value.ToString().EndsWith(".xsoem"))
SelectedUpdateType = UpdateType.NewOem;
else if (dataGridViewPatches.SelectedRows.Count > 0 && dataGridViewPatches.SelectedRows[0].Cells[ColumnUpdate.Index].Value.ToString().EndsWith(".xsupdate"))
SelectedUpdateType = UpdateType.NewRetail;
else if (dataGridViewPatches.SelectedRows.Count > 0 && dataGridViewPatches.SelectedRows[0].Cells[ColumnUpdate.Index].Value.ToString().EndsWith(".iso"))
SelectedUpdateType = UpdateType.NewSuppPack;
else
SelectedUpdateType = UpdateType.Existing;
}
else
SelectedUpdateType = UpdateType.Existing;
{
var fileName = fileNameTextBox.Text;
if (isValidFile())
{
if (fileName.EndsWith(".xsoem"))
SelectedUpdateType = UpdateType.NewOem;
else if (fileName.EndsWith(".xsupdate"))
SelectedUpdateType = UpdateType.NewRetail;
else if (fileName.EndsWith(".iso"))
SelectedUpdateType = UpdateType.NewSuppPack;
else
SelectedUpdateType = UpdateType.Existing;
}
}
SelectedExistingPatch = SelectedUpdateType == UpdateType.Existing
? ((PatchGridViewRow)dataGridViewPatches.SelectedRows[0]).Patch
: null;
@ -169,15 +186,32 @@ namespace XenAdmin.Wizards.PatchingWizard
public override bool EnableNext()
{
if (dataGridViewPatches.SelectedRows.Count == 1)
if (downloadUpdateRadioButton.Checked)
{
DataGridViewExRow row = (DataGridViewExRow)dataGridViewPatches.SelectedRows[0];
if (row.Enabled)
if (dataGridViewPatches.SelectedRows.Count == 1)
{
DataGridViewExRow row = (DataGridViewExRow)dataGridViewPatches.SelectedRows[0];
if (row.Enabled)
return true;
}
}
else if (selectFromDiskRadioButton.Checked)
{
if (isValidFile())
{
return true;
}
}
return false;
}
private bool isValidFile()
{
var fileName = fileNameTextBox.Text;
return !string.IsNullOrEmpty(fileName) && File.Exists(fileName) && (fileName.EndsWith(".xsoem") || fileName.EndsWith(".xsupdate") || fileName.EndsWith(".iso"));
}
private void UpdateEnablement()
{
OnPageUpdated();
@ -189,6 +223,7 @@ namespace XenAdmin.Wizards.PatchingWizard
// to that of the file selected. This means a handle to the directory persists, making
// it undeletable until the program exits, or the working dir moves on. So, save and
// restore the working dir...
selectFromDiskRadioButton.Checked = true;
String oldDir = "";
try
{
@ -204,7 +239,7 @@ namespace XenAdmin.Wizards.PatchingWizard
if (dlg.ShowDialog(this) == DialogResult.OK && dlg.CheckFileExists)
{
AddFile(dlg.FileName);
fileNameTextBox.Text = dlg.FileName;
}
OnPageUpdated();
}
@ -241,9 +276,19 @@ namespace XenAdmin.Wizards.PatchingWizard
{
get
{
return SelectedUpdateType == UpdateType.NewRetail || SelectedUpdateType == UpdateType.NewOem || SelectedUpdateType == UpdateType.NewSuppPack
? ((PatchGridViewRow)dataGridViewPatches.SelectedRows[0]).PathPatch
: null;
if (downloadUpdateRadioButton.Checked)
{
return SelectedUpdateType == UpdateType.NewRetail || SelectedUpdateType == UpdateType.NewOem || SelectedUpdateType == UpdateType.NewSuppPack
? ((PatchGridViewRow)dataGridViewPatches.SelectedRows[0]).PathPatch
: null;
}
else if (selectFromDiskRadioButton.Checked)
{
return SelectedUpdateType == UpdateType.NewRetail || SelectedUpdateType == UpdateType.NewOem || SelectedUpdateType == UpdateType.NewSuppPack
? fileNameTextBox.Text
: null;
}
else return null;
}
}
@ -278,6 +323,7 @@ namespace XenAdmin.Wizards.PatchingWizard
private DataGridViewTextBoxCell _nameCell;
private DataGridViewTextBoxCell _descriptionCell;
private DataGridViewTextBoxCell _statusCell;
private DataGridViewLinkCell _webPageCell;
public PatchGridViewRow(Pool_patch patch)
@ -311,11 +357,13 @@ namespace XenAdmin.Wizards.PatchingWizard
_nameCell = new DataGridViewTextBoxCell();
_descriptionCell = new DataGridViewTextBoxCell();
_statusCell = new DataGridViewTextBoxCell();
_webPageCell = new DataGridViewLinkCell();
Cells.Add(_imageCell);
Cells.Add(_nameCell);
Cells.Add(_descriptionCell);
Cells.Add(_statusCell);
Cells.Add(_webPageCell);
this.UpdateDetails();
}
@ -328,6 +376,8 @@ namespace XenAdmin.Wizards.PatchingWizard
public void UpdateDetails()
{
_imageCell.Value = expanded ? Resources.expanded_triangle : Resources.contracted_triangle;
_webPageCell.Value = Messages.PATCHING_WIZARD_WEBPAGE_CELL;
if (_isFile)
{
_nameCell.Value = System.IO.Path.GetFileName(_patchPath);
@ -428,6 +478,17 @@ namespace XenAdmin.Wizards.PatchingWizard
return false;
}
}
private void dataGridViewPatches_CellContentClick(object sender, DataGridViewCellEventArgs e)
{
downloadUpdateRadioButton.Checked = true;
}
private void textBox1_TextChanged(object sender, EventArgs e)
{
OnPageUpdated();
}
}
public enum UpdateType { NewRetail, NewOem, Existing, NewSuppPack}

View File

@ -112,84 +112,177 @@
<value>2.0</value>
</resheader>
<resheader name="reader">
<value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
<value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<resheader name="writer">
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
<data name="label1.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
<value>Top</value>
</data>
<assembly alias="System.Drawing" name="System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
<data name="label1.Location" type="System.Drawing.Point, System.Drawing">
<value>0, 0</value>
</data>
<data name="label1.Size" type="System.Drawing.Size, System.Drawing">
<value>531, 37</value>
</data>
<assembly alias="mscorlib" name="mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
<data name="label1.TabIndex" type="System.Int32, mscorlib">
<value>0</value>
</data>
<data name="label1.Text" xml:space="preserve">
<value>Select the update that you want to apply from the list of updates that have already been uploaded to one or more managed servers, or click Add to upload a new update.</value>
</data>
<data name="&gt;&gt;label1.Name" xml:space="preserve">
<value>label1</value>
</data>
<data name="&gt;&gt;label1.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;label1.Parent" xml:space="preserve">
<value>$this</value>
</data>
<data name="&gt;&gt;label1.ZOrder" xml:space="preserve">
<value>2</value>
</data>
<data name="BrowseButton.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
<value>Bottom, Left</value>
</data>
<data name="BrowseButton.Location" type="System.Drawing.Point, System.Drawing">
<value>0, 363</value>
</data>
<data name="BrowseButton.Size" type="System.Drawing.Size, System.Drawing">
<value>70, 23</value>
</data>
<data name="BrowseButton.TabIndex" type="System.Int32, mscorlib">
<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>
</data>
<assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
<data name="button1.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
<value>Top, Bottom, Left</value>
</data>
<data name="button1.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
<value>NoControl</value>
</data>
<assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
<data name="button1.Location" type="System.Drawing.Point, System.Drawing">
<value>80, 296</value>
</data>
<data name="button1.Size" type="System.Drawing.Size, System.Drawing">
<value>178, 23</value>
</data>
<data name="button1.TabIndex" type="System.Int32, mscorlib">
<value>4</value>
</data>
<data name="button1.Text" xml:space="preserve">
<value>Restore &amp;Dismissed Updates</value>
</data>
<data name="&gt;&gt;button1.Name" xml:space="preserve">
<value>button1</value>
</data>
<data name="&gt;&gt;button1.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;button1.Parent" xml:space="preserve">
<value>tableLayoutPanel1</value>
</data>
<data name="&gt;&gt;button1.ZOrder" xml:space="preserve">
<value>0</value>
</data>
<data name="label2.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
<value>Top</value>
</data>
<data name="label2.AutoSize" type="System.Boolean, mscorlib">
<value>True</value>
</data>
<data name="label2.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
<value>NoControl</value>
</data>
<data name="label2.Location" type="System.Drawing.Point, System.Drawing">
<value>12, 345</value>
</data>
<data name="label2.Size" type="System.Drawing.Size, System.Drawing">
<value>52, 13</value>
</data>
<data name="label2.TabIndex" type="System.Int32, mscorlib">
<value>6</value>
</data>
<data name="label2.Text" xml:space="preserve">
<value>&amp;Filename:</value>
</data>
<data name="&gt;&gt;label2.Name" xml:space="preserve">
<value>label2</value>
</data>
<data name="&gt;&gt;label2.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;label2.Parent" xml:space="preserve">
<value>tableLayoutPanel1</value>
</data>
<data name="&gt;&gt;label2.ZOrder" xml:space="preserve">
<value>1</value>
</data>
<data name="fileNameTextBox.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
<value>Top, Bottom, Left, Right</value>
</data>
<data name="fileNameTextBox.Location" type="System.Drawing.Point, System.Drawing">
<value>80, 348</value>
</data>
<data name="fileNameTextBox.Size" type="System.Drawing.Size, System.Drawing">
<value>420, 20</value>
</data>
<data name="fileNameTextBox.TabIndex" type="System.Int32, mscorlib">
<value>7</value>
</data>
<data name="&gt;&gt;fileNameTextBox.Name" xml:space="preserve">
<value>fileNameTextBox</value>
</data>
<data name="&gt;&gt;fileNameTextBox.Type" xml:space="preserve">
<value>System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="&gt;&gt;fileNameTextBox.Parent" xml:space="preserve">
<value>tableLayoutPanel1</value>
</data>
<data name="&gt;&gt;fileNameTextBox.ZOrder" xml:space="preserve">
<value>2</value>
</data>
<data name="BrowseButton.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
<value>NoControl</value>
</data>
<data name="BrowseButton.Location" type="System.Drawing.Point, System.Drawing">
<value>506, 348</value>
</data>
<data name="BrowseButton.Size" type="System.Drawing.Size, System.Drawing">
<value>70, 22</value>
</data>
<data name="BrowseButton.TabIndex" type="System.Int32, mscorlib">
<value>8</value>
</data>
<data name="BrowseButton.Text" xml:space="preserve">
<value>&amp;Add...</value>
<value>&amp;Browse...</value>
</data>
<data name="&gt;&gt;BrowseButton.Name" xml:space="preserve">
<value>BrowseButton</value>
</data>
<data name="&gt;&gt;BrowseButton.Type" xml:space="preserve">
<value>System.Windows.Forms.Button, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
<value>System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="&gt;&gt;BrowseButton.Parent" xml:space="preserve">
<value>$this</value>
<value>tableLayoutPanel1</value>
</data>
<data name="&gt;&gt;BrowseButton.ZOrder" xml:space="preserve">
<value>1</value>
<value>3</value>
</data>
<data name="selectFromDiskRadioButton.AutoSize" type="System.Boolean, mscorlib">
<value>True</value>
</data>
<data name="selectFromDiskRadioButton.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
<value>NoControl</value>
</data>
<data name="selectFromDiskRadioButton.Location" type="System.Drawing.Point, System.Drawing">
<value>3, 325</value>
</data>
<data name="selectFromDiskRadioButton.Size" type="System.Drawing.Size, System.Drawing">
<value>240, 17</value>
</data>
<data name="selectFromDiskRadioButton.TabIndex" type="System.Int32, mscorlib">
<value>9</value>
</data>
<data name="selectFromDiskRadioButton.Text" xml:space="preserve">
<value>&amp;Select update or supplemental pack from disk</value>
</data>
<data name="&gt;&gt;selectFromDiskRadioButton.Name" xml:space="preserve">
<value>selectFromDiskRadioButton</value>
</data>
<data name="&gt;&gt;selectFromDiskRadioButton.Type" xml:space="preserve">
<value>System.Windows.Forms.RadioButton, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="&gt;&gt;selectFromDiskRadioButton.Parent" xml:space="preserve">
<value>tableLayoutPanel1</value>
</data>
<data name="&gt;&gt;selectFromDiskRadioButton.ZOrder" xml:space="preserve">
<value>4</value>
</data>
<data name="dataGridViewPatches.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
<value>Top, Bottom, Left, Right</value>
</data>
<metadata name="ColumnArrow.UserAddedColumn" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<metadata name="ColumnArrow.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<data name="ColumnArrow.HeaderText" xml:space="preserve">
<value />
<value>ColumnArrow</value>
</data>
<data name="ColumnArrow.MinimumWidth" type="System.Int32, mscorlib">
<value>16</value>
</data>
<data name="ColumnArrow.Width" type="System.Int32, mscorlib">
<value>16</value>
<value>75</value>
</data>
<metadata name="ColumnUpdate.UserAddedColumn" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<metadata name="ColumnUpdate.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<data name="ColumnUpdate.HeaderText" xml:space="preserve">
@ -201,7 +294,7 @@
<data name="ColumnUpdate.Width" type="System.Int32, mscorlib">
<value>67</value>
</data>
<metadata name="ColumnDescription.UserAddedColumn" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<metadata name="ColumnDescription.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<data name="ColumnDescription.HeaderText" xml:space="preserve">
@ -210,7 +303,7 @@
<data name="ColumnDescription.MinimumWidth" type="System.Int32, mscorlib">
<value>90</value>
</data>
<metadata name="ColumnStatus.UserAddedColumn" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<metadata name="ColumnStatus.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<data name="ColumnStatus.HeaderText" xml:space="preserve">
@ -222,17 +315,29 @@
<data name="ColumnStatus.Width" type="System.Int32, mscorlib">
<value>70</value>
</data>
<metadata name="webPageColumn.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<data name="webPageColumn.HeaderText" xml:space="preserve">
<value>Web Page</value>
</data>
<data name="webPageColumn.MinimumWidth" type="System.Int32, mscorlib">
<value>120</value>
</data>
<data name="webPageColumn.Width" type="System.Int32, mscorlib">
<value>120</value>
</data>
<data name="dataGridViewPatches.Location" type="System.Drawing.Point, System.Drawing">
<value>0, 40</value>
<value>3, 52</value>
</data>
<data name="dataGridViewPatches.ScrollBars" type="System.Windows.Forms.ScrollBars, System.Windows.Forms">
<value>Vertical</value>
</data>
<data name="dataGridViewPatches.Size" type="System.Drawing.Size, System.Drawing">
<value>531, 317</value>
<value>589, 238</value>
</data>
<data name="dataGridViewPatches.TabIndex" type="System.Int32, mscorlib">
<value>4</value>
<value>2</value>
</data>
<data name="&gt;&gt;dataGridViewPatches.Name" xml:space="preserve">
<value>dataGridViewPatches</value>
@ -241,43 +346,177 @@
<value>XenAdmin.Controls.DataGridViewEx.DataGridViewEx, XenCenterMain, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null</value>
</data>
<data name="&gt;&gt;dataGridViewPatches.Parent" xml:space="preserve">
<value>$this</value>
<value>tableLayoutPanel1</value>
</data>
<data name="&gt;&gt;dataGridViewPatches.ZOrder" xml:space="preserve">
<value>5</value>
</data>
<data name="button2.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
<value>Top, Bottom, Left</value>
</data>
<data name="button2.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
<value>NoControl</value>
</data>
<data name="button2.Location" type="System.Drawing.Point, System.Drawing">
<value>3, 296</value>
</data>
<data name="button2.Size" type="System.Drawing.Size, System.Drawing">
<value>71, 23</value>
</data>
<data name="button2.TabIndex" type="System.Int32, mscorlib">
<value>3</value>
</data>
<data name="button2.Text" xml:space="preserve">
<value>&amp;Refresh List</value>
</data>
<data name="&gt;&gt;button2.Name" xml:space="preserve">
<value>button2</value>
</data>
<data name="&gt;&gt;button2.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;button2.Parent" xml:space="preserve">
<value>tableLayoutPanel1</value>
</data>
<data name="&gt;&gt;button2.ZOrder" xml:space="preserve">
<value>6</value>
</data>
<data name="downloadUpdateRadioButton.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
<value>Left</value>
</data>
<data name="downloadUpdateRadioButton.AutoSize" type="System.Boolean, mscorlib">
<value>True</value>
</data>
<data name="downloadUpdateRadioButton.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
<value>NoControl</value>
</data>
<data name="downloadUpdateRadioButton.Location" type="System.Drawing.Point, System.Drawing">
<value>3, 29</value>
</data>
<data name="downloadUpdateRadioButton.Size" type="System.Drawing.Size, System.Drawing">
<value>157, 17</value>
</data>
<data name="downloadUpdateRadioButton.TabIndex" type="System.Int32, mscorlib">
<value>1</value>
</data>
<data name="downloadUpdateRadioButton.Text" xml:space="preserve">
<value>Download update from &amp;Citrix
</value>
</data>
<data name="&gt;&gt;downloadUpdateRadioButton.Name" xml:space="preserve">
<value>downloadUpdateRadioButton</value>
</data>
<data name="&gt;&gt;downloadUpdateRadioButton.Type" xml:space="preserve">
<value>System.Windows.Forms.RadioButton, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="&gt;&gt;downloadUpdateRadioButton.Parent" xml:space="preserve">
<value>tableLayoutPanel1</value>
</data>
<data name="&gt;&gt;downloadUpdateRadioButton.ZOrder" xml:space="preserve">
<value>7</value>
</data>
<data name="label3.AutoSize" type="System.Boolean, mscorlib">
<value>True</value>
</data>
<data name="label3.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
<value>Fill</value>
</data>
<data name="label3.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
<value>NoControl</value>
</data>
<data name="label3.Location" type="System.Drawing.Point, System.Drawing">
<value>3, 0</value>
</data>
<data name="label3.Size" type="System.Drawing.Size, System.Drawing">
<value>589, 26</value>
</data>
<data name="label3.TabIndex" type="System.Int32, mscorlib">
<value>8</value>
</data>
<data name="label3.Text" xml:space="preserve">
<value>Select an update that you wish to download from Citrix, or an update or supplemental pack that you have already downloaded to your local disk.
</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=4.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>8</value>
</data>
<data name="tableLayoutPanel1.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
<value>Fill</value>
</data>
<data name="tableLayoutPanel1.Location" type="System.Drawing.Point, System.Drawing">
<value>0, 0</value>
</data>
<data name="tableLayoutPanel1.RowCount" type="System.Int32, mscorlib">
<value>7</value>
</data>
<data name="tableLayoutPanel1.Size" type="System.Drawing.Size, System.Drawing">
<value>595, 373</value>
</data>
<data name="tableLayoutPanel1.TabIndex" type="System.Int32, mscorlib">
<value>6</value>
</data>
<data name="&gt;&gt;tableLayoutPanel1.Name" xml:space="preserve">
<value>tableLayoutPanel1</value>
</data>
<data name="&gt;&gt;tableLayoutPanel1.Type" xml:space="preserve">
<value>System.Windows.Forms.TableLayoutPanel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="&gt;&gt;tableLayoutPanel1.Parent" xml:space="preserve">
<value>$this</value>
</data>
<data name="&gt;&gt;tableLayoutPanel1.ZOrder" xml:space="preserve">
<value>0</value>
</data>
<metadata name="$this.Localizable" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<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="button1" Row="2" RowSpan="1" Column="0" ColumnSpan="1" /&gt;&lt;Control Name="label2" Row="3" RowSpan="1" Column="0" ColumnSpan="1" /&gt;&lt;Control Name="fileNameTextBox" Row="3" RowSpan="1" Column="1" ColumnSpan="1" /&gt;&lt;Control Name="BrowseButton" Row="3" RowSpan="1" Column="2" ColumnSpan="1" /&gt;&lt;Control Name="selectFromDiskRadioButton" Row="2" RowSpan="1" Column="1" ColumnSpan="4" /&gt;&lt;Control Name="dataGridViewPatches" Row="1" RowSpan="1" Column="1" ColumnSpan="3" /&gt;&lt;Control Name="button2" Row="1" RowSpan="1" Column="2" ColumnSpan="1" /&gt;&lt;Control Name="downloadUpdateRadioButton" Row="1" RowSpan="1" Column="0" ColumnSpan="3" /&gt;&lt;Control Name="label3" Row="0" RowSpan="1" Column="1" ColumnSpan="3" /&gt;&lt;/Controls&gt;&lt;Columns Styles="Absolute,77,Percent,100,Absolute,92" /&gt;&lt;Rows Styles="AutoSize,0,AutoSize,0,AutoSize,37,Percent,100,AutoSize,36,AutoSize,100,AutoSize,26" /&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>
</metadata>
<data name="$this.AutoScaleDimensions" type="System.Drawing.SizeF, System.Drawing">
<value>96, 96</value>
</data>
<data name="$this.Size" type="System.Drawing.Size, System.Drawing">
<value>531, 386</value>
<value>595, 373</value>
</data>
<data name="&gt;&gt;ColumnArrow.Name" xml:space="preserve">
<value>ColumnArrow</value>
</data>
<data name="&gt;&gt;ColumnArrow.Type" xml:space="preserve">
<value>System.Windows.Forms.DataGridViewImageColumn, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
<value>System.Windows.Forms.DataGridViewImageColumn, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="&gt;&gt;ColumnUpdate.Name" xml:space="preserve">
<value>ColumnUpdate</value>
</data>
<data name="&gt;&gt;ColumnUpdate.Type" xml:space="preserve">
<value>System.Windows.Forms.DataGridViewTextBoxColumn, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
<value>System.Windows.Forms.DataGridViewTextBoxColumn, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="&gt;&gt;ColumnDescription.Name" xml:space="preserve">
<value>ColumnDescription</value>
</data>
<data name="&gt;&gt;ColumnDescription.Type" xml:space="preserve">
<value>System.Windows.Forms.DataGridViewTextBoxColumn, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
<value>System.Windows.Forms.DataGridViewTextBoxColumn, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="&gt;&gt;ColumnStatus.Name" xml:space="preserve">
<value>ColumnStatus</value>
</data>
<data name="&gt;&gt;ColumnStatus.Type" xml:space="preserve">
<value>System.Windows.Forms.DataGridViewTextBoxColumn, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
<value>System.Windows.Forms.DataGridViewTextBoxColumn, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="&gt;&gt;webPageColumn.Name" xml:space="preserve">
<value>webPageColumn</value>
</data>
<data name="&gt;&gt;webPageColumn.Type" xml:space="preserve">
<value>System.Windows.Forms.DataGridViewLinkColumn, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="&gt;&gt;$this.Name" xml:space="preserve">
<value>PatchingWizard_SelectPatchPage</value>
@ -285,4 +524,4 @@
<data name="&gt;&gt;$this.Type" xml:space="preserve">
<value>XenAdmin.Controls.XenTabPage, XenCenterMain, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null</value>
</data>
</root>
</root>

View File

@ -1,7 +1,7 @@
//------------------------------------------------------------------------------
// <auto-generated>
// This code was generated by a tool.
// Runtime Version:4.0.30319.17929
// Runtime Version:4.0.30319.18063
//
// Changes to this file may cause incorrect behavior and will be lost if
// the code is regenerated.
@ -25408,6 +25408,15 @@ namespace XenAdmin {
}
}
/// <summary>
/// Looks up a localized string similar to Go to web page.
/// </summary>
public static string PATCHING_WIZARD_WEBPAGE_CELL {
get {
return ResourceManager.GetString("PATCHING_WIZARD_WEBPAGE_CELL", resourceCulture);
}
}
/// <summary>
/// Looks up a localized string similar to Clean up....
/// </summary>

View File

@ -8935,6 +8935,9 @@ However, there is not enough space to perform the repartitioning, so the current
<data name="PATCHING_WIZARD_SOLVING_PROBLEMS" xml:space="preserve">
<value>Solving problems</value>
</data>
<data name="PATCHING_WIZARD_WEBPAGE_CELL" xml:space="preserve">
<value>Go to web page</value>
</data>
<data name="PATCH_APPLIED" xml:space="preserve">
<value>Update '{0}' Applied to Server '{1}'</value>
</data>