From 722527f84e1b40736034857f5723b6f588bed288 Mon Sep 17 00:00:00 2001 From: Callum McIntyre Date: Tue, 1 Nov 2016 15:17:43 +0000 Subject: [PATCH 1/2] [CA-227602] Truncation on the Install Mode page in the Install Upgrade wizard I've looked at how this was implemented in Dundee, and there we used an absolute height on the row containing the manual checkbox. I've done the same here, changing row 3 from autosize to absoliute 47px. I've also removed the empty row that was between the two radio buttons. This is a Winforms problem, without workarounds an autosize radio button in an autosize container (say the table row) will report its height as one row of text, no matter whether it needs more. This seems to be the only place we use a long radio label (as opposed to a separate label underneath the radio), so I doubt it's worth doing anything more complex than this. I've tested it with the CN string used in the ticket, and it uses less space than the English translation. The string also hasn't changed from Dundee. Signed-off-by: Callum McIntyre --- .../PatchingWizard_ModePage.Designer.cs | 10 ++--- .../PatchingWizard_ModePage.resx | 38 +++++++++---------- 2 files changed, 24 insertions(+), 24 deletions(-) diff --git a/XenAdmin/Wizards/PatchingWizard/PatchingWizard_ModePage.Designer.cs b/XenAdmin/Wizards/PatchingWizard/PatchingWizard_ModePage.Designer.cs index cf0e921cf..878775719 100644 --- a/XenAdmin/Wizards/PatchingWizard/PatchingWizard_ModePage.Designer.cs +++ b/XenAdmin/Wizards/PatchingWizard/PatchingWizard_ModePage.Designer.cs @@ -75,11 +75,11 @@ namespace XenAdmin.Wizards.PatchingWizard // resources.ApplyResources(this.tableLayoutPanel1, "tableLayoutPanel1"); this.tableLayoutPanel1.Controls.Add(this.autoHeightLabel1, 0, 0); - this.tableLayoutPanel1.Controls.Add(this.ManualRadioButton, 0, 3); - this.tableLayoutPanel1.Controls.Add(this.label2, 0, 4); - this.tableLayoutPanel1.Controls.Add(this.button1, 0, 6); - this.tableLayoutPanel1.Controls.Add(this.removeUpdateFileCheckBox, 0, 7); - this.tableLayoutPanel1.Controls.Add(this.textBoxLog, 0, 5); + this.tableLayoutPanel1.Controls.Add(this.ManualRadioButton, 0, 2); + this.tableLayoutPanel1.Controls.Add(this.label2, 0, 3); + this.tableLayoutPanel1.Controls.Add(this.button1, 0, 5); + this.tableLayoutPanel1.Controls.Add(this.removeUpdateFileCheckBox, 0, 6); + this.tableLayoutPanel1.Controls.Add(this.textBoxLog, 0, 4); this.tableLayoutPanel1.Controls.Add(this.allowRadioButtonContainer, 0, 1); this.tableLayoutPanel1.Name = "tableLayoutPanel1"; // diff --git a/XenAdmin/Wizards/PatchingWizard/PatchingWizard_ModePage.resx b/XenAdmin/Wizards/PatchingWizard/PatchingWizard_ModePage.resx index c6ce0baeb..d3086b7e9 100644 --- a/XenAdmin/Wizards/PatchingWizard/PatchingWizard_ModePage.resx +++ b/XenAdmin/Wizards/PatchingWizard/PatchingWizard_ModePage.resx @@ -130,13 +130,13 @@ Fill - 15, 159 + 15, 99 15, 3, 3, 3 - 1394, 36 + 688, 41 3 @@ -163,13 +163,13 @@ True - 3, 208 + 3, 153 3, 10, 3, 0 - 304, 32 + 155, 17 4 @@ -193,13 +193,13 @@ Top, Bottom, Left, Right - 3, 243 + 3, 173 True - 1406, 844 + 700, 321 5 @@ -223,13 +223,13 @@ True - 3, 1093 + 3, 500 3, 3, 3, 10 - 122, 23 + 137, 27 6 @@ -265,7 +265,7 @@ 3, 3, 3, 15 - 1406, 96 + 700, 51 0 @@ -289,10 +289,10 @@ True - 3, 1129 + 3, 540 - 730, 36 + 365, 21 7 @@ -331,7 +331,7 @@ 15, 3, 3, 3 - 1394, 36 + 688, 21 2 @@ -355,13 +355,13 @@ Fill - 15, 117 + 15, 72 15, 3, 3, 3 - 1394, 36 + 688, 21 8 @@ -391,7 +391,7 @@ 8 - 1412, 1168 + 706, 584 0 @@ -409,7 +409,7 @@ 0 - <?xml version="1.0" encoding="utf-16"?><TableLayoutSettings><Controls><Control Name="autoHeightLabel1" Row="0" RowSpan="1" Column="0" ColumnSpan="1" /><Control Name="ManualRadioButton" Row="3" RowSpan="1" Column="0" ColumnSpan="1" /><Control Name="label2" Row="4" RowSpan="1" Column="0" ColumnSpan="1" /><Control Name="button1" Row="6" RowSpan="1" Column="0" ColumnSpan="1" /><Control Name="removeUpdateFileCheckBox" Row="7" RowSpan="1" Column="0" ColumnSpan="1" /><Control Name="textBoxLog" Row="5" RowSpan="1" Column="0" ColumnSpan="1" /><Control Name="allowRadioButtonContainer" Row="1" RowSpan="1" Column="0" ColumnSpan="1" /></Controls><Columns Styles="Percent,100" /><Rows Styles="AutoSize,0,AutoSize,0,AutoSize,0,AutoSize,0,AutoSize,0,Percent,100,AutoSize,0,AutoSize,0" /></TableLayoutSettings> + <?xml version="1.0" encoding="utf-16"?><TableLayoutSettings><Controls><Control Name="autoHeightLabel1" Row="0" RowSpan="1" Column="0" ColumnSpan="1" /><Control Name="ManualRadioButton" Row="2" RowSpan="1" Column="0" ColumnSpan="1" /><Control Name="label2" Row="3" RowSpan="1" Column="0" ColumnSpan="1" /><Control Name="button1" Row="5" RowSpan="1" Column="0" ColumnSpan="1" /><Control Name="removeUpdateFileCheckBox" Row="6" RowSpan="1" Column="0" ColumnSpan="1" /><Control Name="textBoxLog" Row="4" RowSpan="1" Column="0" ColumnSpan="1" /><Control Name="allowRadioButtonContainer" Row="1" RowSpan="1" Column="0" ColumnSpan="1" /></Controls><Columns Styles="Percent,100" /><Rows Styles="AutoSize,0,AutoSize,0,Absolute,47,AutoSize,0,Percent,100,AutoSize,0,AutoSize,0,Absolute,20" /></TableLayoutSettings> True @@ -418,16 +418,16 @@ - 240, 240 + 120, 120 True - 8, 8, 8, 8 + 4, 4, 4, 4 - 1412, 1168 + 706, 584 PatchingWizard_ModePage From 07f866e3a0530ff66dc6006e753f669977d1726a Mon Sep 17 00:00:00 2001 From: Callum McIntyre Date: Tue, 1 Nov 2016 16:32:45 +0000 Subject: [PATCH 2/2] [CA-227602] Remove the unused bottom row from the table This fixes the extra padding, we don't need that bottom row at all Signed-off-by: Callum McIntyre --- .../Wizards/PatchingWizard/PatchingWizard_ModePage.resx | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/XenAdmin/Wizards/PatchingWizard/PatchingWizard_ModePage.resx b/XenAdmin/Wizards/PatchingWizard/PatchingWizard_ModePage.resx index d3086b7e9..2aa1b6e53 100644 --- a/XenAdmin/Wizards/PatchingWizard/PatchingWizard_ModePage.resx +++ b/XenAdmin/Wizards/PatchingWizard/PatchingWizard_ModePage.resx @@ -199,7 +199,7 @@ True - 700, 321 + 700, 341 5 @@ -223,7 +223,7 @@ True - 3, 500 + 3, 520 3, 3, 3, 10 @@ -289,7 +289,7 @@ True - 3, 540 + 3, 560 365, 21 @@ -388,7 +388,7 @@ 1, 1 - 8 + 7 706, 584