From 55f311df9ce818e92c7758d3240c02c13309daa7 Mon Sep 17 00:00:00 2001 From: Carmen Agimof Date: Mon, 7 Sep 2015 15:25:08 +0100 Subject: [PATCH] CA-181444: Adds more spacing and indentation on the Select Update Page in the Updates Wizard. --- ...PatchingWizard_SelectPatchPage.Designer.cs | 22 +- .../PatchingWizard_SelectPatchPage.resx | 194 +++++++++--------- 2 files changed, 111 insertions(+), 105 deletions(-) diff --git a/XenAdmin/Wizards/PatchingWizard/PatchingWizard_SelectPatchPage.Designer.cs b/XenAdmin/Wizards/PatchingWizard/PatchingWizard_SelectPatchPage.Designer.cs index ac36a9945..925adeffe 100644 --- a/XenAdmin/Wizards/PatchingWizard/PatchingWizard_SelectPatchPage.Designer.cs +++ b/XenAdmin/Wizards/PatchingWizard/PatchingWizard_SelectPatchPage.Designer.cs @@ -42,7 +42,6 @@ namespace XenAdmin.Wizards.PatchingWizard this.fileNameTextBox = new System.Windows.Forms.TextBox(); this.BrowseButton = new System.Windows.Forms.Button(); this.selectFromDiskRadioButton = new System.Windows.Forms.RadioButton(); - this.RefreshListButton = new System.Windows.Forms.Button(); this.downloadUpdateRadioButton = new System.Windows.Forms.RadioButton(); this.label3 = new System.Windows.Forms.Label(); this.dataGridViewPatches = new XenAdmin.Controls.DataGridViewEx.DataGridViewEx(); @@ -50,6 +49,7 @@ namespace XenAdmin.Wizards.PatchingWizard this.ColumnDescription = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.ColumnDate = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.webPageColumn = new System.Windows.Forms.DataGridViewLinkColumn(); + this.RefreshListButton = new System.Windows.Forms.Button(); this.tableLayoutPanel1.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.dataGridViewPatches)).BeginInit(); this.SuspendLayout(); @@ -62,10 +62,10 @@ namespace XenAdmin.Wizards.PatchingWizard 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.dataGridViewPatches, 0, 2); - this.tableLayoutPanel1.Controls.Add(this.RefreshListButton, 0, 3); this.tableLayoutPanel1.Controls.Add(this.downloadUpdateRadioButton, 0, 1); 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.Name = "tableLayoutPanel1"; // // RestoreDismUpdatesButton @@ -101,14 +101,7 @@ namespace XenAdmin.Wizards.PatchingWizard this.selectFromDiskRadioButton.Name = "selectFromDiskRadioButton"; this.selectFromDiskRadioButton.UseVisualStyleBackColor = true; this.selectFromDiskRadioButton.CheckedChanged += new System.EventHandler(this.selectFromDiskRadioButton_CheckedChanged); - // - // RefreshListButton - // - resources.ApplyResources(this.RefreshListButton, "RefreshListButton"); - this.RefreshListButton.Name = "RefreshListButton"; - this.RefreshListButton.UseVisualStyleBackColor = true; - this.RefreshListButton.Click += new System.EventHandler(this.RefreshListButton_Click); - // + // // downloadUpdateRadioButton // resources.ApplyResources(this.downloadUpdateRadioButton, "downloadUpdateRadioButton"); @@ -200,6 +193,13 @@ namespace XenAdmin.Wizards.PatchingWizard this.webPageColumn.ReadOnly = true; this.webPageColumn.Resizable = System.Windows.Forms.DataGridViewTriState.True; // + // RefreshListButton + // + resources.ApplyResources(this.RefreshListButton, "RefreshListButton"); + this.RefreshListButton.Name = "RefreshListButton"; + this.RefreshListButton.UseVisualStyleBackColor = true; + this.RefreshListButton.Click += new System.EventHandler(this.RefreshListButton_Click); + // // PatchingWizard_SelectPatchPage // resources.ApplyResources(this, "$this"); diff --git a/XenAdmin/Wizards/PatchingWizard/PatchingWizard_SelectPatchPage.resx b/XenAdmin/Wizards/PatchingWizard/PatchingWizard_SelectPatchPage.resx index 8294f1af5..808df9202 100644 --- a/XenAdmin/Wizards/PatchingWizard/PatchingWizard_SelectPatchPage.resx +++ b/XenAdmin/Wizards/PatchingWizard/PatchingWizard_SelectPatchPage.resx @@ -130,7 +130,7 @@ - 85, 318 + 118, 305 178, 23 @@ -153,23 +153,23 @@ 0 + + Top, Left, Right + True - - Fill - NoControl - 10, 380 + 36, 389 - 10, 0, 3, 0 + 36, 5, 3, 0 - 69, 28 + 76, 13 6 @@ -196,10 +196,10 @@ Top, Left, Right - 85, 383 + 118, 387 - 415, 20 + 388, 20 7 @@ -216,14 +216,11 @@ 2 - - Bottom, Left - NoControl - 506, 383 + 512, 387 70, 22 @@ -246,6 +243,9 @@ 3 + + Bottom, Left + True @@ -253,7 +253,7 @@ NoControl - 3, 360 + 3, 364 3, 16, 3, 3 @@ -279,6 +279,79 @@ 4 + + Left + + + True + + + NoControl + + + 3, 42 + + + 3, 16, 3, 3 + + + No + + + 157, 17 + + + 1 + + + Download update from &Citrix + + + downloadUpdateRadioButton + + + System.Windows.Forms.RadioButton, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tableLayoutPanel1 + + + 5 + + + True + + + Fill + + + NoControl + + + 3, 0 + + + 595, 26 + + + 9 + + + 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. + + + + label3 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tableLayoutPanel1 + + + 6 + Top, Bottom, Left, Right @@ -328,13 +401,16 @@ 110 - 3, 65 + 36, 65 + + + 36, 3, 3, 3 Vertical - 589, 247 + 562, 234 2 @@ -349,7 +425,7 @@ tableLayoutPanel1 - 5 + 7 Top, Bottom, Left @@ -358,7 +434,10 @@ NoControl - 3, 318 + 36, 305 + + + 36, 3, 3, 3 71, 23 @@ -379,79 +458,6 @@ tableLayoutPanel1 - 6 - - - Left - - - True - - - NoControl - - - 3, 42 - - - 3, 16, 3, 3 - - - No - - - 157, 17 - - - 1 - - - Download update from &Citrix - - - downloadUpdateRadioButton - - - System.Windows.Forms.RadioButton, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tableLayoutPanel1 - - - 7 - - - True - - - Fill - - - NoControl - - - 3, 0 - - - 589, 26 - - - 9 - - - 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. - - - - label3 - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tableLayoutPanel1 - - 8 @@ -464,7 +470,7 @@ 7 - 595, 408 + 601, 427 6 @@ -482,7 +488,7 @@ 0 - <?xml version="1.0" encoding="utf-16"?><TableLayoutSettings><Controls><Control Name="RestoreDismUpdatesButton" Row="3" RowSpan="1" Column="1" ColumnSpan="1" /><Control Name="label2" Row="5" RowSpan="1" Column="0" ColumnSpan="1" /><Control Name="fileNameTextBox" Row="5" RowSpan="1" Column="1" ColumnSpan="1" /><Control Name="BrowseButton" Row="5" RowSpan="1" Column="2" ColumnSpan="1" /><Control Name="selectFromDiskRadioButton" Row="4" RowSpan="1" Column="1" ColumnSpan="4" /><Control Name="dataGridViewPatches" Row="2" RowSpan="1" Column="0" ColumnSpan="3" /><Control Name="RefreshListButton" Row="3" RowSpan="1" Column="0" ColumnSpan="1" /><Control Name="downloadUpdateRadioButton" Row="1" RowSpan="1" Column="0" ColumnSpan="3" /><Control Name="label3" Row="0" RowSpan="1" Column="0" ColumnSpan="3" /></Controls><Columns Styles="Absolute,82,Percent,100,Absolute,92" /><Rows Styles="AutoSize,0,AutoSize,0,Percent,100,AutoSize,0,AutoSize,0,AutoSize,0,AutoSize,0" /></TableLayoutSettings> + <?xml version="1.0" encoding="utf-16"?><TableLayoutSettings><Controls><Control Name="RestoreDismUpdatesButton" Row="3" RowSpan="1" Column="1" ColumnSpan="1" /><Control Name="label2" Row="5" RowSpan="1" Column="0" ColumnSpan="1" /><Control Name="fileNameTextBox" Row="5" RowSpan="1" Column="1" ColumnSpan="1" /><Control Name="BrowseButton" Row="5" RowSpan="1" Column="2" ColumnSpan="1" /><Control Name="selectFromDiskRadioButton" Row="4" RowSpan="1" Column="1" ColumnSpan="4" /><Control Name="downloadUpdateRadioButton" Row="1" RowSpan="1" Column="0" ColumnSpan="3" /><Control Name="label3" Row="0" RowSpan="1" Column="0" ColumnSpan="3" /><Control Name="dataGridViewPatches" Row="2" RowSpan="1" Column="0" ColumnSpan="3" /><Control Name="RefreshListButton" Row="3" RowSpan="1" Column="0" ColumnSpan="1" /></Controls><Columns Styles="Absolute,115,Percent,100,Absolute,92" /><Rows Styles="AutoSize,0,AutoSize,0,Percent,100,AutoSize,0,AutoSize,0,Absolute,53,Absolute,43" /></TableLayoutSettings> True @@ -491,7 +497,7 @@ 96, 96 - 595, 408 + 601, 427 ColumnUpdate