diff options
author | Melanie | 2010-03-03 02:07:03 +0000 |
---|---|---|
committer | Melanie | 2010-03-03 02:07:03 +0000 |
commit | 028a87fe37002e7a0611f66babf1deee46c83804 (patch) | |
tree | 387aec499fd60c2012bed8148e6a2ddc847c3d95 /OpenSim/Grid/Manager | |
parent | Revert "test" (diff) | |
parent | Fixes Region.Framework tests. Although these tests don't fail, they need to b... (diff) | |
download | opensim-SC-028a87fe37002e7a0611f66babf1deee46c83804.zip opensim-SC-028a87fe37002e7a0611f66babf1deee46c83804.tar.gz opensim-SC-028a87fe37002e7a0611f66babf1deee46c83804.tar.bz2 opensim-SC-028a87fe37002e7a0611f66babf1deee46c83804.tar.xz |
Merge branch 'master' into careminster-presence-refactor
This brings careminster on the level of master. To be tested
Diffstat (limited to '')
16 files changed, 31 insertions, 1888 deletions
diff --git a/OpenSim/Grid/Manager/OpenGridServices.Manager/BlockingQueue.cs b/OpenSim/Data/SQLite/SQLiteAvatarData.cs index 2e39cd0..b3f4a4c 100644 --- a/OpenSim/Grid/Manager/OpenGridServices.Manager/BlockingQueue.cs +++ b/OpenSim/Data/SQLite/SQLiteAvatarData.cs | |||
@@ -26,34 +26,48 @@ | |||
26 | */ | 26 | */ |
27 | 27 | ||
28 | using System; | 28 | using System; |
29 | using System.Threading; | ||
30 | using System.Collections.Generic; | 29 | using System.Collections.Generic; |
31 | using System.Text; | 30 | using System.Data; |
31 | using System.Reflection; | ||
32 | using System.Threading; | ||
33 | using log4net; | ||
34 | using OpenMetaverse; | ||
35 | using OpenSim.Framework; | ||
36 | using Mono.Data.SqliteClient; | ||
32 | 37 | ||
33 | namespace OpenGridServices.Manager | 38 | namespace OpenSim.Data.SQLite |
34 | { | 39 | { |
35 | public class BlockingQueue<T> | 40 | /// <summary> |
41 | /// A SQLite Interface for Avatar Data | ||
42 | /// </summary> | ||
43 | public class SQLiteAvatarData : SQLiteGenericTableHandler<AvatarBaseData>, | ||
44 | IAvatarData | ||
36 | { | 45 | { |
37 | private Queue<T> _queue = new Queue<T>(); | 46 | private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); |
38 | private object _queueSync = new object(); | ||
39 | 47 | ||
40 | public void Enqueue(T value) | 48 | public SQLiteAvatarData(string connectionString, string realm) : |
49 | base(connectionString, realm, "Avatar") | ||
41 | { | 50 | { |
42 | lock (_queueSync) | ||
43 | { | ||
44 | _queue.Enqueue(value); | ||
45 | Monitor.Pulse(_queueSync); | ||
46 | } | ||
47 | } | 51 | } |
48 | 52 | ||
49 | public T Dequeue() | 53 | public bool Delete(UUID principalID, string name) |
50 | { | 54 | { |
51 | lock (_queueSync) | 55 | SqliteCommand cmd = new SqliteCommand(); |
56 | |||
57 | cmd.CommandText = String.Format("delete from {0} where `PrincipalID` = :PrincipalID and `Name` = :Name", m_Realm); | ||
58 | cmd.Parameters.Add(":PrincipalID", principalID.ToString()); | ||
59 | cmd.Parameters.Add(":Name", name); | ||
60 | |||
61 | try | ||
52 | { | 62 | { |
53 | if (_queue.Count < 1) | 63 | if (ExecuteNonQuery(cmd, m_Connection) > 0) |
54 | Monitor.Wait(_queueSync); | 64 | return true; |
55 | 65 | ||
56 | return _queue.Dequeue(); | 66 | return false; |
67 | } | ||
68 | finally | ||
69 | { | ||
70 | CloseCommand(cmd); | ||
57 | } | 71 | } |
58 | } | 72 | } |
59 | } | 73 | } |
diff --git a/OpenSim/Grid/Manager/OpenGridServices.Manager.mds b/OpenSim/Grid/Manager/OpenGridServices.Manager.mds deleted file mode 100644 index ed7bc24..0000000 --- a/OpenSim/Grid/Manager/OpenGridServices.Manager.mds +++ /dev/null | |||
@@ -1,16 +0,0 @@ | |||
1 | <Combine name="OpenGridServices.Manager" fileversion="2.0" outputpath="../../mono-1.2.3.1/lib/monodevelop/bin" MakePkgConfig="False" MakeLibPC="True"> | ||
2 | <Configurations active="Debug"> | ||
3 | <Configuration name="Debug" ctype="CombineConfiguration"> | ||
4 | <Entry build="True" name="OpenGridServices.Manager" configuration="Debug" /> | ||
5 | </Configuration> | ||
6 | <Configuration name="Release" ctype="CombineConfiguration"> | ||
7 | <Entry build="True" name="OpenGridServices.Manager" configuration="Release" /> | ||
8 | </Configuration> | ||
9 | </Configurations> | ||
10 | <StartMode startupentry="OpenGridServices.Manager" single="True"> | ||
11 | <Execute type="None" entry="OpenGridServices.Manager" /> | ||
12 | </StartMode> | ||
13 | <Entries> | ||
14 | <Entry filename="./OpenGridServices.Manager/OpenGridServices.Manager.mdp" /> | ||
15 | </Entries> | ||
16 | </Combine> \ No newline at end of file | ||
diff --git a/OpenSim/Grid/Manager/OpenGridServices.Manager.userprefs b/OpenSim/Grid/Manager/OpenGridServices.Manager.userprefs deleted file mode 100644 index f221509..0000000 --- a/OpenSim/Grid/Manager/OpenGridServices.Manager.userprefs +++ /dev/null | |||
@@ -1,39 +0,0 @@ | |||
1 | <?xml version="1.0"?> | ||
2 | <UserCombinePreferences filename="/home/gareth/OpenGridServices.Manager/OpenGridServices.Manager.mds"> | ||
3 | <Files> | ||
4 | <File filename="Welcome" /> | ||
5 | <File filename="./OpenGridServices.Manager/MainWindow.cs" /> | ||
6 | <File filename="./OpenGridServices.Manager/ConnectToGridServerDialog.cs" /> | ||
7 | <File filename="./OpenGridServices.Manager/Main.cs" /> | ||
8 | </Files> | ||
9 | <Views> | ||
10 | <ViewMemento Id="MonoDevelop.Ide.Gui.Pads.ProjectPad"> | ||
11 | <TreeView> | ||
12 | <Node expanded="True"> | ||
13 | <Node name="OpenGridServices.Manager" expanded="True"> | ||
14 | <Node name="References" expanded="True" /> | ||
15 | <Node name="Resources" expanded="True" /> | ||
16 | <Node name="UserInterface" expanded="True" /> | ||
17 | <Node name="ConnectToGridServerDialog.cs" expanded="False" selected="True" /> | ||
18 | </Node> | ||
19 | </Node> | ||
20 | </TreeView> | ||
21 | </ViewMemento> | ||
22 | <ViewMemento Id="MonoDevelop.Ide.Gui.Pads.ClassPad"> | ||
23 | <TreeView> | ||
24 | <Node expanded="True" /> | ||
25 | </TreeView> | ||
26 | </ViewMemento> | ||
27 | <ViewMemento Id="MonoDevelop.NUnit.TestPad"> | ||
28 | <TreeView> | ||
29 | <Node expanded="False" /> | ||
30 | </TreeView> | ||
31 | </ViewMemento> | ||
32 | </Views> | ||
33 | <Properties> | ||
34 | <Properties> | ||
35 | <Property key="ActiveConfiguration" value="Debug" /> | ||
36 | <Property key="ActiveWindow" value="/home/gareth/OpenGridServices.Manager/OpenGridServices.Manager/ConnectToGridServerDialog.cs" /> | ||
37 | </Properties> | ||
38 | </Properties> | ||
39 | </UserCombinePreferences> \ No newline at end of file | ||
diff --git a/OpenSim/Grid/Manager/OpenGridServices.Manager.usertasks b/OpenSim/Grid/Manager/OpenGridServices.Manager.usertasks deleted file mode 100644 index d887d0e..0000000 --- a/OpenSim/Grid/Manager/OpenGridServices.Manager.usertasks +++ /dev/null | |||
@@ -1,2 +0,0 @@ | |||
1 | <?xml version="1.0" encoding="utf-8"?> | ||
2 | <ArrayOfUserTask xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" /> \ No newline at end of file | ||
diff --git a/OpenSim/Grid/Manager/OpenGridServices.Manager/AssemblyInfo.cs b/OpenSim/Grid/Manager/OpenGridServices.Manager/AssemblyInfo.cs deleted file mode 100644 index 49d1818..0000000 --- a/OpenSim/Grid/Manager/OpenGridServices.Manager/AssemblyInfo.cs +++ /dev/null | |||
@@ -1,59 +0,0 @@ | |||
1 | /* | ||
2 | * Copyright (c) Contributors, http://opensimulator.org/ | ||
3 | * See CONTRIBUTORS.TXT for a full list of copyright holders. | ||
4 | * | ||
5 | * Redistribution and use in source and binary forms, with or without | ||
6 | * modification, are permitted provided that the following conditions are met: | ||
7 | * * Redistributions of source code must retain the above copyright | ||
8 | * notice, this list of conditions and the following disclaimer. | ||
9 | * * Redistributions in binary form must reproduce the above copyright | ||
10 | * notice, this list of conditions and the following disclaimer in the | ||
11 | * documentation and/or other materials provided with the distribution. | ||
12 | * * Neither the name of the OpenSimulator Project nor the | ||
13 | * names of its contributors may be used to endorse or promote products | ||
14 | * derived from this software without specific prior written permission. | ||
15 | * | ||
16 | * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY | ||
17 | * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED | ||
18 | * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE | ||
19 | * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY | ||
20 | * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES | ||
21 | * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; | ||
22 | * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND | ||
23 | * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT | ||
24 | * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS | ||
25 | * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | ||
26 | */ | ||
27 | |||
28 | using System.Reflection; | ||
29 | using System.Runtime.CompilerServices; | ||
30 | |||
31 | // Information about this assembly is defined by the following | ||
32 | // attributes. | ||
33 | // | ||
34 | // change them to the information which is associated with the assembly | ||
35 | // you compile. | ||
36 | |||
37 | [assembly: AssemblyTitle("")] | ||
38 | [assembly: AssemblyDescription("")] | ||
39 | [assembly: AssemblyConfiguration("")] | ||
40 | [assembly: AssemblyCompany("http://opensimulator.org")] | ||
41 | [assembly: AssemblyProduct("")] | ||
42 | [assembly: AssemblyCopyright("Copyright (c) OpenSimulator.org Developers 2007-2009")] | ||
43 | [assembly: AssemblyTrademark("")] | ||
44 | [assembly: AssemblyCulture("")] | ||
45 | |||
46 | // The assembly version has following format : | ||
47 | // | ||
48 | // Major.Minor.Build.Revision | ||
49 | // | ||
50 | // You can specify all values by your own or you can build default build and revision | ||
51 | // numbers with the '*' character (the default): | ||
52 | |||
53 | [assembly: AssemblyVersion("0.6.3.*")] | ||
54 | |||
55 | // The following attributes specify the key for the sign of your assembly. See the | ||
56 | // .NET Framework documentation for more information about signing. | ||
57 | // This is not required, if you don't want signing let these attributes like they're. | ||
58 | [assembly: AssemblyDelaySign(false)] | ||
59 | [assembly: AssemblyKeyFile("")] | ||
diff --git a/OpenSim/Grid/Manager/OpenGridServices.Manager/ConnectToGridServer.cs b/OpenSim/Grid/Manager/OpenGridServices.Manager/ConnectToGridServer.cs deleted file mode 100644 index 25f25a7..0000000 --- a/OpenSim/Grid/Manager/OpenGridServices.Manager/ConnectToGridServer.cs +++ /dev/null | |||
@@ -1,39 +0,0 @@ | |||
1 | /* | ||
2 | * Copyright (c) Contributors, http://opensimulator.org/ | ||
3 | * See CONTRIBUTORS.TXT for a full list of copyright holders. | ||
4 | * | ||
5 | * Redistribution and use in source and binary forms, with or without | ||
6 | * modification, are permitted provided that the following conditions are met: | ||
7 | * * Redistributions of source code must retain the above copyright | ||
8 | * notice, this list of conditions and the following disclaimer. | ||
9 | * * Redistributions in binary form must reproduce the above copyright | ||
10 | * notice, this list of conditions and the following disclaimer in the | ||
11 | * documentation and/or other materials provided with the distribution. | ||
12 | * * Neither the name of the OpenSimulator Project nor the | ||
13 | * names of its contributors may be used to endorse or promote products | ||
14 | * derived from this software without specific prior written permission. | ||
15 | * | ||
16 | * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY | ||
17 | * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED | ||
18 | * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE | ||
19 | * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY | ||
20 | * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES | ||
21 | * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; | ||
22 | * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND | ||
23 | * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT | ||
24 | * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS | ||
25 | * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | ||
26 | */ | ||
27 | |||
28 | using System; | ||
29 | |||
30 | namespace OpenGridServices.Manager | ||
31 | { | ||
32 | public partial class Connect to grid server : Gtk.Dialog | ||
33 | { | ||
34 | public Connect to grid server() | ||
35 | { | ||
36 | this.Build(); | ||
37 | } | ||
38 | } | ||
39 | } | ||
diff --git a/OpenSim/Grid/Manager/OpenGridServices.Manager/ConnectToGridServerDialog.cs b/OpenSim/Grid/Manager/OpenGridServices.Manager/ConnectToGridServerDialog.cs deleted file mode 100644 index fd4d211..0000000 --- a/OpenSim/Grid/Manager/OpenGridServices.Manager/ConnectToGridServerDialog.cs +++ /dev/null | |||
@@ -1,54 +0,0 @@ | |||
1 | /* | ||
2 | * Copyright (c) Contributors, http://opensimulator.org/ | ||
3 | * See CONTRIBUTORS.TXT for a full list of copyright holders. | ||
4 | * | ||
5 | * Redistribution and use in source and binary forms, with or without | ||
6 | * modification, are permitted provided that the following conditions are met: | ||
7 | * * Redistributions of source code must retain the above copyright | ||
8 | * notice, this list of conditions and the following disclaimer. | ||
9 | * * Redistributions in binary form must reproduce the above copyright | ||
10 | * notice, this list of conditions and the following disclaimer in the | ||
11 | * documentation and/or other materials provided with the distribution. | ||
12 | * * Neither the name of the OpenSimulator Project nor the | ||
13 | * names of its contributors may be used to endorse or promote products | ||
14 | * derived from this software without specific prior written permission. | ||
15 | * | ||
16 | * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY | ||
17 | * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED | ||
18 | * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE | ||
19 | * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY | ||
20 | * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES | ||
21 | * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; | ||
22 | * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND | ||
23 | * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT | ||
24 | * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS | ||
25 | * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | ||
26 | */ | ||
27 | |||
28 | using Gtk; | ||
29 | using System; | ||
30 | |||
31 | namespace OpenGridServices.Manager | ||
32 | { | ||
33 | public partial class ConnectToGridServerDialog : Gtk.Dialog | ||
34 | { | ||
35 | public ConnectToGridServerDialog() | ||
36 | { | ||
37 | this.Build(); | ||
38 | } | ||
39 | |||
40 | protected virtual void OnResponse(object o, Gtk.ResponseArgs args) | ||
41 | { | ||
42 | switch (args.ResponseId) | ||
43 | { | ||
44 | case Gtk.ResponseType.Ok: | ||
45 | MainClass.PendingOperations.Enqueue("connect_to_gridserver " + this.entry1.Text + " " + this.entry2.Text + " " + this.entry3.Text); | ||
46 | break; | ||
47 | |||
48 | case Gtk.ResponseType.Cancel: | ||
49 | break; | ||
50 | } | ||
51 | this.Hide(); | ||
52 | } | ||
53 | } | ||
54 | } | ||
diff --git a/OpenSim/Grid/Manager/OpenGridServices.Manager/GridServerConnectionManager.cs b/OpenSim/Grid/Manager/OpenGridServices.Manager/GridServerConnectionManager.cs deleted file mode 100644 index 425a20e..0000000 --- a/OpenSim/Grid/Manager/OpenGridServices.Manager/GridServerConnectionManager.cs +++ /dev/null | |||
@@ -1,146 +0,0 @@ | |||
1 | /* | ||
2 | * Copyright (c) Contributors, http://opensimulator.org/ | ||
3 | * See CONTRIBUTORS.TXT for a full list of copyright holders. | ||
4 | * | ||
5 | * Redistribution and use in source and binary forms, with or without | ||
6 | * modification, are permitted provided that the following conditions are met: | ||
7 | * * Redistributions of source code must retain the above copyright | ||
8 | * notice, this list of conditions and the following disclaimer. | ||
9 | * * Redistributions in binary form must reproduce the above copyright | ||
10 | * notice, this list of conditions and the following disclaimer in the | ||
11 | * documentation and/or other materials provided with the distribution. | ||
12 | * * Neither the name of the OpenSimulator Project nor the | ||
13 | * names of its contributors may be used to endorse or promote products | ||
14 | * derived from this software without specific prior written permission. | ||
15 | * | ||
16 | * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY | ||
17 | * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED | ||
18 | * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE | ||
19 | * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY | ||
20 | * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES | ||
21 | * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; | ||
22 | * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND | ||
23 | * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT | ||
24 | * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS | ||
25 | * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | ||
26 | */ | ||
27 | |||
28 | using Nwc.XmlRpc; | ||
29 | using System; | ||
30 | using System.Net; | ||
31 | using System.IO; | ||
32 | using System.Xml; | ||
33 | using System.Collections; | ||
34 | using System.Collections.Generic; | ||
35 | using libsecondlife; | ||
36 | |||
37 | namespace OpenGridServices.Manager | ||
38 | { | ||
39 | public class GridServerConnectionManager | ||
40 | { | ||
41 | private string ServerURL; | ||
42 | public LLUUID SessionID; | ||
43 | public bool connected=false; | ||
44 | |||
45 | public RegionBlock[][] WorldMap; | ||
46 | |||
47 | public bool Connect(string GridServerURL, string username, string password) | ||
48 | { | ||
49 | try | ||
50 | { | ||
51 | this.ServerURL=GridServerURL; | ||
52 | Hashtable LoginParamsHT = new Hashtable(); | ||
53 | LoginParamsHT["username"]=username; | ||
54 | LoginParamsHT["password"]=password; | ||
55 | ArrayList LoginParams = new ArrayList(); | ||
56 | LoginParams.Add(LoginParamsHT); | ||
57 | XmlRpcRequest GridLoginReq = new XmlRpcRequest("manager_login",LoginParams); | ||
58 | XmlRpcResponse GridResp = GridLoginReq.Send(ServerURL,3000); | ||
59 | if (GridResp.IsFault) | ||
60 | { | ||
61 | connected=false; | ||
62 | return false; | ||
63 | } | ||
64 | else | ||
65 | { | ||
66 | Hashtable gridrespData = (Hashtable)GridResp.Value; | ||
67 | this.SessionID = new LLUUID((string)gridrespData["session_id"]); | ||
68 | connected=true; | ||
69 | return true; | ||
70 | } | ||
71 | } | ||
72 | catch(Exception e) | ||
73 | { | ||
74 | Console.WriteLine(e.ToString()); | ||
75 | connected=false; | ||
76 | return false; | ||
77 | } | ||
78 | } | ||
79 | |||
80 | public void DownloadMap() | ||
81 | { | ||
82 | System.Net.WebClient mapdownloader = new WebClient(); | ||
83 | Stream regionliststream = mapdownloader.OpenRead(ServerURL + "/regionlist"); | ||
84 | |||
85 | RegionBlock TempRegionData; | ||
86 | |||
87 | XmlDocument doc = new XmlDocument(); | ||
88 | doc.Load(regionliststream); | ||
89 | regionliststream.Close(); | ||
90 | XmlNode rootnode = doc.FirstChild; | ||
91 | if (rootnode.Name != "regions") | ||
92 | { | ||
93 | // TODO - ERROR! | ||
94 | } | ||
95 | |||
96 | for (int i = 0; i <= rootnode.ChildNodes.Count; i++) | ||
97 | { | ||
98 | if (rootnode.ChildNodes.Item(i).Name != "region") | ||
99 | { | ||
100 | // TODO - ERROR! | ||
101 | } | ||
102 | else | ||
103 | { | ||
104 | TempRegionData = new RegionBlock(); | ||
105 | } | ||
106 | } | ||
107 | } | ||
108 | |||
109 | public bool RestartServer() | ||
110 | { | ||
111 | return true; | ||
112 | } | ||
113 | |||
114 | public bool ShutdownServer() | ||
115 | { | ||
116 | try | ||
117 | { | ||
118 | Hashtable ShutdownParamsHT = new Hashtable(); | ||
119 | ArrayList ShutdownParams = new ArrayList(); | ||
120 | ShutdownParamsHT["session_id"]=this.SessionID.ToString(); | ||
121 | ShutdownParams.Add(ShutdownParamsHT); | ||
122 | XmlRpcRequest GridShutdownReq = new XmlRpcRequest("shutdown",ShutdownParams); | ||
123 | XmlRpcResponse GridResp = GridShutdownReq.Send(this.ServerURL, 3000); | ||
124 | if (GridResp.IsFault) | ||
125 | { | ||
126 | return false; | ||
127 | } | ||
128 | else | ||
129 | { | ||
130 | connected=false; | ||
131 | return true; | ||
132 | } | ||
133 | } | ||
134 | catch(Exception e) | ||
135 | { | ||
136 | Console.WriteLine(e.ToString()); | ||
137 | return false; | ||
138 | } | ||
139 | } | ||
140 | |||
141 | public void DisconnectServer() | ||
142 | { | ||
143 | this.connected=false; | ||
144 | } | ||
145 | } | ||
146 | } | ||
diff --git a/OpenSim/Grid/Manager/OpenGridServices.Manager/Main.cs b/OpenSim/Grid/Manager/OpenGridServices.Manager/Main.cs deleted file mode 100644 index 63954d5..0000000 --- a/OpenSim/Grid/Manager/OpenGridServices.Manager/Main.cs +++ /dev/null | |||
@@ -1,132 +0,0 @@ | |||
1 | /* | ||
2 | * Copyright (c) Contributors, http://opensimulator.org/ | ||
3 | * See CONTRIBUTORS.TXT for a full list of copyright holders. | ||
4 | * | ||
5 | * Redistribution and use in source and binary forms, with or without | ||
6 | * modification, are permitted provided that the following conditions are met: | ||
7 | * * Redistributions of source code must retain the above copyright | ||
8 | * notice, this list of conditions and the following disclaimer. | ||
9 | * * Redistributions in binary form must reproduce the above copyright | ||
10 | * notice, this list of conditions and the following disclaimer in the | ||
11 | * documentation and/or other materials provided with the distribution. | ||
12 | * * Neither the name of the OpenSimulator Project nor the | ||
13 | * names of its contributors may be used to endorse or promote products | ||
14 | * derived from this software without specific prior written permission. | ||
15 | * | ||
16 | * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY | ||
17 | * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED | ||
18 | * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE | ||
19 | * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY | ||
20 | * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES | ||
21 | * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; | ||
22 | * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND | ||
23 | * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT | ||
24 | * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS | ||
25 | * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | ||
26 | */ | ||
27 | |||
28 | using System; | ||
29 | using System.Threading; | ||
30 | using Gtk; | ||
31 | |||
32 | namespace OpenGridServices.Manager | ||
33 | { | ||
34 | class MainClass | ||
35 | { | ||
36 | |||
37 | public static bool QuitReq=false; | ||
38 | public static BlockingQueue<string> PendingOperations = new BlockingQueue<string>(); | ||
39 | |||
40 | private static Thread OperationsRunner; | ||
41 | |||
42 | private static GridServerConnectionManager gridserverConn; | ||
43 | |||
44 | private static MainWindow win; | ||
45 | |||
46 | public static void DoMainLoop() | ||
47 | { | ||
48 | while (!QuitReq) | ||
49 | { | ||
50 | Application.RunIteration(); | ||
51 | } | ||
52 | } | ||
53 | |||
54 | public static void RunOperations() | ||
55 | { | ||
56 | string operation; | ||
57 | string cmd; | ||
58 | char[] sep = new char[1]; | ||
59 | sep[0]=' '; | ||
60 | while (!QuitReq) | ||
61 | { | ||
62 | operation=PendingOperations.Dequeue(); | ||
63 | Console.WriteLine(operation); | ||
64 | cmd = operation.Split(sep)[0]; | ||
65 | switch (cmd) | ||
66 | { | ||
67 | case "connect_to_gridserver": | ||
68 | win.SetStatus("Connecting to grid server..."); | ||
69 | if (gridserverConn.Connect(operation.Split(sep)[1], operation.Split(sep)[2], operation.Split(sep)[3])) | ||
70 | { | ||
71 | win.SetStatus("Connected OK with session ID:" + gridserverConn.SessionID); | ||
72 | win.SetGridServerConnected(true); | ||
73 | Thread.Sleep(3000); | ||
74 | win.SetStatus("Downloading region maps..."); | ||
75 | gridserverConn.DownloadMap(); | ||
76 | } | ||
77 | else | ||
78 | { | ||
79 | win.SetStatus("Could not connect"); | ||
80 | } | ||
81 | break; | ||
82 | |||
83 | case "restart_gridserver": | ||
84 | win.SetStatus("Restarting grid server..."); | ||
85 | if (gridserverConn.RestartServer()) | ||
86 | { | ||
87 | win.SetStatus("Restarted server OK"); | ||
88 | Thread.Sleep(3000); | ||
89 | win.SetStatus(""); | ||
90 | } | ||
91 | else | ||
92 | { | ||
93 | win.SetStatus("Error restarting grid server!!!"); | ||
94 | } | ||
95 | break; | ||
96 | |||
97 | case "shutdown_gridserver": | ||
98 | win.SetStatus("Shutting down grid server..."); | ||
99 | if (gridserverConn.ShutdownServer()) | ||
100 | { | ||
101 | win.SetStatus("Grid server shutdown"); | ||
102 | win.SetGridServerConnected(false); | ||
103 | Thread.Sleep(3000); | ||
104 | win.SetStatus(""); | ||
105 | } | ||
106 | else | ||
107 | { | ||
108 | win.SetStatus("Could not shutdown grid server!!!"); | ||
109 | } | ||
110 | break; | ||
111 | |||
112 | case "disconnect_gridserver": | ||
113 | gridserverConn.DisconnectServer(); | ||
114 | win.SetGridServerConnected(false); | ||
115 | break; | ||
116 | } | ||
117 | } | ||
118 | } | ||
119 | |||
120 | public static void Main (string[] args) | ||
121 | { | ||
122 | gridserverConn = new GridServerConnectionManager(); | ||
123 | Application.Init (); | ||
124 | win = new MainWindow (); | ||
125 | win.Show (); | ||
126 | OperationsRunner = new Thread(new ThreadStart(RunOperations)); | ||
127 | OperationsRunner.IsBackground=true; | ||
128 | OperationsRunner.Start(); | ||
129 | DoMainLoop(); | ||
130 | } | ||
131 | } | ||
132 | } | ||
diff --git a/OpenSim/Grid/Manager/OpenGridServices.Manager/MainWindow.cs b/OpenSim/Grid/Manager/OpenGridServices.Manager/MainWindow.cs deleted file mode 100644 index c6fa800..0000000 --- a/OpenSim/Grid/Manager/OpenGridServices.Manager/MainWindow.cs +++ /dev/null | |||
@@ -1,106 +0,0 @@ | |||
1 | /* | ||
2 | * Copyright (c) Contributors, http://opensimulator.org/ | ||
3 | * See CONTRIBUTORS.TXT for a full list of copyright holders. | ||
4 | * | ||
5 | * Redistribution and use in source and binary forms, with or without | ||
6 | * modification, are permitted provided that the following conditions are met: | ||
7 | * * Redistributions of source code must retain the above copyright | ||
8 | * notice, this list of conditions and the following disclaimer. | ||
9 | * * Redistributions in binary form must reproduce the above copyright | ||
10 | * notice, this list of conditions and the following disclaimer in the | ||
11 | * documentation and/or other materials provided with the distribution. | ||
12 | * * Neither the name of the OpenSimulator Project nor the | ||
13 | * names of its contributors may be used to endorse or promote products | ||
14 | * derived from this software without specific prior written permission. | ||
15 | * | ||
16 | * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY | ||
17 | * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED | ||
18 | * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE | ||
19 | * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY | ||
20 | * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES | ||
21 | * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; | ||
22 | * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND | ||
23 | * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT | ||
24 | * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS | ||
25 | * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | ||
26 | */ | ||
27 | |||
28 | using System; | ||
29 | using Gtk; | ||
30 | |||
31 | namespace OpenGridServices.Manager | ||
32 | { | ||
33 | public partial class MainWindow: Gtk.Window | ||
34 | { | ||
35 | public MainWindow() : base (Gtk.WindowType.Toplevel) | ||
36 | { | ||
37 | Build(); | ||
38 | } | ||
39 | |||
40 | public void SetStatus(string statustext) | ||
41 | { | ||
42 | this.statusbar1.Pop(0); | ||
43 | this.statusbar1.Push(0, statustext); | ||
44 | } | ||
45 | |||
46 | public void DrawGrid(RegionBlock[][] regions) | ||
47 | { | ||
48 | for (int x=0; x<=regions.GetUpperBound(0); x++) | ||
49 | { | ||
50 | for (int y=0; y<=regions.GetUpperBound(1); y++) | ||
51 | { | ||
52 | Gdk.Image themap = new Gdk.Image(Gdk.ImageType.Fastest,Gdk.Visual.System,256,256); | ||
53 | this.drawingarea1.GdkWindow.DrawImage(new Gdk.GC(this.drawingarea1.GdkWindow),themap,0,0,x*256,y*256,256,256); | ||
54 | } | ||
55 | } | ||
56 | } | ||
57 | |||
58 | public void SetGridServerConnected(bool connected) | ||
59 | { | ||
60 | if (connected) | ||
61 | { | ||
62 | this.ConnectToGridserver.Visible=false; | ||
63 | this.DisconnectFromGridServer.Visible=true; | ||
64 | } | ||
65 | else | ||
66 | { | ||
67 | this.ConnectToGridserver.Visible=true; | ||
68 | this.DisconnectFromGridServer.Visible=false; | ||
69 | } | ||
70 | } | ||
71 | |||
72 | protected void OnDeleteEvent (object sender, DeleteEventArgs a) | ||
73 | { | ||
74 | Application.Quit (); | ||
75 | MainClass.QuitReq=true; | ||
76 | a.RetVal = true; | ||
77 | } | ||
78 | |||
79 | protected virtual void QuitMenu(object sender, System.EventArgs e) | ||
80 | { | ||
81 | MainClass.QuitReq=true; | ||
82 | Application.Quit(); | ||
83 | } | ||
84 | |||
85 | protected virtual void ConnectToGridServerMenu(object sender, System.EventArgs e) | ||
86 | { | ||
87 | ConnectToGridServerDialog griddialog = new ConnectToGridServerDialog (); | ||
88 | griddialog.Show(); | ||
89 | } | ||
90 | |||
91 | protected virtual void RestartGridserverMenu(object sender, System.EventArgs e) | ||
92 | { | ||
93 | MainClass.PendingOperations.Enqueue("restart_gridserver"); | ||
94 | } | ||
95 | |||
96 | protected virtual void ShutdownGridserverMenu(object sender, System.EventArgs e) | ||
97 | { | ||
98 | MainClass.PendingOperations.Enqueue("shutdown_gridserver"); | ||
99 | } | ||
100 | |||
101 | protected virtual void DisconnectGridServerMenu(object sender, System.EventArgs e) | ||
102 | { | ||
103 | MainClass.PendingOperations.Enqueue("disconnect_gridserver"); | ||
104 | } | ||
105 | } | ||
106 | } | ||
diff --git a/OpenSim/Grid/Manager/OpenGridServices.Manager/RegionBlock.cs b/OpenSim/Grid/Manager/OpenGridServices.Manager/RegionBlock.cs deleted file mode 100644 index 6c8b0bd..0000000 --- a/OpenSim/Grid/Manager/OpenGridServices.Manager/RegionBlock.cs +++ /dev/null | |||
@@ -1,62 +0,0 @@ | |||
1 | /* | ||
2 | * Copyright (c) Contributors, http://opensimulator.org/ | ||
3 | * See CONTRIBUTORS.TXT for a full list of copyright holders. | ||
4 | * | ||
5 | * Redistribution and use in source and binary forms, with or without | ||
6 | * modification, are permitted provided that the following conditions are met: | ||
7 | * * Redistributions of source code must retain the above copyright | ||
8 | * notice, this list of conditions and the following disclaimer. | ||
9 | * * Redistributions in binary form must reproduce the above copyright | ||
10 | * notice, this list of conditions and the following disclaimer in the | ||
11 | * documentation and/or other materials provided with the distribution. | ||
12 | * * Neither the name of the OpenSimulator Project nor the | ||
13 | * names of its contributors may be used to endorse or promote products | ||
14 | * derived from this software without specific prior written permission. | ||
15 | * | ||
16 | * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY | ||
17 | * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED | ||
18 | * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE | ||
19 | * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY | ||
20 | * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES | ||
21 | * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; | ||
22 | * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND | ||
23 | * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT | ||
24 | * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS | ||
25 | * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | ||
26 | */ | ||
27 | |||
28 | using System; | ||
29 | using System.Xml; | ||
30 | using libsecondlife; | ||
31 | using OpenSim.Framework.Utilities; | ||
32 | |||
33 | namespace OpenGridServices.Manager | ||
34 | { | ||
35 | public class RegionBlock | ||
36 | { | ||
37 | public uint regloc_x; | ||
38 | public uint regloc_y; | ||
39 | |||
40 | public string httpd_url; | ||
41 | |||
42 | public string region_name; | ||
43 | |||
44 | public ulong regionhandle { | ||
45 | get { return Util.UIntsToLong(regloc_x*256,regloc_y*256); } | ||
46 | } | ||
47 | |||
48 | public Gdk.Pixbuf MiniMap; | ||
49 | |||
50 | public RegionBlock() | ||
51 | { | ||
52 | } | ||
53 | |||
54 | public void LoadFromXmlNode(XmlNode sourcenode) | ||
55 | { | ||
56 | this.regloc_x=Convert.ToUInt32(sourcenode.Attributes.GetNamedItem("loc_x").Value); | ||
57 | this.regloc_y=Convert.ToUInt32(sourcenode.Attributes.GetNamedItem("loc_y").Value); | ||
58 | this.region_name=sourcenode.Attributes.GetNamedItem("region_name").Value; | ||
59 | this.httpd_url=sourcenode.Attributes.GetNamedItem("httpd_url").Value; | ||
60 | } | ||
61 | } | ||
62 | } | ||
diff --git a/OpenSim/Grid/Manager/OpenGridServices.Manager/Util.cs b/OpenSim/Grid/Manager/OpenGridServices.Manager/Util.cs deleted file mode 100644 index f2383bc..0000000 --- a/OpenSim/Grid/Manager/OpenGridServices.Manager/Util.cs +++ /dev/null | |||
@@ -1,160 +0,0 @@ | |||
1 | /* | ||
2 | * Copyright (c) Contributors, http://opensimulator.org/ | ||
3 | * See CONTRIBUTORS.TXT for a full list of copyright holders. | ||
4 | * | ||
5 | * Redistribution and use in source and binary forms, with or without | ||
6 | * modification, are permitted provided that the following conditions are met: | ||
7 | * * Redistributions of source code must retain the above copyright | ||
8 | * notice, this list of conditions and the following disclaimer. | ||
9 | * * Redistributions in binary form must reproduce the above copyright | ||
10 | * notice, this list of conditions and the following disclaimer in the | ||
11 | * documentation and/or other materials provided with the distribution. | ||
12 | * * Neither the name of the OpenSimulator Project nor the | ||
13 | * names of its contributors may be used to endorse or promote products | ||
14 | * derived from this software without specific prior written permission. | ||
15 | * | ||
16 | * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY | ||
17 | * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED | ||
18 | * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE | ||
19 | * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY | ||
20 | * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES | ||
21 | * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; | ||
22 | * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND | ||
23 | * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT | ||
24 | * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS | ||
25 | * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | ||
26 | */ | ||
27 | |||
28 | using System; | ||
29 | using System.Collections.Generic; | ||
30 | using System.Text; | ||
31 | using libsecondlife; | ||
32 | using libsecondlife.Packets; | ||
33 | |||
34 | namespace OpenSim.Framework.Utilities | ||
35 | { | ||
36 | public class Util | ||
37 | { | ||
38 | private static Random randomClass = new Random(); | ||
39 | private static uint nextXferID = 5000; | ||
40 | private static object XferLock = new object(); | ||
41 | |||
42 | public static ulong UIntsToLong(uint X, uint Y) | ||
43 | { | ||
44 | return Helpers.UIntsToLong(X, Y); | ||
45 | } | ||
46 | |||
47 | public static Random RandomClass | ||
48 | { | ||
49 | get | ||
50 | { | ||
51 | return randomClass; | ||
52 | } | ||
53 | } | ||
54 | |||
55 | public static uint GetNextXferID() | ||
56 | { | ||
57 | uint id = 0; | ||
58 | lock (XferLock) | ||
59 | { | ||
60 | id = nextXferID; | ||
61 | nextXferID++; | ||
62 | } | ||
63 | return id; | ||
64 | } | ||
65 | |||
66 | //public static int fast_distance2d(int x, int y) | ||
67 | //{ | ||
68 | // x = System.Math.Abs(x); | ||
69 | // y = System.Math.Abs(y); | ||
70 | |||
71 | // int min = System.Math.Min(x, y); | ||
72 | |||
73 | // return (x + y - (min >> 1) - (min >> 2) + (min >> 4)); | ||
74 | //} | ||
75 | |||
76 | public static string FieldToString(byte[] bytes) | ||
77 | { | ||
78 | return FieldToString(bytes, String.Empty); | ||
79 | } | ||
80 | |||
81 | /// <summary> | ||
82 | /// Convert a variable length field (byte array) to a string, with a | ||
83 | /// field name prepended to each line of the output | ||
84 | /// </summary> | ||
85 | /// <remarks>If the byte array has unprintable characters in it, a | ||
86 | /// hex dump will be put in the string instead</remarks> | ||
87 | /// <param name="bytes">The byte array to convert to a string</param> | ||
88 | /// <param name="fieldName">A field name to prepend to each line of output</param> | ||
89 | /// <returns>An ASCII string or a string containing a hex dump, minus | ||
90 | /// the null terminator</returns> | ||
91 | public static string FieldToString(byte[] bytes, string fieldName) | ||
92 | { | ||
93 | // Check for a common case | ||
94 | if (bytes.Length == 0) return String.Empty; | ||
95 | |||
96 | StringBuilder output = new StringBuilder(); | ||
97 | bool printable = true; | ||
98 | |||
99 | for (int i = 0; i < bytes.Length; ++i) | ||
100 | { | ||
101 | // Check if there are any unprintable characters in the array | ||
102 | if ((bytes[i] < 0x20 || bytes[i] > 0x7E) && bytes[i] != 0x09 | ||
103 | && bytes[i] != 0x0D && bytes[i] != 0x0A && bytes[i] != 0x00) | ||
104 | { | ||
105 | printable = false; | ||
106 | break; | ||
107 | } | ||
108 | } | ||
109 | |||
110 | if (printable) | ||
111 | { | ||
112 | if (fieldName.Length > 0) | ||
113 | { | ||
114 | output.Append(fieldName); | ||
115 | output.Append(": "); | ||
116 | } | ||
117 | |||
118 | if (bytes[bytes.Length - 1] == 0x00) | ||
119 | output.Append(UTF8Encoding.UTF8.GetString(bytes, 0, bytes.Length - 1)); | ||
120 | else | ||
121 | output.Append(UTF8Encoding.UTF8.GetString(bytes)); | ||
122 | } | ||
123 | else | ||
124 | { | ||
125 | for (int i = 0; i < bytes.Length; i += 16) | ||
126 | { | ||
127 | if (i != 0) | ||
128 | output.Append(Environment.NewLine); | ||
129 | if (fieldName.Length > 0) | ||
130 | { | ||
131 | output.Append(fieldName); | ||
132 | output.Append(": "); | ||
133 | } | ||
134 | |||
135 | for (int j = 0; j < 16; j++) | ||
136 | { | ||
137 | if ((i + j) < bytes.Length) | ||
138 | output.Append(String.Format("{0:X2} ", bytes[i + j])); | ||
139 | else | ||
140 | output.Append(" "); | ||
141 | } | ||
142 | |||
143 | for (int j = 0; j < 16 && (i + j) < bytes.Length; j++) | ||
144 | { | ||
145 | if (bytes[i + j] >= 0x20 && bytes[i + j] < 0x7E) | ||
146 | output.Append((char)bytes[i + j]); | ||
147 | else | ||
148 | output.Append("."); | ||
149 | } | ||
150 | } | ||
151 | } | ||
152 | |||
153 | return output.ToString(); | ||
154 | } | ||
155 | |||
156 | public Util() | ||
157 | { | ||
158 | } | ||
159 | } | ||
160 | } | ||
diff --git a/OpenSim/Grid/Manager/OpenGridServices.Manager/gtk-gui/OpenGridServices.Manager.ConnectToGridServerDialog.cs b/OpenSim/Grid/Manager/OpenGridServices.Manager/gtk-gui/OpenGridServices.Manager.ConnectToGridServerDialog.cs deleted file mode 100644 index d80499c..0000000 --- a/OpenSim/Grid/Manager/OpenGridServices.Manager/gtk-gui/OpenGridServices.Manager.ConnectToGridServerDialog.cs +++ /dev/null | |||
@@ -1,242 +0,0 @@ | |||
1 | /* | ||
2 | * Copyright (c) Contributors, http://opensimulator.org/ | ||
3 | * See CONTRIBUTORS.TXT for a full list of copyright holders. | ||
4 | * | ||
5 | * Redistribution and use in source and binary forms, with or without | ||
6 | * modification, are permitted provided that the following conditions are met: | ||
7 | * * Redistributions of source code must retain the above copyright | ||
8 | * notice, this list of conditions and the following disclaimer. | ||
9 | * * Redistributions in binary form must reproduce the above copyright | ||
10 | * notice, this list of conditions and the following disclaimer in the | ||
11 | * documentation and/or other materials provided with the distribution. | ||
12 | * * Neither the name of the OpenSimulator Project nor the | ||
13 | * names of its contributors may be used to endorse or promote products | ||
14 | * derived from this software without specific prior written permission. | ||
15 | * | ||
16 | * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY | ||
17 | * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED | ||
18 | * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE | ||
19 | * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY | ||
20 | * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES | ||
21 | * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; | ||
22 | * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND | ||
23 | * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT | ||
24 | * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS | ||
25 | * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | ||
26 | */ | ||
27 | |||
28 | // ------------------------------------------------------------------------------ | ||
29 | // <autogenerated> | ||
30 | // This code was generated by a tool. | ||
31 | // Mono Runtime Version: 2.0.50727.42 | ||
32 | // | ||
33 | // Changes to this file may cause incorrect behavior and will be lost if | ||
34 | // the code is regenerated. | ||
35 | // </autogenerated> | ||
36 | // ------------------------------------------------------------------------------ | ||
37 | |||
38 | namespace OpenGridServices.Manager | ||
39 | { | ||
40 | public partial class ConnectToGridServerDialog | ||
41 | { | ||
42 | private Gtk.VBox vbox2; | ||
43 | private Gtk.VBox vbox3; | ||
44 | private Gtk.HBox hbox1; | ||
45 | private Gtk.Label label1; | ||
46 | private Gtk.Entry entry1; | ||
47 | private Gtk.HBox hbox2; | ||
48 | private Gtk.Label label2; | ||
49 | private Gtk.Entry entry2; | ||
50 | private Gtk.HBox hbox3; | ||
51 | private Gtk.Label label3; | ||
52 | private Gtk.Entry entry3; | ||
53 | private Gtk.Button button2; | ||
54 | private Gtk.Button button8; | ||
55 | |||
56 | protected virtual void Build() | ||
57 | { | ||
58 | Stetic.Gui.Initialize(); | ||
59 | // Widget OpenGridServices.Manager.ConnectToGridServerDialog | ||
60 | this.Events = ((Gdk.EventMask)(256)); | ||
61 | this.Name = "OpenGridServices.Manager.ConnectToGridServerDialog"; | ||
62 | this.Title = Mono.Unix.Catalog.GetString("Connect to Grid server"); | ||
63 | this.WindowPosition = ((Gtk.WindowPosition)(4)); | ||
64 | this.HasSeparator = false; | ||
65 | // Internal child OpenGridServices.Manager.ConnectToGridServerDialog.VBox | ||
66 | Gtk.VBox w1 = this.VBox; | ||
67 | w1.Events = ((Gdk.EventMask)(256)); | ||
68 | w1.Name = "dialog_VBox"; | ||
69 | w1.BorderWidth = ((uint)(2)); | ||
70 | // Container child dialog_VBox.Gtk.Box+BoxChild | ||
71 | this.vbox2 = new Gtk.VBox(); | ||
72 | this.vbox2.Name = "vbox2"; | ||
73 | // Container child vbox2.Gtk.Box+BoxChild | ||
74 | this.vbox3 = new Gtk.VBox(); | ||
75 | this.vbox3.Name = "vbox3"; | ||
76 | // Container child vbox3.Gtk.Box+BoxChild | ||
77 | this.hbox1 = new Gtk.HBox(); | ||
78 | this.hbox1.Name = "hbox1"; | ||
79 | // Container child hbox1.Gtk.Box+BoxChild | ||
80 | this.label1 = new Gtk.Label(); | ||
81 | this.label1.Name = "label1"; | ||
82 | this.label1.Xalign = 1F; | ||
83 | this.label1.LabelProp = Mono.Unix.Catalog.GetString("Grid server URL: "); | ||
84 | this.label1.Justify = ((Gtk.Justification)(1)); | ||
85 | this.hbox1.Add(this.label1); | ||
86 | Gtk.Box.BoxChild w2 = ((Gtk.Box.BoxChild)(this.hbox1[this.label1])); | ||
87 | w2.Position = 0; | ||
88 | // Container child hbox1.Gtk.Box+BoxChild | ||
89 | this.entry1 = new Gtk.Entry(); | ||
90 | this.entry1.CanFocus = true; | ||
91 | this.entry1.Name = "entry1"; | ||
92 | this.entry1.Text = Mono.Unix.Catalog.GetString("http://gridserver:8001"); | ||
93 | this.entry1.IsEditable = true; | ||
94 | this.entry1.MaxLength = 255; | ||
95 | this.entry1.InvisibleChar = '•'; | ||
96 | this.hbox1.Add(this.entry1); | ||
97 | Gtk.Box.BoxChild w3 = ((Gtk.Box.BoxChild)(this.hbox1[this.entry1])); | ||
98 | w3.Position = 1; | ||
99 | this.vbox3.Add(this.hbox1); | ||
100 | Gtk.Box.BoxChild w4 = ((Gtk.Box.BoxChild)(this.vbox3[this.hbox1])); | ||
101 | w4.Position = 0; | ||
102 | w4.Expand = false; | ||
103 | w4.Fill = false; | ||
104 | // Container child vbox3.Gtk.Box+BoxChild | ||
105 | this.hbox2 = new Gtk.HBox(); | ||
106 | this.hbox2.Name = "hbox2"; | ||
107 | // Container child hbox2.Gtk.Box+BoxChild | ||
108 | this.label2 = new Gtk.Label(); | ||
109 | this.label2.Name = "label2"; | ||
110 | this.label2.Xalign = 1F; | ||
111 | this.label2.LabelProp = Mono.Unix.Catalog.GetString("Username:"); | ||
112 | this.label2.Justify = ((Gtk.Justification)(1)); | ||
113 | this.hbox2.Add(this.label2); | ||
114 | Gtk.Box.BoxChild w5 = ((Gtk.Box.BoxChild)(this.hbox2[this.label2])); | ||
115 | w5.Position = 0; | ||
116 | // Container child hbox2.Gtk.Box+BoxChild | ||
117 | this.entry2 = new Gtk.Entry(); | ||
118 | this.entry2.CanFocus = true; | ||
119 | this.entry2.Name = "entry2"; | ||
120 | this.entry2.IsEditable = true; | ||
121 | this.entry2.InvisibleChar = '•'; | ||
122 | this.hbox2.Add(this.entry2); | ||
123 | Gtk.Box.BoxChild w6 = ((Gtk.Box.BoxChild)(this.hbox2[this.entry2])); | ||
124 | w6.Position = 1; | ||
125 | this.vbox3.Add(this.hbox2); | ||
126 | Gtk.Box.BoxChild w7 = ((Gtk.Box.BoxChild)(this.vbox3[this.hbox2])); | ||
127 | w7.Position = 1; | ||
128 | w7.Expand = false; | ||
129 | w7.Fill = false; | ||
130 | // Container child vbox3.Gtk.Box+BoxChild | ||
131 | this.hbox3 = new Gtk.HBox(); | ||
132 | this.hbox3.Name = "hbox3"; | ||
133 | // Container child hbox3.Gtk.Box+BoxChild | ||
134 | this.label3 = new Gtk.Label(); | ||
135 | this.label3.Name = "label3"; | ||
136 | this.label3.Xalign = 1F; | ||
137 | this.label3.LabelProp = Mono.Unix.Catalog.GetString("Password:"); | ||
138 | this.label3.Justify = ((Gtk.Justification)(1)); | ||
139 | this.hbox3.Add(this.label3); | ||
140 | Gtk.Box.BoxChild w8 = ((Gtk.Box.BoxChild)(this.hbox3[this.label3])); | ||
141 | w8.Position = 0; | ||
142 | // Container child hbox3.Gtk.Box+BoxChild | ||
143 | this.entry3 = new Gtk.Entry(); | ||
144 | this.entry3.CanFocus = true; | ||
145 | this.entry3.Name = "entry3"; | ||
146 | this.entry3.IsEditable = true; | ||
147 | this.entry3.InvisibleChar = '•'; | ||
148 | this.hbox3.Add(this.entry3); | ||
149 | Gtk.Box.BoxChild w9 = ((Gtk.Box.BoxChild)(this.hbox3[this.entry3])); | ||
150 | w9.Position = 1; | ||
151 | this.vbox3.Add(this.hbox3); | ||
152 | Gtk.Box.BoxChild w10 = ((Gtk.Box.BoxChild)(this.vbox3[this.hbox3])); | ||
153 | w10.Position = 2; | ||
154 | w10.Expand = false; | ||
155 | w10.Fill = false; | ||
156 | this.vbox2.Add(this.vbox3); | ||
157 | Gtk.Box.BoxChild w11 = ((Gtk.Box.BoxChild)(this.vbox2[this.vbox3])); | ||
158 | w11.Position = 2; | ||
159 | w11.Expand = false; | ||
160 | w11.Fill = false; | ||
161 | w1.Add(this.vbox2); | ||
162 | Gtk.Box.BoxChild w12 = ((Gtk.Box.BoxChild)(w1[this.vbox2])); | ||
163 | w12.Position = 0; | ||
164 | // Internal child OpenGridServices.Manager.ConnectToGridServerDialog.ActionArea | ||
165 | Gtk.HButtonBox w13 = this.ActionArea; | ||
166 | w13.Events = ((Gdk.EventMask)(256)); | ||
167 | w13.Name = "OpenGridServices.Manager.ConnectToGridServerDialog_ActionArea"; | ||
168 | w13.Spacing = 6; | ||
169 | w13.BorderWidth = ((uint)(5)); | ||
170 | w13.LayoutStyle = ((Gtk.ButtonBoxStyle)(4)); | ||
171 | // Container child OpenGridServices.Manager.ConnectToGridServerDialog_ActionArea.Gtk.ButtonBox+ButtonBoxChild | ||
172 | this.button2 = new Gtk.Button(); | ||
173 | this.button2.CanDefault = true; | ||
174 | this.button2.CanFocus = true; | ||
175 | this.button2.Name = "button2"; | ||
176 | this.button2.UseUnderline = true; | ||
177 | // Container child button2.Gtk.Container+ContainerChild | ||
178 | Gtk.Alignment w14 = new Gtk.Alignment(0.5F, 0.5F, 0F, 0F); | ||
179 | w14.Name = "GtkAlignment"; | ||
180 | // Container child GtkAlignment.Gtk.Container+ContainerChild | ||
181 | Gtk.HBox w15 = new Gtk.HBox(); | ||
182 | w15.Name = "GtkHBox"; | ||
183 | w15.Spacing = 2; | ||
184 | // Container child GtkHBox.Gtk.Container+ContainerChild | ||
185 | Gtk.Image w16 = new Gtk.Image(); | ||
186 | w16.Name = "image1"; | ||
187 | w16.Pixbuf = Gtk.IconTheme.Default.LoadIcon("gtk-apply", 16, 0); | ||
188 | w15.Add(w16); | ||
189 | // Container child GtkHBox.Gtk.Container+ContainerChild | ||
190 | Gtk.Label w18 = new Gtk.Label(); | ||
191 | w18.Name = "GtkLabel"; | ||
192 | w18.LabelProp = Mono.Unix.Catalog.GetString("Connect"); | ||
193 | w18.UseUnderline = true; | ||
194 | w15.Add(w18); | ||
195 | w14.Add(w15); | ||
196 | this.button2.Add(w14); | ||
197 | this.AddActionWidget(this.button2, -5); | ||
198 | Gtk.ButtonBox.ButtonBoxChild w22 = ((Gtk.ButtonBox.ButtonBoxChild)(w13[this.button2])); | ||
199 | w22.Expand = false; | ||
200 | w22.Fill = false; | ||
201 | // Container child OpenGridServices.Manager.ConnectToGridServerDialog_ActionArea.Gtk.ButtonBox+ButtonBoxChild | ||
202 | this.button8 = new Gtk.Button(); | ||
203 | this.button8.CanDefault = true; | ||
204 | this.button8.CanFocus = true; | ||
205 | this.button8.Name = "button8"; | ||
206 | this.button8.UseUnderline = true; | ||
207 | // Container child button8.Gtk.Container+ContainerChild | ||
208 | Gtk.Alignment w23 = new Gtk.Alignment(0.5F, 0.5F, 0F, 0F); | ||
209 | w23.Name = "GtkAlignment1"; | ||
210 | // Container child GtkAlignment1.Gtk.Container+ContainerChild | ||
211 | Gtk.HBox w24 = new Gtk.HBox(); | ||
212 | w24.Name = "GtkHBox1"; | ||
213 | w24.Spacing = 2; | ||
214 | // Container child GtkHBox1.Gtk.Container+ContainerChild | ||
215 | Gtk.Image w25 = new Gtk.Image(); | ||
216 | w25.Name = "image2"; | ||
217 | w25.Pixbuf = Gtk.IconTheme.Default.LoadIcon("gtk-cancel", 16, 0); | ||
218 | w24.Add(w25); | ||
219 | // Container child GtkHBox1.Gtk.Container+ContainerChild | ||
220 | Gtk.Label w27 = new Gtk.Label(); | ||
221 | w27.Name = "GtkLabel1"; | ||
222 | w27.LabelProp = Mono.Unix.Catalog.GetString("Cancel"); | ||
223 | w27.UseUnderline = true; | ||
224 | w24.Add(w27); | ||
225 | w23.Add(w24); | ||
226 | this.button8.Add(w23); | ||
227 | this.AddActionWidget(this.button8, -6); | ||
228 | Gtk.ButtonBox.ButtonBoxChild w31 = ((Gtk.ButtonBox.ButtonBoxChild)(w13[this.button8])); | ||
229 | w31.Position = 1; | ||
230 | w31.Expand = false; | ||
231 | w31.Fill = false; | ||
232 | if (this.Child != null) | ||
233 | { | ||
234 | this.Child.ShowAll(); | ||
235 | } | ||
236 | this.DefaultWidth = 476; | ||
237 | this.DefaultHeight = 137; | ||
238 | this.Show(); | ||
239 | this.Response += new Gtk.ResponseHandler(this.OnResponse); | ||
240 | } | ||
241 | } | ||
242 | } | ||
diff --git a/OpenSim/Grid/Manager/OpenGridServices.Manager/gtk-gui/OpenGridServices.Manager.MainWindow.cs b/OpenSim/Grid/Manager/OpenGridServices.Manager/gtk-gui/OpenGridServices.Manager.MainWindow.cs deleted file mode 100644 index 0476081..0000000 --- a/OpenSim/Grid/Manager/OpenGridServices.Manager/gtk-gui/OpenGridServices.Manager.MainWindow.cs +++ /dev/null | |||
@@ -1,250 +0,0 @@ | |||
1 | /* | ||
2 | * Copyright (c) Contributors, http://opensimulator.org/ | ||
3 | * See CONTRIBUTORS.TXT for a full list of copyright holders. | ||
4 | * | ||
5 | * Redistribution and use in source and binary forms, with or without | ||
6 | * modification, are permitted provided that the following conditions are met: | ||
7 | * * Redistributions of source code must retain the above copyright | ||
8 | * notice, this list of conditions and the following disclaimer. | ||
9 | * * Redistributions in binary form must reproduce the above copyright | ||
10 | * notice, this list of conditions and the following disclaimer in the | ||
11 | * documentation and/or other materials provided with the distribution. | ||
12 | * * Neither the name of the OpenSimulator Project nor the | ||
13 | * names of its contributors may be used to endorse or promote products | ||
14 | * derived from this software without specific prior written permission. | ||
15 | * | ||
16 | * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY | ||
17 | * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED | ||
18 | * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE | ||
19 | * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY | ||
20 | * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES | ||
21 | * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; | ||
22 | * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND | ||
23 | * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT | ||
24 | * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS | ||
25 | * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | ||
26 | */ | ||
27 | |||
28 | // ------------------------------------------------------------------------------ | ||
29 | // <autogenerated> | ||
30 | // This code was generated by a tool. | ||
31 | // Mono Runtime Version: 2.0.50727.42 | ||
32 | // | ||
33 | // Changes to this file may cause incorrect behavior and will be lost if | ||
34 | // the code is regenerated. | ||
35 | // </autogenerated> | ||
36 | // ------------------------------------------------------------------------------ | ||
37 | |||
38 | namespace OpenGridServices.Manager | ||
39 | { | ||
40 | public partial class MainWindow | ||
41 | { | ||
42 | private Gtk.Action Grid; | ||
43 | private Gtk.Action User; | ||
44 | private Gtk.Action Asset; | ||
45 | private Gtk.Action Region; | ||
46 | private Gtk.Action Services; | ||
47 | private Gtk.Action ConnectToGridserver; | ||
48 | private Gtk.Action RestartWholeGrid; | ||
49 | private Gtk.Action ShutdownWholeGrid; | ||
50 | private Gtk.Action ExitGridManager; | ||
51 | private Gtk.Action ConnectToUserserver; | ||
52 | private Gtk.Action AccountManagment; | ||
53 | private Gtk.Action GlobalNotice; | ||
54 | private Gtk.Action DisableAllLogins; | ||
55 | private Gtk.Action DisableNonGodUsersOnly; | ||
56 | private Gtk.Action ShutdownUserServer; | ||
57 | private Gtk.Action ShutdownGridserverOnly; | ||
58 | private Gtk.Action RestartGridserverOnly; | ||
59 | private Gtk.Action DefaultLocalGridUserserver; | ||
60 | private Gtk.Action CustomUserserver; | ||
61 | private Gtk.Action RemoteGridDefaultUserserver; | ||
62 | private Gtk.Action DisconnectFromGridServer; | ||
63 | private Gtk.Action UploadAsset; | ||
64 | private Gtk.Action AssetManagement; | ||
65 | private Gtk.Action ConnectToAssetServer; | ||
66 | private Gtk.Action ConnectToDefaultAssetServerForGrid; | ||
67 | private Gtk.Action DefaultForLocalGrid; | ||
68 | private Gtk.Action DefaultForRemoteGrid; | ||
69 | private Gtk.Action CustomAssetServer; | ||
70 | private Gtk.VBox vbox1; | ||
71 | private Gtk.MenuBar menubar2; | ||
72 | private Gtk.HBox hbox1; | ||
73 | private Gtk.ScrolledWindow scrolledwindow1; | ||
74 | private Gtk.DrawingArea drawingarea1; | ||
75 | private Gtk.TreeView treeview1; | ||
76 | private Gtk.Statusbar statusbar1; | ||
77 | |||
78 | protected virtual void Build() | ||
79 | { | ||
80 | Stetic.Gui.Initialize(); | ||
81 | // Widget OpenGridServices.Manager.MainWindow | ||
82 | Gtk.UIManager w1 = new Gtk.UIManager(); | ||
83 | Gtk.ActionGroup w2 = new Gtk.ActionGroup("Default"); | ||
84 | this.Grid = new Gtk.Action("Grid", Mono.Unix.Catalog.GetString("Grid"), null, null); | ||
85 | this.Grid.HideIfEmpty = false; | ||
86 | this.Grid.ShortLabel = Mono.Unix.Catalog.GetString("Grid"); | ||
87 | w2.Add(this.Grid, "<Alt><Mod2>g"); | ||
88 | this.User = new Gtk.Action("User", Mono.Unix.Catalog.GetString("User"), null, null); | ||
89 | this.User.HideIfEmpty = false; | ||
90 | this.User.ShortLabel = Mono.Unix.Catalog.GetString("User"); | ||
91 | w2.Add(this.User, null); | ||
92 | this.Asset = new Gtk.Action("Asset", Mono.Unix.Catalog.GetString("Asset"), null, null); | ||
93 | this.Asset.HideIfEmpty = false; | ||
94 | this.Asset.ShortLabel = Mono.Unix.Catalog.GetString("Asset"); | ||
95 | w2.Add(this.Asset, null); | ||
96 | this.Region = new Gtk.Action("Region", Mono.Unix.Catalog.GetString("Region"), null, null); | ||
97 | this.Region.ShortLabel = Mono.Unix.Catalog.GetString("Region"); | ||
98 | w2.Add(this.Region, null); | ||
99 | this.Services = new Gtk.Action("Services", Mono.Unix.Catalog.GetString("Services"), null, null); | ||
100 | this.Services.ShortLabel = Mono.Unix.Catalog.GetString("Services"); | ||
101 | w2.Add(this.Services, null); | ||
102 | this.ConnectToGridserver = new Gtk.Action("ConnectToGridserver", Mono.Unix.Catalog.GetString("Connect to gridserver..."), null, "gtk-connect"); | ||
103 | this.ConnectToGridserver.HideIfEmpty = false; | ||
104 | this.ConnectToGridserver.ShortLabel = Mono.Unix.Catalog.GetString("Connect to gridserver"); | ||
105 | w2.Add(this.ConnectToGridserver, null); | ||
106 | this.RestartWholeGrid = new Gtk.Action("RestartWholeGrid", Mono.Unix.Catalog.GetString("Restart whole grid"), null, "gtk-refresh"); | ||
107 | this.RestartWholeGrid.ShortLabel = Mono.Unix.Catalog.GetString("Restart whole grid"); | ||
108 | w2.Add(this.RestartWholeGrid, null); | ||
109 | this.ShutdownWholeGrid = new Gtk.Action("ShutdownWholeGrid", Mono.Unix.Catalog.GetString("Shutdown whole grid"), null, "gtk-stop"); | ||
110 | this.ShutdownWholeGrid.ShortLabel = Mono.Unix.Catalog.GetString("Shutdown whole grid"); | ||
111 | w2.Add(this.ShutdownWholeGrid, null); | ||
112 | this.ExitGridManager = new Gtk.Action("ExitGridManager", Mono.Unix.Catalog.GetString("Exit grid manager"), null, "gtk-close"); | ||
113 | this.ExitGridManager.ShortLabel = Mono.Unix.Catalog.GetString("Exit grid manager"); | ||
114 | w2.Add(this.ExitGridManager, null); | ||
115 | this.ConnectToUserserver = new Gtk.Action("ConnectToUserserver", Mono.Unix.Catalog.GetString("Connect to userserver"), null, "gtk-connect"); | ||
116 | this.ConnectToUserserver.ShortLabel = Mono.Unix.Catalog.GetString("Connect to userserver"); | ||
117 | w2.Add(this.ConnectToUserserver, null); | ||
118 | this.AccountManagment = new Gtk.Action("AccountManagment", Mono.Unix.Catalog.GetString("Account managment"), null, "gtk-properties"); | ||
119 | this.AccountManagment.ShortLabel = Mono.Unix.Catalog.GetString("Account managment"); | ||
120 | w2.Add(this.AccountManagment, null); | ||
121 | this.GlobalNotice = new Gtk.Action("GlobalNotice", Mono.Unix.Catalog.GetString("Global notice"), null, "gtk-network"); | ||
122 | this.GlobalNotice.ShortLabel = Mono.Unix.Catalog.GetString("Global notice"); | ||
123 | w2.Add(this.GlobalNotice, null); | ||
124 | this.DisableAllLogins = new Gtk.Action("DisableAllLogins", Mono.Unix.Catalog.GetString("Disable all logins"), null, "gtk-no"); | ||
125 | this.DisableAllLogins.ShortLabel = Mono.Unix.Catalog.GetString("Disable all logins"); | ||
126 | w2.Add(this.DisableAllLogins, null); | ||
127 | this.DisableNonGodUsersOnly = new Gtk.Action("DisableNonGodUsersOnly", Mono.Unix.Catalog.GetString("Disable non-god users only"), null, "gtk-no"); | ||
128 | this.DisableNonGodUsersOnly.ShortLabel = Mono.Unix.Catalog.GetString("Disable non-god users only"); | ||
129 | w2.Add(this.DisableNonGodUsersOnly, null); | ||
130 | this.ShutdownUserServer = new Gtk.Action("ShutdownUserServer", Mono.Unix.Catalog.GetString("Shutdown user server"), null, "gtk-stop"); | ||
131 | this.ShutdownUserServer.ShortLabel = Mono.Unix.Catalog.GetString("Shutdown user server"); | ||
132 | w2.Add(this.ShutdownUserServer, null); | ||
133 | this.ShutdownGridserverOnly = new Gtk.Action("ShutdownGridserverOnly", Mono.Unix.Catalog.GetString("Shutdown gridserver only"), null, "gtk-stop"); | ||
134 | this.ShutdownGridserverOnly.ShortLabel = Mono.Unix.Catalog.GetString("Shutdown gridserver only"); | ||
135 | w2.Add(this.ShutdownGridserverOnly, null); | ||
136 | this.RestartGridserverOnly = new Gtk.Action("RestartGridserverOnly", Mono.Unix.Catalog.GetString("Restart gridserver only"), null, "gtk-refresh"); | ||
137 | this.RestartGridserverOnly.ShortLabel = Mono.Unix.Catalog.GetString("Restart gridserver only"); | ||
138 | w2.Add(this.RestartGridserverOnly, null); | ||
139 | this.DefaultLocalGridUserserver = new Gtk.Action("DefaultLocalGridUserserver", Mono.Unix.Catalog.GetString("Default local grid userserver"), null, null); | ||
140 | this.DefaultLocalGridUserserver.ShortLabel = Mono.Unix.Catalog.GetString("Default local grid userserver"); | ||
141 | w2.Add(this.DefaultLocalGridUserserver, null); | ||
142 | this.CustomUserserver = new Gtk.Action("CustomUserserver", Mono.Unix.Catalog.GetString("Custom userserver..."), null, null); | ||
143 | this.CustomUserserver.ShortLabel = Mono.Unix.Catalog.GetString("Custom userserver"); | ||
144 | w2.Add(this.CustomUserserver, null); | ||
145 | this.RemoteGridDefaultUserserver = new Gtk.Action("RemoteGridDefaultUserserver", Mono.Unix.Catalog.GetString("Remote grid default userserver..."), null, null); | ||
146 | this.RemoteGridDefaultUserserver.ShortLabel = Mono.Unix.Catalog.GetString("Remote grid default userserver"); | ||
147 | w2.Add(this.RemoteGridDefaultUserserver, null); | ||
148 | this.DisconnectFromGridServer = new Gtk.Action("DisconnectFromGridServer", Mono.Unix.Catalog.GetString("Disconnect from grid server"), null, "gtk-disconnect"); | ||
149 | this.DisconnectFromGridServer.ShortLabel = Mono.Unix.Catalog.GetString("Disconnect from grid server"); | ||
150 | this.DisconnectFromGridServer.Visible = false; | ||
151 | w2.Add(this.DisconnectFromGridServer, null); | ||
152 | this.UploadAsset = new Gtk.Action("UploadAsset", Mono.Unix.Catalog.GetString("Upload asset"), null, null); | ||
153 | this.UploadAsset.ShortLabel = Mono.Unix.Catalog.GetString("Upload asset"); | ||
154 | w2.Add(this.UploadAsset, null); | ||
155 | this.AssetManagement = new Gtk.Action("AssetManagement", Mono.Unix.Catalog.GetString("Asset management"), null, null); | ||
156 | this.AssetManagement.ShortLabel = Mono.Unix.Catalog.GetString("Asset management"); | ||
157 | w2.Add(this.AssetManagement, null); | ||
158 | this.ConnectToAssetServer = new Gtk.Action("ConnectToAssetServer", Mono.Unix.Catalog.GetString("Connect to asset server"), null, null); | ||
159 | this.ConnectToAssetServer.ShortLabel = Mono.Unix.Catalog.GetString("Connect to asset server"); | ||
160 | w2.Add(this.ConnectToAssetServer, null); | ||
161 | this.ConnectToDefaultAssetServerForGrid = new Gtk.Action("ConnectToDefaultAssetServerForGrid", Mono.Unix.Catalog.GetString("Connect to default asset server for grid"), null, null); | ||
162 | this.ConnectToDefaultAssetServerForGrid.ShortLabel = Mono.Unix.Catalog.GetString("Connect to default asset server for grid"); | ||
163 | w2.Add(this.ConnectToDefaultAssetServerForGrid, null); | ||
164 | this.DefaultForLocalGrid = new Gtk.Action("DefaultForLocalGrid", Mono.Unix.Catalog.GetString("Default for local grid"), null, null); | ||
165 | this.DefaultForLocalGrid.ShortLabel = Mono.Unix.Catalog.GetString("Default for local grid"); | ||
166 | w2.Add(this.DefaultForLocalGrid, null); | ||
167 | this.DefaultForRemoteGrid = new Gtk.Action("DefaultForRemoteGrid", Mono.Unix.Catalog.GetString("Default for remote grid..."), null, null); | ||
168 | this.DefaultForRemoteGrid.ShortLabel = Mono.Unix.Catalog.GetString("Default for remote grid..."); | ||
169 | w2.Add(this.DefaultForRemoteGrid, null); | ||
170 | this.CustomAssetServer = new Gtk.Action("CustomAssetServer", Mono.Unix.Catalog.GetString("Custom asset server..."), null, null); | ||
171 | this.CustomAssetServer.ShortLabel = Mono.Unix.Catalog.GetString("Custom asset server..."); | ||
172 | w2.Add(this.CustomAssetServer, null); | ||
173 | w1.InsertActionGroup(w2, 0); | ||
174 | this.AddAccelGroup(w1.AccelGroup); | ||
175 | this.WidthRequest = 800; | ||
176 | this.HeightRequest = 600; | ||
177 | this.Name = "OpenGridServices.Manager.MainWindow"; | ||
178 | this.Title = Mono.Unix.Catalog.GetString("Open Grid Services Manager"); | ||
179 | this.Icon = Gtk.IconTheme.Default.LoadIcon("gtk-network", 48, 0); | ||
180 | // Container child OpenGridServices.Manager.MainWindow.Gtk.Container+ContainerChild | ||
181 | this.vbox1 = new Gtk.VBox(); | ||
182 | this.vbox1.Name = "vbox1"; | ||
183 | // Container child vbox1.Gtk.Box+BoxChild | ||
184 | w1.AddUiFromString("<ui><menubar name='menubar2'><menu action='Grid'><menuitem action='ConnectToGridserver'/><menuitem action='DisconnectFromGridServer'/><separator/><menuitem action='RestartWholeGrid'/><menuitem action='RestartGridserverOnly'/><separator/><menuitem action='ShutdownWholeGrid'/><menuitem action='ShutdownGridserverOnly'/><separator/><menuitem action='ExitGridManager'/></menu><menu action='User'><menu action='ConnectToUserserver'><menuitem action='DefaultLocalGridUserserver'/><menuitem action='CustomUserserver'/><menuitem action='RemoteGridDefaultUserserver'/></menu><separator/><menuitem action='AccountManagment'/><menuitem action='GlobalNotice'/><separator/><menuitem action='DisableAllLogins'/><menuitem action='DisableNonGodUsersOnly'/><separator/><menuitem action='ShutdownUserServer'/></menu><menu action='Asset'><menuitem action='UploadAsset'/><menuitem action='AssetManagement'/><menu action='ConnectToAssetServer'><menuitem action='DefaultForLocalGrid'/><menuitem action='DefaultForRemoteGrid'/><menuitem action='CustomAssetServer'/></menu></menu><menu action='Region'/><menu action='Services'/></menubar></ui>"); | ||
185 | this.menubar2 = ((Gtk.MenuBar)(w1.GetWidget("/menubar2"))); | ||
186 | this.menubar2.HeightRequest = 25; | ||
187 | this.menubar2.Name = "menubar2"; | ||
188 | this.vbox1.Add(this.menubar2); | ||
189 | Gtk.Box.BoxChild w3 = ((Gtk.Box.BoxChild)(this.vbox1[this.menubar2])); | ||
190 | w3.Position = 0; | ||
191 | w3.Expand = false; | ||
192 | w3.Fill = false; | ||
193 | // Container child vbox1.Gtk.Box+BoxChild | ||
194 | this.hbox1 = new Gtk.HBox(); | ||
195 | this.hbox1.Name = "hbox1"; | ||
196 | // Container child hbox1.Gtk.Box+BoxChild | ||
197 | this.scrolledwindow1 = new Gtk.ScrolledWindow(); | ||
198 | this.scrolledwindow1.CanFocus = true; | ||
199 | this.scrolledwindow1.Name = "scrolledwindow1"; | ||
200 | this.scrolledwindow1.VscrollbarPolicy = ((Gtk.PolicyType)(1)); | ||
201 | this.scrolledwindow1.HscrollbarPolicy = ((Gtk.PolicyType)(1)); | ||
202 | // Container child scrolledwindow1.Gtk.Container+ContainerChild | ||
203 | Gtk.Viewport w4 = new Gtk.Viewport(); | ||
204 | w4.Name = "GtkViewport"; | ||
205 | w4.ShadowType = ((Gtk.ShadowType)(0)); | ||
206 | // Container child GtkViewport.Gtk.Container+ContainerChild | ||
207 | this.drawingarea1 = new Gtk.DrawingArea(); | ||
208 | this.drawingarea1.Name = "drawingarea1"; | ||
209 | w4.Add(this.drawingarea1); | ||
210 | this.scrolledwindow1.Add(w4); | ||
211 | this.hbox1.Add(this.scrolledwindow1); | ||
212 | Gtk.Box.BoxChild w7 = ((Gtk.Box.BoxChild)(this.hbox1[this.scrolledwindow1])); | ||
213 | w7.Position = 1; | ||
214 | // Container child hbox1.Gtk.Box+BoxChild | ||
215 | this.treeview1 = new Gtk.TreeView(); | ||
216 | this.treeview1.CanFocus = true; | ||
217 | this.treeview1.Name = "treeview1"; | ||
218 | this.hbox1.Add(this.treeview1); | ||
219 | Gtk.Box.BoxChild w8 = ((Gtk.Box.BoxChild)(this.hbox1[this.treeview1])); | ||
220 | w8.Position = 2; | ||
221 | this.vbox1.Add(this.hbox1); | ||
222 | Gtk.Box.BoxChild w9 = ((Gtk.Box.BoxChild)(this.vbox1[this.hbox1])); | ||
223 | w9.Position = 1; | ||
224 | // Container child vbox1.Gtk.Box+BoxChild | ||
225 | this.statusbar1 = new Gtk.Statusbar(); | ||
226 | this.statusbar1.Name = "statusbar1"; | ||
227 | this.statusbar1.Spacing = 5; | ||
228 | this.vbox1.Add(this.statusbar1); | ||
229 | Gtk.Box.BoxChild w10 = ((Gtk.Box.BoxChild)(this.vbox1[this.statusbar1])); | ||
230 | w10.PackType = ((Gtk.PackType)(1)); | ||
231 | w10.Position = 2; | ||
232 | w10.Expand = false; | ||
233 | w10.Fill = false; | ||
234 | this.Add(this.vbox1); | ||
235 | if (this.Child != null) | ||
236 | { | ||
237 | this.Child.ShowAll(); | ||
238 | } | ||
239 | this.DefaultWidth = 800; | ||
240 | this.DefaultHeight = 800; | ||
241 | this.Show(); | ||
242 | this.DeleteEvent += new Gtk.DeleteEventHandler(this.OnDeleteEvent); | ||
243 | this.ConnectToGridserver.Activated += new System.EventHandler(this.ConnectToGridServerMenu); | ||
244 | this.ExitGridManager.Activated += new System.EventHandler(this.QuitMenu); | ||
245 | this.ShutdownGridserverOnly.Activated += new System.EventHandler(this.ShutdownGridserverMenu); | ||
246 | this.RestartGridserverOnly.Activated += new System.EventHandler(this.RestartGridserverMenu); | ||
247 | this.DisconnectFromGridServer.Activated += new System.EventHandler(this.DisconnectGridServerMenu); | ||
248 | } | ||
249 | } | ||
250 | } | ||
diff --git a/OpenSim/Grid/Manager/OpenGridServices.Manager/gtk-gui/generated.cs b/OpenSim/Grid/Manager/OpenGridServices.Manager/gtk-gui/generated.cs deleted file mode 100644 index 9fb84d2..0000000 --- a/OpenSim/Grid/Manager/OpenGridServices.Manager/gtk-gui/generated.cs +++ /dev/null | |||
@@ -1,62 +0,0 @@ | |||
1 | /* | ||
2 | * Copyright (c) Contributors, http://opensimulator.org/ | ||
3 | * See CONTRIBUTORS.TXT for a full list of copyright holders. | ||
4 | * | ||
5 | * Redistribution and use in source and binary forms, with or without | ||
6 | * modification, are permitted provided that the following conditions are met: | ||
7 | * * Redistributions of source code must retain the above copyright | ||
8 | * notice, this list of conditions and the following disclaimer. | ||
9 | * * Redistributions in binary form must reproduce the above copyright | ||
10 | * notice, this list of conditions and the following disclaimer in the | ||
11 | * documentation and/or other materials provided with the distribution. | ||
12 | * * Neither the name of the OpenSimulator Project nor the | ||
13 | * names of its contributors may be used to endorse or promote products | ||
14 | * derived from this software without specific prior written permission. | ||
15 | * | ||
16 | * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY | ||
17 | * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED | ||
18 | * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE | ||
19 | * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY | ||
20 | * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES | ||
21 | * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; | ||
22 | * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND | ||
23 | * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT | ||
24 | * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS | ||
25 | * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | ||
26 | */ | ||
27 | |||
28 | // ------------------------------------------------------------------------------ | ||
29 | // <autogenerated> | ||
30 | // This code was generated by a tool. | ||
31 | // Mono Runtime Version: 2.0.50727.42 | ||
32 | // | ||
33 | // Changes to this file may cause incorrect behavior and will be lost if | ||
34 | // the code is regenerated. | ||
35 | // </autogenerated> | ||
36 | // ------------------------------------------------------------------------------ | ||
37 | |||
38 | namespace Stetic | ||
39 | { | ||
40 | internal class Gui | ||
41 | { | ||
42 | private static bool initialized; | ||
43 | |||
44 | internal static void Initialize() | ||
45 | { | ||
46 | Stetic.Gui.initialized = true; | ||
47 | } | ||
48 | } | ||
49 | |||
50 | internal class ActionGroups | ||
51 | { | ||
52 | public static Gtk.ActionGroup GetActionGroup(System.Type type) | ||
53 | { | ||
54 | return Stetic.ActionGroups.GetActionGroup(type.FullName); | ||
55 | } | ||
56 | |||
57 | public static Gtk.ActionGroup GetActionGroup(string name) | ||
58 | { | ||
59 | return null; | ||
60 | } | ||
61 | } | ||
62 | } | ||
diff --git a/OpenSim/Grid/Manager/OpenGridServices.Manager/gtk-gui/gui.stetic b/OpenSim/Grid/Manager/OpenGridServices.Manager/gtk-gui/gui.stetic deleted file mode 100644 index c883f08..0000000 --- a/OpenSim/Grid/Manager/OpenGridServices.Manager/gtk-gui/gui.stetic +++ /dev/null | |||
@@ -1,502 +0,0 @@ | |||
1 | <?xml version="1.0" encoding="utf-8"?> | ||
2 | <stetic-interface> | ||
3 | <widget class="Gtk.Window" id="OpenGridServices.Manager.MainWindow" design-size="800 800"> | ||
4 | <action-group name="Default"> | ||
5 | <action id="Grid"> | ||
6 | <property name="Type">Action</property> | ||
7 | <property name="Accelerator"><Alt><Mod2>g</property> | ||
8 | <property name="HideIfEmpty">False</property> | ||
9 | <property name="Label" translatable="yes">Grid</property> | ||
10 | <property name="ShortLabel" translatable="yes">Grid</property> | ||
11 | </action> | ||
12 | <action id="User"> | ||
13 | <property name="Type">Action</property> | ||
14 | <property name="HideIfEmpty">False</property> | ||
15 | <property name="Label" translatable="yes">User</property> | ||
16 | <property name="ShortLabel" translatable="yes">User</property> | ||
17 | </action> | ||
18 | <action id="Asset"> | ||
19 | <property name="Type">Action</property> | ||
20 | <property name="HideIfEmpty">False</property> | ||
21 | <property name="Label" translatable="yes">Asset</property> | ||
22 | <property name="ShortLabel" translatable="yes">Asset</property> | ||
23 | </action> | ||
24 | <action id="Region"> | ||
25 | <property name="Type">Action</property> | ||
26 | <property name="Label" translatable="yes">Region</property> | ||
27 | <property name="ShortLabel" translatable="yes">Region</property> | ||
28 | </action> | ||
29 | <action id="Services"> | ||
30 | <property name="Type">Action</property> | ||
31 | <property name="Label" translatable="yes">Services</property> | ||
32 | <property name="ShortLabel" translatable="yes">Services</property> | ||
33 | </action> | ||
34 | <action id="ConnectToGridserver"> | ||
35 | <property name="Type">Action</property> | ||
36 | <property name="HideIfEmpty">False</property> | ||
37 | <property name="Label" translatable="yes">Connect to gridserver...</property> | ||
38 | <property name="ShortLabel" translatable="yes">Connect to gridserver</property> | ||
39 | <property name="StockId">gtk-connect</property> | ||
40 | <signal name="Activated" handler="ConnectToGridServerMenu" /> | ||
41 | </action> | ||
42 | <action id="RestartWholeGrid"> | ||
43 | <property name="Type">Action</property> | ||
44 | <property name="Label" translatable="yes">Restart whole grid</property> | ||
45 | <property name="ShortLabel" translatable="yes">Restart whole grid</property> | ||
46 | <property name="StockId">gtk-refresh</property> | ||
47 | </action> | ||
48 | <action id="ShutdownWholeGrid"> | ||
49 | <property name="Type">Action</property> | ||
50 | <property name="Label" translatable="yes">Shutdown whole grid</property> | ||
51 | <property name="ShortLabel" translatable="yes">Shutdown whole grid</property> | ||
52 | <property name="StockId">gtk-stop</property> | ||
53 | </action> | ||
54 | <action id="ExitGridManager"> | ||
55 | <property name="Type">Action</property> | ||
56 | <property name="Label" translatable="yes">Exit grid manager</property> | ||
57 | <property name="ShortLabel" translatable="yes">Exit grid manager</property> | ||
58 | <property name="StockId">gtk-close</property> | ||
59 | <signal name="Activated" handler="QuitMenu" after="yes" /> | ||
60 | </action> | ||
61 | <action id="ConnectToUserserver"> | ||
62 | <property name="Type">Action</property> | ||
63 | <property name="Label" translatable="yes">Connect to userserver</property> | ||
64 | <property name="ShortLabel" translatable="yes">Connect to userserver</property> | ||
65 | <property name="StockId">gtk-connect</property> | ||
66 | </action> | ||
67 | <action id="AccountManagment"> | ||
68 | <property name="Type">Action</property> | ||
69 | <property name="Label" translatable="yes">Account managment</property> | ||
70 | <property name="ShortLabel" translatable="yes">Account managment</property> | ||
71 | <property name="StockId">gtk-properties</property> | ||
72 | </action> | ||
73 | <action id="GlobalNotice"> | ||
74 | <property name="Type">Action</property> | ||
75 | <property name="Label" translatable="yes">Global notice</property> | ||
76 | <property name="ShortLabel" translatable="yes">Global notice</property> | ||
77 | <property name="StockId">gtk-network</property> | ||
78 | </action> | ||
79 | <action id="DisableAllLogins"> | ||
80 | <property name="Type">Action</property> | ||
81 | <property name="Label" translatable="yes">Disable all logins</property> | ||
82 | <property name="ShortLabel" translatable="yes">Disable all logins</property> | ||
83 | <property name="StockId">gtk-no</property> | ||
84 | </action> | ||
85 | <action id="DisableNonGodUsersOnly"> | ||
86 | <property name="Type">Action</property> | ||
87 | <property name="Label" translatable="yes">Disable non-god users only</property> | ||
88 | <property name="ShortLabel" translatable="yes">Disable non-god users only</property> | ||
89 | <property name="StockId">gtk-no</property> | ||
90 | </action> | ||
91 | <action id="ShutdownUserServer"> | ||
92 | <property name="Type">Action</property> | ||
93 | <property name="Label" translatable="yes">Shutdown user server</property> | ||
94 | <property name="ShortLabel" translatable="yes">Shutdown user server</property> | ||
95 | <property name="StockId">gtk-stop</property> | ||
96 | </action> | ||
97 | <action id="ShutdownGridserverOnly"> | ||
98 | <property name="Type">Action</property> | ||
99 | <property name="Label" translatable="yes">Shutdown gridserver only</property> | ||
100 | <property name="ShortLabel" translatable="yes">Shutdown gridserver only</property> | ||
101 | <property name="StockId">gtk-stop</property> | ||
102 | <signal name="Activated" handler="ShutdownGridserverMenu" after="yes" /> | ||
103 | </action> | ||
104 | <action id="RestartGridserverOnly"> | ||
105 | <property name="Type">Action</property> | ||
106 | <property name="Label" translatable="yes">Restart gridserver only</property> | ||
107 | <property name="ShortLabel" translatable="yes">Restart gridserver only</property> | ||
108 | <property name="StockId">gtk-refresh</property> | ||
109 | <signal name="Activated" handler="RestartGridserverMenu" after="yes" /> | ||
110 | </action> | ||
111 | <action id="DefaultLocalGridUserserver"> | ||
112 | <property name="Type">Action</property> | ||
113 | <property name="Label" translatable="yes">Default local grid userserver</property> | ||
114 | <property name="ShortLabel" translatable="yes">Default local grid userserver</property> | ||
115 | </action> | ||
116 | <action id="CustomUserserver"> | ||
117 | <property name="Type">Action</property> | ||
118 | <property name="Label" translatable="yes">Custom userserver...</property> | ||
119 | <property name="ShortLabel" translatable="yes">Custom userserver</property> | ||
120 | </action> | ||
121 | <action id="RemoteGridDefaultUserserver"> | ||
122 | <property name="Type">Action</property> | ||
123 | <property name="Label" translatable="yes">Remote grid default userserver...</property> | ||
124 | <property name="ShortLabel" translatable="yes">Remote grid default userserver</property> | ||
125 | </action> | ||
126 | <action id="DisconnectFromGridServer"> | ||
127 | <property name="Type">Action</property> | ||
128 | <property name="Label" translatable="yes">Disconnect from grid server</property> | ||
129 | <property name="ShortLabel" translatable="yes">Disconnect from grid server</property> | ||
130 | <property name="StockId">gtk-disconnect</property> | ||
131 | <property name="Visible">False</property> | ||
132 | <signal name="Activated" handler="DisconnectGridServerMenu" after="yes" /> | ||
133 | </action> | ||
134 | <action id="UploadAsset"> | ||
135 | <property name="Type">Action</property> | ||
136 | <property name="Label" translatable="yes">Upload asset</property> | ||
137 | <property name="ShortLabel" translatable="yes">Upload asset</property> | ||
138 | </action> | ||
139 | <action id="AssetManagement"> | ||
140 | <property name="Type">Action</property> | ||
141 | <property name="Label" translatable="yes">Asset management</property> | ||
142 | <property name="ShortLabel" translatable="yes">Asset management</property> | ||
143 | </action> | ||
144 | <action id="ConnectToAssetServer"> | ||
145 | <property name="Type">Action</property> | ||
146 | <property name="Label" translatable="yes">Connect to asset server</property> | ||
147 | <property name="ShortLabel" translatable="yes">Connect to asset server</property> | ||
148 | </action> | ||
149 | <action id="ConnectToDefaultAssetServerForGrid"> | ||
150 | <property name="Type">Action</property> | ||
151 | <property name="Label" translatable="yes">Connect to default asset server for grid</property> | ||
152 | <property name="ShortLabel" translatable="yes">Connect to default asset server for grid</property> | ||
153 | </action> | ||
154 | <action id="DefaultForLocalGrid"> | ||
155 | <property name="Type">Action</property> | ||
156 | <property name="Label" translatable="yes">Default for local grid</property> | ||
157 | <property name="ShortLabel" translatable="yes">Default for local grid</property> | ||
158 | </action> | ||
159 | <action id="DefaultForRemoteGrid"> | ||
160 | <property name="Type">Action</property> | ||
161 | <property name="Label" translatable="yes">Default for remote grid...</property> | ||
162 | <property name="ShortLabel" translatable="yes">Default for remote grid...</property> | ||
163 | </action> | ||
164 | <action id="CustomAssetServer"> | ||
165 | <property name="Type">Action</property> | ||
166 | <property name="Label" translatable="yes">Custom asset server...</property> | ||
167 | <property name="ShortLabel" translatable="yes">Custom asset server...</property> | ||
168 | </action> | ||
169 | </action-group> | ||
170 | <property name="MemberName" /> | ||
171 | <property name="WidthRequest">800</property> | ||
172 | <property name="HeightRequest">600</property> | ||
173 | <property name="Title" translatable="yes">Open Grid Services Manager</property> | ||
174 | <property name="Icon">stock:gtk-network Dialog</property> | ||
175 | <signal name="DeleteEvent" handler="OnDeleteEvent" /> | ||
176 | <child> | ||
177 | <widget class="Gtk.VBox" id="vbox1"> | ||
178 | <property name="MemberName" /> | ||
179 | <child> | ||
180 | <widget class="Gtk.MenuBar" id="menubar2"> | ||
181 | <property name="MemberName" /> | ||
182 | <property name="HeightRequest">25</property> | ||
183 | <node name="menubar2" type="Menubar"> | ||
184 | <node type="Menu" action="Grid"> | ||
185 | <node type="Menuitem" action="ConnectToGridserver" /> | ||
186 | <node type="Menuitem" action="DisconnectFromGridServer" /> | ||
187 | <node type="Separator" /> | ||
188 | <node type="Menuitem" action="RestartWholeGrid" /> | ||
189 | <node type="Menuitem" action="RestartGridserverOnly" /> | ||
190 | <node type="Separator" /> | ||
191 | <node type="Menuitem" action="ShutdownWholeGrid" /> | ||
192 | <node type="Menuitem" action="ShutdownGridserverOnly" /> | ||
193 | <node type="Separator" /> | ||
194 | <node type="Menuitem" action="ExitGridManager" /> | ||
195 | </node> | ||
196 | <node type="Menu" action="User"> | ||
197 | <node type="Menu" action="ConnectToUserserver"> | ||
198 | <node type="Menuitem" action="DefaultLocalGridUserserver" /> | ||
199 | <node type="Menuitem" action="CustomUserserver" /> | ||
200 | <node type="Menuitem" action="RemoteGridDefaultUserserver" /> | ||
201 | </node> | ||
202 | <node type="Separator" /> | ||
203 | <node type="Menuitem" action="AccountManagment" /> | ||
204 | <node type="Menuitem" action="GlobalNotice" /> | ||
205 | <node type="Separator" /> | ||
206 | <node type="Menuitem" action="DisableAllLogins" /> | ||
207 | <node type="Menuitem" action="DisableNonGodUsersOnly" /> | ||
208 | <node type="Separator" /> | ||
209 | <node type="Menuitem" action="ShutdownUserServer" /> | ||
210 | </node> | ||
211 | <node type="Menu" action="Asset"> | ||
212 | <node type="Menuitem" action="UploadAsset" /> | ||
213 | <node type="Menuitem" action="AssetManagement" /> | ||
214 | <node type="Menu" action="ConnectToAssetServer"> | ||
215 | <node type="Menuitem" action="DefaultForLocalGrid" /> | ||
216 | <node type="Menuitem" action="DefaultForRemoteGrid" /> | ||
217 | <node type="Menuitem" action="CustomAssetServer" /> | ||
218 | </node> | ||
219 | </node> | ||
220 | <node type="Menu" action="Region" /> | ||
221 | <node type="Menu" action="Services" /> | ||
222 | </node> | ||
223 | </widget> | ||
224 | <packing> | ||
225 | <property name="Position">0</property> | ||
226 | <property name="AutoSize">False</property> | ||
227 | <property name="Expand">False</property> | ||
228 | <property name="Fill">False</property> | ||
229 | </packing> | ||
230 | </child> | ||
231 | <child> | ||
232 | <widget class="Gtk.HBox" id="hbox1"> | ||
233 | <property name="MemberName" /> | ||
234 | <child> | ||
235 | <placeholder /> | ||
236 | </child> | ||
237 | <child> | ||
238 | <widget class="Gtk.ScrolledWindow" id="scrolledwindow1"> | ||
239 | <property name="MemberName" /> | ||
240 | <property name="CanFocus">True</property> | ||
241 | <property name="VscrollbarPolicy">Automatic</property> | ||
242 | <property name="HscrollbarPolicy">Automatic</property> | ||
243 | <child> | ||
244 | <widget class="Gtk.Viewport" id="GtkViewport"> | ||
245 | <property name="MemberName" /> | ||
246 | <property name="ShadowType">None</property> | ||
247 | <child> | ||
248 | <widget class="Gtk.DrawingArea" id="drawingarea1"> | ||
249 | <property name="MemberName" /> | ||
250 | </widget> | ||
251 | </child> | ||
252 | </widget> | ||
253 | </child> | ||
254 | </widget> | ||
255 | <packing> | ||
256 | <property name="Position">1</property> | ||
257 | <property name="AutoSize">True</property> | ||
258 | </packing> | ||
259 | </child> | ||
260 | <child> | ||
261 | <widget class="Gtk.TreeView" id="treeview1"> | ||
262 | <property name="MemberName" /> | ||
263 | <property name="CanFocus">True</property> | ||
264 | </widget> | ||
265 | <packing> | ||
266 | <property name="Position">2</property> | ||
267 | <property name="AutoSize">True</property> | ||
268 | </packing> | ||
269 | </child> | ||
270 | </widget> | ||
271 | <packing> | ||
272 | <property name="Position">1</property> | ||
273 | <property name="AutoSize">True</property> | ||
274 | </packing> | ||
275 | </child> | ||
276 | <child> | ||
277 | <widget class="Gtk.Statusbar" id="statusbar1"> | ||
278 | <property name="MemberName">statusBar1</property> | ||
279 | <property name="Spacing">5</property> | ||
280 | <child> | ||
281 | <placeholder /> | ||
282 | </child> | ||
283 | <child> | ||
284 | <placeholder /> | ||
285 | </child> | ||
286 | </widget> | ||
287 | <packing> | ||
288 | <property name="PackType">End</property> | ||
289 | <property name="Position">2</property> | ||
290 | <property name="AutoSize">False</property> | ||
291 | <property name="Expand">False</property> | ||
292 | <property name="Fill">False</property> | ||
293 | </packing> | ||
294 | </child> | ||
295 | </widget> | ||
296 | </child> | ||
297 | </widget> | ||
298 | <widget class="Gtk.Dialog" id="OpenGridServices.Manager.ConnectToGridServerDialog" design-size="476 137"> | ||
299 | <property name="MemberName" /> | ||
300 | <property name="Events">ButtonPressMask</property> | ||
301 | <property name="Title" translatable="yes">Connect to Grid server</property> | ||
302 | <property name="WindowPosition">CenterOnParent</property> | ||
303 | <property name="Buttons">2</property> | ||
304 | <property name="HelpButton">False</property> | ||
305 | <property name="HasSeparator">False</property> | ||
306 | <signal name="Response" handler="OnResponse" /> | ||
307 | <child internal-child="VBox"> | ||
308 | <widget class="Gtk.VBox" id="dialog_VBox"> | ||
309 | <property name="MemberName" /> | ||
310 | <property name="Events">ButtonPressMask</property> | ||
311 | <property name="BorderWidth">2</property> | ||
312 | <child> | ||
313 | <widget class="Gtk.VBox" id="vbox2"> | ||
314 | <property name="MemberName" /> | ||
315 | <child> | ||
316 | <placeholder /> | ||
317 | </child> | ||
318 | <child> | ||
319 | <placeholder /> | ||
320 | </child> | ||
321 | <child> | ||
322 | <widget class="Gtk.VBox" id="vbox3"> | ||
323 | <property name="MemberName" /> | ||
324 | <child> | ||
325 | <widget class="Gtk.HBox" id="hbox1"> | ||
326 | <property name="MemberName" /> | ||
327 | <child> | ||
328 | <widget class="Gtk.Label" id="label1"> | ||
329 | <property name="MemberName" /> | ||
330 | <property name="Xalign">1</property> | ||
331 | <property name="LabelProp" translatable="yes">Grid server URL: </property> | ||
332 | <property name="Justify">Right</property> | ||
333 | </widget> | ||
334 | <packing> | ||
335 | <property name="Position">0</property> | ||
336 | <property name="AutoSize">False</property> | ||
337 | </packing> | ||
338 | </child> | ||
339 | <child> | ||
340 | <widget class="Gtk.Entry" id="entry1"> | ||
341 | <property name="MemberName" /> | ||
342 | <property name="CanFocus">True</property> | ||
343 | <property name="Text" translatable="yes">http://gridserver:8001</property> | ||
344 | <property name="IsEditable">True</property> | ||
345 | <property name="MaxLength">255</property> | ||
346 | <property name="InvisibleChar">•</property> | ||
347 | </widget> | ||
348 | <packing> | ||
349 | <property name="Position">1</property> | ||
350 | <property name="AutoSize">False</property> | ||
351 | </packing> | ||
352 | </child> | ||
353 | <child> | ||
354 | <placeholder /> | ||
355 | </child> | ||
356 | </widget> | ||
357 | <packing> | ||
358 | <property name="Position">0</property> | ||
359 | <property name="AutoSize">True</property> | ||
360 | <property name="Expand">False</property> | ||
361 | <property name="Fill">False</property> | ||
362 | </packing> | ||
363 | </child> | ||
364 | <child> | ||
365 | <widget class="Gtk.HBox" id="hbox2"> | ||
366 | <property name="MemberName" /> | ||
367 | <child> | ||
368 | <widget class="Gtk.Label" id="label2"> | ||
369 | <property name="MemberName" /> | ||
370 | <property name="Xalign">1</property> | ||
371 | <property name="LabelProp" translatable="yes">Username:</property> | ||
372 | <property name="Justify">Right</property> | ||
373 | </widget> | ||
374 | <packing> | ||
375 | <property name="Position">0</property> | ||
376 | <property name="AutoSize">False</property> | ||
377 | </packing> | ||
378 | </child> | ||
379 | <child> | ||
380 | <widget class="Gtk.Entry" id="entry2"> | ||
381 | <property name="MemberName" /> | ||
382 | <property name="CanFocus">True</property> | ||
383 | <property name="IsEditable">True</property> | ||
384 | <property name="InvisibleChar">•</property> | ||
385 | </widget> | ||
386 | <packing> | ||
387 | <property name="Position">1</property> | ||
388 | <property name="AutoSize">True</property> | ||
389 | </packing> | ||
390 | </child> | ||
391 | <child> | ||
392 | <placeholder /> | ||
393 | </child> | ||
394 | </widget> | ||
395 | <packing> | ||
396 | <property name="Position">1</property> | ||
397 | <property name="AutoSize">False</property> | ||
398 | <property name="Expand">False</property> | ||
399 | <property name="Fill">False</property> | ||
400 | </packing> | ||
401 | </child> | ||
402 | <child> | ||
403 | <widget class="Gtk.HBox" id="hbox3"> | ||
404 | <property name="MemberName" /> | ||
405 | <child> | ||
406 | <widget class="Gtk.Label" id="label3"> | ||
407 | <property name="MemberName" /> | ||
408 | <property name="Xalign">1</property> | ||
409 | <property name="LabelProp" translatable="yes">Password:</property> | ||
410 | <property name="Justify">Right</property> | ||
411 | </widget> | ||
412 | <packing> | ||
413 | <property name="Position">0</property> | ||
414 | <property name="AutoSize">False</property> | ||
415 | </packing> | ||
416 | </child> | ||
417 | <child> | ||
418 | <widget class="Gtk.Entry" id="entry3"> | ||
419 | <property name="MemberName" /> | ||
420 | <property name="CanFocus">True</property> | ||
421 | <property name="IsEditable">True</property> | ||
422 | <property name="InvisibleChar">•</property> | ||
423 | </widget> | ||
424 | <packing> | ||
425 | <property name="Position">1</property> | ||
426 | <property name="AutoSize">True</property> | ||
427 | </packing> | ||
428 | </child> | ||
429 | <child> | ||
430 | <placeholder /> | ||
431 | </child> | ||
432 | </widget> | ||
433 | <packing> | ||
434 | <property name="Position">2</property> | ||
435 | <property name="AutoSize">True</property> | ||
436 | <property name="Expand">False</property> | ||
437 | <property name="Fill">False</property> | ||
438 | </packing> | ||
439 | </child> | ||
440 | </widget> | ||
441 | <packing> | ||
442 | <property name="Position">2</property> | ||
443 | <property name="AutoSize">True</property> | ||
444 | <property name="Expand">False</property> | ||
445 | <property name="Fill">False</property> | ||
446 | </packing> | ||
447 | </child> | ||
448 | </widget> | ||
449 | <packing> | ||
450 | <property name="Position">0</property> | ||
451 | <property name="AutoSize">True</property> | ||
452 | </packing> | ||
453 | </child> | ||
454 | </widget> | ||
455 | </child> | ||
456 | <child internal-child="ActionArea"> | ||
457 | <widget class="Gtk.HButtonBox" id="OpenGridServices.Manager.ConnectToGridServerDialog_ActionArea"> | ||
458 | <property name="MemberName" /> | ||
459 | <property name="Events">ButtonPressMask</property> | ||
460 | <property name="Spacing">6</property> | ||
461 | <property name="BorderWidth">5</property> | ||
462 | <property name="Size">2</property> | ||
463 | <property name="LayoutStyle">End</property> | ||
464 | <child> | ||
465 | <widget class="Gtk.Button" id="button2"> | ||
466 | <property name="MemberName" /> | ||
467 | <property name="CanDefault">True</property> | ||
468 | <property name="CanFocus">True</property> | ||
469 | <property name="Type">TextAndIcon</property> | ||
470 | <property name="Icon">stock:gtk-apply Menu</property> | ||
471 | <property name="Label" translatable="yes">Connect</property> | ||
472 | <property name="UseUnderline">True</property> | ||
473 | <property name="IsDialogButton">True</property> | ||
474 | <property name="ResponseId">-5</property> | ||
475 | </widget> | ||
476 | <packing> | ||
477 | <property name="Expand">False</property> | ||
478 | <property name="Fill">False</property> | ||
479 | </packing> | ||
480 | </child> | ||
481 | <child> | ||
482 | <widget class="Gtk.Button" id="button8"> | ||
483 | <property name="MemberName" /> | ||
484 | <property name="CanDefault">True</property> | ||
485 | <property name="CanFocus">True</property> | ||
486 | <property name="Type">TextAndIcon</property> | ||
487 | <property name="Icon">stock:gtk-cancel Menu</property> | ||
488 | <property name="Label" translatable="yes">Cancel</property> | ||
489 | <property name="UseUnderline">True</property> | ||
490 | <property name="IsDialogButton">True</property> | ||
491 | <property name="ResponseId">-6</property> | ||
492 | </widget> | ||
493 | <packing> | ||
494 | <property name="Position">1</property> | ||
495 | <property name="Expand">False</property> | ||
496 | <property name="Fill">False</property> | ||
497 | </packing> | ||
498 | </child> | ||
499 | </widget> | ||
500 | </child> | ||
501 | </widget> | ||
502 | </stetic-interface> \ No newline at end of file | ||