diff --git a/BizHawk.MultiClient/tools/LuaWriter.Designer.cs b/BizHawk.MultiClient/tools/LuaWriter.Designer.cs index 2f73813afc..a08e1f5a44 100644 --- a/BizHawk.MultiClient/tools/LuaWriter.Designer.cs +++ b/BizHawk.MultiClient/tools/LuaWriter.Designer.cs @@ -28,105 +28,105 @@ /// private void InitializeComponent() { - this.components = new System.ComponentModel.Container(); - System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(LuaWriter)); - this.timer = new System.Windows.Forms.Timer(this.components); - this.menuStrip1 = new System.Windows.Forms.MenuStrip(); - this.fileToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.saveToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.saveAsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.toolStripSeparator1 = new System.Windows.Forms.ToolStripSeparator(); - this.exitToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.editToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.undoToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.redoToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.toolStripSeparator2 = new System.Windows.Forms.ToolStripSeparator(); - this.cutToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.copyToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.pasteToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.toolStripSeparator3 = new System.Windows.Forms.ToolStripSeparator(); - this.selectAllToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.toolStripSeparator4 = new System.Windows.Forms.ToolStripSeparator(); - this.searchToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.replaceToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.goToToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.configToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.fontToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.syntaxHighlightingToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.restoreSettingsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.MessageLabel = new System.Windows.Forms.Label(); - this.AutoCompleteView = new System.Windows.Forms.ListView(); - this.PositionLabel = new System.Windows.Forms.Label(); - this.ZoomLabel = new System.Windows.Forms.Label(); - this.startWithEmptyScriptToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.LuaText = new BizHawk.MultiClient.LuaWriterBox(); - this.toolStripSeparator5 = new System.Windows.Forms.ToolStripSeparator(); - this.menuStrip1.SuspendLayout(); - this.SuspendLayout(); - // - // timer - // - this.timer.Enabled = true; - this.timer.Interval = 1000; - this.timer.Tick += new System.EventHandler(this.timer_Tick); - // - // menuStrip1 - // - this.menuStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { + this.components = new System.ComponentModel.Container(); + System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(LuaWriter)); + this.timer = new System.Windows.Forms.Timer(this.components); + this.menuStrip1 = new System.Windows.Forms.MenuStrip(); + this.fileToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.saveToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.saveAsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.toolStripSeparator1 = new System.Windows.Forms.ToolStripSeparator(); + this.exitToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.editToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.undoToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.redoToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.toolStripSeparator2 = new System.Windows.Forms.ToolStripSeparator(); + this.cutToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.copyToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.pasteToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.toolStripSeparator3 = new System.Windows.Forms.ToolStripSeparator(); + this.selectAllToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.toolStripSeparator4 = new System.Windows.Forms.ToolStripSeparator(); + this.searchToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.replaceToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.goToToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.configToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.fontToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.syntaxHighlightingToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.toolStripSeparator5 = new System.Windows.Forms.ToolStripSeparator(); + this.startWithEmptyScriptToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.restoreSettingsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.MessageLabel = new System.Windows.Forms.Label(); + this.AutoCompleteView = new System.Windows.Forms.ListView(); + this.PositionLabel = new System.Windows.Forms.Label(); + this.ZoomLabel = new System.Windows.Forms.Label(); + this.LuaText = new BizHawk.MultiClient.LuaWriterBox(); + this.menuStrip1.SuspendLayout(); + this.SuspendLayout(); + // + // timer + // + this.timer.Enabled = true; + this.timer.Interval = 1000; + this.timer.Tick += new System.EventHandler(this.timer_Tick); + // + // menuStrip1 + // + this.menuStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { this.fileToolStripMenuItem, this.editToolStripMenuItem, this.configToolStripMenuItem}); - this.menuStrip1.Location = new System.Drawing.Point(0, 0); - this.menuStrip1.Name = "menuStrip1"; - this.menuStrip1.Size = new System.Drawing.Size(474, 24); - this.menuStrip1.TabIndex = 1; - this.menuStrip1.Text = "menuStrip1"; - // - // fileToolStripMenuItem - // - this.fileToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { + this.menuStrip1.Location = new System.Drawing.Point(0, 0); + this.menuStrip1.Name = "menuStrip1"; + this.menuStrip1.Size = new System.Drawing.Size(474, 24); + this.menuStrip1.TabIndex = 1; + this.menuStrip1.Text = "menuStrip1"; + // + // fileToolStripMenuItem + // + this.fileToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { this.saveToolStripMenuItem, this.saveAsToolStripMenuItem, this.toolStripSeparator1, this.exitToolStripMenuItem}); - this.fileToolStripMenuItem.Name = "fileToolStripMenuItem"; - this.fileToolStripMenuItem.Size = new System.Drawing.Size(37, 20); - this.fileToolStripMenuItem.Text = "&File"; - // - // saveToolStripMenuItem - // - this.saveToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.SaveAs; - 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(195, 22); - this.saveToolStripMenuItem.Text = "&Save"; - this.saveToolStripMenuItem.Click += new System.EventHandler(this.saveToolStripMenuItem_Click); - // - // saveAsToolStripMenuItem - // - this.saveAsToolStripMenuItem.Name = "saveAsToolStripMenuItem"; - this.saveAsToolStripMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)(((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.Shift) + this.fileToolStripMenuItem.Name = "fileToolStripMenuItem"; + this.fileToolStripMenuItem.Size = new System.Drawing.Size(37, 20); + this.fileToolStripMenuItem.Text = "&File"; + // + // saveToolStripMenuItem + // + this.saveToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.SaveAs; + 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(195, 22); + this.saveToolStripMenuItem.Text = "&Save"; + this.saveToolStripMenuItem.Click += new System.EventHandler(this.saveToolStripMenuItem_Click); + // + // saveAsToolStripMenuItem + // + this.saveAsToolStripMenuItem.Name = "saveAsToolStripMenuItem"; + this.saveAsToolStripMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)(((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.Shift) | System.Windows.Forms.Keys.S))); - this.saveAsToolStripMenuItem.Size = new System.Drawing.Size(195, 22); - this.saveAsToolStripMenuItem.Text = "Save &As..."; - this.saveAsToolStripMenuItem.Click += new System.EventHandler(this.saveAsToolStripMenuItem_Click); - // - // toolStripSeparator1 - // - this.toolStripSeparator1.Name = "toolStripSeparator1"; - this.toolStripSeparator1.Size = new System.Drawing.Size(192, 6); - // - // exitToolStripMenuItem - // - this.exitToolStripMenuItem.Name = "exitToolStripMenuItem"; - this.exitToolStripMenuItem.ShortcutKeyDisplayString = "Alt+F4"; - this.exitToolStripMenuItem.Size = new System.Drawing.Size(195, 22); - this.exitToolStripMenuItem.Text = "E&xit"; - this.exitToolStripMenuItem.Click += new System.EventHandler(this.exitToolStripMenuItem_Click); - // - // editToolStripMenuItem - // - this.editToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { + this.saveAsToolStripMenuItem.Size = new System.Drawing.Size(195, 22); + this.saveAsToolStripMenuItem.Text = "Save &As..."; + this.saveAsToolStripMenuItem.Click += new System.EventHandler(this.saveAsToolStripMenuItem_Click); + // + // toolStripSeparator1 + // + this.toolStripSeparator1.Name = "toolStripSeparator1"; + this.toolStripSeparator1.Size = new System.Drawing.Size(192, 6); + // + // exitToolStripMenuItem + // + this.exitToolStripMenuItem.Name = "exitToolStripMenuItem"; + this.exitToolStripMenuItem.ShortcutKeyDisplayString = "Alt+F4"; + this.exitToolStripMenuItem.Size = new System.Drawing.Size(195, 22); + this.exitToolStripMenuItem.Text = "E&xit"; + this.exitToolStripMenuItem.Click += new System.EventHandler(this.exitToolStripMenuItem_Click); + // + // editToolStripMenuItem + // + this.editToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { this.undoToolStripMenuItem, this.redoToolStripMenuItem, this.toolStripSeparator2, @@ -139,231 +139,231 @@ this.searchToolStripMenuItem, this.replaceToolStripMenuItem, this.goToToolStripMenuItem}); - this.editToolStripMenuItem.Name = "editToolStripMenuItem"; - this.editToolStripMenuItem.Size = new System.Drawing.Size(39, 20); - this.editToolStripMenuItem.Text = "Edit"; - // - // undoToolStripMenuItem - // - this.undoToolStripMenuItem.Image = global::BizHawk.MultiClient.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(164, 22); - this.undoToolStripMenuItem.Text = "Undo"; - this.undoToolStripMenuItem.Click += new System.EventHandler(this.undoToolStripMenuItem_Click); - // - // redoToolStripMenuItem - // - this.redoToolStripMenuItem.Image = global::BizHawk.MultiClient.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(164, 22); - this.redoToolStripMenuItem.Text = "Redo"; - this.redoToolStripMenuItem.Click += new System.EventHandler(this.redoToolStripMenuItem_Click); - // - // toolStripSeparator2 - // - this.toolStripSeparator2.Name = "toolStripSeparator2"; - this.toolStripSeparator2.Size = new System.Drawing.Size(161, 6); - // - // cutToolStripMenuItem - // - this.cutToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.CutHS; - this.cutToolStripMenuItem.Name = "cutToolStripMenuItem"; - this.cutToolStripMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.X))); - this.cutToolStripMenuItem.Size = new System.Drawing.Size(164, 22); - this.cutToolStripMenuItem.Text = "Cut"; - this.cutToolStripMenuItem.Click += new System.EventHandler(this.cutToolStripMenuItem_Click); - // - // copyToolStripMenuItem - // - this.copyToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.Duplicate; - this.copyToolStripMenuItem.Name = "copyToolStripMenuItem"; - this.copyToolStripMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.C))); - this.copyToolStripMenuItem.Size = new System.Drawing.Size(164, 22); - this.copyToolStripMenuItem.Text = "Copy"; - this.copyToolStripMenuItem.Click += new System.EventHandler(this.copyToolStripMenuItem_Click); - // - // pasteToolStripMenuItem - // - this.pasteToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.Paste; - this.pasteToolStripMenuItem.Name = "pasteToolStripMenuItem"; - this.pasteToolStripMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.V))); - this.pasteToolStripMenuItem.Size = new System.Drawing.Size(164, 22); - this.pasteToolStripMenuItem.Text = "Paste"; - this.pasteToolStripMenuItem.Click += new System.EventHandler(this.pasteToolStripMenuItem_Click); - // - // toolStripSeparator3 - // - this.toolStripSeparator3.Name = "toolStripSeparator3"; - this.toolStripSeparator3.Size = new System.Drawing.Size(161, 6); - // - // selectAllToolStripMenuItem - // - this.selectAllToolStripMenuItem.Name = "selectAllToolStripMenuItem"; - this.selectAllToolStripMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.A))); - this.selectAllToolStripMenuItem.Size = new System.Drawing.Size(164, 22); - this.selectAllToolStripMenuItem.Text = "Select All"; - this.selectAllToolStripMenuItem.Click += new System.EventHandler(this.selectAllToolStripMenuItem_Click); - // - // toolStripSeparator4 - // - this.toolStripSeparator4.Name = "toolStripSeparator4"; - this.toolStripSeparator4.Size = new System.Drawing.Size(161, 6); - // - // searchToolStripMenuItem - // - this.searchToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.FindHS; - this.searchToolStripMenuItem.Name = "searchToolStripMenuItem"; - this.searchToolStripMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.F))); - this.searchToolStripMenuItem.Size = new System.Drawing.Size(164, 22); - this.searchToolStripMenuItem.Text = "Search"; - // - // replaceToolStripMenuItem - // - 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(164, 22); - this.replaceToolStripMenuItem.Text = "Replace"; - // - // goToToolStripMenuItem - // - this.goToToolStripMenuItem.Name = "goToToolStripMenuItem"; - this.goToToolStripMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.G))); - this.goToToolStripMenuItem.Size = new System.Drawing.Size(164, 22); - this.goToToolStripMenuItem.Text = "Go to..."; - this.goToToolStripMenuItem.Click += new System.EventHandler(this.goToToolStripMenuItem_Click); - // - // configToolStripMenuItem - // - this.configToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { + this.editToolStripMenuItem.Name = "editToolStripMenuItem"; + this.editToolStripMenuItem.Size = new System.Drawing.Size(39, 20); + this.editToolStripMenuItem.Text = "Edit"; + // + // undoToolStripMenuItem + // + this.undoToolStripMenuItem.Image = global::BizHawk.MultiClient.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(164, 22); + this.undoToolStripMenuItem.Text = "Undo"; + this.undoToolStripMenuItem.Click += new System.EventHandler(this.undoToolStripMenuItem_Click); + // + // redoToolStripMenuItem + // + this.redoToolStripMenuItem.Image = global::BizHawk.MultiClient.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(164, 22); + this.redoToolStripMenuItem.Text = "Redo"; + this.redoToolStripMenuItem.Click += new System.EventHandler(this.redoToolStripMenuItem_Click); + // + // toolStripSeparator2 + // + this.toolStripSeparator2.Name = "toolStripSeparator2"; + this.toolStripSeparator2.Size = new System.Drawing.Size(161, 6); + // + // cutToolStripMenuItem + // + this.cutToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.CutHS; + this.cutToolStripMenuItem.Name = "cutToolStripMenuItem"; + this.cutToolStripMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.X))); + this.cutToolStripMenuItem.Size = new System.Drawing.Size(164, 22); + this.cutToolStripMenuItem.Text = "Cut"; + this.cutToolStripMenuItem.Click += new System.EventHandler(this.cutToolStripMenuItem_Click); + // + // copyToolStripMenuItem + // + this.copyToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.Duplicate; + this.copyToolStripMenuItem.Name = "copyToolStripMenuItem"; + this.copyToolStripMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.C))); + this.copyToolStripMenuItem.Size = new System.Drawing.Size(164, 22); + this.copyToolStripMenuItem.Text = "Copy"; + this.copyToolStripMenuItem.Click += new System.EventHandler(this.copyToolStripMenuItem_Click); + // + // pasteToolStripMenuItem + // + this.pasteToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.Paste; + this.pasteToolStripMenuItem.Name = "pasteToolStripMenuItem"; + this.pasteToolStripMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.V))); + this.pasteToolStripMenuItem.Size = new System.Drawing.Size(164, 22); + this.pasteToolStripMenuItem.Text = "Paste"; + this.pasteToolStripMenuItem.Click += new System.EventHandler(this.pasteToolStripMenuItem_Click); + // + // toolStripSeparator3 + // + this.toolStripSeparator3.Name = "toolStripSeparator3"; + this.toolStripSeparator3.Size = new System.Drawing.Size(161, 6); + // + // selectAllToolStripMenuItem + // + this.selectAllToolStripMenuItem.Name = "selectAllToolStripMenuItem"; + this.selectAllToolStripMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.A))); + this.selectAllToolStripMenuItem.Size = new System.Drawing.Size(164, 22); + this.selectAllToolStripMenuItem.Text = "Select All"; + this.selectAllToolStripMenuItem.Click += new System.EventHandler(this.selectAllToolStripMenuItem_Click); + // + // toolStripSeparator4 + // + this.toolStripSeparator4.Name = "toolStripSeparator4"; + this.toolStripSeparator4.Size = new System.Drawing.Size(161, 6); + // + // searchToolStripMenuItem + // + this.searchToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.FindHS; + this.searchToolStripMenuItem.Name = "searchToolStripMenuItem"; + this.searchToolStripMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.F))); + this.searchToolStripMenuItem.Size = new System.Drawing.Size(164, 22); + this.searchToolStripMenuItem.Text = "Search"; + // + // replaceToolStripMenuItem + // + 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(164, 22); + this.replaceToolStripMenuItem.Text = "Replace"; + // + // goToToolStripMenuItem + // + this.goToToolStripMenuItem.Name = "goToToolStripMenuItem"; + this.goToToolStripMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.G))); + this.goToToolStripMenuItem.Size = new System.Drawing.Size(164, 22); + this.goToToolStripMenuItem.Text = "Go to..."; + this.goToToolStripMenuItem.Click += new System.EventHandler(this.goToToolStripMenuItem_Click); + // + // configToolStripMenuItem + // + this.configToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { this.fontToolStripMenuItem, this.syntaxHighlightingToolStripMenuItem, this.toolStripSeparator5, this.startWithEmptyScriptToolStripMenuItem, this.restoreSettingsToolStripMenuItem}); - this.configToolStripMenuItem.Name = "configToolStripMenuItem"; - this.configToolStripMenuItem.Size = new System.Drawing.Size(55, 20); - this.configToolStripMenuItem.Text = "&Config"; - // - // fontToolStripMenuItem - // - this.fontToolStripMenuItem.Name = "fontToolStripMenuItem"; - this.fontToolStripMenuItem.Size = new System.Drawing.Size(196, 22); - this.fontToolStripMenuItem.Text = "&Font"; - this.fontToolStripMenuItem.Click += new System.EventHandler(this.fontToolStripMenuItem_Click); - // - // syntaxHighlightingToolStripMenuItem - // - this.syntaxHighlightingToolStripMenuItem.Name = "syntaxHighlightingToolStripMenuItem"; - this.syntaxHighlightingToolStripMenuItem.Size = new System.Drawing.Size(196, 22); - this.syntaxHighlightingToolStripMenuItem.Text = "&Syntax Highlighting"; - this.syntaxHighlightingToolStripMenuItem.Click += new System.EventHandler(this.syntaxHighlightingToolStripMenuItem_Click); - // - // restoreSettingsToolStripMenuItem - // - this.restoreSettingsToolStripMenuItem.Name = "restoreSettingsToolStripMenuItem"; - this.restoreSettingsToolStripMenuItem.Size = new System.Drawing.Size(196, 22); - this.restoreSettingsToolStripMenuItem.Text = "Restore Settings"; - this.restoreSettingsToolStripMenuItem.Click += new System.EventHandler(this.restoreSettingsToolStripMenuItem_Click); - // - // MessageLabel - // - this.MessageLabel.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); - this.MessageLabel.AutoSize = true; - this.MessageLabel.Location = new System.Drawing.Point(15, 424); - this.MessageLabel.Name = "MessageLabel"; - this.MessageLabel.Size = new System.Drawing.Size(91, 13); - this.MessageLabel.TabIndex = 2; - this.MessageLabel.Text = " "; - // - // AutoCompleteView - // - this.AutoCompleteView.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); - this.AutoCompleteView.FullRowSelect = true; - this.AutoCompleteView.Location = new System.Drawing.Point(324, 322); - this.AutoCompleteView.Name = "AutoCompleteView"; - this.AutoCompleteView.Size = new System.Drawing.Size(121, 97); - this.AutoCompleteView.TabIndex = 3; - this.AutoCompleteView.UseCompatibleStateImageBehavior = false; - this.AutoCompleteView.View = System.Windows.Forms.View.List; - this.AutoCompleteView.Visible = false; - this.AutoCompleteView.MouseDoubleClick += new System.Windows.Forms.MouseEventHandler(this.AutoCompleteView_MouseDoubleClick); - // - // PositionLabel - // - this.PositionLabel.AutoSize = true; - this.PositionLabel.Location = new System.Drawing.Point(14, 30); - this.PositionLabel.Name = "PositionLabel"; - this.PositionLabel.Size = new System.Drawing.Size(46, 13); - this.PositionLabel.TabIndex = 4; - this.PositionLabel.Text = " "; - // - // ZoomLabel - // - this.ZoomLabel.AutoSize = true; - this.ZoomLabel.Location = new System.Drawing.Point(393, 30); - this.ZoomLabel.Name = "ZoomLabel"; - this.ZoomLabel.Size = new System.Drawing.Size(66, 13); - this.ZoomLabel.TabIndex = 5; - this.ZoomLabel.Text = "Zoom: 100%"; - // - // startWithEmptyScriptToolStripMenuItem - // - this.startWithEmptyScriptToolStripMenuItem.Name = "startWithEmptyScriptToolStripMenuItem"; - this.startWithEmptyScriptToolStripMenuItem.Size = new System.Drawing.Size(196, 22); - this.startWithEmptyScriptToolStripMenuItem.Text = "Start With Empty Script"; - this.startWithEmptyScriptToolStripMenuItem.Click += new System.EventHandler(this.startWithEmptyScriptToolStripMenuItem_Click); - // - // LuaText - // - this.LuaText.AcceptsTab = true; - this.LuaText.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) + this.configToolStripMenuItem.Name = "configToolStripMenuItem"; + this.configToolStripMenuItem.Size = new System.Drawing.Size(55, 20); + this.configToolStripMenuItem.Text = "&Config"; + // + // fontToolStripMenuItem + // + this.fontToolStripMenuItem.Name = "fontToolStripMenuItem"; + this.fontToolStripMenuItem.Size = new System.Drawing.Size(196, 22); + this.fontToolStripMenuItem.Text = "&Font"; + this.fontToolStripMenuItem.Click += new System.EventHandler(this.fontToolStripMenuItem_Click); + // + // syntaxHighlightingToolStripMenuItem + // + this.syntaxHighlightingToolStripMenuItem.Name = "syntaxHighlightingToolStripMenuItem"; + this.syntaxHighlightingToolStripMenuItem.Size = new System.Drawing.Size(196, 22); + this.syntaxHighlightingToolStripMenuItem.Text = "&Syntax Highlighting"; + this.syntaxHighlightingToolStripMenuItem.Click += new System.EventHandler(this.syntaxHighlightingToolStripMenuItem_Click); + // + // toolStripSeparator5 + // + this.toolStripSeparator5.Name = "toolStripSeparator5"; + this.toolStripSeparator5.Size = new System.Drawing.Size(193, 6); + // + // startWithEmptyScriptToolStripMenuItem + // + this.startWithEmptyScriptToolStripMenuItem.Name = "startWithEmptyScriptToolStripMenuItem"; + this.startWithEmptyScriptToolStripMenuItem.Size = new System.Drawing.Size(196, 22); + this.startWithEmptyScriptToolStripMenuItem.Text = "Start With Empty Script"; + this.startWithEmptyScriptToolStripMenuItem.Click += new System.EventHandler(this.startWithEmptyScriptToolStripMenuItem_Click); + // + // restoreSettingsToolStripMenuItem + // + this.restoreSettingsToolStripMenuItem.Name = "restoreSettingsToolStripMenuItem"; + this.restoreSettingsToolStripMenuItem.Size = new System.Drawing.Size(196, 22); + this.restoreSettingsToolStripMenuItem.Text = "Restore Settings"; + this.restoreSettingsToolStripMenuItem.Click += new System.EventHandler(this.restoreSettingsToolStripMenuItem_Click); + // + // MessageLabel + // + this.MessageLabel.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); + this.MessageLabel.AutoSize = true; + this.MessageLabel.Location = new System.Drawing.Point(15, 424); + this.MessageLabel.Name = "MessageLabel"; + this.MessageLabel.Size = new System.Drawing.Size(91, 13); + this.MessageLabel.TabIndex = 2; + this.MessageLabel.Text = " "; + // + // AutoCompleteView + // + this.AutoCompleteView.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); + this.AutoCompleteView.FullRowSelect = true; + this.AutoCompleteView.Location = new System.Drawing.Point(324, 322); + this.AutoCompleteView.Name = "AutoCompleteView"; + this.AutoCompleteView.Size = new System.Drawing.Size(121, 97); + this.AutoCompleteView.TabIndex = 3; + this.AutoCompleteView.UseCompatibleStateImageBehavior = false; + this.AutoCompleteView.View = System.Windows.Forms.View.List; + this.AutoCompleteView.Visible = false; + this.AutoCompleteView.MouseDoubleClick += new System.Windows.Forms.MouseEventHandler(this.AutoCompleteView_MouseDoubleClick); + // + // PositionLabel + // + this.PositionLabel.AutoSize = true; + this.PositionLabel.Location = new System.Drawing.Point(14, 30); + this.PositionLabel.Name = "PositionLabel"; + this.PositionLabel.Size = new System.Drawing.Size(46, 13); + this.PositionLabel.TabIndex = 4; + this.PositionLabel.Text = " "; + // + // ZoomLabel + // + this.ZoomLabel.AutoSize = true; + this.ZoomLabel.Location = new System.Drawing.Point(393, 30); + this.ZoomLabel.Name = "ZoomLabel"; + this.ZoomLabel.Size = new System.Drawing.Size(66, 13); + this.ZoomLabel.TabIndex = 5; + this.ZoomLabel.Text = "Zoom: 100%"; + // + // LuaText + // + this.LuaText.AcceptsTab = true; + this.LuaText.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) | System.Windows.Forms.AnchorStyles.Left) | System.Windows.Forms.AnchorStyles.Right))); - this.LuaText.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; - this.LuaText.EnableAutoDragDrop = true; - this.LuaText.Location = new System.Drawing.Point(15, 50); - this.LuaText.Name = "LuaText"; - this.LuaText.Size = new System.Drawing.Size(444, 369); - this.LuaText.TabIndex = 0; - this.LuaText.Text = ""; - this.LuaText.WordWrap = false; - this.LuaText.SelectionChanged += new System.EventHandler(this.LuaText_SelectionChanged); - this.LuaText.TextChanged += new System.EventHandler(this.LuaText_TextChanged); - this.LuaText.KeyDown += new System.Windows.Forms.KeyEventHandler(this.LuaText_KeyDown); - this.LuaText.KeyUp += new System.Windows.Forms.KeyEventHandler(this.LuaText_KeyUp); - this.LuaText.PreviewKeyDown += new System.Windows.Forms.PreviewKeyDownEventHandler(this.LuaText_PreviewKeyDown); - // - // toolStripSeparator5 - // - this.toolStripSeparator5.Name = "toolStripSeparator5"; - this.toolStripSeparator5.Size = new System.Drawing.Size(193, 6); - // - // LuaWriter - // - this.AllowDrop = true; - this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); - this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(474, 441); - this.Controls.Add(this.AutoCompleteView); - this.Controls.Add(this.ZoomLabel); - this.Controls.Add(this.PositionLabel); - this.Controls.Add(this.MessageLabel); - this.Controls.Add(this.LuaText); - this.Controls.Add(this.menuStrip1); - this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon"))); - this.MainMenuStrip = this.menuStrip1; - this.Name = "LuaWriter"; - this.Text = "LuaWriter"; - this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.LuaWriter_FormClosing); - this.Load += new System.EventHandler(this.LuaWriter_Load); - this.DragDrop += new System.Windows.Forms.DragEventHandler(this.LuaWriter_DragDrop); - this.DragEnter += new System.Windows.Forms.DragEventHandler(this.LuaWriter_DragEnter); - this.menuStrip1.ResumeLayout(false); - this.menuStrip1.PerformLayout(); - this.ResumeLayout(false); - this.PerformLayout(); + this.LuaText.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; + this.LuaText.EnableAutoDragDrop = true; + this.LuaText.Location = new System.Drawing.Point(15, 50); + this.LuaText.Name = "LuaText"; + this.LuaText.Size = new System.Drawing.Size(444, 369); + this.LuaText.TabIndex = 0; + this.LuaText.Text = ""; + this.LuaText.WordWrap = false; + this.LuaText.SelectionChanged += new System.EventHandler(this.LuaText_SelectionChanged); + this.LuaText.TextChanged += new System.EventHandler(this.LuaText_TextChanged); + this.LuaText.KeyDown += new System.Windows.Forms.KeyEventHandler(this.LuaText_KeyDown); + this.LuaText.KeyUp += new System.Windows.Forms.KeyEventHandler(this.LuaText_KeyUp); + this.LuaText.PreviewKeyDown += new System.Windows.Forms.PreviewKeyDownEventHandler(this.LuaText_PreviewKeyDown); + // + // LuaWriter + // + this.AllowDrop = true; + this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); + this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; + this.ClientSize = new System.Drawing.Size(474, 441); + this.Controls.Add(this.AutoCompleteView); + this.Controls.Add(this.ZoomLabel); + this.Controls.Add(this.PositionLabel); + this.Controls.Add(this.MessageLabel); + this.Controls.Add(this.LuaText); + this.Controls.Add(this.menuStrip1); + this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon"))); + this.MainMenuStrip = this.menuStrip1; + this.Name = "LuaWriter"; + this.Text = "LuaWriter"; + this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.LuaWriter_FormClosing); + this.Load += new System.EventHandler(this.LuaWriter_Load); + this.DragDrop += new System.Windows.Forms.DragEventHandler(this.LuaWriter_DragDrop); + this.DragEnter += new System.Windows.Forms.DragEventHandler(this.LuaWriter_DragEnter); + this.menuStrip1.ResumeLayout(false); + this.menuStrip1.PerformLayout(); + this.ResumeLayout(false); + this.PerformLayout(); } diff --git a/BizHawk.MultiClient/tools/LuaWriter.cs b/BizHawk.MultiClient/tools/LuaWriter.cs index 9f229aa195..3a8c36efea 100644 --- a/BizHawk.MultiClient/tools/LuaWriter.cs +++ b/BizHawk.MultiClient/tools/LuaWriter.cs @@ -33,7 +33,8 @@ namespace BizHawk.MultiClient public string CurrentFile = ""; bool changes = false; - bool hasChanged; + bool hasChanged = false; + bool ProcessingText = false; public Regex keyWords = new Regex("and|break|do|else|if|end|false|for|function|in|local|nil|not|or|repeat|return|then|true|until|while|elseif"); char[] Symbols = { '+', '-', '*', '/', '%', '^', '#', '=', '<', '>', '(', ')', '{', '}', '[', ']', ';', ':', ',', '.' }; public Regex libraryWords; @@ -72,6 +73,7 @@ namespace BizHawk.MultiClient private void ProcessText() { + ProcessingText = true; int selPos = LuaText.SelectionStart; int selChars = LuaText.SelectedText.Length; @@ -86,6 +88,7 @@ namespace BizHawk.MultiClient ColorStrings(); ColorLongStrings(); LuaText.Select(selPos, selChars); + ProcessingText = false; } private void ColorLongStrings() @@ -103,29 +106,35 @@ namespace BizHawk.MultiClient else if (firstBracket != LuaText.Text.Length - 1) { secondBracket = LuaText.Find("[", firstBracket + 1, LuaText.Text.Length, RichTextBoxFinds.MatchCase); - if (secondBracket >= 0 && IsLongString(LuaText.Text.Substring(firstBracket, secondBracket - firstBracket))) - { - if (secondBracket + 1 == LuaText.Text.Length) - ending = LuaText.Text.Length - 1; - else - { - string temp = GetLongStringClosingBracket(LuaText.Text.Substring(firstBracket, secondBracket - firstBracket + 1)); - ending = LuaText.Find(temp, secondBracket + 1, LuaText.Text.Length, RichTextBoxFinds.MatchCase); - ending += temp.Length - 1; - } - if (ending < 0) - ending = LuaText.Text.Length - 1; + if (secondBracket >= 0 && IsLongString(LuaText.Text.Substring(firstBracket, secondBracket - firstBracket + 1))) + { + if (secondBracket + 1 == LuaText.Text.Length) + ending = LuaText.Text.Length - 1; + else + { + string temp = GetLongStringClosingBracket(LuaText.Text.Substring(firstBracket, secondBracket - firstBracket + 1)); + ending = LuaText.Find(temp, secondBracket + 1, LuaText.Text.Length, RichTextBoxFinds.MatchCase); + if (ending < 0) + ending = LuaText.Text.Length; + else + ending += temp.Length - 1; + } - LuaText.Select(firstBracket, ending - firstBracket + 1); - LuaText.SelectionColor = Color.FromArgb(Global.Config.LuaStringColor); + LuaText.Select(firstBracket, ending - firstBracket + 1); + LuaText.SelectionColor = Color.FromArgb(Global.Config.LuaStringColor); - if(ending < LuaText.Text.Length - 1) - firstBracket = LuaText.Find("[", ending + 1, LuaText.Text.Length, RichTextBoxFinds.MatchCase); - else - break; - } - else - break; + if (ending < LuaText.Text.Length - 1) + firstBracket = LuaText.Find("[", ending + 1, LuaText.Text.Length, RichTextBoxFinds.MatchCase); + else + break; + } + else + { + if(secondBracket >= 0 && secondBracket != LuaText.Text.Length - 1) + firstBracket = LuaText.Find("[", secondBracket, LuaText.Text.Length, RichTextBoxFinds.MatchCase); + else + break; + } } else break; @@ -152,8 +161,11 @@ namespace BizHawk.MultiClient bool Validated = true; foreach (char c in longstring) - if (c != ']' && c != '=') - break; + if (c != '[' && c != '=') + { + Validated = false; + break; + } return Validated; } @@ -404,21 +416,9 @@ namespace BizHawk.MultiClient return; } - using (StreamReader sr = file.OpenText()) - { - StringBuilder luaText = new StringBuilder(); - string s = ""; - while ((s = sr.ReadLine()) != null) - { - luaText.Append(s); - luaText.Append('\n'); - } - - if (luaText.Length > 0) - { - LuaText.Text = luaText.ToString(); - } - } + StreamReader sr = new StreamReader(file.FullName); + LuaText.Text = sr.ReadToEnd(); + sr.Close(); MessageLabel.Text = CurrentFile; } @@ -447,9 +447,9 @@ namespace BizHawk.MultiClient } else if (changes) { - SaveScriptAs(); - MessageLabel.Text = Path.GetFileName(CurrentFile) + " saved."; + SaveScriptAs(); } + MessageLabel.Text = Path.GetFileName(CurrentFile) + " saved."; } private void SaveScript() @@ -458,10 +458,7 @@ namespace BizHawk.MultiClient using (StreamWriter sw = new StreamWriter(CurrentFile)) { - foreach (string s in LuaText.Lines) - { - sw.WriteLine(s + '\n'); - } + sw.Write(LuaText.Text); } NoChanges(); @@ -534,8 +531,11 @@ namespace BizHawk.MultiClient private void LuaText_TextChanged(object sender, EventArgs e) { - hasChanged = true; - Changes(); + if (!ProcessingText) + { + hasChanged = true; + Changes(); + } } private void saveAsToolStripMenuItem_Click(object sender, EventArgs e)