diff --git a/XenAdmin/SettingsPanels/ClusteringEditPage.Designer.cs b/XenAdmin/SettingsPanels/ClusteringEditPage.Designer.cs
index 4fad1bb78..5b7020218 100644
--- a/XenAdmin/SettingsPanels/ClusteringEditPage.Designer.cs
+++ b/XenAdmin/SettingsPanels/ClusteringEditPage.Designer.cs
@@ -33,13 +33,13 @@
this.labelTitle = new XenAdmin.Controls.Common.AutoHeightLabel();
this.CheckBoxEnableClustering = new System.Windows.Forms.CheckBox();
this.labelNetwork = new System.Windows.Forms.Label();
- this.flowLayoutInfo = new System.Windows.Forms.FlowLayoutPanel();
this.pictureBoxInfo = new System.Windows.Forms.PictureBox();
this.labelWarning = new System.Windows.Forms.Label();
this.comboBoxNetwork = new XenAdmin.Controls.NetworkComboBox();
+ this.tableLayoutInfo = new System.Windows.Forms.TableLayoutPanel();
this.tableLayoutPanel1.SuspendLayout();
- this.flowLayoutInfo.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.pictureBoxInfo)).BeginInit();
+ this.tableLayoutInfo.SuspendLayout();
this.SuspendLayout();
//
// tableLayoutPanel1
@@ -48,8 +48,8 @@
this.tableLayoutPanel1.Controls.Add(this.labelTitle, 0, 0);
this.tableLayoutPanel1.Controls.Add(this.CheckBoxEnableClustering, 0, 1);
this.tableLayoutPanel1.Controls.Add(this.labelNetwork, 0, 2);
- this.tableLayoutPanel1.Controls.Add(this.flowLayoutInfo, 0, 3);
this.tableLayoutPanel1.Controls.Add(this.comboBoxNetwork, 1, 2);
+ this.tableLayoutPanel1.Controls.Add(this.tableLayoutInfo, 0, 3);
this.tableLayoutPanel1.Name = "tableLayoutPanel1";
//
// labelTitle
@@ -70,14 +70,6 @@
resources.ApplyResources(this.labelNetwork, "labelNetwork");
this.labelNetwork.Name = "labelNetwork";
//
- // flowLayoutInfo
- //
- resources.ApplyResources(this.flowLayoutInfo, "flowLayoutInfo");
- this.tableLayoutPanel1.SetColumnSpan(this.flowLayoutInfo, 2);
- this.flowLayoutInfo.Controls.Add(this.pictureBoxInfo);
- this.flowLayoutInfo.Controls.Add(this.labelWarning);
- this.flowLayoutInfo.Name = "flowLayoutInfo";
- //
// pictureBoxInfo
//
this.pictureBoxInfo.Image = global::XenAdmin.Properties.Resources._000_Info3_h32bit_16;
@@ -100,6 +92,14 @@
resources.ApplyResources(this.comboBoxNetwork, "comboBoxNetwork");
this.comboBoxNetwork.Name = "comboBoxNetwork";
//
+ // tableLayoutInfo
+ //
+ resources.ApplyResources(this.tableLayoutInfo, "tableLayoutInfo");
+ this.tableLayoutPanel1.SetColumnSpan(this.tableLayoutInfo, 2);
+ this.tableLayoutInfo.Controls.Add(this.pictureBoxInfo, 0, 0);
+ this.tableLayoutInfo.Controls.Add(this.labelWarning, 1, 0);
+ this.tableLayoutInfo.Name = "tableLayoutInfo";
+ //
// ClusteringEditPage
//
resources.ApplyResources(this, "$this");
@@ -108,9 +108,9 @@
this.Name = "ClusteringEditPage";
this.tableLayoutPanel1.ResumeLayout(false);
this.tableLayoutPanel1.PerformLayout();
- this.flowLayoutInfo.ResumeLayout(false);
- this.flowLayoutInfo.PerformLayout();
((System.ComponentModel.ISupportInitialize)(this.pictureBoxInfo)).EndInit();
+ this.tableLayoutInfo.ResumeLayout(false);
+ this.tableLayoutInfo.PerformLayout();
this.ResumeLayout(false);
}
@@ -123,8 +123,8 @@
private System.Windows.Forms.Label labelNetwork;
private System.Windows.Forms.PictureBox pictureBoxInfo;
private System.Windows.Forms.Label labelWarning;
- private System.Windows.Forms.FlowLayoutPanel flowLayoutInfo;
private Controls.NetworkComboBox comboBoxNetwork;
+ private System.Windows.Forms.TableLayoutPanel tableLayoutInfo;
}
}
diff --git a/XenAdmin/SettingsPanels/ClusteringEditPage.cs b/XenAdmin/SettingsPanels/ClusteringEditPage.cs
index f47ec662b..e5536ffd7 100644
--- a/XenAdmin/SettingsPanels/ClusteringEditPage.cs
+++ b/XenAdmin/SettingsPanels/ClusteringEditPage.cs
@@ -82,7 +82,7 @@ namespace XenAdmin.SettingsPanels
{
pool = Helpers.GetPoolOfOne(clone.Connection);
var master = Helpers.GetMaster(clone.Connection);
- flowLayoutInfo.Visible = false;
+ tableLayoutInfo.Visible = false;
clusteringEnabled = pool.Connection.Cache.Cluster_hosts.Any(cluster => cluster.host.opaque_ref == master.opaque_ref && cluster.enabled);
var existingCluster = pool.Connection.Cache.Clusters.FirstOrDefault();
@@ -156,7 +156,7 @@ namespace XenAdmin.SettingsPanels
private void DisableControls(string message)
{
comboBoxNetwork.Enabled = labelNetwork.Enabled = CheckBoxEnableClustering.Enabled = false;
- flowLayoutInfo.Visible = true;
+ tableLayoutInfo.Visible = true;
labelWarning.Text = message;
}
diff --git a/XenAdmin/SettingsPanels/ClusteringEditPage.resx b/XenAdmin/SettingsPanels/ClusteringEditPage.resx
index 39d7e4356..2bb52d9fd 100644
--- a/XenAdmin/SettingsPanels/ClusteringEditPage.resx
+++ b/XenAdmin/SettingsPanels/ClusteringEditPage.resx
@@ -192,6 +192,9 @@
1
+
+ Left
+
True
@@ -199,10 +202,10 @@
NoControl
- 22, 87
+ 22, 89
- 22, 5, 3, 0
+ 22, 0, 3, 0
50, 13
@@ -225,9 +228,33 @@
2
-
+
+ 78, 85
+
+
+ 223, 21
+
+
+ 3
+
+
+ comboBoxNetwork
+
+
+ XenAdmin.Controls.NetworkComboBox, XenCenterMain, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null
+
+
+ tableLayoutPanel1
+
+
+ 3
+
+
True
+
+ 2
+
NoControl
@@ -253,7 +280,7 @@
System.Windows.Forms.PictureBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
- flowLayoutInfo
+ tableLayoutInfo
0
@@ -283,56 +310,38 @@
System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
- flowLayoutInfo
+ tableLayoutInfo
1
-
- 3, 119
+
+ 3, 112
-
- 3, 10, 3, 3
+
+ 1
-
+
25, 25
-
+
6
-
- flowLayoutInfo
+
+ tableLayoutInfo
-
- System.Windows.Forms.FlowLayoutPanel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+ System.Windows.Forms.TableLayoutPanel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
+
tableLayoutPanel1
-
- 3
-
-
- 78, 85
-
-
- 223, 21
-
-
- 3
-
-
- comboBoxNetwork
-
-
- XenAdmin.Controls.NetworkComboBox, XenCenterMain, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null
-
-
- tableLayoutPanel1
-
-
+
4
+
+ <?xml version="1.0" encoding="utf-16"?><TableLayoutSettings><Controls><Control Name="pictureBoxInfo" Row="0" RowSpan="1" Column="0" ColumnSpan="1" /><Control Name="labelWarning" Row="0" RowSpan="1" Column="1" ColumnSpan="1" /></Controls><Columns Styles="AutoSize,0,AutoSize,0" /><Rows Styles="Percent,100" /></TableLayoutSettings>
+
Fill
@@ -361,7 +370,7 @@
0
- <?xml version="1.0" encoding="utf-16"?><TableLayoutSettings><Controls><Control Name="labelTitle" Row="0" RowSpan="1" Column="0" ColumnSpan="2" /><Control Name="CheckBoxEnableClustering" Row="1" RowSpan="1" Column="0" ColumnSpan="2" /><Control Name="labelNetwork" Row="2" RowSpan="1" Column="0" ColumnSpan="1" /><Control Name="flowLayoutInfo" Row="3" RowSpan="1" Column="0" ColumnSpan="2" /><Control Name="comboBoxNetwork" Row="2" RowSpan="1" Column="1" ColumnSpan="1" /></Controls><Columns Styles="AutoSize,0,AutoSize,0" /><Rows Styles="AutoSize,0,AutoSize,0,AutoSize,0,Percent,100" /></TableLayoutSettings>
+ <?xml version="1.0" encoding="utf-16"?><TableLayoutSettings><Controls><Control Name="labelTitle" Row="0" RowSpan="1" Column="0" ColumnSpan="2" /><Control Name="CheckBoxEnableClustering" Row="1" RowSpan="1" Column="0" ColumnSpan="2" /><Control Name="labelNetwork" Row="2" RowSpan="1" Column="0" ColumnSpan="1" /><Control Name="comboBoxNetwork" Row="2" RowSpan="1" Column="1" ColumnSpan="1" /><Control Name="tableLayoutInfo" Row="3" RowSpan="1" Column="0" ColumnSpan="2" /></Controls><Columns Styles="AutoSize,0,AutoSize,0" /><Rows Styles="AutoSize,0,AutoSize,0,AutoSize,0,Percent,100,Absolute,20" /></TableLayoutSettings>
True
diff --git a/XenAdmin/Wizards/NewSRWizard_Pages/ChooseSrProvisioningPage.Designer.cs b/XenAdmin/Wizards/NewSRWizard_Pages/ChooseSrProvisioningPage.Designer.cs
index 703b0618d..71217cdcb 100644
--- a/XenAdmin/Wizards/NewSRWizard_Pages/ChooseSrProvisioningPage.Designer.cs
+++ b/XenAdmin/Wizards/NewSRWizard_Pages/ChooseSrProvisioningPage.Designer.cs
@@ -35,12 +35,12 @@
this.labelGFS2 = new System.Windows.Forms.Label();
this.radioButtonLvm = new System.Windows.Forms.RadioButton();
this.label3 = new System.Windows.Forms.Label();
- this.labelWarning = new System.Windows.Forms.Label();
this.pictureBoxInfo = new System.Windows.Forms.PictureBox();
- this.flowLayoutInfo = new System.Windows.Forms.FlowLayoutPanel();
+ this.labelWarning = new System.Windows.Forms.Label();
+ this.tableLayoutInfo = new System.Windows.Forms.TableLayoutPanel();
this.tableLayoutPanel1.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.pictureBoxInfo)).BeginInit();
- this.flowLayoutInfo.SuspendLayout();
+ this.tableLayoutInfo.SuspendLayout();
this.SuspendLayout();
//
// tableLayoutPanel1
@@ -51,20 +51,18 @@
this.tableLayoutPanel1.Controls.Add(this.labelGFS2, 0, 2);
this.tableLayoutPanel1.Controls.Add(this.radioButtonLvm, 0, 3);
this.tableLayoutPanel1.Controls.Add(this.label3, 0, 4);
- this.tableLayoutPanel1.Controls.Add(this.flowLayoutInfo, 0, 5);
+ this.tableLayoutPanel1.Controls.Add(this.tableLayoutInfo, 0, 5);
this.tableLayoutPanel1.Name = "tableLayoutPanel1";
//
// label1
//
resources.ApplyResources(this.label1, "label1");
- this.tableLayoutPanel1.SetColumnSpan(this.label1, 2);
this.label1.Name = "label1";
//
// radioButtonGfs2
//
resources.ApplyResources(this.radioButtonGfs2, "radioButtonGfs2");
this.radioButtonGfs2.Checked = true;
- this.tableLayoutPanel1.SetColumnSpan(this.radioButtonGfs2, 2);
this.radioButtonGfs2.Name = "radioButtonGfs2";
this.radioButtonGfs2.TabStop = true;
this.radioButtonGfs2.UseVisualStyleBackColor = true;
@@ -72,27 +70,19 @@
// labelGFS2
//
resources.ApplyResources(this.labelGFS2, "labelGFS2");
- this.tableLayoutPanel1.SetColumnSpan(this.labelGFS2, 2);
this.labelGFS2.Name = "labelGFS2";
//
// radioButtonLvm
//
resources.ApplyResources(this.radioButtonLvm, "radioButtonLvm");
- this.tableLayoutPanel1.SetColumnSpan(this.radioButtonLvm, 2);
this.radioButtonLvm.Name = "radioButtonLvm";
this.radioButtonLvm.UseVisualStyleBackColor = true;
//
// label3
//
resources.ApplyResources(this.label3, "label3");
- this.tableLayoutPanel1.SetColumnSpan(this.label3, 2);
this.label3.Name = "label3";
//
- // labelWarning
- //
- resources.ApplyResources(this.labelWarning, "labelWarning");
- this.labelWarning.Name = "labelWarning";
- //
// pictureBoxInfo
//
this.pictureBoxInfo.Image = global::XenAdmin.Properties.Resources._000_Info3_h32bit_16;
@@ -100,13 +90,17 @@
this.pictureBoxInfo.Name = "pictureBoxInfo";
this.pictureBoxInfo.TabStop = false;
//
- // flowLayoutInfo
+ // labelWarning
//
- resources.ApplyResources(this.flowLayoutInfo, "flowLayoutInfo");
- this.tableLayoutPanel1.SetColumnSpan(this.flowLayoutInfo, 2);
- this.flowLayoutInfo.Controls.Add(this.pictureBoxInfo);
- this.flowLayoutInfo.Controls.Add(this.labelWarning);
- this.flowLayoutInfo.Name = "flowLayoutInfo";
+ resources.ApplyResources(this.labelWarning, "labelWarning");
+ this.labelWarning.Name = "labelWarning";
+ //
+ // tableLayoutInfo
+ //
+ resources.ApplyResources(this.tableLayoutInfo, "tableLayoutInfo");
+ this.tableLayoutInfo.Controls.Add(this.labelWarning, 1, 0);
+ this.tableLayoutInfo.Controls.Add(this.pictureBoxInfo, 0, 0);
+ this.tableLayoutInfo.Name = "tableLayoutInfo";
//
// ChooseSrProvisioningPage
//
@@ -117,8 +111,8 @@
this.tableLayoutPanel1.ResumeLayout(false);
this.tableLayoutPanel1.PerformLayout();
((System.ComponentModel.ISupportInitialize)(this.pictureBoxInfo)).EndInit();
- this.flowLayoutInfo.ResumeLayout(false);
- this.flowLayoutInfo.PerformLayout();
+ this.tableLayoutInfo.ResumeLayout(false);
+ this.tableLayoutInfo.PerformLayout();
this.ResumeLayout(false);
}
@@ -133,6 +127,6 @@
private System.Windows.Forms.Label label3;
private System.Windows.Forms.PictureBox pictureBoxInfo;
private System.Windows.Forms.Label labelWarning;
- private System.Windows.Forms.FlowLayoutPanel flowLayoutInfo;
+ private System.Windows.Forms.TableLayoutPanel tableLayoutInfo;
}
}
diff --git a/XenAdmin/Wizards/NewSRWizard_Pages/ChooseSrProvisioningPage.cs b/XenAdmin/Wizards/NewSRWizard_Pages/ChooseSrProvisioningPage.cs
index ceab7f6c2..f0cbaf902 100644
--- a/XenAdmin/Wizards/NewSRWizard_Pages/ChooseSrProvisioningPage.cs
+++ b/XenAdmin/Wizards/NewSRWizard_Pages/ChooseSrProvisioningPage.cs
@@ -71,7 +71,7 @@ namespace XenAdmin.Wizards.NewSRWizard_Pages
var gfs2Allowed = !Helpers.FeatureForbidden(Connection, Host.RestrictGfs2) && Connection.Cache.Cluster_hosts.Any(cluster => cluster.host.opaque_ref == master.opaque_ref && cluster.enabled);
radioButtonGfs2.Enabled = labelGFS2.Enabled = gfs2Allowed;
- flowLayoutInfo.Visible = radioButtonLvm.Checked = !gfs2Allowed;
+ tableLayoutInfo.Visible = radioButtonLvm.Checked = !gfs2Allowed;
labelWarning.Text = Helpers.FeatureForbidden(Connection, Host.RestrictGfs2)
? Messages.GFS2_INCORRECT_POOL_LICENSE
: Messages.GFS2_REQUIRES_CLUSTERING_ENABLED;
diff --git a/XenAdmin/Wizards/NewSRWizard_Pages/ChooseSrProvisioningPage.resx b/XenAdmin/Wizards/NewSRWizard_Pages/ChooseSrProvisioningPage.resx
index 6bf0feb22..af9350efd 100644
--- a/XenAdmin/Wizards/NewSRWizard_Pages/ChooseSrProvisioningPage.resx
+++ b/XenAdmin/Wizards/NewSRWizard_Pages/ChooseSrProvisioningPage.resx
@@ -119,7 +119,7 @@
- 2
+ 1
True
@@ -175,7 +175,7 @@
1
- Thin provisioning (GFS2)
+ &Thin provisioning (GFS2)
radioButtonGfs2
@@ -241,7 +241,7 @@
3
- Full provisioning (LVM)
+ &Full provisioning (LVM)
radioButtonLvm
@@ -288,32 +288,11 @@
4
-
+
True
-
- 3, 15
-
-
- 3, 15, 3, 3
-
-
- 19, 20
-
-
- 5
-
-
- pictureBoxInfo
-
-
- System.Windows.Forms.PictureBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
-
- flowLayoutInfo
-
-
- 0
+
+ 2
True
@@ -340,32 +319,62 @@
System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
- flowLayoutInfo
+ tableLayoutInfo
+ 0
+
+
+ 3, 15
+
+
+ 3, 15, 3, 3
+
+
+ 19, 20
+
+
+ 5
+
+
+ pictureBoxInfo
+
+
+ System.Windows.Forms.PictureBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ tableLayoutInfo
+
+
1
-
+
3, 129
-
+
+ 1
+
+
28, 38
-
+
7
-
- flowLayoutInfo
+
+ tableLayoutInfo
-
- System.Windows.Forms.FlowLayoutPanel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+ System.Windows.Forms.TableLayoutPanel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
+
tableLayoutPanel1
-
+
5
+
+ <?xml version="1.0" encoding="utf-16"?><TableLayoutSettings><Controls><Control Name="labelWarning" Row="0" RowSpan="1" Column="1" ColumnSpan="1" /><Control Name="pictureBoxInfo" Row="0" RowSpan="1" Column="0" ColumnSpan="1" /></Controls><Columns Styles="AutoSize,0,AutoSize,0" /><Rows Styles="Percent,100" /></TableLayoutSettings>
+
Fill
@@ -397,7 +406,7 @@
0
- <?xml version="1.0" encoding="utf-16"?><TableLayoutSettings><Controls><Control Name="label1" Row="0" RowSpan="1" Column="0" ColumnSpan="2" /><Control Name="radioButtonGfs2" Row="1" RowSpan="1" Column="0" ColumnSpan="2" /><Control Name="labelGFS2" Row="2" RowSpan="1" Column="0" ColumnSpan="2" /><Control Name="radioButtonLvm" Row="3" RowSpan="1" Column="0" ColumnSpan="2" /><Control Name="label3" Row="4" RowSpan="1" Column="0" ColumnSpan="2" /><Control Name="flowLayoutInfo" Row="5" RowSpan="1" Column="0" ColumnSpan="2" /></Controls><Columns Styles="AutoSize,0,Percent,100" /><Rows Styles="AutoSize,0,AutoSize,0,AutoSize,0,AutoSize,0,AutoSize,0,Percent,100,Absolute,20" /></TableLayoutSettings>
+ <?xml version="1.0" encoding="utf-16"?><TableLayoutSettings><Controls><Control Name="label1" Row="0" RowSpan="1" Column="0" ColumnSpan="1" /><Control Name="radioButtonGfs2" Row="1" RowSpan="1" Column="0" ColumnSpan="1" /><Control Name="labelGFS2" Row="2" RowSpan="1" Column="0" ColumnSpan="1" /><Control Name="radioButtonLvm" Row="3" RowSpan="1" Column="0" ColumnSpan="1" /><Control Name="label3" Row="4" RowSpan="1" Column="0" ColumnSpan="1" /><Control Name="tableLayoutInfo" Row="5" RowSpan="1" Column="0" ColumnSpan="1" /></Controls><Columns Styles="AutoSize,0,Absolute,20" /><Rows Styles="AutoSize,0,AutoSize,0,AutoSize,0,AutoSize,0,AutoSize,0,Percent,100" /></TableLayoutSettings>
True