* 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)zircon^2
gareth
parent
b213d5b7de
commit
4dc99e419c
|
|
@ -6,6 +6,7 @@ namespace OpenGridServices.Manager
|
|||
{
|
||||
class MainClass
|
||||
{
|
||||
|
||||
public static void Main (string[] args)
|
||||
{
|
||||
Application.Init ();
|
||||
|
|
|
|||
|
|
@ -22,6 +22,7 @@
|
|||
<File name="./AssemblyInfo.cs" subtype="Code" buildaction="Compile" />
|
||||
<File name="./ConnectToGridServerDialog.cs" subtype="Code" buildaction="Compile" />
|
||||
<File name="./gtk-gui/ConnectToGridServerDialog.cs" subtype="Code" buildaction="Compile" />
|
||||
<File name="./Util.cs" subtype="Code" buildaction="Compile" />
|
||||
</Contents>
|
||||
<References>
|
||||
<ProjectReference type="Gac" localcopy="True" refto="System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
|
||||
|
|
|
|||
|
|
@ -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);
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Convert a variable length field (byte array) to a string, with a
|
||||
/// field name prepended to each line of the output
|
||||
/// </summary>
|
||||
/// <remarks>If the byte array has unprintable characters in it, a
|
||||
/// hex dump will be put in the string instead</remarks>
|
||||
/// <param name="bytes">The byte array to convert to a string</param>
|
||||
/// <param name="fieldName">A field name to prepend to each line of output</param>
|
||||
/// <returns>An ASCII string or a string containing a hex dump, minus
|
||||
/// the null terminator</returns>
|
||||
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()
|
||||
{
|
||||
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -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);
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -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";
|
||||
|
|
|
|||
|
|
@ -165,9 +165,10 @@
|
|||
</action>
|
||||
</action-group>
|
||||
<property name="MemberName" />
|
||||
<property name="WidthRequest">600</property>
|
||||
<property name="HeightRequest">800</property>
|
||||
<property name="WidthRequest">800</property>
|
||||
<property name="HeightRequest">600</property>
|
||||
<property name="Title" translatable="yes">Open Grid Services Manager</property>
|
||||
<property name="Icon">stock:gtk-network Dialog</property>
|
||||
<signal name="DeleteEvent" handler="OnDeleteEvent" />
|
||||
<child>
|
||||
<widget class="Gtk.VBox" id="vbox1">
|
||||
|
|
@ -465,8 +466,10 @@
|
|||
<property name="MemberName" />
|
||||
<property name="Events">ButtonPressMask</property>
|
||||
<property name="Title" translatable="yes">Connect to Grid server</property>
|
||||
<property name="WindowPosition">CenterOnParent</property>
|
||||
<property name="Buttons">2</property>
|
||||
<property name="HelpButton">False</property>
|
||||
<property name="HasSeparator">False</property>
|
||||
<child internal-child="VBox">
|
||||
<widget class="Gtk.VBox" id="dialog_VBox">
|
||||
<property name="MemberName" />
|
||||
|
|
|
|||
Loading…
Reference in New Issue