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

* Added "development menu", to help on development issues (needs to be activated with param --enableDevel or --enableDebug)

Browse Source
This commit is contained in:
Adolfo Gómez 2013-06-20 09:19:57 +00:00
parent 9b99b8f1bd
commit 278c091dac
17 changed files with 323 additions and 204 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
client/administration/UdsAdmin/Program.cs
View File

@ -44,6 +44,16 @@ namespace UdsAdmin
[STAThread]
static void Main()
{
string[] args = Environment.GetCommandLineArgs();
foreach (string arg in args)
{
if (arg == "--enabledebug" || arg == "--enabledevel")
UdsAdmin.Properties.Settings.Default.debug = true;
else if (arg == "--disabledebug" || arg == "--disabledevel")
UdsAdmin.Properties.Settings.Default.debug = false;
}
Application.EnableVisualStyles();
Application.SetCompatibleTextRenderingDefault(false);
CultureInfo culture = new CultureInfo(UdsAdmin.Properties.Settings.Default.Locale);

20
client/administration/UdsAdmin/Properties/Settings.Designer.cs generated
View File

@ -1,10 +1,10 @@
//------------------------------------------------------------------------------
// <auto-generated>
// Este código fue generado por una herramienta.
// Versión de runtime:4.0.30319.18034
// This code was generated by a tool.
// Runtime Version:4.0.30319.296
//
// Los cambios en este archivo podrían causar un comportamiento incorrecto y se perderán si
// se vuelve a generar el código.
// Changes to this file may cause incorrect behavior and will be lost if
// the code is regenerated.
// </auto-generated>
//------------------------------------------------------------------------------
@ -127,5 +127,17 @@ namespace UdsAdmin.Properties {
return ((int)(this["StatsItems"]));
}
}
[global::System.Configuration.UserScopedSettingAttribute()]
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.Configuration.DefaultSettingValueAttribute("False")]
public bool debug {
get {
return ((bool)(this["debug"]));
}
set {
this["debug"] = value;
}
}
}
}

3
client/administration/UdsAdmin/Properties/Settings.settings
View File

@ -29,5 +29,8 @@
<Setting Name="StatsItems" Type="System.Int32" Scope="Application">
<Value Profile="(Default)">200</Value>
</Setting>
<Setting Name="debug" Type="System.Boolean" Scope="User">
<Value Profile="(Default)">False</Value>
</Setting>
</Settings>
</SettingsFile>

321
client/administration/UdsAdmin/Strings.Designer.cs generated
View File

File diff suppressed because it is too large Load Diff

9
client/administration/UdsAdmin/Strings.resx
View File

@ -522,4 +522,13 @@
<data name="confirmDelete" xml:space="preserve">
<value>Are you sure do you want to delete selected items?</value>
</data>
<data name="releaseInUse" xml:space="preserve">
<value>Release "In use" state</value>
</data>
<data name="setActive" xml:space="preserve">
<value>Force to Active</value>
</data>
<data name="setInUse" xml:space="preserve">
<value>Simulate "In use"</value>
</data>
</root>

3
client/administration/UdsAdmin/app.config
View File

@ -34,6 +34,9 @@
<setting name="MaxControlWidth" serializeAs="String">
<value>320</value>
</setting>
<setting name="debug" serializeAs="String">
<value>False</value>
</setting>
</UdsAdmin.Properties.Settings>
</userSettings>
<applicationSettings>

34
client/administration/UdsAdmin/controls/panel/DeployedPanel.cs
View File

@ -65,6 +65,15 @@ namespace UdsAdmin.controls.panel
ToolStripMenuItem assign = new ToolStripMenuItem(Strings.assignToUser); assign.Click += assignToUser; assign.Image = Images.new16;
_assignMenu.Items.AddRange(new ToolStripItem[] { assign });
if (UdsAdmin.Properties.Settings.Default.debug == true)
{
ToolStripSeparator sep = new ToolStripSeparator();
ToolStripMenuItem debug1 = new ToolStripMenuItem(Strings.setActive); debug1.Name = UdsAdmin.gui.ActionTree.SET_ACTIVE_ACTION; debug1.Click += develMenu;
ToolStripMenuItem debug2 = new ToolStripMenuItem(Strings.setInUse); debug2.Name = UdsAdmin.gui.ActionTree.SET_INUSE_ACTION; debug2.Click += develMenu;
ToolStripMenuItem debug3 = new ToolStripMenuItem(Strings.releaseInUse); debug3.Name = UdsAdmin.gui.ActionTree.RELEASE_INUSE_ACTION; debug3.Click += develMenu;
_deleteMenu.Items.AddRange(new ToolStripItem[] { sep, debug1, debug2, debug3 });
}
// Adapt listview to cache or users
if (cache)
{
@ -158,6 +167,31 @@ namespace UdsAdmin.controls.panel
updateList();
}
private void develMenu(object sender, EventArgs e)
{
ToolStripMenuItem s = (ToolStripMenuItem)sender;
if (listView.SelectedItems.Count == 0)
return;
string[] ids = new string[listView.SelectedItems.Count];
int n = 0;
foreach (ListViewItem i in listView.SelectedItems)
ids[n++] = (string)i.Tag;
try
{
xmlrpc.UdsAdminService.DevelAction(s.Name, ids);
}
catch (CookComputing.XmlRpc.XmlRpcFaultException ex)
{
gui.UserNotifier.notifyRpcException(ex);
}
updateList();
}
private void infoItem(object sender, EventArgs e)
{
string id = (string)listView.SelectedItems[0].Tag;

24
client/administration/UdsAdmin/controls/panel/DeployedServicePanel.resx
View File

@ -907,7 +907,7 @@
<value>0, 0, 0, 0</value>
</data>
<data name="logViewer1.Size" type="System.Drawing.Size, System.Drawing">
<value>721, 69</value>
<value>721, 70</value>
</data>
<data name="logViewer1.TabIndex" type="System.Int32, mscorlib">
<value>0</value>
@ -916,7 +916,7 @@
<value>logViewer1</value>
</data>
<data name="&gt;&gt;logViewer1.Type" xml:space="preserve">
<value>UdsAdmin.controls.panel.LogViewer, UdsAdmin, Version=1.1.0.0, Culture=neutral, PublicKeyToken=null</value>
<value>UdsAdmin.controls.panel.LogViewer, UdsAdmin, Version=1.2.0.0, Culture=neutral, PublicKeyToken=null</value>
</data>
<data name="&gt;&gt;logViewer1.Parent" xml:space="preserve">
<value>splitContainer1.Panel2</value>
@ -937,7 +937,7 @@
<value>1</value>
</data>
<data name="splitContainer1.Size" type="System.Drawing.Size, System.Drawing">
<value>721, 474</value>
<value>721, 475</value>
</data>
<data name="splitContainer1.SplitterDistance" type="System.Int32, mscorlib">
<value>397</value>
@ -952,7 +952,7 @@
<value>splitContainer1</value>
</data>
<data name="&gt;&gt;splitContainer1.Type" xml:space="preserve">
<value>UdsAdmin.controls.SplitContainerEx, UdsAdmin, Version=1.1.0.0, Culture=neutral, PublicKeyToken=null</value>
<value>UdsAdmin.controls.SplitContainerEx, UdsAdmin, Version=1.2.0.0, Culture=neutral, PublicKeyToken=null</value>
</data>
<data name="&gt;&gt;splitContainer1.Parent" xml:space="preserve">
<value>tabPage1</value>
@ -961,13 +961,13 @@
<value>0</value>
</data>
<data name="tabPage1.Location" type="System.Drawing.Point, System.Drawing">
<value>4, 23</value>
<value>4, 22</value>
</data>
<data name="tabPage1.Padding" type="System.Windows.Forms.Padding, System.Windows.Forms">
<value>3, 3, 3, 3</value>
</data>
<data name="tabPage1.Size" type="System.Drawing.Size, System.Drawing">
<value>727, 480</value>
<value>727, 481</value>
</data>
<data name="tabPage1.TabIndex" type="System.Int32, mscorlib">
<value>0</value>
@ -997,7 +997,7 @@
<value>3, 240</value>
</data>
<data name="inUseChart.Size" type="System.Drawing.Size, System.Drawing">
<value>715, 231</value>
<value>715, 232</value>
</data>
<data name="inUseChart.TabIndex" type="System.Int32, mscorlib">
<value>8</value>
@ -1006,7 +1006,7 @@
<value>inUseChart</value>
</data>
<data name="&gt;&gt;inUseChart.Type" xml:space="preserve">
<value>UdsAdmin.controls.panel.ChartPanel, UdsAdmin, Version=1.1.0.0, Culture=neutral, PublicKeyToken=null</value>
<value>UdsAdmin.controls.panel.ChartPanel, UdsAdmin, Version=1.2.0.0, Culture=neutral, PublicKeyToken=null</value>
</data>
<data name="&gt;&gt;inUseChart.Parent" xml:space="preserve">
<value>tableLayoutPanel2</value>
@ -1030,7 +1030,7 @@
<value>assignedChart</value>
</data>
<data name="&gt;&gt;assignedChart.Type" xml:space="preserve">
<value>UdsAdmin.controls.panel.ChartPanel, UdsAdmin, Version=1.1.0.0, Culture=neutral, PublicKeyToken=null</value>
<value>UdsAdmin.controls.panel.ChartPanel, UdsAdmin, Version=1.2.0.0, Culture=neutral, PublicKeyToken=null</value>
</data>
<data name="&gt;&gt;assignedChart.Parent" xml:space="preserve">
<value>tableLayoutPanel2</value>
@ -1048,7 +1048,7 @@
<value>2</value>
</data>
<data name="tableLayoutPanel2.Size" type="System.Drawing.Size, System.Drawing">
<value>721, 474</value>
<value>721, 475</value>
</data>
<data name="tableLayoutPanel2.TabIndex" type="System.Int32, mscorlib">
<value>7</value>
@ -1069,13 +1069,13 @@
<value>&lt;?xml version="1.0" encoding="utf-16"?&gt;&lt;TableLayoutSettings&gt;&lt;Controls&gt;&lt;Control Name="inUseChart" Row="1" RowSpan="1" Column="0" ColumnSpan="1" /&gt;&lt;Control Name="assignedChart" Row="0" RowSpan="1" Column="0" ColumnSpan="1" /&gt;&lt;/Controls&gt;&lt;Columns Styles="Percent,100" /&gt;&lt;Rows Styles="Percent,50,Percent,50" /&gt;&lt;/TableLayoutSettings&gt;</value>
</data>
<data name="tabPage2.Location" type="System.Drawing.Point, System.Drawing">
<value>4, 23</value>
<value>4, 22</value>
</data>
<data name="tabPage2.Padding" type="System.Windows.Forms.Padding, System.Windows.Forms">
<value>3, 3, 3, 3</value>
</data>
<data name="tabPage2.Size" type="System.Drawing.Size, System.Drawing">
<value>727, 480</value>
<value>727, 481</value>
</data>
<data name="tabPage2.TabIndex" type="System.Int32, mscorlib">
<value>1</value>

24
client/administration/UdsAdmin/controls/panel/DeployedServicesPanel.resx
View File

@ -196,7 +196,7 @@
<value>0, 0, 0, 0</value>
</data>
<data name="logViewer1.Size" type="System.Drawing.Size, System.Drawing">
<value>723, 93</value>
<value>723, 94</value>
</data>
<data name="logViewer1.TabIndex" type="System.Int32, mscorlib">
<value>0</value>
@ -205,7 +205,7 @@
<value>logViewer1</value>
</data>
<data name="&gt;&gt;logViewer1.Type" xml:space="preserve">
<value>UdsAdmin.controls.panel.LogViewer, UdsAdmin, Version=1.1.0.0, Culture=neutral, PublicKeyToken=null</value>
<value>UdsAdmin.controls.panel.LogViewer, UdsAdmin, Version=1.2.0.0, Culture=neutral, PublicKeyToken=null</value>
</data>
<data name="&gt;&gt;logViewer1.Parent" xml:space="preserve">
<value>splitContainer1.Panel2</value>
@ -226,7 +226,7 @@
<value>1</value>
</data>
<data name="splitContainer1.Size" type="System.Drawing.Size, System.Drawing">
<value>723, 476</value>
<value>723, 477</value>
</data>
<data name="splitContainer1.SplitterDistance" type="System.Int32, mscorlib">
<value>375</value>
@ -241,7 +241,7 @@
<value>splitContainer1</value>
</data>
<data name="&gt;&gt;splitContainer1.Type" xml:space="preserve">
<value>UdsAdmin.controls.SplitContainerEx, UdsAdmin, Version=1.1.0.0, Culture=neutral, PublicKeyToken=null</value>
<value>UdsAdmin.controls.SplitContainerEx, UdsAdmin, Version=1.2.0.0, Culture=neutral, PublicKeyToken=null</value>
</data>
<data name="&gt;&gt;splitContainer1.Parent" xml:space="preserve">
<value>tabPage1</value>
@ -250,13 +250,13 @@
<value>0</value>
</data>
<data name="tabPage1.Location" type="System.Drawing.Point, System.Drawing">
<value>4, 23</value>
<value>4, 22</value>
</data>
<data name="tabPage1.Padding" type="System.Windows.Forms.Padding, System.Windows.Forms">
<value>3, 3, 3, 3</value>
</data>
<data name="tabPage1.Size" type="System.Drawing.Size, System.Drawing">
<value>729, 482</value>
<value>729, 483</value>
</data>
<data name="tabPage1.TabIndex" type="System.Int32, mscorlib">
<value>0</value>
@ -295,7 +295,7 @@
<value>assignedChart</value>
</data>
<data name="&gt;&gt;assignedChart.Type" xml:space="preserve">
<value>UdsAdmin.controls.panel.ChartPanel, UdsAdmin, Version=1.1.0.0, Culture=neutral, PublicKeyToken=null</value>
<value>UdsAdmin.controls.panel.ChartPanel, UdsAdmin, Version=1.2.0.0, Culture=neutral, PublicKeyToken=null</value>
</data>
<data name="&gt;&gt;assignedChart.Parent" xml:space="preserve">
<value>tableLayoutPanel1</value>
@ -310,7 +310,7 @@
<value>3, 241</value>
</data>
<data name="inUseChart.Size" type="System.Drawing.Size, System.Drawing">
<value>717, 232</value>
<value>717, 233</value>
</data>
<data name="inUseChart.TabIndex" type="System.Int32, mscorlib">
<value>1</value>
@ -319,7 +319,7 @@
<value>inUseChart</value>
</data>
<data name="&gt;&gt;inUseChart.Type" xml:space="preserve">
<value>UdsAdmin.controls.panel.ChartPanel, UdsAdmin, Version=1.1.0.0, Culture=neutral, PublicKeyToken=null</value>
<value>UdsAdmin.controls.panel.ChartPanel, UdsAdmin, Version=1.2.0.0, Culture=neutral, PublicKeyToken=null</value>
</data>
<data name="&gt;&gt;inUseChart.Parent" xml:space="preserve">
<value>tableLayoutPanel1</value>
@ -337,7 +337,7 @@
<value>2</value>
</data>
<data name="tableLayoutPanel1.Size" type="System.Drawing.Size, System.Drawing">
<value>723, 476</value>
<value>723, 477</value>
</data>
<data name="tableLayoutPanel1.TabIndex" type="System.Int32, mscorlib">
<value>0</value>
@ -358,13 +358,13 @@
<value>&lt;?xml version="1.0" encoding="utf-16"?&gt;&lt;TableLayoutSettings&gt;&lt;Controls&gt;&lt;Control Name="assignedChart" Row="0" RowSpan="1" Column="0" ColumnSpan="1" /&gt;&lt;Control Name="inUseChart" Row="1" RowSpan="1" Column="0" ColumnSpan="1" /&gt;&lt;/Controls&gt;&lt;Columns Styles="Percent,100,Absolute,20" /&gt;&lt;Rows Styles="Percent,50,Percent,50" /&gt;&lt;/TableLayoutSettings&gt;</value>
</data>
<data name="tabPage2.Location" type="System.Drawing.Point, System.Drawing">
<value>4, 23</value>
<value>4, 22</value>
</data>
<data name="tabPage2.Padding" type="System.Windows.Forms.Padding, System.Windows.Forms">
<value>3, 3, 3, 3</value>
</data>
<data name="tabPage2.Size" type="System.Drawing.Size, System.Drawing">
<value>729, 482</value>
<value>729, 483</value>
</data>
<data name="tabPage2.TabIndex" type="System.Int32, mscorlib">
<value>1</value>

4
client/administration/UdsAdmin/forms/DeployedServiceForm.cs
View File

@ -183,6 +183,10 @@ namespace UdsAdmin.forms
if (cacheServicesBox.Value > maxServicesBox.Value)
maxServicesBox.Value = cacheServicesBox.Value;
// If no L1 cache, L2 cache will not be used, so we reset it to 0
if (cacheL2ServicesBox.Value > 0 && cacheServicesBox.Value == 0)
cacheL2ServicesBox.Value = 0;
_dps.initialServices = (int)initialServicesBox.Value;
_dps.cacheL1 = (int)cacheServicesBox.Value;
_dps.cacheL2 = (int)cacheL2ServicesBox.Value;

12
client/administration/UdsAdmin/forms/DeployedServiceForm.resx
View File

@ -415,13 +415,13 @@
<value>&lt;?xml version="1.0" encoding="utf-16"?&gt;&lt;TableLayoutSettings&gt;&lt;Controls&gt;&lt;Control Name="label3" Row="3" RowSpan="1" Column="0" ColumnSpan="1" /&gt;&lt;Control Name="label1" Row="2" RowSpan="1" Column="0" ColumnSpan="1" /&gt;&lt;Control Name="osManagerCombo" Row="3" RowSpan="1" Column="1" ColumnSpan="1" /&gt;&lt;Control Name="baseServiceCombo" Row="2" RowSpan="1" Column="1" ColumnSpan="1" /&gt;&lt;Control Name="label9" Row="0" RowSpan="1" Column="0" ColumnSpan="1" /&gt;&lt;Control Name="label8" Row="1" RowSpan="1" Column="0" ColumnSpan="1" /&gt;&lt;Control Name="nameBox" Row="0" RowSpan="1" Column="1" ColumnSpan="1" /&gt;&lt;Control Name="commentsBox" Row="1" RowSpan="1" Column="1" ColumnSpan="1" /&gt;&lt;/Controls&gt;&lt;Columns Styles="AutoSize,0,AutoSize,0" /&gt;&lt;Rows Styles="Percent,25,Percent,25,Percent,25,Percent,25" /&gt;&lt;/TableLayoutSettings&gt;</value>
</data>
<data name="Service.Location" type="System.Drawing.Point, System.Drawing">
<value>4, 23</value>
<value>4, 22</value>
</data>
<data name="Service.Padding" type="System.Windows.Forms.Padding, System.Windows.Forms">
<value>3, 3, 3, 3</value>
</data>
<data name="Service.Size" type="System.Drawing.Size, System.Drawing">
<value>440, 197</value>
<value>440, 198</value>
</data>
<data name="Service.TabIndex" type="System.Int32, mscorlib">
<value>0</value>
@ -529,13 +529,13 @@
<value>&lt;?xml version="1.0" encoding="utf-16"?&gt;&lt;TableLayoutSettings&gt;&lt;Controls&gt;&lt;Control Name="label4" Row="0" RowSpan="1" Column="0" ColumnSpan="1" /&gt;&lt;Control Name="allowedTransports" Row="1" RowSpan="1" Column="0" ColumnSpan="1" /&gt;&lt;/Controls&gt;&lt;Columns Styles="Percent,100,Absolute,20" /&gt;&lt;Rows Styles="Absolute,24,Percent,100" /&gt;&lt;/TableLayoutSettings&gt;</value>
</data>
<data name="Transports.Location" type="System.Drawing.Point, System.Drawing">
<value>4, 23</value>
<value>4, 22</value>
</data>
<data name="Transports.Padding" type="System.Windows.Forms.Padding, System.Windows.Forms">
<value>3, 3, 3, 3</value>
</data>
<data name="Transports.Size" type="System.Drawing.Size, System.Drawing">
<value>440, 197</value>
<value>440, 198</value>
</data>
<data name="Transports.TabIndex" type="System.Int32, mscorlib">
<value>1</value>
@ -829,13 +829,13 @@
<value>&lt;?xml version="1.0" encoding="utf-16"?&gt;&lt;TableLayoutSettings&gt;&lt;Controls&gt;&lt;Control Name="cacheL2ServicesBox" Row="2" RowSpan="1" Column="1" ColumnSpan="1" /&gt;&lt;Control Name="cacheL2Label" Row="2" RowSpan="1" Column="0" ColumnSpan="1" /&gt;&lt;Control Name="cacheServicesBox" Row="1" RowSpan="1" Column="1" ColumnSpan="1" /&gt;&lt;Control Name="label5" Row="0" RowSpan="1" Column="0" ColumnSpan="1" /&gt;&lt;Control Name="cacheLabel" Row="1" RowSpan="1" Column="0" ColumnSpan="1" /&gt;&lt;Control Name="initialServicesBox" Row="0" RowSpan="1" Column="1" ColumnSpan="1" /&gt;&lt;Control Name="label7" Row="3" RowSpan="1" Column="0" ColumnSpan="1" /&gt;&lt;Control Name="maxServicesBox" Row="3" RowSpan="1" Column="1" ColumnSpan="1" /&gt;&lt;/Controls&gt;&lt;Columns Styles="AutoSize,0,Percent,100" /&gt;&lt;Rows Styles="Percent,25,Percent,25,Percent,25,Percent,25" /&gt;&lt;/TableLayoutSettings&gt;</value>
</data>
<data name="Cache.Location" type="System.Drawing.Point, System.Drawing">
<value>4, 23</value>
<value>4, 22</value>
</data>
<data name="Cache.Padding" type="System.Windows.Forms.Padding, System.Windows.Forms">
<value>3, 3, 3, 3</value>
</data>
<data name="Cache.Size" type="System.Drawing.Size, System.Drawing">
<value>440, 197</value>
<value>440, 198</value>
</data>
<data name="Cache.TabIndex" type="System.Int32, mscorlib">
<value>2</value>

1
client/administration/UdsAdmin/forms/MainForm.Designer.cs generated
View File

@ -72,6 +72,7 @@
//
resources.ApplyResources(this.treeActions, "treeActions");
this.treeActions.HideSelection = false;
this.treeActions.MinimumSize = new System.Drawing.Size(200, 4);
this.treeActions.Name = "treeActions";
this.treeActions.ShowNodeToolTips = true;
this.treeActions.BeforeExpand += new System.Windows.Forms.TreeViewCancelEventHandler(this.treeActions_BeforeExpand);

43
client/administration/UdsAdmin/forms/MainForm.resx
View File

@ -123,7 +123,7 @@
</data>
<assembly alias="System.Drawing" name="System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
<data name="splitContainer1.Location" type="System.Drawing.Point, System.Drawing">
<value>0, 50</value>
<value>0, 49</value>
</data>
<data name="treeActions.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
<value>Fill</value>
@ -131,11 +131,8 @@
<data name="treeActions.Location" type="System.Drawing.Point, System.Drawing">
<value>0, 0</value>
</data>
<data name="treeActions.MinimumSize" type="System.Drawing.Size, System.Drawing">
<value>200, 4</value>
</data>
<data name="treeActions.Size" type="System.Drawing.Size, System.Drawing">
<value>200, 376</value>
<value>200, 377</value>
</data>
<assembly alias="mscorlib" name="mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
<data name="treeActions.TabIndex" type="System.Int32, mscorlib">
@ -184,7 +181,7 @@
<value>32</value>
</data>
<data name="splitContainer1.Size" type="System.Drawing.Size, System.Drawing">
<value>610, 376</value>
<value>610, 377</value>
</data>
<data name="splitContainer1.SplitterDistance" type="System.Int32, mscorlib">
<value>146</value>
@ -199,7 +196,7 @@
<value>splitContainer1</value>
</data>
<data name="&gt;&gt;splitContainer1.Type" xml:space="preserve">
<value>UdsAdmin.controls.SplitContainerEx, UdsAdmin, Version=1.1.1.0, Culture=neutral, PublicKeyToken=null</value>
<value>UdsAdmin.controls.SplitContainerEx, UdsAdmin, Version=1.2.0.0, Culture=neutral, PublicKeyToken=null</value>
</data>
<data name="&gt;&gt;splitContainer1.Parent" xml:space="preserve">
<value>$this</value>
@ -238,61 +235,61 @@
<value>133, 17</value>
</metadata>
<data name="exitToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
<value>102, 22</value>
<value>92, 22</value>
</data>
<data name="exitToolStripMenuItem.Text" xml:space="preserve">
<value>Exit</value>
</data>
<data name="fileToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
<value>42, 21</value>
<value>37, 20</value>
</data>
<data name="fileToolStripMenuItem.Text" xml:space="preserve">
<value>File</value>
</data>
<data name="englishToolStripMenuItem1.Size" type="System.Drawing.Size, System.Drawing">
<value>127, 22</value>
<value>116, 22</value>
</data>
<data name="englishToolStripMenuItem1.Text" xml:space="preserve">
<value>English</value>
</data>
<data name="spanishToolStripMenuItem1.Size" type="System.Drawing.Size, System.Drawing">
<value>127, 22</value>
<value>116, 22</value>
</data>
<data name="spanishToolStripMenuItem1.Text" xml:space="preserve">
<value>Spanish</value>
</data>
<data name="frenchToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
<value>127, 22</value>
<value>116, 22</value>
</data>
<data name="frenchToolStripMenuItem.Text" xml:space="preserve">
<value>French</value>
</data>
<data name="germanToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
<value>127, 22</value>
<value>116, 22</value>
</data>
<data name="germanToolStripMenuItem.Text" xml:space="preserve">
<value>German</value>
</data>
<data name="languageToolStripMenuItem1.Size" type="System.Drawing.Size, System.Drawing">
<value>165, 22</value>
<value>148, 22</value>
</data>
<data name="languageToolStripMenuItem1.Text" xml:space="preserve">
<value>Language</value>
</data>
<data name="configurationToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
<value>165, 22</value>
<value>148, 22</value>
</data>
<data name="configurationToolStripMenuItem.Text" xml:space="preserve">
<value>Configuration</value>
</data>
<data name="aboutToolStripMenuItem1.Size" type="System.Drawing.Size, System.Drawing">
<value>165, 22</value>
<value>148, 22</value>
</data>
<data name="aboutToolStripMenuItem1.Text" xml:space="preserve">
<value>About</value>
</data>
<data name="toolsToolStripMenuItem1.Size" type="System.Drawing.Size, System.Drawing">
<value>52, 21</value>
<value>48, 20</value>
</data>
<data name="toolsToolStripMenuItem1.Text" xml:space="preserve">
<value>Tools</value>
@ -301,7 +298,7 @@
<value>0, 0</value>
</data>
<data name="menuStrip1.Size" type="System.Drawing.Size, System.Drawing">
<value>610, 25</value>
<value>610, 24</value>
</data>
<data name="menuStrip1.TabIndex" type="System.Int32, mscorlib">
<value>1</value>
@ -322,13 +319,13 @@
<value>3</value>
</data>
<data name="newServiceProviderMenu.Size" type="System.Drawing.Size, System.Drawing">
<value>106, 22</value>
<value>98, 22</value>
</data>
<data name="newServiceProviderMenu.Text" xml:space="preserve">
<value>New</value>
</data>
<data name="testToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
<value>106, 22</value>
<value>98, 22</value>
</data>
<data name="serviceProviderToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
<value>103, 20</value>
@ -340,13 +337,13 @@
<value>32, 19</value>
</data>
<data name="spanishToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
<value>126, 22</value>
<value>115, 22</value>
</data>
<data name="spanishToolStripMenuItem.Text" xml:space="preserve">
<value>Spanish</value>
</data>
<data name="englishToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
<value>126, 22</value>
<value>115, 22</value>
</data>
<data name="englishToolStripMenuItem.Text" xml:space="preserve">
<value>English</value>
@ -379,7 +376,7 @@
<value>Clears the cache</value>
</data>
<data name="toolStrip1.Location" type="System.Drawing.Point, System.Drawing">
<value>0, 25</value>
<value>0, 24</value>
</data>
<data name="toolStrip1.Size" type="System.Drawing.Size, System.Drawing">
<value>610, 25</value>

3
client/administration/UdsAdmin/gui/ActionTree.cs
View File

@ -72,6 +72,9 @@ namespace UdsAdmin.gui
public const string DELETE_ACTION = "delete";
public const string CHECK_ACTION = "test";
public const string PUBLISH_ACTION = "publish";
public const string SET_ACTIVE_ACTION = "activate";
public const string SET_INUSE_ACTION = "inUse";
public const string RELEASE_INUSE_ACTION = "releaseInUse";
private static Dictionary<string, xmlrpc.ServiceType[]> stCache = new Dictionary<string, xmlrpc.ServiceType[]>();

2
client/administration/UdsAdmin/gui/MenusManager.cs
View File

@ -209,6 +209,7 @@ namespace UdsAdmin.gui
ContextMenuStrip menu = new ContextMenuStrip();
ToolStripMenuItem modify = new ToolStripMenuItem(Strings.modifyItem); modify.Name = ActionTree.MODIFY_ACTION; modify.Click += action;
ToolStripMenuItem delete = new ToolStripMenuItem(Strings.deleteItem); delete.Name = ActionTree.DELETE_ACTION; delete.Click += action;
menu.Items.AddRange(new ToolStripItem[] { modify, delete});
if (dps.info.needsPublication)
{
@ -216,6 +217,7 @@ namespace UdsAdmin.gui
ToolStripMenuItem publish = new ToolStripMenuItem(Strings.publish); publish.Name = ActionTree.PUBLISH_ACTION; publish.Click += action;
menu.Items.AddRange(new ToolStripItem[] {sep, publish });
}
return menu;
}

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

@ -354,6 +354,13 @@ namespace UdsAdmin.xmlrpc
GuiFieldValue[] InvokeChooseCallback(string credentials, string name, GuiFieldValue[] parameters);
// Devel stuff
[XmlRpcMethod("develAction")]
bool DevelAction(string credentials, string action, string[] ids);
}
}

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

@ -768,5 +768,12 @@ namespace UdsAdmin.xmlrpc
}
// Devel stuff
public static bool DevelAction(string action, string[] ids)
{
return s.DevelAction(credentials, action, ids);
}
}
}