diff options
author | gareth | 2007-05-17 01:06:02 +0000 |
---|---|---|
committer | gareth | 2007-05-17 01:06:02 +0000 |
commit | 2f4d484702e68dc1bd82fe0a3fe0a4c3f7afdd69 (patch) | |
tree | c82b377c7e424950e60fa17ff61127243536428b | |
parent | Brought in XMLRPC.dll (diff) | |
download | opensim-SC_OLD-2f4d484702e68dc1bd82fe0a3fe0a4c3f7afdd69.zip opensim-SC_OLD-2f4d484702e68dc1bd82fe0a3fe0a4c3f7afdd69.tar.gz opensim-SC_OLD-2f4d484702e68dc1bd82fe0a3fe0a4c3f7afdd69.tar.bz2 opensim-SC_OLD-2f4d484702e68dc1bd82fe0a3fe0a4c3f7afdd69.tar.xz |
Started Grid Server connection manager
6 files changed, 299 insertions, 85 deletions
diff --git a/OpenGridServices.Manager/OpenGridServices.Manager/ConnectToGridServerDialog.cs b/OpenGridServices.Manager/OpenGridServices.Manager/ConnectToGridServerDialog.cs index c912910..8a80b1d 100644 --- a/OpenGridServices.Manager/OpenGridServices.Manager/ConnectToGridServerDialog.cs +++ b/OpenGridServices.Manager/OpenGridServices.Manager/ConnectToGridServerDialog.cs | |||
@@ -14,7 +14,7 @@ namespace OpenGridServices.Manager { | |||
14 | { | 14 | { |
15 | switch(args.ResponseId) { | 15 | switch(args.ResponseId) { |
16 | case Gtk.ResponseType.Ok: | 16 | case Gtk.ResponseType.Ok: |
17 | MainClass.PendingOperations.Enqueue("connect_to_gridserver " + this.entry1.Text); | 17 | MainClass.PendingOperations.Enqueue("connect_to_gridserver " + this.entry1.Text + " " + this.entry2.Text + " " + this.entry3.Text); |
18 | break; | 18 | break; |
19 | 19 | ||
20 | case Gtk.ResponseType.Cancel: | 20 | case Gtk.ResponseType.Cancel: |
diff --git a/OpenGridServices.Manager/OpenGridServices.Manager/GridServerConnectionManager.cs b/OpenGridServices.Manager/OpenGridServices.Manager/GridServerConnectionManager.cs new file mode 100644 index 0000000..112487f --- /dev/null +++ b/OpenGridServices.Manager/OpenGridServices.Manager/GridServerConnectionManager.cs | |||
@@ -0,0 +1,29 @@ | |||
1 | using Nwc.XmlRpc; | ||
2 | using System; | ||
3 | using System.Collections; | ||
4 | using System.Collections.Generic; | ||
5 | |||
6 | namespace OpenGridServices.Manager | ||
7 | { | ||
8 | public class GridServerConnectionManager | ||
9 | { | ||
10 | private string ServerURL; | ||
11 | |||
12 | public bool Connect(string GridServerURL, string username, string password) | ||
13 | { | ||
14 | this.ServerURL=GridServerURL; | ||
15 | Hashtable LoginParamsHT = new Hashtable(); | ||
16 | LoginParamsHT["username"]=username; | ||
17 | LoginParamsHT["password"]=password; | ||
18 | ArrayList LoginParams = new ArrayList(); | ||
19 | LoginParams.Add(LoginParamsHT); | ||
20 | XmlRpcRequest GridLoginReq = new XmlRpcRequest("manager_login",LoginParams); | ||
21 | XmlRpcResponse GridResp = GridLoginReq.Send(ServerURL,3000); | ||
22 | if(GridResp.IsFault) { | ||
23 | return false; | ||
24 | } else { | ||
25 | return true; | ||
26 | } | ||
27 | } | ||
28 | } | ||
29 | } | ||
diff --git a/OpenGridServices.Manager/OpenGridServices.Manager/Main.cs b/OpenGridServices.Manager/OpenGridServices.Manager/Main.cs index f6a41e1..b14d10b 100644 --- a/OpenGridServices.Manager/OpenGridServices.Manager/Main.cs +++ b/OpenGridServices.Manager/OpenGridServices.Manager/Main.cs | |||
@@ -12,6 +12,9 @@ namespace OpenGridServices.Manager | |||
12 | public static BlockingQueue<string> PendingOperations = new BlockingQueue<string>(); | 12 | public static BlockingQueue<string> PendingOperations = new BlockingQueue<string>(); |
13 | 13 | ||
14 | private static Thread OperationsRunner; | 14 | private static Thread OperationsRunner; |
15 | |||
16 | private static GridServerConnectionManager gridserverConn; | ||
17 | |||
15 | private static MainWindow win; | 18 | private static MainWindow win; |
16 | 19 | ||
17 | public static void DoMainLoop() | 20 | public static void DoMainLoop() |
@@ -36,7 +39,7 @@ namespace OpenGridServices.Manager | |||
36 | switch(cmd) { | 39 | switch(cmd) { |
37 | case "connect_to_gridserver": | 40 | case "connect_to_gridserver": |
38 | win.SetStatus("Connecting to grid server..."); | 41 | win.SetStatus("Connecting to grid server..."); |
39 | 42 | gridserverConn.Connect(operation.Split(sep)[1],operation.Split(sep)[2],operation.Split(sep)[3]); | |
40 | break; | 43 | break; |
41 | } | 44 | } |
42 | } | 45 | } |
@@ -44,6 +47,7 @@ namespace OpenGridServices.Manager | |||
44 | 47 | ||
45 | public static void Main (string[] args) | 48 | public static void Main (string[] args) |
46 | { | 49 | { |
50 | gridserverConn = new GridServerConnectionManager(); | ||
47 | Application.Init (); | 51 | Application.Init (); |
48 | win = new MainWindow (); | 52 | win = new MainWindow (); |
49 | win.Show (); | 53 | win.Show (); |
diff --git a/OpenGridServices.Manager/OpenGridServices.Manager/OpenGridServices.Manager.mdp b/OpenGridServices.Manager/OpenGridServices.Manager/OpenGridServices.Manager.mdp index fbf6ff3..357cf0c 100644 --- a/OpenGridServices.Manager/OpenGridServices.Manager/OpenGridServices.Manager.mdp +++ b/OpenGridServices.Manager/OpenGridServices.Manager/OpenGridServices.Manager.mdp | |||
@@ -24,6 +24,7 @@ | |||
24 | <File name="./gtk-gui/OpenGridServices.Manager.MainWindow.cs" subtype="Code" buildaction="Compile" /> | 24 | <File name="./gtk-gui/OpenGridServices.Manager.MainWindow.cs" subtype="Code" buildaction="Compile" /> |
25 | <File name="./BlockingQueue.cs" subtype="Code" buildaction="Compile" /> | 25 | <File name="./BlockingQueue.cs" subtype="Code" buildaction="Compile" /> |
26 | <File name="./gtk-gui/OpenGridServices.Manager.ConnectToGridServerDialog.cs" subtype="Code" buildaction="Compile" /> | 26 | <File name="./gtk-gui/OpenGridServices.Manager.ConnectToGridServerDialog.cs" subtype="Code" buildaction="Compile" /> |
27 | <File name="./GridServerConnectionManager.cs" subtype="Code" buildaction="Compile" /> | ||
27 | </Contents> | 28 | </Contents> |
28 | <References> | 29 | <References> |
29 | <ProjectReference type="Gac" localcopy="True" refto="gtk-sharp, Version=2.4.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" /> | 30 | <ProjectReference type="Gac" localcopy="True" refto="gtk-sharp, Version=2.4.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" /> |
diff --git a/OpenGridServices.Manager/OpenGridServices.Manager/gtk-gui/OpenGridServices.Manager.ConnectToGridServerDialog.cs b/OpenGridServices.Manager/OpenGridServices.Manager/gtk-gui/OpenGridServices.Manager.ConnectToGridServerDialog.cs index 8037683..0707b01 100644 --- a/OpenGridServices.Manager/OpenGridServices.Manager/gtk-gui/OpenGridServices.Manager.ConnectToGridServerDialog.cs +++ b/OpenGridServices.Manager/OpenGridServices.Manager/gtk-gui/OpenGridServices.Manager.ConnectToGridServerDialog.cs | |||
@@ -15,10 +15,26 @@ namespace OpenGridServices.Manager { | |||
15 | 15 | ||
16 | private Gtk.VBox vbox2; | 16 | private Gtk.VBox vbox2; |
17 | 17 | ||
18 | private Gtk.VBox vbox3; | ||
19 | |||
20 | private Gtk.HBox hbox1; | ||
21 | |||
18 | private Gtk.Label label1; | 22 | private Gtk.Label label1; |
19 | 23 | ||
20 | private Gtk.Entry entry1; | 24 | private Gtk.Entry entry1; |
21 | 25 | ||
26 | private Gtk.HBox hbox2; | ||
27 | |||
28 | private Gtk.Label label2; | ||
29 | |||
30 | private Gtk.Entry entry2; | ||
31 | |||
32 | private Gtk.HBox hbox3; | ||
33 | |||
34 | private Gtk.Label label3; | ||
35 | |||
36 | private Gtk.Entry entry3; | ||
37 | |||
22 | private Gtk.Button button2; | 38 | private Gtk.Button button2; |
23 | 39 | ||
24 | private Gtk.Button button8; | 40 | private Gtk.Button button8; |
@@ -38,17 +54,21 @@ namespace OpenGridServices.Manager { | |||
38 | this.vbox2 = new Gtk.VBox(); | 54 | this.vbox2 = new Gtk.VBox(); |
39 | this.vbox2.Name = "vbox2"; | 55 | this.vbox2.Name = "vbox2"; |
40 | // Container child vbox2.Gtk.Box+BoxChild | 56 | // Container child vbox2.Gtk.Box+BoxChild |
57 | this.vbox3 = new Gtk.VBox(); | ||
58 | this.vbox3.Name = "vbox3"; | ||
59 | // Container child vbox3.Gtk.Box+BoxChild | ||
60 | this.hbox1 = new Gtk.HBox(); | ||
61 | this.hbox1.Name = "hbox1"; | ||
62 | // Container child hbox1.Gtk.Box+BoxChild | ||
41 | this.label1 = new Gtk.Label(); | 63 | this.label1 = new Gtk.Label(); |
42 | this.label1.Name = "label1"; | 64 | this.label1.Name = "label1"; |
43 | this.label1.LabelProp = Mono.Unix.Catalog.GetString("Please type in the grid server management interface URL:"); | 65 | this.label1.Xalign = 1F; |
44 | this.label1.Wrap = true; | 66 | this.label1.LabelProp = Mono.Unix.Catalog.GetString("Grid server URL: "); |
45 | this.label1.Justify = ((Gtk.Justification)(2)); | 67 | this.label1.Justify = ((Gtk.Justification)(1)); |
46 | this.vbox2.Add(this.label1); | 68 | this.hbox1.Add(this.label1); |
47 | Gtk.Box.BoxChild w2 = ((Gtk.Box.BoxChild)(this.vbox2[this.label1])); | 69 | Gtk.Box.BoxChild w2 = ((Gtk.Box.BoxChild)(this.hbox1[this.label1])); |
48 | w2.Position = 0; | 70 | w2.Position = 0; |
49 | w2.Expand = false; | 71 | // Container child hbox1.Gtk.Box+BoxChild |
50 | w2.Fill = false; | ||
51 | // Container child vbox2.Gtk.Box+BoxChild | ||
52 | this.entry1 = new Gtk.Entry(); | 72 | this.entry1 = new Gtk.Entry(); |
53 | this.entry1.CanFocus = true; | 73 | this.entry1.CanFocus = true; |
54 | this.entry1.Name = "entry1"; | 74 | this.entry1.Name = "entry1"; |
@@ -56,21 +76,81 @@ namespace OpenGridServices.Manager { | |||
56 | this.entry1.IsEditable = true; | 76 | this.entry1.IsEditable = true; |
57 | this.entry1.MaxLength = 255; | 77 | this.entry1.MaxLength = 255; |
58 | this.entry1.InvisibleChar = '•'; | 78 | this.entry1.InvisibleChar = '•'; |
59 | this.vbox2.Add(this.entry1); | 79 | this.hbox1.Add(this.entry1); |
60 | Gtk.Box.BoxChild w3 = ((Gtk.Box.BoxChild)(this.vbox2[this.entry1])); | 80 | Gtk.Box.BoxChild w3 = ((Gtk.Box.BoxChild)(this.hbox1[this.entry1])); |
61 | w3.Position = 1; | 81 | w3.Position = 1; |
62 | w3.Expand = false; | 82 | this.vbox3.Add(this.hbox1); |
63 | w3.Fill = false; | 83 | Gtk.Box.BoxChild w4 = ((Gtk.Box.BoxChild)(this.vbox3[this.hbox1])); |
64 | w1.Add(this.vbox2); | ||
65 | Gtk.Box.BoxChild w4 = ((Gtk.Box.BoxChild)(w1[this.vbox2])); | ||
66 | w4.Position = 0; | 84 | w4.Position = 0; |
85 | w4.Expand = false; | ||
86 | w4.Fill = false; | ||
87 | // Container child vbox3.Gtk.Box+BoxChild | ||
88 | this.hbox2 = new Gtk.HBox(); | ||
89 | this.hbox2.Name = "hbox2"; | ||
90 | // Container child hbox2.Gtk.Box+BoxChild | ||
91 | this.label2 = new Gtk.Label(); | ||
92 | this.label2.Name = "label2"; | ||
93 | this.label2.Xalign = 1F; | ||
94 | this.label2.LabelProp = Mono.Unix.Catalog.GetString("Username:"); | ||
95 | this.label2.Justify = ((Gtk.Justification)(1)); | ||
96 | this.hbox2.Add(this.label2); | ||
97 | Gtk.Box.BoxChild w5 = ((Gtk.Box.BoxChild)(this.hbox2[this.label2])); | ||
98 | w5.Position = 0; | ||
99 | // Container child hbox2.Gtk.Box+BoxChild | ||
100 | this.entry2 = new Gtk.Entry(); | ||
101 | this.entry2.CanFocus = true; | ||
102 | this.entry2.Name = "entry2"; | ||
103 | this.entry2.IsEditable = true; | ||
104 | this.entry2.InvisibleChar = '•'; | ||
105 | this.hbox2.Add(this.entry2); | ||
106 | Gtk.Box.BoxChild w6 = ((Gtk.Box.BoxChild)(this.hbox2[this.entry2])); | ||
107 | w6.Position = 1; | ||
108 | this.vbox3.Add(this.hbox2); | ||
109 | Gtk.Box.BoxChild w7 = ((Gtk.Box.BoxChild)(this.vbox3[this.hbox2])); | ||
110 | w7.Position = 1; | ||
111 | w7.Expand = false; | ||
112 | w7.Fill = false; | ||
113 | // Container child vbox3.Gtk.Box+BoxChild | ||
114 | this.hbox3 = new Gtk.HBox(); | ||
115 | this.hbox3.Name = "hbox3"; | ||
116 | // Container child hbox3.Gtk.Box+BoxChild | ||
117 | this.label3 = new Gtk.Label(); | ||
118 | this.label3.Name = "label3"; | ||
119 | this.label3.Xalign = 1F; | ||
120 | this.label3.LabelProp = Mono.Unix.Catalog.GetString("Password:"); | ||
121 | this.label3.Justify = ((Gtk.Justification)(1)); | ||
122 | this.hbox3.Add(this.label3); | ||
123 | Gtk.Box.BoxChild w8 = ((Gtk.Box.BoxChild)(this.hbox3[this.label3])); | ||
124 | w8.Position = 0; | ||
125 | // Container child hbox3.Gtk.Box+BoxChild | ||
126 | this.entry3 = new Gtk.Entry(); | ||
127 | this.entry3.CanFocus = true; | ||
128 | this.entry3.Name = "entry3"; | ||
129 | this.entry3.IsEditable = true; | ||
130 | this.entry3.InvisibleChar = '•'; | ||
131 | this.hbox3.Add(this.entry3); | ||
132 | Gtk.Box.BoxChild w9 = ((Gtk.Box.BoxChild)(this.hbox3[this.entry3])); | ||
133 | w9.Position = 1; | ||
134 | this.vbox3.Add(this.hbox3); | ||
135 | Gtk.Box.BoxChild w10 = ((Gtk.Box.BoxChild)(this.vbox3[this.hbox3])); | ||
136 | w10.Position = 2; | ||
137 | w10.Expand = false; | ||
138 | w10.Fill = false; | ||
139 | this.vbox2.Add(this.vbox3); | ||
140 | Gtk.Box.BoxChild w11 = ((Gtk.Box.BoxChild)(this.vbox2[this.vbox3])); | ||
141 | w11.Position = 2; | ||
142 | w11.Expand = false; | ||
143 | w11.Fill = false; | ||
144 | w1.Add(this.vbox2); | ||
145 | Gtk.Box.BoxChild w12 = ((Gtk.Box.BoxChild)(w1[this.vbox2])); | ||
146 | w12.Position = 0; | ||
67 | // Internal child OpenGridServices.Manager.ConnectToGridServerDialog.ActionArea | 147 | // Internal child OpenGridServices.Manager.ConnectToGridServerDialog.ActionArea |
68 | Gtk.HButtonBox w5 = this.ActionArea; | 148 | Gtk.HButtonBox w13 = this.ActionArea; |
69 | w5.Events = ((Gdk.EventMask)(256)); | 149 | w13.Events = ((Gdk.EventMask)(256)); |
70 | w5.Name = "OpenGridServices.Manager.ConnectToGridServerDialog_ActionArea"; | 150 | w13.Name = "OpenGridServices.Manager.ConnectToGridServerDialog_ActionArea"; |
71 | w5.Spacing = 6; | 151 | w13.Spacing = 6; |
72 | w5.BorderWidth = ((uint)(5)); | 152 | w13.BorderWidth = ((uint)(5)); |
73 | w5.LayoutStyle = ((Gtk.ButtonBoxStyle)(4)); | 153 | w13.LayoutStyle = ((Gtk.ButtonBoxStyle)(4)); |
74 | // Container child OpenGridServices.Manager.ConnectToGridServerDialog_ActionArea.Gtk.ButtonBox+ButtonBoxChild | 154 | // Container child OpenGridServices.Manager.ConnectToGridServerDialog_ActionArea.Gtk.ButtonBox+ButtonBoxChild |
75 | this.button2 = new Gtk.Button(); | 155 | this.button2 = new Gtk.Button(); |
76 | this.button2.CanDefault = true; | 156 | this.button2.CanDefault = true; |
@@ -78,29 +158,29 @@ namespace OpenGridServices.Manager { | |||
78 | this.button2.Name = "button2"; | 158 | this.button2.Name = "button2"; |
79 | this.button2.UseUnderline = true; | 159 | this.button2.UseUnderline = true; |
80 | // Container child button2.Gtk.Container+ContainerChild | 160 | // Container child button2.Gtk.Container+ContainerChild |
81 | Gtk.Alignment w6 = new Gtk.Alignment(0.5F, 0.5F, 0F, 0F); | 161 | Gtk.Alignment w14 = new Gtk.Alignment(0.5F, 0.5F, 0F, 0F); |
82 | w6.Name = "GtkAlignment"; | 162 | w14.Name = "GtkAlignment"; |
83 | // Container child GtkAlignment.Gtk.Container+ContainerChild | 163 | // Container child GtkAlignment.Gtk.Container+ContainerChild |
84 | Gtk.HBox w7 = new Gtk.HBox(); | 164 | Gtk.HBox w15 = new Gtk.HBox(); |
85 | w7.Name = "GtkHBox"; | 165 | w15.Name = "GtkHBox"; |
86 | w7.Spacing = 2; | 166 | w15.Spacing = 2; |
87 | // Container child GtkHBox.Gtk.Container+ContainerChild | 167 | // Container child GtkHBox.Gtk.Container+ContainerChild |
88 | Gtk.Image w8 = new Gtk.Image(); | 168 | Gtk.Image w16 = new Gtk.Image(); |
89 | w8.Name = "image37"; | 169 | w16.Name = "image39"; |
90 | w8.Pixbuf = Gtk.IconTheme.Default.LoadIcon("gtk-apply", 16, 0); | 170 | w16.Pixbuf = Gtk.IconTheme.Default.LoadIcon("gtk-apply", 16, 0); |
91 | w7.Add(w8); | 171 | w15.Add(w16); |
92 | // Container child GtkHBox.Gtk.Container+ContainerChild | 172 | // Container child GtkHBox.Gtk.Container+ContainerChild |
93 | Gtk.Label w10 = new Gtk.Label(); | 173 | Gtk.Label w18 = new Gtk.Label(); |
94 | w10.Name = "GtkLabel"; | 174 | w18.Name = "GtkLabel"; |
95 | w10.LabelProp = Mono.Unix.Catalog.GetString("Connect"); | 175 | w18.LabelProp = Mono.Unix.Catalog.GetString("Connect"); |
96 | w10.UseUnderline = true; | 176 | w18.UseUnderline = true; |
97 | w7.Add(w10); | 177 | w15.Add(w18); |
98 | w6.Add(w7); | 178 | w14.Add(w15); |
99 | this.button2.Add(w6); | 179 | this.button2.Add(w14); |
100 | this.AddActionWidget(this.button2, -5); | 180 | this.AddActionWidget(this.button2, -5); |
101 | Gtk.ButtonBox.ButtonBoxChild w14 = ((Gtk.ButtonBox.ButtonBoxChild)(w5[this.button2])); | 181 | Gtk.ButtonBox.ButtonBoxChild w22 = ((Gtk.ButtonBox.ButtonBoxChild)(w13[this.button2])); |
102 | w14.Expand = false; | 182 | w22.Expand = false; |
103 | w14.Fill = false; | 183 | w22.Fill = false; |
104 | // Container child OpenGridServices.Manager.ConnectToGridServerDialog_ActionArea.Gtk.ButtonBox+ButtonBoxChild | 184 | // Container child OpenGridServices.Manager.ConnectToGridServerDialog_ActionArea.Gtk.ButtonBox+ButtonBoxChild |
105 | this.button8 = new Gtk.Button(); | 185 | this.button8 = new Gtk.Button(); |
106 | this.button8.CanDefault = true; | 186 | this.button8.CanDefault = true; |
@@ -108,35 +188,35 @@ namespace OpenGridServices.Manager { | |||
108 | this.button8.Name = "button8"; | 188 | this.button8.Name = "button8"; |
109 | this.button8.UseUnderline = true; | 189 | this.button8.UseUnderline = true; |
110 | // Container child button8.Gtk.Container+ContainerChild | 190 | // Container child button8.Gtk.Container+ContainerChild |
111 | Gtk.Alignment w15 = new Gtk.Alignment(0.5F, 0.5F, 0F, 0F); | 191 | Gtk.Alignment w23 = new Gtk.Alignment(0.5F, 0.5F, 0F, 0F); |
112 | w15.Name = "GtkAlignment1"; | 192 | w23.Name = "GtkAlignment1"; |
113 | // Container child GtkAlignment1.Gtk.Container+ContainerChild | 193 | // Container child GtkAlignment1.Gtk.Container+ContainerChild |
114 | Gtk.HBox w16 = new Gtk.HBox(); | 194 | Gtk.HBox w24 = new Gtk.HBox(); |
115 | w16.Name = "GtkHBox1"; | 195 | w24.Name = "GtkHBox1"; |
116 | w16.Spacing = 2; | 196 | w24.Spacing = 2; |
117 | // Container child GtkHBox1.Gtk.Container+ContainerChild | 197 | // Container child GtkHBox1.Gtk.Container+ContainerChild |
118 | Gtk.Image w17 = new Gtk.Image(); | 198 | Gtk.Image w25 = new Gtk.Image(); |
119 | w17.Name = "image38"; | 199 | w25.Name = "image40"; |
120 | w17.Pixbuf = Gtk.IconTheme.Default.LoadIcon("gtk-cancel", 16, 0); | 200 | w25.Pixbuf = Gtk.IconTheme.Default.LoadIcon("gtk-cancel", 16, 0); |
121 | w16.Add(w17); | 201 | w24.Add(w25); |
122 | // Container child GtkHBox1.Gtk.Container+ContainerChild | 202 | // Container child GtkHBox1.Gtk.Container+ContainerChild |
123 | Gtk.Label w19 = new Gtk.Label(); | 203 | Gtk.Label w27 = new Gtk.Label(); |
124 | w19.Name = "GtkLabel1"; | 204 | w27.Name = "GtkLabel1"; |
125 | w19.LabelProp = Mono.Unix.Catalog.GetString("Cancel"); | 205 | w27.LabelProp = Mono.Unix.Catalog.GetString("Cancel"); |
126 | w19.UseUnderline = true; | 206 | w27.UseUnderline = true; |
127 | w16.Add(w19); | 207 | w24.Add(w27); |
128 | w15.Add(w16); | 208 | w23.Add(w24); |
129 | this.button8.Add(w15); | 209 | this.button8.Add(w23); |
130 | this.AddActionWidget(this.button8, -6); | 210 | this.AddActionWidget(this.button8, -6); |
131 | Gtk.ButtonBox.ButtonBoxChild w23 = ((Gtk.ButtonBox.ButtonBoxChild)(w5[this.button8])); | 211 | Gtk.ButtonBox.ButtonBoxChild w31 = ((Gtk.ButtonBox.ButtonBoxChild)(w13[this.button8])); |
132 | w23.Position = 1; | 212 | w31.Position = 1; |
133 | w23.Expand = false; | 213 | w31.Expand = false; |
134 | w23.Fill = false; | 214 | w31.Fill = false; |
135 | if ((this.Child != null)) { | 215 | if ((this.Child != null)) { |
136 | this.Child.ShowAll(); | 216 | this.Child.ShowAll(); |
137 | } | 217 | } |
138 | this.DefaultWidth = 476; | 218 | this.DefaultWidth = 476; |
139 | this.DefaultHeight = 107; | 219 | this.DefaultHeight = 137; |
140 | this.Show(); | 220 | this.Show(); |
141 | this.Response += new Gtk.ResponseHandler(this.OnResponse); | 221 | this.Response += new Gtk.ResponseHandler(this.OnResponse); |
142 | } | 222 | } |
diff --git a/OpenGridServices.Manager/OpenGridServices.Manager/gtk-gui/gui.stetic b/OpenGridServices.Manager/OpenGridServices.Manager/gtk-gui/gui.stetic index 81ef762..12674c3 100644 --- a/OpenGridServices.Manager/OpenGridServices.Manager/gtk-gui/gui.stetic +++ b/OpenGridServices.Manager/OpenGridServices.Manager/gtk-gui/gui.stetic | |||
@@ -463,7 +463,7 @@ | |||
463 | </widget> | 463 | </widget> |
464 | </child> | 464 | </child> |
465 | </widget> | 465 | </widget> |
466 | <widget class="Gtk.Dialog" id="OpenGridServices.Manager.ConnectToGridServerDialog" design-size="476 107"> | 466 | <widget class="Gtk.Dialog" id="OpenGridServices.Manager.ConnectToGridServerDialog" design-size="476 137"> |
467 | <property name="MemberName" /> | 467 | <property name="MemberName" /> |
468 | <property name="Events">ButtonPressMask</property> | 468 | <property name="Events">ButtonPressMask</property> |
469 | <property name="Title" translatable="yes">Connect to Grid server</property> | 469 | <property name="Title" translatable="yes">Connect to Grid server</property> |
@@ -479,38 +479,138 @@ | |||
479 | <widget class="Gtk.VBox" id="vbox2"> | 479 | <widget class="Gtk.VBox" id="vbox2"> |
480 | <property name="MemberName" /> | 480 | <property name="MemberName" /> |
481 | <child> | 481 | <child> |
482 | <widget class="Gtk.Label" id="label1"> | 482 | <placeholder /> |
483 | <property name="MemberName" /> | ||
484 | <property name="LabelProp" translatable="yes">Please type in the grid server management interface URL:</property> | ||
485 | <property name="Wrap">True</property> | ||
486 | <property name="Justify">Center</property> | ||
487 | </widget> | ||
488 | <packing> | ||
489 | <property name="Position">0</property> | ||
490 | <property name="AutoSize">True</property> | ||
491 | <property name="Expand">False</property> | ||
492 | <property name="Fill">False</property> | ||
493 | </packing> | ||
494 | </child> | 483 | </child> |
495 | <child> | 484 | <child> |
496 | <widget class="Gtk.Entry" id="entry1"> | 485 | <placeholder /> |
486 | </child> | ||
487 | <child> | ||
488 | <widget class="Gtk.VBox" id="vbox3"> | ||
497 | <property name="MemberName" /> | 489 | <property name="MemberName" /> |
498 | <property name="CanFocus">True</property> | 490 | <child> |
499 | <property name="Text" translatable="yes">http://gridserver:8001</property> | 491 | <widget class="Gtk.HBox" id="hbox1"> |
500 | <property name="IsEditable">True</property> | 492 | <property name="MemberName" /> |
501 | <property name="MaxLength">255</property> | 493 | <child> |
502 | <property name="InvisibleChar">•</property> | 494 | <widget class="Gtk.Label" id="label1"> |
495 | <property name="MemberName" /> | ||
496 | <property name="Xalign">1</property> | ||
497 | <property name="LabelProp" translatable="yes">Grid server URL: </property> | ||
498 | <property name="Justify">Right</property> | ||
499 | </widget> | ||
500 | <packing> | ||
501 | <property name="Position">0</property> | ||
502 | <property name="AutoSize">False</property> | ||
503 | </packing> | ||
504 | </child> | ||
505 | <child> | ||
506 | <widget class="Gtk.Entry" id="entry1"> | ||
507 | <property name="MemberName" /> | ||
508 | <property name="CanFocus">True</property> | ||
509 | <property name="Text" translatable="yes">http://gridserver:8001</property> | ||
510 | <property name="IsEditable">True</property> | ||
511 | <property name="MaxLength">255</property> | ||
512 | <property name="InvisibleChar">•</property> | ||
513 | </widget> | ||
514 | <packing> | ||
515 | <property name="Position">1</property> | ||
516 | <property name="AutoSize">False</property> | ||
517 | </packing> | ||
518 | </child> | ||
519 | <child> | ||
520 | <placeholder /> | ||
521 | </child> | ||
522 | </widget> | ||
523 | <packing> | ||
524 | <property name="Position">0</property> | ||
525 | <property name="AutoSize">True</property> | ||
526 | <property name="Expand">False</property> | ||
527 | <property name="Fill">False</property> | ||
528 | </packing> | ||
529 | </child> | ||
530 | <child> | ||
531 | <widget class="Gtk.HBox" id="hbox2"> | ||
532 | <property name="MemberName" /> | ||
533 | <child> | ||
534 | <widget class="Gtk.Label" id="label2"> | ||
535 | <property name="MemberName" /> | ||
536 | <property name="Xalign">1</property> | ||
537 | <property name="LabelProp" translatable="yes">Username:</property> | ||
538 | <property name="Justify">Right</property> | ||
539 | </widget> | ||
540 | <packing> | ||
541 | <property name="Position">0</property> | ||
542 | <property name="AutoSize">False</property> | ||
543 | </packing> | ||
544 | </child> | ||
545 | <child> | ||
546 | <widget class="Gtk.Entry" id="entry2"> | ||
547 | <property name="MemberName" /> | ||
548 | <property name="CanFocus">True</property> | ||
549 | <property name="IsEditable">True</property> | ||
550 | <property name="InvisibleChar">•</property> | ||
551 | </widget> | ||
552 | <packing> | ||
553 | <property name="Position">1</property> | ||
554 | <property name="AutoSize">True</property> | ||
555 | </packing> | ||
556 | </child> | ||
557 | <child> | ||
558 | <placeholder /> | ||
559 | </child> | ||
560 | </widget> | ||
561 | <packing> | ||
562 | <property name="Position">1</property> | ||
563 | <property name="AutoSize">False</property> | ||
564 | <property name="Expand">False</property> | ||
565 | <property name="Fill">False</property> | ||
566 | </packing> | ||
567 | </child> | ||
568 | <child> | ||
569 | <widget class="Gtk.HBox" id="hbox3"> | ||
570 | <property name="MemberName" /> | ||
571 | <child> | ||
572 | <widget class="Gtk.Label" id="label3"> | ||
573 | <property name="MemberName" /> | ||
574 | <property name="Xalign">1</property> | ||
575 | <property name="LabelProp" translatable="yes">Password:</property> | ||
576 | <property name="Justify">Right</property> | ||
577 | </widget> | ||
578 | <packing> | ||
579 | <property name="Position">0</property> | ||
580 | <property name="AutoSize">False</property> | ||
581 | </packing> | ||
582 | </child> | ||
583 | <child> | ||
584 | <widget class="Gtk.Entry" id="entry3"> | ||
585 | <property name="MemberName" /> | ||
586 | <property name="CanFocus">True</property> | ||
587 | <property name="IsEditable">True</property> | ||
588 | <property name="InvisibleChar">•</property> | ||
589 | </widget> | ||
590 | <packing> | ||
591 | <property name="Position">1</property> | ||
592 | <property name="AutoSize">True</property> | ||
593 | </packing> | ||
594 | </child> | ||
595 | <child> | ||
596 | <placeholder /> | ||
597 | </child> | ||
598 | </widget> | ||
599 | <packing> | ||
600 | <property name="Position">2</property> | ||
601 | <property name="AutoSize">True</property> | ||
602 | <property name="Expand">False</property> | ||
603 | <property name="Fill">False</property> | ||
604 | </packing> | ||
605 | </child> | ||
503 | </widget> | 606 | </widget> |
504 | <packing> | 607 | <packing> |
505 | <property name="Position">1</property> | 608 | <property name="Position">2</property> |
506 | <property name="AutoSize">True</property> | 609 | <property name="AutoSize">True</property> |
507 | <property name="Expand">False</property> | 610 | <property name="Expand">False</property> |
508 | <property name="Fill">False</property> | 611 | <property name="Fill">False</property> |
509 | </packing> | 612 | </packing> |
510 | </child> | 613 | </child> |
511 | <child> | ||
512 | <placeholder /> | ||
513 | </child> | ||
514 | </widget> | 614 | </widget> |
515 | <packing> | 615 | <packing> |
516 | <property name="Position">0</property> | 616 | <property name="Position">0</property> |