burmatovan/openuds
1
0
Fork 0
forked from shaba/openuds
Code Issues Pull Requests Projects Releases Wiki Activity

* Added translations to administration client

Browse Source 
* Upgraded version to administration client
* Added support for new server characteristics
This commit is contained in:
Adolfo Gómez 2013-04-17 08:59:24 +00:00
parent 5538caa9bb
commit 38dd6e23c8
22 changed files with 171 additions and 311 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
client/administration/UdsAdmin/Properties/AssemblyInfo.cs
View File

@ -33,6 +33,6 @@ using System.Resources;
// Puede especificar todos los valores o establecer como predeterminados los números de versión de compilación y de revisión
// mediante el asterisco ('*'), como se muestra a continuación:
// [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("1.1.1.0")]
[assembly: AssemblyFileVersion("1.1.1.0")]
[assembly: AssemblyVersion("1.2.0.0")]
[assembly: AssemblyFileVersion("1.2.0.0")]
[assembly: NeutralResourcesLanguageAttribute("en")]

2
client/administration/UdsAdmin/controls/ListEditor.es.resx
View File

@ -118,6 +118,6 @@
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<data name="bntOpen.Text" xml:space="preserve">
<value>Abra el editor</value>
<value>Abrir el editor</value>
</data>
</root>

4
client/administration/UdsAdmin/controls/panel/DeployedPanel.es.resx
View File

@ -127,12 +127,12 @@
<value>Revisión</value>
</data>
<data name="CreationDate.Text" xml:space="preserve">
<value>Fecha de creación de</value>
<value>Fecha de creación</value>
</data>
<data name="State.Text" xml:space="preserve">
<value>Estado</value>
</data>
<data name="StatusDate.Text" xml:space="preserve">
<value>Etapa Fecha</value>
<value>Fecha Estado</value>
</data>
</root>

4
client/administration/UdsAdmin/controls/panel/DeployedServicePanel.es.resx
View File

@ -325,7 +325,7 @@
<value>13</value>
</data>
<data name="cacheLabel.Text" xml:space="preserve">
<value>Servicios para mantener en la memoria caché</value>
<value>Servicios a mantener en la memoria caché</value>
</data>
<data name="&gt;&gt;cacheLabel.Name" xml:space="preserve">
<value>cacheLabel</value>
@ -358,7 +358,7 @@
<value>14</value>
</data>
<data name="cacheL2Label.Text" xml:space="preserve">
<value>Servicios para mantener en la memoria caché L2</value>
<value>Servicios a mantener en la memoria caché L2</value>
</data>
<data name="&gt;&gt;cacheL2Label.Name" xml:space="preserve">
<value>cacheL2Label</value>

2
client/administration/UdsAdmin/controls/panel/LogViewer.es.resx
View File

@ -130,7 +130,7 @@
<value>mensaje</value>
</data>
<data name="source.Text" xml:space="preserve">
<value>fuente</value>
<value>origen</value>
</data>
<data name="date.Text" xml:space="preserve">
<value>fecha</value>

19
client/administration/UdsAdmin/controls/panel/NetworksPanel.Designer.cs generated
View File

@ -31,8 +31,7 @@
System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(NetworksPanel));
this.listView = new System.Windows.Forms.ListView();
this.name = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader()));
this.rangeStart = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader()));
this.rangeEnd = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader()));
this.netRange = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader()));
this.SuspendLayout();
//
// listView
@ -40,8 +39,7 @@
this.listView.AutoArrange = false;
this.listView.Columns.AddRange(new System.Windows.Forms.ColumnHeader[] {
this.name,
this.rangeStart,
this.rangeEnd});
this.netRange});
resources.ApplyResources(this.listView, "listView");
this.listView.FullRowSelect = true;
this.listView.GridLines = true;
@ -57,15 +55,9 @@
resources.ApplyResources(this.name, "name");
this.name.Width = global::UdsAdmin.Properties.Settings.Default.wNameCol;
//
// rangeStart
// netRange
//
resources.ApplyResources(this.rangeStart, "rangeStart");
this.rangeStart.Width = global::UdsAdmin.Properties.Settings.Default.wStateCol;
//
// rangeEnd
//
resources.ApplyResources(this.rangeEnd, "rangeEnd");
this.rangeEnd.Width = global::UdsAdmin.Properties.Settings.Default.wCommentsCol;
resources.ApplyResources(this.netRange, "netRange");
//
// NetworksPanel
//
@ -82,7 +74,6 @@
private System.Windows.Forms.ListView listView;
private System.Windows.Forms.ColumnHeader name;
private System.Windows.Forms.ColumnHeader rangeStart;
private System.Windows.Forms.ColumnHeader rangeEnd;
private System.Windows.Forms.ColumnHeader netRange;
}
}

19
client/administration/UdsAdmin/controls/panel/NetworksPanel.cs
View File

@ -54,9 +54,10 @@ namespace UdsAdmin.controls.panel
ToolStripMenuItem newG1 = new ToolStripMenuItem(Strings.newItem); newG1.Click += newItem; newG1.Image = Images.new16;
ToolStripMenuItem newG2 = new ToolStripMenuItem(Strings.newItem); newG2.Click += newItem; newG2.Image = Images.new16;
ToolStripMenuItem delete = new ToolStripMenuItem(Strings.deleteItem); delete.Click += deleteItem; delete.Image = Images.delete16;
ToolStripMenuItem modify = new ToolStripMenuItem(Strings.modifyItem); modify.Click += modifyItem;
_emptyMenu.Items.Add(newG1);
_fullMenu.Items.AddRange(new ToolStripItem[] { newG2, delete });
_fullMenu.Items.AddRange(new ToolStripItem[] { modify, newG2, delete });
listView.ListViewItemSorter = _listSorter = new gui.ListViewSorter(listView);
@ -79,9 +80,9 @@ namespace UdsAdmin.controls.panel
List<ListViewItem> lst = new List<ListViewItem>();
foreach (xmlrpc.Network net in nets)
{
ListViewItem itm = new ListViewItem(new string[]{net.name, net.netStart, net.netEnd});
ListViewItem itm = new ListViewItem(new string[]{net.name, net.netRange});
itm.ForeColor = gui.Colors.ActiveColor;
itm.Tag = net;
itm.Tag = net.id;
lst.Add(itm);
}
listView.Items.Clear();
@ -93,6 +94,16 @@ namespace UdsAdmin.controls.panel
}
}
private void modifyItem(object sender, EventArgs e)
{
xmlrpc.Network net = xmlrpc.UdsAdminService.GetNetwork((string)(listView.SelectedItems[0].Tag));
UdsAdmin.forms.NetworkForm form = new UdsAdmin.forms.NetworkForm(net);
if (form.ShowDialog() == DialogResult.OK)
{
updateList();
}
}
private void newItem(object sender, EventArgs e)
{
UdsAdmin.forms.NetworkForm form = new UdsAdmin.forms.NetworkForm();
@ -110,7 +121,7 @@ namespace UdsAdmin.controls.panel
int n = 0;
foreach (ListViewItem i in listView.SelectedItems)
{
ids[n++] = ((xmlrpc.Network)i.Tag).id;
ids[n++] = (string)i.Tag;
listView.Items.Remove(i);
}
xmlrpc.UdsAdminService.RemoveNetworks(ids);

3
client/administration/UdsAdmin/controls/panel/NetworksPanel.de.resx
View File

@ -189,4 +189,7 @@
<data name="&gt;&gt;$this.Type" xml:space="preserve">
<value>System.Windows.Forms.UserControl, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="netRange.Text" xml:space="preserve">
<value>Netzwerkbereich</value>
</data>
</root>

3
client/administration/UdsAdmin/controls/panel/NetworksPanel.es.resx
View File

@ -189,4 +189,7 @@
<data name="&gt;&gt;$this.Type" xml:space="preserve">
<value>System.Windows.Forms.UserControl, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="netRange.Text" xml:space="preserve">
<value>Rango de red</value>
</data>
</root>

3
client/administration/UdsAdmin/controls/panel/NetworksPanel.fr.resx
View File

@ -189,4 +189,7 @@
<data name="&gt;&gt;$this.Type" xml:space="preserve">
<value>System.Windows.Forms.UserControl, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="netRange.Text" xml:space="preserve">
<value>Gamme de réseau</value>
</data>
</root>

22
client/administration/UdsAdmin/controls/panel/NetworksPanel.resx
View File

@ -120,17 +120,17 @@
<data name="name.Text" xml:space="preserve">
<value>Name</value>
</data>
<data name="rangeStart.Text" xml:space="preserve">
<value>Range Start</value>
<data name="netRange.Text" xml:space="preserve">
<value>Network Range</value>
</data>
<data name="rangeEnd.Text" xml:space="preserve">
<value>Range End</value>
<assembly alias="mscorlib" name="mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
<data name="netRange.Width" type="System.Int32, mscorlib">
<value>320</value>
</data>
<assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
<data name="listView.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
<value>Fill</value>
</data>
<assembly alias="mscorlib" name="mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
<data name="listView.LabelWrap" type="System.Boolean, mscorlib">
<value>False</value>
</data>
@ -171,16 +171,10 @@
<data name="&gt;&gt;name.Type" xml:space="preserve">
<value>System.Windows.Forms.ColumnHeader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="&gt;&gt;rangeStart.Name" xml:space="preserve">
<value>rangeStart</value>
<data name="&gt;&gt;netRange.Name" xml:space="preserve">
<value>netRange</value>
</data>
<data name="&gt;&gt;rangeStart.Type" xml:space="preserve">
<value>System.Windows.Forms.ColumnHeader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="&gt;&gt;rangeEnd.Name" xml:space="preserve">
<value>rangeEnd</value>
</data>
<data name="&gt;&gt;rangeEnd.Type" xml:space="preserve">
<data name="&gt;&gt;netRange.Type" xml:space="preserve">
<value>System.Windows.Forms.ColumnHeader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="&gt;&gt;$this.Name" xml:space="preserve">

2
client/administration/UdsAdmin/forms/AboutBoxForm.de.resx
View File

@ -819,7 +819,7 @@
<value>24</value>
</data>
<data name="okButton.Text" xml:space="preserve">
<value>&amp; Akzeptieren</value>
<value>&amp;Akzeptieren</value>
</data>
<data name="&gt;&gt;okButton.Name" xml:space="preserve">
<value>okButton</value>

2
client/administration/UdsAdmin/forms/AboutBoxForm.es.resx
View File

@ -622,6 +622,6 @@
<value>Descripción</value>
</data>
<data name="okButton.Text" xml:space="preserve">
<value>&amp; Aceptar</value>
<value>&amp;Aceptar</value>
</data>
</root>

2
client/administration/UdsAdmin/forms/AboutBoxForm.fr.resx
View File

@ -819,7 +819,7 @@
<value>24</value>
</data>
<data name="okButton.Text" xml:space="preserve">
<value>&amp; Accepter</value>
<value>&amp;Accepter</value>
</data>
<data name="&gt;&gt;okButton.Name" xml:space="preserve">
<value>okButton</value>

9
client/administration/UdsAdmin/forms/LoginForm.de.resx
View File

@ -454,4 +454,13 @@
<data name="&gt;&gt;$this.Type" xml:space="preserve">
<value>System.Windows.Forms.Form, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="connectButton.Text" xml:space="preserve">
<value>Verbinden</value>
</data>
<data name="exitButton.Text" xml:space="preserve">
<value>Ausfahrt</value>
</data>
<data name="extendButton.Text" xml:space="preserve">
<value>&gt;&gt;&gt;</value>
</data>
</root>

9
client/administration/UdsAdmin/forms/LoginForm.es.resx
View File

@ -148,4 +148,13 @@
<data name="label4.Text" xml:space="preserve">
<value>Autenticador</value>
</data>
<data name="connectButton.Text" xml:space="preserve">
<value>Conectar</value>
</data>
<data name="exitButton.Text" xml:space="preserve">
<value>Salida</value>
</data>
<data name="extendButton.Text" xml:space="preserve">
<value>&gt;&gt;&gt;</value>
</data>
</root>

9
client/administration/UdsAdmin/forms/LoginForm.fr.resx
View File

@ -454,4 +454,13 @@
<data name="&gt;&gt;$this.Type" xml:space="preserve">
<value>System.Windows.Forms.Form, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="connectButton.Text" xml:space="preserve">
<value>Se connecter</value>
</data>
<data name="exitButton.Text" xml:space="preserve">
<value>Sortie</value>
</data>
<data name="extendButton.Text" xml:space="preserve">
<value>&gt;&gt;&gt;</value>
</data>
</root>

28
client/administration/UdsAdmin/forms/NetworkForm.Designer.cs generated
View File

@ -33,12 +33,10 @@
this.accept = new System.Windows.Forms.Button();
this.cancel = new System.Windows.Forms.Button();
this.tableLayoutPanel1 = new System.Windows.Forms.TableLayoutPanel();
this.label3 = new System.Windows.Forms.Label();
this.label2 = new System.Windows.Forms.Label();
this.groupLabel = new System.Windows.Forms.Label();
this.name = new System.Windows.Forms.TextBox();
this.netStart = new System.Windows.Forms.TextBox();
this.netEnd = new System.Windows.Forms.TextBox();
this.netRange = new System.Windows.Forms.TextBox();
this.tableLayoutPanel2.SuspendLayout();
this.tableLayoutPanel1.SuspendLayout();
this.SuspendLayout();
@ -67,19 +65,12 @@
// tableLayoutPanel1
//
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.groupLabel, 0, 0);
this.tableLayoutPanel1.Controls.Add(this.name, 1, 0);
this.tableLayoutPanel1.Controls.Add(this.netStart, 1, 1);
this.tableLayoutPanel1.Controls.Add(this.netEnd, 1, 2);
this.tableLayoutPanel1.Controls.Add(this.netRange, 1, 1);
this.tableLayoutPanel1.Name = "tableLayoutPanel1";
//
// label3
//
resources.ApplyResources(this.label3, "label3");
this.label3.Name = "label3";
//
// label2
//
resources.ApplyResources(this.label2, "label2");
@ -95,15 +86,10 @@
resources.ApplyResources(this.name, "name");
this.name.Name = "name";
//
// netStart
// netRange
//
resources.ApplyResources(this.netStart, "netStart");
this.netStart.Name = "netStart";
//
// netEnd
//
resources.ApplyResources(this.netEnd, "netEnd");
this.netEnd.Name = "netEnd";
resources.ApplyResources(this.netRange, "netRange");
this.netRange.Name = "netRange";
//
// NetworkForm
//
@ -128,11 +114,9 @@
private System.Windows.Forms.Button accept;
private System.Windows.Forms.Button cancel;
private System.Windows.Forms.TableLayoutPanel tableLayoutPanel1;
private System.Windows.Forms.Label label3;
private System.Windows.Forms.Label label2;
private System.Windows.Forms.Label groupLabel;
private System.Windows.Forms.TextBox name;
private System.Windows.Forms.TextBox netStart;
private System.Windows.Forms.TextBox netEnd;
private System.Windows.Forms.TextBox netRange;
}
}

41
client/administration/UdsAdmin/forms/NetworkForm.cs
View File

@ -51,52 +51,23 @@ namespace UdsAdmin.forms
else
_net = new xmlrpc.Network();
netStart.KeyPress += HandleKeyPress;
netEnd.KeyPress += HandleKeyPress;
Text = Strings.titleNetwork;
}
private void NetworkForm_Load(object sender, EventArgs e)
{
if (_net == null)
if (_net != null)
{
name.Text = _net.name;
netStart.Text = _net.netStart;
netEnd.Text = _net.netEnd;
netRange.Text = _net.netRange;
}
Location = MainForm.centerLocation(this);
}
private void accept_Click(object sender, EventArgs e)
{
if (name.Text.Trim().Length == 0)
{
gui.UserNotifier.notifyError(Strings.nameRequired);
return;
}
System.Net.IPAddress ip;
System.Net.IPAddress ip2;
if (System.Net.IPAddress.TryParse(netStart.Text, out ip) == false)
{
MessageBox.Show(Strings.invalidIpAddress, Strings.netStart, MessageBoxButtons.OK, MessageBoxIcon.Error);
return;
}
if (System.Net.IPAddress.TryParse(netEnd.Text, out ip2) == false)
{
MessageBox.Show(Strings.invalidIpAddress, Strings.netEnd, MessageBoxButtons.OK, MessageBoxIcon.Error);
return;
}
if (ip.Address > ip2.Address)
{
MessageBox.Show(Strings.netRangeError, Strings.netStart + "/" + Strings.netEnd, MessageBoxButtons.OK, MessageBoxIcon.Error);
return;
}
_net.name = name.Text;
_net.netStart = netStart.Text;
_net.netEnd = netEnd.Text;
_net.netRange = netRange.Text;
try {
if (_net.id == "")
{
@ -115,11 +86,5 @@ namespace UdsAdmin.forms
}
private void HandleKeyPress(object sender, KeyPressEventArgs e)
{
if (!(char.IsDigit(e.KeyChar) || char.IsControl(e.KeyChar)) && e.KeyChar != '.')
e.Handled = true;
}
}
}

270
client/administration/UdsAdmin/forms/NetworkForm.resx
View File

@ -181,7 +181,7 @@
<value>Bottom</value>
</data>
<data name="tableLayoutPanel2.Location" type="System.Drawing.Point, System.Drawing">
<value>0, 117</value>
<value>0, 83</value>
</data>
<data name="tableLayoutPanel2.RowCount" type="System.Int32, mscorlib">
<value>1</value>
@ -213,17 +213,23 @@
<data name="tableLayoutPanel1.ColumnCount" type="System.Int32, mscorlib">
<value>2</value>
</data>
<data name="&gt;&gt;label3.Name" xml:space="preserve">
<value>label3</value>
<data name="label2.AutoSize" type="System.Boolean, mscorlib">
<value>True</value>
</data>
<data name="&gt;&gt;label3.Type" xml:space="preserve">
<value>System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
<data name="label2.Location" type="System.Drawing.Point, System.Drawing">
<value>3, 34</value>
</data>
<data name="&gt;&gt;label3.Parent" xml:space="preserve">
<value>tableLayoutPanel1</value>
<data name="label2.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
<value>3, 6, 3, 0</value>
</data>
<data name="&gt;&gt;label3.ZOrder" xml:space="preserve">
<value>0</value>
<data name="label2.Size" type="System.Drawing.Size, System.Drawing">
<value>82, 13</value>
</data>
<data name="label2.TabIndex" type="System.Int32, mscorlib">
<value>1</value>
</data>
<data name="label2.Text" xml:space="preserve">
<value>Network Range</value>
</data>
<data name="&gt;&gt;label2.Name" xml:space="preserve">
<value>label2</value>
@ -235,7 +241,25 @@
<value>tableLayoutPanel1</value>
</data>
<data name="&gt;&gt;label2.ZOrder" xml:space="preserve">
<value>1</value>
<value>0</value>
</data>
<data name="groupLabel.AutoSize" type="System.Boolean, mscorlib">
<value>True</value>
</data>
<data name="groupLabel.Location" type="System.Drawing.Point, System.Drawing">
<value>3, 6</value>
</data>
<data name="groupLabel.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
<value>3, 6, 3, 0</value>
</data>
<data name="groupLabel.Size" type="System.Drawing.Size, System.Drawing">
<value>78, 13</value>
</data>
<data name="groupLabel.TabIndex" type="System.Int32, mscorlib">
<value>0</value>
</data>
<data name="groupLabel.Text" xml:space="preserve">
<value>Network Name</value>
</data>
<data name="&gt;&gt;groupLabel.Name" xml:space="preserve">
<value>groupLabel</value>
@ -247,7 +271,19 @@
<value>tableLayoutPanel1</value>
</data>
<data name="&gt;&gt;groupLabel.ZOrder" xml:space="preserve">
<value>2</value>
<value>1</value>
</data>
<data name="name.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
<value>Fill</value>
</data>
<data name="name.Location" type="System.Drawing.Point, System.Drawing">
<value>204, 3</value>
</data>
<data name="name.Size" type="System.Drawing.Size, System.Drawing">
<value>195, 20</value>
</data>
<data name="name.TabIndex" type="System.Int32, mscorlib">
<value>0</value>
</data>
<data name="&gt;&gt;name.Name" xml:space="preserve">
<value>name</value>
@ -259,40 +295,40 @@
<value>tableLayoutPanel1</value>
</data>
<data name="&gt;&gt;name.ZOrder" xml:space="preserve">
<value>2</value>
</data>
<data name="netRange.Location" type="System.Drawing.Point, System.Drawing">
<value>204, 31</value>
</data>
<data name="netRange.MaxLength" type="System.Int32, mscorlib">
<value>64</value>
</data>
<data name="netRange.Size" type="System.Drawing.Size, System.Drawing">
<value>195, 20</value>
</data>
<data name="netRange.TabIndex" type="System.Int32, mscorlib">
<value>1</value>
</data>
<data name="&gt;&gt;netRange.Name" xml:space="preserve">
<value>netRange</value>
</data>
<data name="&gt;&gt;netRange.Type" xml:space="preserve">
<value>System.Windows.Forms.TextBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="&gt;&gt;netRange.Parent" xml:space="preserve">
<value>tableLayoutPanel1</value>
</data>
<data name="&gt;&gt;netRange.ZOrder" xml:space="preserve">
<value>3</value>
</data>
<data name="&gt;&gt;netStart.Name" xml:space="preserve">
<value>netStart</value>
</data>
<data name="&gt;&gt;netStart.Type" xml:space="preserve">
<value>System.Windows.Forms.TextBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="&gt;&gt;netStart.Parent" xml:space="preserve">
<value>tableLayoutPanel1</value>
</data>
<data name="&gt;&gt;netStart.ZOrder" xml:space="preserve">
<value>4</value>
</data>
<data name="&gt;&gt;netEnd.Name" xml:space="preserve">
<value>netEnd</value>
</data>
<data name="&gt;&gt;netEnd.Type" xml:space="preserve">
<value>System.Windows.Forms.TextBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="&gt;&gt;netEnd.Parent" xml:space="preserve">
<value>tableLayoutPanel1</value>
</data>
<data name="&gt;&gt;netEnd.ZOrder" xml:space="preserve">
<value>5</value>
</data>
<data name="tableLayoutPanel1.Location" type="System.Drawing.Point, System.Drawing">
<value>12, 12</value>
</data>
<data name="tableLayoutPanel1.RowCount" type="System.Int32, mscorlib">
<value>3</value>
<value>2</value>
</data>
<data name="tableLayoutPanel1.Size" type="System.Drawing.Size, System.Drawing">
<value>402, 85</value>
<value>402, 56</value>
</data>
<data name="tableLayoutPanel1.TabIndex" type="System.Int32, mscorlib">
<value>10</value>
@ -310,163 +346,7 @@
<value>0</value>
</data>
<data name="tableLayoutPanel1.LayoutSettings" type="System.Windows.Forms.TableLayoutSettings, System.Windows.Forms">
<value>&lt;?xml version="1.0" encoding="utf-16"?&gt;&lt;TableLayoutSettings&gt;&lt;Controls&gt;&lt;Control Name="label3" Row="2" RowSpan="1" Column="0" ColumnSpan="1" /&gt;&lt;Control Name="label2" Row="1" RowSpan="1" Column="0" ColumnSpan="1" /&gt;&lt;Control Name="groupLabel" Row="0" RowSpan="1" Column="0" ColumnSpan="1" /&gt;&lt;Control Name="name" Row="0" RowSpan="1" Column="1" ColumnSpan="1" /&gt;&lt;Control Name="netStart" Row="1" RowSpan="1" Column="1" ColumnSpan="1" /&gt;&lt;Control Name="netEnd" Row="2" RowSpan="1" Column="1" ColumnSpan="1" /&gt;&lt;/Controls&gt;&lt;Columns Styles="Percent,35,95506,Percent,64,04494" /&gt;&lt;Rows Styles="Percent,33,Percent,33,Percent,34" /&gt;&lt;/TableLayoutSettings&gt;</value>
</data>
<data name="label3.AutoSize" type="System.Boolean, mscorlib">
<value>True</value>
</data>
<data name="label3.Location" type="System.Drawing.Point, System.Drawing">
<value>3, 62</value>
</data>
<data name="label3.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
<value>3, 6, 3, 0</value>
</data>
<data name="label3.Size" type="System.Drawing.Size, System.Drawing">
<value>69, 13</value>
</data>
<data name="label3.TabIndex" type="System.Int32, mscorlib">
<value>7</value>
</data>
<data name="label3.Text" xml:space="preserve">
<value>Network End</value>
</data>
<data name="&gt;&gt;label3.Name" xml:space="preserve">
<value>label3</value>
</data>
<data name="&gt;&gt;label3.Type" xml:space="preserve">
<value>System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="&gt;&gt;label3.Parent" xml:space="preserve">
<value>tableLayoutPanel1</value>
</data>
<data name="&gt;&gt;label3.ZOrder" xml:space="preserve">
<value>0</value>
</data>
<data name="label2.AutoSize" type="System.Boolean, mscorlib">
<value>True</value>
</data>
<data name="label2.Location" type="System.Drawing.Point, System.Drawing">
<value>3, 34</value>
</data>
<data name="label2.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
<value>3, 6, 3, 0</value>
</data>
<data name="label2.Size" type="System.Drawing.Size, System.Drawing">
<value>72, 13</value>
</data>
<data name="label2.TabIndex" type="System.Int32, mscorlib">
<value>1</value>
</data>
<data name="label2.Text" xml:space="preserve">
<value>Network Start</value>
</data>
<data name="&gt;&gt;label2.Name" xml:space="preserve">
<value>label2</value>
</data>
<data name="&gt;&gt;label2.Type" xml:space="preserve">
<value>System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="&gt;&gt;label2.Parent" xml:space="preserve">
<value>tableLayoutPanel1</value>
</data>
<data name="&gt;&gt;label2.ZOrder" xml:space="preserve">
<value>1</value>
</data>
<data name="groupLabel.AutoSize" type="System.Boolean, mscorlib">
<value>True</value>
</data>
<data name="groupLabel.Location" type="System.Drawing.Point, System.Drawing">
<value>3, 6</value>
</data>
<data name="groupLabel.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
<value>3, 6, 3, 0</value>
</data>
<data name="groupLabel.Size" type="System.Drawing.Size, System.Drawing">
<value>113, 13</value>
</data>
<data name="groupLabel.TabIndex" type="System.Int32, mscorlib">
<value>0</value>
</data>
<data name="groupLabel.Text" xml:space="preserve">
<value>Network Range Name</value>
</data>
<data name="&gt;&gt;groupLabel.Name" xml:space="preserve">
<value>groupLabel</value>
</data>
<data name="&gt;&gt;groupLabel.Type" xml:space="preserve">
<value>System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="&gt;&gt;groupLabel.Parent" xml:space="preserve">
<value>tableLayoutPanel1</value>
</data>
<data name="&gt;&gt;groupLabel.ZOrder" xml:space="preserve">
<value>2</value>
</data>
<data name="name.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
<value>Fill</value>
</data>
<data name="name.Location" type="System.Drawing.Point, System.Drawing">
<value>147, 3</value>
</data>
<data name="name.Size" type="System.Drawing.Size, System.Drawing">
<value>252, 20</value>
</data>
<data name="name.TabIndex" type="System.Int32, mscorlib">
<value>0</value>
</data>
<data name="&gt;&gt;name.Name" xml:space="preserve">
<value>name</value>
</data>
<data name="&gt;&gt;name.Type" xml:space="preserve">
<value>System.Windows.Forms.TextBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="&gt;&gt;name.Parent" xml:space="preserve">
<value>tableLayoutPanel1</value>
</data>
<data name="&gt;&gt;name.ZOrder" xml:space="preserve">
<value>3</value>
</data>
<data name="netStart.Location" type="System.Drawing.Point, System.Drawing">
<value>147, 31</value>
</data>
<data name="netStart.Size" type="System.Drawing.Size, System.Drawing">
<value>119, 20</value>
</data>
<data name="netStart.TabIndex" type="System.Int32, mscorlib">
<value>1</value>
</data>
<data name="&gt;&gt;netStart.Name" xml:space="preserve">
<value>netStart</value>
</data>
<data name="&gt;&gt;netStart.Type" xml:space="preserve">
<value>System.Windows.Forms.TextBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="&gt;&gt;netStart.Parent" xml:space="preserve">
<value>tableLayoutPanel1</value>
</data>
<data name="&gt;&gt;netStart.ZOrder" xml:space="preserve">
<value>4</value>
</data>
<data name="netEnd.Location" type="System.Drawing.Point, System.Drawing">
<value>147, 59</value>
</data>
<data name="netEnd.Size" type="System.Drawing.Size, System.Drawing">
<value>119, 20</value>
</data>
<data name="netEnd.TabIndex" type="System.Int32, mscorlib">
<value>2</value>
</data>
<data name="&gt;&gt;netEnd.Name" xml:space="preserve">
<value>netEnd</value>
</data>
<data name="&gt;&gt;netEnd.Type" xml:space="preserve">
<value>System.Windows.Forms.TextBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="&gt;&gt;netEnd.Parent" xml:space="preserve">
<value>tableLayoutPanel1</value>
</data>
<data name="&gt;&gt;netEnd.ZOrder" xml:space="preserve">
<value>5</value>
<value>&lt;?xml version="1.0" encoding="utf-16"?&gt;&lt;TableLayoutSettings&gt;&lt;Controls&gt;&lt;Control Name="label2" Row="1" RowSpan="1" Column="0" ColumnSpan="1" /&gt;&lt;Control Name="groupLabel" Row="0" RowSpan="1" Column="0" ColumnSpan="1" /&gt;&lt;Control Name="name" Row="0" RowSpan="1" Column="1" ColumnSpan="1" /&gt;&lt;Control Name="netRange" Row="1" RowSpan="1" Column="1" ColumnSpan="1" /&gt;&lt;/Controls&gt;&lt;Columns Styles="Percent,50,Percent,50" /&gt;&lt;Rows Styles="Percent,50,Percent,50" /&gt;&lt;/TableLayoutSettings&gt;</value>
</data>
<metadata name="$this.Localizable" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
@ -475,7 +355,7 @@
<value>6, 13</value>
</data>
<data name="$this.ClientSize" type="System.Drawing.Size, System.Drawing">
<value>426, 150</value>
<value>426, 116</value>
</data>
<data name="$this.StartPosition" type="System.Windows.Forms.FormStartPosition, System.Windows.Forms">
<value>Manual</value>

18
client/administration/UdsAdmin/forms/UserForm.resx
View File

@ -364,7 +364,7 @@
<value>87, 3</value>
</data>
<data name="name.Size" type="System.Drawing.Size, System.Drawing">
<value>217, 20</value>
<value>215, 20</value>
</data>
<data name="name.TabIndex" type="System.Int32, mscorlib">
<value>1</value>
@ -409,7 +409,7 @@
<value>NoControl</value>
</data>
<data name="searchButton.Location" type="System.Drawing.Point, System.Drawing">
<value>310, 3</value>
<value>308, 3</value>
</data>
<data name="searchButton.Size" type="System.Drawing.Size, System.Drawing">
<value>30, 20</value>
@ -640,7 +640,7 @@
<value>87, 115</value>
</data>
<data name="staffMember.Size" type="System.Drawing.Size, System.Drawing">
<value>217, 21</value>
<value>215, 21</value>
</data>
<data name="staffMember.TabIndex" type="System.Int32, mscorlib">
<value>14</value>
@ -667,7 +667,7 @@
<value>87, 142</value>
</data>
<data name="admin.Size" type="System.Drawing.Size, System.Drawing">
<value>217, 21</value>
<value>215, 21</value>
</data>
<data name="admin.TabIndex" type="System.Int32, mscorlib">
<value>15</value>
@ -709,16 +709,16 @@
<value>0</value>
</data>
<data name="tableLayoutPanel1.LayoutSettings" type="System.Windows.Forms.TableLayoutSettings, System.Windows.Forms">
<value>&lt;?xml version="1.0" encoding="utf-16"?&gt;&lt;TableLayoutSettings&gt;&lt;Controls&gt;&lt;Control Name="realName" Row="1" RowSpan="1" Column="1" ColumnSpan="2" /&gt;&lt;Control Name="label4" Row="1" RowSpan="1" Column="0" ColumnSpan="1" /&gt;&lt;Control Name="label2" Row="2" RowSpan="1" Column="0" ColumnSpan="1" /&gt;&lt;Control Name="name" Row="0" RowSpan="1" Column="1" ColumnSpan="1" /&gt;&lt;Control Name="comments" Row="2" RowSpan="1" Column="1" ColumnSpan="2" /&gt;&lt;Control Name="searchButton" Row="0" RowSpan="1" Column="2" ColumnSpan="1" /&gt;&lt;Control Name="userNameLabel" Row="0" RowSpan="1" Column="0" ColumnSpan="1" /&gt;&lt;Control Name="state" Row="3" RowSpan="1" Column="1" ColumnSpan="2" /&gt;&lt;Control Name="passwordLabel" Row="6" RowSpan="1" Column="0" ColumnSpan="1" /&gt;&lt;Control Name="staffMemberLabel" Row="4" RowSpan="1" Column="0" ColumnSpan="1" /&gt;&lt;Control Name="adminLabel" Row="5" RowSpan="1" Column="0" ColumnSpan="1" /&gt;&lt;Control Name="label5" Row="3" RowSpan="1" Column="0" ColumnSpan="1" /&gt;&lt;Control Name="password" Row="6" RowSpan="1" Column="1" ColumnSpan="2" /&gt;&lt;Control Name="staffMember" Row="4" RowSpan="1" Column="1" ColumnSpan="1" /&gt;&lt;Control Name="admin" Row="5" RowSpan="1" Column="1" ColumnSpan="1" /&gt;&lt;/Controls&gt;&lt;Columns Styles="Percent,27,54098,Percent,72,45902,Absolute,65" /&gt;&lt;Rows Styles="Percent,15,Percent,15,Percent,14,Percent,14,Percent,14,Percent,14,Percent,14,Absolute,20" /&gt;&lt;/TableLayoutSettings&gt;</value>
<value>&lt;?xml version="1.0" encoding="utf-16"?&gt;&lt;TableLayoutSettings&gt;&lt;Controls&gt;&lt;Control Name="realName" Row="1" RowSpan="1" Column="1" ColumnSpan="2" /&gt;&lt;Control Name="label4" Row="1" RowSpan="1" Column="0" ColumnSpan="1" /&gt;&lt;Control Name="label2" Row="2" RowSpan="1" Column="0" ColumnSpan="1" /&gt;&lt;Control Name="name" Row="0" RowSpan="1" Column="1" ColumnSpan="1" /&gt;&lt;Control Name="comments" Row="2" RowSpan="1" Column="1" ColumnSpan="2" /&gt;&lt;Control Name="searchButton" Row="0" RowSpan="1" Column="2" ColumnSpan="1" /&gt;&lt;Control Name="userNameLabel" Row="0" RowSpan="1" Column="0" ColumnSpan="1" /&gt;&lt;Control Name="state" Row="3" RowSpan="1" Column="1" ColumnSpan="2" /&gt;&lt;Control Name="passwordLabel" Row="6" RowSpan="1" Column="0" ColumnSpan="1" /&gt;&lt;Control Name="staffMemberLabel" Row="4" RowSpan="1" Column="0" ColumnSpan="1" /&gt;&lt;Control Name="adminLabel" Row="5" RowSpan="1" Column="0" ColumnSpan="1" /&gt;&lt;Control Name="label5" Row="3" RowSpan="1" Column="0" ColumnSpan="1" /&gt;&lt;Control Name="password" Row="6" RowSpan="1" Column="1" ColumnSpan="2" /&gt;&lt;Control Name="staffMember" Row="4" RowSpan="1" Column="1" ColumnSpan="1" /&gt;&lt;Control Name="admin" Row="5" RowSpan="1" Column="1" ColumnSpan="1" /&gt;&lt;/Controls&gt;&lt;Columns Styles="Percent,27,54098,Percent,72,45902,Absolute,67" /&gt;&lt;Rows Styles="Percent,15,Percent,15,Percent,14,Percent,14,Percent,14,Percent,14,Percent,14,Absolute,20" /&gt;&lt;/TableLayoutSettings&gt;</value>
</data>
<data name="user.Location" type="System.Drawing.Point, System.Drawing">
<value>4, 23</value>
<value>4, 22</value>
</data>
<data name="user.Padding" type="System.Windows.Forms.Padding, System.Windows.Forms">
<value>3, 3, 3, 3</value>
</data>
<data name="user.Size" type="System.Drawing.Size, System.Drawing">
<value>385, 210</value>
<value>385, 211</value>
</data>
<data name="user.TabIndex" type="System.Int32, mscorlib">
<value>0</value>
@ -760,13 +760,13 @@
<value>0</value>
</data>
<data name="group.Location" type="System.Drawing.Point, System.Drawing">
<value>4, 23</value>
<value>4, 22</value>
</data>
<data name="group.Padding" type="System.Windows.Forms.Padding, System.Windows.Forms">
<value>3, 3, 3, 3</value>
</data>
<data name="group.Size" type="System.Drawing.Size, System.Drawing">
<value>385, 210</value>
<value>385, 211</value>
</data>
<data name="group.TabIndex" type="System.Int32, mscorlib">
<value>1</value>

7
client/administration/UdsAdmin/xmlrpc/structs.cs
View File

@ -307,17 +307,16 @@ namespace UdsAdmin.xmlrpc
{
public string id;
public string name;
public string netStart;
public string netEnd;
public string netRange;
public Network()
{
id = name = netStart = netEnd = "";
id = name = netRange = "";
}
public override string ToString()
{
return name;
return String.Format("{0} ({1})", name, netRange);
}
}