diff --git a/trunk/Editor/SyntaxRichTextBox.cs b/trunk/Editor/SyntaxRichTextBox.cs index 14b8283..ac0162c 100644 --- a/trunk/Editor/SyntaxRichTextBox.cs +++ b/trunk/Editor/SyntaxRichTextBox.cs @@ -2038,7 +2038,7 @@ namespace LSLEditor using (StringReader reader = new StringReader(ttext)) { string line; - + int lineNumber = 0; while ((line = reader.ReadLine()) != null) { @@ -2048,42 +2048,41 @@ namespace LSLEditor string[] words = line.Split(' '); foreach (string word in words) { - Debug.WriteLine("ww:"+word); + //Debug.WriteLine("ww:" + word); if (keyWords.ContainsKeyWord(word)) { KeyWordInfo k = keyWords.GetKeyWordInfo(word); - Debug.WriteLine("w:"+word); - Debug.WriteLine("k:" + k.type); - if (!list.ContainsKey(lineNumber)) - { - switch (k.type) + // Debug.WriteLine("w:" + word); + //Debug.WriteLine("k:" + k.type); + if (!list.ContainsKey(lineNumber)) { - - case KeyWordTypeEnum.Functions: - list.Add(lineNumber, new LSLEditor.Helpers.OutlineHelper(k, lineNumber)); - // Debug.WriteLine(k); - break; - case KeyWordTypeEnum.Events: - list.Add(lineNumber, new LSLEditor.Helpers.OutlineHelper(k, lineNumber)); - break; - case KeyWordTypeEnum.Constants: - list.Add(lineNumber, new LSLEditor.Helpers.OutlineHelper(k, lineNumber)); - break; - case KeyWordTypeEnum.Class: - list.Add(lineNumber, new LSLEditor.Helpers.OutlineHelper(k, lineNumber)); - break; - case KeyWordTypeEnum.Vars: - list.Add(lineNumber, new LSLEditor.Helpers.OutlineHelper(k, lineNumber)); - break; - case KeyWordTypeEnum.States: - list.Add(lineNumber, new LSLEditor.Helpers.OutlineHelper(k, lineNumber)); - break; - default: + switch (k.type) + { - break; + case KeyWordTypeEnum.Functions: + list.Add(lineNumber, new LSLEditor.Helpers.OutlineHelper(k, lineNumber)); + // Debug.WriteLine(k); + break; + case KeyWordTypeEnum.Events: + list.Add(lineNumber, new LSLEditor.Helpers.OutlineHelper(k, lineNumber)); + break; + case KeyWordTypeEnum.Constants: + list.Add(lineNumber, new LSLEditor.Helpers.OutlineHelper(k, lineNumber)); + break; + case KeyWordTypeEnum.Class: + list.Add(lineNumber, new LSLEditor.Helpers.OutlineHelper(k, lineNumber)); + break; + case KeyWordTypeEnum.Vars: + list.Add(lineNumber, new LSLEditor.Helpers.OutlineHelper(k, lineNumber)); + break; + case KeyWordTypeEnum.States: + list.Add(lineNumber, new LSLEditor.Helpers.OutlineHelper(k, lineNumber)); + break; + default: + //Debug.WriteLine(k); + break; + } } - } - } } @@ -2093,39 +2092,66 @@ namespace LSLEditor } //TODO: parse dict and create the outline in the treeview //WILL SOMEONE PLEASE FUCKING FINISH THIS! - p.treeView1.Nodes.Clear(); - string lastState = "none"; - string lastevent = "none"; - foreach (LSLEditor.Helpers.OutlineHelper k in list.Values) + + if (p != null) //It gives the parent-scriptwindow as null when you try to run it { + p.tvOutline.BeginUpdate(); + p.tvOutline.Nodes.Clear(); + TreeNode lastState = null; + TreeNode lastEvent = null; + TreeNode lastScope = null; - - //Debug.WriteLine(b.Name); - if (k.info.type == KeyWordTypeEnum.States) + foreach (LSLEditor.Helpers.OutlineHelper k in list.Values) { - - - lastState = k.info.name; - } - else - { - if (k.info.type == KeyWordTypeEnum.Events) + switch (k.info.type) { - + case KeyWordTypeEnum.States: + lastState = createOutlineNode(k); + lastScope = lastState; + p.tvOutline.Nodes.Add(lastState); + break; + case KeyWordTypeEnum.Events: + if (lastState != null) //we need a state for every event! + { + lastEvent = createOutlineNode(k); + lastScope = lastEvent; + lastState.Nodes.Add(lastEvent); + } + break; + case KeyWordTypeEnum.Functions: + if (lastScope != null) + { + lastScope.Nodes.Add(createOutlineNode(k)); + } + break; + case KeyWordTypeEnum.Class: + if (lastScope != null) + { + lastScope.Nodes.Add(createOutlineNode(k)); + } + else + { + p.tvOutline.Nodes.Add(createOutlineNode(k)); + } + break; + default: + p.tvOutline.Nodes.Add(createOutlineNode(k)); + break; } - else - { - - } - - - } + p.tvOutline.EndUpdate(); + // p.tvOutline.Nodes.Add(states); + p.tvOutline.ExpandAll(); } + } - // p.treeView1.Nodes.Add(states); - p.treeView1.ExpandAll(); - + TreeNode createOutlineNode(Helpers.OutlineHelper ohOutline) + { + TreeNode result = null; + int ImageKey = (int)ohOutline.info.type; + result = new TreeNode(string.Format("{0} [{1}]", ohOutline.info.name, ohOutline.line + 1), ImageKey, ImageKey); + result.Tag = ohOutline; + return result; } public void SaveCurrentFile(string strPath) diff --git a/trunk/Images/States.gif b/trunk/Images/States.gif new file mode 100644 index 0000000..568939e Binary files /dev/null and b/trunk/Images/States.gif differ diff --git a/trunk/LSLEditorForm.Designer.cs b/trunk/LSLEditorForm.Designer.cs index f64c61e..0467535 100644 --- a/trunk/LSLEditorForm.Designer.cs +++ b/trunk/LSLEditorForm.Designer.cs @@ -135,17 +135,17 @@ namespace LSLEditor this.contextMenuStrip1 = new System.Windows.Forms.ContextMenuStrip(this.components); this.closeTabToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.panel2 = new System.Windows.Forms.Panel(); - this.tabControlExtended2 = new System.Windows.Forms.TabControlExtended(this.components); - this.tabPage1 = new System.Windows.Forms.TabPage(); - this.solutionExplorer1 = new LSLEditor.Solution.SolutionExplorer(); - this.outline = new System.Windows.Forms.TabPage(); - this.treeView1 = new System.Windows.Forms.TreeView(); this.splitter2 = new System.Windows.Forms.Splitter(); this.panel1 = new System.Windows.Forms.Panel(); this.splitter1 = new System.Windows.Forms.Splitter(); this.pageSetupDialog1 = new System.Windows.Forms.PageSetupDialog(); this.openFileDialog2 = new System.Windows.Forms.OpenFileDialog(); this.tabControlExtended1 = new System.Windows.Forms.TabControlExtended(this.components); + this.tabControlExtended2 = new System.Windows.Forms.TabControlExtended(this.components); + this.tabPage1 = new System.Windows.Forms.TabPage(); + this.solutionExplorer1 = new LSLEditor.Solution.SolutionExplorer(); + this.outline = new System.Windows.Forms.TabPage(); + this.tvOutline = new System.Windows.Forms.TreeView(); this.menuStrip1.SuspendLayout(); this.statusStrip1.SuspendLayout(); this.contextMenuStrip1.SuspendLayout(); @@ -200,7 +200,7 @@ namespace LSLEditor this.toolStripSeparator21, this.exitToolStripMenuItem}); this.fileToolStripMenuItem.Name = "fileToolStripMenuItem"; - this.fileToolStripMenuItem.Size = new System.Drawing.Size(37, 20); + this.fileToolStripMenuItem.Size = new System.Drawing.Size(35, 20); this.fileToolStripMenuItem.Text = "File"; this.fileToolStripMenuItem.Click += new System.EventHandler(this.fileToolStripMenuItem_Click); // @@ -211,7 +211,7 @@ namespace LSLEditor this.newFileToolStripMenuItem, this.notecardToolStripMenuItem}); 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"; // // newProjectToolStripMenuItem @@ -219,7 +219,7 @@ namespace LSLEditor 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.Size = new System.Drawing.Size(202, 22); + this.newProjectToolStripMenuItem.Size = new System.Drawing.Size(204, 22); this.newProjectToolStripMenuItem.Text = "Solution..."; this.newProjectToolStripMenuItem.Click += new System.EventHandler(this.newProjectToolStripMenuItem_Click); // @@ -228,14 +228,14 @@ namespace LSLEditor this.newFileToolStripMenuItem.Image = global::LSLEditor.Properties.Resources.NEWDOC; this.newFileToolStripMenuItem.Name = "newFileToolStripMenuItem"; this.newFileToolStripMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.N))); - this.newFileToolStripMenuItem.Size = new System.Drawing.Size(202, 22); + this.newFileToolStripMenuItem.Size = new System.Drawing.Size(204, 22); this.newFileToolStripMenuItem.Text = "Script"; this.newFileToolStripMenuItem.Click += new System.EventHandler(this.newFileToolStripMenuItem_Click); // // notecardToolStripMenuItem // this.notecardToolStripMenuItem.Name = "notecardToolStripMenuItem"; - this.notecardToolStripMenuItem.Size = new System.Drawing.Size(202, 22); + this.notecardToolStripMenuItem.Size = new System.Drawing.Size(204, 22); this.notecardToolStripMenuItem.Text = "Notecard"; this.notecardToolStripMenuItem.Click += new System.EventHandler(this.notecardToolStripMenuItem_Click); // @@ -245,7 +245,7 @@ namespace LSLEditor this.openProjectSolutionToolStripMenuItem, this.openFileToolStripMenuItem}); 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"; // // openProjectSolutionToolStripMenuItem @@ -253,7 +253,7 @@ namespace LSLEditor 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.Size = new System.Drawing.Size(244, 22); + this.openProjectSolutionToolStripMenuItem.Size = new System.Drawing.Size(243, 22); this.openProjectSolutionToolStripMenuItem.Text = "Project/Solution..."; this.openProjectSolutionToolStripMenuItem.Click += new System.EventHandler(this.openProjectSolutionToolStripMenuItem_Click); // @@ -262,14 +262,14 @@ namespace LSLEditor this.openFileToolStripMenuItem.Image = global::LSLEditor.Properties.Resources.OPEN; this.openFileToolStripMenuItem.Name = "openFileToolStripMenuItem"; this.openFileToolStripMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.O))); - this.openFileToolStripMenuItem.Size = new System.Drawing.Size(244, 22); + this.openFileToolStripMenuItem.Size = new System.Drawing.Size(243, 22); this.openFileToolStripMenuItem.Text = "File..."; this.openFileToolStripMenuItem.Click += new System.EventHandler(this.openFileToolStripMenuItem_Click); // // toolStripSeparator5 // this.toolStripSeparator5.Name = "toolStripSeparator5"; - this.toolStripSeparator5.Size = new System.Drawing.Size(184, 6); + this.toolStripSeparator5.Size = new System.Drawing.Size(188, 6); // // addToolStripMenuItem // @@ -278,40 +278,40 @@ namespace LSLEditor this.toolStripSeparator19, this.existingProjectToolStripMenuItem}); 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.Visible = false; // // newProjectToolStripMenuItem1 // this.newProjectToolStripMenuItem1.Name = "newProjectToolStripMenuItem1"; - this.newProjectToolStripMenuItem1.Size = new System.Drawing.Size(163, 22); + this.newProjectToolStripMenuItem1.Size = new System.Drawing.Size(171, 22); this.newProjectToolStripMenuItem1.Text = "New project..."; this.newProjectToolStripMenuItem1.Click += new System.EventHandler(this.newProjectToolStripMenuItem1_Click); // // toolStripSeparator19 // this.toolStripSeparator19.Name = "toolStripSeparator19"; - this.toolStripSeparator19.Size = new System.Drawing.Size(160, 6); + this.toolStripSeparator19.Size = new System.Drawing.Size(168, 6); // // existingProjectToolStripMenuItem // this.existingProjectToolStripMenuItem.Name = "existingProjectToolStripMenuItem"; - this.existingProjectToolStripMenuItem.Size = new System.Drawing.Size(163, 22); + this.existingProjectToolStripMenuItem.Size = new System.Drawing.Size(171, 22); this.existingProjectToolStripMenuItem.Text = "Existing project..."; this.existingProjectToolStripMenuItem.Click += new System.EventHandler(this.existingProjectToolStripMenuItem_Click); // // 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; // // closeFileToolStripMenuItem // this.closeFileToolStripMenuItem.Name = "closeFileToolStripMenuItem"; 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.Click += new System.EventHandler(this.closeFileToolStripMenuItem_Click); // @@ -319,40 +319,40 @@ namespace LSLEditor // this.closeSolutiontoolStripMenuItem.Enabled = false; 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.Click += new System.EventHandler(this.closeSolutiontoolStripMenuItem_Click); // // toolStripSeparator20 // this.toolStripSeparator20.Name = "toolStripSeparator20"; - this.toolStripSeparator20.Size = new System.Drawing.Size(184, 6); + this.toolStripSeparator20.Size = new System.Drawing.Size(188, 6); // // 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.Click += new System.EventHandler(this.importExampleToolStripMenuItem_Click); // // toolStripSeparator4 // this.toolStripSeparator4.Name = "toolStripSeparator4"; - this.toolStripSeparator4.Size = new System.Drawing.Size(184, 6); + this.toolStripSeparator4.Size = new System.Drawing.Size(188, 6); // // saveToolStripMenuItem // this.saveToolStripMenuItem.Image = global::LSLEditor.Properties.Resources.SAVE; this.saveToolStripMenuItem.Name = "saveToolStripMenuItem"; 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.Click += new System.EventHandler(this.saveToolStripMenuItem_Click); // // 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.Click += new System.EventHandler(this.saveAsToolStripMenuItem_Click); // @@ -362,26 +362,26 @@ namespace LSLEditor 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.Size = new System.Drawing.Size(187, 22); + this.SaveAllToolStripMenuItem.Size = new System.Drawing.Size(191, 22); this.SaveAllToolStripMenuItem.Text = "Save All"; this.SaveAllToolStripMenuItem.Click += new System.EventHandler(this.SaveAllToolStripMenuItem_Click); // // toolStripSeparator3 // this.toolStripSeparator3.Name = "toolStripSeparator3"; - this.toolStripSeparator3.Size = new System.Drawing.Size(184, 6); + this.toolStripSeparator3.Size = new System.Drawing.Size(188, 6); // // 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.Click += new System.EventHandler(this.pageSettingsToolStripMenuItem_Click); // // 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.Click += new System.EventHandler(this.printPreviewtoolStripMenuItem_Click); // @@ -390,50 +390,50 @@ namespace LSLEditor this.printToolStripMenuItem.Image = global::LSLEditor.Properties.Resources.PRINT; this.printToolStripMenuItem.Name = "printToolStripMenuItem"; 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.Click += new System.EventHandler(this.printToolStripMenuItem_Click); // // toolStripSeparator2 // this.toolStripSeparator2.Name = "toolStripSeparator2"; - this.toolStripSeparator2.Size = new System.Drawing.Size(184, 6); + this.toolStripSeparator2.Size = new System.Drawing.Size(188, 6); // // 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.Click += new System.EventHandler(this.copyToClipboardToolStripMenuItem_Click); // // toolStripSeparator1 // this.toolStripSeparator1.Name = "toolStripSeparator1"; - this.toolStripSeparator1.Size = new System.Drawing.Size(184, 6); + this.toolStripSeparator1.Size = new System.Drawing.Size(188, 6); // // 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.DropDownItemClicked += new System.Windows.Forms.ToolStripItemClickedEventHandler(this.recentFileToolStripMenuItem_DropDownItemClicked); // // 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.DropDownItemClicked += new System.Windows.Forms.ToolStripItemClickedEventHandler(this.recentProjectToolStripMenuItem_DropDownItemClicked); // // toolStripSeparator21 // this.toolStripSeparator21.Name = "toolStripSeparator21"; - this.toolStripSeparator21.Size = new System.Drawing.Size(184, 6); + this.toolStripSeparator21.Size = new System.Drawing.Size(188, 6); // // exitToolStripMenuItem // this.exitToolStripMenuItem.Name = "exitToolStripMenuItem"; - this.exitToolStripMenuItem.Size = new System.Drawing.Size(187, 22); + this.exitToolStripMenuItem.Size = new System.Drawing.Size(191, 22); this.exitToolStripMenuItem.Text = "Exit"; this.exitToolStripMenuItem.Click += new System.EventHandler(this.exitToolStripMenuItem_Click); // @@ -456,7 +456,7 @@ namespace LSLEditor this.toolStripSeparator14, this.advancedToolStripMenuItem}); this.editToolStripMenuItem.Name = "editToolStripMenuItem"; - this.editToolStripMenuItem.Size = new System.Drawing.Size(39, 20); + this.editToolStripMenuItem.Size = new System.Drawing.Size(37, 20); this.editToolStripMenuItem.Text = "Edit"; // // undoToolStripMenuItem @@ -464,7 +464,7 @@ namespace LSLEditor this.undoToolStripMenuItem.Image = global::LSLEditor.Properties.Resources.UNDO; this.undoToolStripMenuItem.Name = "undoToolStripMenuItem"; this.undoToolStripMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.Z))); - this.undoToolStripMenuItem.Size = new System.Drawing.Size(225, 22); + this.undoToolStripMenuItem.Size = new System.Drawing.Size(224, 22); this.undoToolStripMenuItem.Text = "Undo"; this.undoToolStripMenuItem.Click += new System.EventHandler(this.undoToolStripMenuItem_Click); // @@ -473,21 +473,21 @@ namespace LSLEditor this.redoToolStripMenuItem.Image = global::LSLEditor.Properties.Resources.REDO; this.redoToolStripMenuItem.Name = "redoToolStripMenuItem"; this.redoToolStripMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.Y))); - this.redoToolStripMenuItem.Size = new System.Drawing.Size(225, 22); + this.redoToolStripMenuItem.Size = new System.Drawing.Size(224, 22); this.redoToolStripMenuItem.Text = "Redo"; this.redoToolStripMenuItem.Click += new System.EventHandler(this.redoToolStripMenuItem_Click); // // toolStripSeparator6 // this.toolStripSeparator6.Name = "toolStripSeparator6"; - this.toolStripSeparator6.Size = new System.Drawing.Size(222, 6); + this.toolStripSeparator6.Size = new System.Drawing.Size(221, 6); // // cutToolStripMenuItem // this.cutToolStripMenuItem.Image = global::LSLEditor.Properties.Resources.CUT; this.cutToolStripMenuItem.Name = "cutToolStripMenuItem"; this.cutToolStripMenuItem.ShortcutKeyDisplayString = "Ctrl+X"; - this.cutToolStripMenuItem.Size = new System.Drawing.Size(225, 22); + this.cutToolStripMenuItem.Size = new System.Drawing.Size(224, 22); this.cutToolStripMenuItem.Text = "Cut"; this.cutToolStripMenuItem.Click += new System.EventHandler(this.cutToolStripMenuItem_Click); // @@ -496,7 +496,7 @@ namespace LSLEditor this.copyToolStripMenuItem.Image = global::LSLEditor.Properties.Resources.COPY; this.copyToolStripMenuItem.Name = "copyToolStripMenuItem"; this.copyToolStripMenuItem.ShortcutKeyDisplayString = "Ctrl+C"; - this.copyToolStripMenuItem.Size = new System.Drawing.Size(225, 22); + this.copyToolStripMenuItem.Size = new System.Drawing.Size(224, 22); this.copyToolStripMenuItem.Text = "Copy"; this.copyToolStripMenuItem.Click += new System.EventHandler(this.copyToolStripMenuItem_Click); // @@ -505,7 +505,7 @@ namespace LSLEditor this.pasteToolStripMenuItem.Image = global::LSLEditor.Properties.Resources.PASTE; this.pasteToolStripMenuItem.Name = "pasteToolStripMenuItem"; this.pasteToolStripMenuItem.ShortcutKeyDisplayString = "Ctrl+V"; - this.pasteToolStripMenuItem.Size = new System.Drawing.Size(225, 22); + this.pasteToolStripMenuItem.Size = new System.Drawing.Size(224, 22); this.pasteToolStripMenuItem.Text = "Paste"; this.pasteToolStripMenuItem.Click += new System.EventHandler(this.pasteToolStripMenuItem_Click); // @@ -514,20 +514,20 @@ namespace LSLEditor this.deleteToolStripMenuItem.Image = global::LSLEditor.Properties.Resources.DELETE; this.deleteToolStripMenuItem.Name = "deleteToolStripMenuItem"; this.deleteToolStripMenuItem.ShortcutKeyDisplayString = "Del"; - this.deleteToolStripMenuItem.Size = new System.Drawing.Size(225, 22); + this.deleteToolStripMenuItem.Size = new System.Drawing.Size(224, 22); this.deleteToolStripMenuItem.Text = "Delete"; this.deleteToolStripMenuItem.Click += new System.EventHandler(this.deleteToolStripMenuItem_Click); // // toolStripSeparator13 // this.toolStripSeparator13.Name = "toolStripSeparator13"; - this.toolStripSeparator13.Size = new System.Drawing.Size(222, 6); + this.toolStripSeparator13.Size = new System.Drawing.Size(221, 6); // // selectAllToolStripMenuItem // this.selectAllToolStripMenuItem.Name = "selectAllToolStripMenuItem"; this.selectAllToolStripMenuItem.ShortcutKeyDisplayString = "Ctrl+A"; - this.selectAllToolStripMenuItem.Size = new System.Drawing.Size(225, 22); + this.selectAllToolStripMenuItem.Size = new System.Drawing.Size(224, 22); this.selectAllToolStripMenuItem.Text = "Select All"; this.selectAllToolStripMenuItem.Click += new System.EventHandler(this.selectAllToolStripMenuItem_Click); // @@ -536,14 +536,14 @@ namespace LSLEditor 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.Size = new System.Drawing.Size(225, 22); + this.toolStripMenuItem8.Size = new System.Drawing.Size(224, 22); this.toolStripMenuItem8.Text = "Select All to SL"; this.toolStripMenuItem8.Click += new System.EventHandler(this.toolStripMenuItem8_Click); // // toolStripSeparator7 // this.toolStripSeparator7.Name = "toolStripSeparator7"; - this.toolStripSeparator7.Size = new System.Drawing.Size(222, 6); + this.toolStripSeparator7.Size = new System.Drawing.Size(221, 6); // // FindtoolStripMenuItem // @@ -552,14 +552,14 @@ namespace LSLEditor this.replaceToolStripMenuItem, this.findNextToolStripMenuItem}); this.FindtoolStripMenuItem.Name = "FindtoolStripMenuItem"; - this.FindtoolStripMenuItem.Size = new System.Drawing.Size(225, 22); + this.FindtoolStripMenuItem.Size = new System.Drawing.Size(224, 22); this.FindtoolStripMenuItem.Text = "Find and Replace"; // // findToolStripMenuItem1 // this.findToolStripMenuItem1.Name = "findToolStripMenuItem1"; this.findToolStripMenuItem1.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.F))); - this.findToolStripMenuItem1.Size = new System.Drawing.Size(158, 22); + this.findToolStripMenuItem1.Size = new System.Drawing.Size(162, 22); this.findToolStripMenuItem1.Text = "Find"; this.findToolStripMenuItem1.Click += new System.EventHandler(this.findToolStripMenuItem_Click); // @@ -567,7 +567,7 @@ namespace LSLEditor // this.replaceToolStripMenuItem.Name = "replaceToolStripMenuItem"; this.replaceToolStripMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.H))); - this.replaceToolStripMenuItem.Size = new System.Drawing.Size(158, 22); + this.replaceToolStripMenuItem.Size = new System.Drawing.Size(162, 22); this.replaceToolStripMenuItem.Text = "Replace"; this.replaceToolStripMenuItem.Click += new System.EventHandler(this.replaceToolStripMenuItem_Click); // @@ -575,7 +575,7 @@ namespace LSLEditor // this.findNextToolStripMenuItem.Name = "findNextToolStripMenuItem"; this.findNextToolStripMenuItem.ShortcutKeys = System.Windows.Forms.Keys.F3; - this.findNextToolStripMenuItem.Size = new System.Drawing.Size(158, 22); + this.findNextToolStripMenuItem.Size = new System.Drawing.Size(162, 22); this.findNextToolStripMenuItem.Text = "Find next"; this.findNextToolStripMenuItem.Visible = false; this.findNextToolStripMenuItem.Click += new System.EventHandler(this.findNextToolStripMenuItem_Click); @@ -584,14 +584,14 @@ namespace LSLEditor // this.toolStripMenuItem1.Name = "toolStripMenuItem1"; this.toolStripMenuItem1.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.G))); - this.toolStripMenuItem1.Size = new System.Drawing.Size(225, 22); + this.toolStripMenuItem1.Size = new System.Drawing.Size(224, 22); this.toolStripMenuItem1.Text = "Goto..."; this.toolStripMenuItem1.Click += new System.EventHandler(this.toolStripMenuItem1_Click); // // toolStripSeparator14 // this.toolStripSeparator14.Name = "toolStripSeparator14"; - this.toolStripSeparator14.Size = new System.Drawing.Size(222, 6); + this.toolStripSeparator14.Size = new System.Drawing.Size(221, 6); // // advancedToolStripMenuItem // @@ -601,14 +601,14 @@ namespace LSLEditor this.commentInToolStripMenuItem, this.uncommentingSelectedTextToolStripMenuItem}); this.advancedToolStripMenuItem.Name = "advancedToolStripMenuItem"; - this.advancedToolStripMenuItem.Size = new System.Drawing.Size(225, 22); + this.advancedToolStripMenuItem.Size = new System.Drawing.Size(224, 22); this.advancedToolStripMenuItem.Text = "Advanced"; // // formatDocumentToolStripMenuItem // this.formatDocumentToolStripMenuItem.Name = "formatDocumentToolStripMenuItem"; this.formatDocumentToolStripMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.D))); - this.formatDocumentToolStripMenuItem.Size = new System.Drawing.Size(266, 22); + this.formatDocumentToolStripMenuItem.Size = new System.Drawing.Size(258, 22); this.formatDocumentToolStripMenuItem.Text = "Format document"; this.formatDocumentToolStripMenuItem.Click += new System.EventHandler(this.formatDocumentToolStripMenuItem_Click); // @@ -616,7 +616,7 @@ namespace LSLEditor // this.formatSelectedTextToolStripMenuItem.Name = "formatSelectedTextToolStripMenuItem"; this.formatSelectedTextToolStripMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.E))); - this.formatSelectedTextToolStripMenuItem.Size = new System.Drawing.Size(266, 22); + this.formatSelectedTextToolStripMenuItem.Size = new System.Drawing.Size(258, 22); this.formatSelectedTextToolStripMenuItem.Text = "Format selected text"; this.formatSelectedTextToolStripMenuItem.Click += new System.EventHandler(this.formatSelectedTextToolStripMenuItem_Click); // @@ -625,7 +625,7 @@ namespace LSLEditor this.commentInToolStripMenuItem.Image = global::LSLEditor.Properties.Resources.ININDENT; this.commentInToolStripMenuItem.Name = "commentInToolStripMenuItem"; this.commentInToolStripMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.K))); - this.commentInToolStripMenuItem.Size = new System.Drawing.Size(266, 22); + this.commentInToolStripMenuItem.Size = new System.Drawing.Size(258, 22); this.commentInToolStripMenuItem.Text = "Commenting selected text"; this.commentInToolStripMenuItem.Click += new System.EventHandler(this.commentInToolStripMenuItem_Click); // @@ -634,7 +634,7 @@ namespace LSLEditor this.uncommentingSelectedTextToolStripMenuItem.Image = global::LSLEditor.Properties.Resources.DEINDENT; this.uncommentingSelectedTextToolStripMenuItem.Name = "uncommentingSelectedTextToolStripMenuItem"; this.uncommentingSelectedTextToolStripMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.L))); - this.uncommentingSelectedTextToolStripMenuItem.Size = new System.Drawing.Size(266, 22); + this.uncommentingSelectedTextToolStripMenuItem.Size = new System.Drawing.Size(258, 22); this.uncommentingSelectedTextToolStripMenuItem.Text = "Uncommenting selected text"; this.uncommentingSelectedTextToolStripMenuItem.Click += new System.EventHandler(this.uncommentingSelectedTextToolStripMenuItem_Click); // @@ -643,13 +643,13 @@ namespace LSLEditor this.toolStripMenuItem2.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { this.solutionExplorerToolStripMenuItem}); this.toolStripMenuItem2.Name = "toolStripMenuItem2"; - this.toolStripMenuItem2.Size = new System.Drawing.Size(44, 20); + this.toolStripMenuItem2.Size = new System.Drawing.Size(41, 20); this.toolStripMenuItem2.Text = "View"; // // solutionExplorerToolStripMenuItem // this.solutionExplorerToolStripMenuItem.Name = "solutionExplorerToolStripMenuItem"; - this.solutionExplorerToolStripMenuItem.Size = new System.Drawing.Size(163, 22); + this.solutionExplorerToolStripMenuItem.Size = new System.Drawing.Size(166, 22); this.solutionExplorerToolStripMenuItem.Text = "Solution Explorer"; this.solutionExplorerToolStripMenuItem.Click += new System.EventHandler(this.solutionExplorerToolStripMenuItem_Click); // @@ -659,7 +659,7 @@ namespace LSLEditor this.addNewObjecttoolStripMenuItem, this.addNewFileToolStripMenuItem}); this.projectToolStripMenuItem.Name = "projectToolStripMenuItem"; - this.projectToolStripMenuItem.Size = new System.Drawing.Size(56, 20); + this.projectToolStripMenuItem.Size = new System.Drawing.Size(53, 20); this.projectToolStripMenuItem.Text = "Project"; // // addNewObjecttoolStripMenuItem @@ -668,7 +668,7 @@ namespace LSLEditor 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.Size = new System.Drawing.Size(235, 22); + this.addNewObjecttoolStripMenuItem.Size = new System.Drawing.Size(232, 22); this.addNewObjecttoolStripMenuItem.Text = "Add New Object"; this.addNewObjecttoolStripMenuItem.Click += new System.EventHandler(this.addNewObjecttoolStripMenuItem_Click); // @@ -676,7 +676,7 @@ namespace LSLEditor // this.addNewFileToolStripMenuItem.Enabled = false; this.addNewFileToolStripMenuItem.Name = "addNewFileToolStripMenuItem"; - this.addNewFileToolStripMenuItem.Size = new System.Drawing.Size(235, 22); + this.addNewFileToolStripMenuItem.Size = new System.Drawing.Size(232, 22); this.addNewFileToolStripMenuItem.Text = "Add New Item"; // // buildToolStripMenuItem @@ -687,7 +687,7 @@ namespace LSLEditor this.toolStripSeparator23, this.syntaxCheckerToolStripMenuItem}); this.buildToolStripMenuItem.Name = "buildToolStripMenuItem"; - this.buildToolStripMenuItem.Size = new System.Drawing.Size(54, 20); + this.buildToolStripMenuItem.Size = new System.Drawing.Size(50, 20); this.buildToolStripMenuItem.Text = "Debug"; // // startToolStripMenuItem @@ -695,7 +695,7 @@ namespace LSLEditor this.startToolStripMenuItem.Image = global::LSLEditor.Properties.Resources.START; this.startToolStripMenuItem.Name = "startToolStripMenuItem"; this.startToolStripMenuItem.ShortcutKeys = System.Windows.Forms.Keys.F5; - this.startToolStripMenuItem.Size = new System.Drawing.Size(173, 22); + this.startToolStripMenuItem.Size = new System.Drawing.Size(180, 22); this.startToolStripMenuItem.Text = "Start"; this.startToolStripMenuItem.Click += new System.EventHandler(this.startToolStripMenuItem_Click); // @@ -705,20 +705,20 @@ namespace LSLEditor this.stopToolStripMenuItem.Image = global::LSLEditor.Properties.Resources.END; this.stopToolStripMenuItem.Name = "stopToolStripMenuItem"; this.stopToolStripMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Shift | System.Windows.Forms.Keys.F5))); - this.stopToolStripMenuItem.Size = new System.Drawing.Size(173, 22); + this.stopToolStripMenuItem.Size = new System.Drawing.Size(180, 22); this.stopToolStripMenuItem.Text = "Stop"; this.stopToolStripMenuItem.Click += new System.EventHandler(this.stopToolStripMenuItem_Click); // // toolStripSeparator23 // this.toolStripSeparator23.Name = "toolStripSeparator23"; - this.toolStripSeparator23.Size = new System.Drawing.Size(170, 6); + this.toolStripSeparator23.Size = new System.Drawing.Size(177, 6); // // syntaxCheckerToolStripMenuItem // this.syntaxCheckerToolStripMenuItem.Name = "syntaxCheckerToolStripMenuItem"; this.syntaxCheckerToolStripMenuItem.ShortcutKeys = System.Windows.Forms.Keys.F6; - this.syntaxCheckerToolStripMenuItem.Size = new System.Drawing.Size(173, 22); + this.syntaxCheckerToolStripMenuItem.Size = new System.Drawing.Size(180, 22); this.syntaxCheckerToolStripMenuItem.Text = "Syntax Checker"; this.syntaxCheckerToolStripMenuItem.Click += new System.EventHandler(this.syntaxCheckerToolStripMenuItem_Click); // @@ -727,13 +727,13 @@ namespace LSLEditor this.toolStripMenuItem3.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { this.optionsToolStripMenuItem}); this.toolStripMenuItem3.Name = "toolStripMenuItem3"; - this.toolStripMenuItem3.Size = new System.Drawing.Size(48, 20); + this.toolStripMenuItem3.Size = new System.Drawing.Size(44, 20); this.toolStripMenuItem3.Text = "Tools"; // // optionsToolStripMenuItem // this.optionsToolStripMenuItem.Name = "optionsToolStripMenuItem"; - this.optionsToolStripMenuItem.Size = new System.Drawing.Size(125, 22); + this.optionsToolStripMenuItem.Size = new System.Drawing.Size(152, 22); this.optionsToolStripMenuItem.Text = "Options..."; this.optionsToolStripMenuItem.Click += new System.EventHandler(this.optionsToolStripMenuItem_Click); // @@ -752,70 +752,70 @@ namespace LSLEditor this.tabbedViewToolStripMenuItem, this.closeActiveWindowToolStripMenuItem}); this.viewToolStripMenuItem.Name = "viewToolStripMenuItem"; - this.viewToolStripMenuItem.Size = new System.Drawing.Size(63, 20); + this.viewToolStripMenuItem.Size = new System.Drawing.Size(57, 20); this.viewToolStripMenuItem.Text = "Window"; // // horizontalToolStripMenuItem // this.horizontalToolStripMenuItem.Name = "horizontalToolStripMenuItem"; - this.horizontalToolStripMenuItem.Size = new System.Drawing.Size(263, 22); + this.horizontalToolStripMenuItem.Size = new System.Drawing.Size(258, 22); this.horizontalToolStripMenuItem.Text = "Horizontal"; this.horizontalToolStripMenuItem.Click += new System.EventHandler(this.horizontalToolStripMenuItem_Click); // // verticalToolStripMenuItem // this.verticalToolStripMenuItem.Name = "verticalToolStripMenuItem"; - this.verticalToolStripMenuItem.Size = new System.Drawing.Size(263, 22); + this.verticalToolStripMenuItem.Size = new System.Drawing.Size(258, 22); this.verticalToolStripMenuItem.Text = "Vertical"; this.verticalToolStripMenuItem.Click += new System.EventHandler(this.verticalToolStripMenuItem_Click); // // cascadeToolStripMenuItem // this.cascadeToolStripMenuItem.Name = "cascadeToolStripMenuItem"; - this.cascadeToolStripMenuItem.Size = new System.Drawing.Size(263, 22); + this.cascadeToolStripMenuItem.Size = new System.Drawing.Size(258, 22); this.cascadeToolStripMenuItem.Text = "Cascade"; this.cascadeToolStripMenuItem.Click += new System.EventHandler(this.cascadeToolStripMenuItem_Click); // // toolStripSeparator11 // this.toolStripSeparator11.Name = "toolStripSeparator11"; - this.toolStripSeparator11.Size = new System.Drawing.Size(260, 6); + this.toolStripSeparator11.Size = new System.Drawing.Size(255, 6); // // ArangeIconsToolStripMenuItem // this.ArangeIconsToolStripMenuItem.Name = "ArangeIconsToolStripMenuItem"; - this.ArangeIconsToolStripMenuItem.Size = new System.Drawing.Size(263, 22); + this.ArangeIconsToolStripMenuItem.Size = new System.Drawing.Size(258, 22); this.ArangeIconsToolStripMenuItem.Text = "Arange Icons"; this.ArangeIconsToolStripMenuItem.Click += new System.EventHandler(this.normalToolStripMenuItem_Click); // // toolStripSeparator10 // this.toolStripSeparator10.Name = "toolStripSeparator10"; - this.toolStripSeparator10.Size = new System.Drawing.Size(260, 6); + this.toolStripSeparator10.Size = new System.Drawing.Size(255, 6); // // browserInWindowToolStripMenuItem // this.browserInWindowToolStripMenuItem.Name = "browserInWindowToolStripMenuItem"; - this.browserInWindowToolStripMenuItem.Size = new System.Drawing.Size(263, 22); + this.browserInWindowToolStripMenuItem.Size = new System.Drawing.Size(258, 22); this.browserInWindowToolStripMenuItem.Text = "Browser in window"; this.browserInWindowToolStripMenuItem.Click += new System.EventHandler(this.browserInWindowToolStripMenuItem_Click); // // WikiSepBrowserstoolStripMenuItem // this.WikiSepBrowserstoolStripMenuItem.Name = "WikiSepBrowserstoolStripMenuItem"; - this.WikiSepBrowserstoolStripMenuItem.Size = new System.Drawing.Size(263, 22); + this.WikiSepBrowserstoolStripMenuItem.Size = new System.Drawing.Size(258, 22); this.WikiSepBrowserstoolStripMenuItem.Text = "Online Wiki-pages separate Browser"; this.WikiSepBrowserstoolStripMenuItem.Click += new System.EventHandler(this.WikiSepBrowserstoolStripMenuItem_Click); // // toolStripSeparator16 // this.toolStripSeparator16.Name = "toolStripSeparator16"; - this.toolStripSeparator16.Size = new System.Drawing.Size(260, 6); + this.toolStripSeparator16.Size = new System.Drawing.Size(255, 6); // // tabbedViewToolStripMenuItem // this.tabbedViewToolStripMenuItem.Name = "tabbedViewToolStripMenuItem"; - this.tabbedViewToolStripMenuItem.Size = new System.Drawing.Size(263, 22); + this.tabbedViewToolStripMenuItem.Size = new System.Drawing.Size(258, 22); this.tabbedViewToolStripMenuItem.Text = "Tabbed document"; this.tabbedViewToolStripMenuItem.Click += new System.EventHandler(this.tabbedViewToolStripMenuItem_Click); // @@ -823,7 +823,7 @@ namespace LSLEditor // this.closeActiveWindowToolStripMenuItem.Name = "closeActiveWindowToolStripMenuItem"; this.closeActiveWindowToolStripMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.F4))); - this.closeActiveWindowToolStripMenuItem.Size = new System.Drawing.Size(263, 22); + this.closeActiveWindowToolStripMenuItem.Size = new System.Drawing.Size(258, 22); this.closeActiveWindowToolStripMenuItem.Text = "Close active window"; this.closeActiveWindowToolStripMenuItem.Click += new System.EventHandler(this.closeActiveWindowToolStripMenuItem_Click); // @@ -847,14 +847,14 @@ namespace LSLEditor this.toolStripSeparator17, this.aboutToolStripMenuItem}); this.helpToolStripMenuItem.Name = "helpToolStripMenuItem"; - this.helpToolStripMenuItem.Size = new System.Drawing.Size(44, 20); + this.helpToolStripMenuItem.Size = new System.Drawing.Size(40, 20); this.helpToolStripMenuItem.Text = "Help"; // // indexToolStripMenuItem // this.indexToolStripMenuItem.Name = "indexToolStripMenuItem"; this.indexToolStripMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.F1))); - this.indexToolStripMenuItem.Size = new System.Drawing.Size(211, 22); + this.indexToolStripMenuItem.Size = new System.Drawing.Size(219, 22); this.indexToolStripMenuItem.Text = "Index LSL Wiki"; this.indexToolStripMenuItem.Click += new System.EventHandler(this.indexToolStripMenuItem_Click); // @@ -862,93 +862,93 @@ namespace LSLEditor // this.helpKeywordToolStripMenuItem.Name = "helpKeywordToolStripMenuItem"; this.helpKeywordToolStripMenuItem.ShortcutKeys = System.Windows.Forms.Keys.F1; - this.helpKeywordToolStripMenuItem.Size = new System.Drawing.Size(211, 22); + this.helpKeywordToolStripMenuItem.Size = new System.Drawing.Size(219, 22); this.helpKeywordToolStripMenuItem.Text = "Help on keyword"; this.helpKeywordToolStripMenuItem.Click += new System.EventHandler(this.helpKeywordToolStripMenuItem_Click); // // toolStripSeparator8 // this.toolStripSeparator8.Name = "toolStripSeparator8"; - this.toolStripSeparator8.Size = new System.Drawing.Size(208, 6); + this.toolStripSeparator8.Size = new System.Drawing.Size(216, 6); // // checkForUpdatesToolStripMenuItem // this.checkForUpdatesToolStripMenuItem.Name = "checkForUpdatesToolStripMenuItem"; - this.checkForUpdatesToolStripMenuItem.Size = new System.Drawing.Size(211, 22); + this.checkForUpdatesToolStripMenuItem.Size = new System.Drawing.Size(219, 22); this.checkForUpdatesToolStripMenuItem.Text = "Info on the latest release..."; this.checkForUpdatesToolStripMenuItem.Click += new System.EventHandler(this.checkForUpdatesToolStripMenuItem_Click); // // toolStripMenuItem4 // this.toolStripMenuItem4.Name = "toolStripMenuItem4"; - this.toolStripMenuItem4.Size = new System.Drawing.Size(211, 22); + this.toolStripMenuItem4.Size = new System.Drawing.Size(219, 22); this.toolStripMenuItem4.Text = "Check for update..."; this.toolStripMenuItem4.Click += new System.EventHandler(this.toolStripMenuItem4_Click); // // toolStripSeparator9 // this.toolStripSeparator9.Name = "toolStripSeparator9"; - this.toolStripSeparator9.Size = new System.Drawing.Size(208, 6); + this.toolStripSeparator9.Size = new System.Drawing.Size(216, 6); // // ReleaseNotesToolStripMenuItem // this.ReleaseNotesToolStripMenuItem.Name = "ReleaseNotesToolStripMenuItem"; - this.ReleaseNotesToolStripMenuItem.Size = new System.Drawing.Size(211, 22); + this.ReleaseNotesToolStripMenuItem.Size = new System.Drawing.Size(219, 22); this.ReleaseNotesToolStripMenuItem.Text = "Release notes..."; this.ReleaseNotesToolStripMenuItem.Click += new System.EventHandler(this.ReleaseNotesToolStripMenuItem_Click); // // toolStripSeparator12 // this.toolStripSeparator12.Name = "toolStripSeparator12"; - this.toolStripSeparator12.Size = new System.Drawing.Size(208, 6); + this.toolStripSeparator12.Size = new System.Drawing.Size(216, 6); // // makeBugReporttoolStripMenuItem // this.makeBugReporttoolStripMenuItem.Name = "makeBugReporttoolStripMenuItem"; - this.makeBugReporttoolStripMenuItem.Size = new System.Drawing.Size(211, 22); + this.makeBugReporttoolStripMenuItem.Size = new System.Drawing.Size(219, 22); this.makeBugReporttoolStripMenuItem.Text = "Bug report..."; this.makeBugReporttoolStripMenuItem.Click += new System.EventHandler(this.makeBugReporttoolStripMenuItem_Click); // // toolStripMenuItem6 // this.toolStripMenuItem6.Name = "toolStripMenuItem6"; - this.toolStripMenuItem6.Size = new System.Drawing.Size(211, 22); + this.toolStripMenuItem6.Size = new System.Drawing.Size(219, 22); this.toolStripMenuItem6.Text = "LSLEditor Forum..."; this.toolStripMenuItem6.Click += new System.EventHandler(this.forumStripMenuItem_Click); // // toolStripSeparator22 // this.toolStripSeparator22.Name = "toolStripSeparator22"; - this.toolStripSeparator22.Size = new System.Drawing.Size(208, 6); + this.toolStripSeparator22.Size = new System.Drawing.Size(216, 6); // // toolStripMenuItem5 // this.toolStripMenuItem5.Name = "toolStripMenuItem5"; - this.toolStripMenuItem5.Size = new System.Drawing.Size(211, 22); + this.toolStripMenuItem5.Size = new System.Drawing.Size(219, 22); this.toolStripMenuItem5.Text = "Donate..."; this.toolStripMenuItem5.Click += new System.EventHandler(this.toolStripMenuItem5_Click); // // toolStripSeparator15 // this.toolStripSeparator15.Name = "toolStripSeparator15"; - this.toolStripSeparator15.Size = new System.Drawing.Size(208, 6); + this.toolStripSeparator15.Size = new System.Drawing.Size(216, 6); // // toolStripMenuItem7 // this.toolStripMenuItem7.Name = "toolStripMenuItem7"; - this.toolStripMenuItem7.Size = new System.Drawing.Size(211, 22); + this.toolStripMenuItem7.Size = new System.Drawing.Size(219, 22); this.toolStripMenuItem7.Text = "Contact..."; this.toolStripMenuItem7.Click += new System.EventHandler(this.toolStripMenuItem7_Click); // // toolStripSeparator17 // this.toolStripSeparator17.Name = "toolStripSeparator17"; - this.toolStripSeparator17.Size = new System.Drawing.Size(208, 6); + this.toolStripSeparator17.Size = new System.Drawing.Size(216, 6); // // aboutToolStripMenuItem // this.aboutToolStripMenuItem.Name = "aboutToolStripMenuItem"; - this.aboutToolStripMenuItem.Size = new System.Drawing.Size(211, 22); + this.aboutToolStripMenuItem.Size = new System.Drawing.Size(219, 22); this.aboutToolStripMenuItem.Text = "About..."; this.aboutToolStripMenuItem.Click += new System.EventHandler(this.aboutToolStripMenuItem_Click); // @@ -976,12 +976,12 @@ namespace LSLEditor this.contextMenuStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { this.closeTabToolStripMenuItem}); this.contextMenuStrip1.Name = "contextMenuStrip1"; - this.contextMenuStrip1.Size = new System.Drawing.Size(104, 26); + this.contextMenuStrip1.Size = new System.Drawing.Size(112, 26); // // closeTabToolStripMenuItem // this.closeTabToolStripMenuItem.Name = "closeTabToolStripMenuItem"; - this.closeTabToolStripMenuItem.Size = new System.Drawing.Size(103, 22); + this.closeTabToolStripMenuItem.Size = new System.Drawing.Size(111, 22); this.closeTabToolStripMenuItem.Text = "Close"; this.closeTabToolStripMenuItem.Click += new System.EventHandler(this.closeTabToolStripMenuItem_Click); // @@ -995,55 +995,6 @@ namespace LSLEditor this.panel2.TabIndex = 20; this.panel2.Visible = false; // - // tabControlExtended2 - // - this.tabControlExtended2.Controls.Add(this.tabPage1); - this.tabControlExtended2.Controls.Add(this.outline); - this.tabControlExtended2.Dock = System.Windows.Forms.DockStyle.Fill; - this.tabControlExtended2.Location = new System.Drawing.Point(0, 0); - this.tabControlExtended2.Name = "tabControlExtended2"; - this.tabControlExtended2.SelectedIndex = 0; - this.tabControlExtended2.Size = new System.Drawing.Size(200, 470); - this.tabControlExtended2.TabIndex = 0; - // - // tabPage1 - // - this.tabPage1.Controls.Add(this.solutionExplorer1); - this.tabPage1.Location = new System.Drawing.Point(4, 22); - this.tabPage1.Name = "tabPage1"; - this.tabPage1.Padding = new System.Windows.Forms.Padding(3); - this.tabPage1.Size = new System.Drawing.Size(192, 444); - this.tabPage1.TabIndex = 0; - this.tabPage1.Text = "SolutionExplorer"; - this.tabPage1.UseVisualStyleBackColor = true; - // - // solutionExplorer1 - // - this.solutionExplorer1.Dock = System.Windows.Forms.DockStyle.Fill; - this.solutionExplorer1.Location = new System.Drawing.Point(3, 3); - this.solutionExplorer1.Name = "solutionExplorer1"; - this.solutionExplorer1.Size = new System.Drawing.Size(186, 438); - this.solutionExplorer1.TabIndex = 0; - // - // outline - // - this.outline.Controls.Add(this.treeView1); - this.outline.Location = new System.Drawing.Point(4, 22); - this.outline.Name = "outline"; - this.outline.Padding = new System.Windows.Forms.Padding(3); - this.outline.Size = new System.Drawing.Size(192, 444); - this.outline.TabIndex = 1; - this.outline.Text = "Outline"; - this.outline.UseVisualStyleBackColor = true; - // - // treeView1 - // - this.treeView1.Dock = System.Windows.Forms.DockStyle.Fill; - this.treeView1.Location = new System.Drawing.Point(3, 3); - this.treeView1.Name = "treeView1"; - this.treeView1.Size = new System.Drawing.Size(186, 438); - this.treeView1.TabIndex = 0; - // // splitter2 // this.splitter2.Dock = System.Windows.Forms.DockStyle.Right; @@ -1089,6 +1040,56 @@ namespace LSLEditor this.tabControlExtended1.MouseDown += new System.Windows.Forms.MouseEventHandler(this.tabControlExtended1_MouseDown); this.tabControlExtended1.SelectedIndexChanged += new System.EventHandler(this.tabControlExtended1_SelectedIndexChanged); // + // tabControlExtended2 + // + this.tabControlExtended2.Controls.Add(this.tabPage1); + this.tabControlExtended2.Controls.Add(this.outline); + this.tabControlExtended2.Dock = System.Windows.Forms.DockStyle.Fill; + this.tabControlExtended2.Location = new System.Drawing.Point(0, 0); + this.tabControlExtended2.Name = "tabControlExtended2"; + this.tabControlExtended2.SelectedIndex = 0; + this.tabControlExtended2.Size = new System.Drawing.Size(200, 470); + this.tabControlExtended2.TabIndex = 0; + // + // tabPage1 + // + this.tabPage1.Controls.Add(this.solutionExplorer1); + this.tabPage1.Location = new System.Drawing.Point(4, 22); + this.tabPage1.Name = "tabPage1"; + this.tabPage1.Padding = new System.Windows.Forms.Padding(3); + this.tabPage1.Size = new System.Drawing.Size(192, 444); + this.tabPage1.TabIndex = 0; + this.tabPage1.Text = "SolutionExplorer"; + this.tabPage1.UseVisualStyleBackColor = true; + // + // solutionExplorer1 + // + this.solutionExplorer1.Dock = System.Windows.Forms.DockStyle.Fill; + this.solutionExplorer1.Location = new System.Drawing.Point(3, 3); + this.solutionExplorer1.Name = "solutionExplorer1"; + this.solutionExplorer1.Size = new System.Drawing.Size(186, 438); + this.solutionExplorer1.TabIndex = 0; + // + // outline + // + this.outline.Controls.Add(this.tvOutline); + this.outline.Location = new System.Drawing.Point(4, 22); + this.outline.Name = "outline"; + this.outline.Padding = new System.Windows.Forms.Padding(3); + this.outline.Size = new System.Drawing.Size(192, 444); + this.outline.TabIndex = 1; + this.outline.Text = "Outline"; + this.outline.UseVisualStyleBackColor = true; + // + // tvOutline + // + this.tvOutline.Dock = System.Windows.Forms.DockStyle.Fill; + this.tvOutline.Location = new System.Drawing.Point(3, 3); + this.tvOutline.Name = "tvOutline"; + this.tvOutline.Size = new System.Drawing.Size(186, 438); + this.tvOutline.TabIndex = 0; + this.tvOutline.NodeMouseClick += new System.Windows.Forms.TreeNodeMouseClickEventHandler(this.tvOutline_NodeMouseClick); + // // LSLEditorForm // this.AllowDrop = true; @@ -1243,6 +1244,6 @@ namespace LSLEditor private System.Windows.Forms.ToolStripSeparator toolStripSeparator17; private System.Windows.Forms.ToolStripMenuItem toolStripMenuItem8; private System.Windows.Forms.TabPage outline; - public System.Windows.Forms.TreeView treeView1; + public System.Windows.Forms.TreeView tvOutline; } } \ No newline at end of file diff --git a/trunk/LSLEditorForm.cs b/trunk/LSLEditorForm.cs index 6cfcdc9..e2709e5 100644 --- a/trunk/LSLEditorForm.cs +++ b/trunk/LSLEditorForm.cs @@ -901,6 +901,7 @@ namespace LSLEditor this.TooltipListBox.XOffset = 200; // TODO, afhankelijk van toegepaste font this.GListBoxWindow.Tag = ""; + // This order equals with the KeyWordTypeEnum in KeyWords.cs ImageList imageList = new ImageList(); imageList.Images.Add(new Bitmap(this.GetType(), "Images.Unknown.gif")); imageList.Images.Add(new Bitmap(this.GetType(), "Images.Functions.gif")); @@ -909,8 +910,10 @@ namespace LSLEditor imageList.Images.Add(new Bitmap(this.GetType(), "Images.Class.gif")); imageList.Images.Add(new Bitmap(this.GetType(), "Images.Vars.gif")); imageList.Images.Add(new Bitmap(this.GetType(), "Images.Properties.gif")); + imageList.Images.Add(new Bitmap(this.GetType(), "Images.States.gif")); this.GListBoxWindow.GListBox.ImageList = imageList; + this.tvOutline.ImageList = imageList; this.Move += new EventHandler(LSLEditorForm_SetPosition); this.Resize += new EventHandler(LSLEditorForm_SetPosition); @@ -1874,7 +1877,23 @@ namespace LSLEditor NativeHelper.SendMyKeys.ClipBoardToApp("SecondLife", null); } - - + private void tvOutline_NodeMouseClick(object sender, TreeNodeMouseClickEventArgs e) + { + EditForm editForm = this.ActiveMdiForm as EditForm; + if (editForm == null) + return; + if (e.Node.Tag is Helpers.OutlineHelper) + { + Helpers.OutlineHelper ohOutline = (Helpers.OutlineHelper)e.Node.Tag; + if (ohOutline.line < editForm.TextBox.Lines.Length) + { + //editForm.Focus(); + editForm.TextBox.Select(); + editForm.TextBox.Goto(ohOutline.line + 1); + + + } + } + } } } \ No newline at end of file diff --git a/trunk/Properties/Resources.Designer.cs b/trunk/Properties/Resources.Designer.cs index bf9c5e3..ce47715 100644 --- a/trunk/Properties/Resources.Designer.cs +++ b/trunk/Properties/Resources.Designer.cs @@ -1,7 +1,7 @@ //------------------------------------------------------------------------------ // // This code was generated by a tool. -// Runtime Version:2.0.50727.832 +// Runtime Version:2.0.50727.3603 // // Changes to this file may cause incorrect behavior and will be lost if // the code is regenerated. diff --git a/trunk/Properties/Settings.Designer.cs b/trunk/Properties/Settings.Designer.cs index 4ff4f82..e5af6a2 100644 --- a/trunk/Properties/Settings.Designer.cs +++ b/trunk/Properties/Settings.Designer.cs @@ -1,7 +1,7 @@ //------------------------------------------------------------------------------ // // This code was generated by a tool. -// Runtime Version:2.0.50727.4927 +// Runtime Version:2.0.50727.3603 // // Changes to this file may cause incorrect behavior and will be lost if // the code is regenerated. @@ -12,7 +12,7 @@ namespace LSLEditor.Properties { [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "8.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "9.0.0.0")] internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase { private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings()))); diff --git a/trunk/Web References/org.lsleditor.www/Reference.cs b/trunk/Web References/org.lsleditor.www/Reference.cs index aedf547..0c0e7de 100644 --- a/trunk/Web References/org.lsleditor.www/Reference.cs +++ b/trunk/Web References/org.lsleditor.www/Reference.cs @@ -1,46 +1,16 @@ -// /** -// ******** -// * -// * ORIGIONAL 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 -// * To Brandon'Dimentox Travanti' Husbands & Malcolm J. Kudra which in turn Liscense under the GPLv2. -// * In agreement to Alphons van der Heijden wishes. -// * -// * 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. -// * -// * 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 -// * ("GPL"), unless you have obtained a separate licensing agreement -// * ("Other License"), formally executed by you and The LSLEditor Group. Terms of -// * the GPL can be found in the gplv2.txt document. -// * -// ******** -// * GPLv2 Header -// ******** -// * LSLEditor, a External editor for the LSL Language. -// * Copyright (C) 2010 The LSLEditor Group. +//------------------------------------------------------------------------------ +// +// This code was generated by a tool. +// Runtime Version:2.0.50727.3603 +// +// Changes to this file may cause incorrect behavior and will be lost if +// the code is regenerated. +// +//------------------------------------------------------------------------------ + +// +// This source code was auto-generated by Microsoft.VSDesigner, Version 2.0.50727.3603. // -// * This program is free software; you can redistribute it and/or -// * modify it under the terms of the GNU General Public License -// * as published by the Free Software Foundation; either version 2 -// * of the License, or (at your option) any later version. -// * -// * This program is distributed in the hope that it will be useful, -// * but WITHOUT ANY WARRANTY; without even the implied warranty of -// * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// * GNU General Public License for more details. -// * -// * You should have received a copy of the GNU General Public License -// * along with this program; if not, write to the Free Software -// * 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 -// * copies or substantial portions of the Software. -// * -// ******** -// */ #pragma warning disable 1591 namespace LSLEditor.org.lsleditor.www { @@ -53,7 +23,7 @@ namespace LSLEditor.org.lsleditor.www { /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "2.0.50727.42")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "2.0.50727.3053")] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] [System.Web.Services.WebServiceBindingAttribute(Name="Service1Soap", Namespace="http://tempuri.org/")] @@ -257,11 +227,11 @@ namespace LSLEditor.org.lsleditor.www { } /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "2.0.50727.42")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "2.0.50727.3053")] public delegate void OpenCompletedEventHandler(object sender, OpenCompletedEventArgs e); /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "2.0.50727.42")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "2.0.50727.3053")] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] public partial class OpenCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs { @@ -283,11 +253,11 @@ namespace LSLEditor.org.lsleditor.www { } /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "2.0.50727.42")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "2.0.50727.3053")] public delegate void GetStatusCompletedEventHandler(object sender, GetStatusCompletedEventArgs e); /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "2.0.50727.42")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "2.0.50727.3053")] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] public partial class GetStatusCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs { @@ -309,11 +279,11 @@ namespace LSLEditor.org.lsleditor.www { } /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "2.0.50727.42")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "2.0.50727.3053")] public delegate void GetBugReportCompletedEventHandler(object sender, GetBugReportCompletedEventArgs e); /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "2.0.50727.42")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "2.0.50727.3053")] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] public partial class GetBugReportCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs { @@ -335,11 +305,11 @@ namespace LSLEditor.org.lsleditor.www { } /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "2.0.50727.42")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "2.0.50727.3053")] public delegate void WriteCompletedEventHandler(object sender, WriteCompletedEventArgs e); /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "2.0.50727.42")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "2.0.50727.3053")] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] public partial class WriteCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs { diff --git a/trunk/obj/Debug/lsleditor.csproj.GenerateResource.Cache b/trunk/obj/Debug/lsleditor.csproj.GenerateResource.Cache index 22b4049..c83b061 100644 Binary files a/trunk/obj/Debug/lsleditor.csproj.GenerateResource.Cache and b/trunk/obj/Debug/lsleditor.csproj.GenerateResource.Cache differ