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

Merge branch 'next'

Browse source
This commit is contained in:
niel-archer 2011-12-30 03:24:25 +00:00
commit 620ea6fa0f
13 changed files with 1640 additions and 1571 deletions
Download patch file Download diff file Expand all files Collapse all files

34
trunk/Editor/SyntaxRichTextBox.cs
View file

@ -899,9 +899,15 @@ namespace LSLEditor
public new void Paste()
{
ResetHighlichting();
ResetHighlighting();
if (Clipboard.GetDataObject().GetDataPresent(DataFormats.Text, true))
// First try with Unicode
if (Clipboard.GetDataObject().GetDataPresent(DataFormats.UnicodeText, true))
{
string strTextToPaste = Clipboard.GetDataObject().GetData(DataFormats.UnicodeText, true).ToString().Replace("\r", "");
this.ColoredText = strTextToPaste;
} // failing that try ANSI text.
else if (Clipboard.GetDataObject().GetDataPresent(DataFormats.Text, true))
{
string strTextToPaste = Clipboard.GetDataObject().GetData(DataFormats.Text, true).ToString().Replace("\r", "");
this.ColoredText = strTextToPaste;
@ -1147,7 +1153,7 @@ namespace LSLEditor
protected override void OnKeyPress(KeyPressEventArgs e)
{
ResetHighlichting();
ResetHighlighting();
char keyChar = e.KeyChar;
@ -1743,19 +1749,23 @@ namespace LSLEditor
{
BeginUpdate();
ResetHighlichting();
ResetHighlighting();
string strW = GetNewWhiteSpace(-1);
int intTabs = (int)(strW.Length / AutoFormatter.GetTab().Length);
if (this.SelectionLength == 0)
int intLastLine = this.GetLineFromCharIndex(this.SelectionStart + this.SelectionLength);
int intLine = this.GetLineFromCharIndex(this.SelectionStart);
this.SelectionStart = this.GetFirstCharIndexFromLine(intLine);
int intLength = 0;
do
{
int intLine = this.GetLineFromCharIndex(this.SelectionStart);
int intStart = this.GetFirstCharIndexFromLine(intLine);
int intLength = this.Lines[intLine].Length + 1;
this.SelectionStart = intStart;
this.SelectionLength = intLength;
}
intLength += this.Lines[intLine].Length + 1;
intLine++;
} while (intLine <= intLastLine);
this.SelectionLength = intLength;
string strSelectedText = AutoFormatter.MultiLineComment(blnAdd, intTabs, this.SelectedText);
int intBackup = this.SelectionStart;
@ -1888,7 +1898,7 @@ namespace LSLEditor
}
}
private void ResetHighlichting()
private void ResetHighlighting()
{
if (HighLightList.Count == 0)
return;

2
trunk/Helpers/LSL2CSharp.cs
View file

@ -175,7 +175,7 @@ namespace LSLEditor
// State change, excluding global functions
regex = new Regex(
@"(\s+)state\s+(\w*)(\s*;)",
@"(\s+)state\s+(\w+)(\s*;)",
RegexOptions.IgnorePatternWhitespace
| RegexOptions.Compiled
);

BIN
trunk/LSLEditor.RES
View file

Binary file not shown.

44
trunk/LSLEditorForm.Designer.cs generated
View file

@ -127,8 +127,8 @@ namespace LSLEditor
this.toolStripSeparator8 = new System.Windows.Forms.ToolStripSeparator();
this.toolStripMenuItem4 = new System.Windows.Forms.ToolStripMenuItem();
this.toolStripSeparator9 = new System.Windows.Forms.ToolStripSeparator();
this.toolStripSeparator12 = new System.Windows.Forms.ToolStripSeparator();
this.makeBugReporttoolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.toolStripSeparator12 = new System.Windows.Forms.ToolStripSeparator();
this.aboutToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.openFileDialog1 = new System.Windows.Forms.OpenFileDialog();
this.saveFileDialog1 = new System.Windows.Forms.SaveFileDialog();
@ -140,6 +140,7 @@ namespace LSLEditor
this.openFileDialog2 = new System.Windows.Forms.OpenFileDialog();
this.toolTip1 = new System.Windows.Forms.ToolTip(this.components);
this.dockPanel = new LSLEditor.Docking.DockPanel();
this.releaseNotesToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.menuStrip1.SuspendLayout();
this.statusStrip1.SuspendLayout();
this.contextMenuStrip1.SuspendLayout();
@ -207,8 +208,8 @@ namespace LSLEditor
// newProjectToolStripMenuItem
//
this.newProjectToolStripMenuItem.Name = "newProjectToolStripMenuItem";
this.newProjectToolStripMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)(((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.Shift)
| System.Windows.Forms.Keys.N)));
this.newProjectToolStripMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)(((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.Shift)
| System.Windows.Forms.Keys.N)));
this.newProjectToolStripMenuItem.Size = new System.Drawing.Size(202, 22);
this.newProjectToolStripMenuItem.Text = "Solution...";
this.newProjectToolStripMenuItem.Click += new System.EventHandler(this.newProjectToolStripMenuItem_Click);
@ -241,8 +242,8 @@ namespace LSLEditor
// openProjectSolutionToolStripMenuItem
//
this.openProjectSolutionToolStripMenuItem.Name = "openProjectSolutionToolStripMenuItem";
this.openProjectSolutionToolStripMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)(((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.Shift)
| System.Windows.Forms.Keys.O)));
this.openProjectSolutionToolStripMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)(((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.Shift)
| System.Windows.Forms.Keys.O)));
this.openProjectSolutionToolStripMenuItem.Size = new System.Drawing.Size(244, 22);
this.openProjectSolutionToolStripMenuItem.Text = "Project/Solution...";
this.openProjectSolutionToolStripMenuItem.Click += new System.EventHandler(this.openProjectSolutionToolStripMenuItem_Click);
@ -350,8 +351,8 @@ namespace LSLEditor
//
this.SaveAllToolStripMenuItem.Image = global::LSLEditor.Properties.Resources.SAVEAS;
this.SaveAllToolStripMenuItem.Name = "SaveAllToolStripMenuItem";
this.SaveAllToolStripMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)(((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.Shift)
| System.Windows.Forms.Keys.S)));
this.SaveAllToolStripMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)(((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.Shift)
| System.Windows.Forms.Keys.S)));
this.SaveAllToolStripMenuItem.Size = new System.Drawing.Size(187, 22);
this.SaveAllToolStripMenuItem.Text = "Save All";
this.SaveAllToolStripMenuItem.Click += new System.EventHandler(this.SaveAllToolStripMenuItem_Click);
@ -524,8 +525,8 @@ namespace LSLEditor
// toolStripMenuItem8
//
this.toolStripMenuItem8.Name = "toolStripMenuItem8";
this.toolStripMenuItem8.ShortcutKeys = ((System.Windows.Forms.Keys)(((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.Shift)
| System.Windows.Forms.Keys.A)));
this.toolStripMenuItem8.ShortcutKeys = ((System.Windows.Forms.Keys)(((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.Shift)
| System.Windows.Forms.Keys.A)));
this.toolStripMenuItem8.Size = new System.Drawing.Size(225, 22);
this.toolStripMenuItem8.Text = "Select All to SL";
this.toolStripMenuItem8.Click += new System.EventHandler(this.toolStripMenuItem8_Click);
@ -665,8 +666,8 @@ namespace LSLEditor
//
this.addNewObjecttoolStripMenuItem.Enabled = false;
this.addNewObjecttoolStripMenuItem.Name = "addNewObjecttoolStripMenuItem";
this.addNewObjecttoolStripMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)(((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.Shift)
| System.Windows.Forms.Keys.A)));
this.addNewObjecttoolStripMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)(((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.Shift)
| System.Windows.Forms.Keys.A)));
this.addNewObjecttoolStripMenuItem.Size = new System.Drawing.Size(235, 22);
this.addNewObjecttoolStripMenuItem.Text = "Add New Object";
this.addNewObjecttoolStripMenuItem.Click += new System.EventHandler(this.addNewObjecttoolStripMenuItem_Click);
@ -732,7 +733,7 @@ namespace LSLEditor
// optionsToolStripMenuItem
//
this.optionsToolStripMenuItem.Name = "optionsToolStripMenuItem";
this.optionsToolStripMenuItem.Size = new System.Drawing.Size(152, 22);
this.optionsToolStripMenuItem.Size = new System.Drawing.Size(125, 22);
this.optionsToolStripMenuItem.Text = "Options...";
this.optionsToolStripMenuItem.Click += new System.EventHandler(this.optionsToolStripMenuItem_Click);
//
@ -785,6 +786,7 @@ namespace LSLEditor
this.toolStripSeparator9,
this.makeBugReporttoolStripMenuItem,
this.toolStripSeparator12,
this.releaseNotesToolStripMenuItem,
this.aboutToolStripMenuItem});
this.helpToolStripMenuItem.Name = "helpToolStripMenuItem";
this.helpToolStripMenuItem.Size = new System.Drawing.Size(44, 20);
@ -830,11 +832,6 @@ namespace LSLEditor
this.toolStripSeparator9.Name = "toolStripSeparator9";
this.toolStripSeparator9.Size = new System.Drawing.Size(207, 6);
//
// toolStripSeparator12
//
this.toolStripSeparator12.Name = "toolStripSeparator12";
this.toolStripSeparator12.Size = new System.Drawing.Size(207, 6);
//
// makeBugReporttoolStripMenuItem
//
this.makeBugReporttoolStripMenuItem.Name = "makeBugReporttoolStripMenuItem";
@ -842,6 +839,11 @@ namespace LSLEditor
this.makeBugReporttoolStripMenuItem.Text = "Bug report...";
this.makeBugReporttoolStripMenuItem.Click += new System.EventHandler(this.makeBugReporttoolStripMenuItem_Click);
//
// toolStripSeparator12
//
this.toolStripSeparator12.Name = "toolStripSeparator12";
this.toolStripSeparator12.Size = new System.Drawing.Size(207, 6);
//
// aboutToolStripMenuItem
//
this.aboutToolStripMenuItem.Name = "aboutToolStripMenuItem";
@ -940,6 +942,13 @@ namespace LSLEditor
this.dockPanel.Skin = dockPanelSkin1;
this.dockPanel.TabIndex = 10;
//
// releaseNotesToolStripMenuItem
//
this.releaseNotesToolStripMenuItem.Name = "releaseNotesToolStripMenuItem";
this.releaseNotesToolStripMenuItem.Size = new System.Drawing.Size(210, 22);
this.releaseNotesToolStripMenuItem.Text = "Release Notes...";
this.releaseNotesToolStripMenuItem.Click += new System.EventHandler(this.releaseNotesToolStripMenuItem_Click);
//
// LSLEditorForm
//
this.AllowDrop = true;
@ -1066,5 +1075,6 @@ namespace LSLEditor
private System.Windows.Forms.ToolStripSeparator toolStripSeparator16;
private System.Windows.Forms.ToolStripMenuItem closeActiveWindowToolStripMenuItem;
private System.Windows.Forms.ToolStripMenuItem toolStripMenuItem9;
private System.Windows.Forms.ToolStripMenuItem releaseNotesToolStripMenuItem;
}
}

8
trunk/LSLEditorForm.cs
View file

@ -1245,7 +1245,7 @@ namespace LSLEditor
}
}
private void ReleaseNotesToolStripMenuItem_Click(object sender, EventArgs e)
private void releaseNotesToolStripMenuItem_Click(object sender, EventArgs e)
{
Browser browser = GetBrowser();
string strExeFileName = Path.GetFileName(Assembly.GetExecutingAssembly().CodeBase);
@ -1699,11 +1699,7 @@ namespace LSLEditor
{
if (lslint.HasErrors)
{
//TODO: Show errors somewhere else
//this.panel1.Controls.Clear();
//this.panel1.Controls.Add(this.SyntaxErrors);
//this.panel1.Visible = true;
//this.splitter1.SplitPosition = Properties.Settings.Default.SimulatorSize.Height;
this.SyntaxErrors.Show(dockPanel);
}
else
{

26
trunk/Properties/Settings.Designer.cs generated
View file

@ -866,18 +866,6 @@ namespace LSLEditor.Properties {
}
}
[global::System.Configuration.UserScopedSettingAttribute()]
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.Configuration.DefaultSettingValueAttribute("ANSI")]
public string OutputFormat {
get {
return ((string)(this["OutputFormat"]));
}
set {
this["OutputFormat"] = value;
}
}
[global::System.Configuration.UserScopedSettingAttribute()]
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.Configuration.DefaultSettingValueAttribute("False")]
@ -1222,11 +1210,23 @@ namespace LSLEditor.Properties {
[global::System.Configuration.ApplicationScopedSettingAttribute()]
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.Configuration.DefaultSettingValueAttribute("2.43")]
[global::System.Configuration.DefaultSettingValueAttribute("2.44.0")]
public string Version {
get {
return ((string)(this["Version"]));
}
}
[global::System.Configuration.UserScopedSettingAttribute()]
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.Configuration.DefaultSettingValueAttribute("UTF-8")]
public string OutputFormat {
get {
return ((string)(this["OutputFormat"]));
}
set {
this["OutputFormat"] = value;
}
}
}
}

8
trunk/Properties/Settings.settings
View file

@ -221,9 +221,6 @@
<Setting Name="SvnPassword" Type="System.String" Scope="User">
<Value Profile="(Default)" />
</Setting>
<Setting Name="OutputFormat" Type="System.String" Scope="User">
<Value Profile="(Default)">ANSI</Value>
</Setting>
<Setting Name="ShowSolutionExplorer" Type="System.Boolean" Scope="User">
<Value Profile="(Default)">False</Value>
</Setting>
@ -330,7 +327,10 @@
<Value Profile="(Default)">True</Value>
</Setting>
<Setting Name="Version" Type="System.String" Scope="Application">
<Value Profile="(Default)">2.43</Value>
<Value Profile="(Default)">2.44.0</Value>
</Setting>
<Setting Name="OutputFormat" Type="System.String" Scope="User">
<Value Profile="(Default)">UTF-8</Value>
</Setting>
</Settings>
</SettingsFile>

7
trunk/Resource/About.htm
View file

@ -8,9 +8,8 @@
<body scroll="no">
Special thanks to: <img src="GIF/thanks.gif" /><br />
<br />
<marquee direction="up" SCROLLAMOUNT="2" height="120">
<marquee direction="up" SCROLLAMOUNT="2" height="120">
<ul>
<li>Vlad Bjornson</li>
<li>Mazok Nishi</li>
<li>Sonja Manatiso</li>
@ -205,9 +204,9 @@
<li>Toran Cult </li>
<li>Strife Onizuka </li>
<li>Sandra Tsure</li>
<li>Moundsa Mayo</li>
<li>Ima Mechanique</li>
</ul>
</marquee>
</body>
</html>

2
trunk/Resource/AssemblyInfo.cs
View file

@ -69,7 +69,7 @@ using System.Runtime.CompilerServices;
// You can specify all the values or you can default the Revision and Build Numbers
// by using the '*' as shown below:
[assembly: AssemblyVersion("2.43.*")]
[assembly: AssemblyVersion("2.44.*")]
//
// In order to sign your assembly you must specify a key to use. Refer to the

3060
trunk/Resource/ReleaseNotes.htm
View file

File diff suppressed because it is too large Load diff

8
trunk/Tools/TextEditorFontColors.Designer.cs generated
View file

@ -128,18 +128,18 @@ namespace LSLEditor.Tools
this.checkBox1.AutoSize = true;
this.checkBox1.Location = new System.Drawing.Point(16, 24);
this.checkBox1.Name = "checkBox1";
this.checkBox1.Size = new System.Drawing.Size(142, 17);
this.checkBox1.Size = new System.Drawing.Size(145, 17);
this.checkBox1.TabIndex = 0;
this.checkBox1.Text = "use original colorscheme";
this.checkBox1.Text = "use original color scheme";
this.checkBox1.UseVisualStyleBackColor = true;
//
// EnvironmentFontColors
// TextEditorFontColors
//
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.Controls.Add(this.groupBox5);
this.Controls.Add(this.groupBox1);
this.Name = "EnvironmentFontColors";
this.Name = "TextEditorFontColors";
this.Size = new System.Drawing.Size(392, 272);
this.groupBox5.ResumeLayout(false);
this.groupBox5.PerformLayout();

4
trunk/Tools/TextEditorGeneral.Designer.cs generated
View file

@ -224,7 +224,7 @@ namespace LSLEditor.Tools
this.radioButton6.Size = new System.Drawing.Size(65, 17);
this.radioButton6.TabIndex = 1;
this.radioButton6.TabStop = true;
this.radioButton6.Text = "Unicode";
this.radioButton6.Text = "UTF-16 LE";
this.radioButton6.UseVisualStyleBackColor = true;
//
// radioButton7
@ -235,7 +235,7 @@ namespace LSLEditor.Tools
this.radioButton7.Size = new System.Drawing.Size(117, 17);
this.radioButton7.TabIndex = 2;
this.radioButton7.TabStop = true;
this.radioButton7.Text = "Unicode big endian";
this.radioButton7.Text = "UTF-16 BE";
this.radioButton7.UseVisualStyleBackColor = true;
//
// radioButton8

8
trunk/app.config
View file

@ -185,9 +185,6 @@
<setting name="SvnPassword" serializeAs="String">
<value />
</setting>
<setting name="OutputFormat" serializeAs="String">
<value>ANSI</value>
</setting>
<setting name="ShowSolutionExplorer" serializeAs="String">
<value>False</value>
</setting>
@ -239,6 +236,9 @@
<setting name="VersionControlSVN" serializeAs="String">
<value>True</value>
</setting>
<setting name="OutputFormat" serializeAs="String">
<value>UTF-8</value>
</setting>
</LSLEditor.Properties.Settings>
</userSettings>
<applicationSettings>
@ -325,7 +325,7 @@
<value />
</setting>
<setting name="Version" serializeAs="String">
<value>2.43</value>
<value>2.44.0</value>
</setting>
</LSLEditor.Properties.Settings>
</applicationSettings>