diff --git a/client/administration/UdsAdmin/Strings.Designer.cs b/client/administration/UdsAdmin/Strings.Designer.cs index e1ec1c79..13faa855 100644 --- a/client/administration/UdsAdmin/Strings.Designer.cs +++ b/client/administration/UdsAdmin/Strings.Designer.cs @@ -267,6 +267,15 @@ namespace UdsAdmin { } } + /// + /// Busca una cadena traducida similar a Are you sure do you want to delete selected items?. + /// + internal static string confirmDelete { + get { + return ResourceManager.GetString("confirmDelete", resourceCulture); + } + } + /// /// Busca una cadena traducida similar a Connectivity. /// diff --git a/client/administration/UdsAdmin/Strings.de.resx b/client/administration/UdsAdmin/Strings.de.resx index 06144e4c..27d8b16d 100644 --- a/client/administration/UdsAdmin/Strings.de.resx +++ b/client/administration/UdsAdmin/Strings.de.resx @@ -490,4 +490,16 @@ Legende + + Einen kleinen Namen mit maximal 8 Zeichen, wobei A-Z, a-Z, 0-9-_-Chars ist erforderlich + + + Neue Meta-Gruppe + + + Ist keine Meta-Gruppe!!! + + + Sind Sie sicher wollen Sie ausgewählten Rechner löschen? + \ No newline at end of file diff --git a/client/administration/UdsAdmin/Strings.es.resx b/client/administration/UdsAdmin/Strings.es.resx index 55346611..ce96200d 100644 --- a/client/administration/UdsAdmin/Strings.es.resx +++ b/client/administration/UdsAdmin/Strings.es.resx @@ -510,4 +510,16 @@ Leyenda + + Un nombre pequeño con menos de 8 caracteres y A-z, a-z, 0-9-_ caracteres se requiere + + + Nuevo grupo meta + + + Grupo no es un grupo Meta! + + + ¿Está seguro que desea eliminar las máquinas? + \ No newline at end of file diff --git a/client/administration/UdsAdmin/Strings.fr.resx b/client/administration/UdsAdmin/Strings.fr.resx index 8e3d1281..5b68cb9b 100644 --- a/client/administration/UdsAdmin/Strings.fr.resx +++ b/client/administration/UdsAdmin/Strings.fr.resx @@ -490,4 +490,16 @@ Légende + + Un petit nom au maximum 8 caractères et à l'aide de A à Z, d'a à z, 0-9-_ chars est requis + + + Nouveau groupe de meta + + + Groupe n'est pas un groupe Meta!!! + + + Êtes-vous sûr que vous souhaitez supprimer les machines sélectionnées ? + \ No newline at end of file diff --git a/client/administration/UdsAdmin/Strings.resx b/client/administration/UdsAdmin/Strings.resx index 7fea72dd..9c99485b 100644 --- a/client/administration/UdsAdmin/Strings.resx +++ b/client/administration/UdsAdmin/Strings.resx @@ -519,4 +519,7 @@ Group is not a Meta group!!! + + Are you sure do you want to delete selected items? + \ No newline at end of file diff --git a/client/administration/UdsAdmin/UdsAdmin.csproj b/client/administration/UdsAdmin/UdsAdmin.csproj index 47652590..d33ebca9 100644 --- a/client/administration/UdsAdmin/UdsAdmin.csproj +++ b/client/administration/UdsAdmin/UdsAdmin.csproj @@ -683,6 +683,15 @@ GroupForm.cs + + GroupMetaForm.cs + + + GroupMetaForm.cs + + + GroupMetaForm.cs + GroupMetaForm.cs diff --git a/client/administration/UdsAdmin/controls/panel/AuthsPanel.Designer.cs b/client/administration/UdsAdmin/controls/panel/AuthsPanel.Designer.cs index c0309c72..4512ee58 100644 --- a/client/administration/UdsAdmin/controls/panel/AuthsPanel.Designer.cs +++ b/client/administration/UdsAdmin/controls/panel/AuthsPanel.Designer.cs @@ -36,6 +36,7 @@ this.comments = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader())); this.priority = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader())); this.logViewer1 = new UdsAdmin.controls.panel.LogViewer(); + this.smallName = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader())); this.splitContainer1.Panel1.SuspendLayout(); this.splitContainer1.Panel2.SuspendLayout(); this.splitContainer1.SuspendLayout(); @@ -60,6 +61,7 @@ this.listView.Columns.AddRange(new System.Windows.Forms.ColumnHeader[] { this.name, this.typeName, + this.smallName, this.comments, this.priority}); resources.ApplyResources(this.listView, "listView"); @@ -95,6 +97,10 @@ resources.ApplyResources(this.logViewer1, "logViewer1"); this.logViewer1.Name = "logViewer1"; // + // smallName + // + resources.ApplyResources(this.smallName, "smallName"); + // // AuthsPanel // resources.ApplyResources(this, "$this"); @@ -119,5 +125,6 @@ private System.Windows.Forms.ColumnHeader priority; private SplitContainerEx splitContainer1; private LogViewer logViewer1; + private System.Windows.Forms.ColumnHeader smallName; } } diff --git a/client/administration/UdsAdmin/controls/panel/AuthsPanel.cs b/client/administration/UdsAdmin/controls/panel/AuthsPanel.cs index 7df6c22d..e6927831 100644 --- a/client/administration/UdsAdmin/controls/panel/AuthsPanel.cs +++ b/client/administration/UdsAdmin/controls/panel/AuthsPanel.cs @@ -66,7 +66,7 @@ namespace UdsAdmin.controls.panel List lst = new List(); foreach (xmlrpc.Authenticator auth in auths) { - ListViewItem itm = new ListViewItem(new string[] { auth.name, auth.typeName, auth.comments, auth.priority }); + ListViewItem itm = new ListViewItem(new string[] { auth.name, auth.typeName, auth.smallName, auth.comments, auth.priority }); itm.ForeColor = gui.Colors.ActiveColor; itm.Tag = auth.id; lst.Add(itm); diff --git a/client/administration/UdsAdmin/controls/panel/AuthsPanel.resx b/client/administration/UdsAdmin/controls/panel/AuthsPanel.resx index 5dc000c6..aab1d4bc 100644 --- a/client/administration/UdsAdmin/controls/panel/AuthsPanel.resx +++ b/client/administration/UdsAdmin/controls/panel/AuthsPanel.resx @@ -138,6 +138,12 @@ 135 + + Small Name + + + 140 + Comments @@ -205,7 +211,7 @@ logViewer1 - UdsAdmin.controls.panel.LogViewer, UdsAdmin, Version=1.1.0.0, Culture=neutral, PublicKeyToken=null + UdsAdmin.controls.panel.LogViewer, UdsAdmin, Version=1.1.1.0, Culture=neutral, PublicKeyToken=null splitContainer1.Panel2 @@ -241,7 +247,7 @@ splitContainer1 - UdsAdmin.controls.SplitContainerEx, UdsAdmin, Version=1.1.0.0, Culture=neutral, PublicKeyToken=null + UdsAdmin.controls.SplitContainerEx, UdsAdmin, Version=1.1.1.0, Culture=neutral, PublicKeyToken=null $this @@ -282,6 +288,12 @@ System.Windows.Forms.ColumnHeader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + smallName + + + System.Windows.Forms.ColumnHeader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + AuthsPanel diff --git a/client/administration/UdsAdmin/controls/panel/DeployedPanel.cs b/client/administration/UdsAdmin/controls/panel/DeployedPanel.cs index 1e152f93..27f258f4 100644 --- a/client/administration/UdsAdmin/controls/panel/DeployedPanel.cs +++ b/client/administration/UdsAdmin/controls/panel/DeployedPanel.cs @@ -169,6 +169,10 @@ namespace UdsAdmin.controls.panel { if (listView.SelectedItems.Count == 0) return; + + if (MessageBox.Show(Strings.confirmDelete, Strings.removeQuestion, MessageBoxButtons.YesNo) == DialogResult.No) + return; + string[] ids = new string[listView.SelectedItems.Count]; int n = 0; foreach (ListViewItem i in listView.SelectedItems) diff --git a/client/administration/UdsAdmin/controls/panel/DeployedServicePanel.de.resx b/client/administration/UdsAdmin/controls/panel/DeployedServicePanel.de.resx index 54f8b0f4..a6d1aa1c 100644 --- a/client/administration/UdsAdmin/controls/panel/DeployedServicePanel.de.resx +++ b/client/administration/UdsAdmin/controls/panel/DeployedServicePanel.de.resx @@ -783,4 +783,10 @@ + + Allgemeine + + + Statistik + \ No newline at end of file diff --git a/client/administration/UdsAdmin/controls/panel/DeployedServicePanel.es.resx b/client/administration/UdsAdmin/controls/panel/DeployedServicePanel.es.resx index 574bcea4..4b7088a5 100644 --- a/client/administration/UdsAdmin/controls/panel/DeployedServicePanel.es.resx +++ b/client/administration/UdsAdmin/controls/panel/DeployedServicePanel.es.resx @@ -783,4 +783,10 @@ + + General + + + Estadísticas + \ No newline at end of file diff --git a/client/administration/UdsAdmin/controls/panel/DeployedServicePanel.fr.resx b/client/administration/UdsAdmin/controls/panel/DeployedServicePanel.fr.resx index 46a46801..f51c9085 100644 --- a/client/administration/UdsAdmin/controls/panel/DeployedServicePanel.fr.resx +++ b/client/administration/UdsAdmin/controls/panel/DeployedServicePanel.fr.resx @@ -783,4 +783,10 @@ + + Générales + + + Statistiques + \ No newline at end of file diff --git a/client/administration/UdsAdmin/controls/panel/LogViewer.cs b/client/administration/UdsAdmin/controls/panel/LogViewer.cs index 78ed8aea..f6a9e19e 100644 --- a/client/administration/UdsAdmin/controls/panel/LogViewer.cs +++ b/client/administration/UdsAdmin/controls/panel/LogViewer.cs @@ -27,7 +27,7 @@ namespace UdsAdmin.controls.panel levelFilterCombo.Items.AddRange(new string[] { xmlrpc.Constants.LEVEL_DEBUG, xmlrpc.Constants.LEVEL_INFO, xmlrpc.Constants.LEVEL_WARN, xmlrpc.Constants.LEVEL_ERROR, xmlrpc.Constants.LEVEL_FATAL }); - levelFilterCombo.SelectedIndex = 2; + levelFilterCombo.SelectedIndex = 1; } public void setLogs(xmlrpc.LogEntry[] logs) @@ -40,6 +40,7 @@ namespace UdsAdmin.controls.panel { if( logs == null ) return; + listView.BeginUpdate(); List lst = new List(); int minLevel = levelIndex[levelFilterCombo.SelectedIndex]; @@ -56,6 +57,10 @@ namespace UdsAdmin.controls.panel } listView.Items.Clear(); listView.Items.AddRange(lst.ToArray()); + if (listView.Items.Count > 0) + listView.TopItem = listView.Items[listView.Items.Count - 1]; + + listView.EndUpdate(); } diff --git a/client/administration/UdsAdmin/controls/panel/LogViewer.es.resx b/client/administration/UdsAdmin/controls/panel/LogViewer.es.resx index 88d37dff..566feff8 100644 --- a/client/administration/UdsAdmin/controls/panel/LogViewer.es.resx +++ b/client/administration/UdsAdmin/controls/panel/LogViewer.es.resx @@ -118,7 +118,7 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - Filtrar: + Filtro: Nivel diff --git a/client/administration/UdsAdmin/forms/AssignDeployed.de.resx b/client/administration/UdsAdmin/forms/AssignDeployed.de.resx index 3876ef5d..e85778cd 100644 --- a/client/administration/UdsAdmin/forms/AssignDeployed.de.resx +++ b/client/administration/UdsAdmin/forms/AssignDeployed.de.resx @@ -136,4 +136,7 @@ Service + + Authentifikator + \ No newline at end of file diff --git a/client/administration/UdsAdmin/forms/AssignDeployed.es.resx b/client/administration/UdsAdmin/forms/AssignDeployed.es.resx index d0d085de..f93ad5f5 100644 --- a/client/administration/UdsAdmin/forms/AssignDeployed.es.resx +++ b/client/administration/UdsAdmin/forms/AssignDeployed.es.resx @@ -132,4 +132,7 @@ Nombre de usuario + + Autenticador + \ No newline at end of file diff --git a/client/administration/UdsAdmin/forms/AssignDeployed.fr.resx b/client/administration/UdsAdmin/forms/AssignDeployed.fr.resx index 712b8a84..35ddc02e 100644 --- a/client/administration/UdsAdmin/forms/AssignDeployed.fr.resx +++ b/client/administration/UdsAdmin/forms/AssignDeployed.fr.resx @@ -132,4 +132,7 @@ Nom d'utilisateur + + Authentificateur + \ No newline at end of file diff --git a/client/administration/UdsAdmin/forms/AuthenticatorForm.de.resx b/client/administration/UdsAdmin/forms/AuthenticatorForm.de.resx index c33d1a7e..c2481dc1 100644 --- a/client/administration/UdsAdmin/forms/AuthenticatorForm.de.resx +++ b/client/administration/UdsAdmin/forms/AuthenticatorForm.de.resx @@ -144,4 +144,7 @@ Test + + Kleine Namen + \ No newline at end of file diff --git a/client/administration/UdsAdmin/forms/AuthenticatorForm.es.resx b/client/administration/UdsAdmin/forms/AuthenticatorForm.es.resx index 331480fd..b94c448f 100644 --- a/client/administration/UdsAdmin/forms/AuthenticatorForm.es.resx +++ b/client/administration/UdsAdmin/forms/AuthenticatorForm.es.resx @@ -151,4 +151,7 @@ Prioridad + + Nombre pequeño + \ No newline at end of file diff --git a/client/administration/UdsAdmin/forms/AuthenticatorForm.fr.resx b/client/administration/UdsAdmin/forms/AuthenticatorForm.fr.resx index 0a85bb67..92f3f084 100644 --- a/client/administration/UdsAdmin/forms/AuthenticatorForm.fr.resx +++ b/client/administration/UdsAdmin/forms/AuthenticatorForm.fr.resx @@ -151,4 +151,7 @@ Test + + Petit nom + \ No newline at end of file diff --git a/client/administration/UdsAdmin/forms/GroupMetaForm.Designer.cs b/client/administration/UdsAdmin/forms/GroupMetaForm.Designer.cs index 1c4bc8a9..f0d975de 100644 --- a/client/administration/UdsAdmin/forms/GroupMetaForm.Designer.cs +++ b/client/administration/UdsAdmin/forms/GroupMetaForm.Designer.cs @@ -28,6 +28,7 @@ /// private void InitializeComponent() { + System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(GroupMetaForm)); this.tableLayoutPanel2 = new System.Windows.Forms.TableLayoutPanel(); this.accept = new System.Windows.Forms.Button(); this.cancel = new System.Windows.Forms.Button(); @@ -38,6 +39,8 @@ this.flowLayoutPanel1 = new System.Windows.Forms.FlowLayoutPanel(); this.button1 = new System.Windows.Forms.Button(); this.button2 = new System.Windows.Forms.Button(); + this.groupBox1 = new System.Windows.Forms.GroupBox(); + this.availableGroups = new System.Windows.Forms.ListBox(); this.tableLayoutPanel1 = new System.Windows.Forms.TableLayoutPanel(); this.label3 = new System.Windows.Forms.Label(); this.label2 = new System.Windows.Forms.Label(); @@ -45,274 +48,159 @@ this.comments = new System.Windows.Forms.TextBox(); this.groupLabel = new System.Windows.Forms.Label(); this.active = new System.Windows.Forms.CheckBox(); - this.groupBox1 = new System.Windows.Forms.GroupBox(); - this.availableGroups = new System.Windows.Forms.ListBox(); this.tableLayoutPanel2.SuspendLayout(); this.tableLayoutPanel4.SuspendLayout(); this.groupBox2.SuspendLayout(); this.flowLayoutPanel1.SuspendLayout(); - this.tableLayoutPanel1.SuspendLayout(); this.groupBox1.SuspendLayout(); + this.tableLayoutPanel1.SuspendLayout(); this.SuspendLayout(); // // tableLayoutPanel2 // - this.tableLayoutPanel2.ColumnCount = 3; - this.tableLayoutPanel2.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 30F)); - this.tableLayoutPanel2.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 40F)); - this.tableLayoutPanel2.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 30F)); + resources.ApplyResources(this.tableLayoutPanel2, "tableLayoutPanel2"); this.tableLayoutPanel2.Controls.Add(this.accept, 0, 0); this.tableLayoutPanel2.Controls.Add(this.cancel, 2, 0); this.tableLayoutPanel2.Controls.Add(this.tableLayoutPanel3, 1, 0); - this.tableLayoutPanel2.Dock = System.Windows.Forms.DockStyle.Bottom; - this.tableLayoutPanel2.Location = new System.Drawing.Point(0, 376); this.tableLayoutPanel2.Name = "tableLayoutPanel2"; - this.tableLayoutPanel2.RowCount = 1; - this.tableLayoutPanel2.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 100F)); - this.tableLayoutPanel2.Size = new System.Drawing.Size(555, 33); - this.tableLayoutPanel2.TabIndex = 8; // // accept // - this.accept.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left) - | System.Windows.Forms.AnchorStyles.Right))); - this.accept.ImeMode = System.Windows.Forms.ImeMode.NoControl; - this.accept.Location = new System.Drawing.Point(3, 7); + resources.ApplyResources(this.accept, "accept"); this.accept.Name = "accept"; - this.accept.Size = new System.Drawing.Size(160, 23); - this.accept.TabIndex = 0; - this.accept.Text = "Accept"; this.accept.UseVisualStyleBackColor = true; this.accept.Click += new System.EventHandler(this.accept_Click); // // cancel // - this.cancel.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left) - | System.Windows.Forms.AnchorStyles.Right))); + resources.ApplyResources(this.cancel, "cancel"); this.cancel.DialogResult = System.Windows.Forms.DialogResult.Cancel; - this.cancel.ImeMode = System.Windows.Forms.ImeMode.NoControl; - this.cancel.Location = new System.Drawing.Point(391, 7); this.cancel.Name = "cancel"; - this.cancel.Size = new System.Drawing.Size(161, 23); - this.cancel.TabIndex = 1; - this.cancel.Text = "Cancel"; this.cancel.UseVisualStyleBackColor = true; this.cancel.Click += new System.EventHandler(this.cancel_Click); // // tableLayoutPanel3 // - this.tableLayoutPanel3.ColumnCount = 3; - this.tableLayoutPanel3.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 20F)); - this.tableLayoutPanel3.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 60F)); - this.tableLayoutPanel3.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 20F)); - this.tableLayoutPanel3.Dock = System.Windows.Forms.DockStyle.Fill; - this.tableLayoutPanel3.Location = new System.Drawing.Point(169, 3); + resources.ApplyResources(this.tableLayoutPanel3, "tableLayoutPanel3"); this.tableLayoutPanel3.Name = "tableLayoutPanel3"; - this.tableLayoutPanel3.RowCount = 1; - this.tableLayoutPanel3.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 100F)); - this.tableLayoutPanel3.Size = new System.Drawing.Size(216, 27); - this.tableLayoutPanel3.TabIndex = 2; // // tableLayoutPanel4 // - this.tableLayoutPanel4.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) - | System.Windows.Forms.AnchorStyles.Left) - | System.Windows.Forms.AnchorStyles.Right))); - this.tableLayoutPanel4.ColumnCount = 3; - this.tableLayoutPanel4.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 50F)); - this.tableLayoutPanel4.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 80F)); - this.tableLayoutPanel4.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 50F)); + resources.ApplyResources(this.tableLayoutPanel4, "tableLayoutPanel4"); this.tableLayoutPanel4.Controls.Add(this.groupBox2, 2, 0); this.tableLayoutPanel4.Controls.Add(this.flowLayoutPanel1, 1, 0); this.tableLayoutPanel4.Controls.Add(this.groupBox1, 0, 0); - this.tableLayoutPanel4.Location = new System.Drawing.Point(11, 103); this.tableLayoutPanel4.Name = "tableLayoutPanel4"; - this.tableLayoutPanel4.RowCount = 1; - this.tableLayoutPanel4.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 100F)); - this.tableLayoutPanel4.Size = new System.Drawing.Size(538, 264); - this.tableLayoutPanel4.TabIndex = 10; // // groupBox2 // this.groupBox2.Controls.Add(this.selectedGroups); - this.groupBox2.Dock = System.Windows.Forms.DockStyle.Fill; - this.groupBox2.Location = new System.Drawing.Point(312, 3); + resources.ApplyResources(this.groupBox2, "groupBox2"); this.groupBox2.Name = "groupBox2"; - this.groupBox2.Size = new System.Drawing.Size(223, 258); - this.groupBox2.TabIndex = 1; this.groupBox2.TabStop = false; - this.groupBox2.Text = "Selected Groups"; // // selectedGroups // - this.selectedGroups.Dock = System.Windows.Forms.DockStyle.Fill; + resources.ApplyResources(this.selectedGroups, "selectedGroups"); this.selectedGroups.FormattingEnabled = true; - this.selectedGroups.Location = new System.Drawing.Point(3, 16); this.selectedGroups.Name = "selectedGroups"; this.selectedGroups.SelectionMode = System.Windows.Forms.SelectionMode.MultiSimple; - this.selectedGroups.Size = new System.Drawing.Size(217, 239); - this.selectedGroups.TabIndex = 0; // // flowLayoutPanel1 // - this.flowLayoutPanel1.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) - | System.Windows.Forms.AnchorStyles.Right))); + resources.ApplyResources(this.flowLayoutPanel1, "flowLayoutPanel1"); this.flowLayoutPanel1.Controls.Add(this.button1); this.flowLayoutPanel1.Controls.Add(this.button2); - this.flowLayoutPanel1.FlowDirection = System.Windows.Forms.FlowDirection.TopDown; - this.flowLayoutPanel1.Location = new System.Drawing.Point(232, 46); - this.flowLayoutPanel1.Margin = new System.Windows.Forms.Padding(3, 46, 3, 3); this.flowLayoutPanel1.Name = "flowLayoutPanel1"; - this.flowLayoutPanel1.Size = new System.Drawing.Size(74, 64); - this.flowLayoutPanel1.TabIndex = 2; // // button1 // - this.button1.Location = new System.Drawing.Point(3, 3); + resources.ApplyResources(this.button1, "button1"); this.button1.Name = "button1"; - this.button1.Size = new System.Drawing.Size(70, 23); - this.button1.TabIndex = 0; - this.button1.Text = ">"; this.button1.UseVisualStyleBackColor = true; this.button1.Click += new System.EventHandler(this.button1_Click); // // button2 // - this.button2.Location = new System.Drawing.Point(3, 32); + resources.ApplyResources(this.button2, "button2"); this.button2.Name = "button2"; - this.button2.Size = new System.Drawing.Size(70, 23); - this.button2.TabIndex = 1; - this.button2.Text = "<"; this.button2.UseVisualStyleBackColor = true; this.button2.Click += new System.EventHandler(this.button2_Click); // + // groupBox1 + // + this.groupBox1.Controls.Add(this.availableGroups); + resources.ApplyResources(this.groupBox1, "groupBox1"); + this.groupBox1.Name = "groupBox1"; + this.groupBox1.TabStop = false; + // + // availableGroups + // + resources.ApplyResources(this.availableGroups, "availableGroups"); + this.availableGroups.FormattingEnabled = true; + this.availableGroups.Name = "availableGroups"; + this.availableGroups.SelectionMode = System.Windows.Forms.SelectionMode.MultiSimple; + // // tableLayoutPanel1 // - this.tableLayoutPanel1.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) - | System.Windows.Forms.AnchorStyles.Right))); - this.tableLayoutPanel1.ColumnCount = 2; - this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 22.52252F)); - this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 77.47748F)); + resources.ApplyResources(this.tableLayoutPanel1, "tableLayoutPanel1"); this.tableLayoutPanel1.Controls.Add(this.label3, 0, 2); this.tableLayoutPanel1.Controls.Add(this.label2, 0, 1); this.tableLayoutPanel1.Controls.Add(this.name, 1, 0); this.tableLayoutPanel1.Controls.Add(this.comments, 1, 1); this.tableLayoutPanel1.Controls.Add(this.groupLabel, 0, 0); this.tableLayoutPanel1.Controls.Add(this.active, 1, 2); - this.tableLayoutPanel1.Location = new System.Drawing.Point(12, 12); this.tableLayoutPanel1.Name = "tableLayoutPanel1"; - this.tableLayoutPanel1.RowCount = 3; - this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 30F)); - this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 30F)); - this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 40F)); - this.tableLayoutPanel1.Size = new System.Drawing.Size(531, 85); - this.tableLayoutPanel1.TabIndex = 11; // // label3 // - this.label3.AutoSize = true; - this.label3.ImeMode = System.Windows.Forms.ImeMode.NoControl; - this.label3.Location = new System.Drawing.Point(3, 56); - this.label3.Margin = new System.Windows.Forms.Padding(3, 6, 3, 0); + resources.ApplyResources(this.label3, "label3"); this.label3.Name = "label3"; - this.label3.Size = new System.Drawing.Size(32, 13); - this.label3.TabIndex = 7; - this.label3.Text = "State"; // // label2 // - this.label2.AutoSize = true; - this.label2.ImeMode = System.Windows.Forms.ImeMode.NoControl; - this.label2.Location = new System.Drawing.Point(3, 31); - this.label2.Margin = new System.Windows.Forms.Padding(3, 6, 3, 0); + resources.ApplyResources(this.label2, "label2"); this.label2.Name = "label2"; - this.label2.Size = new System.Drawing.Size(56, 13); - this.label2.TabIndex = 1; - this.label2.Text = "Comments"; // // name // - this.name.Dock = System.Windows.Forms.DockStyle.Fill; - this.name.Location = new System.Drawing.Point(122, 3); + resources.ApplyResources(this.name, "name"); this.name.Name = "name"; - this.name.Size = new System.Drawing.Size(406, 20); - this.name.TabIndex = 2; // // comments // - this.comments.Dock = System.Windows.Forms.DockStyle.Fill; - this.comments.Location = new System.Drawing.Point(122, 28); + resources.ApplyResources(this.comments, "comments"); this.comments.Name = "comments"; - this.comments.Size = new System.Drawing.Size(406, 20); - this.comments.TabIndex = 3; // // groupLabel // - this.groupLabel.AutoSize = true; - this.groupLabel.ImeMode = System.Windows.Forms.ImeMode.NoControl; - this.groupLabel.Location = new System.Drawing.Point(3, 6); - this.groupLabel.Margin = new System.Windows.Forms.Padding(3, 6, 3, 0); + resources.ApplyResources(this.groupLabel, "groupLabel"); this.groupLabel.Name = "groupLabel"; - this.groupLabel.Size = new System.Drawing.Size(67, 13); - this.groupLabel.TabIndex = 0; - this.groupLabel.Text = "Group Name"; // // active // - this.active.Appearance = System.Windows.Forms.Appearance.Button; - this.active.AutoSize = true; + resources.ApplyResources(this.active, "active"); this.active.Checked = true; this.active.CheckState = System.Windows.Forms.CheckState.Checked; - this.active.Dock = System.Windows.Forms.DockStyle.Fill; - this.active.ImeMode = System.Windows.Forms.ImeMode.NoControl; - this.active.Location = new System.Drawing.Point(122, 56); - this.active.Margin = new System.Windows.Forms.Padding(3, 6, 3, 3); this.active.Name = "active"; - this.active.Size = new System.Drawing.Size(406, 26); - this.active.TabIndex = 6; - this.active.Text = "Active"; - this.active.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; this.active.UseVisualStyleBackColor = true; // - // groupBox1 - // - this.groupBox1.Controls.Add(this.availableGroups); - this.groupBox1.Dock = System.Windows.Forms.DockStyle.Fill; - this.groupBox1.Location = new System.Drawing.Point(3, 3); - this.groupBox1.Name = "groupBox1"; - this.groupBox1.Size = new System.Drawing.Size(223, 258); - this.groupBox1.TabIndex = 3; - this.groupBox1.TabStop = false; - this.groupBox1.Text = "Available Groups"; - // - // availableGroups - // - this.availableGroups.Dock = System.Windows.Forms.DockStyle.Fill; - this.availableGroups.FormattingEnabled = true; - this.availableGroups.Location = new System.Drawing.Point(3, 16); - this.availableGroups.Name = "availableGroups"; - this.availableGroups.SelectionMode = System.Windows.Forms.SelectionMode.MultiSimple; - this.availableGroups.Size = new System.Drawing.Size(217, 239); - this.availableGroups.TabIndex = 4; - // // GroupMetaForm // - this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); + resources.ApplyResources(this, "$this"); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(555, 409); this.Controls.Add(this.tableLayoutPanel1); this.Controls.Add(this.tableLayoutPanel4); this.Controls.Add(this.tableLayoutPanel2); this.Name = "GroupMetaForm"; - this.Text = "Meta Group"; this.Load += new System.EventHandler(this.GroupMetaForm_Load); this.tableLayoutPanel2.ResumeLayout(false); this.tableLayoutPanel4.ResumeLayout(false); this.groupBox2.ResumeLayout(false); this.flowLayoutPanel1.ResumeLayout(false); + this.groupBox1.ResumeLayout(false); this.tableLayoutPanel1.ResumeLayout(false); this.tableLayoutPanel1.PerformLayout(); - this.groupBox1.ResumeLayout(false); this.ResumeLayout(false); } diff --git a/client/administration/UdsAdmin/forms/GroupMetaForm.resx b/client/administration/UdsAdmin/forms/GroupMetaForm.resx index 5ea0895e..0dee3206 100644 --- a/client/administration/UdsAdmin/forms/GroupMetaForm.resx +++ b/client/administration/UdsAdmin/forms/GroupMetaForm.resx @@ -117,4 +117,742 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + 3 + + + + Bottom, Left, Right + + + NoControl + + + + 3, 7 + + + 160, 23 + + + 0 + + + Accept + + + accept + + + System.Windows.Forms.Button, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tableLayoutPanel2 + + + 0 + + + Bottom, Left, Right + + + NoControl + + + 391, 7 + + + 161, 23 + + + 1 + + + Cancel + + + cancel + + + System.Windows.Forms.Button, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tableLayoutPanel2 + + + 1 + + + 3 + + + Fill + + + 169, 3 + + + 1 + + + 216, 27 + + + 2 + + + tableLayoutPanel3 + + + System.Windows.Forms.TableLayoutPanel, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tableLayoutPanel2 + + + 2 + + + <?xml version="1.0" encoding="utf-16"?><TableLayoutSettings><Controls /><Columns Styles="Percent,20,Percent,60,Percent,20" /><Rows Styles="Percent,100" /></TableLayoutSettings> + + + Bottom + + + 0, 376 + + + 1 + + + 555, 33 + + + 8 + + + tableLayoutPanel2 + + + System.Windows.Forms.TableLayoutPanel, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 2 + + + <?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> + + + Top, Bottom, Left, Right + + + 3 + + + groupBox2 + + + System.Windows.Forms.GroupBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tableLayoutPanel4 + + + 0 + + + flowLayoutPanel1 + + + System.Windows.Forms.FlowLayoutPanel, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tableLayoutPanel4 + + + 1 + + + groupBox1 + + + System.Windows.Forms.GroupBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tableLayoutPanel4 + + + 2 + + + 11, 103 + + + 1 + + + 538, 264 + + + 10 + + + tableLayoutPanel4 + + + 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="groupBox2" Row="0" RowSpan="1" Column="2" ColumnSpan="1" /><Control Name="flowLayoutPanel1" Row="0" RowSpan="1" Column="1" ColumnSpan="1" /><Control Name="groupBox1" Row="0" RowSpan="1" Column="0" ColumnSpan="1" /></Controls><Columns Styles="Percent,50,Absolute,80,Percent,50" /><Rows Styles="Percent,100" /></TableLayoutSettings> + + + selectedGroups + + + System.Windows.Forms.ListBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + groupBox2 + + + 0 + + + Fill + + + 312, 3 + + + 223, 258 + + + 1 + + + Selected Groups + + + groupBox2 + + + System.Windows.Forms.GroupBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tableLayoutPanel4 + + + 0 + + + Fill + + + 3, 16 + + + 217, 239 + + + 0 + + + selectedGroups + + + System.Windows.Forms.ListBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + groupBox2 + + + 0 + + + Top, Left, Right + + + button1 + + + System.Windows.Forms.Button, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + flowLayoutPanel1 + + + 0 + + + button2 + + + System.Windows.Forms.Button, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + flowLayoutPanel1 + + + 1 + + + TopDown + + + 232, 46 + + + 3, 46, 3, 3 + + + 74, 64 + + + 2 + + + flowLayoutPanel1 + + + System.Windows.Forms.FlowLayoutPanel, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tableLayoutPanel4 + + + 1 + + + 3, 3 + + + 70, 23 + + + 0 + + + > + + + button1 + + + System.Windows.Forms.Button, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + flowLayoutPanel1 + + + 0 + + + 3, 32 + + + 70, 23 + + + 1 + + + < + + + button2 + + + System.Windows.Forms.Button, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + flowLayoutPanel1 + + + 1 + + + availableGroups + + + System.Windows.Forms.ListBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + groupBox1 + + + 0 + + + Fill + + + 3, 3 + + + 223, 258 + + + 3 + + + Available Groups + + + groupBox1 + + + System.Windows.Forms.GroupBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tableLayoutPanel4 + + + 2 + + + Fill + + + 3, 16 + + + 217, 239 + + + 4 + + + availableGroups + + + System.Windows.Forms.ListBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + groupBox1 + + + 0 + + + Top, Left, Right + + + 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 + + + name + + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tableLayoutPanel1 + + + 2 + + + comments + + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tableLayoutPanel1 + + + 3 + + + groupLabel + + + System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tableLayoutPanel1 + + + 4 + + + active + + + System.Windows.Forms.CheckBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tableLayoutPanel1 + + + 5 + + + 12, 12 + + + 3 + + + 531, 85 + + + 11 + + + 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="name" Row="0" RowSpan="1" Column="1" ColumnSpan="1" /><Control Name="comments" Row="1" RowSpan="1" Column="1" ColumnSpan="1" /><Control Name="groupLabel" Row="0" RowSpan="1" Column="0" ColumnSpan="1" /><Control Name="active" Row="2" RowSpan="1" Column="1" ColumnSpan="1" /></Controls><Columns Styles="Percent,22,52252,Percent,77,47748" /><Rows Styles="Percent,30,Percent,30,Percent,40" /></TableLayoutSettings> + + + True + + + NoControl + + + 3, 56 + + + 3, 6, 3, 0 + + + 32, 13 + + + 7 + + + State + + + label3 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tableLayoutPanel1 + + + 0 + + + True + + + NoControl + + + 3, 31 + + + 3, 6, 3, 0 + + + 56, 13 + + + 1 + + + Comments + + + label2 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tableLayoutPanel1 + + + 1 + + + Fill + + + 122, 3 + + + 406, 20 + + + 2 + + + name + + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tableLayoutPanel1 + + + 2 + + + Fill + + + 122, 28 + + + 406, 20 + + + 3 + + + comments + + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tableLayoutPanel1 + + + 3 + + + True + + + NoControl + + + 3, 6 + + + 3, 6, 3, 0 + + + 67, 13 + + + 0 + + + Group Name + + + groupLabel + + + System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tableLayoutPanel1 + + + 4 + + + Button + + + True + + + Fill + + + NoControl + + + 122, 56 + + + 3, 6, 3, 3 + + + 406, 26 + + + 6 + + + Active + + + MiddleCenter + + + active + + + System.Windows.Forms.CheckBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tableLayoutPanel1 + + + 5 + + + True + + + 6, 13 + + + 555, 409 + + + Meta Group + + + GroupMetaForm + + + System.Windows.Forms.Form, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + \ No newline at end of file diff --git a/client/administration/UdsAdmin/forms/MainForm.cs b/client/administration/UdsAdmin/forms/MainForm.cs index 676d86f0..689fa83e 100644 --- a/client/administration/UdsAdmin/forms/MainForm.cs +++ b/client/administration/UdsAdmin/forms/MainForm.cs @@ -337,6 +337,8 @@ namespace UdsAdmin.forms } case gui.ActionTree.DELETE_ACTION: { + if (MessageBox.Show(Strings.confirmDelete, Strings.removeQuestion, MessageBoxButtons.YesNo) == DialogResult.No) + break; xmlrpc.Authenticator auth = (xmlrpc.Authenticator)treeActions.SelectedNode.Tag; xmlrpc.UdsAdminService.RemoveAuthenticator(auth.id); updateAuthenticatorsTree(); diff --git a/client/administration/UdsAdmin/forms/MainForm.de.resx b/client/administration/UdsAdmin/forms/MainForm.de.resx index 7972aad7..b03c6cd7 100644 --- a/client/administration/UdsAdmin/forms/MainForm.de.resx +++ b/client/administration/UdsAdmin/forms/MainForm.de.resx @@ -284,4 +284,7 @@ Löscht den Cache + + Konfiguration + \ No newline at end of file diff --git a/client/administration/UdsAdmin/forms/MainForm.es.resx b/client/administration/UdsAdmin/forms/MainForm.es.resx index e249e498..9eeb2608 100644 --- a/client/administration/UdsAdmin/forms/MainForm.es.resx +++ b/client/administration/UdsAdmin/forms/MainForm.es.resx @@ -244,4 +244,7 @@ Borra la caché + + Configuración + \ No newline at end of file diff --git a/client/administration/UdsAdmin/forms/MainForm.fr.resx b/client/administration/UdsAdmin/forms/MainForm.fr.resx index aa88e1a4..da954a35 100644 --- a/client/administration/UdsAdmin/forms/MainForm.fr.resx +++ b/client/administration/UdsAdmin/forms/MainForm.fr.resx @@ -244,4 +244,7 @@ Efface le cache + + Configuration + \ No newline at end of file diff --git a/client/administration/UdsAdmin/forms/MainForm.resx b/client/administration/UdsAdmin/forms/MainForm.resx index 2b3b8f87..271e299a 100644 --- a/client/administration/UdsAdmin/forms/MainForm.resx +++ b/client/administration/UdsAdmin/forms/MainForm.resx @@ -237,53 +237,17 @@ 133, 17 - - 0, 0 - - - 610, 25 - - - 1 - - - topMenu - - - menuStrip1 - - - System.Windows.Forms.MenuStrip, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - $this - - - 3 - - - 42, 21 - - - File - 102, 22 Exit - - 52, 21 + + 42, 21 - - Tools - - - 165, 22 - - - Language + + File 127, 22 @@ -309,6 +273,12 @@ German + + 165, 22 + + + Language + 165, 22 @@ -321,11 +291,35 @@ About - - 103, 20 + + 52, 21 - - Service Provider + + Tools + + + 0, 0 + + + 610, 25 + + + 1 + + + topMenu + + + menuStrip1 + + + System.Windows.Forms.MenuStrip, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 3 106, 22 @@ -336,15 +330,15 @@ 106, 22 + + 103, 20 + + + Service Provider + 32, 19 - - 126, 22 - - - Language - 126, 22 @@ -357,6 +351,12 @@ English + + 126, 22 + + + Language + 126, 22 @@ -366,6 +366,18 @@ 248, 17 + + Magenta + + + 23, 22 + + + Flush Cache + + + Clears the cache + 0, 25 @@ -390,18 +402,6 @@ 1 - - Magenta - - - 23, 22 - - - Flush Cache - - - Clears the cache - True diff --git a/client/administration/UdsAdmin/forms/UserForm.resx b/client/administration/UdsAdmin/forms/UserForm.resx index 3f4cd417..e203b553 100644 --- a/client/administration/UdsAdmin/forms/UserForm.resx +++ b/client/administration/UdsAdmin/forms/UserForm.resx @@ -279,36 +279,6 @@ Top, Left, Right - - 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,56" /><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 @@ -321,42 +291,6 @@ 0 - - 7, 7 - - - 372, 184 - - - 0 - - - groupsList - - - System.Windows.Forms.CheckedListBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - group - - - 0 - - - 4, 23 - - - 3, 3, 3, 3 - - - 385, 210 - - - 1 - - - Groups - group @@ -390,6 +324,48 @@ 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,63" /><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 @@ -601,16 +577,16 @@ 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,56" /><Rows Styles="Percent,15,Percent,15,Percent,14,Percent,14,Percent,14,Percent,14,Percent,14,Absolute,20" /></TableLayoutSettings> + <?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,63" /><Rows Styles="Percent,15,Percent,15,Percent,14,Percent,14,Percent,14,Percent,14,Percent,14,Absolute,20" /></TableLayoutSettings> Fill - 90, 32 + 88, 32 - 280, 20 + 282, 20 3 @@ -691,10 +667,10 @@ Fill - 90, 3 + 88, 3 - 223, 20 + 218, 20 1 @@ -715,10 +691,10 @@ Fill - 90, 61 + 88, 61 - 280, 20 + 282, 20 4 @@ -739,7 +715,7 @@ NoControl - 319, 3 + 312, 3 30, 20 @@ -796,10 +772,10 @@ Fill - 90, 88 + 88, 88 - 280, 21 + 282, 21 5 @@ -940,10 +916,10 @@ Fill - 90, 169 + 88, 169 - 280, 20 + 282, 20 6 @@ -967,10 +943,10 @@ Fill - 90, 115 + 88, 115 - 223, 21 + 218, 21 14 @@ -994,10 +970,10 @@ Fill - 90, 142 + 88, 142 - 223, 21 + 218, 21 15 @@ -1014,6 +990,66 @@ 14 + + groupsList + + + System.Windows.Forms.CheckedListBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + group + + + 0 + + + 4, 23 + + + 3, 3, 3, 3 + + + 385, 210 + + + 1 + + + Groups + + + group + + + System.Windows.Forms.TabPage, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tabs + + + 1 + + + 7, 7 + + + 372, 184 + + + 0 + + + groupsList + + + System.Windows.Forms.CheckedListBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + group + + + 0 + True