AriasCreations/LSLEditor
3
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'next' into next-syntax-highlighting

Browse source
This commit is contained in:
niel-archer 2012-02-25 05:56:53 +00:00
commit 80f8432359
6 changed files with 981 additions and 982 deletions
Download patch file Download diff file Expand all files Collapse all files

BIN
trunk/LSLEditor.RES
View file

Binary file not shown.

1742
trunk/LSLEditorForm.Designer.cs generated
View file

File diff suppressed because it is too large Load diff

10
trunk/LSLEditorForm.cs
View file

@ -496,8 +496,8 @@ namespace LSLEditor
private void InitPluginsList() private void InitPluginsList()
{ {
// erase old plugins // erase old plugins
for (int intI = this.toolStripMenuItem3.DropDownItems.Count - 1; intI > 0; intI--) for (int intI = this.toolsStripMenuItem.DropDownItems.Count - 1; intI > 0; intI--)
this.toolStripMenuItem3.DropDownItems.RemoveAt(intI); this.toolsStripMenuItem.DropDownItems.RemoveAt(intI);
if (Properties.Settings.Default.Plugins == null) if (Properties.Settings.Default.Plugins == null)
return; return;
@ -510,7 +510,7 @@ namespace LSLEditor
tsmi = new ToolStripMenuItem(strPlugin, null, handler, Keys.F7); tsmi = new ToolStripMenuItem(strPlugin, null, handler, Keys.F7);
else else
tsmi = new ToolStripMenuItem(strPlugin, null, handler); tsmi = new ToolStripMenuItem(strPlugin, null, handler);
this.toolStripMenuItem3.DropDownItems.Add(tsmi); this.toolsStripMenuItem.DropDownItems.Add(tsmi);
} }
} }
@ -1550,7 +1550,7 @@ namespace LSLEditor
if (tsmi == null) if (tsmi == null)
return; return;
this.fileToolStripMenuItem.HideDropDown(); this.fileStripMenuItem.HideDropDown();
string strPath = tsmi.Tag.ToString(); string strPath = tsmi.Tag.ToString();
OpenFile(strPath, Guid.NewGuid()); OpenFile(strPath, Guid.NewGuid());
@ -1625,7 +1625,7 @@ namespace LSLEditor
if (tsmi == null) if (tsmi == null)
return; return;
this.fileToolStripMenuItem.HideDropDown(); this.fileStripMenuItem.HideDropDown();
if (CloseAllOpenWindows()) if (CloseAllOpenWindows())
{ {

202
trunk/Resource/AssemblyInfo.cs → trunk/Properties/AssemblyInfo.cs
View file

@ -1,101 +1,101 @@
// /** // /**
// ******** // ********
// * // *
// * ORIGINAL CODE BASE IS Copyright (C) 2006-2010 by Alphons van der Heijden // * ORIGINAL CODE BASE IS Copyright (C) 2006-2010 by Alphons van der Heijden
// * The code was donated on 4/28/2010 by Alphons van der Heijden // * The code was donated on 4/28/2010 by Alphons van der Heijden
// * To Brandon 'Dimentox Travanti' Husbands & Malcolm J. Kudra, who in turn License under the GPLv2. // * To Brandon 'Dimentox Travanti' Husbands & Malcolm J. Kudra, who in turn License under the GPLv2.
// * In agreement with Alphons van der Heijden's wishes. // * In agreement with Alphons van der Heijden's wishes.
// * // *
// * The community would like to thank Alphons for all of his hard work, blood sweat and tears. // * The community would like to thank Alphons for all of his hard work, blood sweat and tears.
// * Without his work the community would be stuck with crappy editors. // * Without his work the community would be stuck with crappy editors.
// * // *
// * The source code in this file ("Source Code") is provided by The LSLEditor Group // * The source code in this file ("Source Code") is provided by The LSLEditor Group
// * to you under the terms of the GNU General Public License, version 2.0 // * to you under the terms of the GNU General Public License, version 2.0
// * ("GPL"), unless you have obtained a separate licensing agreement // * ("GPL"), unless you have obtained a separate licensing agreement
// * ("Other License"), formally executed by you and The LSLEditor Group. Terms of // * ("Other License"), formally executed by you and The LSLEditor Group. Terms of
// * the GPL can be found in the gplv2.txt document. // * the GPL can be found in the gplv2.txt document.
// * // *
// ******** // ********
// * GPLv2 Header // * GPLv2 Header
// ******** // ********
// * LSLEditor, a External editor for the LSL Language. // * LSLEditor, a External editor for the LSL Language.
// * Copyright (C) 2010 The LSLEditor Group. // * Copyright (C) 2010 The LSLEditor Group.
// //
// * This program is free software; you can redistribute it and/or // * This program is free software; you can redistribute it and/or
// * modify it under the terms of the GNU General Public License // * modify it under the terms of the GNU General Public License
// * as published by the Free Software Foundation; either version 2 // * as published by the Free Software Foundation; either version 2
// * of the License, or (at your option) any later version. // * of the License, or (at your option) any later version.
// * // *
// * This program is distributed in the hope that it will be useful, // * This program is distributed in the hope that it will be useful,
// * but WITHOUT ANY WARRANTY; without even the implied warranty of // * but WITHOUT ANY WARRANTY; without even the implied warranty of
// * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the // * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// * GNU General Public License for more details. // * GNU General Public License for more details.
// * // *
// * You should have received a copy of the GNU General Public License // * You should have received a copy of the GNU General Public License
// * along with this program; if not, write to the Free Software // * along with this program; if not, write to the Free Software
// * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. // * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
// ******** // ********
// * // *
// * The above copyright notice and this permission notice shall be included in all // * The above copyright notice and this permission notice shall be included in all
// * copies or substantial portions of the Software. // * copies or substantial portions of the Software.
// * // *
// ******** // ********
// */ // */
using System.Reflection; using System.Reflection;
using System.Runtime.CompilerServices; using System.Runtime.CompilerServices;
// //
// General Information about an assembly is controlled through the following // General Information about an assembly is controlled through the following
// set of attributes. Change these attribute values to modify the information // set of attributes. Change these attribute values to modify the information
// associated with an assembly. // associated with an assembly.
// //
[assembly: AssemblyTitle("LSL-Editor")] [assembly: AssemblyTitle("LSL-Editor Community Edition")]
[assembly: AssemblyDescription("LSL-Editor for editing and compiling LSL scripts")] [assembly: AssemblyDescription("LSL-Editor for editing and compiling LSL scripts")]
[assembly: AssemblyConfiguration("")] [assembly: AssemblyConfiguration("")]
[assembly: AssemblyCompany("Van der Heijden Holding BV")] [assembly: AssemblyCompany("")]
[assembly: AssemblyProduct("")] [assembly: AssemblyProduct("")]
[assembly: AssemblyCopyright("Alphons van der Heijden")] [assembly: AssemblyCopyright("2006 - 2012")]
[assembly: AssemblyTrademark("")] [assembly: AssemblyTrademark("")]
[assembly: AssemblyCulture("")] [assembly: AssemblyCulture("")]
// //
// Version information for an assembly consists of the following four values: // Version information for an assembly consists of the following four values:
// //
// Major Version // Major Version
// Minor Version // Minor Version
// Build Number // Build Number
// Revision // Revision
// //
// You can specify all the values or you can default the Revision and Build Numbers // You can specify all the values or you can default the Revision and Build Numbers
// by using the '*' as shown below: // by using the '*' as shown below:
[assembly: AssemblyVersion("2.44.*")] [assembly: AssemblyVersion("2.45.0.*")]
// //
// In order to sign your assembly you must specify a key to use. Refer to the // In order to sign your assembly you must specify a key to use. Refer to the
// Microsoft .NET Framework documentation for more information on assembly signing. // Microsoft .NET Framework documentation for more information on assembly signing.
// //
// Use the attributes below to control which key is used for signing. // Use the attributes below to control which key is used for signing.
// //
// Notes: // Notes:
// (*) If no key is specified, the assembly is not signed. // (*) If no key is specified, the assembly is not signed.
// (*) KeyName refers to a key that has been installed in the Crypto Service // (*) KeyName refers to a key that has been installed in the Crypto Service
// Provider (CSP) on your machine. KeyFile refers to a file which contains // Provider (CSP) on your machine. KeyFile refers to a file which contains
// a key. // a key.
// (*) If the KeyFile and the KeyName values are both specified, the // (*) If the KeyFile and the KeyName values are both specified, the
// following processing occurs: // following processing occurs:
// (1) If the KeyName can be found in the CSP, that key is used. // (1) If the KeyName can be found in the CSP, that key is used.
// (2) If the KeyName does not exist and the KeyFile does exist, the key // (2) If the KeyName does not exist and the KeyFile does exist, the key
// in the KeyFile is installed into the CSP and used. // in the KeyFile is installed into the CSP and used.
// (*) In order to create a KeyFile, you can use the sn.exe (Strong Name) utility. // (*) In order to create a KeyFile, you can use the sn.exe (Strong Name) utility.
// When specifying the KeyFile, the location of the KeyFile should be // When specifying the KeyFile, the location of the KeyFile should be
// relative to the project output directory which is // relative to the project output directory which is
// %Project Directory%\obj\<configuration>. For example, if your KeyFile is // %Project Directory%\obj\<configuration>. For example, if your KeyFile is
// located in the project directory, you would specify the AssemblyKeyFile // located in the project directory, you would specify the AssemblyKeyFile
// attribute as [assembly: AssemblyKeyFile("..\\..\\mykey.snk")] // attribute as [assembly: AssemblyKeyFile("..\\..\\mykey.snk")]
// (*) Delay Signing is an advanced option - see the Microsoft .NET Framework // (*) Delay Signing is an advanced option - see the Microsoft .NET Framework
// documentation for more information on this. // documentation for more information on this.
// //
[assembly: AssemblyDelaySign(false)] [assembly: AssemblyDelaySign(false)]
//[assembly: AssemblyKeyName("")] //[assembly: AssemblyKeyName("")]
//[assembly: AssemblyKeyFile("..\\..\\Resource\\test.snk")] [assembly: AssemblyKeyFile("..\\..\\Resource\\test.snk")]

BIN
trunk/Resource/Test.snk
View file

Binary file not shown.

9
trunk/lsleditor.csproj
View file

@ -12,7 +12,7 @@
<AssemblyKeyContainerName> <AssemblyKeyContainerName>
</AssemblyKeyContainerName> </AssemblyKeyContainerName>
<AssemblyName>LSLEditor</AssemblyName> <AssemblyName>LSLEditor</AssemblyName>
<AssemblyOriginatorKeyFile>Resource\Test.snk</AssemblyOriginatorKeyFile> <AssemblyOriginatorKeyFile>testing.pfx</AssemblyOriginatorKeyFile>
<DefaultClientScript>JScript</DefaultClientScript> <DefaultClientScript>JScript</DefaultClientScript>
<DefaultHTMLPageLayout>Grid</DefaultHTMLPageLayout> <DefaultHTMLPageLayout>Grid</DefaultHTMLPageLayout>
<DefaultTargetSchema>IE50</DefaultTargetSchema> <DefaultTargetSchema>IE50</DefaultTargetSchema>
@ -245,6 +245,7 @@
<DependentUpon>llTextBoxForm.cs</DependentUpon> <DependentUpon>llTextBoxForm.cs</DependentUpon>
</Compile> </Compile>
<Compile Include="Plugins\Generic.cs" /> <Compile Include="Plugins\Generic.cs" />
<Compile Include="Properties\AssemblyInfo.cs" />
<Compile Include="Solution\GuidProperty.cs"> <Compile Include="Solution\GuidProperty.cs">
<SubType>Form</SubType> <SubType>Form</SubType>
</Compile> </Compile>
@ -316,9 +317,6 @@
</Compile> </Compile>
<Compile Include="Plugins\LSLint.cs" /> <Compile Include="Plugins\LSLint.cs" />
<Compile Include="Plugins\Particles.cs" /> <Compile Include="Plugins\Particles.cs" />
<Compile Include="Resource\AssemblyInfo.cs">
<SubType>Code</SubType>
</Compile>
<Compile Include="Browser.cs"> <Compile Include="Browser.cs">
<SubType>Form</SubType> <SubType>Form</SubType>
</Compile> </Compile>
@ -720,6 +718,8 @@
<Content Include="LSLEditor.rc" /> <Content Include="LSLEditor.rc" />
<EmbeddedResource Include="Resource\ToolsOptions.xml" /> <EmbeddedResource Include="Resource\ToolsOptions.xml" />
<EmbeddedResource Include="Resource\thanks.gif" /> <EmbeddedResource Include="Resource\thanks.gif" />
<None Include="Test.snk" />
<None Include="testing.pfx" />
<None Include="Web References\org.lsleditor.www\Service1.disco" /> <None Include="Web References\org.lsleditor.www\Service1.disco" />
<EmbeddedResource Include="Resource\About.htm" /> <EmbeddedResource Include="Resource\About.htm" />
<EmbeddedResource Include="Resource\ReleaseNotes.htm"> <EmbeddedResource Include="Resource\ReleaseNotes.htm">
@ -813,7 +813,6 @@
<Generator>SettingsSingleFileGenerator</Generator> <Generator>SettingsSingleFileGenerator</Generator>
<LastGenOutput>Settings.Designer.cs</LastGenOutput> <LastGenOutput>Settings.Designer.cs</LastGenOutput>
</None> </None>
<None Include="Resource\Test.snk" />
<None Include="Web References\org.lsleditor.www\Reference.map"> <None Include="Web References\org.lsleditor.www\Reference.map">
<Generator>MSDiscoCodeGenerator</Generator> <Generator>MSDiscoCodeGenerator</Generator>
<LastGenOutput>Reference.cs</LastGenOutput> <LastGenOutput>Reference.cs</LastGenOutput>