diff options
author | Jeff Ames | 2008-05-14 05:33:32 +0000 |
---|---|---|
committer | Jeff Ames | 2008-05-14 05:33:32 +0000 |
commit | 6a1b787436cc59043a26a296781e7a7b5ea0c67b (patch) | |
tree | 10f55a7b0abfdc47f103d40f13f3cae530c13581 /OpenSim/Grid/Manager/OpenGridServices.Manager/gtk-gui | |
parent | Formatting cleanup. (diff) | |
download | opensim-SC_OLD-6a1b787436cc59043a26a296781e7a7b5ea0c67b.zip opensim-SC_OLD-6a1b787436cc59043a26a296781e7a7b5ea0c67b.tar.gz opensim-SC_OLD-6a1b787436cc59043a26a296781e7a7b5ea0c67b.tar.bz2 opensim-SC_OLD-6a1b787436cc59043a26a296781e7a7b5ea0c67b.tar.xz |
More formatting cleanup.
Diffstat (limited to 'OpenSim/Grid/Manager/OpenGridServices.Manager/gtk-gui')
3 files changed, 29 insertions, 73 deletions
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 @@ | |||
35 | // </autogenerated> | 35 | // </autogenerated> |
36 | // ------------------------------------------------------------------------------ | 36 | // ------------------------------------------------------------------------------ |
37 | 37 | ||
38 | namespace OpenGridServices.Manager { | 38 | namespace OpenGridServices.Manager |
39 | 39 | { | |
40 | 40 | public partial class ConnectToGridServerDialog | |
41 | public partial class ConnectToGridServerDialog { | 41 | { |
42 | |||
43 | private Gtk.VBox vbox2; | 42 | private Gtk.VBox vbox2; |
44 | |||
45 | private Gtk.VBox vbox3; | 43 | private Gtk.VBox vbox3; |
46 | |||
47 | private Gtk.HBox hbox1; | 44 | private Gtk.HBox hbox1; |
48 | |||
49 | private Gtk.Label label1; | 45 | private Gtk.Label label1; |
50 | |||
51 | private Gtk.Entry entry1; | 46 | private Gtk.Entry entry1; |
52 | |||
53 | private Gtk.HBox hbox2; | 47 | private Gtk.HBox hbox2; |
54 | |||
55 | private Gtk.Label label2; | 48 | private Gtk.Label label2; |
56 | |||
57 | private Gtk.Entry entry2; | 49 | private Gtk.Entry entry2; |
58 | |||
59 | private Gtk.HBox hbox3; | 50 | private Gtk.HBox hbox3; |
60 | |||
61 | private Gtk.Label label3; | 51 | private Gtk.Label label3; |
62 | |||
63 | private Gtk.Entry entry3; | 52 | private Gtk.Entry entry3; |
64 | |||
65 | private Gtk.Button button2; | 53 | private Gtk.Button button2; |
66 | |||
67 | private Gtk.Button button8; | 54 | private Gtk.Button button8; |
68 | 55 | ||
69 | protected virtual void Build() { | 56 | protected virtual void Build() |
57 | { | ||
70 | Stetic.Gui.Initialize(); | 58 | Stetic.Gui.Initialize(); |
71 | // Widget OpenGridServices.Manager.ConnectToGridServerDialog | 59 | // Widget OpenGridServices.Manager.ConnectToGridServerDialog |
72 | this.Events = ((Gdk.EventMask)(256)); | 60 | this.Events = ((Gdk.EventMask)(256)); |
@@ -241,7 +229,8 @@ namespace OpenGridServices.Manager { | |||
241 | w31.Position = 1; | 229 | w31.Position = 1; |
242 | w31.Expand = false; | 230 | w31.Expand = false; |
243 | w31.Fill = false; | 231 | w31.Fill = false; |
244 | if ((this.Child != null)) { | 232 | if (this.Child != null) |
233 | { | ||
245 | this.Child.ShowAll(); | 234 | this.Child.ShowAll(); |
246 | } | 235 | } |
247 | this.DefaultWidth = 476; | 236 | 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 @@ | |||
35 | // </autogenerated> | 35 | // </autogenerated> |
36 | // ------------------------------------------------------------------------------ | 36 | // ------------------------------------------------------------------------------ |
37 | 37 | ||
38 | namespace OpenGridServices.Manager { | 38 | namespace OpenGridServices.Manager |
39 | 39 | { | |
40 | 40 | public partial class MainWindow | |
41 | public partial class MainWindow { | 41 | { |
42 | |||
43 | private Gtk.Action Grid; | 42 | private Gtk.Action Grid; |
44 | |||
45 | private Gtk.Action User; | 43 | private Gtk.Action User; |
46 | |||
47 | private Gtk.Action Asset; | 44 | private Gtk.Action Asset; |
48 | |||
49 | private Gtk.Action Region; | 45 | private Gtk.Action Region; |
50 | |||
51 | private Gtk.Action Services; | 46 | private Gtk.Action Services; |
52 | |||
53 | private Gtk.Action ConnectToGridserver; | 47 | private Gtk.Action ConnectToGridserver; |
54 | |||
55 | private Gtk.Action RestartWholeGrid; | 48 | private Gtk.Action RestartWholeGrid; |
56 | |||
57 | private Gtk.Action ShutdownWholeGrid; | 49 | private Gtk.Action ShutdownWholeGrid; |
58 | |||
59 | private Gtk.Action ExitGridManager; | 50 | private Gtk.Action ExitGridManager; |
60 | |||
61 | private Gtk.Action ConnectToUserserver; | 51 | private Gtk.Action ConnectToUserserver; |
62 | |||
63 | private Gtk.Action AccountManagment; | 52 | private Gtk.Action AccountManagment; |
64 | |||
65 | private Gtk.Action GlobalNotice; | 53 | private Gtk.Action GlobalNotice; |
66 | |||
67 | private Gtk.Action DisableAllLogins; | 54 | private Gtk.Action DisableAllLogins; |
68 | |||
69 | private Gtk.Action DisableNonGodUsersOnly; | 55 | private Gtk.Action DisableNonGodUsersOnly; |
70 | |||
71 | private Gtk.Action ShutdownUserServer; | 56 | private Gtk.Action ShutdownUserServer; |
72 | |||
73 | private Gtk.Action ShutdownGridserverOnly; | 57 | private Gtk.Action ShutdownGridserverOnly; |
74 | |||
75 | private Gtk.Action RestartGridserverOnly; | 58 | private Gtk.Action RestartGridserverOnly; |
76 | |||
77 | private Gtk.Action DefaultLocalGridUserserver; | 59 | private Gtk.Action DefaultLocalGridUserserver; |
78 | |||
79 | private Gtk.Action CustomUserserver; | 60 | private Gtk.Action CustomUserserver; |
80 | |||
81 | private Gtk.Action RemoteGridDefaultUserserver; | 61 | private Gtk.Action RemoteGridDefaultUserserver; |
82 | |||
83 | private Gtk.Action DisconnectFromGridServer; | 62 | private Gtk.Action DisconnectFromGridServer; |
84 | |||
85 | private Gtk.Action UploadAsset; | 63 | private Gtk.Action UploadAsset; |
86 | |||
87 | private Gtk.Action AssetManagement; | 64 | private Gtk.Action AssetManagement; |
88 | |||
89 | private Gtk.Action ConnectToAssetServer; | 65 | private Gtk.Action ConnectToAssetServer; |
90 | |||
91 | private Gtk.Action ConnectToDefaultAssetServerForGrid; | 66 | private Gtk.Action ConnectToDefaultAssetServerForGrid; |
92 | |||
93 | private Gtk.Action DefaultForLocalGrid; | 67 | private Gtk.Action DefaultForLocalGrid; |
94 | |||
95 | private Gtk.Action DefaultForRemoteGrid; | 68 | private Gtk.Action DefaultForRemoteGrid; |
96 | |||
97 | private Gtk.Action CustomAssetServer; | 69 | private Gtk.Action CustomAssetServer; |
98 | |||
99 | private Gtk.VBox vbox1; | 70 | private Gtk.VBox vbox1; |
100 | |||
101 | private Gtk.MenuBar menubar2; | 71 | private Gtk.MenuBar menubar2; |
102 | |||
103 | private Gtk.HBox hbox1; | 72 | private Gtk.HBox hbox1; |
104 | |||
105 | private Gtk.ScrolledWindow scrolledwindow1; | 73 | private Gtk.ScrolledWindow scrolledwindow1; |
106 | |||
107 | private Gtk.DrawingArea drawingarea1; | 74 | private Gtk.DrawingArea drawingarea1; |
108 | |||
109 | private Gtk.TreeView treeview1; | 75 | private Gtk.TreeView treeview1; |
110 | |||
111 | private Gtk.Statusbar statusbar1; | 76 | private Gtk.Statusbar statusbar1; |
112 | 77 | ||
113 | protected virtual void Build() { | 78 | protected virtual void Build() |
79 | { | ||
114 | Stetic.Gui.Initialize(); | 80 | Stetic.Gui.Initialize(); |
115 | // Widget OpenGridServices.Manager.MainWindow | 81 | // Widget OpenGridServices.Manager.MainWindow |
116 | Gtk.UIManager w1 = new Gtk.UIManager(); | 82 | Gtk.UIManager w1 = new Gtk.UIManager(); |
@@ -266,7 +232,8 @@ namespace OpenGridServices.Manager { | |||
266 | w10.Expand = false; | 232 | w10.Expand = false; |
267 | w10.Fill = false; | 233 | w10.Fill = false; |
268 | this.Add(this.vbox1); | 234 | this.Add(this.vbox1); |
269 | if ((this.Child != null)) { | 235 | if (this.Child != null) |
236 | { | ||
270 | this.Child.ShowAll(); | 237 | this.Child.ShowAll(); |
271 | } | 238 | } |
272 | this.DefaultWidth = 800; | 239 | 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 @@ | |||
35 | // </autogenerated> | 35 | // </autogenerated> |
36 | // ------------------------------------------------------------------------------ | 36 | // ------------------------------------------------------------------------------ |
37 | 37 | ||
38 | namespace Stetic { | 38 | namespace Stetic |
39 | 39 | { | |
40 | 40 | internal class Gui | |
41 | internal class Gui { | 41 | { |
42 | |||
43 | private static bool initialized; | 42 | private static bool initialized; |
44 | 43 | ||
45 | internal static void Initialize() { | 44 | internal static void Initialize() |
46 | if ((Stetic.Gui.initialized == false)) { | 45 | { |
47 | Stetic.Gui.initialized = true; | 46 | Stetic.Gui.initialized = true; |
48 | } | ||
49 | } | 47 | } |
50 | } | 48 | } |
51 | 49 | ||
52 | internal class ActionGroups { | 50 | internal class ActionGroups |
53 | 51 | { | |
54 | public static Gtk.ActionGroup GetActionGroup(System.Type type) { | 52 | public static Gtk.ActionGroup GetActionGroup(System.Type type) |
53 | { | ||
55 | return Stetic.ActionGroups.GetActionGroup(type.FullName); | 54 | return Stetic.ActionGroups.GetActionGroup(type.FullName); |
56 | } | 55 | } |
57 | 56 | ||
58 | public static Gtk.ActionGroup GetActionGroup(string name) { | 57 | public static Gtk.ActionGroup GetActionGroup(string name) |
58 | { | ||
59 | return null; | 59 | return null; |
60 | } | 60 | } |
61 | } | 61 | } |