diff options
author | Tedd Hansen | 2007-09-12 13:27:04 +0000 |
---|---|---|
committer | Tedd Hansen | 2007-09-12 13:27:04 +0000 |
commit | a5aedc089671fa326285c590a7bdd6414d2ec5f3 (patch) | |
tree | 55e78716eec7e35c094d89646b0288ec58a9120c | |
parent | GUI also contains option for Stand Alone mode. (diff) | |
download | opensim-SC_OLD-a5aedc089671fa326285c590a7bdd6414d2ec5f3.zip opensim-SC_OLD-a5aedc089671fa326285c590a7bdd6414d2ec5f3.tar.gz opensim-SC_OLD-a5aedc089671fa326285c590a7bdd6414d2ec5f3.tar.bz2 opensim-SC_OLD-a5aedc089671fa326285c590a7bdd6414d2ec5f3.tar.xz |
GUI: Added placeholders + info on what to be done
-rw-r--r-- | OpenSim/Tools/OpenSim.GUI/Main.cs | 7 | ||||
-rw-r--r-- | OpenSim/Tools/OpenSim.GUI/OpenSim.GUI.csproj | 10 | ||||
-rw-r--r-- | OpenSim/Tools/OpenSim.GUI/frmConfiguration.Designer.cs | 61 | ||||
-rw-r--r-- | OpenSim/Tools/OpenSim.GUI/frmConfiguration.cs | 18 | ||||
-rw-r--r-- | OpenSim/Tools/OpenSim.GUI/frmConfiguration.resx | 129 |
5 files changed, 225 insertions, 0 deletions
diff --git a/OpenSim/Tools/OpenSim.GUI/Main.cs b/OpenSim/Tools/OpenSim.GUI/Main.cs index fb2cdae..611ddd9 100644 --- a/OpenSim/Tools/OpenSim.GUI/Main.cs +++ b/OpenSim/Tools/OpenSim.GUI/Main.cs | |||
@@ -92,6 +92,13 @@ namespace OpenSim.GUI | |||
92 | 92 | ||
93 | private void btnStart_Click(object sender, EventArgs e) | 93 | private void btnStart_Click(object sender, EventArgs e) |
94 | { | 94 | { |
95 | |||
96 | // | ||
97 | // THIS PART NEEDS TO BE MOVED TO A SEPARATE THREAD OR A TIMER OF SOME SORT | ||
98 | // should not block on wait | ||
99 | // ALSO - IF SOME SERVICES ARE NOT CONFIGURED, POP UP CONFIGURATION BOX FOR THAT SERVICE! | ||
100 | // | ||
101 | |||
95 | btnStart.Enabled = false; | 102 | btnStart.Enabled = false; |
96 | btnStop.Enabled = false; | 103 | btnStop.Enabled = false; |
97 | 104 | ||
diff --git a/OpenSim/Tools/OpenSim.GUI/OpenSim.GUI.csproj b/OpenSim/Tools/OpenSim.GUI/OpenSim.GUI.csproj index 5228b2b..7ac4290 100644 --- a/OpenSim/Tools/OpenSim.GUI/OpenSim.GUI.csproj +++ b/OpenSim/Tools/OpenSim.GUI/OpenSim.GUI.csproj | |||
@@ -36,6 +36,12 @@ | |||
36 | <Reference Include="System.Xml" /> | 36 | <Reference Include="System.Xml" /> |
37 | </ItemGroup> | 37 | </ItemGroup> |
38 | <ItemGroup> | 38 | <ItemGroup> |
39 | <Compile Include="frmConfiguration.cs"> | ||
40 | <SubType>Form</SubType> | ||
41 | </Compile> | ||
42 | <Compile Include="frmConfiguration.Designer.cs"> | ||
43 | <DependentUpon>frmConfiguration.cs</DependentUpon> | ||
44 | </Compile> | ||
39 | <Compile Include="InputTextBoxControl.cs"> | 45 | <Compile Include="InputTextBoxControl.cs"> |
40 | <SubType>Component</SubType> | 46 | <SubType>Component</SubType> |
41 | </Compile> | 47 | </Compile> |
@@ -50,6 +56,10 @@ | |||
50 | </Compile> | 56 | </Compile> |
51 | <Compile Include="Program.cs" /> | 57 | <Compile Include="Program.cs" /> |
52 | <Compile Include="Properties\AssemblyInfo.cs" /> | 58 | <Compile Include="Properties\AssemblyInfo.cs" /> |
59 | <EmbeddedResource Include="frmConfiguration.resx"> | ||
60 | <SubType>Designer</SubType> | ||
61 | <DependentUpon>frmConfiguration.cs</DependentUpon> | ||
62 | </EmbeddedResource> | ||
53 | <EmbeddedResource Include="Main.resx"> | 63 | <EmbeddedResource Include="Main.resx"> |
54 | <SubType>Designer</SubType> | 64 | <SubType>Designer</SubType> |
55 | <DependentUpon>Main.cs</DependentUpon> | 65 | <DependentUpon>Main.cs</DependentUpon> |
diff --git a/OpenSim/Tools/OpenSim.GUI/frmConfiguration.Designer.cs b/OpenSim/Tools/OpenSim.GUI/frmConfiguration.Designer.cs new file mode 100644 index 0000000..1777fbc --- /dev/null +++ b/OpenSim/Tools/OpenSim.GUI/frmConfiguration.Designer.cs | |||
@@ -0,0 +1,61 @@ | |||
1 | namespace OpenSim.GUI | ||
2 | { | ||
3 | partial class frmConfiguration | ||
4 | { | ||
5 | /// <summary> | ||
6 | /// Required designer variable. | ||
7 | /// </summary> | ||
8 | private System.ComponentModel.IContainer components = null; | ||
9 | |||
10 | /// <summary> | ||
11 | /// Clean up any resources being used. | ||
12 | /// </summary> | ||
13 | /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param> | ||
14 | protected override void Dispose(bool disposing) | ||
15 | { | ||
16 | if (disposing && (components != null)) | ||
17 | { | ||
18 | components.Dispose(); | ||
19 | } | ||
20 | base.Dispose(disposing); | ||
21 | } | ||
22 | |||
23 | #region Windows Form Designer generated code | ||
24 | |||
25 | /// <summary> | ||
26 | /// Required method for Designer support - do not modify | ||
27 | /// the contents of this method with the code editor. | ||
28 | /// </summary> | ||
29 | private void InitializeComponent() | ||
30 | { | ||
31 | System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(frmConfiguration)); | ||
32 | this.textBox1 = new System.Windows.Forms.TextBox(); | ||
33 | this.SuspendLayout(); | ||
34 | // | ||
35 | // textBox1 | ||
36 | // | ||
37 | this.textBox1.Location = new System.Drawing.Point(12, 12); | ||
38 | this.textBox1.Multiline = true; | ||
39 | this.textBox1.Name = "textBox1"; | ||
40 | this.textBox1.Size = new System.Drawing.Size(570, 190); | ||
41 | this.textBox1.TabIndex = 0; | ||
42 | this.textBox1.Text = resources.GetString("textBox1.Text"); | ||
43 | // | ||
44 | // frmConfiguration | ||
45 | // | ||
46 | this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); | ||
47 | this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; | ||
48 | this.ClientSize = new System.Drawing.Size(664, 413); | ||
49 | this.Controls.Add(this.textBox1); | ||
50 | this.Name = "frmConfiguration"; | ||
51 | this.Text = "Configuration"; | ||
52 | this.ResumeLayout(false); | ||
53 | this.PerformLayout(); | ||
54 | |||
55 | } | ||
56 | |||
57 | #endregion | ||
58 | |||
59 | private System.Windows.Forms.TextBox textBox1; | ||
60 | } | ||
61 | } \ No newline at end of file | ||
diff --git a/OpenSim/Tools/OpenSim.GUI/frmConfiguration.cs b/OpenSim/Tools/OpenSim.GUI/frmConfiguration.cs new file mode 100644 index 0000000..9acf305 --- /dev/null +++ b/OpenSim/Tools/OpenSim.GUI/frmConfiguration.cs | |||
@@ -0,0 +1,18 @@ | |||
1 | using System; | ||
2 | using System.Collections.Generic; | ||
3 | using System.ComponentModel; | ||
4 | using System.Data; | ||
5 | using System.Drawing; | ||
6 | using System.Text; | ||
7 | using System.Windows.Forms; | ||
8 | |||
9 | namespace OpenSim.GUI | ||
10 | { | ||
11 | public partial class frmConfiguration : Form | ||
12 | { | ||
13 | public frmConfiguration() | ||
14 | { | ||
15 | InitializeComponent(); | ||
16 | } | ||
17 | } | ||
18 | } \ No newline at end of file | ||
diff --git a/OpenSim/Tools/OpenSim.GUI/frmConfiguration.resx b/OpenSim/Tools/OpenSim.GUI/frmConfiguration.resx new file mode 100644 index 0000000..2002e68 --- /dev/null +++ b/OpenSim/Tools/OpenSim.GUI/frmConfiguration.resx | |||
@@ -0,0 +1,129 @@ | |||
1 | <?xml version="1.0" encoding="utf-8"?> | ||
2 | <root> | ||
3 | <!-- | ||
4 | Microsoft ResX Schema | ||
5 | |||
6 | Version 2.0 | ||
7 | |||
8 | The primary goals of this format is to allow a simple XML format | ||
9 | that is mostly human readable. The generation and parsing of the | ||
10 | various data types are done through the TypeConverter classes | ||
11 | associated with the data types. | ||
12 | |||
13 | Example: | ||
14 | |||
15 | ... ado.net/XML headers & schema ... | ||
16 | <resheader name="resmimetype">text/microsoft-resx</resheader> | ||
17 | <resheader name="version">2.0</resheader> | ||
18 | <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader> | ||
19 | <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader> | ||
20 | <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data> | ||
21 | <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data> | ||
22 | <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64"> | ||
23 | <value>[base64 mime encoded serialized .NET Framework object]</value> | ||
24 | </data> | ||
25 | <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64"> | ||
26 | <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value> | ||
27 | <comment>This is a comment</comment> | ||
28 | </data> | ||
29 | |||
30 | There are any number of "resheader" rows that contain simple | ||
31 | name/value pairs. | ||
32 | |||
33 | Each data row contains a name, and value. The row also contains a | ||
34 | type or mimetype. Type corresponds to a .NET class that support | ||
35 | text/value conversion through the TypeConverter architecture. | ||
36 | Classes that don't support this are serialized and stored with the | ||
37 | mimetype set. | ||
38 | |||
39 | The mimetype is used for serialized objects, and tells the | ||
40 | ResXResourceReader how to depersist the object. This is currently not | ||
41 | extensible. For a given mimetype the value must be set accordingly: | ||
42 | |||
43 | Note - application/x-microsoft.net.object.binary.base64 is the format | ||
44 | that the ResXResourceWriter will generate, however the reader can | ||
45 | read any of the formats listed below. | ||
46 | |||
47 | mimetype: application/x-microsoft.net.object.binary.base64 | ||
48 | value : The object must be serialized with | ||
49 | : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter | ||
50 | : and then encoded with base64 encoding. | ||
51 | |||
52 | mimetype: application/x-microsoft.net.object.soap.base64 | ||
53 | value : The object must be serialized with | ||
54 | : System.Runtime.Serialization.Formatters.Soap.SoapFormatter | ||
55 | : and then encoded with base64 encoding. | ||
56 | |||
57 | mimetype: application/x-microsoft.net.object.bytearray.base64 | ||
58 | value : The object must be serialized into a byte array | ||
59 | : using a System.ComponentModel.TypeConverter | ||
60 | : and then encoded with base64 encoding. | ||
61 | --> | ||
62 | <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata"> | ||
63 | <xsd:import namespace="http://www.w3.org/XML/1998/namespace" /> | ||
64 | <xsd:element name="root" msdata:IsDataSet="true"> | ||
65 | <xsd:complexType> | ||
66 | <xsd:choice maxOccurs="unbounded"> | ||
67 | <xsd:element name="metadata"> | ||
68 | <xsd:complexType> | ||
69 | <xsd:sequence> | ||
70 | <xsd:element name="value" type="xsd:string" minOccurs="0" /> | ||
71 | </xsd:sequence> | ||
72 | <xsd:attribute name="name" use="required" type="xsd:string" /> | ||
73 | <xsd:attribute name="type" type="xsd:string" /> | ||
74 | <xsd:attribute name="mimetype" type="xsd:string" /> | ||
75 | <xsd:attribute ref="xml:space" /> | ||
76 | </xsd:complexType> | ||
77 | </xsd:element> | ||
78 | <xsd:element name="assembly"> | ||
79 | <xsd:complexType> | ||
80 | <xsd:attribute name="alias" type="xsd:string" /> | ||
81 | <xsd:attribute name="name" type="xsd:string" /> | ||
82 | </xsd:complexType> | ||
83 | </xsd:element> | ||
84 | <xsd:element name="data"> | ||
85 | <xsd:complexType> | ||
86 | <xsd:sequence> | ||
87 | <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" /> | ||
88 | <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" /> | ||
89 | </xsd:sequence> | ||
90 | <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" /> | ||
91 | <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" /> | ||
92 | <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" /> | ||
93 | <xsd:attribute ref="xml:space" /> | ||
94 | </xsd:complexType> | ||
95 | </xsd:element> | ||
96 | <xsd:element name="resheader"> | ||
97 | <xsd:complexType> | ||
98 | <xsd:sequence> | ||
99 | <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" /> | ||
100 | </xsd:sequence> | ||
101 | <xsd:attribute name="name" type="xsd:string" use="required" /> | ||
102 | </xsd:complexType> | ||
103 | </xsd:element> | ||
104 | </xsd:choice> | ||
105 | </xsd:complexType> | ||
106 | </xsd:element> | ||
107 | </xsd:schema> | ||
108 | <resheader name="resmimetype"> | ||
109 | <value>text/microsoft-resx</value> | ||
110 | </resheader> | ||
111 | <resheader name="version"> | ||
112 | <value>2.0</value> | ||
113 | </resheader> | ||
114 | <resheader name="reader"> | ||
115 | <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> | ||
116 | </resheader> | ||
117 | <resheader name="writer"> | ||
118 | <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> | ||
119 | </resheader> | ||
120 | <data name="textBox1.Text" xml:space="preserve"> | ||
121 | <value>What I want here: | ||
122 | * Region configuration add/disable/modify) | ||
123 | * OpenSim config: what physics/sql/scriptengine modules | ||
124 | * Configuration for each of the servers | ||
125 | * An option of what parts the server will run: "Stand Alone, Grid region, Grid Server, Custom" | ||
126 | Custom = you can enable/disable one or more services, for example if you only run AssetServer on this machine. | ||
127 | * User manager (add/remove/lockout/modify) -- maybe a separate form for this?</value> | ||
128 | </data> | ||
129 | </root> \ No newline at end of file | ||