diff options
author | Jeff Ames | 2008-01-26 10:34:49 +0000 |
---|---|---|
committer | Jeff Ames | 2008-01-26 10:34:49 +0000 |
commit | 20215c3d30fb55bf232bff1b3d6652d82e00b798 (patch) | |
tree | 19fce94014cafb1a235b3874b7bde8bc92767415 /OpenSim | |
parent | Removed ScriptServer.csproj from svn. (diff) | |
download | opensim-SC_OLD-20215c3d30fb55bf232bff1b3d6652d82e00b798.zip opensim-SC_OLD-20215c3d30fb55bf232bff1b3d6652d82e00b798.tar.gz opensim-SC_OLD-20215c3d30fb55bf232bff1b3d6652d82e00b798.tar.bz2 opensim-SC_OLD-20215c3d30fb55bf232bff1b3d6652d82e00b798.tar.xz |
Rewrote svn properties handling script in python. Added more file types.
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Tools/OpenSim.GUI/Main.resx | 270 | ||||
-rw-r--r-- | OpenSim/Tools/OpenSim.GUI/OpenSim.GUI.csproj | 186 | ||||
-rw-r--r-- | OpenSim/Tools/OpenSim.GUI/Properties/Resources.resx | 232 | ||||
-rw-r--r-- | OpenSim/Tools/OpenSim.GUI/Properties/Settings.settings | 14 | ||||
-rw-r--r-- | OpenSim/Tools/OpenSim.GUI/frmConfiguration.resx | 256 | ||||
-rw-r--r-- | OpenSim/Tools/Windows/Installer/OpenSim.nsi | 302 |
6 files changed, 630 insertions, 630 deletions
diff --git a/OpenSim/Tools/OpenSim.GUI/Main.resx b/OpenSim/Tools/OpenSim.GUI/Main.resx index db8eb0a..517179d 100644 --- a/OpenSim/Tools/OpenSim.GUI/Main.resx +++ b/OpenSim/Tools/OpenSim.GUI/Main.resx | |||
@@ -1,135 +1,135 @@ | |||
1 | <?xml version="1.0" encoding="utf-8"?> | 1 | <?xml version="1.0" encoding="utf-8"?> |
2 | <root> | 2 | <root> |
3 | <!-- | 3 | <!-- |
4 | Microsoft ResX Schema | 4 | Microsoft ResX Schema |
5 | 5 | ||
6 | Version 2.0 | 6 | Version 2.0 |
7 | 7 | ||
8 | The primary goals of this format is to allow a simple XML format | 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 | 9 | that is mostly human readable. The generation and parsing of the |
10 | various data types are done through the TypeConverter classes | 10 | various data types are done through the TypeConverter classes |
11 | associated with the data types. | 11 | associated with the data types. |
12 | 12 | ||
13 | Example: | 13 | Example: |
14 | 14 | ||
15 | ... ado.net/XML headers & schema ... | 15 | ... ado.net/XML headers & schema ... |
16 | <resheader name="resmimetype">text/microsoft-resx</resheader> | 16 | <resheader name="resmimetype">text/microsoft-resx</resheader> |
17 | <resheader name="version">2.0</resheader> | 17 | <resheader name="version">2.0</resheader> |
18 | <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader> | 18 | <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader> |
19 | <resheader name="writer">System.Resources.ResXResourceWriter, 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> | 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> | 21 | <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data> |
22 | <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64"> | 22 | <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64"> |
23 | <value>[base64 mime encoded serialized .NET Framework object]</value> | 23 | <value>[base64 mime encoded serialized .NET Framework object]</value> |
24 | </data> | 24 | </data> |
25 | <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64"> | 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> | 26 | <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value> |
27 | <comment>This is a comment</comment> | 27 | <comment>This is a comment</comment> |
28 | </data> | 28 | </data> |
29 | 29 | ||
30 | There are any number of "resheader" rows that contain simple | 30 | There are any number of "resheader" rows that contain simple |
31 | name/value pairs. | 31 | name/value pairs. |
32 | 32 | ||
33 | Each data row contains a name, and value. The row also contains a | 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 | 34 | type or mimetype. Type corresponds to a .NET class that support |
35 | text/value conversion through the TypeConverter architecture. | 35 | text/value conversion through the TypeConverter architecture. |
36 | Classes that don't support this are serialized and stored with the | 36 | Classes that don't support this are serialized and stored with the |
37 | mimetype set. | 37 | mimetype set. |
38 | 38 | ||
39 | The mimetype is used for serialized objects, and tells the | 39 | The mimetype is used for serialized objects, and tells the |
40 | ResXResourceReader how to depersist the object. This is currently not | 40 | ResXResourceReader how to depersist the object. This is currently not |
41 | extensible. For a given mimetype the value must be set accordingly: | 41 | extensible. For a given mimetype the value must be set accordingly: |
42 | 42 | ||
43 | Note - application/x-microsoft.net.object.binary.base64 is the format | 43 | Note - application/x-microsoft.net.object.binary.base64 is the format |
44 | that the ResXResourceWriter will generate, however the reader can | 44 | that the ResXResourceWriter will generate, however the reader can |
45 | read any of the formats listed below. | 45 | read any of the formats listed below. |
46 | 46 | ||
47 | mimetype: application/x-microsoft.net.object.binary.base64 | 47 | mimetype: application/x-microsoft.net.object.binary.base64 |
48 | value : The object must be serialized with | 48 | value : The object must be serialized with |
49 | : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter | 49 | : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter |
50 | : and then encoded with base64 encoding. | 50 | : and then encoded with base64 encoding. |
51 | 51 | ||
52 | mimetype: application/x-microsoft.net.object.soap.base64 | 52 | mimetype: application/x-microsoft.net.object.soap.base64 |
53 | value : The object must be serialized with | 53 | value : The object must be serialized with |
54 | : System.Runtime.Serialization.Formatters.Soap.SoapFormatter | 54 | : System.Runtime.Serialization.Formatters.Soap.SoapFormatter |
55 | : and then encoded with base64 encoding. | 55 | : and then encoded with base64 encoding. |
56 | 56 | ||
57 | mimetype: application/x-microsoft.net.object.bytearray.base64 | 57 | mimetype: application/x-microsoft.net.object.bytearray.base64 |
58 | value : The object must be serialized into a byte array | 58 | value : The object must be serialized into a byte array |
59 | : using a System.ComponentModel.TypeConverter | 59 | : using a System.ComponentModel.TypeConverter |
60 | : and then encoded with base64 encoding. | 60 | : and then encoded with base64 encoding. |
61 | --> | 61 | --> |
62 | <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata"> | 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" /> | 63 | <xsd:import namespace="http://www.w3.org/XML/1998/namespace" /> |
64 | <xsd:element name="root" msdata:IsDataSet="true"> | 64 | <xsd:element name="root" msdata:IsDataSet="true"> |
65 | <xsd:complexType> | 65 | <xsd:complexType> |
66 | <xsd:choice maxOccurs="unbounded"> | 66 | <xsd:choice maxOccurs="unbounded"> |
67 | <xsd:element name="metadata"> | 67 | <xsd:element name="metadata"> |
68 | <xsd:complexType> | 68 | <xsd:complexType> |
69 | <xsd:sequence> | 69 | <xsd:sequence> |
70 | <xsd:element name="value" type="xsd:string" minOccurs="0" /> | 70 | <xsd:element name="value" type="xsd:string" minOccurs="0" /> |
71 | </xsd:sequence> | 71 | </xsd:sequence> |
72 | <xsd:attribute name="name" use="required" type="xsd:string" /> | 72 | <xsd:attribute name="name" use="required" type="xsd:string" /> |
73 | <xsd:attribute name="type" type="xsd:string" /> | 73 | <xsd:attribute name="type" type="xsd:string" /> |
74 | <xsd:attribute name="mimetype" type="xsd:string" /> | 74 | <xsd:attribute name="mimetype" type="xsd:string" /> |
75 | <xsd:attribute ref="xml:space" /> | 75 | <xsd:attribute ref="xml:space" /> |
76 | </xsd:complexType> | 76 | </xsd:complexType> |
77 | </xsd:element> | 77 | </xsd:element> |
78 | <xsd:element name="assembly"> | 78 | <xsd:element name="assembly"> |
79 | <xsd:complexType> | 79 | <xsd:complexType> |
80 | <xsd:attribute name="alias" type="xsd:string" /> | 80 | <xsd:attribute name="alias" type="xsd:string" /> |
81 | <xsd:attribute name="name" type="xsd:string" /> | 81 | <xsd:attribute name="name" type="xsd:string" /> |
82 | </xsd:complexType> | 82 | </xsd:complexType> |
83 | </xsd:element> | 83 | </xsd:element> |
84 | <xsd:element name="data"> | 84 | <xsd:element name="data"> |
85 | <xsd:complexType> | 85 | <xsd:complexType> |
86 | <xsd:sequence> | 86 | <xsd:sequence> |
87 | <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" /> | 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" /> | 88 | <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" /> |
89 | </xsd:sequence> | 89 | </xsd:sequence> |
90 | <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" /> | 90 | <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" /> |
91 | <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" /> | 91 | <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" /> |
92 | <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" /> | 92 | <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" /> |
93 | <xsd:attribute ref="xml:space" /> | 93 | <xsd:attribute ref="xml:space" /> |
94 | </xsd:complexType> | 94 | </xsd:complexType> |
95 | </xsd:element> | 95 | </xsd:element> |
96 | <xsd:element name="resheader"> | 96 | <xsd:element name="resheader"> |
97 | <xsd:complexType> | 97 | <xsd:complexType> |
98 | <xsd:sequence> | 98 | <xsd:sequence> |
99 | <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" /> | 99 | <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" /> |
100 | </xsd:sequence> | 100 | </xsd:sequence> |
101 | <xsd:attribute name="name" type="xsd:string" use="required" /> | 101 | <xsd:attribute name="name" type="xsd:string" use="required" /> |
102 | </xsd:complexType> | 102 | </xsd:complexType> |
103 | </xsd:element> | 103 | </xsd:element> |
104 | </xsd:choice> | 104 | </xsd:choice> |
105 | </xsd:complexType> | 105 | </xsd:complexType> |
106 | </xsd:element> | 106 | </xsd:element> |
107 | </xsd:schema> | 107 | </xsd:schema> |
108 | <resheader name="resmimetype"> | 108 | <resheader name="resmimetype"> |
109 | <value>text/microsoft-resx</value> | 109 | <value>text/microsoft-resx</value> |
110 | </resheader> | 110 | </resheader> |
111 | <resheader name="version"> | 111 | <resheader name="version"> |
112 | <value>2.0</value> | 112 | <value>2.0</value> |
113 | </resheader> | 113 | </resheader> |
114 | <resheader name="reader"> | 114 | <resheader name="reader"> |
115 | <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> | 115 | <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> |
116 | </resheader> | 116 | </resheader> |
117 | <resheader name="writer"> | 117 | <resheader name="writer"> |
118 | <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> | 118 | <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> |
119 | </resheader> | 119 | </resheader> |
120 | <metadata name="menuStrip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"> | 120 | <metadata name="menuStrip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"> |
121 | <value>17, 17</value> | 121 | <value>17, 17</value> |
122 | </metadata> | 122 | </metadata> |
123 | <metadata name="timer1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"> | 123 | <metadata name="timer1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"> |
124 | <value>126, 17</value> | 124 | <value>126, 17</value> |
125 | </metadata> | 125 | </metadata> |
126 | <metadata name="toolTip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"> | 126 | <metadata name="toolTip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"> |
127 | <value>209, 17</value> | 127 | <value>209, 17</value> |
128 | </metadata> | 128 | </metadata> |
129 | <metadata name="toolTip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"> | 129 | <metadata name="toolTip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"> |
130 | <value>209, 17</value> | 130 | <value>209, 17</value> |
131 | </metadata> | 131 | </metadata> |
132 | <metadata name="$this.TrayHeight" type="System.Int32, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> | 132 | <metadata name="$this.TrayHeight" type="System.Int32, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> |
133 | <value>39</value> | 133 | <value>39</value> |
134 | </metadata> | 134 | </metadata> |
135 | </root> | 135 | </root> |
diff --git a/OpenSim/Tools/OpenSim.GUI/OpenSim.GUI.csproj b/OpenSim/Tools/OpenSim.GUI/OpenSim.GUI.csproj index 7ac4290..e722fec 100644 --- a/OpenSim/Tools/OpenSim.GUI/OpenSim.GUI.csproj +++ b/OpenSim/Tools/OpenSim.GUI/OpenSim.GUI.csproj | |||
@@ -1,94 +1,94 @@ | |||
1 | <Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> | 1 | <Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> |
2 | <PropertyGroup> | 2 | <PropertyGroup> |
3 | <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> | 3 | <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> |
4 | <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> | 4 | <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> |
5 | <ProductVersion>8.0.50727</ProductVersion> | 5 | <ProductVersion>8.0.50727</ProductVersion> |
6 | <SchemaVersion>2.0</SchemaVersion> | 6 | <SchemaVersion>2.0</SchemaVersion> |
7 | <ProjectGuid>{78AEEDD5-4DA8-4E05-8D53-F3C5476A0B97}</ProjectGuid> | 7 | <ProjectGuid>{78AEEDD5-4DA8-4E05-8D53-F3C5476A0B97}</ProjectGuid> |
8 | <OutputType>WinExe</OutputType> | 8 | <OutputType>WinExe</OutputType> |
9 | <AppDesignerFolder>Properties</AppDesignerFolder> | 9 | <AppDesignerFolder>Properties</AppDesignerFolder> |
10 | <RootNamespace>OpenSim.GUI</RootNamespace> | 10 | <RootNamespace>OpenSim.GUI</RootNamespace> |
11 | <AssemblyName>OpenSim.GUI</AssemblyName> | 11 | <AssemblyName>OpenSim.GUI</AssemblyName> |
12 | </PropertyGroup> | 12 | </PropertyGroup> |
13 | <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "> | 13 | <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "> |
14 | <DebugSymbols>true</DebugSymbols> | 14 | <DebugSymbols>true</DebugSymbols> |
15 | <DebugType>full</DebugType> | 15 | <DebugType>full</DebugType> |
16 | <Optimize>false</Optimize> | 16 | <Optimize>false</Optimize> |
17 | <OutputPath>..\..\..\bin\</OutputPath> | 17 | <OutputPath>..\..\..\bin\</OutputPath> |
18 | <DefineConstants>DEBUG;TRACE</DefineConstants> | 18 | <DefineConstants>DEBUG;TRACE</DefineConstants> |
19 | <ErrorReport>prompt</ErrorReport> | 19 | <ErrorReport>prompt</ErrorReport> |
20 | <WarningLevel>4</WarningLevel> | 20 | <WarningLevel>4</WarningLevel> |
21 | </PropertyGroup> | 21 | </PropertyGroup> |
22 | <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "> | 22 | <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "> |
23 | <DebugType>pdbonly</DebugType> | 23 | <DebugType>pdbonly</DebugType> |
24 | <Optimize>true</Optimize> | 24 | <Optimize>true</Optimize> |
25 | <OutputPath>bin\Release\</OutputPath> | 25 | <OutputPath>bin\Release\</OutputPath> |
26 | <DefineConstants>TRACE</DefineConstants> | 26 | <DefineConstants>TRACE</DefineConstants> |
27 | <ErrorReport>prompt</ErrorReport> | 27 | <ErrorReport>prompt</ErrorReport> |
28 | <WarningLevel>4</WarningLevel> | 28 | <WarningLevel>4</WarningLevel> |
29 | </PropertyGroup> | 29 | </PropertyGroup> |
30 | <ItemGroup> | 30 | <ItemGroup> |
31 | <Reference Include="System" /> | 31 | <Reference Include="System" /> |
32 | <Reference Include="System.Data" /> | 32 | <Reference Include="System.Data" /> |
33 | <Reference Include="System.Deployment" /> | 33 | <Reference Include="System.Deployment" /> |
34 | <Reference Include="System.Drawing" /> | 34 | <Reference Include="System.Drawing" /> |
35 | <Reference Include="System.Windows.Forms" /> | 35 | <Reference Include="System.Windows.Forms" /> |
36 | <Reference Include="System.Xml" /> | 36 | <Reference Include="System.Xml" /> |
37 | </ItemGroup> | 37 | </ItemGroup> |
38 | <ItemGroup> | 38 | <ItemGroup> |
39 | <Compile Include="frmConfiguration.cs"> | 39 | <Compile Include="frmConfiguration.cs"> |
40 | <SubType>Form</SubType> | 40 | <SubType>Form</SubType> |
41 | </Compile> | 41 | </Compile> |
42 | <Compile Include="frmConfiguration.Designer.cs"> | 42 | <Compile Include="frmConfiguration.Designer.cs"> |
43 | <DependentUpon>frmConfiguration.cs</DependentUpon> | 43 | <DependentUpon>frmConfiguration.cs</DependentUpon> |
44 | </Compile> | 44 | </Compile> |
45 | <Compile Include="InputTextBoxControl.cs"> | 45 | <Compile Include="InputTextBoxControl.cs"> |
46 | <SubType>Component</SubType> | 46 | <SubType>Component</SubType> |
47 | </Compile> | 47 | </Compile> |
48 | <Compile Include="Main.cs"> | 48 | <Compile Include="Main.cs"> |
49 | <SubType>Form</SubType> | 49 | <SubType>Form</SubType> |
50 | </Compile> | 50 | </Compile> |
51 | <Compile Include="Main.Designer.cs"> | 51 | <Compile Include="Main.Designer.cs"> |
52 | <DependentUpon>Main.cs</DependentUpon> | 52 | <DependentUpon>Main.cs</DependentUpon> |
53 | </Compile> | 53 | </Compile> |
54 | <Compile Include="ProcessManager.cs"> | 54 | <Compile Include="ProcessManager.cs"> |
55 | <SubType>Component</SubType> | 55 | <SubType>Component</SubType> |
56 | </Compile> | 56 | </Compile> |
57 | <Compile Include="Program.cs" /> | 57 | <Compile Include="Program.cs" /> |
58 | <Compile Include="Properties\AssemblyInfo.cs" /> | 58 | <Compile Include="Properties\AssemblyInfo.cs" /> |
59 | <EmbeddedResource Include="frmConfiguration.resx"> | 59 | <EmbeddedResource Include="frmConfiguration.resx"> |
60 | <SubType>Designer</SubType> | 60 | <SubType>Designer</SubType> |
61 | <DependentUpon>frmConfiguration.cs</DependentUpon> | 61 | <DependentUpon>frmConfiguration.cs</DependentUpon> |
62 | </EmbeddedResource> | 62 | </EmbeddedResource> |
63 | <EmbeddedResource Include="Main.resx"> | 63 | <EmbeddedResource Include="Main.resx"> |
64 | <SubType>Designer</SubType> | 64 | <SubType>Designer</SubType> |
65 | <DependentUpon>Main.cs</DependentUpon> | 65 | <DependentUpon>Main.cs</DependentUpon> |
66 | </EmbeddedResource> | 66 | </EmbeddedResource> |
67 | <EmbeddedResource Include="Properties\Resources.resx"> | 67 | <EmbeddedResource Include="Properties\Resources.resx"> |
68 | <Generator>ResXFileCodeGenerator</Generator> | 68 | <Generator>ResXFileCodeGenerator</Generator> |
69 | <LastGenOutput>Resources.Designer.cs</LastGenOutput> | 69 | <LastGenOutput>Resources.Designer.cs</LastGenOutput> |
70 | <SubType>Designer</SubType> | 70 | <SubType>Designer</SubType> |
71 | </EmbeddedResource> | 71 | </EmbeddedResource> |
72 | <Compile Include="Properties\Resources.Designer.cs"> | 72 | <Compile Include="Properties\Resources.Designer.cs"> |
73 | <AutoGen>True</AutoGen> | 73 | <AutoGen>True</AutoGen> |
74 | <DependentUpon>Resources.resx</DependentUpon> | 74 | <DependentUpon>Resources.resx</DependentUpon> |
75 | </Compile> | 75 | </Compile> |
76 | <None Include="Properties\Settings.settings"> | 76 | <None Include="Properties\Settings.settings"> |
77 | <Generator>SettingsSingleFileGenerator</Generator> | 77 | <Generator>SettingsSingleFileGenerator</Generator> |
78 | <LastGenOutput>Settings.Designer.cs</LastGenOutput> | 78 | <LastGenOutput>Settings.Designer.cs</LastGenOutput> |
79 | </None> | 79 | </None> |
80 | <Compile Include="Properties\Settings.Designer.cs"> | 80 | <Compile Include="Properties\Settings.Designer.cs"> |
81 | <AutoGen>True</AutoGen> | 81 | <AutoGen>True</AutoGen> |
82 | <DependentUpon>Settings.settings</DependentUpon> | 82 | <DependentUpon>Settings.settings</DependentUpon> |
83 | <DesignTimeSharedInput>True</DesignTimeSharedInput> | 83 | <DesignTimeSharedInput>True</DesignTimeSharedInput> |
84 | </Compile> | 84 | </Compile> |
85 | </ItemGroup> | 85 | </ItemGroup> |
86 | <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" /> | 86 | <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" /> |
87 | <!-- To modify your build process, add your task inside one of the targets below and uncomment it. | 87 | <!-- To modify your build process, add your task inside one of the targets below and uncomment it. |
88 | Other similar extension points exist, see Microsoft.Common.targets. | 88 | Other similar extension points exist, see Microsoft.Common.targets. |
89 | <Target Name="BeforeBuild"> | 89 | <Target Name="BeforeBuild"> |
90 | </Target> | 90 | </Target> |
91 | <Target Name="AfterBuild"> | 91 | <Target Name="AfterBuild"> |
92 | </Target> | 92 | </Target> |
93 | --> | 93 | --> |
94 | </Project> \ No newline at end of file | 94 | </Project> \ No newline at end of file |
diff --git a/OpenSim/Tools/OpenSim.GUI/Properties/Resources.resx b/OpenSim/Tools/OpenSim.GUI/Properties/Resources.resx index ffecec8..af7dbeb 100644 --- a/OpenSim/Tools/OpenSim.GUI/Properties/Resources.resx +++ b/OpenSim/Tools/OpenSim.GUI/Properties/Resources.resx | |||
@@ -1,117 +1,117 @@ | |||
1 | <?xml version="1.0" encoding="utf-8"?> | 1 | <?xml version="1.0" encoding="utf-8"?> |
2 | <root> | 2 | <root> |
3 | <!-- | 3 | <!-- |
4 | Microsoft ResX Schema | 4 | Microsoft ResX Schema |
5 | 5 | ||
6 | Version 2.0 | 6 | Version 2.0 |
7 | 7 | ||
8 | The primary goals of this format is to allow a simple XML format | 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 | 9 | that is mostly human readable. The generation and parsing of the |
10 | various data types are done through the TypeConverter classes | 10 | various data types are done through the TypeConverter classes |
11 | associated with the data types. | 11 | associated with the data types. |
12 | 12 | ||
13 | Example: | 13 | Example: |
14 | 14 | ||
15 | ... ado.net/XML headers & schema ... | 15 | ... ado.net/XML headers & schema ... |
16 | <resheader name="resmimetype">text/microsoft-resx</resheader> | 16 | <resheader name="resmimetype">text/microsoft-resx</resheader> |
17 | <resheader name="version">2.0</resheader> | 17 | <resheader name="version">2.0</resheader> |
18 | <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader> | 18 | <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader> |
19 | <resheader name="writer">System.Resources.ResXResourceWriter, 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> | 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> | 21 | <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data> |
22 | <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64"> | 22 | <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64"> |
23 | <value>[base64 mime encoded serialized .NET Framework object]</value> | 23 | <value>[base64 mime encoded serialized .NET Framework object]</value> |
24 | </data> | 24 | </data> |
25 | <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64"> | 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> | 26 | <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value> |
27 | <comment>This is a comment</comment> | 27 | <comment>This is a comment</comment> |
28 | </data> | 28 | </data> |
29 | 29 | ||
30 | There are any number of "resheader" rows that contain simple | 30 | There are any number of "resheader" rows that contain simple |
31 | name/value pairs. | 31 | name/value pairs. |
32 | 32 | ||
33 | Each data row contains a name, and value. The row also contains a | 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 | 34 | type or mimetype. Type corresponds to a .NET class that support |
35 | text/value conversion through the TypeConverter architecture. | 35 | text/value conversion through the TypeConverter architecture. |
36 | Classes that don't support this are serialized and stored with the | 36 | Classes that don't support this are serialized and stored with the |
37 | mimetype set. | 37 | mimetype set. |
38 | 38 | ||
39 | The mimetype is used for serialized objects, and tells the | 39 | The mimetype is used for serialized objects, and tells the |
40 | ResXResourceReader how to depersist the object. This is currently not | 40 | ResXResourceReader how to depersist the object. This is currently not |
41 | extensible. For a given mimetype the value must be set accordingly: | 41 | extensible. For a given mimetype the value must be set accordingly: |
42 | 42 | ||
43 | Note - application/x-microsoft.net.object.binary.base64 is the format | 43 | Note - application/x-microsoft.net.object.binary.base64 is the format |
44 | that the ResXResourceWriter will generate, however the reader can | 44 | that the ResXResourceWriter will generate, however the reader can |
45 | read any of the formats listed below. | 45 | read any of the formats listed below. |
46 | 46 | ||
47 | mimetype: application/x-microsoft.net.object.binary.base64 | 47 | mimetype: application/x-microsoft.net.object.binary.base64 |
48 | value : The object must be serialized with | 48 | value : The object must be serialized with |
49 | : System.Serialization.Formatters.Binary.BinaryFormatter | 49 | : System.Serialization.Formatters.Binary.BinaryFormatter |
50 | : and then encoded with base64 encoding. | 50 | : and then encoded with base64 encoding. |
51 | 51 | ||
52 | mimetype: application/x-microsoft.net.object.soap.base64 | 52 | mimetype: application/x-microsoft.net.object.soap.base64 |
53 | value : The object must be serialized with | 53 | value : The object must be serialized with |
54 | : System.Runtime.Serialization.Formatters.Soap.SoapFormatter | 54 | : System.Runtime.Serialization.Formatters.Soap.SoapFormatter |
55 | : and then encoded with base64 encoding. | 55 | : and then encoded with base64 encoding. |
56 | 56 | ||
57 | mimetype: application/x-microsoft.net.object.bytearray.base64 | 57 | mimetype: application/x-microsoft.net.object.bytearray.base64 |
58 | value : The object must be serialized into a byte array | 58 | value : The object must be serialized into a byte array |
59 | : using a System.ComponentModel.TypeConverter | 59 | : using a System.ComponentModel.TypeConverter |
60 | : and then encoded with base64 encoding. | 60 | : and then encoded with base64 encoding. |
61 | --> | 61 | --> |
62 | <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata"> | 62 | <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata"> |
63 | <xsd:element name="root" msdata:IsDataSet="true"> | 63 | <xsd:element name="root" msdata:IsDataSet="true"> |
64 | <xsd:complexType> | 64 | <xsd:complexType> |
65 | <xsd:choice maxOccurs="unbounded"> | 65 | <xsd:choice maxOccurs="unbounded"> |
66 | <xsd:element name="metadata"> | 66 | <xsd:element name="metadata"> |
67 | <xsd:complexType> | 67 | <xsd:complexType> |
68 | <xsd:sequence> | 68 | <xsd:sequence> |
69 | <xsd:element name="value" type="xsd:string" minOccurs="0" /> | 69 | <xsd:element name="value" type="xsd:string" minOccurs="0" /> |
70 | </xsd:sequence> | 70 | </xsd:sequence> |
71 | <xsd:attribute name="name" type="xsd:string" /> | 71 | <xsd:attribute name="name" type="xsd:string" /> |
72 | <xsd:attribute name="type" type="xsd:string" /> | 72 | <xsd:attribute name="type" type="xsd:string" /> |
73 | <xsd:attribute name="mimetype" type="xsd:string" /> | 73 | <xsd:attribute name="mimetype" type="xsd:string" /> |
74 | </xsd:complexType> | 74 | </xsd:complexType> |
75 | </xsd:element> | 75 | </xsd:element> |
76 | <xsd:element name="assembly"> | 76 | <xsd:element name="assembly"> |
77 | <xsd:complexType> | 77 | <xsd:complexType> |
78 | <xsd:attribute name="alias" type="xsd:string" /> | 78 | <xsd:attribute name="alias" type="xsd:string" /> |
79 | <xsd:attribute name="name" type="xsd:string" /> | 79 | <xsd:attribute name="name" type="xsd:string" /> |
80 | </xsd:complexType> | 80 | </xsd:complexType> |
81 | </xsd:element> | 81 | </xsd:element> |
82 | <xsd:element name="data"> | 82 | <xsd:element name="data"> |
83 | <xsd:complexType> | 83 | <xsd:complexType> |
84 | <xsd:sequence> | 84 | <xsd:sequence> |
85 | <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" /> | 85 | <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" /> |
86 | <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" /> | 86 | <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" /> |
87 | </xsd:sequence> | 87 | </xsd:sequence> |
88 | <xsd:attribute name="name" type="xsd:string" msdata:Ordinal="1" /> | 88 | <xsd:attribute name="name" type="xsd:string" msdata:Ordinal="1" /> |
89 | <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" /> | 89 | <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" /> |
90 | <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" /> | 90 | <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" /> |
91 | </xsd:complexType> | 91 | </xsd:complexType> |
92 | </xsd:element> | 92 | </xsd:element> |
93 | <xsd:element name="resheader"> | 93 | <xsd:element name="resheader"> |
94 | <xsd:complexType> | 94 | <xsd:complexType> |
95 | <xsd:sequence> | 95 | <xsd:sequence> |
96 | <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" /> | 96 | <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" /> |
97 | </xsd:sequence> | 97 | </xsd:sequence> |
98 | <xsd:attribute name="name" type="xsd:string" use="required" /> | 98 | <xsd:attribute name="name" type="xsd:string" use="required" /> |
99 | </xsd:complexType> | 99 | </xsd:complexType> |
100 | </xsd:element> | 100 | </xsd:element> |
101 | </xsd:choice> | 101 | </xsd:choice> |
102 | </xsd:complexType> | 102 | </xsd:complexType> |
103 | </xsd:element> | 103 | </xsd:element> |
104 | </xsd:schema> | 104 | </xsd:schema> |
105 | <resheader name="resmimetype"> | 105 | <resheader name="resmimetype"> |
106 | <value>text/microsoft-resx</value> | 106 | <value>text/microsoft-resx</value> |
107 | </resheader> | 107 | </resheader> |
108 | <resheader name="version"> | 108 | <resheader name="version"> |
109 | <value>2.0</value> | 109 | <value>2.0</value> |
110 | </resheader> | 110 | </resheader> |
111 | <resheader name="reader"> | 111 | <resheader name="reader"> |
112 | <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> | 112 | <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> |
113 | </resheader> | 113 | </resheader> |
114 | <resheader name="writer"> | 114 | <resheader name="writer"> |
115 | <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> | 115 | <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> |
116 | </resheader> | 116 | </resheader> |
117 | </root> \ No newline at end of file | 117 | </root> \ No newline at end of file |
diff --git a/OpenSim/Tools/OpenSim.GUI/Properties/Settings.settings b/OpenSim/Tools/OpenSim.GUI/Properties/Settings.settings index abf36c5..3964565 100644 --- a/OpenSim/Tools/OpenSim.GUI/Properties/Settings.settings +++ b/OpenSim/Tools/OpenSim.GUI/Properties/Settings.settings | |||
@@ -1,7 +1,7 @@ | |||
1 | <?xml version='1.0' encoding='utf-8'?> | 1 | <?xml version='1.0' encoding='utf-8'?> |
2 | <SettingsFile xmlns="http://schemas.microsoft.com/VisualStudio/2004/01/settings" CurrentProfile="(Default)"> | 2 | <SettingsFile xmlns="http://schemas.microsoft.com/VisualStudio/2004/01/settings" CurrentProfile="(Default)"> |
3 | <Profiles> | 3 | <Profiles> |
4 | <Profile Name="(Default)" /> | 4 | <Profile Name="(Default)" /> |
5 | </Profiles> | 5 | </Profiles> |
6 | <Settings /> | 6 | <Settings /> |
7 | </SettingsFile> | 7 | </SettingsFile> |
diff --git a/OpenSim/Tools/OpenSim.GUI/frmConfiguration.resx b/OpenSim/Tools/OpenSim.GUI/frmConfiguration.resx index 2002e68..084547c 100644 --- a/OpenSim/Tools/OpenSim.GUI/frmConfiguration.resx +++ b/OpenSim/Tools/OpenSim.GUI/frmConfiguration.resx | |||
@@ -1,129 +1,129 @@ | |||
1 | <?xml version="1.0" encoding="utf-8"?> | 1 | <?xml version="1.0" encoding="utf-8"?> |
2 | <root> | 2 | <root> |
3 | <!-- | 3 | <!-- |
4 | Microsoft ResX Schema | 4 | Microsoft ResX Schema |
5 | 5 | ||
6 | Version 2.0 | 6 | Version 2.0 |
7 | 7 | ||
8 | The primary goals of this format is to allow a simple XML format | 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 | 9 | that is mostly human readable. The generation and parsing of the |
10 | various data types are done through the TypeConverter classes | 10 | various data types are done through the TypeConverter classes |
11 | associated with the data types. | 11 | associated with the data types. |
12 | 12 | ||
13 | Example: | 13 | Example: |
14 | 14 | ||
15 | ... ado.net/XML headers & schema ... | 15 | ... ado.net/XML headers & schema ... |
16 | <resheader name="resmimetype">text/microsoft-resx</resheader> | 16 | <resheader name="resmimetype">text/microsoft-resx</resheader> |
17 | <resheader name="version">2.0</resheader> | 17 | <resheader name="version">2.0</resheader> |
18 | <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader> | 18 | <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader> |
19 | <resheader name="writer">System.Resources.ResXResourceWriter, 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> | 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> | 21 | <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data> |
22 | <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64"> | 22 | <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64"> |
23 | <value>[base64 mime encoded serialized .NET Framework object]</value> | 23 | <value>[base64 mime encoded serialized .NET Framework object]</value> |
24 | </data> | 24 | </data> |
25 | <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64"> | 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> | 26 | <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value> |
27 | <comment>This is a comment</comment> | 27 | <comment>This is a comment</comment> |
28 | </data> | 28 | </data> |
29 | 29 | ||
30 | There are any number of "resheader" rows that contain simple | 30 | There are any number of "resheader" rows that contain simple |
31 | name/value pairs. | 31 | name/value pairs. |
32 | 32 | ||
33 | Each data row contains a name, and value. The row also contains a | 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 | 34 | type or mimetype. Type corresponds to a .NET class that support |
35 | text/value conversion through the TypeConverter architecture. | 35 | text/value conversion through the TypeConverter architecture. |
36 | Classes that don't support this are serialized and stored with the | 36 | Classes that don't support this are serialized and stored with the |
37 | mimetype set. | 37 | mimetype set. |
38 | 38 | ||
39 | The mimetype is used for serialized objects, and tells the | 39 | The mimetype is used for serialized objects, and tells the |
40 | ResXResourceReader how to depersist the object. This is currently not | 40 | ResXResourceReader how to depersist the object. This is currently not |
41 | extensible. For a given mimetype the value must be set accordingly: | 41 | extensible. For a given mimetype the value must be set accordingly: |
42 | 42 | ||
43 | Note - application/x-microsoft.net.object.binary.base64 is the format | 43 | Note - application/x-microsoft.net.object.binary.base64 is the format |
44 | that the ResXResourceWriter will generate, however the reader can | 44 | that the ResXResourceWriter will generate, however the reader can |
45 | read any of the formats listed below. | 45 | read any of the formats listed below. |
46 | 46 | ||
47 | mimetype: application/x-microsoft.net.object.binary.base64 | 47 | mimetype: application/x-microsoft.net.object.binary.base64 |
48 | value : The object must be serialized with | 48 | value : The object must be serialized with |
49 | : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter | 49 | : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter |
50 | : and then encoded with base64 encoding. | 50 | : and then encoded with base64 encoding. |
51 | 51 | ||
52 | mimetype: application/x-microsoft.net.object.soap.base64 | 52 | mimetype: application/x-microsoft.net.object.soap.base64 |
53 | value : The object must be serialized with | 53 | value : The object must be serialized with |
54 | : System.Runtime.Serialization.Formatters.Soap.SoapFormatter | 54 | : System.Runtime.Serialization.Formatters.Soap.SoapFormatter |
55 | : and then encoded with base64 encoding. | 55 | : and then encoded with base64 encoding. |
56 | 56 | ||
57 | mimetype: application/x-microsoft.net.object.bytearray.base64 | 57 | mimetype: application/x-microsoft.net.object.bytearray.base64 |
58 | value : The object must be serialized into a byte array | 58 | value : The object must be serialized into a byte array |
59 | : using a System.ComponentModel.TypeConverter | 59 | : using a System.ComponentModel.TypeConverter |
60 | : and then encoded with base64 encoding. | 60 | : and then encoded with base64 encoding. |
61 | --> | 61 | --> |
62 | <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata"> | 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" /> | 63 | <xsd:import namespace="http://www.w3.org/XML/1998/namespace" /> |
64 | <xsd:element name="root" msdata:IsDataSet="true"> | 64 | <xsd:element name="root" msdata:IsDataSet="true"> |
65 | <xsd:complexType> | 65 | <xsd:complexType> |
66 | <xsd:choice maxOccurs="unbounded"> | 66 | <xsd:choice maxOccurs="unbounded"> |
67 | <xsd:element name="metadata"> | 67 | <xsd:element name="metadata"> |
68 | <xsd:complexType> | 68 | <xsd:complexType> |
69 | <xsd:sequence> | 69 | <xsd:sequence> |
70 | <xsd:element name="value" type="xsd:string" minOccurs="0" /> | 70 | <xsd:element name="value" type="xsd:string" minOccurs="0" /> |
71 | </xsd:sequence> | 71 | </xsd:sequence> |
72 | <xsd:attribute name="name" use="required" type="xsd:string" /> | 72 | <xsd:attribute name="name" use="required" type="xsd:string" /> |
73 | <xsd:attribute name="type" type="xsd:string" /> | 73 | <xsd:attribute name="type" type="xsd:string" /> |
74 | <xsd:attribute name="mimetype" type="xsd:string" /> | 74 | <xsd:attribute name="mimetype" type="xsd:string" /> |
75 | <xsd:attribute ref="xml:space" /> | 75 | <xsd:attribute ref="xml:space" /> |
76 | </xsd:complexType> | 76 | </xsd:complexType> |
77 | </xsd:element> | 77 | </xsd:element> |
78 | <xsd:element name="assembly"> | 78 | <xsd:element name="assembly"> |
79 | <xsd:complexType> | 79 | <xsd:complexType> |
80 | <xsd:attribute name="alias" type="xsd:string" /> | 80 | <xsd:attribute name="alias" type="xsd:string" /> |
81 | <xsd:attribute name="name" type="xsd:string" /> | 81 | <xsd:attribute name="name" type="xsd:string" /> |
82 | </xsd:complexType> | 82 | </xsd:complexType> |
83 | </xsd:element> | 83 | </xsd:element> |
84 | <xsd:element name="data"> | 84 | <xsd:element name="data"> |
85 | <xsd:complexType> | 85 | <xsd:complexType> |
86 | <xsd:sequence> | 86 | <xsd:sequence> |
87 | <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" /> | 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" /> | 88 | <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" /> |
89 | </xsd:sequence> | 89 | </xsd:sequence> |
90 | <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" /> | 90 | <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" /> |
91 | <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" /> | 91 | <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" /> |
92 | <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" /> | 92 | <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" /> |
93 | <xsd:attribute ref="xml:space" /> | 93 | <xsd:attribute ref="xml:space" /> |
94 | </xsd:complexType> | 94 | </xsd:complexType> |
95 | </xsd:element> | 95 | </xsd:element> |
96 | <xsd:element name="resheader"> | 96 | <xsd:element name="resheader"> |
97 | <xsd:complexType> | 97 | <xsd:complexType> |
98 | <xsd:sequence> | 98 | <xsd:sequence> |
99 | <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" /> | 99 | <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" /> |
100 | </xsd:sequence> | 100 | </xsd:sequence> |
101 | <xsd:attribute name="name" type="xsd:string" use="required" /> | 101 | <xsd:attribute name="name" type="xsd:string" use="required" /> |
102 | </xsd:complexType> | 102 | </xsd:complexType> |
103 | </xsd:element> | 103 | </xsd:element> |
104 | </xsd:choice> | 104 | </xsd:choice> |
105 | </xsd:complexType> | 105 | </xsd:complexType> |
106 | </xsd:element> | 106 | </xsd:element> |
107 | </xsd:schema> | 107 | </xsd:schema> |
108 | <resheader name="resmimetype"> | 108 | <resheader name="resmimetype"> |
109 | <value>text/microsoft-resx</value> | 109 | <value>text/microsoft-resx</value> |
110 | </resheader> | 110 | </resheader> |
111 | <resheader name="version"> | 111 | <resheader name="version"> |
112 | <value>2.0</value> | 112 | <value>2.0</value> |
113 | </resheader> | 113 | </resheader> |
114 | <resheader name="reader"> | 114 | <resheader name="reader"> |
115 | <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> | 115 | <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> |
116 | </resheader> | 116 | </resheader> |
117 | <resheader name="writer"> | 117 | <resheader name="writer"> |
118 | <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> | 118 | <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> |
119 | </resheader> | 119 | </resheader> |
120 | <data name="textBox1.Text" xml:space="preserve"> | 120 | <data name="textBox1.Text" xml:space="preserve"> |
121 | <value>What I want here: | 121 | <value>What I want here: |
122 | * Region configuration add/disable/modify) | 122 | * Region configuration add/disable/modify) |
123 | * OpenSim config: what physics/sql/scriptengine modules | 123 | * OpenSim config: what physics/sql/scriptengine modules |
124 | * Configuration for each of the servers | 124 | * Configuration for each of the servers |
125 | * An option of what parts the server will run: "Stand Alone, Grid region, Grid Server, Custom" | 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. | 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> | 127 | * User manager (add/remove/lockout/modify) -- maybe a separate form for this?</value> |
128 | </data> | 128 | </data> |
129 | </root> \ No newline at end of file | 129 | </root> \ No newline at end of file |
diff --git a/OpenSim/Tools/Windows/Installer/OpenSim.nsi b/OpenSim/Tools/Windows/Installer/OpenSim.nsi index d1df7ba..25f33d1 100644 --- a/OpenSim/Tools/Windows/Installer/OpenSim.nsi +++ b/OpenSim/Tools/Windows/Installer/OpenSim.nsi | |||
@@ -1,151 +1,151 @@ | |||
1 | !include "MUI.nsh" | 1 | !include "MUI.nsh" |
2 | 2 | ||
3 | Name "OpenSim" | 3 | Name "OpenSim" |
4 | OutFile "OpenSim Setup 0.4.exe" | 4 | OutFile "OpenSim Setup 0.4.exe" |
5 | 5 | ||
6 | CRCCheck On | 6 | CRCCheck On |
7 | 7 | ||
8 | InstallDir "$PROGRAMFILES\OpenSim" | 8 | InstallDir "$PROGRAMFILES\OpenSim" |
9 | InstallDirRegKey HKCU "Software\OpenSim" "" | 9 | InstallDirRegKey HKCU "Software\OpenSim" "" |
10 | 10 | ||
11 | ;Vista redirects $SMPROGRAMS to all users without this | 11 | ;Vista redirects $SMPROGRAMS to all users without this |
12 | RequestExecutionLevel admin | 12 | RequestExecutionLevel admin |
13 | 13 | ||
14 | Var MUI_TEMP | 14 | Var MUI_TEMP |
15 | Var STARTMENU_FOLDER | 15 | Var STARTMENU_FOLDER |
16 | 16 | ||
17 | !define MUI_LANGDLL_REGISTRY_ROOT "HKCU" | 17 | !define MUI_LANGDLL_REGISTRY_ROOT "HKCU" |
18 | !define MUI_LANGDLL_REGISTRY_KEY "Software\OpenSim" | 18 | !define MUI_LANGDLL_REGISTRY_KEY "Software\OpenSim" |
19 | !define MUI_LANGDLL_REGISTRY_VALUENAME "Installer Language" | 19 | !define MUI_LANGDLL_REGISTRY_VALUENAME "Installer Language" |
20 | 20 | ||
21 | !define MUI_ABORTWARNING | 21 | !define MUI_ABORTWARNING |
22 | 22 | ||
23 | !insertmacro MUI_PAGE_WELCOME | 23 | !insertmacro MUI_PAGE_WELCOME |
24 | !insertmacro MUI_PAGE_LICENSE "LICENSE.txt" | 24 | !insertmacro MUI_PAGE_LICENSE "LICENSE.txt" |
25 | !insertmacro MUI_PAGE_DIRECTORY | 25 | !insertmacro MUI_PAGE_DIRECTORY |
26 | 26 | ||
27 | !define MUI_STARTMENUPAGE_REGISTRY_ROOT "HKCU" | 27 | !define MUI_STARTMENUPAGE_REGISTRY_ROOT "HKCU" |
28 | !define MUI_STARTMENUPAGE_REGISTRY_KEY "Software\OpenSim" | 28 | !define MUI_STARTMENUPAGE_REGISTRY_KEY "Software\OpenSim" |
29 | !define MUI_STARTMENUPAGE_REGISTRY_VALUENAME "Start Menu Folder" | 29 | !define MUI_STARTMENUPAGE_REGISTRY_VALUENAME "Start Menu Folder" |
30 | 30 | ||
31 | !insertmacro MUI_PAGE_STARTMENU Application $STARTMENU_FOLDER | 31 | !insertmacro MUI_PAGE_STARTMENU Application $STARTMENU_FOLDER |
32 | 32 | ||
33 | !insertmacro MUI_PAGE_INSTFILES | 33 | !insertmacro MUI_PAGE_INSTFILES |
34 | !insertmacro MUI_PAGE_FINISH | 34 | !insertmacro MUI_PAGE_FINISH |
35 | 35 | ||
36 | !insertmacro MUI_UNPAGE_WELCOME | 36 | !insertmacro MUI_UNPAGE_WELCOME |
37 | !insertmacro MUI_UNPAGE_CONFIRM | 37 | !insertmacro MUI_UNPAGE_CONFIRM |
38 | !insertmacro MUI_UNPAGE_INSTFILES | 38 | !insertmacro MUI_UNPAGE_INSTFILES |
39 | !insertmacro MUI_UNPAGE_FINISH | 39 | !insertmacro MUI_UNPAGE_FINISH |
40 | 40 | ||
41 | !insertmacro MUI_LANGUAGE "English" | 41 | !insertmacro MUI_LANGUAGE "English" |
42 | !insertmacro MUI_LANGUAGE "French" | 42 | !insertmacro MUI_LANGUAGE "French" |
43 | !insertmacro MUI_LANGUAGE "German" | 43 | !insertmacro MUI_LANGUAGE "German" |
44 | !insertmacro MUI_LANGUAGE "Spanish" | 44 | !insertmacro MUI_LANGUAGE "Spanish" |
45 | !insertmacro MUI_LANGUAGE "SpanishInternational" | 45 | !insertmacro MUI_LANGUAGE "SpanishInternational" |
46 | !insertmacro MUI_LANGUAGE "SimpChinese" | 46 | !insertmacro MUI_LANGUAGE "SimpChinese" |
47 | !insertmacro MUI_LANGUAGE "TradChinese" | 47 | !insertmacro MUI_LANGUAGE "TradChinese" |
48 | !insertmacro MUI_LANGUAGE "Japanese" | 48 | !insertmacro MUI_LANGUAGE "Japanese" |
49 | !insertmacro MUI_LANGUAGE "Korean" | 49 | !insertmacro MUI_LANGUAGE "Korean" |
50 | !insertmacro MUI_LANGUAGE "Italian" | 50 | !insertmacro MUI_LANGUAGE "Italian" |
51 | !insertmacro MUI_LANGUAGE "Dutch" | 51 | !insertmacro MUI_LANGUAGE "Dutch" |
52 | !insertmacro MUI_LANGUAGE "Danish" | 52 | !insertmacro MUI_LANGUAGE "Danish" |
53 | !insertmacro MUI_LANGUAGE "Swedish" | 53 | !insertmacro MUI_LANGUAGE "Swedish" |
54 | !insertmacro MUI_LANGUAGE "Norwegian" | 54 | !insertmacro MUI_LANGUAGE "Norwegian" |
55 | !insertmacro MUI_LANGUAGE "NorwegianNynorsk" | 55 | !insertmacro MUI_LANGUAGE "NorwegianNynorsk" |
56 | !insertmacro MUI_LANGUAGE "Finnish" | 56 | !insertmacro MUI_LANGUAGE "Finnish" |
57 | !insertmacro MUI_LANGUAGE "Greek" | 57 | !insertmacro MUI_LANGUAGE "Greek" |
58 | !insertmacro MUI_LANGUAGE "Russian" | 58 | !insertmacro MUI_LANGUAGE "Russian" |
59 | !insertmacro MUI_LANGUAGE "Portuguese" | 59 | !insertmacro MUI_LANGUAGE "Portuguese" |
60 | !insertmacro MUI_LANGUAGE "PortugueseBR" | 60 | !insertmacro MUI_LANGUAGE "PortugueseBR" |
61 | !insertmacro MUI_LANGUAGE "Polish" | 61 | !insertmacro MUI_LANGUAGE "Polish" |
62 | !insertmacro MUI_LANGUAGE "Ukrainian" | 62 | !insertmacro MUI_LANGUAGE "Ukrainian" |
63 | !insertmacro MUI_LANGUAGE "Czech" | 63 | !insertmacro MUI_LANGUAGE "Czech" |
64 | !insertmacro MUI_LANGUAGE "Slovak" | 64 | !insertmacro MUI_LANGUAGE "Slovak" |
65 | !insertmacro MUI_LANGUAGE "Croatian" | 65 | !insertmacro MUI_LANGUAGE "Croatian" |
66 | !insertmacro MUI_LANGUAGE "Bulgarian" | 66 | !insertmacro MUI_LANGUAGE "Bulgarian" |
67 | !insertmacro MUI_LANGUAGE "Hungarian" | 67 | !insertmacro MUI_LANGUAGE "Hungarian" |
68 | !insertmacro MUI_LANGUAGE "Thai" | 68 | !insertmacro MUI_LANGUAGE "Thai" |
69 | !insertmacro MUI_LANGUAGE "Romanian" | 69 | !insertmacro MUI_LANGUAGE "Romanian" |
70 | !insertmacro MUI_LANGUAGE "Latvian" | 70 | !insertmacro MUI_LANGUAGE "Latvian" |
71 | !insertmacro MUI_LANGUAGE "Macedonian" | 71 | !insertmacro MUI_LANGUAGE "Macedonian" |
72 | !insertmacro MUI_LANGUAGE "Estonian" | 72 | !insertmacro MUI_LANGUAGE "Estonian" |
73 | !insertmacro MUI_LANGUAGE "Turkish" | 73 | !insertmacro MUI_LANGUAGE "Turkish" |
74 | !insertmacro MUI_LANGUAGE "Lithuanian" | 74 | !insertmacro MUI_LANGUAGE "Lithuanian" |
75 | !insertmacro MUI_LANGUAGE "Slovenian" | 75 | !insertmacro MUI_LANGUAGE "Slovenian" |
76 | !insertmacro MUI_LANGUAGE "Serbian" | 76 | !insertmacro MUI_LANGUAGE "Serbian" |
77 | !insertmacro MUI_LANGUAGE "SerbianLatin" | 77 | !insertmacro MUI_LANGUAGE "SerbianLatin" |
78 | !insertmacro MUI_LANGUAGE "Arabic" | 78 | !insertmacro MUI_LANGUAGE "Arabic" |
79 | !insertmacro MUI_LANGUAGE "Farsi" | 79 | !insertmacro MUI_LANGUAGE "Farsi" |
80 | !insertmacro MUI_LANGUAGE "Hebrew" | 80 | !insertmacro MUI_LANGUAGE "Hebrew" |
81 | !insertmacro MUI_LANGUAGE "Indonesian" | 81 | !insertmacro MUI_LANGUAGE "Indonesian" |
82 | !insertmacro MUI_LANGUAGE "Mongolian" | 82 | !insertmacro MUI_LANGUAGE "Mongolian" |
83 | !insertmacro MUI_LANGUAGE "Luxembourgish" | 83 | !insertmacro MUI_LANGUAGE "Luxembourgish" |
84 | !insertmacro MUI_LANGUAGE "Albanian" | 84 | !insertmacro MUI_LANGUAGE "Albanian" |
85 | !insertmacro MUI_LANGUAGE "Breton" | 85 | !insertmacro MUI_LANGUAGE "Breton" |
86 | !insertmacro MUI_LANGUAGE "Belarusian" | 86 | !insertmacro MUI_LANGUAGE "Belarusian" |
87 | !insertmacro MUI_LANGUAGE "Icelandic" | 87 | !insertmacro MUI_LANGUAGE "Icelandic" |
88 | !insertmacro MUI_LANGUAGE "Malay" | 88 | !insertmacro MUI_LANGUAGE "Malay" |
89 | !insertmacro MUI_LANGUAGE "Bosnian" | 89 | !insertmacro MUI_LANGUAGE "Bosnian" |
90 | !insertmacro MUI_LANGUAGE "Kurdish" | 90 | !insertmacro MUI_LANGUAGE "Kurdish" |
91 | !insertmacro MUI_LANGUAGE "Irish" | 91 | !insertmacro MUI_LANGUAGE "Irish" |
92 | !insertmacro MUI_LANGUAGE "Uzbek" | 92 | !insertmacro MUI_LANGUAGE "Uzbek" |
93 | !insertmacro MUI_LANGUAGE "Galician" | 93 | !insertmacro MUI_LANGUAGE "Galician" |
94 | !insertmacro MUI_LANGUAGE "Afrikaans" | 94 | !insertmacro MUI_LANGUAGE "Afrikaans" |
95 | !insertmacro MUI_LANGUAGE "Catalan" | 95 | !insertmacro MUI_LANGUAGE "Catalan" |
96 | 96 | ||
97 | !insertmacro MUI_RESERVEFILE_LANGDLL | 97 | !insertmacro MUI_RESERVEFILE_LANGDLL |
98 | 98 | ||
99 | Section "Install" | 99 | Section "Install" |
100 | SetOutPath "$INSTDIR" | 100 | SetOutPath "$INSTDIR" |
101 | 101 | ||
102 | SetCompress Auto | 102 | SetCompress Auto |
103 | SetOverwrite IfNewer | 103 | SetOverwrite IfNewer |
104 | File /r "bin\*.*" | 104 | File /r "bin\*.*" |
105 | 105 | ||
106 | WriteRegStr HKCU "Software\OpenSim" "" $INSTDIR | 106 | WriteRegStr HKCU "Software\OpenSim" "" $INSTDIR |
107 | WriteUninstaller "$INSTDIR\Uninstall.exe" | 107 | WriteUninstaller "$INSTDIR\Uninstall.exe" |
108 | 108 | ||
109 | !insertmacro MUI_STARTMENU_WRITE_BEGIN Application | 109 | !insertmacro MUI_STARTMENU_WRITE_BEGIN Application |
110 | CreateDirectory "$SMPROGRAMS\$STARTMENU_FOLDER" | 110 | CreateDirectory "$SMPROGRAMS\$STARTMENU_FOLDER" |
111 | CreateShortCut "$SMPROGRAMS\$STARTMENU_FOLDER\OpenSim.lnk" "$INSTDIR\OpenSim.exe" | 111 | CreateShortCut "$SMPROGRAMS\$STARTMENU_FOLDER\OpenSim.lnk" "$INSTDIR\OpenSim.exe" |
112 | CreateShortCut "$SMPROGRAMS\$STARTMENU_FOLDER\Uninstall.lnk" "$INSTDIR\Uninstall.exe" | 112 | CreateShortCut "$SMPROGRAMS\$STARTMENU_FOLDER\Uninstall.lnk" "$INSTDIR\Uninstall.exe" |
113 | !insertmacro MUI_STARTMENU_WRITE_END | 113 | !insertmacro MUI_STARTMENU_WRITE_END |
114 | 114 | ||
115 | WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\OpenSim" "DisplayName" "OpenSim (remove only)" | 115 | WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\OpenSim" "DisplayName" "OpenSim (remove only)" |
116 | WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\OpenSim" "UninstallString" "$INSTDIR\Uninstall.exe" | 116 | WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\OpenSim" "UninstallString" "$INSTDIR\Uninstall.exe" |
117 | SectionEnd | 117 | SectionEnd |
118 | 118 | ||
119 | Function .onInit | 119 | Function .onInit |
120 | !insertmacro MUI_LANGDLL_DISPLAY | 120 | !insertmacro MUI_LANGDLL_DISPLAY |
121 | FunctionEnd | 121 | FunctionEnd |
122 | 122 | ||
123 | Section "Uninstall" | 123 | Section "Uninstall" |
124 | Delete "$INSTDIR\*.*" | 124 | Delete "$INSTDIR\*.*" |
125 | RMDir /r "$INSTDIR" | 125 | RMDir /r "$INSTDIR" |
126 | 126 | ||
127 | !insertmacro MUI_STARTMENU_GETFOLDER Application $MUI_TEMP | 127 | !insertmacro MUI_STARTMENU_GETFOLDER Application $MUI_TEMP |
128 | 128 | ||
129 | Delete "$SMPROGRAMS\$MUI_TEMP\OpenSim.lnk" | 129 | Delete "$SMPROGRAMS\$MUI_TEMP\OpenSim.lnk" |
130 | Delete "$SMPROGRAMS\$MUI_TEMP\Uninstall.lnk" | 130 | Delete "$SMPROGRAMS\$MUI_TEMP\Uninstall.lnk" |
131 | 131 | ||
132 | ;Delete empty start menu parent diretories | 132 | ;Delete empty start menu parent diretories |
133 | StrCpy $MUI_TEMP "$SMPROGRAMS\$MUI_TEMP" | 133 | StrCpy $MUI_TEMP "$SMPROGRAMS\$MUI_TEMP" |
134 | 134 | ||
135 | startMenuDeleteLoop: | 135 | startMenuDeleteLoop: |
136 | ClearErrors | 136 | ClearErrors |
137 | RMDir $MUI_TEMP | 137 | RMDir $MUI_TEMP |
138 | GetFullPathName $MUI_TEMP "$MUI_TEMP\.." | 138 | GetFullPathName $MUI_TEMP "$MUI_TEMP\.." |
139 | 139 | ||
140 | IfErrors startMenuDeleteLoopDone | 140 | IfErrors startMenuDeleteLoopDone |
141 | 141 | ||
142 | StrCmp $MUI_TEMP $SMPROGRAMS startMenuDeleteLoopDone startMenuDeleteLoop | 142 | StrCmp $MUI_TEMP $SMPROGRAMS startMenuDeleteLoopDone startMenuDeleteLoop |
143 | startMenuDeleteLoopDone: | 143 | startMenuDeleteLoopDone: |
144 | 144 | ||
145 | DeleteRegKey /ifempty HKCU "Software\OpenSim" | 145 | DeleteRegKey /ifempty HKCU "Software\OpenSim" |
146 | DeleteRegKey HKEY_LOCAL_MACHINE "SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\OpenSim" | 146 | DeleteRegKey HKEY_LOCAL_MACHINE "SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\OpenSim" |
147 | SectionEnd | 147 | SectionEnd |
148 | 148 | ||
149 | Function un.onInit | 149 | Function un.onInit |
150 | !insertmacro MUI_UNGETLANGUAGE | 150 | !insertmacro MUI_UNGETLANGUAGE |
151 | FunctionEnd | 151 | FunctionEnd |