diff --git a/trunk/EditForm.Designer.cs b/trunk/EditForm.Designer.cs index 21d8b19..79d61f9 100644 --- a/trunk/EditForm.Designer.cs +++ b/trunk/EditForm.Designer.cs @@ -28,75 +28,93 @@ namespace LSLEditor /// private void InitializeComponent() { - this.components = new System.ComponentModel.Container(); - this.tabControl1 = new System.Windows.Forms.TabControl(); - this.tabPage1 = new System.Windows.Forms.TabPage(); - this.contextMenuStrip1 = new System.Windows.Forms.ContextMenuStrip(this.components); - this.disableCompilesyntaxCheckToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.numberedTextBoxUC1 = new NumberedTextBox.NumberedTextBoxUC(); - this.tabControl1.SuspendLayout(); - this.tabPage1.SuspendLayout(); - this.contextMenuStrip1.SuspendLayout(); - this.SuspendLayout(); - // - // tabControl1 - // - this.tabControl1.ContextMenuStrip = this.contextMenuStrip1; - this.tabControl1.Controls.Add(this.tabPage1); - this.tabControl1.Dock = System.Windows.Forms.DockStyle.Fill; - this.tabControl1.Location = new System.Drawing.Point(0, 0); - this.tabControl1.Name = "tabControl1"; - this.tabControl1.SelectedIndex = 0; - this.tabControl1.Size = new System.Drawing.Size(551, 323); - this.tabControl1.TabIndex = 1; - this.tabControl1.SelectedIndexChanged += new System.EventHandler(this.tabControl1_SelectedIndexChanged); - // - // tabPage1 - // - this.tabPage1.Controls.Add(this.numberedTextBoxUC1); - 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(543, 297); - this.tabPage1.TabIndex = 0; - this.tabPage1.Text = "Script"; - this.tabPage1.UseVisualStyleBackColor = true; - // - // contextMenuStrip1 - // - this.contextMenuStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { - this.disableCompilesyntaxCheckToolStripMenuItem}); - this.contextMenuStrip1.Name = "contextMenuStrip1"; - this.contextMenuStrip1.Size = new System.Drawing.Size(225, 26); - // - // disableCompilesyntaxCheckToolStripMenuItem - // - this.disableCompilesyntaxCheckToolStripMenuItem.Name = "disableCompilesyntaxCheckToolStripMenuItem"; - this.disableCompilesyntaxCheckToolStripMenuItem.Size = new System.Drawing.Size(224, 22); - this.disableCompilesyntaxCheckToolStripMenuItem.Text = "Disable compile/syntax check"; - this.disableCompilesyntaxCheckToolStripMenuItem.Click += new System.EventHandler(this.disableCompilesyntaxCheckToolStripMenuItem_Click); - // - // numberedTextBoxUC1 - // - this.numberedTextBoxUC1.Dock = System.Windows.Forms.DockStyle.Fill; - this.numberedTextBoxUC1.Location = new System.Drawing.Point(3, 3); - this.numberedTextBoxUC1.Name = "numberedTextBoxUC1"; - this.numberedTextBoxUC1.Size = new System.Drawing.Size(537, 291); - this.numberedTextBoxUC1.TabIndex = 4; - // - // EditForm - // - this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); - this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(551, 323); - this.Controls.Add(this.tabControl1); - this.Name = "EditForm"; - this.Text = "EditForm"; - this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.EditForm_FormClosing); - this.tabControl1.ResumeLayout(false); - this.tabPage1.ResumeLayout(false); - this.contextMenuStrip1.ResumeLayout(false); - this.ResumeLayout(false); + this.tabControl1 = new System.Windows.Forms.TabControl(); + this.tabPage1 = new System.Windows.Forms.TabPage(); + this.splitContainer1 = new System.Windows.Forms.SplitContainer(); + this.tvOutline = new System.Windows.Forms.TreeView(); + this.numberedTextBoxUC1 = new NumberedTextBox.NumberedTextBoxUC(); + this.tabControl1.SuspendLayout(); + this.tabPage1.SuspendLayout(); + this.splitContainer1.Panel1.SuspendLayout(); + this.splitContainer1.Panel2.SuspendLayout(); + this.splitContainer1.SuspendLayout(); + this.SuspendLayout(); + // + // tabControl1 + // + this.tabControl1.Controls.Add(this.tabPage1); + this.tabControl1.Dock = System.Windows.Forms.DockStyle.Fill; + this.tabControl1.Location = new System.Drawing.Point(0, 0); + this.tabControl1.Name = "tabControl1"; + this.tabControl1.SelectedIndex = 0; + this.tabControl1.Size = new System.Drawing.Size(560, 264); + this.tabControl1.TabIndex = 1; + this.tabControl1.SelectedIndexChanged += new System.EventHandler(this.tabControl1_SelectedIndexChanged); + // + // tabPage1 + // + this.tabPage1.Controls.Add(this.splitContainer1); + 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(552, 238); + this.tabPage1.TabIndex = 0; + this.tabPage1.Text = "Script"; + this.tabPage1.UseVisualStyleBackColor = true; + // + // splitContainer1 + // + this.splitContainer1.Dock = System.Windows.Forms.DockStyle.Fill; + this.splitContainer1.Location = new System.Drawing.Point(3, 3); + this.splitContainer1.Name = "splitContainer1"; + // + // splitContainer1.Panel1 + // + this.splitContainer1.Panel1.Controls.Add(this.numberedTextBoxUC1); + this.splitContainer1.Panel1.RightToLeft = System.Windows.Forms.RightToLeft.No; + // + // splitContainer1.Panel2 + // + this.splitContainer1.Panel2.Controls.Add(this.tvOutline); + this.splitContainer1.Panel2.RightToLeft = System.Windows.Forms.RightToLeft.No; + this.splitContainer1.RightToLeft = System.Windows.Forms.RightToLeft.No; + this.splitContainer1.Size = new System.Drawing.Size(546, 232); + this.splitContainer1.SplitterDistance = 438; + this.splitContainer1.TabIndex = 7; + // + // tvOutline + // + this.tvOutline.Dock = System.Windows.Forms.DockStyle.Fill; + this.tvOutline.Location = new System.Drawing.Point(0, 0); + this.tvOutline.Name = "tvOutline"; + this.tvOutline.Size = new System.Drawing.Size(104, 232); + this.tvOutline.TabIndex = 6; + this.tvOutline.AfterSelect += new System.Windows.Forms.TreeViewEventHandler(this.tvOutline_AfterSelect); + this.tvOutline.NodeMouseClick += new System.Windows.Forms.TreeNodeMouseClickEventHandler(this.tvOutline_NodeMouseClick); + // + // numberedTextBoxUC1 + // + this.numberedTextBoxUC1.Dock = System.Windows.Forms.DockStyle.Fill; + this.numberedTextBoxUC1.Location = new System.Drawing.Point(0, 0); + this.numberedTextBoxUC1.Name = "numberedTextBoxUC1"; + this.numberedTextBoxUC1.Size = new System.Drawing.Size(438, 232); + this.numberedTextBoxUC1.TabIndex = 4; + // + // EditForm + // + this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); + this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; + this.ClientSize = new System.Drawing.Size(560, 264); + this.Controls.Add(this.tabControl1); + this.Name = "EditForm"; + this.Text = "EditForm"; + this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.EditForm_FormClosing); + this.tabControl1.ResumeLayout(false); + this.tabPage1.ResumeLayout(false); + this.splitContainer1.Panel1.ResumeLayout(false); + this.splitContainer1.Panel2.ResumeLayout(false); + this.splitContainer1.ResumeLayout(false); + this.ResumeLayout(false); } @@ -104,9 +122,9 @@ namespace LSLEditor private System.Windows.Forms.TabControl tabControl1; private System.Windows.Forms.TabPage tabPage1; - private NumberedTextBox.NumberedTextBoxUC numberedTextBoxUC1; - private System.Windows.Forms.ContextMenuStrip contextMenuStrip1; - private System.Windows.Forms.ToolStripMenuItem disableCompilesyntaxCheckToolStripMenuItem; + private NumberedTextBox.NumberedTextBoxUC numberedTextBoxUC1; + public System.Windows.Forms.TreeView tvOutline; + public System.Windows.Forms.SplitContainer splitContainer1; } diff --git a/trunk/EditForm.cs b/trunk/EditForm.cs index 8fcc576..f23e8e4 100644 --- a/trunk/EditForm.cs +++ b/trunk/EditForm.cs @@ -139,7 +139,7 @@ namespace LSLEditor this.Icon = lslEditorForm.Icon; this.parent = lslEditorForm; - + this.numberedTextBoxUC1.TextBox.setEditform(this); this.numberedTextBoxUC1.TextBox.Init(this.parent, this.parent.ConfLSL); this.numberedTextBoxUC1.TextBox.OnDirtyChanged += new IsDirtyHandler(TextBox_OnDirtyChanged); @@ -147,7 +147,17 @@ namespace LSLEditor this.Resize += new EventHandler(EditForm_Position); this.Layout += new LayoutEventHandler(EditForm_Layout); + ImageList imageList = new ImageList(); + imageList.Images.Add(new Bitmap(this.GetType(), "Images.Unknown.gif")); + imageList.Images.Add(new Bitmap(this.GetType(), "Images.Functions.gif")); + imageList.Images.Add(new Bitmap(this.GetType(), "Images.Events.gif")); + imageList.Images.Add(new Bitmap(this.GetType(), "Images.Constants.gif")); + 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.tvOutline.ImageList = imageList; SetFont(); } @@ -354,8 +364,8 @@ namespace LSLEditor public bool StartCompiler() { - if (this.disableCompilesyntaxCheckToolStripMenuItem.Checked) - return false; + //if (this.disableCompilesyntaxCheckToolStripMenuItem.Checked) + // return false; if (!this.IsScript) return false; @@ -385,8 +395,8 @@ namespace LSLEditor public bool SyntaxCheck() { - if (this.disableCompilesyntaxCheckToolStripMenuItem.Checked) - return false; + //if (this.disableCompilesyntaxCheckToolStripMenuItem.Checked) + // return false; if (!this.IsScript) return false; @@ -443,7 +453,37 @@ namespace LSLEditor private void disableCompilesyntaxCheckToolStripMenuItem_Click(object sender, EventArgs e) { - this.disableCompilesyntaxCheckToolStripMenuItem.Checked = !this.disableCompilesyntaxCheckToolStripMenuItem.Checked; + //this.disableCompilesyntaxCheckToolStripMenuItem.Checked = !this.disableCompilesyntaxCheckToolStripMenuItem.Checked; } + private void tvOutline_NodeMouseClick(object sender, TreeNodeMouseClickEventArgs e) + { + //this.BeginInvoke(new TreeNodeMouseClickEventHandler( + // delegate(object sender2, TreeNodeMouseClickEventArgs e2) + //{ + + if (e.Node.Tag is Helpers.OutlineHelper) + { + Helpers.OutlineHelper ohOutline = (Helpers.OutlineHelper)e.Node.Tag; + if (ohOutline.line < this.TextBox.Lines.Length) + { + //editForm.Focus(); + //editForm.TextBox.Select(); + //editForm.TextBox.Goto(ohOutline.line + 1); + + TextBox.Focus(); + this.TextBox.Select(); + this.TextBox.SelectionStart = this.TextBox.GetFirstCharIndexFromLine(ohOutline.line); + + + } + } + // }), sender, e); + } + + private void tvOutline_AfterSelect(object sender, TreeViewEventArgs e) + { + + //this.TextBox.Select + } } } \ No newline at end of file diff --git a/trunk/EditForm.resx b/trunk/EditForm.resx index 3f402fe..a403b40 100644 --- a/trunk/EditForm.resx +++ b/trunk/EditForm.resx @@ -117,9 +117,6 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - 17, 17 - 37 diff --git a/trunk/Editor/SyntaxRichTextBox.cs b/trunk/Editor/SyntaxRichTextBox.cs index 25b271e..1b982af 100644 --- a/trunk/Editor/SyntaxRichTextBox.cs +++ b/trunk/Editor/SyntaxRichTextBox.cs @@ -111,7 +111,7 @@ namespace LSLEditor // bracket highlighting private List HighLightList; - public LSLEditorForm p; + public EditForm p; public float CharWidth; public int LineHeight; @@ -291,7 +291,10 @@ namespace LSLEditor //SetStyle(ControlStyles.OptimizedDoubleBuffer, true); //SetStyle(ControlStyles.Opaque, true); } - + public void setEditform(EditForm ed) + { + p = ed; + } public void Init(LSLEditorForm parent, XmlDocument xml) { if (parent != null) @@ -301,7 +304,8 @@ namespace LSLEditor this.TooltipMouse = parent.TooltipMouse; this.TooltipKeyboard = parent.TooltipKeyboard; this.TooltipListBox = parent.TooltipListBox; - p = parent; + // p = this.Parent as EditForm; + // p = parent; moved to edit form } string ColorScheme = "color"; diff --git a/trunk/LSLEditorForm.Designer.cs b/trunk/LSLEditorForm.Designer.cs index 095b486..91ec2ef 100644 --- a/trunk/LSLEditorForm.Designer.cs +++ b/trunk/LSLEditorForm.Designer.cs @@ -140,19 +140,17 @@ namespace LSLEditor this.splitter1 = new System.Windows.Forms.Splitter(); this.pageSetupDialog1 = new System.Windows.Forms.PageSetupDialog(); this.openFileDialog2 = new System.Windows.Forms.OpenFileDialog(); + this.toolTip1 = new System.Windows.Forms.ToolTip(this.components); 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(); this.panel2.SuspendLayout(); this.tabControlExtended2.SuspendLayout(); this.tabPage1.SuspendLayout(); - this.outline.SuspendLayout(); this.SuspendLayout(); // // menuStrip1 @@ -200,7 +198,7 @@ namespace LSLEditor this.toolStripSeparator21, this.exitToolStripMenuItem}); this.fileToolStripMenuItem.Name = "fileToolStripMenuItem"; - this.fileToolStripMenuItem.Size = new System.Drawing.Size(35, 20); + this.fileToolStripMenuItem.Size = new System.Drawing.Size(37, 20); this.fileToolStripMenuItem.Text = "File"; this.fileToolStripMenuItem.Click += new System.EventHandler(this.fileToolStripMenuItem_Click); // @@ -211,7 +209,7 @@ namespace LSLEditor this.newFileToolStripMenuItem, this.notecardToolStripMenuItem}); this.newToolStripMenuItem.Name = "newToolStripMenuItem"; - this.newToolStripMenuItem.Size = new System.Drawing.Size(191, 22); + this.newToolStripMenuItem.Size = new System.Drawing.Size(187, 22); this.newToolStripMenuItem.Text = "New"; // // newProjectToolStripMenuItem @@ -219,7 +217,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(204, 22); + this.newProjectToolStripMenuItem.Size = new System.Drawing.Size(202, 22); this.newProjectToolStripMenuItem.Text = "Solution..."; this.newProjectToolStripMenuItem.Click += new System.EventHandler(this.newProjectToolStripMenuItem_Click); // @@ -228,14 +226,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(204, 22); + this.newFileToolStripMenuItem.Size = new System.Drawing.Size(202, 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(204, 22); + this.notecardToolStripMenuItem.Size = new System.Drawing.Size(202, 22); this.notecardToolStripMenuItem.Text = "Notecard"; this.notecardToolStripMenuItem.Click += new System.EventHandler(this.notecardToolStripMenuItem_Click); // @@ -245,7 +243,7 @@ namespace LSLEditor this.openProjectSolutionToolStripMenuItem, this.openFileToolStripMenuItem}); this.openToolStripMenuItem.Name = "openToolStripMenuItem"; - this.openToolStripMenuItem.Size = new System.Drawing.Size(191, 22); + this.openToolStripMenuItem.Size = new System.Drawing.Size(187, 22); this.openToolStripMenuItem.Text = "Open"; // // openProjectSolutionToolStripMenuItem @@ -253,7 +251,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(243, 22); + this.openProjectSolutionToolStripMenuItem.Size = new System.Drawing.Size(244, 22); this.openProjectSolutionToolStripMenuItem.Text = "Project/Solution..."; this.openProjectSolutionToolStripMenuItem.Click += new System.EventHandler(this.openProjectSolutionToolStripMenuItem_Click); // @@ -262,14 +260,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(243, 22); + this.openFileToolStripMenuItem.Size = new System.Drawing.Size(244, 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(188, 6); + this.toolStripSeparator5.Size = new System.Drawing.Size(184, 6); // // addToolStripMenuItem // @@ -278,40 +276,40 @@ namespace LSLEditor this.toolStripSeparator19, this.existingProjectToolStripMenuItem}); this.addToolStripMenuItem.Name = "addToolStripMenuItem"; - this.addToolStripMenuItem.Size = new System.Drawing.Size(191, 22); + this.addToolStripMenuItem.Size = new System.Drawing.Size(187, 22); this.addToolStripMenuItem.Text = "Add"; this.addToolStripMenuItem.Visible = false; // // newProjectToolStripMenuItem1 // this.newProjectToolStripMenuItem1.Name = "newProjectToolStripMenuItem1"; - this.newProjectToolStripMenuItem1.Size = new System.Drawing.Size(171, 22); + this.newProjectToolStripMenuItem1.Size = new System.Drawing.Size(163, 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(168, 6); + this.toolStripSeparator19.Size = new System.Drawing.Size(160, 6); // // existingProjectToolStripMenuItem // this.existingProjectToolStripMenuItem.Name = "existingProjectToolStripMenuItem"; - this.existingProjectToolStripMenuItem.Size = new System.Drawing.Size(171, 22); + this.existingProjectToolStripMenuItem.Size = new System.Drawing.Size(163, 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(188, 6); + this.addToolStripSeparator.Size = new System.Drawing.Size(184, 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(191, 22); + this.closeFileToolStripMenuItem.Size = new System.Drawing.Size(187, 22); this.closeFileToolStripMenuItem.Text = "Close"; this.closeFileToolStripMenuItem.Click += new System.EventHandler(this.closeFileToolStripMenuItem_Click); // @@ -319,40 +317,40 @@ namespace LSLEditor // this.closeSolutiontoolStripMenuItem.Enabled = false; this.closeSolutiontoolStripMenuItem.Name = "closeSolutiontoolStripMenuItem"; - this.closeSolutiontoolStripMenuItem.Size = new System.Drawing.Size(191, 22); + this.closeSolutiontoolStripMenuItem.Size = new System.Drawing.Size(187, 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(188, 6); + this.toolStripSeparator20.Size = new System.Drawing.Size(184, 6); // // importExampleToolStripMenuItem // this.importExampleToolStripMenuItem.Name = "importExampleToolStripMenuItem"; - this.importExampleToolStripMenuItem.Size = new System.Drawing.Size(191, 22); + this.importExampleToolStripMenuItem.Size = new System.Drawing.Size(187, 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(188, 6); + this.toolStripSeparator4.Size = new System.Drawing.Size(184, 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(191, 22); + this.saveToolStripMenuItem.Size = new System.Drawing.Size(187, 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(191, 22); + this.saveAsToolStripMenuItem.Size = new System.Drawing.Size(187, 22); this.saveAsToolStripMenuItem.Text = "Save As..."; this.saveAsToolStripMenuItem.Click += new System.EventHandler(this.saveAsToolStripMenuItem_Click); // @@ -362,26 +360,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(191, 22); + this.SaveAllToolStripMenuItem.Size = new System.Drawing.Size(187, 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(188, 6); + this.toolStripSeparator3.Size = new System.Drawing.Size(184, 6); // // pageSettingsToolStripMenuItem // this.pageSettingsToolStripMenuItem.Name = "pageSettingsToolStripMenuItem"; - this.pageSettingsToolStripMenuItem.Size = new System.Drawing.Size(191, 22); + this.pageSettingsToolStripMenuItem.Size = new System.Drawing.Size(187, 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(191, 22); + this.printPreviewtoolStripMenuItem.Size = new System.Drawing.Size(187, 22); this.printPreviewtoolStripMenuItem.Text = "Print Preview..."; this.printPreviewtoolStripMenuItem.Click += new System.EventHandler(this.printPreviewtoolStripMenuItem_Click); // @@ -390,50 +388,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(191, 22); + this.printToolStripMenuItem.Size = new System.Drawing.Size(187, 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(188, 6); + this.toolStripSeparator2.Size = new System.Drawing.Size(184, 6); // // copyToClipboardToolStripMenuItem // this.copyToClipboardToolStripMenuItem.Name = "copyToClipboardToolStripMenuItem"; - this.copyToClipboardToolStripMenuItem.Size = new System.Drawing.Size(191, 22); + this.copyToClipboardToolStripMenuItem.Size = new System.Drawing.Size(187, 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(188, 6); + this.toolStripSeparator1.Size = new System.Drawing.Size(184, 6); // // recentFileToolStripMenuItem // this.recentFileToolStripMenuItem.Name = "recentFileToolStripMenuItem"; - this.recentFileToolStripMenuItem.Size = new System.Drawing.Size(191, 22); + this.recentFileToolStripMenuItem.Size = new System.Drawing.Size(187, 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(191, 22); + this.recentProjectToolStripMenuItem.Size = new System.Drawing.Size(187, 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(188, 6); + this.toolStripSeparator21.Size = new System.Drawing.Size(184, 6); // // exitToolStripMenuItem // this.exitToolStripMenuItem.Name = "exitToolStripMenuItem"; - this.exitToolStripMenuItem.Size = new System.Drawing.Size(191, 22); + this.exitToolStripMenuItem.Size = new System.Drawing.Size(187, 22); this.exitToolStripMenuItem.Text = "Exit"; this.exitToolStripMenuItem.Click += new System.EventHandler(this.exitToolStripMenuItem_Click); // @@ -456,7 +454,7 @@ namespace LSLEditor this.toolStripSeparator14, this.advancedToolStripMenuItem}); this.editToolStripMenuItem.Name = "editToolStripMenuItem"; - this.editToolStripMenuItem.Size = new System.Drawing.Size(37, 20); + this.editToolStripMenuItem.Size = new System.Drawing.Size(39, 20); this.editToolStripMenuItem.Text = "Edit"; // // undoToolStripMenuItem @@ -464,7 +462,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(224, 22); + this.undoToolStripMenuItem.Size = new System.Drawing.Size(225, 22); this.undoToolStripMenuItem.Text = "Undo"; this.undoToolStripMenuItem.Click += new System.EventHandler(this.undoToolStripMenuItem_Click); // @@ -473,21 +471,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(224, 22); + this.redoToolStripMenuItem.Size = new System.Drawing.Size(225, 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(221, 6); + this.toolStripSeparator6.Size = new System.Drawing.Size(222, 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(224, 22); + this.cutToolStripMenuItem.Size = new System.Drawing.Size(225, 22); this.cutToolStripMenuItem.Text = "Cut"; this.cutToolStripMenuItem.Click += new System.EventHandler(this.cutToolStripMenuItem_Click); // @@ -496,7 +494,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(224, 22); + this.copyToolStripMenuItem.Size = new System.Drawing.Size(225, 22); this.copyToolStripMenuItem.Text = "Copy"; this.copyToolStripMenuItem.Click += new System.EventHandler(this.copyToolStripMenuItem_Click); // @@ -505,7 +503,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(224, 22); + this.pasteToolStripMenuItem.Size = new System.Drawing.Size(225, 22); this.pasteToolStripMenuItem.Text = "Paste"; this.pasteToolStripMenuItem.Click += new System.EventHandler(this.pasteToolStripMenuItem_Click); // @@ -514,20 +512,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(224, 22); + this.deleteToolStripMenuItem.Size = new System.Drawing.Size(225, 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(221, 6); + this.toolStripSeparator13.Size = new System.Drawing.Size(222, 6); // // selectAllToolStripMenuItem // this.selectAllToolStripMenuItem.Name = "selectAllToolStripMenuItem"; this.selectAllToolStripMenuItem.ShortcutKeyDisplayString = "Ctrl+A"; - this.selectAllToolStripMenuItem.Size = new System.Drawing.Size(224, 22); + this.selectAllToolStripMenuItem.Size = new System.Drawing.Size(225, 22); this.selectAllToolStripMenuItem.Text = "Select All"; this.selectAllToolStripMenuItem.Click += new System.EventHandler(this.selectAllToolStripMenuItem_Click); // @@ -536,14 +534,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(224, 22); + this.toolStripMenuItem8.Size = new System.Drawing.Size(225, 22); this.toolStripMenuItem8.Text = "Select All to SL"; this.toolStripMenuItem8.Click += new System.EventHandler(this.toolStripMenuItem8_Click); // // toolStripSeparator7 // this.toolStripSeparator7.Name = "toolStripSeparator7"; - this.toolStripSeparator7.Size = new System.Drawing.Size(221, 6); + this.toolStripSeparator7.Size = new System.Drawing.Size(222, 6); // // FindtoolStripMenuItem // @@ -552,14 +550,14 @@ namespace LSLEditor this.replaceToolStripMenuItem, this.findNextToolStripMenuItem}); this.FindtoolStripMenuItem.Name = "FindtoolStripMenuItem"; - this.FindtoolStripMenuItem.Size = new System.Drawing.Size(224, 22); + this.FindtoolStripMenuItem.Size = new System.Drawing.Size(225, 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(162, 22); + this.findToolStripMenuItem1.Size = new System.Drawing.Size(158, 22); this.findToolStripMenuItem1.Text = "Find"; this.findToolStripMenuItem1.Click += new System.EventHandler(this.findToolStripMenuItem_Click); // @@ -567,7 +565,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(162, 22); + this.replaceToolStripMenuItem.Size = new System.Drawing.Size(158, 22); this.replaceToolStripMenuItem.Text = "Replace"; this.replaceToolStripMenuItem.Click += new System.EventHandler(this.replaceToolStripMenuItem_Click); // @@ -575,7 +573,7 @@ namespace LSLEditor // this.findNextToolStripMenuItem.Name = "findNextToolStripMenuItem"; this.findNextToolStripMenuItem.ShortcutKeys = System.Windows.Forms.Keys.F3; - this.findNextToolStripMenuItem.Size = new System.Drawing.Size(162, 22); + this.findNextToolStripMenuItem.Size = new System.Drawing.Size(158, 22); this.findNextToolStripMenuItem.Text = "Find next"; this.findNextToolStripMenuItem.Visible = false; this.findNextToolStripMenuItem.Click += new System.EventHandler(this.findNextToolStripMenuItem_Click); @@ -584,14 +582,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(224, 22); + this.toolStripMenuItem1.Size = new System.Drawing.Size(225, 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(221, 6); + this.toolStripSeparator14.Size = new System.Drawing.Size(222, 6); // // advancedToolStripMenuItem // @@ -601,14 +599,14 @@ namespace LSLEditor this.commentInToolStripMenuItem, this.uncommentingSelectedTextToolStripMenuItem}); this.advancedToolStripMenuItem.Name = "advancedToolStripMenuItem"; - this.advancedToolStripMenuItem.Size = new System.Drawing.Size(224, 22); + this.advancedToolStripMenuItem.Size = new System.Drawing.Size(225, 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(258, 22); + this.formatDocumentToolStripMenuItem.Size = new System.Drawing.Size(266, 22); this.formatDocumentToolStripMenuItem.Text = "Format document"; this.formatDocumentToolStripMenuItem.Click += new System.EventHandler(this.formatDocumentToolStripMenuItem_Click); // @@ -616,7 +614,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(258, 22); + this.formatSelectedTextToolStripMenuItem.Size = new System.Drawing.Size(266, 22); this.formatSelectedTextToolStripMenuItem.Text = "Format selected text"; this.formatSelectedTextToolStripMenuItem.Click += new System.EventHandler(this.formatSelectedTextToolStripMenuItem_Click); // @@ -625,7 +623,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(258, 22); + this.commentInToolStripMenuItem.Size = new System.Drawing.Size(266, 22); this.commentInToolStripMenuItem.Text = "Commenting selected text"; this.commentInToolStripMenuItem.Click += new System.EventHandler(this.commentInToolStripMenuItem_Click); // @@ -634,7 +632,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(258, 22); + this.uncommentingSelectedTextToolStripMenuItem.Size = new System.Drawing.Size(266, 22); this.uncommentingSelectedTextToolStripMenuItem.Text = "Uncommenting selected text"; this.uncommentingSelectedTextToolStripMenuItem.Click += new System.EventHandler(this.uncommentingSelectedTextToolStripMenuItem_Click); // @@ -643,13 +641,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(41, 20); + this.toolStripMenuItem2.Size = new System.Drawing.Size(44, 20); this.toolStripMenuItem2.Text = "View"; // // solutionExplorerToolStripMenuItem // this.solutionExplorerToolStripMenuItem.Name = "solutionExplorerToolStripMenuItem"; - this.solutionExplorerToolStripMenuItem.Size = new System.Drawing.Size(166, 22); + this.solutionExplorerToolStripMenuItem.Size = new System.Drawing.Size(163, 22); this.solutionExplorerToolStripMenuItem.Text = "Solution Explorer"; this.solutionExplorerToolStripMenuItem.Click += new System.EventHandler(this.solutionExplorerToolStripMenuItem_Click); // @@ -659,7 +657,7 @@ namespace LSLEditor this.addNewObjecttoolStripMenuItem, this.addNewFileToolStripMenuItem}); this.projectToolStripMenuItem.Name = "projectToolStripMenuItem"; - this.projectToolStripMenuItem.Size = new System.Drawing.Size(53, 20); + this.projectToolStripMenuItem.Size = new System.Drawing.Size(56, 20); this.projectToolStripMenuItem.Text = "Project"; // // addNewObjecttoolStripMenuItem @@ -668,7 +666,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(232, 22); + this.addNewObjecttoolStripMenuItem.Size = new System.Drawing.Size(235, 22); this.addNewObjecttoolStripMenuItem.Text = "Add New Object"; this.addNewObjecttoolStripMenuItem.Click += new System.EventHandler(this.addNewObjecttoolStripMenuItem_Click); // @@ -676,7 +674,7 @@ namespace LSLEditor // this.addNewFileToolStripMenuItem.Enabled = false; this.addNewFileToolStripMenuItem.Name = "addNewFileToolStripMenuItem"; - this.addNewFileToolStripMenuItem.Size = new System.Drawing.Size(232, 22); + this.addNewFileToolStripMenuItem.Size = new System.Drawing.Size(235, 22); this.addNewFileToolStripMenuItem.Text = "Add New Item"; // // buildToolStripMenuItem @@ -687,7 +685,7 @@ namespace LSLEditor this.toolStripSeparator23, this.syntaxCheckerToolStripMenuItem}); this.buildToolStripMenuItem.Name = "buildToolStripMenuItem"; - this.buildToolStripMenuItem.Size = new System.Drawing.Size(50, 20); + this.buildToolStripMenuItem.Size = new System.Drawing.Size(54, 20); this.buildToolStripMenuItem.Text = "Debug"; // // startToolStripMenuItem @@ -695,7 +693,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(180, 22); + this.startToolStripMenuItem.Size = new System.Drawing.Size(173, 22); this.startToolStripMenuItem.Text = "Start"; this.startToolStripMenuItem.Click += new System.EventHandler(this.startToolStripMenuItem_Click); // @@ -705,20 +703,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(180, 22); + this.stopToolStripMenuItem.Size = new System.Drawing.Size(173, 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(177, 6); + this.toolStripSeparator23.Size = new System.Drawing.Size(170, 6); // // syntaxCheckerToolStripMenuItem // this.syntaxCheckerToolStripMenuItem.Name = "syntaxCheckerToolStripMenuItem"; this.syntaxCheckerToolStripMenuItem.ShortcutKeys = System.Windows.Forms.Keys.F6; - this.syntaxCheckerToolStripMenuItem.Size = new System.Drawing.Size(180, 22); + this.syntaxCheckerToolStripMenuItem.Size = new System.Drawing.Size(173, 22); this.syntaxCheckerToolStripMenuItem.Text = "Syntax Checker"; this.syntaxCheckerToolStripMenuItem.Click += new System.EventHandler(this.syntaxCheckerToolStripMenuItem_Click); // @@ -727,13 +725,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(44, 20); + this.toolStripMenuItem3.Size = new System.Drawing.Size(48, 20); this.toolStripMenuItem3.Text = "Tools"; // // optionsToolStripMenuItem // this.optionsToolStripMenuItem.Name = "optionsToolStripMenuItem"; - this.optionsToolStripMenuItem.Size = new System.Drawing.Size(134, 22); + this.optionsToolStripMenuItem.Size = new System.Drawing.Size(125, 22); this.optionsToolStripMenuItem.Text = "Options..."; this.optionsToolStripMenuItem.Click += new System.EventHandler(this.optionsToolStripMenuItem_Click); // @@ -752,70 +750,70 @@ namespace LSLEditor this.tabbedViewToolStripMenuItem, this.closeActiveWindowToolStripMenuItem}); this.viewToolStripMenuItem.Name = "viewToolStripMenuItem"; - this.viewToolStripMenuItem.Size = new System.Drawing.Size(57, 20); + this.viewToolStripMenuItem.Size = new System.Drawing.Size(63, 20); this.viewToolStripMenuItem.Text = "Window"; // // horizontalToolStripMenuItem // this.horizontalToolStripMenuItem.Name = "horizontalToolStripMenuItem"; - this.horizontalToolStripMenuItem.Size = new System.Drawing.Size(258, 22); + this.horizontalToolStripMenuItem.Size = new System.Drawing.Size(263, 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(258, 22); + this.verticalToolStripMenuItem.Size = new System.Drawing.Size(263, 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(258, 22); + this.cascadeToolStripMenuItem.Size = new System.Drawing.Size(263, 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(255, 6); + this.toolStripSeparator11.Size = new System.Drawing.Size(260, 6); // // ArangeIconsToolStripMenuItem // this.ArangeIconsToolStripMenuItem.Name = "ArangeIconsToolStripMenuItem"; - this.ArangeIconsToolStripMenuItem.Size = new System.Drawing.Size(258, 22); + this.ArangeIconsToolStripMenuItem.Size = new System.Drawing.Size(263, 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(255, 6); + this.toolStripSeparator10.Size = new System.Drawing.Size(260, 6); // // browserInWindowToolStripMenuItem // this.browserInWindowToolStripMenuItem.Name = "browserInWindowToolStripMenuItem"; - this.browserInWindowToolStripMenuItem.Size = new System.Drawing.Size(258, 22); + this.browserInWindowToolStripMenuItem.Size = new System.Drawing.Size(263, 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(258, 22); + this.WikiSepBrowserstoolStripMenuItem.Size = new System.Drawing.Size(263, 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(255, 6); + this.toolStripSeparator16.Size = new System.Drawing.Size(260, 6); // // tabbedViewToolStripMenuItem // this.tabbedViewToolStripMenuItem.Name = "tabbedViewToolStripMenuItem"; - this.tabbedViewToolStripMenuItem.Size = new System.Drawing.Size(258, 22); + this.tabbedViewToolStripMenuItem.Size = new System.Drawing.Size(263, 22); this.tabbedViewToolStripMenuItem.Text = "Tabbed document"; this.tabbedViewToolStripMenuItem.Click += new System.EventHandler(this.tabbedViewToolStripMenuItem_Click); // @@ -823,7 +821,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(258, 22); + this.closeActiveWindowToolStripMenuItem.Size = new System.Drawing.Size(263, 22); this.closeActiveWindowToolStripMenuItem.Text = "Close active window"; this.closeActiveWindowToolStripMenuItem.Click += new System.EventHandler(this.closeActiveWindowToolStripMenuItem_Click); // @@ -847,14 +845,14 @@ namespace LSLEditor this.toolStripSeparator17, this.aboutToolStripMenuItem}); this.helpToolStripMenuItem.Name = "helpToolStripMenuItem"; - this.helpToolStripMenuItem.Size = new System.Drawing.Size(40, 20); + this.helpToolStripMenuItem.Size = new System.Drawing.Size(44, 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(219, 22); + this.indexToolStripMenuItem.Size = new System.Drawing.Size(211, 22); this.indexToolStripMenuItem.Text = "Index LSL Wiki"; this.indexToolStripMenuItem.Click += new System.EventHandler(this.indexToolStripMenuItem_Click); // @@ -862,93 +860,93 @@ namespace LSLEditor // this.helpKeywordToolStripMenuItem.Name = "helpKeywordToolStripMenuItem"; this.helpKeywordToolStripMenuItem.ShortcutKeys = System.Windows.Forms.Keys.F1; - this.helpKeywordToolStripMenuItem.Size = new System.Drawing.Size(219, 22); + this.helpKeywordToolStripMenuItem.Size = new System.Drawing.Size(211, 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(216, 6); + this.toolStripSeparator8.Size = new System.Drawing.Size(208, 6); // // checkForUpdatesToolStripMenuItem // this.checkForUpdatesToolStripMenuItem.Name = "checkForUpdatesToolStripMenuItem"; - this.checkForUpdatesToolStripMenuItem.Size = new System.Drawing.Size(219, 22); + this.checkForUpdatesToolStripMenuItem.Size = new System.Drawing.Size(211, 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(219, 22); + this.toolStripMenuItem4.Size = new System.Drawing.Size(211, 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(216, 6); + this.toolStripSeparator9.Size = new System.Drawing.Size(208, 6); // // ReleaseNotesToolStripMenuItem // this.ReleaseNotesToolStripMenuItem.Name = "ReleaseNotesToolStripMenuItem"; - this.ReleaseNotesToolStripMenuItem.Size = new System.Drawing.Size(219, 22); + this.ReleaseNotesToolStripMenuItem.Size = new System.Drawing.Size(211, 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(216, 6); + this.toolStripSeparator12.Size = new System.Drawing.Size(208, 6); // // makeBugReporttoolStripMenuItem // this.makeBugReporttoolStripMenuItem.Name = "makeBugReporttoolStripMenuItem"; - this.makeBugReporttoolStripMenuItem.Size = new System.Drawing.Size(219, 22); + this.makeBugReporttoolStripMenuItem.Size = new System.Drawing.Size(211, 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(219, 22); + this.toolStripMenuItem6.Size = new System.Drawing.Size(211, 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(216, 6); + this.toolStripSeparator22.Size = new System.Drawing.Size(208, 6); // // toolStripMenuItem5 // this.toolStripMenuItem5.Name = "toolStripMenuItem5"; - this.toolStripMenuItem5.Size = new System.Drawing.Size(219, 22); + this.toolStripMenuItem5.Size = new System.Drawing.Size(211, 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(216, 6); + this.toolStripSeparator15.Size = new System.Drawing.Size(208, 6); // // toolStripMenuItem7 // this.toolStripMenuItem7.Name = "toolStripMenuItem7"; - this.toolStripMenuItem7.Size = new System.Drawing.Size(219, 22); + this.toolStripMenuItem7.Size = new System.Drawing.Size(211, 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(216, 6); + this.toolStripSeparator17.Size = new System.Drawing.Size(208, 6); // // aboutToolStripMenuItem // this.aboutToolStripMenuItem.Name = "aboutToolStripMenuItem"; - this.aboutToolStripMenuItem.Size = new System.Drawing.Size(219, 22); + this.aboutToolStripMenuItem.Size = new System.Drawing.Size(211, 22); this.aboutToolStripMenuItem.Text = "About..."; this.aboutToolStripMenuItem.Click += new System.EventHandler(this.aboutToolStripMenuItem_Click); // @@ -976,12 +974,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(112, 26); + this.contextMenuStrip1.Size = new System.Drawing.Size(104, 26); // // closeTabToolStripMenuItem // this.closeTabToolStripMenuItem.Name = "closeTabToolStripMenuItem"; - this.closeTabToolStripMenuItem.Size = new System.Drawing.Size(111, 22); + this.closeTabToolStripMenuItem.Size = new System.Drawing.Size(103, 22); this.closeTabToolStripMenuItem.Text = "Close"; this.closeTabToolStripMenuItem.Click += new System.EventHandler(this.closeTabToolStripMenuItem_Click); // @@ -1043,7 +1041,6 @@ namespace LSLEditor // 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"; @@ -1070,28 +1067,6 @@ namespace LSLEditor 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.HideSelection = false; - 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.AfterSelect += new System.Windows.Forms.TreeViewEventHandler(this.tvOutline_AfterSelect); - this.tvOutline.NodeMouseClick += new System.Windows.Forms.TreeNodeMouseClickEventHandler(this.tvOutline_NodeMouseClick); - // // LSLEditorForm // this.AllowDrop = true; @@ -1123,7 +1098,6 @@ namespace LSLEditor this.panel2.ResumeLayout(false); this.tabControlExtended2.ResumeLayout(false); this.tabPage1.ResumeLayout(false); - this.outline.ResumeLayout(false); this.ResumeLayout(false); this.PerformLayout(); @@ -1244,8 +1218,7 @@ namespace LSLEditor private System.Windows.Forms.ToolStripMenuItem notecardToolStripMenuItem; private System.Windows.Forms.ToolStripMenuItem toolStripMenuItem7; private System.Windows.Forms.ToolStripSeparator toolStripSeparator17; - private System.Windows.Forms.ToolStripMenuItem toolStripMenuItem8; - private System.Windows.Forms.TabPage outline; - public System.Windows.Forms.TreeView tvOutline; + private System.Windows.Forms.ToolStripMenuItem toolStripMenuItem8; + private System.Windows.Forms.ToolTip toolTip1; } } \ No newline at end of file diff --git a/trunk/LSLEditorForm.cs b/trunk/LSLEditorForm.cs index 25e42cb..8ba3f5f 100644 --- a/trunk/LSLEditorForm.cs +++ b/trunk/LSLEditorForm.cs @@ -913,7 +913,7 @@ namespace LSLEditor imageList.Images.Add(new Bitmap(this.GetType(), "Images.States.gif")); this.GListBoxWindow.GListBox.ImageList = imageList; - this.tvOutline.ImageList = imageList; + // this.tvOutline.ImageList = imageList; this.Move += new EventHandler(LSLEditorForm_SetPosition); this.Resize += new EventHandler(LSLEditorForm_SetPosition); @@ -1877,36 +1877,6 @@ namespace LSLEditor NativeHelper.SendMyKeys.ClipBoardToApp("SecondLife", null); } - private void tvOutline_NodeMouseClick(object sender, TreeNodeMouseClickEventArgs e) - { - this.BeginInvoke(new TreeNodeMouseClickEventHandler( - delegate(object sender2, TreeNodeMouseClickEventArgs e2) - { - 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); - //editForm.Focus(); - editForm.TextBox.Select(); - editForm.TextBox.SelectionStart = editForm.TextBox.GetFirstCharIndexFromLine(ohOutline.line); - - - } - } - }), sender, e); - } - - private void tvOutline_AfterSelect(object sender, TreeViewEventArgs e) - { - - } } } \ No newline at end of file diff --git a/trunk/LSLEditorForm.resx b/trunk/LSLEditorForm.resx index 548795f..5c4482c 100644 --- a/trunk/LSLEditorForm.resx +++ b/trunk/LSLEditorForm.resx @@ -138,6 +138,9 @@ 17, 54 + + 157, 54 + 53