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

Export functionality, bug fixes

Browse source
This commit is contained in:
User 2017-10-27 15:45:11 +02:00
parent 086f7d2887
commit 334359ac96
9 changed files with 307 additions and 141 deletions
Download patch file Download diff file Expand all files Collapse all files

147
trunk/Helpers/LSLIConverter.cs
View file

@ -57,9 +57,9 @@ namespace LSLEditor.Helpers
public const string LSL_EXT = ".lsl"; public const string LSL_EXT = ".lsl";
public const string LSLI_EXT = ".lsli"; public const string LSLI_EXT = ".lsli";
private const string INCLUDE_REGEX = "(\n|^)//@include\\(\".*?\"\\)"; private const string INCLUDE_REGEX = "(\\s+|^)//@include\\(\".*?\"\\)";// Eerst was '\\s+' '\n'
private const string BEGIN_REGEX = "(\n|^)" + BEGIN; //"(\n|^)//@BEGIN" private const string BEGIN_REGEX = "(\\s+|^)" + BEGIN; //"(\n|^)//@BEGIN"
private const string END_REGEX = "(\n|^)" + END; private const string END_REGEX = "(\\s+|^)" + END;
private List<string> implementedIncludes = new List<string>(); private List<string> implementedIncludes = new List<string>();
private int includeDepth = 0; private int includeDepth = 0;
@ -132,18 +132,47 @@ namespace LSLEditor.Helpers
return relativePath; return relativePath;
} }
public static List<int> AllIndexesOf(string str, string value)
{
if (String.IsNullOrEmpty(value))
throw new ArgumentException("the string to find may not be empty", "value");
List<int> indexes = new List<int>();
for (int index = 0; ; index += value.Length)
{
index = str.IndexOf(value, index);
if (index == -1)
return indexes;
indexes.Add(index);
}
}
/// <summary> /// <summary>
/// This is a hack to get the correct line, since problems arose in WriteAfterLine when inserting index-based /// This is a hack to get the correct line, since problems arose in WriteAfterLine when inserting index-based
/// </summary> /// </summary>
/// <param name="lineBefore"></param> /// <param name="lineBefore"></param>
/// <returns></returns> /// <returns></returns>
private int GetCorrectIndexOfLine(string lineBefore, string context) // TODO private int GetCorrectIndexOfLine(string lineBefore, string context)
{ {
//int correctIndex = -1; if (Regex.IsMatch(lineBefore.Trim('\n'), INCLUDE_REGEX)
//if(lineBefore.Trim('\n') == BEGIN) && lineBefore.Trim('\n').EndsWith(Regex.Match(lineBefore.Trim('\n'), INCLUDE_REGEX).ToString())) // Line before this line is an include statement, that means this is a BEGIN statement
//{ {
// correctIndex = context.Where(l => l).LastIndexOf(lineBefore); // Get all matches with this linebefore
//} List<int> allIndexes = AllIndexesOf(context, lineBefore);
foreach(int index in allIndexes)
{
// Check wether there is already a begin statement
string actualLineBefore = context.Substring(index + lineBefore.Length).Trim('\n');
if (actualLineBefore.StartsWith(BEGIN))
{
continue;
} else
{
return index;
}
}
}
return context.LastIndexOf(lineBefore); return context.LastIndexOf(lineBefore);
} }
@ -157,7 +186,6 @@ namespace LSLEditor.Helpers
private StringBuilder WriteAfterLine(StringBuilder context, string newLine, string lineBefore) // TODO: HIJ MOET KIJKEN NAAR DE INDEX VAN LINEBEFORE, NIET ZELF DE INDEX OPZOEKEN private StringBuilder WriteAfterLine(StringBuilder context, string newLine, string lineBefore) // TODO: HIJ MOET KIJKEN NAAR DE INDEX VAN LINEBEFORE, NIET ZELF DE INDEX OPZOEKEN
{ {
string ctx = context.ToString(); string ctx = context.ToString();
//int lastIndexOfLineBefore = ctx.LastIndexOf(lineBefore);
int lastIndexOfLineBefore = GetCorrectIndexOfLine(lineBefore, ctx); int lastIndexOfLineBefore = GetCorrectIndexOfLine(lineBefore, ctx);
int includeIndex = lastIndexOfLineBefore + lineBefore.Length; int includeIndex = lastIndexOfLineBefore + lineBefore.Length;
@ -178,34 +206,29 @@ namespace LSLEditor.Helpers
return context; return context;
} }
/// <summary> private void ShowError(string message)
/// Creates a new line in the context after a specified index {
/// </summary> if (!editForm.verboseQueue.Contains(message))
/// <param name="context"></param> {
/// <param name="newLine"></param> MessageBox.Show(message, "Oops...", MessageBoxButtons.OK, MessageBoxIcon.Error);
/// <param name="indexOfNewLine"></param> editForm.verboseQueue.Add(message);
/// <returns>Context with the new line</returns> }
//private StringBuilder WriteAfterLine(StringBuilder context, string newLine, int indexOfNewLine) // DEZE IS BETER, MAAR IN PRAKTIJK WERKT NIET... }
//{
// string ctx = context.ToString();
// int includeIndex = indexOfNewLine;
// string hasSeperator = context.ToString().Substring(indexOfNewLine - 1, 1); private string GetTabsForIncludeDepth(int includeDepth, bool OneLess = false) // TODO: Dit wordt wss een setting. Tabs hangt namelijk af van de hoeveelheid ingedente include statement.
// if (hasSeperator != "\n") {
// { string tabs = "";
// newLine = "\n" + newLine; if(OneLess && includeDepth != 0)
// } {
includeDepth--;
}
// hasSeperator = newLine.Substring(newLine.Length - 1, 1); for(int i = 0; i < includeDepth; i++)
// if (hasSeperator != "\n") {
// { tabs += "\t";
// newLine += "\n"; }
// } return tabs;
}
// context.Insert(includeIndex, newLine);
// string test = context.ToString();
// return context;
//}
/// <summary> /// <summary>
/// Imports scripts from //@include statements /// Imports scripts from //@include statements
@ -213,7 +236,7 @@ namespace LSLEditor.Helpers
/// <param name="strC">Sourcecode</param> /// <param name="strC">Sourcecode</param>
/// <param name="pathOfScript">Path of the source code of the script</param> /// <param name="pathOfScript">Path of the source code of the script</param>
/// <returns>Sourcecode with imported scripts</returns> /// <returns>Sourcecode with imported scripts</returns>
private string ImportScripts(string strC, string pathOfScript) // TODO: Lange functie, kan ik deze opsplitten? private string ImportScripts(string strC, string pathOfScript, bool ShowBeginEnd = true) // TODO: Lange functie, kan ik deze opsplitten?
{ {
if(!LSLIPathHelper.IsLSLI(pathOfScript)) if(!LSLIPathHelper.IsLSLI(pathOfScript))
{ {
@ -255,30 +278,46 @@ namespace LSLEditor.Helpers
if (pathOfInclude != "" && !this.implementedIncludes.Contains(Path.GetFullPath(pathOfInclude))) if (pathOfInclude != "" && !this.implementedIncludes.Contains(Path.GetFullPath(pathOfInclude)))
{ {
sb = this.WriteAfterLine(sb, BEGIN, line); if(ShowBeginEnd)
{
sb = this.WriteAfterLine(sb, GetTabsForIncludeDepth(includeDepth, true) + BEGIN, line);
}
// Insert included script // Insert included script
string script = "// Empty script\n"; string script = GetTabsForIncludeDepth(includeDepth) + "// Empty script\n";
using (StreamReader sr = new StreamReader(pathOfInclude)) using (StreamReader sr = new StreamReader(pathOfInclude))
{ {
this.implementedIncludes.Add(Path.GetFullPath(pathOfInclude)); this.implementedIncludes.Add(Path.GetFullPath(pathOfInclude));
string scriptRaw = sr.ReadToEnd(); string scriptRaw = sr.ReadToEnd();
scriptRaw = scriptRaw.Replace("\n", "\n\t"); scriptRaw = GetTabsForIncludeDepth(includeDepth) + scriptRaw.Replace("\n", "\n" + GetTabsForIncludeDepth(includeDepth));
// If there are includes in the included script // If there are includes in the included script
if (Regex.IsMatch(scriptRaw, INCLUDE_REGEX)) if (Regex.IsMatch(scriptRaw, INCLUDE_REGEX))
{ {
// Then import these scripts too // Then import these scripts too
script = "\n" + ImportScripts(scriptRaw, pathOfInclude) + "\n"; if (ShowBeginEnd)
} else if(scriptRaw != "" && scriptRaw != " ") {
script = "\n" + ImportScripts(scriptRaw, pathOfInclude) + "\n";
} else
{
script = "\n" + ImportScripts(scriptRaw, pathOfInclude, false) + "\n";
}
} else if(!Regex.IsMatch(scriptRaw, "^\\s*$"))// Check if its not empty or whitespace // scriptRaw != "" && scriptRaw != " ")
{ {
script = scriptRaw + "\n"; script = scriptRaw + "\n";
} }
} }
this.WriteAfterLine(sb, script, BEGIN + "\n");
this.WriteAfterLine(sb, END, script); if (ShowBeginEnd)
{
this.WriteAfterLine(sb, script, BEGIN + "\n");
this.WriteAfterLine(sb, GetTabsForIncludeDepth(includeDepth, true) + END, script);
} else
{
this.WriteAfterLine(sb, script, line);
string ctx = sb.ToString();
sb = new StringBuilder(ctx.Remove(ctx.IndexOf(line.TrimStart('\n')), line.TrimStart('\n').Length));
}
} }
else if (pathOfInclude != "" && this.implementedIncludes.Contains(Path.GetFullPath(pathOfInclude))) else if (pathOfInclude != "" && this.implementedIncludes.Contains(Path.GetFullPath(pathOfInclude)))
{ {
@ -286,22 +325,14 @@ namespace LSLEditor.Helpers
"\". In script \"" "\". In script \""
+ Path.GetFileName(pathOfScript) + "\". Line " + lineNumber + "."; + Path.GetFileName(pathOfScript) + "\". Line " + lineNumber + ".";
if (!editForm.verboseQueue.Contains(message)) ShowError(message);
{
MessageBox.Show(message, "Oops...", MessageBoxButtons.OK, MessageBoxIcon.Error);
editForm.verboseQueue.Add(message);
}
} else } else
{ {
string correctPath = Path.GetFullPath(GetRelativePath(pathOfScript, Environment.CurrentDirectory) + pathOfIncludeOriginal); string correctPath = Path.GetFullPath(GetRelativePath(pathOfScript, Environment.CurrentDirectory) + pathOfIncludeOriginal);
string message = "Error: Unable to find file \"" + correctPath + string message = "Error: Unable to find file \"" + correctPath +
"\". In script \"" + Path.GetFileName(pathOfScript) + "\". Line " + lineNumber + "."; "\". In script \"" + Path.GetFileName(pathOfScript) + "\". Line " + lineNumber + ".";
if (!editForm.verboseQueue.Contains(message)) ShowError(message);
{
MessageBox.Show(message, "Oops...", MessageBoxButtons.OK, MessageBoxIcon.Error);
editForm.verboseQueue.Add(message);
}
} }
} }
includeDepth--; includeDepth--;
@ -405,10 +436,10 @@ namespace LSLEditor.Helpers
/// </summary> /// </summary>
/// <param name="editForm"></param> /// <param name="editForm"></param>
/// <returns>LSL</returns> /// <returns>LSL</returns>
public string ExpandToLSL(EditForm editForm) public string ExpandToLSL(EditForm editForm, bool ShowBeginEnd = true)
{ {
this.editForm = editForm; this.editForm = editForm;
string sourceCode = ImportScripts(editForm.SourceCode, editForm.FullPathName); string sourceCode = ImportScripts(editForm.SourceCode, editForm.FullPathName, ShowBeginEnd);
return sourceCode; return sourceCode;
} }
} }

2
trunk/Helpers/LSLIPathHelper.cs
View file

@ -144,7 +144,7 @@ namespace LSLEditor.Helpers
return filename; return filename;
} }
private static string RemoveDotInFrontOfFilename(string filename) public static string RemoveDotInFrontOfFilename(string filename)
{ {
int afterLastIndexOfSeperator = (filename.LastIndexOf('\\') > filename.LastIndexOf('/') ? filename.LastIndexOf('\\') : filename.LastIndexOf('/')) + 1; int afterLastIndexOfSeperator = (filename.LastIndexOf('\\') > filename.LastIndexOf('/') ? filename.LastIndexOf('\\') : filename.LastIndexOf('/')) + 1;

86
trunk/LSLEditorForm.Designer.cs generated
View file

@ -69,6 +69,8 @@ namespace LSLEditor
this.saveToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.saveToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.saveAsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.saveAsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.SaveAllToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.SaveAllToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.toolStripSeparator11 = new System.Windows.Forms.ToolStripSeparator();
this.toolStripMenuItem2 = new System.Windows.Forms.ToolStripMenuItem();
this.toolStripSeparator3 = new System.Windows.Forms.ToolStripSeparator(); this.toolStripSeparator3 = new System.Windows.Forms.ToolStripSeparator();
this.pageSettingsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.pageSettingsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.printPreviewtoolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.printPreviewtoolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
@ -106,6 +108,7 @@ namespace LSLEditor
this.toolStripSeparator10 = new System.Windows.Forms.ToolStripSeparator(); this.toolStripSeparator10 = new System.Windows.Forms.ToolStripSeparator();
this.CollapseToLSLIToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.CollapseToLSLIToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.expandToLSLToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.expandToLSLToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.viewLSLIToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.viewlStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.viewlStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.solutionExplorerToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.solutionExplorerToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.outlineToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.outlineToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
@ -146,7 +149,6 @@ namespace LSLEditor
this.pageSetupDialog1 = new System.Windows.Forms.PageSetupDialog(); this.pageSetupDialog1 = new System.Windows.Forms.PageSetupDialog();
this.openSolutionFilesDialog = new System.Windows.Forms.OpenFileDialog(); this.openSolutionFilesDialog = new System.Windows.Forms.OpenFileDialog();
this.toolTip1 = new System.Windows.Forms.ToolTip(this.components); this.toolTip1 = new System.Windows.Forms.ToolTip(this.components);
this.viewLSLIToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.dockPanel = new LSLEditor.Docking.DockPanel(); this.dockPanel = new LSLEditor.Docking.DockPanel();
this.menuStrip1.SuspendLayout(); this.menuStrip1.SuspendLayout();
this.statusStrip1.SuspendLayout(); this.statusStrip1.SuspendLayout();
@ -186,6 +188,8 @@ namespace LSLEditor
this.saveToolStripMenuItem, this.saveToolStripMenuItem,
this.saveAsToolStripMenuItem, this.saveAsToolStripMenuItem,
this.SaveAllToolStripMenuItem, this.SaveAllToolStripMenuItem,
this.toolStripSeparator11,
this.toolStripMenuItem2,
this.toolStripSeparator3, this.toolStripSeparator3,
this.pageSettingsToolStripMenuItem, this.pageSettingsToolStripMenuItem,
this.printPreviewtoolStripMenuItem, this.printPreviewtoolStripMenuItem,
@ -209,7 +213,7 @@ namespace LSLEditor
this.newFileToolStripMenuItem, this.newFileToolStripMenuItem,
this.notecardToolStripMenuItem}); this.notecardToolStripMenuItem});
this.newToolStripMenuItem.Name = "newToolStripMenuItem"; this.newToolStripMenuItem.Name = "newToolStripMenuItem";
this.newToolStripMenuItem.Size = new System.Drawing.Size(187, 22); this.newToolStripMenuItem.Size = new System.Drawing.Size(191, 22);
this.newToolStripMenuItem.Text = "New"; this.newToolStripMenuItem.Text = "New";
// //
// newProjectToolStripMenuItem // newProjectToolStripMenuItem
@ -244,7 +248,7 @@ namespace LSLEditor
this.openNotecardFilesToolStripMenuItem, this.openNotecardFilesToolStripMenuItem,
this.openScriptFilesToolStripMenuItem}); this.openScriptFilesToolStripMenuItem});
this.openToolStripMenuItem.Name = "openToolStripMenuItem"; this.openToolStripMenuItem.Name = "openToolStripMenuItem";
this.openToolStripMenuItem.Size = new System.Drawing.Size(187, 22); this.openToolStripMenuItem.Size = new System.Drawing.Size(191, 22);
this.openToolStripMenuItem.Text = "Open"; this.openToolStripMenuItem.Text = "Open";
// //
// openProjectSolutionToolStripMenuItem // openProjectSolutionToolStripMenuItem
@ -278,7 +282,7 @@ namespace LSLEditor
// toolStripSeparator5 // toolStripSeparator5
// //
this.toolStripSeparator5.Name = "toolStripSeparator5"; this.toolStripSeparator5.Name = "toolStripSeparator5";
this.toolStripSeparator5.Size = new System.Drawing.Size(184, 6); this.toolStripSeparator5.Size = new System.Drawing.Size(188, 6);
// //
// addToolStripMenuItem // addToolStripMenuItem
// //
@ -287,7 +291,7 @@ namespace LSLEditor
this.toolStripSeparator19, this.toolStripSeparator19,
this.existingProjectToolStripMenuItem}); this.existingProjectToolStripMenuItem});
this.addToolStripMenuItem.Name = "addToolStripMenuItem"; this.addToolStripMenuItem.Name = "addToolStripMenuItem";
this.addToolStripMenuItem.Size = new System.Drawing.Size(187, 22); this.addToolStripMenuItem.Size = new System.Drawing.Size(191, 22);
this.addToolStripMenuItem.Text = "Add"; this.addToolStripMenuItem.Text = "Add";
this.addToolStripMenuItem.Visible = false; this.addToolStripMenuItem.Visible = false;
// //
@ -313,14 +317,14 @@ namespace LSLEditor
// addToolStripSeparator // addToolStripSeparator
// //
this.addToolStripSeparator.Name = "addToolStripSeparator"; this.addToolStripSeparator.Name = "addToolStripSeparator";
this.addToolStripSeparator.Size = new System.Drawing.Size(184, 6); this.addToolStripSeparator.Size = new System.Drawing.Size(188, 6);
this.addToolStripSeparator.Visible = false; this.addToolStripSeparator.Visible = false;
// //
// closeFileToolStripMenuItem // closeFileToolStripMenuItem
// //
this.closeFileToolStripMenuItem.Name = "closeFileToolStripMenuItem"; this.closeFileToolStripMenuItem.Name = "closeFileToolStripMenuItem";
this.closeFileToolStripMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.W))); this.closeFileToolStripMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.W)));
this.closeFileToolStripMenuItem.Size = new System.Drawing.Size(187, 22); this.closeFileToolStripMenuItem.Size = new System.Drawing.Size(191, 22);
this.closeFileToolStripMenuItem.Text = "Close"; this.closeFileToolStripMenuItem.Text = "Close";
this.closeFileToolStripMenuItem.Click += new System.EventHandler(this.closeFileToolStripMenuItem_Click); this.closeFileToolStripMenuItem.Click += new System.EventHandler(this.closeFileToolStripMenuItem_Click);
// //
@ -328,40 +332,40 @@ namespace LSLEditor
// //
this.closeSolutiontoolStripMenuItem.Enabled = false; this.closeSolutiontoolStripMenuItem.Enabled = false;
this.closeSolutiontoolStripMenuItem.Name = "closeSolutiontoolStripMenuItem"; this.closeSolutiontoolStripMenuItem.Name = "closeSolutiontoolStripMenuItem";
this.closeSolutiontoolStripMenuItem.Size = new System.Drawing.Size(187, 22); this.closeSolutiontoolStripMenuItem.Size = new System.Drawing.Size(191, 22);
this.closeSolutiontoolStripMenuItem.Text = "Close Solution"; this.closeSolutiontoolStripMenuItem.Text = "Close Solution";
this.closeSolutiontoolStripMenuItem.Click += new System.EventHandler(this.closeSolutiontoolStripMenuItem_Click); this.closeSolutiontoolStripMenuItem.Click += new System.EventHandler(this.closeSolutiontoolStripMenuItem_Click);
// //
// toolStripSeparator20 // toolStripSeparator20
// //
this.toolStripSeparator20.Name = "toolStripSeparator20"; this.toolStripSeparator20.Name = "toolStripSeparator20";
this.toolStripSeparator20.Size = new System.Drawing.Size(184, 6); this.toolStripSeparator20.Size = new System.Drawing.Size(188, 6);
// //
// importExampleToolStripMenuItem // importExampleToolStripMenuItem
// //
this.importExampleToolStripMenuItem.Name = "importExampleToolStripMenuItem"; this.importExampleToolStripMenuItem.Name = "importExampleToolStripMenuItem";
this.importExampleToolStripMenuItem.Size = new System.Drawing.Size(187, 22); this.importExampleToolStripMenuItem.Size = new System.Drawing.Size(191, 22);
this.importExampleToolStripMenuItem.Text = "Import Example..."; this.importExampleToolStripMenuItem.Text = "Import Example...";
this.importExampleToolStripMenuItem.Click += new System.EventHandler(this.importExampleToolStripMenuItem_Click); this.importExampleToolStripMenuItem.Click += new System.EventHandler(this.importExampleToolStripMenuItem_Click);
// //
// toolStripSeparator4 // toolStripSeparator4
// //
this.toolStripSeparator4.Name = "toolStripSeparator4"; this.toolStripSeparator4.Name = "toolStripSeparator4";
this.toolStripSeparator4.Size = new System.Drawing.Size(184, 6); this.toolStripSeparator4.Size = new System.Drawing.Size(188, 6);
// //
// saveToolStripMenuItem // saveToolStripMenuItem
// //
this.saveToolStripMenuItem.Image = global::LSLEditor.Properties.Resources.SAVE; this.saveToolStripMenuItem.Image = global::LSLEditor.Properties.Resources.SAVE;
this.saveToolStripMenuItem.Name = "saveToolStripMenuItem"; this.saveToolStripMenuItem.Name = "saveToolStripMenuItem";
this.saveToolStripMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.S))); this.saveToolStripMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.S)));
this.saveToolStripMenuItem.Size = new System.Drawing.Size(187, 22); this.saveToolStripMenuItem.Size = new System.Drawing.Size(191, 22);
this.saveToolStripMenuItem.Text = "Save"; this.saveToolStripMenuItem.Text = "Save";
this.saveToolStripMenuItem.Click += new System.EventHandler(this.saveToolStripMenuItem_Click); this.saveToolStripMenuItem.Click += new System.EventHandler(this.saveToolStripMenuItem_Click);
// //
// saveAsToolStripMenuItem // saveAsToolStripMenuItem
// //
this.saveAsToolStripMenuItem.Name = "saveAsToolStripMenuItem"; this.saveAsToolStripMenuItem.Name = "saveAsToolStripMenuItem";
this.saveAsToolStripMenuItem.Size = new System.Drawing.Size(187, 22); this.saveAsToolStripMenuItem.Size = new System.Drawing.Size(191, 22);
this.saveAsToolStripMenuItem.Text = "Save As..."; this.saveAsToolStripMenuItem.Text = "Save As...";
this.saveAsToolStripMenuItem.Click += new System.EventHandler(this.saveAsToolStripMenuItem_Click); this.saveAsToolStripMenuItem.Click += new System.EventHandler(this.saveAsToolStripMenuItem_Click);
// //
@ -371,26 +375,40 @@ namespace LSLEditor
this.SaveAllToolStripMenuItem.Name = "SaveAllToolStripMenuItem"; this.SaveAllToolStripMenuItem.Name = "SaveAllToolStripMenuItem";
this.SaveAllToolStripMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)(((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.Shift) this.SaveAllToolStripMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)(((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.Shift)
| System.Windows.Forms.Keys.S))); | System.Windows.Forms.Keys.S)));
this.SaveAllToolStripMenuItem.Size = new System.Drawing.Size(187, 22); this.SaveAllToolStripMenuItem.Size = new System.Drawing.Size(191, 22);
this.SaveAllToolStripMenuItem.Text = "Save All"; this.SaveAllToolStripMenuItem.Text = "Save All";
this.SaveAllToolStripMenuItem.Click += new System.EventHandler(this.SaveAllToolStripMenuItem_Click); this.SaveAllToolStripMenuItem.Click += new System.EventHandler(this.SaveAllToolStripMenuItem_Click);
// //
// toolStripSeparator11
//
this.toolStripSeparator11.Name = "toolStripSeparator11";
this.toolStripSeparator11.Size = new System.Drawing.Size(188, 6);
//
// toolStripMenuItem2
//
this.toolStripMenuItem2.Image = global::LSLEditor.Properties.Resources.export_file_32;
this.toolStripMenuItem2.Name = "toolStripMenuItem2";
this.toolStripMenuItem2.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.E)));
this.toolStripMenuItem2.Size = new System.Drawing.Size(191, 22);
this.toolStripMenuItem2.Text = "Export to LSL...";
this.toolStripMenuItem2.Click += new System.EventHandler(this.toolStripMenuItem2_Click);
//
// toolStripSeparator3 // toolStripSeparator3
// //
this.toolStripSeparator3.Name = "toolStripSeparator3"; this.toolStripSeparator3.Name = "toolStripSeparator3";
this.toolStripSeparator3.Size = new System.Drawing.Size(184, 6); this.toolStripSeparator3.Size = new System.Drawing.Size(188, 6);
// //
// pageSettingsToolStripMenuItem // pageSettingsToolStripMenuItem
// //
this.pageSettingsToolStripMenuItem.Name = "pageSettingsToolStripMenuItem"; this.pageSettingsToolStripMenuItem.Name = "pageSettingsToolStripMenuItem";
this.pageSettingsToolStripMenuItem.Size = new System.Drawing.Size(187, 22); this.pageSettingsToolStripMenuItem.Size = new System.Drawing.Size(191, 22);
this.pageSettingsToolStripMenuItem.Text = "Page settings..."; this.pageSettingsToolStripMenuItem.Text = "Page settings...";
this.pageSettingsToolStripMenuItem.Click += new System.EventHandler(this.pageSettingsToolStripMenuItem_Click); this.pageSettingsToolStripMenuItem.Click += new System.EventHandler(this.pageSettingsToolStripMenuItem_Click);
// //
// printPreviewtoolStripMenuItem // printPreviewtoolStripMenuItem
// //
this.printPreviewtoolStripMenuItem.Name = "printPreviewtoolStripMenuItem"; this.printPreviewtoolStripMenuItem.Name = "printPreviewtoolStripMenuItem";
this.printPreviewtoolStripMenuItem.Size = new System.Drawing.Size(187, 22); this.printPreviewtoolStripMenuItem.Size = new System.Drawing.Size(191, 22);
this.printPreviewtoolStripMenuItem.Text = "Print Preview..."; this.printPreviewtoolStripMenuItem.Text = "Print Preview...";
this.printPreviewtoolStripMenuItem.Click += new System.EventHandler(this.printPreviewtoolStripMenuItem_Click); this.printPreviewtoolStripMenuItem.Click += new System.EventHandler(this.printPreviewtoolStripMenuItem_Click);
// //
@ -399,45 +417,45 @@ namespace LSLEditor
this.printToolStripMenuItem.Image = global::LSLEditor.Properties.Resources.PRINT; this.printToolStripMenuItem.Image = global::LSLEditor.Properties.Resources.PRINT;
this.printToolStripMenuItem.Name = "printToolStripMenuItem"; this.printToolStripMenuItem.Name = "printToolStripMenuItem";
this.printToolStripMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.P))); this.printToolStripMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.P)));
this.printToolStripMenuItem.Size = new System.Drawing.Size(187, 22); this.printToolStripMenuItem.Size = new System.Drawing.Size(191, 22);
this.printToolStripMenuItem.Text = "Print..."; this.printToolStripMenuItem.Text = "Print...";
this.printToolStripMenuItem.Click += new System.EventHandler(this.printToolStripMenuItem_Click); this.printToolStripMenuItem.Click += new System.EventHandler(this.printToolStripMenuItem_Click);
// //
// toolStripSeparator2 // toolStripSeparator2
// //
this.toolStripSeparator2.Name = "toolStripSeparator2"; this.toolStripSeparator2.Name = "toolStripSeparator2";
this.toolStripSeparator2.Size = new System.Drawing.Size(184, 6); this.toolStripSeparator2.Size = new System.Drawing.Size(188, 6);
// //
// copyToClipboardToolStripMenuItem // copyToClipboardToolStripMenuItem
// //
this.copyToClipboardToolStripMenuItem.Name = "copyToClipboardToolStripMenuItem"; this.copyToClipboardToolStripMenuItem.Name = "copyToClipboardToolStripMenuItem";
this.copyToClipboardToolStripMenuItem.Size = new System.Drawing.Size(187, 22); this.copyToClipboardToolStripMenuItem.Size = new System.Drawing.Size(191, 22);
this.copyToClipboardToolStripMenuItem.Text = "Copy to clipboard"; this.copyToClipboardToolStripMenuItem.Text = "Copy to clipboard";
this.copyToClipboardToolStripMenuItem.Click += new System.EventHandler(this.copyToClipboardToolStripMenuItem_Click); this.copyToClipboardToolStripMenuItem.Click += new System.EventHandler(this.copyToClipboardToolStripMenuItem_Click);
// //
// toolStripSeparator1 // toolStripSeparator1
// //
this.toolStripSeparator1.Name = "toolStripSeparator1"; this.toolStripSeparator1.Name = "toolStripSeparator1";
this.toolStripSeparator1.Size = new System.Drawing.Size(184, 6); this.toolStripSeparator1.Size = new System.Drawing.Size(188, 6);
// //
// recentFileToolStripMenuItem // recentFileToolStripMenuItem
// //
this.recentFileToolStripMenuItem.Name = "recentFileToolStripMenuItem"; this.recentFileToolStripMenuItem.Name = "recentFileToolStripMenuItem";
this.recentFileToolStripMenuItem.Size = new System.Drawing.Size(187, 22); this.recentFileToolStripMenuItem.Size = new System.Drawing.Size(191, 22);
this.recentFileToolStripMenuItem.Text = "Recent Files"; this.recentFileToolStripMenuItem.Text = "Recent Files";
this.recentFileToolStripMenuItem.DropDownItemClicked += new System.Windows.Forms.ToolStripItemClickedEventHandler(this.recentFileToolStripMenuItem_DropDownItemClicked); this.recentFileToolStripMenuItem.DropDownItemClicked += new System.Windows.Forms.ToolStripItemClickedEventHandler(this.recentFileToolStripMenuItem_DropDownItemClicked);
// //
// recentProjectToolStripMenuItem // recentProjectToolStripMenuItem
// //
this.recentProjectToolStripMenuItem.Name = "recentProjectToolStripMenuItem"; this.recentProjectToolStripMenuItem.Name = "recentProjectToolStripMenuItem";
this.recentProjectToolStripMenuItem.Size = new System.Drawing.Size(187, 22); this.recentProjectToolStripMenuItem.Size = new System.Drawing.Size(191, 22);
this.recentProjectToolStripMenuItem.Text = "Recent Solutions"; this.recentProjectToolStripMenuItem.Text = "Recent Solutions";
this.recentProjectToolStripMenuItem.DropDownItemClicked += new System.Windows.Forms.ToolStripItemClickedEventHandler(this.recentProjectToolStripMenuItem_DropDownItemClicked); this.recentProjectToolStripMenuItem.DropDownItemClicked += new System.Windows.Forms.ToolStripItemClickedEventHandler(this.recentProjectToolStripMenuItem_DropDownItemClicked);
// //
// toolStripSeparator21 // toolStripSeparator21
// //
this.toolStripSeparator21.Name = "toolStripSeparator21"; this.toolStripSeparator21.Name = "toolStripSeparator21";
this.toolStripSeparator21.Size = new System.Drawing.Size(184, 6); this.toolStripSeparator21.Size = new System.Drawing.Size(188, 6);
// //
// exitToolStripMenuItem // exitToolStripMenuItem
// //
@ -445,7 +463,7 @@ namespace LSLEditor
this.exitToolStripMenuItem.ShortcutKeyDisplayString = ""; this.exitToolStripMenuItem.ShortcutKeyDisplayString = "";
this.exitToolStripMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Alt | System.Windows.Forms.Keys.F4))); this.exitToolStripMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Alt | System.Windows.Forms.Keys.F4)));
this.exitToolStripMenuItem.ShowShortcutKeys = false; this.exitToolStripMenuItem.ShowShortcutKeys = false;
this.exitToolStripMenuItem.Size = new System.Drawing.Size(187, 22); this.exitToolStripMenuItem.Size = new System.Drawing.Size(191, 22);
this.exitToolStripMenuItem.Text = "Exit"; this.exitToolStripMenuItem.Text = "Exit";
this.exitToolStripMenuItem.Click += new System.EventHandler(this.exitToolStripMenuItem_Click); this.exitToolStripMenuItem.Click += new System.EventHandler(this.exitToolStripMenuItem_Click);
// //
@ -675,6 +693,14 @@ namespace LSLEditor
this.expandToLSLToolStripMenuItem.Text = "Expand to LSL"; this.expandToLSLToolStripMenuItem.Text = "Expand to LSL";
this.expandToLSLToolStripMenuItem.Click += new System.EventHandler(this.expandToLSLToolStripMenuItem_Click); this.expandToLSLToolStripMenuItem.Click += new System.EventHandler(this.expandToLSLToolStripMenuItem_Click);
// //
// viewLSLIToolStripMenuItem
//
this.viewLSLIToolStripMenuItem.Name = "viewLSLIToolStripMenuItem";
this.viewLSLIToolStripMenuItem.ShortcutKeys = System.Windows.Forms.Keys.F12;
this.viewLSLIToolStripMenuItem.Size = new System.Drawing.Size(225, 22);
this.viewLSLIToolStripMenuItem.Text = "View LSLI";
this.viewLSLIToolStripMenuItem.Click += new System.EventHandler(this.viewLSLIToolStripMenuItem_Click);
//
// viewlStripMenuItem // viewlStripMenuItem
// //
this.viewlStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { this.viewlStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
@ -941,14 +967,6 @@ namespace LSLEditor
// //
this.openSolutionFilesDialog.FileName = "openFileDialog2"; this.openSolutionFilesDialog.FileName = "openFileDialog2";
// //
// viewLSLIToolStripMenuItem
//
this.viewLSLIToolStripMenuItem.Name = "viewLSLIToolStripMenuItem";
this.viewLSLIToolStripMenuItem.ShortcutKeys = System.Windows.Forms.Keys.F12;
this.viewLSLIToolStripMenuItem.Size = new System.Drawing.Size(225, 22);
this.viewLSLIToolStripMenuItem.Text = "View LSLI";
this.viewLSLIToolStripMenuItem.Click += new System.EventHandler(this.viewLSLIToolStripMenuItem_Click);
//
// dockPanel // dockPanel
// //
this.dockPanel.ActiveAutoHideContent = null; this.dockPanel.ActiveAutoHideContent = null;
@ -1137,5 +1155,7 @@ namespace LSLEditor
private System.Windows.Forms.ToolStripMenuItem CollapseToLSLIToolStripMenuItem; private System.Windows.Forms.ToolStripMenuItem CollapseToLSLIToolStripMenuItem;
private System.Windows.Forms.ToolStripMenuItem expandToLSLToolStripMenuItem; private System.Windows.Forms.ToolStripMenuItem expandToLSLToolStripMenuItem;
private System.Windows.Forms.ToolStripMenuItem viewLSLIToolStripMenuItem; private System.Windows.Forms.ToolStripMenuItem viewLSLIToolStripMenuItem;
private System.Windows.Forms.ToolStripSeparator toolStripSeparator11;
private System.Windows.Forms.ToolStripMenuItem toolStripMenuItem2;
} }
} }

41
trunk/LSLEditorForm.cs
View file

@ -279,7 +279,7 @@ namespace LSLEditor
{ {
string fileFilterNotes = "Notecard files (*.txt)|*.txt|All files (*.*)|*.*"; string fileFilterNotes = "Notecard files (*.txt)|*.txt|All files (*.*)|*.*";
string fileFilterScripts = "Secondlife script files (*.lsl;*.lsli)|*.lsl;*.lsli|All files (*.*)|*.*"; string fileFilterScripts = "Secondlife script files (*.lsl;*.lsli)|*.lsl;*.lsli|All files (*.*)|*.*";
string fileFilterSolutions = "LSLEditor Solution File (*.sol)|*.sol|All Files (*.*)|*.*"; string fileFilterSolutions = "LSLEditor Solution File (*.sol)|*.sol|All Files (*.*)|*.*";
this.ConfLSL = GetXmlFromResource(Properties.Settings.Default.ConfLSL); this.ConfLSL = GetXmlFromResource(Properties.Settings.Default.ConfLSL);
this.ConfCSharp = GetXmlFromResource(Properties.Settings.Default.ConfCSharp); this.ConfCSharp = GetXmlFromResource(Properties.Settings.Default.ConfCSharp);
@ -1750,7 +1750,21 @@ namespace LSLEditor
private void fileToolStripMenuItem_Click(object sender, EventArgs e) private void fileToolStripMenuItem_Click(object sender, EventArgs e)
{ {
SetupFileMenu(); EditForm editForm = this.ActiveMdiForm as EditForm;
if (editForm != null)
{
if (Helpers.LSLIPathHelper.IsLSLI(editForm.ScriptName) || Helpers.LSLIPathHelper.IsExpandedLSL(editForm.ScriptName))
{
toolStripMenuItem2.Enabled = true;
}
else
{
toolStripMenuItem2.Enabled = false;
}
}
SetupFileMenu();
} }
private void forumStripMenuItem_Click(object sender, EventArgs e) private void forumStripMenuItem_Click(object sender, EventArgs e)
@ -1919,5 +1933,28 @@ namespace LSLEditor
} }
} }
} }
private void toolStripMenuItem2_Click(object sender, EventArgs e)
{
StreamWriter streamWriter;
SaveFileDialog saveFileDialog1 = new SaveFileDialog();
EditForm editForm = this.ActiveMdiForm as EditForm;
saveFileDialog1.Filter = "Secondlife script files (*.lsl)|*.lsl";
saveFileDialog1.FileName = Helpers.LSLIPathHelper.RemoveDotInFrontOfFilename(Helpers.LSLIPathHelper.RemoveExpandedSubExtension(
Path.GetFileNameWithoutExtension(editForm.ScriptName))) + Helpers.LSLIConverter.LSL_EXT;
saveFileDialog1.RestoreDirectory = true;
saveFileDialog1.Title = "Export to LSL";
if (saveFileDialog1.ShowDialog() == DialogResult.OK)
{
if ((streamWriter = new StreamWriter(saveFileDialog1.OpenFile())) != null)
{
Helpers.LSLIConverter lsliConverter = new Helpers.LSLIConverter();
streamWriter.Write(lsliConverter.ExpandToLSL(editForm, false));
streamWriter.Close();
}
}
}
} }
} }

4
trunk/Properties/AssemblyInfo.cs
View file

@ -70,7 +70,7 @@ using System.Runtime.InteropServices;
// 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.55.0.549")] [assembly: AssemblyVersion("2.55.0.590")]
// //
// 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
@ -100,4 +100,4 @@ using System.Runtime.InteropServices;
[assembly: AssemblyDelaySign(false)] [assembly: AssemblyDelaySign(false)]
//[assembly: AssemblyKeyName("")] //[assembly: AssemblyKeyName("")]
[assembly: ComVisibleAttribute(false)] [assembly: ComVisibleAttribute(false)]
[assembly: AssemblyFileVersionAttribute("2.55.0.549")] [assembly: AssemblyFileVersionAttribute("2.55.0.590")]

77
trunk/Properties/Resources.Designer.cs generated
View file

@ -1,7 +1,7 @@
//------------------------------------------------------------------------------ //------------------------------------------------------------------------------
// <auto-generated> // <auto-generated>
// This code was generated by a tool. // This code was generated by a tool.
// Runtime Version:4.0.30319.296 // Runtime Version:4.0.30319.42000
// //
// Changes to this file may cause incorrect behavior and will be lost if // Changes to this file may cause incorrect behavior and will be lost if
// the code is regenerated. // the code is regenerated.
@ -19,7 +19,7 @@ namespace LSLEditor.Properties {
// class via a tool like ResGen or Visual Studio. // class via a tool like ResGen or Visual Studio.
// To add or remove a member, edit your .ResX file then rerun ResGen // To add or remove a member, edit your .ResX file then rerun ResGen
// with the /str option, or rebuild your VS project. // with the /str option, or rebuild your VS project.
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0")] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "15.0.0.0")]
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
internal class Resources { internal class Resources {
@ -60,6 +60,9 @@ namespace LSLEditor.Properties {
} }
} }
/// <summary>
/// Looks up a localized resource of type System.Drawing.Bitmap.
/// </summary>
internal static System.Drawing.Bitmap ADDITEM { internal static System.Drawing.Bitmap ADDITEM {
get { get {
object obj = ResourceManager.GetObject("ADDITEM", resourceCulture); object obj = ResourceManager.GetObject("ADDITEM", resourceCulture);
@ -67,6 +70,9 @@ namespace LSLEditor.Properties {
} }
} }
/// <summary>
/// Looks up a localized resource of type System.Drawing.Bitmap.
/// </summary>
internal static System.Drawing.Bitmap COPY { internal static System.Drawing.Bitmap COPY {
get { get {
object obj = ResourceManager.GetObject("COPY", resourceCulture); object obj = ResourceManager.GetObject("COPY", resourceCulture);
@ -74,6 +80,9 @@ namespace LSLEditor.Properties {
} }
} }
/// <summary>
/// Looks up a localized resource of type System.Drawing.Bitmap.
/// </summary>
internal static System.Drawing.Bitmap CUT { internal static System.Drawing.Bitmap CUT {
get { get {
object obj = ResourceManager.GetObject("CUT", resourceCulture); object obj = ResourceManager.GetObject("CUT", resourceCulture);
@ -81,6 +90,9 @@ namespace LSLEditor.Properties {
} }
} }
/// <summary>
/// Looks up a localized resource of type System.Drawing.Bitmap.
/// </summary>
internal static System.Drawing.Bitmap DEINDENT { internal static System.Drawing.Bitmap DEINDENT {
get { get {
object obj = ResourceManager.GetObject("DEINDENT", resourceCulture); object obj = ResourceManager.GetObject("DEINDENT", resourceCulture);
@ -88,6 +100,9 @@ namespace LSLEditor.Properties {
} }
} }
/// <summary>
/// Looks up a localized resource of type System.Drawing.Bitmap.
/// </summary>
internal static System.Drawing.Bitmap DELETE { internal static System.Drawing.Bitmap DELETE {
get { get {
object obj = ResourceManager.GetObject("DELETE", resourceCulture); object obj = ResourceManager.GetObject("DELETE", resourceCulture);
@ -95,6 +110,9 @@ namespace LSLEditor.Properties {
} }
} }
/// <summary>
/// Looks up a localized resource of type System.Drawing.Bitmap.
/// </summary>
internal static System.Drawing.Bitmap END { internal static System.Drawing.Bitmap END {
get { get {
object obj = ResourceManager.GetObject("END", resourceCulture); object obj = ResourceManager.GetObject("END", resourceCulture);
@ -102,6 +120,19 @@ namespace LSLEditor.Properties {
} }
} }
/// <summary>
/// Looks up a localized resource of type System.Drawing.Bitmap.
/// </summary>
internal static System.Drawing.Bitmap export_file_32 {
get {
object obj = ResourceManager.GetObject("export_file-32", resourceCulture);
return ((System.Drawing.Bitmap)(obj));
}
}
/// <summary>
/// Looks up a localized resource of type System.Drawing.Bitmap.
/// </summary>
internal static System.Drawing.Bitmap FIND { internal static System.Drawing.Bitmap FIND {
get { get {
object obj = ResourceManager.GetObject("FIND", resourceCulture); object obj = ResourceManager.GetObject("FIND", resourceCulture);
@ -109,6 +140,9 @@ namespace LSLEditor.Properties {
} }
} }
/// <summary>
/// Looks up a localized resource of type System.Drawing.Bitmap.
/// </summary>
internal static System.Drawing.Bitmap ININDENT { internal static System.Drawing.Bitmap ININDENT {
get { get {
object obj = ResourceManager.GetObject("ININDENT", resourceCulture); object obj = ResourceManager.GetObject("ININDENT", resourceCulture);
@ -116,6 +150,9 @@ namespace LSLEditor.Properties {
} }
} }
/// <summary>
/// Looks up a localized resource of type System.Drawing.Bitmap.
/// </summary>
internal static System.Drawing.Bitmap logo { internal static System.Drawing.Bitmap logo {
get { get {
object obj = ResourceManager.GetObject("logo", resourceCulture); object obj = ResourceManager.GetObject("logo", resourceCulture);
@ -123,6 +160,9 @@ namespace LSLEditor.Properties {
} }
} }
/// <summary>
/// Looks up a localized resource of type System.Drawing.Bitmap.
/// </summary>
internal static System.Drawing.Bitmap NEWDOC { internal static System.Drawing.Bitmap NEWDOC {
get { get {
object obj = ResourceManager.GetObject("NEWDOC", resourceCulture); object obj = ResourceManager.GetObject("NEWDOC", resourceCulture);
@ -130,6 +170,9 @@ namespace LSLEditor.Properties {
} }
} }
/// <summary>
/// Looks up a localized resource of type System.Drawing.Bitmap.
/// </summary>
internal static System.Drawing.Bitmap NEWPROJ { internal static System.Drawing.Bitmap NEWPROJ {
get { get {
object obj = ResourceManager.GetObject("NEWPROJ", resourceCulture); object obj = ResourceManager.GetObject("NEWPROJ", resourceCulture);
@ -137,6 +180,9 @@ namespace LSLEditor.Properties {
} }
} }
/// <summary>
/// Looks up a localized resource of type System.Drawing.Bitmap.
/// </summary>
internal static System.Drawing.Bitmap OPEN { internal static System.Drawing.Bitmap OPEN {
get { get {
object obj = ResourceManager.GetObject("OPEN", resourceCulture); object obj = ResourceManager.GetObject("OPEN", resourceCulture);
@ -144,6 +190,9 @@ namespace LSLEditor.Properties {
} }
} }
/// <summary>
/// Looks up a localized resource of type System.Drawing.Bitmap.
/// </summary>
internal static System.Drawing.Bitmap PASTE { internal static System.Drawing.Bitmap PASTE {
get { get {
object obj = ResourceManager.GetObject("PASTE", resourceCulture); object obj = ResourceManager.GetObject("PASTE", resourceCulture);
@ -151,6 +200,9 @@ namespace LSLEditor.Properties {
} }
} }
/// <summary>
/// Looks up a localized resource of type System.Drawing.Bitmap.
/// </summary>
internal static System.Drawing.Bitmap PRINT { internal static System.Drawing.Bitmap PRINT {
get { get {
object obj = ResourceManager.GetObject("PRINT", resourceCulture); object obj = ResourceManager.GetObject("PRINT", resourceCulture);
@ -158,6 +210,9 @@ namespace LSLEditor.Properties {
} }
} }
/// <summary>
/// Looks up a localized resource of type System.Drawing.Bitmap.
/// </summary>
internal static System.Drawing.Bitmap PROJECT { internal static System.Drawing.Bitmap PROJECT {
get { get {
object obj = ResourceManager.GetObject("PROJECT", resourceCulture); object obj = ResourceManager.GetObject("PROJECT", resourceCulture);
@ -165,6 +220,9 @@ namespace LSLEditor.Properties {
} }
} }
/// <summary>
/// Looks up a localized resource of type System.Drawing.Bitmap.
/// </summary>
internal static System.Drawing.Bitmap PROPS { internal static System.Drawing.Bitmap PROPS {
get { get {
object obj = ResourceManager.GetObject("PROPS", resourceCulture); object obj = ResourceManager.GetObject("PROPS", resourceCulture);
@ -172,6 +230,9 @@ namespace LSLEditor.Properties {
} }
} }
/// <summary>
/// Looks up a localized resource of type System.Drawing.Bitmap.
/// </summary>
internal static System.Drawing.Bitmap REDO { internal static System.Drawing.Bitmap REDO {
get { get {
object obj = ResourceManager.GetObject("REDO", resourceCulture); object obj = ResourceManager.GetObject("REDO", resourceCulture);
@ -179,6 +240,9 @@ namespace LSLEditor.Properties {
} }
} }
/// <summary>
/// Looks up a localized resource of type System.Drawing.Bitmap.
/// </summary>
internal static System.Drawing.Bitmap SAVE { internal static System.Drawing.Bitmap SAVE {
get { get {
object obj = ResourceManager.GetObject("SAVE", resourceCulture); object obj = ResourceManager.GetObject("SAVE", resourceCulture);
@ -186,6 +250,9 @@ namespace LSLEditor.Properties {
} }
} }
/// <summary>
/// Looks up a localized resource of type System.Drawing.Bitmap.
/// </summary>
internal static System.Drawing.Bitmap SAVEAS { internal static System.Drawing.Bitmap SAVEAS {
get { get {
object obj = ResourceManager.GetObject("SAVEAS", resourceCulture); object obj = ResourceManager.GetObject("SAVEAS", resourceCulture);
@ -193,6 +260,9 @@ namespace LSLEditor.Properties {
} }
} }
/// <summary>
/// Looks up a localized resource of type System.Drawing.Bitmap.
/// </summary>
internal static System.Drawing.Bitmap START { internal static System.Drawing.Bitmap START {
get { get {
object obj = ResourceManager.GetObject("START", resourceCulture); object obj = ResourceManager.GetObject("START", resourceCulture);
@ -200,6 +270,9 @@ namespace LSLEditor.Properties {
} }
} }
/// <summary>
/// Looks up a localized resource of type System.Drawing.Bitmap.
/// </summary>
internal static System.Drawing.Bitmap UNDO { internal static System.Drawing.Bitmap UNDO {
get { get {
object obj = ResourceManager.GetObject("UNDO", resourceCulture); object obj = ResourceManager.GetObject("UNDO", resourceCulture);

90
trunk/Properties/Resources.resx
View file

@ -118,47 +118,23 @@
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader> </resheader>
<assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" /> <assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
<data name="COPY" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\icons\copy.gif;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="logo" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Images\logo.gif;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="ININDENT" type="System.Resources.ResXFileRef, System.Windows.Forms"> <data name="ININDENT" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\icons\inindent.gif;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> <value>..\icons\inindent.gif;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data> </data>
<data name="DELETE" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\icons\delete.gif;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="NEWPROJ" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\icons\newproj.gif;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="PRINT" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\icons\print.gif;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="FIND" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\icons\find.gif;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="SAVE" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\icons\save.gif;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="NEWDOC" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\icons\newdoc.gif;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="DEINDENT" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\icons\deindent.gif;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="PASTE" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\icons\paste.gif;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="PROPS" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\icons\props.gif;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="END" type="System.Resources.ResXFileRef, System.Windows.Forms"> <data name="END" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\icons\end.gif;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> <value>..\icons\end.gif;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data> </data>
<data name="OPEN" type="System.Resources.ResXFileRef, System.Windows.Forms"> <data name="PROPS" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\icons\open.gif;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> <value>..\icons\props.gif;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="CUT" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\icons\cut.gif;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="FIND" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\icons\find.gif;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="UNDO" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\icons\undo.gif;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data> </data>
<data name="PROJECT" type="System.Resources.ResXFileRef, System.Windows.Forms"> <data name="PROJECT" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\icons\project.gif;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> <value>..\icons\project.gif;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
@ -166,19 +142,47 @@
<data name="REDO" type="System.Resources.ResXFileRef, System.Windows.Forms"> <data name="REDO" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\icons\redo.gif;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> <value>..\icons\redo.gif;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data> </data>
<data name="SAVEAS" type="System.Resources.ResXFileRef, System.Windows.Forms"> <data name="logo" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\icons\saveas.gif;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> <value>..\Images\logo.gif;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data> </data>
<data name="UNDO" type="System.Resources.ResXFileRef, System.Windows.Forms"> <data name="PASTE" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\icons\undo.gif;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> <value>..\icons\paste.gif;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data> </data>
<data name="START" type="System.Resources.ResXFileRef, System.Windows.Forms"> <data name="SAVE" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\icons\start.gif;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> <value>..\icons\save.gif;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data> </data>
<data name="CUT" type="System.Resources.ResXFileRef, System.Windows.Forms"> <data name="DELETE" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\icons\cut.gif;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> <value>..\icons\delete.gif;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="OPEN" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\icons\open.gif;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data> </data>
<data name="ADDITEM" type="System.Resources.ResXFileRef, System.Windows.Forms"> <data name="ADDITEM" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\icons\additem.gif;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> <value>..\icons\additem.gif;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data> </data>
<data name="NEWDOC" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\icons\newdoc.gif;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="DEINDENT" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\icons\deindent.gif;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="PRINT" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\icons\print.gif;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="START" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\icons\start.gif;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="SAVEAS" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\icons\saveas.gif;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="NEWPROJ" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\icons\newproj.gif;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="COPY" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\icons\copy.gif;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
<data name="export_file-32" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\export_file-32.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
</root> </root>

BIN
trunk/Resources/export_file-32.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 2.4 KiB

1
trunk/lsleditor.csproj
View file

@ -958,6 +958,7 @@
<EmbeddedResource Include="ImagesSolutionExplorer\Unknown.gif" /> <EmbeddedResource Include="ImagesSolutionExplorer\Unknown.gif" />
<EmbeddedResource Include="Images\Vars.gif" /> <EmbeddedResource Include="Images\Vars.gif" />
<EmbeddedResource Include="Images\States.gif" /> <EmbeddedResource Include="Images\States.gif" />
<None Include="Resources\export_file-32.png" />
<Content Include="Resource\App.ico" /> <Content Include="Resource\App.ico" />
<Content Include="Images\logo.gif" /> <Content Include="Images\logo.gif" />
<Content Include="LSLEditor.rc" /> <Content Include="LSLEditor.rc" />