aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorgareth2007-05-19 22:46:50 +0000
committergareth2007-05-19 22:46:50 +0000
commit3bca4cd5b1fb6063ff61055afade7df7f26ae788 (patch)
treee214261a6f44a9b22bf85ca9a3c4fc4fb5930d45
parentBorder crossing back to mostly working, still seems a problem in that you nee... (diff)
downloadopensim-SC_OLD-3bca4cd5b1fb6063ff61055afade7df7f26ae788.zip
opensim-SC_OLD-3bca4cd5b1fb6063ff61055afade7df7f26ae788.tar.gz
opensim-SC_OLD-3bca4cd5b1fb6063ff61055afade7df7f26ae788.tar.bz2
opensim-SC_OLD-3bca4cd5b1fb6063ff61055afade7df7f26ae788.tar.xz
Begun adding the mapping code
Diffstat
-rw-r--r--OpenGridServices.Manager/OpenGridServices.Manager/MainWindow.cs5
-rw-r--r--OpenGridServices.Manager/OpenGridServices.Manager/OpenGridServices.Manager.mdp1
-rw-r--r--OpenGridServices.Manager/OpenGridServices.Manager/RegionBlock.cs27
-rw-r--r--OpenGridServices.Manager/OpenGridServices.Manager/gtk-gui/OpenGridServices.Manager.MainWindow.cs135
-rw-r--r--OpenGridServices.Manager/OpenGridServices.Manager/gtk-gui/gui.stetic172
5 files changed, 49 insertions, 291 deletions
diff --git a/OpenGridServices.Manager/OpenGridServices.Manager/MainWindow.cs b/OpenGridServices.Manager/OpenGridServices.Manager/MainWindow.cs
index bc8d251..598e380 100644
--- a/OpenGridServices.Manager/OpenGridServices.Manager/MainWindow.cs
+++ b/OpenGridServices.Manager/OpenGridServices.Manager/MainWindow.cs
@@ -15,6 +15,11 @@ namespace OpenGridServices.Manager {
15 this.statusbar1.Push(0,statustext); 15 this.statusbar1.Push(0,statustext);
16 } 16 }
17 17
18 public void DrawGrid(RegionBlock[][] regions)
19 {
20
21 }
22
18 public void SetGridServerConnected(bool connected) 23 public void SetGridServerConnected(bool connected)
19 { 24 {
20 if(connected) { 25 if(connected) {
diff --git a/OpenGridServices.Manager/OpenGridServices.Manager/OpenGridServices.Manager.mdp b/OpenGridServices.Manager/OpenGridServices.Manager/OpenGridServices.Manager.mdp
index 357cf0c..3140034 100644
--- a/OpenGridServices.Manager/OpenGridServices.Manager/OpenGridServices.Manager.mdp
+++ b/OpenGridServices.Manager/OpenGridServices.Manager/OpenGridServices.Manager.mdp
@@ -25,6 +25,7 @@
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 <File name="./GridServerConnectionManager.cs" subtype="Code" buildaction="Compile" />
28 <File name="./RegionBlock.cs" subtype="Code" buildaction="Compile" />
28 </Contents> 29 </Contents>
29 <References> 30 <References>
30 <ProjectReference type="Gac" localcopy="True" refto="gtk-sharp, Version=2.4.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" /> 31 <ProjectReference type="Gac" localcopy="True" refto="gtk-sharp, Version=2.4.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
diff --git a/OpenGridServices.Manager/OpenGridServices.Manager/RegionBlock.cs b/OpenGridServices.Manager/OpenGridServices.Manager/RegionBlock.cs
new file mode 100644
index 0000000..b4e5cca
--- /dev/null
+++ b/OpenGridServices.Manager/OpenGridServices.Manager/RegionBlock.cs
@@ -0,0 +1,27 @@
1using System;
2using libsecondlife;
3using OpenSim.Framework.Utilities;
4
5namespace OpenGridServices.Manager
6{
7
8
9 public class RegionBlock
10 {
11
12 private uint regloc_x;
13 private uint regloc_y;
14
15
16
17 public ulong regionhandle {
18 get { return Util.UIntsToLong(regloc_x*256,regloc_y*256); }
19 }
20
21 public Gdk.Pixbuf MiniMap;
22
23 public RegionBlock()
24 {
25 }
26 }
27}
diff --git a/OpenGridServices.Manager/OpenGridServices.Manager/gtk-gui/OpenGridServices.Manager.MainWindow.cs b/OpenGridServices.Manager/OpenGridServices.Manager/gtk-gui/OpenGridServices.Manager.MainWindow.cs
index 593ee42..8798dac 100644
--- a/OpenGridServices.Manager/OpenGridServices.Manager/gtk-gui/OpenGridServices.Manager.MainWindow.cs
+++ b/OpenGridServices.Manager/OpenGridServices.Manager/gtk-gui/OpenGridServices.Manager.MainWindow.cs
@@ -77,25 +77,7 @@ namespace OpenGridServices.Manager {
77 77
78 private Gtk.ScrolledWindow scrolledwindow1; 78 private Gtk.ScrolledWindow scrolledwindow1;
79 79
80 private Gtk.Table table1; 80 private Gtk.DrawingArea drawingarea1;
81
82 private Gtk.Image image1;
83
84 private Gtk.Image image2;
85
86 private Gtk.Image image3;
87
88 private Gtk.Image image4;
89
90 private Gtk.Image image5;
91
92 private Gtk.Image image6;
93
94 private Gtk.Image image7;
95
96 private Gtk.Image image8;
97
98 private Gtk.Image image9;
99 81
100 private Gtk.TreeView treeview1; 82 private Gtk.TreeView treeview1;
101 83
@@ -229,120 +211,33 @@ namespace OpenGridServices.Manager {
229 w4.Name = "GtkViewport"; 211 w4.Name = "GtkViewport";
230 w4.ShadowType = ((Gtk.ShadowType)(0)); 212 w4.ShadowType = ((Gtk.ShadowType)(0));
231 // Container child GtkViewport.Gtk.Container+ContainerChild 213 // Container child GtkViewport.Gtk.Container+ContainerChild
232 this.table1 = new Gtk.Table(((uint)(3)), ((uint)(3)), false); 214 this.drawingarea1 = new Gtk.DrawingArea();
233 this.table1.Name = "table1"; 215 this.drawingarea1.Name = "drawingarea1";
234 // Container child table1.Gtk.Table+TableChild 216 w4.Add(this.drawingarea1);
235 this.image1 = new Gtk.Image();
236 this.image1.Name = "image1";
237 this.table1.Add(this.image1);
238 Gtk.Table.TableChild w5 = ((Gtk.Table.TableChild)(this.table1[this.image1]));
239 w5.XOptions = ((Gtk.AttachOptions)(4));
240 w5.YOptions = ((Gtk.AttachOptions)(4));
241 // Container child table1.Gtk.Table+TableChild
242 this.image2 = new Gtk.Image();
243 this.image2.Name = "image2";
244 this.table1.Add(this.image2);
245 Gtk.Table.TableChild w6 = ((Gtk.Table.TableChild)(this.table1[this.image2]));
246 w6.LeftAttach = ((uint)(1));
247 w6.RightAttach = ((uint)(2));
248 w6.XOptions = ((Gtk.AttachOptions)(4));
249 w6.YOptions = ((Gtk.AttachOptions)(4));
250 // Container child table1.Gtk.Table+TableChild
251 this.image3 = new Gtk.Image();
252 this.image3.Name = "image3";
253 this.table1.Add(this.image3);
254 Gtk.Table.TableChild w7 = ((Gtk.Table.TableChild)(this.table1[this.image3]));
255 w7.LeftAttach = ((uint)(2));
256 w7.RightAttach = ((uint)(3));
257 w7.XOptions = ((Gtk.AttachOptions)(4));
258 w7.YOptions = ((Gtk.AttachOptions)(4));
259 // Container child table1.Gtk.Table+TableChild
260 this.image4 = new Gtk.Image();
261 this.image4.Name = "image4";
262 this.table1.Add(this.image4);
263 Gtk.Table.TableChild w8 = ((Gtk.Table.TableChild)(this.table1[this.image4]));
264 w8.TopAttach = ((uint)(1));
265 w8.BottomAttach = ((uint)(2));
266 w8.XOptions = ((Gtk.AttachOptions)(4));
267 w8.YOptions = ((Gtk.AttachOptions)(4));
268 // Container child table1.Gtk.Table+TableChild
269 this.image5 = new Gtk.Image();
270 this.image5.Name = "image5";
271 this.table1.Add(this.image5);
272 Gtk.Table.TableChild w9 = ((Gtk.Table.TableChild)(this.table1[this.image5]));
273 w9.TopAttach = ((uint)(1));
274 w9.BottomAttach = ((uint)(2));
275 w9.LeftAttach = ((uint)(1));
276 w9.RightAttach = ((uint)(2));
277 w9.XOptions = ((Gtk.AttachOptions)(4));
278 w9.YOptions = ((Gtk.AttachOptions)(4));
279 // Container child table1.Gtk.Table+TableChild
280 this.image6 = new Gtk.Image();
281 this.image6.Name = "image6";
282 this.table1.Add(this.image6);
283 Gtk.Table.TableChild w10 = ((Gtk.Table.TableChild)(this.table1[this.image6]));
284 w10.TopAttach = ((uint)(1));
285 w10.BottomAttach = ((uint)(2));
286 w10.LeftAttach = ((uint)(2));
287 w10.RightAttach = ((uint)(3));
288 w10.XOptions = ((Gtk.AttachOptions)(4));
289 w10.YOptions = ((Gtk.AttachOptions)(4));
290 // Container child table1.Gtk.Table+TableChild
291 this.image7 = new Gtk.Image();
292 this.image7.Name = "image7";
293 this.table1.Add(this.image7);
294 Gtk.Table.TableChild w11 = ((Gtk.Table.TableChild)(this.table1[this.image7]));
295 w11.TopAttach = ((uint)(2));
296 w11.BottomAttach = ((uint)(3));
297 w11.XOptions = ((Gtk.AttachOptions)(4));
298 w11.YOptions = ((Gtk.AttachOptions)(4));
299 // Container child table1.Gtk.Table+TableChild
300 this.image8 = new Gtk.Image();
301 this.image8.Name = "image8";
302 this.table1.Add(this.image8);
303 Gtk.Table.TableChild w12 = ((Gtk.Table.TableChild)(this.table1[this.image8]));
304 w12.TopAttach = ((uint)(2));
305 w12.BottomAttach = ((uint)(3));
306 w12.LeftAttach = ((uint)(1));
307 w12.RightAttach = ((uint)(2));
308 w12.XOptions = ((Gtk.AttachOptions)(4));
309 w12.YOptions = ((Gtk.AttachOptions)(4));
310 // Container child table1.Gtk.Table+TableChild
311 this.image9 = new Gtk.Image();
312 this.image9.Name = "image9";
313 this.table1.Add(this.image9);
314 Gtk.Table.TableChild w13 = ((Gtk.Table.TableChild)(this.table1[this.image9]));
315 w13.TopAttach = ((uint)(2));
316 w13.BottomAttach = ((uint)(3));
317 w13.LeftAttach = ((uint)(2));
318 w13.RightAttach = ((uint)(3));
319 w13.XOptions = ((Gtk.AttachOptions)(4));
320 w13.YOptions = ((Gtk.AttachOptions)(4));
321 w4.Add(this.table1);
322 this.scrolledwindow1.Add(w4); 217 this.scrolledwindow1.Add(w4);
323 this.hbox1.Add(this.scrolledwindow1); 218 this.hbox1.Add(this.scrolledwindow1);
324 Gtk.Box.BoxChild w16 = ((Gtk.Box.BoxChild)(this.hbox1[this.scrolledwindow1])); 219 Gtk.Box.BoxChild w7 = ((Gtk.Box.BoxChild)(this.hbox1[this.scrolledwindow1]));
325 w16.Position = 1; 220 w7.Position = 1;
326 // Container child hbox1.Gtk.Box+BoxChild 221 // Container child hbox1.Gtk.Box+BoxChild
327 this.treeview1 = new Gtk.TreeView(); 222 this.treeview1 = new Gtk.TreeView();
328 this.treeview1.CanFocus = true; 223 this.treeview1.CanFocus = true;
329 this.treeview1.Name = "treeview1"; 224 this.treeview1.Name = "treeview1";
330 this.hbox1.Add(this.treeview1); 225 this.hbox1.Add(this.treeview1);
331 Gtk.Box.BoxChild w17 = ((Gtk.Box.BoxChild)(this.hbox1[this.treeview1])); 226 Gtk.Box.BoxChild w8 = ((Gtk.Box.BoxChild)(this.hbox1[this.treeview1]));
332 w17.Position = 2; 227 w8.Position = 2;
333 this.vbox1.Add(this.hbox1); 228 this.vbox1.Add(this.hbox1);
334 Gtk.Box.BoxChild w18 = ((Gtk.Box.BoxChild)(this.vbox1[this.hbox1])); 229 Gtk.Box.BoxChild w9 = ((Gtk.Box.BoxChild)(this.vbox1[this.hbox1]));
335 w18.Position = 1; 230 w9.Position = 1;
336 // Container child vbox1.Gtk.Box+BoxChild 231 // Container child vbox1.Gtk.Box+BoxChild
337 this.statusbar1 = new Gtk.Statusbar(); 232 this.statusbar1 = new Gtk.Statusbar();
338 this.statusbar1.Name = "statusbar1"; 233 this.statusbar1.Name = "statusbar1";
339 this.statusbar1.Spacing = 5; 234 this.statusbar1.Spacing = 5;
340 this.vbox1.Add(this.statusbar1); 235 this.vbox1.Add(this.statusbar1);
341 Gtk.Box.BoxChild w19 = ((Gtk.Box.BoxChild)(this.vbox1[this.statusbar1])); 236 Gtk.Box.BoxChild w10 = ((Gtk.Box.BoxChild)(this.vbox1[this.statusbar1]));
342 w19.PackType = ((Gtk.PackType)(1)); 237 w10.PackType = ((Gtk.PackType)(1));
343 w19.Position = 2; 238 w10.Position = 2;
344 w19.Expand = false; 239 w10.Expand = false;
345 w19.Fill = false; 240 w10.Fill = false;
346 this.Add(this.vbox1); 241 this.Add(this.vbox1);
347 if ((this.Child != null)) { 242 if ((this.Child != null)) {
348 this.Child.ShowAll(); 243 this.Child.ShowAll();
diff --git a/OpenGridServices.Manager/OpenGridServices.Manager/gtk-gui/gui.stetic b/OpenGridServices.Manager/OpenGridServices.Manager/gtk-gui/gui.stetic
index ac677a2..c883f08 100644
--- a/OpenGridServices.Manager/OpenGridServices.Manager/gtk-gui/gui.stetic
+++ b/OpenGridServices.Manager/OpenGridServices.Manager/gtk-gui/gui.stetic
@@ -245,178 +245,8 @@
245 <property name="MemberName" /> 245 <property name="MemberName" />
246 <property name="ShadowType">None</property> 246 <property name="ShadowType">None</property>
247 <child> 247 <child>
248 <widget class="Gtk.Table" id="table1"> 248 <widget class="Gtk.DrawingArea" id="drawingarea1">
249 <property name="MemberName" /> 249 <property name="MemberName" />
250 <property name="NRows">3</property>
251 <property name="NColumns">3</property>
252 <child>
253 <widget class="Gtk.Image" id="image1">
254 <property name="MemberName" />
255 </widget>
256 <packing>
257 <property name="AutoSize">True</property>
258 <property name="XOptions">Fill</property>
259 <property name="YOptions">Fill</property>
260 <property name="XExpand">False</property>
261 <property name="XFill">True</property>
262 <property name="XShrink">False</property>
263 <property name="YExpand">False</property>
264 <property name="YFill">True</property>
265 <property name="YShrink">False</property>
266 </packing>
267 </child>
268 <child>
269 <widget class="Gtk.Image" id="image2">
270 <property name="MemberName" />
271 </widget>
272 <packing>
273 <property name="LeftAttach">1</property>
274 <property name="RightAttach">2</property>
275 <property name="AutoSize">True</property>
276 <property name="XOptions">Fill</property>
277 <property name="YOptions">Fill</property>
278 <property name="XExpand">False</property>
279 <property name="XFill">True</property>
280 <property name="XShrink">False</property>
281 <property name="YExpand">False</property>
282 <property name="YFill">True</property>
283 <property name="YShrink">False</property>
284 </packing>
285 </child>
286 <child>
287 <widget class="Gtk.Image" id="image3">
288 <property name="MemberName" />
289 </widget>
290 <packing>
291 <property name="LeftAttach">2</property>
292 <property name="RightAttach">3</property>
293 <property name="AutoSize">True</property>
294 <property name="XOptions">Fill</property>
295 <property name="YOptions">Fill</property>
296 <property name="XExpand">False</property>
297 <property name="XFill">True</property>
298 <property name="XShrink">False</property>
299 <property name="YExpand">False</property>
300 <property name="YFill">True</property>
301 <property name="YShrink">False</property>
302 </packing>
303 </child>
304 <child>
305 <widget class="Gtk.Image" id="image4">
306 <property name="MemberName" />
307 </widget>
308 <packing>
309 <property name="TopAttach">1</property>
310 <property name="BottomAttach">2</property>
311 <property name="AutoSize">True</property>
312 <property name="XOptions">Fill</property>
313 <property name="YOptions">Fill</property>
314 <property name="XExpand">False</property>
315 <property name="XFill">True</property>
316 <property name="XShrink">False</property>
317 <property name="YExpand">False</property>
318 <property name="YFill">True</property>
319 <property name="YShrink">False</property>
320 </packing>
321 </child>
322 <child>
323 <widget class="Gtk.Image" id="image5">
324 <property name="MemberName" />
325 </widget>
326 <packing>
327 <property name="TopAttach">1</property>
328 <property name="BottomAttach">2</property>
329 <property name="LeftAttach">1</property>
330 <property name="RightAttach">2</property>
331 <property name="AutoSize">True</property>
332 <property name="XOptions">Fill</property>
333 <property name="YOptions">Fill</property>
334 <property name="XExpand">False</property>
335 <property name="XFill">True</property>
336 <property name="XShrink">False</property>
337 <property name="YExpand">False</property>
338 <property name="YFill">True</property>
339 <property name="YShrink">False</property>
340 </packing>
341 </child>
342 <child>
343 <widget class="Gtk.Image" id="image6">
344 <property name="MemberName" />
345 </widget>
346 <packing>
347 <property name="TopAttach">1</property>
348 <property name="BottomAttach">2</property>
349 <property name="LeftAttach">2</property>
350 <property name="RightAttach">3</property>
351 <property name="AutoSize">True</property>
352 <property name="XOptions">Fill</property>
353 <property name="YOptions">Fill</property>
354 <property name="XExpand">False</property>
355 <property name="XFill">True</property>
356 <property name="XShrink">False</property>
357 <property name="YExpand">False</property>
358 <property name="YFill">True</property>
359 <property name="YShrink">False</property>
360 </packing>
361 </child>
362 <child>
363 <widget class="Gtk.Image" id="image7">
364 <property name="MemberName" />
365 </widget>
366 <packing>
367 <property name="TopAttach">2</property>
368 <property name="BottomAttach">3</property>
369 <property name="AutoSize">True</property>
370 <property name="XOptions">Fill</property>
371 <property name="YOptions">Fill</property>
372 <property name="XExpand">False</property>
373 <property name="XFill">True</property>
374 <property name="XShrink">False</property>
375 <property name="YExpand">False</property>
376 <property name="YFill">True</property>
377 <property name="YShrink">False</property>
378 </packing>
379 </child>
380 <child>
381 <widget class="Gtk.Image" id="image8">
382 <property name="MemberName" />
383 </widget>
384 <packing>
385 <property name="TopAttach">2</property>
386 <property name="BottomAttach">3</property>
387 <property name="LeftAttach">1</property>
388 <property name="RightAttach">2</property>
389 <property name="AutoSize">True</property>
390 <property name="XOptions">Fill</property>
391 <property name="YOptions">Fill</property>
392 <property name="XExpand">False</property>
393 <property name="XFill">True</property>
394 <property name="XShrink">False</property>
395 <property name="YExpand">False</property>
396 <property name="YFill">True</property>
397 <property name="YShrink">False</property>
398 </packing>
399 </child>
400 <child>
401 <widget class="Gtk.Image" id="image9">
402 <property name="MemberName" />
403 </widget>
404 <packing>
405 <property name="TopAttach">2</property>
406 <property name="BottomAttach">3</property>
407 <property name="LeftAttach">2</property>
408 <property name="RightAttach">3</property>
409 <property name="AutoSize">True</property>
410 <property name="XOptions">Fill</property>
411 <property name="YOptions">Fill</property>
412 <property name="XExpand">False</property>
413 <property name="XFill">True</property>
414 <property name="XShrink">False</property>
415 <property name="YExpand">False</property>
416 <property name="YFill">True</property>
417 <property name="YShrink">False</property>
418 </packing>
419 </child>
420 </widget> 250 </widget>
421 </child> 251 </child>
422 </widget> 252 </widget>
generated by cgit v1.1 at 2024-11-12 11:17:11 +0000