diff --git a/XenAdmin/Dialogs/Wlb/WlbConfigurationDialog.Designer.cs b/XenAdmin/Dialogs/Wlb/WlbConfigurationDialog.Designer.cs index 20e2679dd..0cda58f34 100644 --- a/XenAdmin/Dialogs/Wlb/WlbConfigurationDialog.Designer.cs +++ b/XenAdmin/Dialogs/Wlb/WlbConfigurationDialog.Designer.cs @@ -124,14 +124,12 @@ namespace XenAdmin.Dialogs.Wlb // this.wlbAdvancedSettingsPage.BackColor = System.Drawing.Color.Transparent; resources.ApplyResources(this.wlbAdvancedSettingsPage, "wlbAdvancedSettingsPage"); - this.wlbAdvancedSettingsPage.MinimumSize = new System.Drawing.Size(560, 560); this.wlbAdvancedSettingsPage.Name = "wlbAdvancedSettingsPage"; // // WlbConfigurationDialog // resources.ApplyResources(this, "$this"); this.Name = "WlbConfigurationDialog"; - this.SizeChanged += new System.EventHandler(this.WlbConfigurationDialog_SizeChanged); this.Controls.SetChildIndex(this.cancelButton, 0); this.Controls.SetChildIndex(this.okButton, 0); this.Controls.SetChildIndex(this.splitContainer, 0); diff --git a/XenAdmin/Dialogs/Wlb/WlbConfigurationDialog.cs b/XenAdmin/Dialogs/Wlb/WlbConfigurationDialog.cs index dd692ae7a..c0dc69e9e 100644 --- a/XenAdmin/Dialogs/Wlb/WlbConfigurationDialog.cs +++ b/XenAdmin/Dialogs/Wlb/WlbConfigurationDialog.cs @@ -218,16 +218,5 @@ namespace XenAdmin.Dialogs.Wlb } } } - - private void WlbConfigurationDialog_SizeChanged(object sender, EventArgs e) - { - // When the size of configuration dialog is changed, - // the SplitContainer panels should expand and contract correspondingly. - // Originally the dialog height is 750, SplitContainer height is 674, - // the difference is 76. - // The SplitContainer height must track the change of the dialog height. - splitContainer.Height = this.Height - 76; - } - } } diff --git a/XenAdmin/Dialogs/Wlb/WlbConfigurationDialog.resx b/XenAdmin/Dialogs/Wlb/WlbConfigurationDialog.resx index 4e05816fc..6d7c34190 100644 --- a/XenAdmin/Dialogs/Wlb/WlbConfigurationDialog.resx +++ b/XenAdmin/Dialogs/Wlb/WlbConfigurationDialog.resx @@ -112,23 +112,19 @@ 2.0 - System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - + Top, Left - - - True - Fill - + Segoe UI, 9pt @@ -136,8 +132,9 @@ 10, 49 - 552, 613 + 556, 599 + 1 @@ -163,7 +160,7 @@ 10, 49 - 552, 613 + 556, 599 2 @@ -190,7 +187,7 @@ 10, 49 - 552, 613 + 556, 599 2 @@ -217,7 +214,7 @@ 10, 49 - 552, 613 + 556, 599 0 @@ -244,7 +241,7 @@ 10, 49 - 552, 613 + 556, 599 3 @@ -271,7 +268,7 @@ 10, 49 - 560, 613 + 560, 599 0 @@ -298,13 +295,13 @@ 10, 49, 10, 10 - 572, 672 + 576, 658 ContentPanel - System.Windows.Forms.Panel, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + System.Windows.Forms.Panel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 blueBorder @@ -312,11 +309,8 @@ 1 - - 20, 0 - - 216, 674 + 229, 660 verticalTabs @@ -330,62 +324,44 @@ 0 - - Bottom, Right - - 738, 682 + 738, 681 cancelButton - System.Windows.Forms.Button, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 $this - 3 - - - Bottom, Right + 2 - 647, 682 + 647, 681 okButton - System.Windows.Forms.Button, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 $this - 2 - - - Top, Left - - - Top - - - 0, 43 + 1 10, 3, 10, 3 - - 20, 0, 0, 0 - splitContainer.Panel1 - System.Windows.Forms.SplitterPanel, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + System.Windows.Forms.SplitterPanel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 splitContainer @@ -393,14 +369,11 @@ 0 - - 0, 0, 20, 0 - splitContainer.Panel2 - System.Windows.Forms.SplitterPanel, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + System.Windows.Forms.SplitterPanel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 splitContainer @@ -412,16 +385,16 @@ 400 - 834, 674 + 811, 660 - 236 + 229 splitContainer - System.Windows.Forms.SplitContainer, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + System.Windows.Forms.SplitContainer, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 $this @@ -430,7 +403,7 @@ 0 - 574, 674 + 578, 660 blueBorder @@ -444,98 +417,14 @@ 0 - - True - - - GrowAndShrink - - - 3 - - - True - - - True - - - GrowAndShrink - - - Fill - - - Segoe UI, 9pt - - - 131, 8 - - - 570, 27 - - - 0 - - - False - - - deprecationBanner - - - XenAdmin.Controls.DeprecationBanner, XenCenterMain, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null - - - tableLayoutPanel1 - - - 0 - - - Top - - - Segoe UI, 9pt - - - 0, 0 - - - 5, 5, 5, 5 - - - 1 - - - 834, 43 - - - 7 - - - tableLayoutPanel1 - - - System.Windows.Forms.TableLayoutPanel, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - $this - - - 1 - - - <?xml version="1.0" encoding="utf-16"?><TableLayoutSettings><Controls><Control Name="deprecationBanner" Row="0" RowSpan="1" Column="1" ColumnSpan="1" /></Controls><Columns Styles="Percent,15,Percent,70,Percent,15" /><Rows Styles="Percent,100" /></TableLayoutSettings> - - + True 96, 96 - 834, 712 + 834, 711 Tahoma, 8pt diff --git a/XenAdmin/SettingsPanels/Wlb/WlbAdvancedSettingsPage.Designer.cs b/XenAdmin/SettingsPanels/Wlb/WlbAdvancedSettingsPage.Designer.cs index 3c6bc2863..238e007ec 100644 --- a/XenAdmin/SettingsPanels/Wlb/WlbAdvancedSettingsPage.Designer.cs +++ b/XenAdmin/SettingsPanels/Wlb/WlbAdvancedSettingsPage.Designer.cs @@ -460,7 +460,6 @@ namespace XenAdmin.SettingsPanels this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Dpi; this.BackColor = System.Drawing.SystemColors.Window; this.Controls.Add(this.tableLayoutPanel1); - this.MinimumSize = new System.Drawing.Size(560, 560); this.Name = "WlbAdvancedSettingsPage"; this.tableLayoutPanel1.ResumeLayout(false); this.tableLayoutPanel1.PerformLayout();