From 6a1b787436cc59043a26a296781e7a7b5ea0c67b Mon Sep 17 00:00:00 2001 From: Jeff Ames Date: Wed, 14 May 2008 05:33:32 +0000 Subject: More formatting cleanup. --- ...idServices.Manager.ConnectToGridServerDialog.cs | 27 ++++-------- .../gtk-gui/OpenGridServices.Manager.MainWindow.cs | 49 ++++------------------ .../OpenGridServices.Manager/gtk-gui/generated.cs | 26 ++++++------ 3 files changed, 29 insertions(+), 73 deletions(-) (limited to 'OpenSim/Grid/Manager/OpenGridServices.Manager/gtk-gui') 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 index d082a3b..a5a4ec8 100644 --- a/OpenSim/Grid/Manager/OpenGridServices.Manager/gtk-gui/OpenGridServices.Manager.ConnectToGridServerDialog.cs +++ b/OpenSim/Grid/Manager/OpenGridServices.Manager/gtk-gui/OpenGridServices.Manager.ConnectToGridServerDialog.cs @@ -35,38 +35,26 @@ // // ------------------------------------------------------------------------------ -namespace OpenGridServices.Manager { - - - public partial class ConnectToGridServerDialog { - +namespace OpenGridServices.Manager +{ + public partial class ConnectToGridServerDialog + { private Gtk.VBox vbox2; - private Gtk.VBox vbox3; - private Gtk.HBox hbox1; - private Gtk.Label label1; - private Gtk.Entry entry1; - private Gtk.HBox hbox2; - private Gtk.Label label2; - private Gtk.Entry entry2; - private Gtk.HBox hbox3; - private Gtk.Label label3; - private Gtk.Entry entry3; - private Gtk.Button button2; - private Gtk.Button button8; - protected virtual void Build() { + protected virtual void Build() + { Stetic.Gui.Initialize(); // Widget OpenGridServices.Manager.ConnectToGridServerDialog this.Events = ((Gdk.EventMask)(256)); @@ -241,7 +229,8 @@ namespace OpenGridServices.Manager { w31.Position = 1; w31.Expand = false; w31.Fill = false; - if ((this.Child != null)) { + if (this.Child != null) + { this.Child.ShowAll(); } this.DefaultWidth = 476; 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 index 9d3cdaf..9707aee 100644 --- a/OpenSim/Grid/Manager/OpenGridServices.Manager/gtk-gui/OpenGridServices.Manager.MainWindow.cs +++ b/OpenSim/Grid/Manager/OpenGridServices.Manager/gtk-gui/OpenGridServices.Manager.MainWindow.cs @@ -35,82 +35,48 @@ // // ------------------------------------------------------------------------------ -namespace OpenGridServices.Manager { - - - public partial class MainWindow { - +namespace OpenGridServices.Manager +{ + public partial class MainWindow + { private Gtk.Action Grid; - private Gtk.Action User; - private Gtk.Action Asset; - private Gtk.Action Region; - private Gtk.Action Services; - private Gtk.Action ConnectToGridserver; - private Gtk.Action RestartWholeGrid; - private Gtk.Action ShutdownWholeGrid; - private Gtk.Action ExitGridManager; - private Gtk.Action ConnectToUserserver; - private Gtk.Action AccountManagment; - private Gtk.Action GlobalNotice; - private Gtk.Action DisableAllLogins; - private Gtk.Action DisableNonGodUsersOnly; - private Gtk.Action ShutdownUserServer; - private Gtk.Action ShutdownGridserverOnly; - private Gtk.Action RestartGridserverOnly; - private Gtk.Action DefaultLocalGridUserserver; - private Gtk.Action CustomUserserver; - private Gtk.Action RemoteGridDefaultUserserver; - private Gtk.Action DisconnectFromGridServer; - private Gtk.Action UploadAsset; - private Gtk.Action AssetManagement; - private Gtk.Action ConnectToAssetServer; - private Gtk.Action ConnectToDefaultAssetServerForGrid; - private Gtk.Action DefaultForLocalGrid; - private Gtk.Action DefaultForRemoteGrid; - private Gtk.Action CustomAssetServer; - private Gtk.VBox vbox1; - private Gtk.MenuBar menubar2; - private Gtk.HBox hbox1; - private Gtk.ScrolledWindow scrolledwindow1; - private Gtk.DrawingArea drawingarea1; - private Gtk.TreeView treeview1; - private Gtk.Statusbar statusbar1; - protected virtual void Build() { + protected virtual void Build() + { Stetic.Gui.Initialize(); // Widget OpenGridServices.Manager.MainWindow Gtk.UIManager w1 = new Gtk.UIManager(); @@ -266,7 +232,8 @@ namespace OpenGridServices.Manager { w10.Expand = false; w10.Fill = false; this.Add(this.vbox1); - if ((this.Child != null)) { + if (this.Child != null) + { this.Child.ShowAll(); } this.DefaultWidth = 800; diff --git a/OpenSim/Grid/Manager/OpenGridServices.Manager/gtk-gui/generated.cs b/OpenSim/Grid/Manager/OpenGridServices.Manager/gtk-gui/generated.cs index b297b16..46dec05 100644 --- a/OpenSim/Grid/Manager/OpenGridServices.Manager/gtk-gui/generated.cs +++ b/OpenSim/Grid/Manager/OpenGridServices.Manager/gtk-gui/generated.cs @@ -35,27 +35,27 @@ // // ------------------------------------------------------------------------------ -namespace Stetic { - - - internal class Gui { - +namespace Stetic +{ + internal class Gui + { private static bool initialized; - internal static void Initialize() { - if ((Stetic.Gui.initialized == false)) { - Stetic.Gui.initialized = true; - } + internal static void Initialize() + { + Stetic.Gui.initialized = true; } } - internal class ActionGroups { - - public static Gtk.ActionGroup GetActionGroup(System.Type type) { + internal class ActionGroups + { + public static Gtk.ActionGroup GetActionGroup(System.Type type) + { return Stetic.ActionGroups.GetActionGroup(type.FullName); } - public static Gtk.ActionGroup GetActionGroup(string name) { + public static Gtk.ActionGroup GetActionGroup(string name) + { return null; } } -- cgit v1.1