Merge pull request #801 from GaborApatiNagy/CP-15711

CP-15711: Modify Select Update Page
This commit is contained in:
Mihaela Stoica 2016-02-02 10:46:08 +00:00
commit 8d0d3c0c8e
2 changed files with 136 additions and 37 deletions

View File

@ -37,6 +37,8 @@ namespace XenAdmin.Wizards.PatchingWizard
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle2 = new System.Windows.Forms.DataGridViewCellStyle();
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle3 = new System.Windows.Forms.DataGridViewCellStyle();
this.tableLayoutPanel1 = new System.Windows.Forms.TableLayoutPanel();
this.automaticOptionLabel = new System.Windows.Forms.Label();
this.AutomaticRadioButton = new System.Windows.Forms.RadioButton();
this.RestoreDismUpdatesButton = new System.Windows.Forms.Button();
this.label2 = new System.Windows.Forms.Label();
this.fileNameTextBox = new System.Windows.Forms.TextBox();
@ -57,17 +59,32 @@ namespace XenAdmin.Wizards.PatchingWizard
// tableLayoutPanel1
//
resources.ApplyResources(this.tableLayoutPanel1, "tableLayoutPanel1");
this.tableLayoutPanel1.Controls.Add(this.RestoreDismUpdatesButton, 1, 3);
this.tableLayoutPanel1.Controls.Add(this.label2, 0, 5);
this.tableLayoutPanel1.Controls.Add(this.fileNameTextBox, 1, 5);
this.tableLayoutPanel1.Controls.Add(this.BrowseButton, 2, 5);
this.tableLayoutPanel1.Controls.Add(this.selectFromDiskRadioButton, 1, 4);
this.tableLayoutPanel1.Controls.Add(this.downloadUpdateRadioButton, 0, 1);
this.tableLayoutPanel1.Controls.Add(this.automaticOptionLabel, 0, 3);
this.tableLayoutPanel1.Controls.Add(this.AutomaticRadioButton, 0, 2);
this.tableLayoutPanel1.Controls.Add(this.RestoreDismUpdatesButton, 1, 5);
this.tableLayoutPanel1.Controls.Add(this.label2, 0, 7);
this.tableLayoutPanel1.Controls.Add(this.fileNameTextBox, 1, 7);
this.tableLayoutPanel1.Controls.Add(this.BrowseButton, 2, 7);
this.tableLayoutPanel1.Controls.Add(this.selectFromDiskRadioButton, 1, 6);
this.tableLayoutPanel1.Controls.Add(this.downloadUpdateRadioButton, 0, 4);
this.tableLayoutPanel1.Controls.Add(this.label3, 0, 0);
this.tableLayoutPanel1.Controls.Add(this.dataGridViewPatches, 0, 2);
this.tableLayoutPanel1.Controls.Add(this.RefreshListButton, 0, 3);
this.tableLayoutPanel1.Controls.Add(this.dataGridViewPatches, 0, 4);
this.tableLayoutPanel1.Controls.Add(this.RefreshListButton, 0, 5);
this.tableLayoutPanel1.Name = "tableLayoutPanel1";
//
// automaticOptionLabel
//
resources.ApplyResources(this.automaticOptionLabel, "automaticOptionLabel");
this.tableLayoutPanel1.SetColumnSpan(this.automaticOptionLabel, 3);
this.automaticOptionLabel.Name = "automaticOptionLabel";
//
// AutomaticRadioButton
//
resources.ApplyResources(this.AutomaticRadioButton, "AutomaticRadioButton");
this.tableLayoutPanel1.SetColumnSpan(this.AutomaticRadioButton, 3);
this.AutomaticRadioButton.Name = "AutomaticRadioButton";
this.AutomaticRadioButton.UseVisualStyleBackColor = true;
//
// RestoreDismUpdatesButton
//
resources.ApplyResources(this.RestoreDismUpdatesButton, "RestoreDismUpdatesButton");
@ -101,7 +118,7 @@ namespace XenAdmin.Wizards.PatchingWizard
this.selectFromDiskRadioButton.Name = "selectFromDiskRadioButton";
this.selectFromDiskRadioButton.UseVisualStyleBackColor = true;
this.selectFromDiskRadioButton.CheckedChanged += new System.EventHandler(this.selectFromDiskRadioButton_CheckedChanged);
//
//
// downloadUpdateRadioButton
//
resources.ApplyResources(this.downloadUpdateRadioButton, "downloadUpdateRadioButton");
@ -120,7 +137,6 @@ namespace XenAdmin.Wizards.PatchingWizard
// dataGridViewPatches
//
this.dataGridViewPatches.AllowUserToResizeColumns = false;
resources.ApplyResources(this.dataGridViewPatches, "dataGridViewPatches");
this.dataGridViewPatches.AutoSizeRowsMode = System.Windows.Forms.DataGridViewAutoSizeRowsMode.AllCells;
this.dataGridViewPatches.BackgroundColor = System.Drawing.SystemColors.Window;
this.dataGridViewPatches.CellBorderStyle = System.Windows.Forms.DataGridViewCellBorderStyle.Raised;
@ -131,6 +147,7 @@ namespace XenAdmin.Wizards.PatchingWizard
this.ColumnDate,
this.webPageColumn});
this.tableLayoutPanel1.SetColumnSpan(this.dataGridViewPatches, 3);
resources.ApplyResources(this.dataGridViewPatches, "dataGridViewPatches");
this.dataGridViewPatches.Name = "dataGridViewPatches";
this.dataGridViewPatches.ReadOnly = true;
dataGridViewCellStyle4.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
@ -229,5 +246,7 @@ namespace XenAdmin.Wizards.PatchingWizard
private System.Windows.Forms.DataGridViewTextBoxColumn ColumnDescription;
private System.Windows.Forms.DataGridViewTextBoxColumn ColumnDate;
private System.Windows.Forms.DataGridViewLinkColumn webPageColumn;
private System.Windows.Forms.Label automaticOptionLabel;
private System.Windows.Forms.RadioButton AutomaticRadioButton;
}
}

View File

@ -121,16 +121,97 @@
<data name="tableLayoutPanel1.ColumnCount" type="System.Int32, mscorlib">
<value>3</value>
</data>
<data name="automaticOptionLabel.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="automaticOptionLabel.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
<value>Fill</value>
</data>
<data name="automaticOptionLabel.Enabled" type="System.Boolean, mscorlib">
<value>False</value>
</data>
<data name="automaticOptionLabel.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="automaticOptionLabel.Location" type="System.Drawing.Point, System.Drawing">
<value>36, 65</value>
</data>
<data name="automaticOptionLabel.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
<value>36, 3, 3, 3</value>
</data>
<data name="automaticOptionLabel.Size" type="System.Drawing.Size, System.Drawing">
<value>562, 26</value>
</data>
<data name="automaticOptionLabel.TabIndex" type="System.Int32, mscorlib">
<value>11</value>
</data>
<data name="automaticOptionLabel.Text" xml:space="preserve">
<value>@BRANDING_BRAND_CONSOLE@ will &amp;automatically download and install all current updates from @BRANDING_COMPANY_NAME_SHORT@, usually with only a single reboot at the end.</value>
</data>
<data name="&gt;&gt;automaticOptionLabel.Name" xml:space="preserve">
<value>automaticOptionLabel</value>
</data>
<data name="&gt;&gt;automaticOptionLabel.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;automaticOptionLabel.Parent" xml:space="preserve">
<value>tableLayoutPanel1</value>
</data>
<data name="&gt;&gt;automaticOptionLabel.ZOrder" xml:space="preserve">
<value>0</value>
</data>
<data name="AutomaticRadioButton.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
<value>Left</value>
</data>
<data name="AutomaticRadioButton.AutoSize" type="System.Boolean, mscorlib">
<value>True</value>
</data>
<data name="AutomaticRadioButton.Enabled" type="System.Boolean, mscorlib">
<value>False</value>
</data>
<data name="AutomaticRadioButton.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
<value>NoControl</value>
</data>
<data name="AutomaticRadioButton.Location" type="System.Drawing.Point, System.Drawing">
<value>3, 42</value>
</data>
<data name="AutomaticRadioButton.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
<value>3, 16, 3, 3</value>
</data>
<data name="AutomaticRadioButton.RightToLeft" type="System.Windows.Forms.RightToLeft, System.Windows.Forms">
<value>No</value>
</data>
<data name="AutomaticRadioButton.Size" type="System.Drawing.Size, System.Drawing">
<value>72, 17</value>
</data>
<data name="AutomaticRadioButton.TabIndex" type="System.Int32, mscorlib">
<value>10</value>
</data>
<data name="AutomaticRadioButton.Text" xml:space="preserve">
<value>Automatic</value>
</data>
<data name="&gt;&gt;AutomaticRadioButton.Name" xml:space="preserve">
<value>AutomaticRadioButton</value>
</data>
<data name="&gt;&gt;AutomaticRadioButton.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;AutomaticRadioButton.Parent" xml:space="preserve">
<value>tableLayoutPanel1</value>
</data>
<data name="&gt;&gt;AutomaticRadioButton.ZOrder" xml:space="preserve">
<value>1</value>
</data>
<data name="RestoreDismUpdatesButton.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
<value>Top, Bottom, Left</value>
</data>
<data name="RestoreDismUpdatesButton.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="RestoreDismUpdatesButton.Location" type="System.Drawing.Point, System.Drawing">
<value>118, 305</value>
<value>118, 337</value>
</data>
<data name="RestoreDismUpdatesButton.Size" type="System.Drawing.Size, System.Drawing">
<value>178, 23</value>
@ -151,7 +232,7 @@
<value>tableLayoutPanel1</value>
</data>
<data name="&gt;&gt;RestoreDismUpdatesButton.ZOrder" xml:space="preserve">
<value>0</value>
<value>2</value>
</data>
<data name="label2.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
<value>Top, Left, Right</value>
@ -163,7 +244,7 @@
<value>NoControl</value>
</data>
<data name="label2.Location" type="System.Drawing.Point, System.Drawing">
<value>36, 389</value>
<value>36, 404</value>
</data>
<data name="label2.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
<value>36, 5, 3, 0</value>
@ -190,13 +271,13 @@
<value>tableLayoutPanel1</value>
</data>
<data name="&gt;&gt;label2.ZOrder" xml:space="preserve">
<value>1</value>
<value>3</value>
</data>
<data name="fileNameTextBox.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
<value>Top, Left, Right</value>
</data>
<data name="fileNameTextBox.Location" type="System.Drawing.Point, System.Drawing">
<value>118, 387</value>
<value>118, 402</value>
</data>
<data name="fileNameTextBox.Size" type="System.Drawing.Size, System.Drawing">
<value>388, 20</value>
@ -214,13 +295,13 @@
<value>tableLayoutPanel1</value>
</data>
<data name="&gt;&gt;fileNameTextBox.ZOrder" xml:space="preserve">
<value>2</value>
<value>4</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>512, 387</value>
<value>512, 402</value>
</data>
<data name="BrowseButton.Size" type="System.Drawing.Size, System.Drawing">
<value>70, 22</value>
@ -241,7 +322,7 @@
<value>tableLayoutPanel1</value>
</data>
<data name="&gt;&gt;BrowseButton.ZOrder" xml:space="preserve">
<value>3</value>
<value>5</value>
</data>
<data name="selectFromDiskRadioButton.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
<value>Bottom, Left</value>
@ -253,7 +334,7 @@
<value>NoControl</value>
</data>
<data name="selectFromDiskRadioButton.Location" type="System.Drawing.Point, System.Drawing">
<value>3, 364</value>
<value>3, 379</value>
</data>
<data name="selectFromDiskRadioButton.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
<value>3, 16, 3, 3</value>
@ -277,7 +358,7 @@
<value>tableLayoutPanel1</value>
</data>
<data name="&gt;&gt;selectFromDiskRadioButton.ZOrder" xml:space="preserve">
<value>4</value>
<value>6</value>
</data>
<data name="downloadUpdateRadioButton.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
<value>Left</value>
@ -289,7 +370,7 @@
<value>NoControl</value>
</data>
<data name="downloadUpdateRadioButton.Location" type="System.Drawing.Point, System.Drawing">
<value>3, 42</value>
<value>3, 110</value>
</data>
<data name="downloadUpdateRadioButton.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
<value>3, 16, 3, 3</value>
@ -298,7 +379,7 @@
<value>No</value>
</data>
<data name="downloadUpdateRadioButton.Size" type="System.Drawing.Size, System.Drawing">
<value>157, 17</value>
<value>354, 17</value>
</data>
<data name="downloadUpdateRadioButton.TabIndex" type="System.Int32, mscorlib">
<value>1</value>
@ -316,7 +397,7 @@
<value>tableLayoutPanel1</value>
</data>
<data name="&gt;&gt;downloadUpdateRadioButton.ZOrder" xml:space="preserve">
<value>5</value>
<value>7</value>
</data>
<data name="label3.AutoSize" type="System.Boolean, mscorlib">
<value>True</value>
@ -337,8 +418,7 @@
<value>9</value>
</data>
<data name="label3.Text" xml:space="preserve">
<value>Select an update that you wish to download from @BRANDING_COMPANY_NAME_SHORT@, or an update or supplemental pack that you have already downloaded to your local disk.
</value>
<value>Select Automatic mode or manually select an update to be downloaded from @BRANDING_COMPANY_NAME_SHORT@, or browse an update or supplemental pack file from your computer.</value>
</data>
<data name="&gt;&gt;label3.Name" xml:space="preserve">
<value>label3</value>
@ -350,10 +430,7 @@
<value>tableLayoutPanel1</value>
</data>
<data name="&gt;&gt;label3.ZOrder" xml:space="preserve">
<value>6</value>
</data>
<data name="dataGridViewPatches.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
<value>Top, Bottom, Left, Right</value>
<value>8</value>
</data>
<metadata name="ColumnUpdate.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
@ -400,8 +477,11 @@
<data name="webPageColumn.Width" type="System.Int32, mscorlib">
<value>110</value>
</data>
<data name="dataGridViewPatches.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
<value>Fill</value>
</data>
<data name="dataGridViewPatches.Location" type="System.Drawing.Point, System.Drawing">
<value>36, 65</value>
<value>36, 133</value>
</data>
<data name="dataGridViewPatches.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
<value>36, 3, 3, 3</value>
@ -410,7 +490,7 @@
<value>Vertical</value>
</data>
<data name="dataGridViewPatches.Size" type="System.Drawing.Size, System.Drawing">
<value>562, 234</value>
<value>562, 198</value>
</data>
<data name="dataGridViewPatches.TabIndex" type="System.Int32, mscorlib">
<value>2</value>
@ -425,7 +505,7 @@
<value>tableLayoutPanel1</value>
</data>
<data name="&gt;&gt;dataGridViewPatches.ZOrder" xml:space="preserve">
<value>7</value>
<value>9</value>
</data>
<data name="RefreshListButton.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
<value>Top, Bottom, Left</value>
@ -434,7 +514,7 @@
<value>NoControl</value>
</data>
<data name="RefreshListButton.Location" type="System.Drawing.Point, System.Drawing">
<value>36, 305</value>
<value>36, 337</value>
</data>
<data name="RefreshListButton.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
<value>36, 3, 3, 3</value>
@ -458,7 +538,7 @@
<value>tableLayoutPanel1</value>
</data>
<data name="&gt;&gt;RefreshListButton.ZOrder" xml:space="preserve">
<value>8</value>
<value>10</value>
</data>
<data name="tableLayoutPanel1.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
<value>Fill</value>
@ -467,7 +547,7 @@
<value>0, 0</value>
</data>
<data name="tableLayoutPanel1.RowCount" type="System.Int32, mscorlib">
<value>7</value>
<value>9</value>
</data>
<data name="tableLayoutPanel1.Size" type="System.Drawing.Size, System.Drawing">
<value>601, 427</value>
@ -488,7 +568,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="RestoreDismUpdatesButton" Row="3" RowSpan="1" Column="1" ColumnSpan="1" /&gt;&lt;Control Name="label2" Row="5" RowSpan="1" Column="0" ColumnSpan="1" /&gt;&lt;Control Name="fileNameTextBox" Row="5" RowSpan="1" Column="1" ColumnSpan="1" /&gt;&lt;Control Name="BrowseButton" Row="5" RowSpan="1" Column="2" ColumnSpan="1" /&gt;&lt;Control Name="selectFromDiskRadioButton" Row="4" RowSpan="1" Column="1" ColumnSpan="4" /&gt;&lt;Control Name="downloadUpdateRadioButton" Row="1" RowSpan="1" Column="0" ColumnSpan="3" /&gt;&lt;Control Name="label3" Row="0" RowSpan="1" Column="0" ColumnSpan="3" /&gt;&lt;Control Name="dataGridViewPatches" Row="2" RowSpan="1" Column="0" ColumnSpan="3" /&gt;&lt;Control Name="RefreshListButton" Row="3" RowSpan="1" Column="0" ColumnSpan="1" /&gt;&lt;/Controls&gt;&lt;Columns Styles="Absolute,115,Percent,100,Absolute,92" /&gt;&lt;Rows Styles="AutoSize,0,AutoSize,0,Percent,100,AutoSize,0,AutoSize,0,Absolute,53,Absolute,43" /&gt;&lt;/TableLayoutSettings&gt;</value>
<value>&lt;?xml version="1.0" encoding="utf-16"?&gt;&lt;TableLayoutSettings&gt;&lt;Controls&gt;&lt;Control Name="automaticOptionLabel" Row="3" RowSpan="1" Column="0" ColumnSpan="3" /&gt;&lt;Control Name="AutomaticRadioButton" Row="2" RowSpan="1" Column="0" ColumnSpan="3" /&gt;&lt;Control Name="RestoreDismUpdatesButton" Row="5" RowSpan="1" Column="1" ColumnSpan="1" /&gt;&lt;Control Name="label2" Row="7" RowSpan="1" Column="0" ColumnSpan="1" /&gt;&lt;Control Name="fileNameTextBox" Row="7" RowSpan="1" Column="1" ColumnSpan="1" /&gt;&lt;Control Name="BrowseButton" Row="7" RowSpan="1" Column="2" ColumnSpan="1" /&gt;&lt;Control Name="selectFromDiskRadioButton" Row="6" RowSpan="1" Column="1" ColumnSpan="4" /&gt;&lt;Control Name="downloadUpdateRadioButton" Row="4" RowSpan="1" Column="0" ColumnSpan="3" /&gt;&lt;Control Name="label3" Row="0" RowSpan="1" Column="0" ColumnSpan="3" /&gt;&lt;Control Name="dataGridViewPatches" Row="4" RowSpan="1" Column="0" ColumnSpan="3" /&gt;&lt;Control Name="RefreshListButton" Row="5" RowSpan="1" Column="0" ColumnSpan="1" /&gt;&lt;/Controls&gt;&lt;Columns Styles="Absolute,115,Percent,100,Absolute,92" /&gt;&lt;Rows Styles="AutoSize,0,AutoSize,0,AutoSize,0,AutoSize,0,AutoSize,0,Percent,100,AutoSize,0,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>