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())
{ {

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

@ -1,4 +1,4 @@
// /** // /**
// ******** // ********
// * // *
// * 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
@ -49,12 +49,12 @@ using System.Runtime.CompilerServices;
// 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("")]
@ -69,7 +69,7 @@ using System.Runtime.CompilerServices;
// 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
@ -98,4 +98,4 @@ using System.Runtime.CompilerServices;
// //
[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>