From deed3291024b0bd36af01ad1d4720c3e758fb84d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adolfo=20G=C3=B3mez?= Date: Mon, 20 Aug 2012 04:55:14 +0000 Subject: [PATCH] * Fixed up representation of fields (some fields not correctly displayed by a bug introduced with multi line boxes. * Centered on parent all forms (by code) * Some minor corrections --- .../UdsAdmin/forms/AboutBoxForm.resx | 2 +- .../UdsAdmin/forms/AssignDeployed.cs | 1 + .../UdsAdmin/forms/AssignDeployed.resx | 2 +- .../UdsAdmin/forms/AuthenticatorForm.cs | 7 +- .../UdsAdmin/forms/AuthenticatorForm.resx | 2 +- .../UdsAdmin/forms/ConfigurationForm.cs | 2 +- .../UdsAdmin/forms/ConfigurationForm.resx | 2 +- .../UdsAdmin/forms/DeployedGroupForm.cs | 2 +- .../UdsAdmin/forms/DeployedGroupForm.resx | 2 +- .../UdsAdmin/forms/DeployedServiceForm.cs | 2 +- .../UdsAdmin/forms/DeployedServiceForm.resx | 4 +- .../UdsAdmin/forms/DeployedTransportForm.cs | 2 +- .../UdsAdmin/forms/DeployedTransportForm.resx | 2 +- .../UdsAdmin/forms/FileDownloader.resx | 2 +- .../UdsAdmin/forms/GroupForm.cs | 2 +- .../UdsAdmin/forms/GroupForm.resx | 8 +- .../administration/UdsAdmin/forms/MainForm.cs | 7 +- .../UdsAdmin/forms/NetworkForm.cs | 1 + .../UdsAdmin/forms/NetworkForm.resx | 128 ++++-- .../UdsAdmin/forms/OSManagerForm.cs | 4 + .../UdsAdmin/forms/OSManagerForm.resx | 2 +- .../UdsAdmin/forms/ServiceForm.cs | 6 +- .../UdsAdmin/forms/ServiceForm.resx | 2 +- .../UdsAdmin/forms/ServiceProviderForm.cs | 5 +- .../UdsAdmin/forms/ServiceProviderForm.resx | 2 +- .../UdsAdmin/forms/TransportForm.cs | 5 +- .../UdsAdmin/forms/TransportForm.resx | 428 +++++------------ .../administration/UdsAdmin/forms/UserForm.cs | 2 +- .../UdsAdmin/forms/UserForm.resx | 435 ++++++++++++++---- .../UdsAdmin/forms/UserPreferencesForm.cs | 1 + .../UdsAdmin/forms/UserPreferencesForm.resx | 2 +- .../UdsAdmin/gui/DinamycFieldsManager.cs | 4 +- 32 files changed, 617 insertions(+), 461 deletions(-) diff --git a/client/administration/UdsAdmin/forms/AboutBoxForm.resx b/client/administration/UdsAdmin/forms/AboutBoxForm.resx index 3149d4615..a0dc06d31 100644 --- a/client/administration/UdsAdmin/forms/AboutBoxForm.resx +++ b/client/administration/UdsAdmin/forms/AboutBoxForm.resx @@ -876,7 +876,7 @@ 9, 9, 9, 9 - CenterParent + CenterScreen AboutBox diff --git a/client/administration/UdsAdmin/forms/AssignDeployed.cs b/client/administration/UdsAdmin/forms/AssignDeployed.cs index 0e8ac6669..af2b417a4 100644 --- a/client/administration/UdsAdmin/forms/AssignDeployed.cs +++ b/client/administration/UdsAdmin/forms/AssignDeployed.cs @@ -74,6 +74,7 @@ namespace UdsAdmin.forms } authCombo.SelectedIndex = 0; serviceCombo.Items.AddRange(services); + Location = MainForm.centerLocation(this); } private void accept_Click(object sender, EventArgs e) diff --git a/client/administration/UdsAdmin/forms/AssignDeployed.resx b/client/administration/UdsAdmin/forms/AssignDeployed.resx index 767656925..fda5f95eb 100644 --- a/client/administration/UdsAdmin/forms/AssignDeployed.resx +++ b/client/administration/UdsAdmin/forms/AssignDeployed.resx @@ -403,7 +403,7 @@ 357, 150 - CenterParent + Manual Assign Service diff --git a/client/administration/UdsAdmin/forms/AuthenticatorForm.cs b/client/administration/UdsAdmin/forms/AuthenticatorForm.cs index 984b142b8..0d49fb914 100644 --- a/client/administration/UdsAdmin/forms/AuthenticatorForm.cs +++ b/client/administration/UdsAdmin/forms/AuthenticatorForm.cs @@ -71,15 +71,20 @@ namespace UdsAdmin.forms { _flds = xmlrpc.UdsAdminService.GetAuthenticatorGui(_authenticatorType); Size sz = gui.DinamycFieldsManager.PutFields(dataPanel, _flds, _fldValues); - groupData.Size = new Size(groupData.Size.Width, 32 + sz.Height); + groupData.Size = new Size(sz.Width, 32 + sz.Height); Size wSize = new Size(); wSize.Width = Size.Width; + int w = groupData.Location.X + groupData.Size.Width + 48; + if (wSize.Width < w) + wSize.Width = w; wSize.Height = groupData.Location.Y + tableLayoutPanel1.Size.Height + groupData.Size.Height + 48; Size = MinimumSize = MaximumSize = wSize; if (_flds.Length == 0) groupData.Visible = false; Text = _authenticatorName; + + this.Location = MainForm.centerLocation(this); //this.Location = System.Windows.Forms.Cursor.Position; } diff --git a/client/administration/UdsAdmin/forms/AuthenticatorForm.resx b/client/administration/UdsAdmin/forms/AuthenticatorForm.resx index 73fe3efc9..5fb39c687 100644 --- a/client/administration/UdsAdmin/forms/AuthenticatorForm.resx +++ b/client/administration/UdsAdmin/forms/AuthenticatorForm.resx @@ -547,7 +547,7 @@ 474, 340 - CenterParent + Manual Authenticator diff --git a/client/administration/UdsAdmin/forms/ConfigurationForm.cs b/client/administration/UdsAdmin/forms/ConfigurationForm.cs index 2648ed890..c0ddf95c2 100644 --- a/client/administration/UdsAdmin/forms/ConfigurationForm.cs +++ b/client/administration/UdsAdmin/forms/ConfigurationForm.cs @@ -112,7 +112,7 @@ namespace UdsAdmin.forms panels.Add(pan); modTabs.TabPages.Add(page); } - + Location = MainForm.centerLocation(this); } private void accept_Click(object sender, EventArgs e) diff --git a/client/administration/UdsAdmin/forms/ConfigurationForm.resx b/client/administration/UdsAdmin/forms/ConfigurationForm.resx index 98aed7f06..18d947dc0 100644 --- a/client/administration/UdsAdmin/forms/ConfigurationForm.resx +++ b/client/administration/UdsAdmin/forms/ConfigurationForm.resx @@ -244,7 +244,7 @@ 400, 400 - CenterParent + Manual ConfigurationForm diff --git a/client/administration/UdsAdmin/forms/DeployedGroupForm.cs b/client/administration/UdsAdmin/forms/DeployedGroupForm.cs index 7492b947b..76b77cda5 100644 --- a/client/administration/UdsAdmin/forms/DeployedGroupForm.cs +++ b/client/administration/UdsAdmin/forms/DeployedGroupForm.cs @@ -63,7 +63,7 @@ namespace UdsAdmin.forms MessageBox.Show(Strings.error, Strings.authenticators, MessageBoxButtons.OK, MessageBoxIcon.Error); Close(); } - + Location = MainForm.centerLocation(this); } private void accept_Click(object sender, EventArgs e) diff --git a/client/administration/UdsAdmin/forms/DeployedGroupForm.resx b/client/administration/UdsAdmin/forms/DeployedGroupForm.resx index ff9221600..137ac031c 100644 --- a/client/administration/UdsAdmin/forms/DeployedGroupForm.resx +++ b/client/administration/UdsAdmin/forms/DeployedGroupForm.resx @@ -352,7 +352,7 @@ 359, 130 - CenterParent + Manual Assign new group diff --git a/client/administration/UdsAdmin/forms/DeployedServiceForm.cs b/client/administration/UdsAdmin/forms/DeployedServiceForm.cs index fa30cfcbf..10a962c3c 100644 --- a/client/administration/UdsAdmin/forms/DeployedServiceForm.cs +++ b/client/administration/UdsAdmin/forms/DeployedServiceForm.cs @@ -141,7 +141,7 @@ namespace UdsAdmin.forms publishOnSave.Checked = true; } - //this.Location = System.Windows.Forms.Cursor.Position; + Location = MainForm.centerLocation(this); } private void baseServiceCombo_SelectionChangeCommitted(object sender, EventArgs e) diff --git a/client/administration/UdsAdmin/forms/DeployedServiceForm.resx b/client/administration/UdsAdmin/forms/DeployedServiceForm.resx index f5082d683..a334cd106 100644 --- a/client/administration/UdsAdmin/forms/DeployedServiceForm.resx +++ b/client/administration/UdsAdmin/forms/DeployedServiceForm.resx @@ -421,7 +421,7 @@ 3, 3, 3, 3 - 342, 197 + 440, 197 0 @@ -1001,7 +1001,7 @@ - CenterParent + Manual New Deployed Service diff --git a/client/administration/UdsAdmin/forms/DeployedTransportForm.cs b/client/administration/UdsAdmin/forms/DeployedTransportForm.cs index 03f9d6371..02b565a49 100644 --- a/client/administration/UdsAdmin/forms/DeployedTransportForm.cs +++ b/client/administration/UdsAdmin/forms/DeployedTransportForm.cs @@ -63,7 +63,7 @@ namespace UdsAdmin.forms MessageBox.Show(Strings.error, Strings.transports, MessageBoxButtons.OK, MessageBoxIcon.Error); Close(); } - + Location = MainForm.centerLocation(this); } private void accept_Click(object sender, EventArgs e) diff --git a/client/administration/UdsAdmin/forms/DeployedTransportForm.resx b/client/administration/UdsAdmin/forms/DeployedTransportForm.resx index 4a5bac44f..5422e316f 100644 --- a/client/administration/UdsAdmin/forms/DeployedTransportForm.resx +++ b/client/administration/UdsAdmin/forms/DeployedTransportForm.resx @@ -301,7 +301,7 @@ 359, 100 - CenterParent + Manual Assign new transport diff --git a/client/administration/UdsAdmin/forms/FileDownloader.resx b/client/administration/UdsAdmin/forms/FileDownloader.resx index a7da8f7a4..de0b2e1f3 100644 --- a/client/administration/UdsAdmin/forms/FileDownloader.resx +++ b/client/administration/UdsAdmin/forms/FileDownloader.resx @@ -241,7 +241,7 @@ 355, 89 - CenterParent + CenterScreen Downloader diff --git a/client/administration/UdsAdmin/forms/GroupForm.cs b/client/administration/UdsAdmin/forms/GroupForm.cs index ea900236b..2d27a3270 100644 --- a/client/administration/UdsAdmin/forms/GroupForm.cs +++ b/client/administration/UdsAdmin/forms/GroupForm.cs @@ -66,7 +66,7 @@ namespace UdsAdmin.forms check.Visible = false; } groupLabel.Text = _authType.groupNameLabel; - //this.Location = System.Windows.Forms.Cursor.Position; + Location = MainForm.centerLocation(this); } private void searchButton_Click(object sender, EventArgs e) diff --git a/client/administration/UdsAdmin/forms/GroupForm.resx b/client/administration/UdsAdmin/forms/GroupForm.resx index 3379184d9..f96286938 100644 --- a/client/administration/UdsAdmin/forms/GroupForm.resx +++ b/client/administration/UdsAdmin/forms/GroupForm.resx @@ -193,7 +193,7 @@ 71, 3 - 231, 20 + 229, 20 2 @@ -235,7 +235,7 @@ 3 - 308, 3 + 306, 3 30, 19 @@ -349,7 +349,7 @@ 1 - <?xml version="1.0" encoding="utf-16"?><TableLayoutSettings><Controls><Control Name="label3" Row="2" RowSpan="1" Column="0" ColumnSpan="1" /><Control Name="label2" Row="1" RowSpan="1" Column="0" ColumnSpan="1" /><Control Name="name" Row="0" RowSpan="1" Column="1" ColumnSpan="1" /><Control Name="comments" Row="1" RowSpan="1" Column="1" ColumnSpan="2" /><Control Name="searchButton" Row="0" RowSpan="1" Column="2" ColumnSpan="1" /><Control Name="groupLabel" Row="0" RowSpan="1" Column="0" ColumnSpan="1" /><Control Name="active" Row="2" RowSpan="1" Column="1" ColumnSpan="2" /></Controls><Columns Styles="Percent,22,52252,Percent,77,47748,Absolute,67" /><Rows Styles="Percent,30,Percent,30,Percent,40" /></TableLayoutSettings> + <?xml version="1.0" encoding="utf-16"?><TableLayoutSettings><Controls><Control Name="label3" Row="2" RowSpan="1" Column="0" ColumnSpan="1" /><Control Name="label2" Row="1" RowSpan="1" Column="0" ColumnSpan="1" /><Control Name="name" Row="0" RowSpan="1" Column="1" ColumnSpan="1" /><Control Name="comments" Row="1" RowSpan="1" Column="1" ColumnSpan="2" /><Control Name="searchButton" Row="0" RowSpan="1" Column="2" ColumnSpan="1" /><Control Name="groupLabel" Row="0" RowSpan="1" Column="0" ColumnSpan="1" /><Control Name="active" Row="2" RowSpan="1" Column="1" ColumnSpan="2" /></Controls><Columns Styles="Percent,22,52252,Percent,77,47748,Absolute,69" /><Rows Styles="Percent,30,Percent,30,Percent,40" /></TableLayoutSettings> 3 @@ -529,7 +529,7 @@ - CenterParent + Manual Groups diff --git a/client/administration/UdsAdmin/forms/MainForm.cs b/client/administration/UdsAdmin/forms/MainForm.cs index 6356b35a3..3a674046f 100644 --- a/client/administration/UdsAdmin/forms/MainForm.cs +++ b/client/administration/UdsAdmin/forms/MainForm.cs @@ -47,7 +47,7 @@ namespace UdsAdmin.forms public xmlrpc.OSManagerType[] _osManagersTypes = null; public xmlrpc.TransportType[] _transportTypes = null; - public MainForm form = null; + public static MainForm form = null; private Icon getIcon( xmlrpc.BaseType[] bas, string type) { @@ -686,5 +686,10 @@ namespace UdsAdmin.forms new ConfigurationForm().ShowDialog(); } + public static Point centerLocation(Form f) + { + return new Point(form.Location.X + form.Width / 2 - f.Width / 2, form.Location.Y + form.Height / 2 - f.Height / 2); + } + } } diff --git a/client/administration/UdsAdmin/forms/NetworkForm.cs b/client/administration/UdsAdmin/forms/NetworkForm.cs index f664ea3d7..430425bab 100644 --- a/client/administration/UdsAdmin/forms/NetworkForm.cs +++ b/client/administration/UdsAdmin/forms/NetworkForm.cs @@ -65,6 +65,7 @@ namespace UdsAdmin.forms netStart.Text = _net.netStart; netEnd.Text = _net.netEnd; } + Location = MainForm.centerLocation(this); } private void accept_Click(object sender, EventArgs e) diff --git a/client/administration/UdsAdmin/forms/NetworkForm.resx b/client/administration/UdsAdmin/forms/NetworkForm.resx index 564185acc..421730962 100644 --- a/client/administration/UdsAdmin/forms/NetworkForm.resx +++ b/client/administration/UdsAdmin/forms/NetworkForm.resx @@ -213,6 +213,105 @@ 2 + + label3 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tableLayoutPanel1 + + + 0 + + + label2 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tableLayoutPanel1 + + + 1 + + + groupLabel + + + System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tableLayoutPanel1 + + + 2 + + + name + + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tableLayoutPanel1 + + + 3 + + + netStart + + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tableLayoutPanel1 + + + 4 + + + netEnd + + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tableLayoutPanel1 + + + 5 + + + 12, 12 + + + 3 + + + 402, 85 + + + 10 + + + tableLayoutPanel1 + + + System.Windows.Forms.TableLayoutPanel, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 0 + + + <?xml version="1.0" encoding="utf-16"?><TableLayoutSettings><Controls><Control Name="label3" Row="2" RowSpan="1" Column="0" ColumnSpan="1" /><Control Name="label2" Row="1" RowSpan="1" Column="0" ColumnSpan="1" /><Control Name="groupLabel" Row="0" RowSpan="1" Column="0" ColumnSpan="1" /><Control Name="name" Row="0" RowSpan="1" Column="1" ColumnSpan="1" /><Control Name="netStart" Row="1" RowSpan="1" Column="1" ColumnSpan="1" /><Control Name="netEnd" Row="2" RowSpan="1" Column="1" ColumnSpan="1" /></Controls><Columns Styles="Percent,35,95506,Percent,64,04494" /><Rows Styles="Percent,33,Percent,33,Percent,34" /></TableLayoutSettings> + True @@ -369,33 +468,6 @@ 5 - - 12, 12 - - - 3 - - - 402, 85 - - - 10 - - - tableLayoutPanel1 - - - System.Windows.Forms.TableLayoutPanel, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - $this - - - 0 - - - <?xml version="1.0" encoding="utf-16"?><TableLayoutSettings><Controls><Control Name="label3" Row="2" RowSpan="1" Column="0" ColumnSpan="1" /><Control Name="label2" Row="1" RowSpan="1" Column="0" ColumnSpan="1" /><Control Name="groupLabel" Row="0" RowSpan="1" Column="0" ColumnSpan="1" /><Control Name="name" Row="0" RowSpan="1" Column="1" ColumnSpan="1" /><Control Name="netStart" Row="1" RowSpan="1" Column="1" ColumnSpan="1" /><Control Name="netEnd" Row="2" RowSpan="1" Column="1" ColumnSpan="1" /></Controls><Columns Styles="Percent,35,95506,Percent,64,04494" /><Rows Styles="Percent,33,Percent,33,Percent,34" /></TableLayoutSettings> - True @@ -406,7 +478,7 @@ 426, 150 - CenterParent + Manual Network diff --git a/client/administration/UdsAdmin/forms/OSManagerForm.cs b/client/administration/UdsAdmin/forms/OSManagerForm.cs index 30827ffc8..061508ea7 100644 --- a/client/administration/UdsAdmin/forms/OSManagerForm.cs +++ b/client/administration/UdsAdmin/forms/OSManagerForm.cs @@ -77,6 +77,9 @@ namespace UdsAdmin.forms Size sz = gui.DinamycFieldsManager.PutFields(dataPanel, _flds, _fldValues); groupData.Size = new Size(groupData.Size.Width, 32 + sz.Height); Size wSize = new Size(); + int w = groupData.Location.X + groupData.Size.Width + 48; + if (wSize.Width < w) + wSize.Width = w; wSize.Width = Size.Width; wSize.Height = groupData.Location.Y + tableLayoutPanel1.Size.Height + groupData.Size.Height + 48; Size = MinimumSize = MaximumSize = wSize; @@ -85,6 +88,7 @@ namespace UdsAdmin.forms groupData.Visible = false; Text = _osManagerName; + Location = MainForm.centerLocation(this); } private void accept_Click(object sender, EventArgs e) diff --git a/client/administration/UdsAdmin/forms/OSManagerForm.resx b/client/administration/UdsAdmin/forms/OSManagerForm.resx index c0bff3265..10cb39e4f 100644 --- a/client/administration/UdsAdmin/forms/OSManagerForm.resx +++ b/client/administration/UdsAdmin/forms/OSManagerForm.resx @@ -493,7 +493,7 @@ 470, 303 - CenterParent + Manual Os Manager diff --git a/client/administration/UdsAdmin/forms/ServiceForm.cs b/client/administration/UdsAdmin/forms/ServiceForm.cs index 2bb33ea38..723a3e639 100644 --- a/client/administration/UdsAdmin/forms/ServiceForm.cs +++ b/client/administration/UdsAdmin/forms/ServiceForm.cs @@ -80,6 +80,10 @@ namespace UdsAdmin.forms groupData.Size = new Size(groupData.Size.Width, 32 + sz.Height); Size wSize = new Size(); wSize.Width = Size.Width; + int w = groupData.Location.X + groupData.Size.Width + 48; + if (wSize.Width < w) + wSize.Width = w; + wSize.Height = groupData.Location.Y + tableLayoutPanel1.Size.Height + groupData.Size.Height + 48; Size = MinimumSize = wSize; wSize.Width = Screen.GetWorkingArea(this).Width; @@ -87,7 +91,7 @@ namespace UdsAdmin.forms if (_flds.Length == 0) groupData.Visible = false; Text = _serviceName; - //this.Location = System.Windows.Forms.Cursor.Position; + Location = MainForm.centerLocation(this); } private void accept_Click(object sender, EventArgs e) diff --git a/client/administration/UdsAdmin/forms/ServiceForm.resx b/client/administration/UdsAdmin/forms/ServiceForm.resx index f36c15993..ad26a950d 100644 --- a/client/administration/UdsAdmin/forms/ServiceForm.resx +++ b/client/administration/UdsAdmin/forms/ServiceForm.resx @@ -436,7 +436,7 @@ 496, 303 - CenterParent + Manual Service diff --git a/client/administration/UdsAdmin/forms/ServiceProviderForm.cs b/client/administration/UdsAdmin/forms/ServiceProviderForm.cs index 9d0c15b95..6d90600cc 100644 --- a/client/administration/UdsAdmin/forms/ServiceProviderForm.cs +++ b/client/administration/UdsAdmin/forms/ServiceProviderForm.cs @@ -78,12 +78,15 @@ namespace UdsAdmin.forms groupData.Size = new Size(groupData.Size.Width, 32 + sz.Height); Size wSize = new Size(); wSize.Width = Size.Width; + int w = groupData.Location.X + groupData.Size.Width + 48; + if (wSize.Width < w) + wSize.Width = w; wSize.Height = groupData.Location.Y + tableLayoutPanel1.Size.Height + groupData.Size.Height + 48; Size = MinimumSize = MaximumSize = wSize; if (_flds.Length == 0) groupData.Visible = false; Text = _providerName; - //this.Location = System.Windows.Forms.Cursor.Position; + Location = MainForm.centerLocation(this); } private void accept_Click(object sender, EventArgs e) diff --git a/client/administration/UdsAdmin/forms/ServiceProviderForm.resx b/client/administration/UdsAdmin/forms/ServiceProviderForm.resx index 1a0fa34d2..248768327 100644 --- a/client/administration/UdsAdmin/forms/ServiceProviderForm.resx +++ b/client/administration/UdsAdmin/forms/ServiceProviderForm.resx @@ -493,7 +493,7 @@ 498, 306 - CenterParent + Manual ServiceProvider diff --git a/client/administration/UdsAdmin/forms/TransportForm.cs b/client/administration/UdsAdmin/forms/TransportForm.cs index 1a5fa5669..41704f6b7 100644 --- a/client/administration/UdsAdmin/forms/TransportForm.cs +++ b/client/administration/UdsAdmin/forms/TransportForm.cs @@ -92,12 +92,15 @@ namespace UdsAdmin.forms groupData.Size = new Size(groupData.Size.Width, 32 + sz.Height); Size wSize = new Size(); wSize.Width = Size.Width + 64; + int w = groupData.Location.X + groupData.Size.Width + 96; + if (wSize.Width < w) + wSize.Width = w; wSize.Height = groupData.Location.Y + tableLayoutPanel1.Size.Height + groupData.Size.Height + 96; Size = MinimumSize = MaximumSize = wSize; if (_flds.Length == 0) groupData.Visible = false; Text = _transportName; - //this.Location = System.Windows.Forms.Cursor.Position; + Location = MainForm.centerLocation(this); // Networks positiveNets_CheckedChanged(null, null); diff --git a/client/administration/UdsAdmin/forms/TransportForm.resx b/client/administration/UdsAdmin/forms/TransportForm.resx index 7af6b84da..fd7293a55 100644 --- a/client/administration/UdsAdmin/forms/TransportForm.resx +++ b/client/administration/UdsAdmin/forms/TransportForm.resx @@ -210,105 +210,27 @@ Top, Bottom, Left, Right - - commonPage - - - System.Windows.Forms.TabPage, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tabs - - - 0 - - - networks - - - System.Windows.Forms.TabPage, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tabs - - - 1 - - - 13, 13 - - - 445, 312 - - - 1 - - - tabs - - - System.Windows.Forms.TabControl, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - $this - - - 0 - - - groupData - - - System.Windows.Forms.GroupBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - commonPage - - - 0 - - - groupBox1 - - - System.Windows.Forms.GroupBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - commonPage - - - 1 - - - 4, 23 - - - 3, 3, 3, 3 - - - 437, 285 - - - 0 - - - Transport - - - commonPage - - - System.Windows.Forms.TabPage, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tabs - - - 0 - Top, Left, Right + + 2 + + + Fill + + + 3, 16 + + + 2 + + + 420, 120 + + + 0 + dataPanel @@ -348,183 +270,12 @@ 0 - - 2 - - - Fill - - - 3, 16 - - - 2 - - - 420, 120 - - - 0 - - - dataPanel - - - System.Windows.Forms.TableLayoutPanel, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - groupData - - - 0 - - - <?xml version="1.0" encoding="utf-16"?><TableLayoutSettings><Controls /><Columns Styles="Percent,50,Percent,50" /><Rows Styles="Percent,50,Percent,50" /></TableLayoutSettings> - Top, Left, Right - - tableLayoutPanel2 - - - System.Windows.Forms.TableLayoutPanel, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - groupBox1 - - - 0 - - - <?xml version="1.0" encoding="utf-16"?><TableLayoutSettings><Controls><Control Name="label3" Row="2" RowSpan="1" Column="0" ColumnSpan="1" /><Control Name="comments" Row="1" RowSpan="1" Column="1" ColumnSpan="1" /><Control Name="label2" Row="1" RowSpan="1" Column="0" ColumnSpan="1" /><Control Name="name" Row="0" RowSpan="1" Column="1" ColumnSpan="1" /><Control Name="label1" Row="0" RowSpan="1" Column="0" ColumnSpan="1" /><Control Name="priority" Row="2" RowSpan="1" Column="1" ColumnSpan="1" /></Controls><Columns Styles="Percent,19,29825,Percent,80,70175" /><Rows Styles="Percent,33,Percent,33,Percent,34" /></TableLayoutSettings> - - - 6, 6 - - - 425, 120 - - - 8 - - - Common Data - - - groupBox1 - - - System.Windows.Forms.GroupBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - commonPage - - - 1 - 2 - - label3 - - - System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tableLayoutPanel2 - - - 0 - - - comments - - - System.Windows.Forms.TextBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tableLayoutPanel2 - - - 1 - - - label2 - - - System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tableLayoutPanel2 - - - 2 - - - name - - - System.Windows.Forms.TextBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tableLayoutPanel2 - - - 3 - - - label1 - - - System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tableLayoutPanel2 - - - 4 - - - priority - - - System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tableLayoutPanel2 - - - 5 - - - 11, 19 - - - 3 - - - 414, 77 - - - 3 - - - tableLayoutPanel2 - - - System.Windows.Forms.TableLayoutPanel, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - groupBox1 - - - 0 - - - <?xml version="1.0" encoding="utf-16"?><TableLayoutSettings><Controls><Control Name="label3" Row="2" RowSpan="1" Column="0" ColumnSpan="1" /><Control Name="comments" Row="1" RowSpan="1" Column="1" ColumnSpan="1" /><Control Name="label2" Row="1" RowSpan="1" Column="0" ColumnSpan="1" /><Control Name="name" Row="0" RowSpan="1" Column="1" ColumnSpan="1" /><Control Name="label1" Row="0" RowSpan="1" Column="0" ColumnSpan="1" /><Control Name="priority" Row="2" RowSpan="1" Column="1" ColumnSpan="1" /></Controls><Columns Styles="Percent,19,29825,Percent,80,70175" /><Rows Styles="Percent,33,Percent,33,Percent,34" /></TableLayoutSettings> - Left @@ -687,68 +438,83 @@ 5 - - positiveNets + + 11, 19 - - System.Windows.Forms.CheckBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + 3 - - networks + + 414, 77 - + + 3 + + + tableLayoutPanel2 + + + System.Windows.Forms.TableLayoutPanel, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + groupBox1 + + 0 - - label4 + + <?xml version="1.0" encoding="utf-16"?><TableLayoutSettings><Controls><Control Name="label3" Row="2" RowSpan="1" Column="0" ColumnSpan="1" /><Control Name="comments" Row="1" RowSpan="1" Column="1" ColumnSpan="1" /><Control Name="label2" Row="1" RowSpan="1" Column="0" ColumnSpan="1" /><Control Name="name" Row="0" RowSpan="1" Column="1" ColumnSpan="1" /><Control Name="label1" Row="0" RowSpan="1" Column="0" ColumnSpan="1" /><Control Name="priority" Row="2" RowSpan="1" Column="1" ColumnSpan="1" /></Controls><Columns Styles="Percent,19,29825,Percent,80,70175" /><Rows Styles="Percent,33,Percent,33,Percent,34" /></TableLayoutSettings> - - System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + 6, 6 - - networks + + 425, 120 - + + 8 + + + Common Data + + + groupBox1 + + + System.Windows.Forms.GroupBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + commonPage + + 1 - - nets - - - System.Windows.Forms.CheckedListBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - networks - - - 2 - - + 4, 23 - + 3, 3, 3, 3 - + 437, 285 - - 1 + + 0 - - Associated Networks + + Transport - - networks + + commonPage - + System.Windows.Forms.TabPage, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - + tabs - - 1 + + 0 Bottom, Left, Right @@ -837,6 +603,54 @@ 2 + + 4, 23 + + + 3, 3, 3, 3 + + + 437, 285 + + + 1 + + + Associated Networks + + + networks + + + System.Windows.Forms.TabPage, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tabs + + + 1 + + + 13, 13 + + + 445, 312 + + + 1 + + + tabs + + + System.Windows.Forms.TabControl, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 0 + True @@ -847,7 +661,7 @@ 470, 364 - CenterParent + Manual Transport diff --git a/client/administration/UdsAdmin/forms/UserForm.cs b/client/administration/UdsAdmin/forms/UserForm.cs index d24b8d762..220680e6e 100644 --- a/client/administration/UdsAdmin/forms/UserForm.cs +++ b/client/administration/UdsAdmin/forms/UserForm.cs @@ -131,7 +131,7 @@ namespace UdsAdmin.forms staffMember.Checked = _user.staffMember; admin.Checked = _user.isAdmin; - //this.Location = System.Windows.Forms.Cursor.Position; + Location = MainForm.centerLocation(this); } private void accept_Click(object sender, EventArgs e) diff --git a/client/administration/UdsAdmin/forms/UserForm.resx b/client/administration/UdsAdmin/forms/UserForm.resx index 77354cee2..5be2d4237 100644 --- a/client/administration/UdsAdmin/forms/UserForm.resx +++ b/client/administration/UdsAdmin/forms/UserForm.resx @@ -180,21 +180,6 @@ 3 - - Fill - - - 33, 3 - - - 85, 21 - - - 7 - - - Check name - check @@ -264,15 +249,336 @@ <?xml version="1.0" encoding="utf-16"?><TableLayoutSettings><Controls><Control Name="accept" Row="0" RowSpan="1" Column="0" ColumnSpan="1" /><Control Name="cancel" Row="0" RowSpan="1" Column="2" ColumnSpan="1" /><Control Name="tableLayoutPanel3" Row="0" RowSpan="1" Column="1" ColumnSpan="1" /></Controls><Columns Styles="Percent,30,Percent,40,Percent,30" /><Rows Styles="Percent,100" /></TableLayoutSettings> + + Fill + + + 33, 3 + + + 85, 21 + + + 7 + + + Check name + + + check + + + System.Windows.Forms.Button, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tableLayoutPanel3 + + + 0 + Top, Left, Right + + user + + + System.Windows.Forms.TabPage, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tabs + + + 0 + + + group + + + System.Windows.Forms.TabPage, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tabs + + + 1 + + + 13, 13 + + + 393, 237 + + + 10 + + + tabs + + + System.Windows.Forms.TabControl, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 0 + + + tableLayoutPanel1 + + + System.Windows.Forms.TableLayoutPanel, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + user + + + 0 + + + <?xml version="1.0" encoding="utf-16"?><TableLayoutSettings><Controls><Control Name="realName" Row="1" RowSpan="1" Column="1" ColumnSpan="2" /><Control Name="label4" Row="1" RowSpan="1" Column="0" ColumnSpan="1" /><Control Name="label2" Row="2" RowSpan="1" Column="0" ColumnSpan="1" /><Control Name="name" Row="0" RowSpan="1" Column="1" ColumnSpan="1" /><Control Name="comments" Row="2" RowSpan="1" Column="1" ColumnSpan="2" /><Control Name="searchButton" Row="0" RowSpan="1" Column="2" ColumnSpan="1" /><Control Name="userNameLabel" Row="0" RowSpan="1" Column="0" ColumnSpan="1" /><Control Name="state" Row="3" RowSpan="1" Column="1" ColumnSpan="2" /><Control Name="passwordLabel" Row="6" RowSpan="1" Column="0" ColumnSpan="1" /><Control Name="staffMemberLabel" Row="4" RowSpan="1" Column="0" ColumnSpan="1" /><Control Name="adminLabel" Row="5" RowSpan="1" Column="0" ColumnSpan="1" /><Control Name="label5" Row="3" RowSpan="1" Column="0" ColumnSpan="1" /><Control Name="password" Row="6" RowSpan="1" Column="1" ColumnSpan="2" /><Control Name="staffMember" Row="4" RowSpan="1" Column="1" ColumnSpan="1" /><Control Name="admin" Row="5" RowSpan="1" Column="1" ColumnSpan="1" /></Controls><Columns Styles="Percent,27,54098,Percent,72,45902,Absolute,53" /><Rows Styles="Percent,15,Percent,15,Percent,14,Percent,14,Percent,14,Percent,14,Percent,14,Absolute,20" /></TableLayoutSettings> + + + 4, 23 + + + 3, 3, 3, 3 + + + 385, 210 + + + 0 + + + User + + + user + + + System.Windows.Forms.TabPage, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tabs + + + 0 + Top, Left, Right 3 + + realName + + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tableLayoutPanel1 + + + 0 + + + label4 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tableLayoutPanel1 + + + 1 + + + label2 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tableLayoutPanel1 + + + 2 + + + name + + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tableLayoutPanel1 + + + 3 + + + comments + + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tableLayoutPanel1 + + + 4 + + + searchButton + + + System.Windows.Forms.Button, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tableLayoutPanel1 + + + 5 + + + userNameLabel + + + System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tableLayoutPanel1 + + + 6 + + + state + + + System.Windows.Forms.ComboBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tableLayoutPanel1 + + + 7 + + + passwordLabel + + + System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tableLayoutPanel1 + + + 8 + + + staffMemberLabel + + + System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tableLayoutPanel1 + + + 9 + + + adminLabel + + + System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tableLayoutPanel1 + + + 10 + + + label5 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tableLayoutPanel1 + + + 11 + + + password + + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tableLayoutPanel1 + + + 12 + + + staffMember + + + System.Windows.Forms.CheckBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tableLayoutPanel1 + + + 13 + + + admin + + + System.Windows.Forms.CheckBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tableLayoutPanel1 + + + 14 + + + 6, 6 + + + 7 + + + 373, 195 + + + 1 + + + tableLayoutPanel1 + + + System.Windows.Forms.TableLayoutPanel, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + user + + + 0 + + + <?xml version="1.0" encoding="utf-16"?><TableLayoutSettings><Controls><Control Name="realName" Row="1" RowSpan="1" Column="1" ColumnSpan="2" /><Control Name="label4" Row="1" RowSpan="1" Column="0" ColumnSpan="1" /><Control Name="label2" Row="2" RowSpan="1" Column="0" ColumnSpan="1" /><Control Name="name" Row="0" RowSpan="1" Column="1" ColumnSpan="1" /><Control Name="comments" Row="2" RowSpan="1" Column="1" ColumnSpan="2" /><Control Name="searchButton" Row="0" RowSpan="1" Column="2" ColumnSpan="1" /><Control Name="userNameLabel" Row="0" RowSpan="1" Column="0" ColumnSpan="1" /><Control Name="state" Row="3" RowSpan="1" Column="1" ColumnSpan="2" /><Control Name="passwordLabel" Row="6" RowSpan="1" Column="0" ColumnSpan="1" /><Control Name="staffMemberLabel" Row="4" RowSpan="1" Column="0" ColumnSpan="1" /><Control Name="adminLabel" Row="5" RowSpan="1" Column="0" ColumnSpan="1" /><Control Name="label5" Row="3" RowSpan="1" Column="0" ColumnSpan="1" /><Control Name="password" Row="6" RowSpan="1" Column="1" ColumnSpan="2" /><Control Name="staffMember" Row="4" RowSpan="1" Column="1" ColumnSpan="1" /><Control Name="admin" Row="5" RowSpan="1" Column="1" ColumnSpan="1" /></Controls><Columns Styles="Percent,27,54098,Percent,72,45902,Absolute,53" /><Rows Styles="Percent,15,Percent,15,Percent,14,Percent,14,Percent,14,Percent,14,Percent,14,Absolute,20" /></TableLayoutSettings> + Fill @@ -364,7 +670,7 @@ 91, 3 - 227, 20 + 225, 20 1 @@ -409,7 +715,7 @@ NoControl - 324, 3 + 322, 3 30, 20 @@ -640,7 +946,7 @@ 91, 115 - 227, 21 + 225, 21 14 @@ -667,7 +973,7 @@ 91, 142 - 227, 21 + 225, 21 15 @@ -684,69 +990,6 @@ 14 - - 6, 6 - - - 7 - - - 373, 195 - - - 1 - - - tableLayoutPanel1 - - - System.Windows.Forms.TableLayoutPanel, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - user - - - 0 - - - <?xml version="1.0" encoding="utf-16"?><TableLayoutSettings><Controls><Control Name="realName" Row="1" RowSpan="1" Column="1" ColumnSpan="2" /><Control Name="label4" Row="1" RowSpan="1" Column="0" ColumnSpan="1" /><Control Name="label2" Row="2" RowSpan="1" Column="0" ColumnSpan="1" /><Control Name="name" Row="0" RowSpan="1" Column="1" ColumnSpan="1" /><Control Name="comments" Row="2" RowSpan="1" Column="1" ColumnSpan="2" /><Control Name="searchButton" Row="0" RowSpan="1" Column="2" ColumnSpan="1" /><Control Name="userNameLabel" Row="0" RowSpan="1" Column="0" ColumnSpan="1" /><Control Name="state" Row="3" RowSpan="1" Column="1" ColumnSpan="2" /><Control Name="passwordLabel" Row="6" RowSpan="1" Column="0" ColumnSpan="1" /><Control Name="staffMemberLabel" Row="4" RowSpan="1" Column="0" ColumnSpan="1" /><Control Name="adminLabel" Row="5" RowSpan="1" Column="0" ColumnSpan="1" /><Control Name="label5" Row="3" RowSpan="1" Column="0" ColumnSpan="1" /><Control Name="password" Row="6" RowSpan="1" Column="1" ColumnSpan="2" /><Control Name="staffMember" Row="4" RowSpan="1" Column="1" ColumnSpan="1" /><Control Name="admin" Row="5" RowSpan="1" Column="1" ColumnSpan="1" /></Controls><Columns Styles="Percent,27,54098,Percent,72,45902,Absolute,51" /><Rows Styles="Percent,15,Percent,15,Percent,14,Percent,14,Percent,14,Percent,14,Percent,14,Absolute,20" /></TableLayoutSettings> - - - 4, 23 - - - 3, 3, 3, 3 - - - 385, 210 - - - 0 - - - User - - - user - - - System.Windows.Forms.TabPage, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tabs - - - 0 - - - 7, 7 - - - 372, 184 - - - 0 - groupsList @@ -786,25 +1029,25 @@ 1 - - 13, 13 + + 7, 7 - - 393, 237 + + 372, 184 - - 10 + + 0 - - tabs + + groupsList - - System.Windows.Forms.TabControl, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + System.Windows.Forms.CheckedListBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - $this + + group - + 0 @@ -845,7 +1088,7 @@ - CenterParent + Manual Users diff --git a/client/administration/UdsAdmin/forms/UserPreferencesForm.cs b/client/administration/UdsAdmin/forms/UserPreferencesForm.cs index 2d66f922c..9ff8ba781 100644 --- a/client/administration/UdsAdmin/forms/UserPreferencesForm.cs +++ b/client/administration/UdsAdmin/forms/UserPreferencesForm.cs @@ -83,6 +83,7 @@ namespace UdsAdmin.forms max.Height += 120; max.Width += 56; Size = max; + Location = MainForm.centerLocation(this); } private void accept_Click(object sender, EventArgs e) diff --git a/client/administration/UdsAdmin/forms/UserPreferencesForm.resx b/client/administration/UdsAdmin/forms/UserPreferencesForm.resx index 1e15c992b..f5d0a8ee8 100644 --- a/client/administration/UdsAdmin/forms/UserPreferencesForm.resx +++ b/client/administration/UdsAdmin/forms/UserPreferencesForm.resx @@ -241,7 +241,7 @@ 368, 269 - CenterParent + Manual UserPreferencesForm diff --git a/client/administration/UdsAdmin/gui/DinamycFieldsManager.cs b/client/administration/UdsAdmin/gui/DinamycFieldsManager.cs index 59e2afe3d..1a8235dd1 100644 --- a/client/administration/UdsAdmin/gui/DinamycFieldsManager.cs +++ b/client/administration/UdsAdmin/gui/DinamycFieldsManager.cs @@ -145,7 +145,7 @@ namespace UdsAdmin.gui { { xmlrpc.Constants.TEXT_TYPE, new FldTypeData(CreateTextBox, TextDataExtractor, TextDataWriter, TextSelector, TextSizeCalculator) }, { xmlrpc.Constants.PASSWORD_TYPE, new FldTypeData(CreatePasswordBox, TextDataExtractor, TextDataWriter, TextSelector) }, - { xmlrpc.Constants.NUMERIC_TYPE, new FldTypeData(CreateNumericBox, NumericDataExtractor, TextDataWriter, TextSelector) }, + { xmlrpc.Constants.NUMERIC_TYPE, new FldTypeData(CreateNumericBox, NumericDataExtractor, NumericDataWriter, NumericSelector) }, { xmlrpc.Constants.HIDDEN_TYPE, new FldTypeData(null, TextDataExtractor, TextDataWriter, TextSelector) }, { xmlrpc.Constants.CHOICE_TYPE, new FldTypeData(CreateChoiceBox, ChoiceDataExtractor, ChoiceDataWriter, ChoiceSelector) }, { xmlrpc.Constants.MULTI_CHOICE_TYPE, new FldTypeData(CreateMultiChoiceBox, MultiChoiceExtractor, MultichoiceDataWriter, MultiChoiceSelector, MultiChoiceSizeCalculator) }, @@ -251,7 +251,7 @@ namespace UdsAdmin.gui ctrlTypeInfo[field.gui.type].dataSelector(ctrl[0], v); } } - + return panel.PreferredSize; }