diff --git a/XenAdmin/TabPages/PvsPage.Designer.cs b/XenAdmin/TabPages/PvsPage.Designer.cs index 6624cb73d..216fc556f 100644 --- a/XenAdmin/TabPages/PvsPage.Designer.cs +++ b/XenAdmin/TabPages/PvsPage.Designer.cs @@ -38,16 +38,14 @@ this.ColumnPvsSite = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.ColumnStatus = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.label2 = new System.Windows.Forms.Label(); - this.panel1 = new System.Windows.Forms.Panel(); - this.ConfigureButton = new System.Windows.Forms.Button(); - this.panel2 = new System.Windows.Forms.Panel(); + this.tableLayoutPanel2 = new System.Windows.Forms.TableLayoutPanel(); this.enableButton = new XenAdmin.Commands.CommandButton(); this.disableButton = new XenAdmin.Commands.CommandButton(); + this.ConfigureButton = new System.Windows.Forms.Button(); this.pageContainerPanel.SuspendLayout(); this.tableLayoutPanel1.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.dataGridViewVms)).BeginInit(); - this.panel1.SuspendLayout(); - this.panel2.SuspendLayout(); + this.tableLayoutPanel2.SuspendLayout(); this.SuspendLayout(); // // pageContainerPanel @@ -60,8 +58,8 @@ resources.ApplyResources(this.tableLayoutPanel1, "tableLayoutPanel1"); this.tableLayoutPanel1.Controls.Add(this.dataGridViewVms, 0, 2); this.tableLayoutPanel1.Controls.Add(this.label2, 0, 1); - this.tableLayoutPanel1.Controls.Add(this.panel1, 0, 0); - this.tableLayoutPanel1.Controls.Add(this.panel2, 0, 3); + this.tableLayoutPanel1.Controls.Add(this.tableLayoutPanel2, 0, 3); + this.tableLayoutPanel1.Controls.Add(this.ConfigureButton, 0, 0); this.tableLayoutPanel1.Name = "tableLayoutPanel1"; // // dataGridViewVms @@ -118,25 +116,12 @@ resources.ApplyResources(this.label2, "label2"); this.label2.Name = "label2"; // - // panel1 + // tableLayoutPanel2 // - resources.ApplyResources(this.panel1, "panel1"); - this.panel1.Controls.Add(this.ConfigureButton); - this.panel1.Name = "panel1"; - // - // ConfigureButton - // - resources.ApplyResources(this.ConfigureButton, "ConfigureButton"); - this.ConfigureButton.Name = "ConfigureButton"; - this.ConfigureButton.UseVisualStyleBackColor = true; - this.ConfigureButton.Click += new System.EventHandler(this.ConfigureButton_Click); - // - // panel2 - // - resources.ApplyResources(this.panel2, "panel2"); - this.panel2.Controls.Add(this.enableButton); - this.panel2.Controls.Add(this.disableButton); - this.panel2.Name = "panel2"; + resources.ApplyResources(this.tableLayoutPanel2, "tableLayoutPanel2"); + this.tableLayoutPanel2.Controls.Add(this.enableButton, 0, 0); + this.tableLayoutPanel2.Controls.Add(this.disableButton, 1, 0); + this.tableLayoutPanel2.Name = "tableLayoutPanel2"; // // enableButton // @@ -150,6 +135,13 @@ this.disableButton.Name = "disableButton"; this.disableButton.UseVisualStyleBackColor = true; // + // ConfigureButton + // + resources.ApplyResources(this.ConfigureButton, "ConfigureButton"); + this.ConfigureButton.Name = "ConfigureButton"; + this.ConfigureButton.UseVisualStyleBackColor = true; + this.ConfigureButton.Click += new System.EventHandler(this.ConfigureButton_Click); + // // PvsPage // resources.ApplyResources(this, "$this"); @@ -159,8 +151,8 @@ this.tableLayoutPanel1.ResumeLayout(false); this.tableLayoutPanel1.PerformLayout(); ((System.ComponentModel.ISupportInitialize)(this.dataGridViewVms)).EndInit(); - this.panel1.ResumeLayout(false); - this.panel2.ResumeLayout(false); + this.tableLayoutPanel2.ResumeLayout(false); + this.tableLayoutPanel2.PerformLayout(); this.ResumeLayout(false); this.PerformLayout(); @@ -172,13 +164,12 @@ private System.Windows.Forms.Label label2; private Controls.DataGridViewEx.DataGridViewEx dataGridViewVms; private XenAdmin.Commands.CommandButton disableButton; - private System.Windows.Forms.Panel panel1; - private System.Windows.Forms.Panel panel2; private XenAdmin.Commands.CommandButton enableButton; public System.Windows.Forms.Button ConfigureButton; private System.Windows.Forms.DataGridViewTextBoxColumn columnVM; private System.Windows.Forms.DataGridViewTextBoxColumn ColumnCachingEnabled; private System.Windows.Forms.DataGridViewTextBoxColumn ColumnPvsSite; private System.Windows.Forms.DataGridViewTextBoxColumn ColumnStatus; + private System.Windows.Forms.TableLayoutPanel tableLayoutPanel2; } } diff --git a/XenAdmin/TabPages/PvsPage.resx b/XenAdmin/TabPages/PvsPage.resx index 48503cc64..17a2fdabc 100644 --- a/XenAdmin/TabPages/PvsPage.resx +++ b/XenAdmin/TabPages/PvsPage.resx @@ -169,19 +169,16 @@ Segoe UI, 9pt - 0, 62 - - - 0, 0, 1, 5 + 3, 62 900, 500 - 854, 279 + 849, 287 - 10 + 2 dataGridViewVms @@ -202,19 +199,16 @@ Segoe UI, 11.25pt - 0, 39 + 3, 39 - 0, 10, 0, 0 - - - 0, 0, 0, 3 + 3, 10, 3, 0 - 118, 23 + 118, 20 - 9 + 1 Virtual Machines @@ -231,80 +225,29 @@ 1 - + True - - NoControl + + GrowAndShrink - - 0, 3 - - - 5, 0, 5, 0 - - - 178, 23 - - - 6 - - - &Configure PVS-Accelerator... - - - ConfigureButton - - - System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - panel1 - - - 0 - - - 0, 0 - - - 0, 0, 0, 0 - - - 181, 29 - - - 13 - - - panel1 - - - System.Windows.Forms.Panel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tableLayoutPanel1 - - + 2 - + True NoControl - 0, 3 - - - 5, 0, 5, 0 + 3, 3 170, 23 - 15 + 0 Enable PVS-Accelerator... @@ -316,25 +259,25 @@ XenAdmin.Commands.CommandButton, XenCenterMain, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null - panel2 + tableLayoutPanel2 0 + + True + NoControl - 176, 3 - - - 5, 0, 5, 0 + 179, 3 170, 23 - 11 + 1 &Disable PVS-Accelerator @@ -346,33 +289,72 @@ XenAdmin.Commands.CommandButton, XenCenterMain, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null - panel2 + tableLayoutPanel2 1 - - 0, 349 + + Fill - - 0, 3, 0, 3 + + 0, 352 - - 349, 29 + + 0, 0, 0, 0 - - 14 + + 1 - - panel2 + + 855, 29 - - System.Windows.Forms.Panel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + 3 - + + tableLayoutPanel2 + + + System.Windows.Forms.TableLayoutPanel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + tableLayoutPanel1 - + + 2 + + + <?xml version="1.0" encoding="utf-16"?><TableLayoutSettings><Controls><Control Name="enableButton" Row="0" RowSpan="1" Column="0" ColumnSpan="1" /><Control Name="disableButton" Row="0" RowSpan="1" Column="1" ColumnSpan="1" /></Controls><Columns Styles="AutoSize,0,Percent,100" /><Rows Styles="AutoSize,0" /></TableLayoutSettings> + + + True + + + NoControl + + + 3, 3 + + + 180, 23 + + + 0 + + + &Configure PVS-Accelerator... + + + ConfigureButton + + + System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tableLayoutPanel1 + + 3 @@ -406,7 +388,7 @@ 0 - <?xml version="1.0" encoding="utf-16"?><TableLayoutSettings><Controls><Control Name="dataGridViewVms" Row="2" RowSpan="1" Column="0" ColumnSpan="1" /><Control Name="label2" Row="1" RowSpan="1" Column="0" ColumnSpan="1" /><Control Name="panel1" Row="0" RowSpan="1" Column="0" ColumnSpan="1" /><Control Name="panel2" Row="3" RowSpan="1" Column="0" ColumnSpan="1" /></Controls><Columns Styles="Percent,100" /><Rows Styles="AutoSize,20,AutoSize,0,Percent,100,AutoSize,0" /></TableLayoutSettings> + <?xml version="1.0" encoding="utf-16"?><TableLayoutSettings><Controls><Control Name="dataGridViewVms" Row="2" RowSpan="1" Column="0" ColumnSpan="1" /><Control Name="label2" Row="1" RowSpan="1" Column="0" ColumnSpan="1" /><Control Name="tableLayoutPanel2" Row="3" RowSpan="1" Column="0" ColumnSpan="1" /><Control Name="ConfigureButton" Row="0" RowSpan="1" Column="0" ColumnSpan="1" /></Controls><Columns Styles="Percent,100,Absolute,20" /><Rows Styles="AutoSize,20,AutoSize,0,Percent,100,AutoSize,0" /></TableLayoutSettings> 0, 78