diff --git a/XenAdmin/SettingsPanels/NRPEEditPage.Designer.cs b/XenAdmin/SettingsPanels/NRPEEditPage.Designer.cs
index af65fa8f5..2fee41b34 100644
--- a/XenAdmin/SettingsPanels/NRPEEditPage.Designer.cs
+++ b/XenAdmin/SettingsPanels/NRPEEditPage.Designer.cs
@@ -126,12 +126,12 @@ namespace XenAdmin.SettingsPanels
//
this.CheckDataGridView.BackgroundColor = System.Drawing.SystemColors.Window;
this.CheckDataGridView.CellBorderStyle = System.Windows.Forms.DataGridViewCellBorderStyle.None;
- resources.ApplyResources(this.CheckDataGridView, "CheckDataGridView");
this.CheckDataGridView.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.DisableResizing;
this.CheckDataGridView.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] {
this.CheckColumn,
this.WarningThresholdColumn,
this.CriticalThresholdColumn});
+ resources.ApplyResources(this.CheckDataGridView, "CheckDataGridView");
this.CheckDataGridView.EditMode = System.Windows.Forms.DataGridViewEditMode.EditOnEnter;
this.CheckDataGridView.Name = "CheckDataGridView";
this.CheckDataGridView.RowHeadersWidthSizeMode = System.Windows.Forms.DataGridViewRowHeadersWidthSizeMode.DisableResizing;
diff --git a/XenAdmin/SettingsPanels/NRPEEditPage.resx b/XenAdmin/SettingsPanels/NRPEEditPage.resx
index 3250d8794..a8f49ac6f 100644
--- a/XenAdmin/SettingsPanels/NRPEEditPage.resx
+++ b/XenAdmin/SettingsPanels/NRPEEditPage.resx
@@ -133,13 +133,13 @@
- 4, 0
+ 3, 0
- 4, 0, 4, 15
+ 3, 0, 3, 10
- 967, 40
+ 644, 26
0
@@ -152,7 +152,7 @@ Use this page to review and modify the NRPE configuration and metric threshold s
DescLabelPool
- XenAdmin.Controls.Common.AutoHeightLabel, XenCenter, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null
+ XenAdmin.Controls.Common.AutoHeightLabel, [XenCenter], Version=0.0.0.0, Culture=neutral, PublicKeyToken=null
NRPETableLayoutPanel
@@ -170,13 +170,13 @@ Use this page to review and modify the NRPE configuration and metric threshold s
NoControl
- 4, 55
+ 3, 36
- 4, 0, 4, 15
+ 3, 0, 3, 10
- 967, 40
+ 644, 26
1
@@ -189,7 +189,7 @@ Use this page to review and modify the NRPE configuration and metric threshold s
DescLabelHost
- XenAdmin.Controls.Common.AutoHeightLabel, XenCenter, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null
+ XenAdmin.Controls.Common.AutoHeightLabel, [XenCenter], Version=0.0.0.0, Culture=neutral, PublicKeyToken=null
NRPETableLayoutPanel
@@ -204,16 +204,16 @@ Use this page to review and modify the NRPE configuration and metric threshold s
NoControl
- 4, 114
+ 3, 75
- 4, 4, 4, 12
+ 3, 3, 3, 8
- 4, 0, 0, 0
+ 3, 0, 0, 0
- 137, 24
+ 95, 17
2
@@ -252,13 +252,10 @@ Use this page to review and modify the NRPE configuration and metric threshold s
NoControl
- 4, 7
-
-
- 4, 0, 4, 0
+ 3, 6
- 142, 20
+ 96, 13
0
@@ -282,13 +279,10 @@ Use this page to review and modify the NRPE configuration and metric threshold s
Left, Right
- 154, 4
-
-
- 4, 4, 4, 4
+ 105, 3
- 801, 26
+ 530, 20
1
@@ -312,16 +306,13 @@ Use this page to review and modify the NRPE configuration and metric threshold s
NoControl
- 4, 38
-
-
- 4, 4, 4, 4
+ 3, 29
- 4, 0, 0, 0
+ 3, 0, 0, 0
- 313, 24
+ 211, 17
2
@@ -348,16 +339,13 @@ Use this page to review and modify the NRPE configuration and metric threshold s
NoControl
- 4, 70
-
-
- 4, 4, 4, 4
+ 3, 52
- 4, 0, 0, 0
+ 3, 0, 0, 0
- 269, 24
+ 181, 17
3
@@ -381,16 +369,13 @@ Use this page to review and modify the NRPE configuration and metric threshold s
Top
- 4, 23
-
-
- 4, 4, 4, 4
+ 3, 16
3
- 959, 98
+ 638, 72
0
@@ -408,22 +393,22 @@ Use this page to review and modify the NRPE configuration and metric threshold s
0
- <?xml version="1.0" encoding="utf-16"?><TableLayoutSettings><Controls><Control Name="AllowHostsLabel" Row="0" RowSpan="1" Column="0" ColumnSpan="1" /><Control Name="AllowHostsTextBox" Row="0" RowSpan="1" Column="1" ColumnSpan="1" /><Control Name="DebugLogCheckBox" Row="1" RowSpan="1" Column="0" ColumnSpan="2" /><Control Name="SslDebugLogCheckBox" Row="2" RowSpan="1" Column="0" ColumnSpan="2" /></Controls><Columns Styles="AutoSize,0,Percent,100" /><Rows Styles="AutoSize,0,AutoSize,0,AutoSize,0,Absolute,30" /></TableLayoutSettings>
+ <?xml version="1.0" encoding="utf-16"?><TableLayoutSettings><Controls><Control Name="AllowHostsLabel" Row="0" RowSpan="1" Column="0" ColumnSpan="1" /><Control Name="AllowHostsTextBox" Row="0" RowSpan="1" Column="1" ColumnSpan="1" /><Control Name="DebugLogCheckBox" Row="1" RowSpan="1" Column="0" ColumnSpan="2" /><Control Name="SslDebugLogCheckBox" Row="2" RowSpan="1" Column="0" ColumnSpan="2" /></Controls><Columns Styles="AutoSize,0,Percent,100" /><Rows Styles="AutoSize,0,AutoSize,0,AutoSize,0,Absolute,20" /></TableLayoutSettings>
Fill
- 4, 154
+ 3, 103
- 4, 4, 4, 15
+ 3, 3, 3, 10
- 4, 4, 4, 0
+ 3, 3, 3, 0
- 967, 150
+ 644, 100
3
@@ -443,9 +428,6 @@ Use this page to review and modify the NRPE configuration and metric threshold s
3
-
- 34
-
Metric
@@ -474,10 +456,7 @@ Use this page to review and modify the NRPE configuration and metric threshold s
Fill
- 4, 323
-
-
- 4, 4, 4, 4
+ 3, 216
62
@@ -486,7 +465,7 @@ Use this page to review and modify the NRPE configuration and metric threshold s
None
- 967, 411
+ 644, 273
4
@@ -495,7 +474,7 @@ Use this page to review and modify the NRPE configuration and metric threshold s
CheckDataGridView
- XenAdmin.Controls.DataGridViewEx.DataGridViewEx, XenCenter, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null
+ XenAdmin.Controls.DataGridViewEx.DataGridViewEx, [XenCenter], Version=0.0.0.0, Culture=neutral, PublicKeyToken=null
NRPETableLayoutPanel
@@ -516,13 +495,10 @@ Use this page to review and modify the NRPE configuration and metric threshold s
NoControl
- 36, 0
-
-
- 4, 0, 4, 0
+ 24, 0
- 928, 32
+ 619, 21
5
@@ -549,10 +525,13 @@ Use this page to review and modify the NRPE configuration and metric threshold s
NoControl
- 3, 3
+ 2, 2
+
+
+ 2, 2, 2, 2
- 26, 26
+ 17, 17
6
@@ -570,13 +549,16 @@ Use this page to review and modify the NRPE configuration and metric threshold s
1
- 3, 741
+ 2, 494
+
+
+ 2, 2, 2, 2
1
- 968, 32
+ 646, 21
6
@@ -603,13 +585,13 @@ Use this page to review and modify the NRPE configuration and metric threshold s
0, 0
- 4, 15, 4, 0
+ 3, 10, 3, 0
8
- 975, 806
+ 650, 537
0
@@ -627,22 +609,19 @@ Use this page to review and modify the NRPE configuration and metric threshold s
0
- <?xml version="1.0" encoding="utf-16"?><TableLayoutSettings><Controls><Control Name="DescLabelPool" Row="0" RowSpan="1" Column="0" ColumnSpan="1" /><Control Name="DescLabelHost" Row="1" RowSpan="1" Column="0" ColumnSpan="1" /><Control Name="EnableNRPECheckBox" Row="3" RowSpan="1" Column="0" ColumnSpan="1" /><Control Name="GeneralConfigureGroupBox" Row="4" RowSpan="1" Column="0" ColumnSpan="1" /><Control Name="CheckDataGridView" Row="5" RowSpan="1" Column="0" ColumnSpan="1" /><Control Name="RetrieveNRPEPanel" Row="6" 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,Absolute,30" /></TableLayoutSettings>
+ <?xml version="1.0" encoding="utf-16"?><TableLayoutSettings><Controls><Control Name="DescLabelPool" Row="0" RowSpan="1" Column="0" ColumnSpan="1" /><Control Name="DescLabelHost" Row="1" RowSpan="1" Column="0" ColumnSpan="1" /><Control Name="EnableNRPECheckBox" Row="3" RowSpan="1" Column="0" ColumnSpan="1" /><Control Name="GeneralConfigureGroupBox" Row="4" RowSpan="1" Column="0" ColumnSpan="1" /><Control Name="CheckDataGridView" Row="5" RowSpan="1" Column="0" ColumnSpan="1" /><Control Name="RetrieveNRPEPanel" Row="6" 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,Absolute,20" /></TableLayoutSettings>
True
- 144, 144
+ 96, 96
True
-
- 4, 4, 4, 4
-
- 975, 806
+ 650, 537
CheckColumn