From 4dc99e419c70eec86f551070a869dc531e9b275a Mon Sep 17 00:00:00 2001
From: gareth
Date: Wed, 16 May 2007 22:55:29 +0000
Subject: * OpenGridServices.Manager/gtk-gui/MainWindow.cs,
OpenGridServices.Manager/gtk-gui/gui.stetic: Altered size of main window *
OpenGridServices.Manager/gtk-gui/ConnectToGridServerDialog.cs: Copied
Util.cs in (due to build weirdness)
---
.../OpenGridServices.Manager/Main.cs | 1 +
.../OpenGridServices.Manager.mdp | 1 +
.../OpenGridServices.Manager/Util.cs | 133 +++++++++++++++++++++
.../gtk-gui/ConnectToGridServerDialog.cs | 8 +-
.../OpenGridServices.Manager/gtk-gui/MainWindow.cs | 5 +-
.../OpenGridServices.Manager/gtk-gui/gui.stetic | 7 +-
6 files changed, 149 insertions(+), 6 deletions(-)
create mode 100644 OpenGridServices.Manager/OpenGridServices.Manager/Util.cs
diff --git a/OpenGridServices.Manager/OpenGridServices.Manager/Main.cs b/OpenGridServices.Manager/OpenGridServices.Manager/Main.cs
index 598a342..2921573 100644
--- a/OpenGridServices.Manager/OpenGridServices.Manager/Main.cs
+++ b/OpenGridServices.Manager/OpenGridServices.Manager/Main.cs
@@ -6,6 +6,7 @@ namespace OpenGridServices.Manager
{
class MainClass
{
+
public static void Main (string[] args)
{
Application.Init ();
diff --git a/OpenGridServices.Manager/OpenGridServices.Manager/OpenGridServices.Manager.mdp b/OpenGridServices.Manager/OpenGridServices.Manager/OpenGridServices.Manager.mdp
index d3b87e9..c8baa00 100644
--- a/OpenGridServices.Manager/OpenGridServices.Manager/OpenGridServices.Manager.mdp
+++ b/OpenGridServices.Manager/OpenGridServices.Manager/OpenGridServices.Manager.mdp
@@ -22,6 +22,7 @@
+
diff --git a/OpenGridServices.Manager/OpenGridServices.Manager/Util.cs b/OpenGridServices.Manager/OpenGridServices.Manager/Util.cs
new file mode 100644
index 0000000..5bf7ff9
--- /dev/null
+++ b/OpenGridServices.Manager/OpenGridServices.Manager/Util.cs
@@ -0,0 +1,133 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+using libsecondlife;
+using libsecondlife.Packets;
+
+namespace OpenSim.Framework.Utilities
+{
+ public class Util
+ {
+ private static Random randomClass = new Random();
+ private static uint nextXferID = 5000;
+ private static object XferLock = new object();
+
+ public static ulong UIntsToLong(uint X, uint Y)
+ {
+ return Helpers.UIntsToLong(X, Y);
+ }
+
+ public static Random RandomClass
+ {
+ get
+ {
+ return randomClass;
+ }
+ }
+
+ public static uint GetNextXferID()
+ {
+ uint id = 0;
+ lock(XferLock)
+ {
+ id = nextXferID;
+ nextXferID++;
+ }
+ return id;
+ }
+
+ //public static int fast_distance2d(int x, int y)
+ //{
+ // x = System.Math.Abs(x);
+ // y = System.Math.Abs(y);
+
+ // int min = System.Math.Min(x, y);
+
+ // return (x + y - (min >> 1) - (min >> 2) + (min >> 4));
+ //}
+
+ public static string FieldToString(byte[] bytes)
+ {
+ return FieldToString(bytes, String.Empty);
+ }
+
+ ///
+ /// Convert a variable length field (byte array) to a string, with a
+ /// field name prepended to each line of the output
+ ///
+ /// If the byte array has unprintable characters in it, a
+ /// hex dump will be put in the string instead
+ /// The byte array to convert to a string
+ /// A field name to prepend to each line of output
+ /// An ASCII string or a string containing a hex dump, minus
+ /// the null terminator
+ public static string FieldToString(byte[] bytes, string fieldName)
+ {
+ // Check for a common case
+ if (bytes.Length == 0) return String.Empty;
+
+ StringBuilder output = new StringBuilder();
+ bool printable = true;
+
+ for (int i = 0; i < bytes.Length; ++i)
+ {
+ // Check if there are any unprintable characters in the array
+ if ((bytes[i] < 0x20 || bytes[i] > 0x7E) && bytes[i] != 0x09
+ && bytes[i] != 0x0D && bytes[i] != 0x0A && bytes[i] != 0x00)
+ {
+ printable = false;
+ break;
+ }
+ }
+
+ if (printable)
+ {
+ if (fieldName.Length > 0)
+ {
+ output.Append(fieldName);
+ output.Append(": ");
+ }
+
+ if (bytes[bytes.Length - 1] == 0x00)
+ output.Append(UTF8Encoding.UTF8.GetString(bytes, 0, bytes.Length - 1));
+ else
+ output.Append(UTF8Encoding.UTF8.GetString(bytes));
+ }
+ else
+ {
+ for (int i = 0; i < bytes.Length; i += 16)
+ {
+ if (i != 0)
+ output.Append(Environment.NewLine);
+ if (fieldName.Length > 0)
+ {
+ output.Append(fieldName);
+ output.Append(": ");
+ }
+
+ for (int j = 0; j < 16; j++)
+ {
+ if ((i + j) < bytes.Length)
+ output.Append(String.Format("{0:X2} ", bytes[i + j]));
+ else
+ output.Append(" ");
+ }
+
+ for (int j = 0; j < 16 && (i + j) < bytes.Length; j++)
+ {
+ if (bytes[i + j] >= 0x20 && bytes[i + j] < 0x7E)
+ output.Append((char)bytes[i + j]);
+ else
+ output.Append(".");
+ }
+ }
+ }
+
+ return output.ToString();
+ }
+ public Util()
+ {
+
+ }
+ }
+}
diff --git a/OpenGridServices.Manager/OpenGridServices.Manager/gtk-gui/ConnectToGridServerDialog.cs b/OpenGridServices.Manager/OpenGridServices.Manager/gtk-gui/ConnectToGridServerDialog.cs
index a7c8d43..e147f63 100644
--- a/OpenGridServices.Manager/OpenGridServices.Manager/gtk-gui/ConnectToGridServerDialog.cs
+++ b/OpenGridServices.Manager/OpenGridServices.Manager/gtk-gui/ConnectToGridServerDialog.cs
@@ -28,6 +28,8 @@ public partial class ConnectToGridServerDialog {
this.Events = ((Gdk.EventMask)(256));
this.Name = "ConnectToGridServerDialog";
this.Title = Mono.Unix.Catalog.GetString("Connect to Grid server");
+ this.WindowPosition = ((Gtk.WindowPosition)(4));
+ this.HasSeparator = false;
// Internal child ConnectToGridServerDialog.VBox
Gtk.VBox w1 = this.VBox;
w1.Events = ((Gdk.EventMask)(256));
@@ -85,7 +87,7 @@ public partial class ConnectToGridServerDialog {
w7.Spacing = 2;
// Container child GtkHBox.Gtk.Container+ContainerChild
Gtk.Image w8 = new Gtk.Image();
- w8.Name = "image11";
+ w8.Name = "image1";
w8.Pixbuf = Gtk.IconTheme.Default.LoadIcon("gtk-apply", 16, 0);
w7.Add(w8);
// Container child GtkHBox.Gtk.Container+ContainerChild
@@ -115,7 +117,7 @@ public partial class ConnectToGridServerDialog {
w16.Spacing = 2;
// Container child GtkHBox1.Gtk.Container+ContainerChild
Gtk.Image w17 = new Gtk.Image();
- w17.Name = "image12";
+ w17.Name = "image2";
w17.Pixbuf = Gtk.IconTheme.Default.LoadIcon("gtk-cancel", 16, 0);
w16.Add(w17);
// Container child GtkHBox1.Gtk.Container+ContainerChild
@@ -137,5 +139,7 @@ public partial class ConnectToGridServerDialog {
this.DefaultWidth = 476;
this.DefaultHeight = 107;
this.Show();
+ this.button2.Activated += new System.EventHandler(this.ConnectBtn);
+ this.button8.Activated += new System.EventHandler(this.CancelBtn);
}
}
diff --git a/OpenGridServices.Manager/OpenGridServices.Manager/gtk-gui/MainWindow.cs b/OpenGridServices.Manager/OpenGridServices.Manager/gtk-gui/MainWindow.cs
index 43c2f64..74e7185 100644
--- a/OpenGridServices.Manager/OpenGridServices.Manager/gtk-gui/MainWindow.cs
+++ b/OpenGridServices.Manager/OpenGridServices.Manager/gtk-gui/MainWindow.cs
@@ -196,10 +196,11 @@ public partial class MainWindow {
w2.Add(this.CustomAssetServer, null);
w1.InsertActionGroup(w2, 0);
this.AddAccelGroup(w1.AccelGroup);
- this.WidthRequest = 600;
- this.HeightRequest = 800;
+ this.WidthRequest = 800;
+ this.HeightRequest = 600;
this.Name = "MainWindow";
this.Title = Mono.Unix.Catalog.GetString("Open Grid Services Manager");
+ this.Icon = Gtk.IconTheme.Default.LoadIcon("gtk-network", 48, 0);
// Container child MainWindow.Gtk.Container+ContainerChild
this.vbox1 = new Gtk.VBox();
this.vbox1.Name = "vbox1";
diff --git a/OpenGridServices.Manager/OpenGridServices.Manager/gtk-gui/gui.stetic b/OpenGridServices.Manager/OpenGridServices.Manager/gtk-gui/gui.stetic
index 3908ac4..72586a7 100644
--- a/OpenGridServices.Manager/OpenGridServices.Manager/gtk-gui/gui.stetic
+++ b/OpenGridServices.Manager/OpenGridServices.Manager/gtk-gui/gui.stetic
@@ -165,9 +165,10 @@
- 600
- 800
+ 800
+ 600
Open Grid Services Manager
+ stock:gtk-network Dialog
@@ -465,8 +466,10 @@
ButtonPressMask
Connect to Grid server
+ CenterOnParent
2
False
+ False
--
cgit v1.1