From 1380cccd7a878df745afc00324e5f726d946f95e Mon Sep 17 00:00:00 2001 From: adelikat Date: Sat, 17 Mar 2012 12:14:59 +0000 Subject: [PATCH] Lua Console - output window - context menu with a clear option --- .../tools/LuaConsole.Designer.cs | 1125 +++++++++-------- BizHawk.MultiClient/tools/LuaConsole.cs | 53 +- BizHawk.MultiClient/tools/LuaConsole.resx | 3 + 3 files changed, 605 insertions(+), 576 deletions(-) diff --git a/BizHawk.MultiClient/tools/LuaConsole.Designer.cs b/BizHawk.MultiClient/tools/LuaConsole.Designer.cs index a3fe84ae89..81bb9bba00 100644 --- a/BizHawk.MultiClient/tools/LuaConsole.Designer.cs +++ b/BizHawk.MultiClient/tools/LuaConsole.Designer.cs @@ -28,178 +28,181 @@ /// private void InitializeComponent() { - this.components = new System.ComponentModel.Container(); - System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(LuaConsole)); - this.LuaListView = new BizHawk.VirtualListView(); - this.Script = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader())); - this.PathName = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader())); - this.contextMenuStrip1 = new System.Windows.Forms.ContextMenuStrip(this.components); - this.toggleScriptToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.editScriptToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.removeScriptToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.insertSeperatorToolStripMenuItem1 = new System.Windows.Forms.ToolStripMenuItem(); - this.toolStripSeparator4 = new System.Windows.Forms.ToolStripSeparator(); - this.stopAllScriptsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.menuStrip1 = new System.Windows.Forms.MenuStrip(); - this.fileToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.newToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.openSessionToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.saveToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.saveAsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.toolStripSeparator9 = new System.Windows.Forms.ToolStripSeparator(); - this.recentSessionsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.noneToolStripMenuItem1 = new System.Windows.Forms.ToolStripMenuItem(); - this.toolStripSeparator8 = new System.Windows.Forms.ToolStripSeparator(); - this.clearToolStripMenuItem1 = new System.Windows.Forms.ToolStripMenuItem(); - this.recentToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.noneToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.toolStripSeparator3 = new System.Windows.Forms.ToolStripSeparator(); - this.clearToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.toolStripSeparator1 = new System.Windows.Forms.ToolStripSeparator(); - this.exitToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.scriptToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.openToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.toggleToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.editToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.removeScriptToolStripMenuItem1 = new System.Windows.Forms.ToolStripMenuItem(); - this.insertSeparatorToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.toolStripSeparator7 = new System.Windows.Forms.ToolStripSeparator(); - this.moveUpToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.moveDownToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.selectAllToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.toolStripSeparator6 = new System.Windows.Forms.ToolStripSeparator(); - this.turnOffAllScriptsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.optionsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.saveWindowPositionToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.autoloadConsoleToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.toolStripSeparator5 = new System.Windows.Forms.ToolStripSeparator(); - this.restoreWindowSizeToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.helpToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.luaFunctionsListToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.OutputBox = new System.Windows.Forms.RichTextBox(); - this.groupBox1 = new System.Windows.Forms.GroupBox(); - this.NumberOfScripts = new System.Windows.Forms.Label(); - this.toolStrip1 = new ToolStripEx(); - this.openToolStripButton = new System.Windows.Forms.ToolStripButton(); - this.copyToolStripButton = new System.Windows.Forms.ToolStripButton(); - this.EditToolstripButton = new System.Windows.Forms.ToolStripButton(); - this.cutToolStripButton = new System.Windows.Forms.ToolStripButton(); - this.toolStripButtonSeparator = new System.Windows.Forms.ToolStripButton(); - this.toolStripSeparator2 = new System.Windows.Forms.ToolStripSeparator(); - this.toolStripButtonMoveUp = new System.Windows.Forms.ToolStripButton(); - this.toolStripButtonMoveDown = new System.Windows.Forms.ToolStripButton(); - this.contextMenuStrip1.SuspendLayout(); - this.menuStrip1.SuspendLayout(); - this.groupBox1.SuspendLayout(); - this.toolStrip1.SuspendLayout(); - this.SuspendLayout(); - // - // LuaListView - // - this.LuaListView.CheckBoxes = true; - this.LuaListView.Columns.AddRange(new System.Windows.Forms.ColumnHeader[] { + this.components = new System.ComponentModel.Container(); + System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(LuaConsole)); + this.LuaListView = new BizHawk.VirtualListView(); + this.Script = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader())); + this.PathName = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader())); + this.contextMenuStrip1 = new System.Windows.Forms.ContextMenuStrip(this.components); + this.toggleScriptToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.editScriptToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.removeScriptToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.insertSeperatorToolStripMenuItem1 = new System.Windows.Forms.ToolStripMenuItem(); + this.toolStripSeparator4 = new System.Windows.Forms.ToolStripSeparator(); + this.stopAllScriptsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.menuStrip1 = new System.Windows.Forms.MenuStrip(); + this.fileToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.newToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.openSessionToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.saveToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.saveAsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.toolStripSeparator9 = new System.Windows.Forms.ToolStripSeparator(); + this.recentSessionsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.noneToolStripMenuItem1 = new System.Windows.Forms.ToolStripMenuItem(); + this.toolStripSeparator8 = new System.Windows.Forms.ToolStripSeparator(); + this.clearToolStripMenuItem1 = new System.Windows.Forms.ToolStripMenuItem(); + this.recentToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.noneToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.toolStripSeparator3 = new System.Windows.Forms.ToolStripSeparator(); + this.clearToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.toolStripSeparator1 = new System.Windows.Forms.ToolStripSeparator(); + this.exitToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.scriptToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.openToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.toggleToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.editToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.removeScriptToolStripMenuItem1 = new System.Windows.Forms.ToolStripMenuItem(); + this.insertSeparatorToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.toolStripSeparator7 = new System.Windows.Forms.ToolStripSeparator(); + this.moveUpToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.moveDownToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.selectAllToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.toolStripSeparator6 = new System.Windows.Forms.ToolStripSeparator(); + this.turnOffAllScriptsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.optionsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.saveWindowPositionToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.autoloadConsoleToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.toolStripSeparator5 = new System.Windows.Forms.ToolStripSeparator(); + this.restoreWindowSizeToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.helpToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.luaFunctionsListToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.OutputBox = new System.Windows.Forms.RichTextBox(); + this.groupBox1 = new System.Windows.Forms.GroupBox(); + this.NumberOfScripts = new System.Windows.Forms.Label(); + this.toolStrip1 = new ToolStripEx(); + this.openToolStripButton = new System.Windows.Forms.ToolStripButton(); + this.copyToolStripButton = new System.Windows.Forms.ToolStripButton(); + this.EditToolstripButton = new System.Windows.Forms.ToolStripButton(); + this.cutToolStripButton = new System.Windows.Forms.ToolStripButton(); + this.toolStripButtonSeparator = new System.Windows.Forms.ToolStripButton(); + this.toolStripSeparator2 = new System.Windows.Forms.ToolStripSeparator(); + this.toolStripButtonMoveUp = new System.Windows.Forms.ToolStripButton(); + this.toolStripButtonMoveDown = new System.Windows.Forms.ToolStripButton(); + this.contextMenuStrip2 = new System.Windows.Forms.ContextMenuStrip(this.components); + this.clearToolStripMenuItem2 = new System.Windows.Forms.ToolStripMenuItem(); + this.contextMenuStrip1.SuspendLayout(); + this.menuStrip1.SuspendLayout(); + this.groupBox1.SuspendLayout(); + this.toolStrip1.SuspendLayout(); + this.contextMenuStrip2.SuspendLayout(); + this.SuspendLayout(); + // + // LuaListView + // + this.LuaListView.CheckBoxes = true; + this.LuaListView.Columns.AddRange(new System.Windows.Forms.ColumnHeader[] { this.Script, this.PathName}); - this.LuaListView.ContextMenuStrip = this.contextMenuStrip1; - this.LuaListView.FullRowSelect = true; - this.LuaListView.GridLines = true; - this.LuaListView.HideSelection = false; - this.LuaListView.ItemCount = 0; - this.LuaListView.Location = new System.Drawing.Point(13, 71); - this.LuaListView.Name = "LuaListView"; - this.LuaListView.selectedItem = -1; - this.LuaListView.Size = new System.Drawing.Size(291, 280); - this.LuaListView.TabIndex = 0; - this.LuaListView.UseCompatibleStateImageBehavior = false; - this.LuaListView.View = System.Windows.Forms.View.Details; - this.LuaListView.ItemActivate += new System.EventHandler(this.LuaListView_ItemActivate); - this.LuaListView.SelectedIndexChanged += new System.EventHandler(this.LuaListView_SelectedIndexChanged); - this.LuaListView.DoubleClick += new System.EventHandler(this.LuaListView_DoubleClick); - this.LuaListView.KeyDown += new System.Windows.Forms.KeyEventHandler(this.LuaListView_KeyDown); - // - // Script - // - this.Script.Text = "Script"; - this.Script.Width = 92; - // - // PathName - // - this.PathName.Text = "Path"; - this.PathName.Width = 195; - // - // contextMenuStrip1 - // - this.contextMenuStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { + this.LuaListView.ContextMenuStrip = this.contextMenuStrip1; + this.LuaListView.FullRowSelect = true; + this.LuaListView.GridLines = true; + this.LuaListView.HideSelection = false; + this.LuaListView.ItemCount = 0; + this.LuaListView.Location = new System.Drawing.Point(13, 71); + this.LuaListView.Name = "LuaListView"; + this.LuaListView.selectedItem = -1; + this.LuaListView.Size = new System.Drawing.Size(291, 280); + this.LuaListView.TabIndex = 0; + this.LuaListView.UseCompatibleStateImageBehavior = false; + this.LuaListView.View = System.Windows.Forms.View.Details; + this.LuaListView.ItemActivate += new System.EventHandler(this.LuaListView_ItemActivate); + this.LuaListView.SelectedIndexChanged += new System.EventHandler(this.LuaListView_SelectedIndexChanged); + this.LuaListView.DoubleClick += new System.EventHandler(this.LuaListView_DoubleClick); + this.LuaListView.KeyDown += new System.Windows.Forms.KeyEventHandler(this.LuaListView_KeyDown); + // + // Script + // + this.Script.Text = "Script"; + this.Script.Width = 92; + // + // PathName + // + this.PathName.Text = "Path"; + this.PathName.Width = 195; + // + // contextMenuStrip1 + // + this.contextMenuStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { this.toggleScriptToolStripMenuItem, this.editScriptToolStripMenuItem, this.removeScriptToolStripMenuItem, this.insertSeperatorToolStripMenuItem1, this.toolStripSeparator4, this.stopAllScriptsToolStripMenuItem}); - this.contextMenuStrip1.Name = "contextMenuStrip1"; - this.contextMenuStrip1.Size = new System.Drawing.Size(175, 120); - // - // toggleScriptToolStripMenuItem - // - this.toggleScriptToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.Refresh1; - this.toggleScriptToolStripMenuItem.Name = "toggleScriptToolStripMenuItem"; - this.toggleScriptToolStripMenuItem.Size = new System.Drawing.Size(174, 22); - this.toggleScriptToolStripMenuItem.Text = "&Toggle"; - this.toggleScriptToolStripMenuItem.Click += new System.EventHandler(this.toggleScriptToolStripMenuItem_Click); - // - // editScriptToolStripMenuItem - // - this.editScriptToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.CutHS; - this.editScriptToolStripMenuItem.Name = "editScriptToolStripMenuItem"; - this.editScriptToolStripMenuItem.Size = new System.Drawing.Size(174, 22); - this.editScriptToolStripMenuItem.Text = "&Edit"; - this.editScriptToolStripMenuItem.Click += new System.EventHandler(this.editScriptToolStripMenuItem_Click); - // - // removeScriptToolStripMenuItem - // - this.removeScriptToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.Close; - this.removeScriptToolStripMenuItem.Name = "removeScriptToolStripMenuItem"; - this.removeScriptToolStripMenuItem.Size = new System.Drawing.Size(174, 22); - this.removeScriptToolStripMenuItem.Text = "&Remove"; - this.removeScriptToolStripMenuItem.Click += new System.EventHandler(this.removeScriptToolStripMenuItem_Click); - // - // insertSeperatorToolStripMenuItem1 - // - this.insertSeperatorToolStripMenuItem1.Image = global::BizHawk.MultiClient.Properties.Resources.InsertSeparator; - this.insertSeperatorToolStripMenuItem1.Name = "insertSeperatorToolStripMenuItem1"; - this.insertSeperatorToolStripMenuItem1.Size = new System.Drawing.Size(174, 22); - this.insertSeperatorToolStripMenuItem1.Text = "Insert Seperator"; - this.insertSeperatorToolStripMenuItem1.Click += new System.EventHandler(this.insertSeperatorToolStripMenuItem1_Click); - // - // toolStripSeparator4 - // - this.toolStripSeparator4.Name = "toolStripSeparator4"; - this.toolStripSeparator4.Size = new System.Drawing.Size(171, 6); - // - // stopAllScriptsToolStripMenuItem - // - this.stopAllScriptsToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.Stop; - this.stopAllScriptsToolStripMenuItem.Name = "stopAllScriptsToolStripMenuItem"; - this.stopAllScriptsToolStripMenuItem.Size = new System.Drawing.Size(174, 22); - this.stopAllScriptsToolStripMenuItem.Text = "Turn Off All Scripts"; - this.stopAllScriptsToolStripMenuItem.Click += new System.EventHandler(this.stopAllScriptsToolStripMenuItem_Click); - // - // menuStrip1 - // - this.menuStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { + this.contextMenuStrip1.Name = "contextMenuStrip1"; + this.contextMenuStrip1.Size = new System.Drawing.Size(175, 120); + // + // toggleScriptToolStripMenuItem + // + this.toggleScriptToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.Refresh1; + this.toggleScriptToolStripMenuItem.Name = "toggleScriptToolStripMenuItem"; + this.toggleScriptToolStripMenuItem.Size = new System.Drawing.Size(174, 22); + this.toggleScriptToolStripMenuItem.Text = "&Toggle"; + this.toggleScriptToolStripMenuItem.Click += new System.EventHandler(this.toggleScriptToolStripMenuItem_Click); + // + // editScriptToolStripMenuItem + // + this.editScriptToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.CutHS; + this.editScriptToolStripMenuItem.Name = "editScriptToolStripMenuItem"; + this.editScriptToolStripMenuItem.Size = new System.Drawing.Size(174, 22); + this.editScriptToolStripMenuItem.Text = "&Edit"; + this.editScriptToolStripMenuItem.Click += new System.EventHandler(this.editScriptToolStripMenuItem_Click); + // + // removeScriptToolStripMenuItem + // + this.removeScriptToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.Close; + this.removeScriptToolStripMenuItem.Name = "removeScriptToolStripMenuItem"; + this.removeScriptToolStripMenuItem.Size = new System.Drawing.Size(174, 22); + this.removeScriptToolStripMenuItem.Text = "&Remove"; + this.removeScriptToolStripMenuItem.Click += new System.EventHandler(this.removeScriptToolStripMenuItem_Click); + // + // insertSeperatorToolStripMenuItem1 + // + this.insertSeperatorToolStripMenuItem1.Image = global::BizHawk.MultiClient.Properties.Resources.InsertSeparator; + this.insertSeperatorToolStripMenuItem1.Name = "insertSeperatorToolStripMenuItem1"; + this.insertSeperatorToolStripMenuItem1.Size = new System.Drawing.Size(174, 22); + this.insertSeperatorToolStripMenuItem1.Text = "Insert Seperator"; + this.insertSeperatorToolStripMenuItem1.Click += new System.EventHandler(this.insertSeperatorToolStripMenuItem1_Click); + // + // toolStripSeparator4 + // + this.toolStripSeparator4.Name = "toolStripSeparator4"; + this.toolStripSeparator4.Size = new System.Drawing.Size(171, 6); + // + // stopAllScriptsToolStripMenuItem + // + this.stopAllScriptsToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.Stop; + this.stopAllScriptsToolStripMenuItem.Name = "stopAllScriptsToolStripMenuItem"; + this.stopAllScriptsToolStripMenuItem.Size = new System.Drawing.Size(174, 22); + this.stopAllScriptsToolStripMenuItem.Text = "Turn Off All Scripts"; + this.stopAllScriptsToolStripMenuItem.Click += new System.EventHandler(this.stopAllScriptsToolStripMenuItem_Click); + // + // menuStrip1 + // + this.menuStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { this.fileToolStripMenuItem, this.scriptToolStripMenuItem, this.optionsToolStripMenuItem, this.helpToolStripMenuItem}); - this.menuStrip1.Location = new System.Drawing.Point(0, 0); - this.menuStrip1.Name = "menuStrip1"; - this.menuStrip1.Size = new System.Drawing.Size(584, 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(584, 24); + this.menuStrip1.TabIndex = 1; + this.menuStrip1.Text = "menuStrip1"; + // + // fileToolStripMenuItem + // + this.fileToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { this.newToolStripMenuItem, this.openSessionToolStripMenuItem, this.saveToolStripMenuItem, @@ -209,124 +212,124 @@ this.recentToolStripMenuItem, this.toolStripSeparator1, this.exitToolStripMenuItem}); - this.fileToolStripMenuItem.Name = "fileToolStripMenuItem"; - this.fileToolStripMenuItem.Size = new System.Drawing.Size(37, 20); - this.fileToolStripMenuItem.Text = "&File"; - // - // newToolStripMenuItem - // - this.newToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.NewFile; - this.newToolStripMenuItem.Name = "newToolStripMenuItem"; - this.newToolStripMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.N))); - this.newToolStripMenuItem.Size = new System.Drawing.Size(237, 22); - this.newToolStripMenuItem.Text = "&New Session"; - this.newToolStripMenuItem.Click += new System.EventHandler(this.newToolStripMenuItem_Click); - // - // openSessionToolStripMenuItem - // - this.openSessionToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.OpenFile; - this.openSessionToolStripMenuItem.Name = "openSessionToolStripMenuItem"; - this.openSessionToolStripMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)(((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.Shift) - | System.Windows.Forms.Keys.O))); - this.openSessionToolStripMenuItem.Size = new System.Drawing.Size(237, 22); - this.openSessionToolStripMenuItem.Text = "&Open Session..."; - this.openSessionToolStripMenuItem.Click += new System.EventHandler(this.openSessionToolStripMenuItem_Click); - // - // 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(237, 22); - this.saveToolStripMenuItem.Text = "&Save Session"; - 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(237, 22); - this.saveAsToolStripMenuItem.Text = "Save Session &As..."; - this.saveAsToolStripMenuItem.Click += new System.EventHandler(this.saveAsToolStripMenuItem_Click); - // - // toolStripSeparator9 - // - this.toolStripSeparator9.Name = "toolStripSeparator9"; - this.toolStripSeparator9.Size = new System.Drawing.Size(234, 6); - // - // recentSessionsToolStripMenuItem - // - this.recentSessionsToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { + this.fileToolStripMenuItem.Name = "fileToolStripMenuItem"; + this.fileToolStripMenuItem.Size = new System.Drawing.Size(37, 20); + this.fileToolStripMenuItem.Text = "&File"; + // + // newToolStripMenuItem + // + this.newToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.NewFile; + this.newToolStripMenuItem.Name = "newToolStripMenuItem"; + this.newToolStripMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.N))); + this.newToolStripMenuItem.Size = new System.Drawing.Size(237, 22); + this.newToolStripMenuItem.Text = "&New Session"; + this.newToolStripMenuItem.Click += new System.EventHandler(this.newToolStripMenuItem_Click); + // + // openSessionToolStripMenuItem + // + this.openSessionToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.OpenFile; + this.openSessionToolStripMenuItem.Name = "openSessionToolStripMenuItem"; + this.openSessionToolStripMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)(((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.Shift) + | System.Windows.Forms.Keys.O))); + this.openSessionToolStripMenuItem.Size = new System.Drawing.Size(237, 22); + this.openSessionToolStripMenuItem.Text = "&Open Session..."; + this.openSessionToolStripMenuItem.Click += new System.EventHandler(this.openSessionToolStripMenuItem_Click); + // + // 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(237, 22); + this.saveToolStripMenuItem.Text = "&Save Session"; + 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(237, 22); + this.saveAsToolStripMenuItem.Text = "Save Session &As..."; + this.saveAsToolStripMenuItem.Click += new System.EventHandler(this.saveAsToolStripMenuItem_Click); + // + // toolStripSeparator9 + // + this.toolStripSeparator9.Name = "toolStripSeparator9"; + this.toolStripSeparator9.Size = new System.Drawing.Size(234, 6); + // + // recentSessionsToolStripMenuItem + // + this.recentSessionsToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { this.noneToolStripMenuItem1, this.toolStripSeparator8, this.clearToolStripMenuItem1}); - this.recentSessionsToolStripMenuItem.Name = "recentSessionsToolStripMenuItem"; - this.recentSessionsToolStripMenuItem.Size = new System.Drawing.Size(237, 22); - this.recentSessionsToolStripMenuItem.Text = "Recent Sessions"; - // - // noneToolStripMenuItem1 - // - this.noneToolStripMenuItem1.Name = "noneToolStripMenuItem1"; - this.noneToolStripMenuItem1.Size = new System.Drawing.Size(103, 22); - this.noneToolStripMenuItem1.Text = "None"; - // - // toolStripSeparator8 - // - this.toolStripSeparator8.Name = "toolStripSeparator8"; - this.toolStripSeparator8.Size = new System.Drawing.Size(100, 6); - // - // clearToolStripMenuItem1 - // - this.clearToolStripMenuItem1.Name = "clearToolStripMenuItem1"; - this.clearToolStripMenuItem1.Size = new System.Drawing.Size(103, 22); - this.clearToolStripMenuItem1.Text = "Clear"; - // - // recentToolStripMenuItem - // - this.recentToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { + this.recentSessionsToolStripMenuItem.Name = "recentSessionsToolStripMenuItem"; + this.recentSessionsToolStripMenuItem.Size = new System.Drawing.Size(237, 22); + this.recentSessionsToolStripMenuItem.Text = "Recent Sessions"; + // + // noneToolStripMenuItem1 + // + this.noneToolStripMenuItem1.Name = "noneToolStripMenuItem1"; + this.noneToolStripMenuItem1.Size = new System.Drawing.Size(103, 22); + this.noneToolStripMenuItem1.Text = "None"; + // + // toolStripSeparator8 + // + this.toolStripSeparator8.Name = "toolStripSeparator8"; + this.toolStripSeparator8.Size = new System.Drawing.Size(100, 6); + // + // clearToolStripMenuItem1 + // + this.clearToolStripMenuItem1.Name = "clearToolStripMenuItem1"; + this.clearToolStripMenuItem1.Size = new System.Drawing.Size(103, 22); + this.clearToolStripMenuItem1.Text = "Clear"; + // + // recentToolStripMenuItem + // + this.recentToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { this.noneToolStripMenuItem, this.toolStripSeparator3, this.clearToolStripMenuItem}); - this.recentToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.Recent; - this.recentToolStripMenuItem.Name = "recentToolStripMenuItem"; - this.recentToolStripMenuItem.Size = new System.Drawing.Size(237, 22); - this.recentToolStripMenuItem.Text = "Recent Scripts"; - this.recentToolStripMenuItem.DropDownOpened += new System.EventHandler(this.recentToolStripMenuItem_DropDownOpened); - // - // noneToolStripMenuItem - // - this.noneToolStripMenuItem.Name = "noneToolStripMenuItem"; - this.noneToolStripMenuItem.Size = new System.Drawing.Size(152, 22); - this.noneToolStripMenuItem.Text = "None"; - // - // toolStripSeparator3 - // - this.toolStripSeparator3.Name = "toolStripSeparator3"; - this.toolStripSeparator3.Size = new System.Drawing.Size(149, 6); - // - // clearToolStripMenuItem - // - this.clearToolStripMenuItem.Name = "clearToolStripMenuItem"; - this.clearToolStripMenuItem.Size = new System.Drawing.Size(152, 22); - this.clearToolStripMenuItem.Text = "Clear"; - // - // toolStripSeparator1 - // - this.toolStripSeparator1.Name = "toolStripSeparator1"; - this.toolStripSeparator1.Size = new System.Drawing.Size(234, 6); - // - // exitToolStripMenuItem - // - this.exitToolStripMenuItem.Name = "exitToolStripMenuItem"; - this.exitToolStripMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Alt | System.Windows.Forms.Keys.F4))); - this.exitToolStripMenuItem.Size = new System.Drawing.Size(237, 22); - this.exitToolStripMenuItem.Text = "E&xit"; - this.exitToolStripMenuItem.Click += new System.EventHandler(this.exitToolStripMenuItem_Click); - // - // scriptToolStripMenuItem - // - this.scriptToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { + this.recentToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.Recent; + this.recentToolStripMenuItem.Name = "recentToolStripMenuItem"; + this.recentToolStripMenuItem.Size = new System.Drawing.Size(237, 22); + this.recentToolStripMenuItem.Text = "Recent Scripts"; + this.recentToolStripMenuItem.DropDownOpened += new System.EventHandler(this.recentToolStripMenuItem_DropDownOpened); + // + // noneToolStripMenuItem + // + this.noneToolStripMenuItem.Name = "noneToolStripMenuItem"; + this.noneToolStripMenuItem.Size = new System.Drawing.Size(103, 22); + this.noneToolStripMenuItem.Text = "None"; + // + // toolStripSeparator3 + // + this.toolStripSeparator3.Name = "toolStripSeparator3"; + this.toolStripSeparator3.Size = new System.Drawing.Size(100, 6); + // + // clearToolStripMenuItem + // + this.clearToolStripMenuItem.Name = "clearToolStripMenuItem"; + this.clearToolStripMenuItem.Size = new System.Drawing.Size(103, 22); + this.clearToolStripMenuItem.Text = "Clear"; + // + // toolStripSeparator1 + // + this.toolStripSeparator1.Name = "toolStripSeparator1"; + this.toolStripSeparator1.Size = new System.Drawing.Size(234, 6); + // + // exitToolStripMenuItem + // + this.exitToolStripMenuItem.Name = "exitToolStripMenuItem"; + this.exitToolStripMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Alt | System.Windows.Forms.Keys.F4))); + this.exitToolStripMenuItem.Size = new System.Drawing.Size(237, 22); + this.exitToolStripMenuItem.Text = "E&xit"; + this.exitToolStripMenuItem.Click += new System.EventHandler(this.exitToolStripMenuItem_Click); + // + // scriptToolStripMenuItem + // + this.scriptToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { this.openToolStripMenuItem, this.toggleToolStripMenuItem, this.editToolStripMenuItem, @@ -338,183 +341,184 @@ this.selectAllToolStripMenuItem, this.toolStripSeparator6, this.turnOffAllScriptsToolStripMenuItem}); - this.scriptToolStripMenuItem.Name = "scriptToolStripMenuItem"; - this.scriptToolStripMenuItem.Size = new System.Drawing.Size(49, 20); - this.scriptToolStripMenuItem.Text = "&Script"; - // - // openToolStripMenuItem - // - this.openToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.OpenFile; - this.openToolStripMenuItem.Name = "openToolStripMenuItem"; - this.openToolStripMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.O))); - this.openToolStripMenuItem.Size = new System.Drawing.Size(195, 22); - this.openToolStripMenuItem.Text = "&Open Script..."; - this.openToolStripMenuItem.Click += new System.EventHandler(this.openToolStripMenuItem_Click_1); - // - // toggleToolStripMenuItem - // - this.toggleToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.Refresh1; - this.toggleToolStripMenuItem.Name = "toggleToolStripMenuItem"; - this.toggleToolStripMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.T))); - this.toggleToolStripMenuItem.Size = new System.Drawing.Size(195, 22); - this.toggleToolStripMenuItem.Text = "&Toggle"; - this.toggleToolStripMenuItem.Click += new System.EventHandler(this.toggleToolStripMenuItem_Click); - // - // editToolStripMenuItem - // - this.editToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.CutHS; - this.editToolStripMenuItem.Name = "editToolStripMenuItem"; - this.editToolStripMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.E))); - this.editToolStripMenuItem.Size = new System.Drawing.Size(195, 22); - this.editToolStripMenuItem.Text = "&Edit Script"; - this.editToolStripMenuItem.Click += new System.EventHandler(this.editToolStripMenuItem_Click); - // - // removeScriptToolStripMenuItem1 - // - this.removeScriptToolStripMenuItem1.Image = global::BizHawk.MultiClient.Properties.Resources.Delete; - this.removeScriptToolStripMenuItem1.Name = "removeScriptToolStripMenuItem1"; - this.removeScriptToolStripMenuItem1.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.R))); - this.removeScriptToolStripMenuItem1.Size = new System.Drawing.Size(195, 22); - this.removeScriptToolStripMenuItem1.Text = "&Remove Watch"; - this.removeScriptToolStripMenuItem1.Click += new System.EventHandler(this.removeScriptToolStripMenuItem_Click); - // - // insertSeparatorToolStripMenuItem - // - this.insertSeparatorToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.InsertSeparator; - this.insertSeparatorToolStripMenuItem.Name = "insertSeparatorToolStripMenuItem"; - this.insertSeparatorToolStripMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.I))); - this.insertSeparatorToolStripMenuItem.Size = new System.Drawing.Size(195, 22); - this.insertSeparatorToolStripMenuItem.Text = "Insert Separator"; - this.insertSeparatorToolStripMenuItem.Click += new System.EventHandler(this.insertSeperatorToolStripMenuItem_Click); - // - // toolStripSeparator7 - // - this.toolStripSeparator7.Name = "toolStripSeparator7"; - this.toolStripSeparator7.Size = new System.Drawing.Size(192, 6); - // - // moveUpToolStripMenuItem - // - this.moveUpToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.MoveUp; - this.moveUpToolStripMenuItem.Name = "moveUpToolStripMenuItem"; - this.moveUpToolStripMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.U))); - this.moveUpToolStripMenuItem.Size = new System.Drawing.Size(195, 22); - this.moveUpToolStripMenuItem.Text = "Move &Up"; - // - // moveDownToolStripMenuItem - // - this.moveDownToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.MoveDown; - this.moveDownToolStripMenuItem.Name = "moveDownToolStripMenuItem"; - this.moveDownToolStripMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.D))); - this.moveDownToolStripMenuItem.Size = new System.Drawing.Size(195, 22); - this.moveDownToolStripMenuItem.Text = "Move &Down"; - // - // 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(195, 22); - this.selectAllToolStripMenuItem.Text = "Select &All"; - this.selectAllToolStripMenuItem.Click += new System.EventHandler(this.selectAllToolStripMenuItem_Click); - // - // toolStripSeparator6 - // - this.toolStripSeparator6.Name = "toolStripSeparator6"; - this.toolStripSeparator6.Size = new System.Drawing.Size(192, 6); - // - // turnOffAllScriptsToolStripMenuItem - // - this.turnOffAllScriptsToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.Stop; - this.turnOffAllScriptsToolStripMenuItem.Name = "turnOffAllScriptsToolStripMenuItem"; - this.turnOffAllScriptsToolStripMenuItem.Size = new System.Drawing.Size(195, 22); - this.turnOffAllScriptsToolStripMenuItem.Text = "Turn Off All Scripts"; - this.turnOffAllScriptsToolStripMenuItem.Click += new System.EventHandler(this.turnOffAllScriptsToolStripMenuItem_Click); - // - // optionsToolStripMenuItem - // - this.optionsToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { + this.scriptToolStripMenuItem.Name = "scriptToolStripMenuItem"; + this.scriptToolStripMenuItem.Size = new System.Drawing.Size(49, 20); + this.scriptToolStripMenuItem.Text = "&Script"; + // + // openToolStripMenuItem + // + this.openToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.OpenFile; + this.openToolStripMenuItem.Name = "openToolStripMenuItem"; + this.openToolStripMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.O))); + this.openToolStripMenuItem.Size = new System.Drawing.Size(195, 22); + this.openToolStripMenuItem.Text = "&Open Script..."; + this.openToolStripMenuItem.Click += new System.EventHandler(this.openToolStripMenuItem_Click_1); + // + // toggleToolStripMenuItem + // + this.toggleToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.Refresh1; + this.toggleToolStripMenuItem.Name = "toggleToolStripMenuItem"; + this.toggleToolStripMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.T))); + this.toggleToolStripMenuItem.Size = new System.Drawing.Size(195, 22); + this.toggleToolStripMenuItem.Text = "&Toggle"; + this.toggleToolStripMenuItem.Click += new System.EventHandler(this.toggleToolStripMenuItem_Click); + // + // editToolStripMenuItem + // + this.editToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.CutHS; + this.editToolStripMenuItem.Name = "editToolStripMenuItem"; + this.editToolStripMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.E))); + this.editToolStripMenuItem.Size = new System.Drawing.Size(195, 22); + this.editToolStripMenuItem.Text = "&Edit Script"; + this.editToolStripMenuItem.Click += new System.EventHandler(this.editToolStripMenuItem_Click); + // + // removeScriptToolStripMenuItem1 + // + this.removeScriptToolStripMenuItem1.Image = global::BizHawk.MultiClient.Properties.Resources.Delete; + this.removeScriptToolStripMenuItem1.Name = "removeScriptToolStripMenuItem1"; + this.removeScriptToolStripMenuItem1.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.R))); + this.removeScriptToolStripMenuItem1.Size = new System.Drawing.Size(195, 22); + this.removeScriptToolStripMenuItem1.Text = "&Remove Watch"; + this.removeScriptToolStripMenuItem1.Click += new System.EventHandler(this.removeScriptToolStripMenuItem_Click); + // + // insertSeparatorToolStripMenuItem + // + this.insertSeparatorToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.InsertSeparator; + this.insertSeparatorToolStripMenuItem.Name = "insertSeparatorToolStripMenuItem"; + this.insertSeparatorToolStripMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.I))); + this.insertSeparatorToolStripMenuItem.Size = new System.Drawing.Size(195, 22); + this.insertSeparatorToolStripMenuItem.Text = "Insert Separator"; + this.insertSeparatorToolStripMenuItem.Click += new System.EventHandler(this.insertSeperatorToolStripMenuItem_Click); + // + // toolStripSeparator7 + // + this.toolStripSeparator7.Name = "toolStripSeparator7"; + this.toolStripSeparator7.Size = new System.Drawing.Size(192, 6); + // + // moveUpToolStripMenuItem + // + this.moveUpToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.MoveUp; + this.moveUpToolStripMenuItem.Name = "moveUpToolStripMenuItem"; + this.moveUpToolStripMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.U))); + this.moveUpToolStripMenuItem.Size = new System.Drawing.Size(195, 22); + this.moveUpToolStripMenuItem.Text = "Move &Up"; + // + // moveDownToolStripMenuItem + // + this.moveDownToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.MoveDown; + this.moveDownToolStripMenuItem.Name = "moveDownToolStripMenuItem"; + this.moveDownToolStripMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.D))); + this.moveDownToolStripMenuItem.Size = new System.Drawing.Size(195, 22); + this.moveDownToolStripMenuItem.Text = "Move &Down"; + // + // 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(195, 22); + this.selectAllToolStripMenuItem.Text = "Select &All"; + this.selectAllToolStripMenuItem.Click += new System.EventHandler(this.selectAllToolStripMenuItem_Click); + // + // toolStripSeparator6 + // + this.toolStripSeparator6.Name = "toolStripSeparator6"; + this.toolStripSeparator6.Size = new System.Drawing.Size(192, 6); + // + // turnOffAllScriptsToolStripMenuItem + // + this.turnOffAllScriptsToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.Stop; + this.turnOffAllScriptsToolStripMenuItem.Name = "turnOffAllScriptsToolStripMenuItem"; + this.turnOffAllScriptsToolStripMenuItem.Size = new System.Drawing.Size(195, 22); + this.turnOffAllScriptsToolStripMenuItem.Text = "Turn Off All Scripts"; + this.turnOffAllScriptsToolStripMenuItem.Click += new System.EventHandler(this.turnOffAllScriptsToolStripMenuItem_Click); + // + // optionsToolStripMenuItem + // + this.optionsToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { this.saveWindowPositionToolStripMenuItem, this.autoloadConsoleToolStripMenuItem, this.toolStripSeparator5, this.restoreWindowSizeToolStripMenuItem}); - this.optionsToolStripMenuItem.Name = "optionsToolStripMenuItem"; - this.optionsToolStripMenuItem.Size = new System.Drawing.Size(61, 20); - this.optionsToolStripMenuItem.Text = "&Options"; - this.optionsToolStripMenuItem.DropDownOpened += new System.EventHandler(this.optionsToolStripMenuItem_DropDownOpened); - // - // saveWindowPositionToolStripMenuItem - // - this.saveWindowPositionToolStripMenuItem.Name = "saveWindowPositionToolStripMenuItem"; - this.saveWindowPositionToolStripMenuItem.Size = new System.Drawing.Size(199, 22); - this.saveWindowPositionToolStripMenuItem.Text = "Save Window Position"; - this.saveWindowPositionToolStripMenuItem.Click += new System.EventHandler(this.saveWindowPositionToolStripMenuItem_Click); - // - // autoloadConsoleToolStripMenuItem - // - this.autoloadConsoleToolStripMenuItem.Name = "autoloadConsoleToolStripMenuItem"; - this.autoloadConsoleToolStripMenuItem.Size = new System.Drawing.Size(199, 22); - this.autoloadConsoleToolStripMenuItem.Text = "Autoload Console"; - this.autoloadConsoleToolStripMenuItem.Click += new System.EventHandler(this.autoloadConsoleToolStripMenuItem_Click); - // - // toolStripSeparator5 - // - this.toolStripSeparator5.Name = "toolStripSeparator5"; - this.toolStripSeparator5.Size = new System.Drawing.Size(196, 6); - // - // restoreWindowSizeToolStripMenuItem - // - this.restoreWindowSizeToolStripMenuItem.Name = "restoreWindowSizeToolStripMenuItem"; - this.restoreWindowSizeToolStripMenuItem.Size = new System.Drawing.Size(199, 22); - this.restoreWindowSizeToolStripMenuItem.Text = "Restore Default Settings"; - this.restoreWindowSizeToolStripMenuItem.Click += new System.EventHandler(this.restoreWindowSizeToolStripMenuItem_Click); - // - // helpToolStripMenuItem - // - this.helpToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { + this.optionsToolStripMenuItem.Name = "optionsToolStripMenuItem"; + this.optionsToolStripMenuItem.Size = new System.Drawing.Size(61, 20); + this.optionsToolStripMenuItem.Text = "&Options"; + this.optionsToolStripMenuItem.DropDownOpened += new System.EventHandler(this.optionsToolStripMenuItem_DropDownOpened); + // + // saveWindowPositionToolStripMenuItem + // + this.saveWindowPositionToolStripMenuItem.Name = "saveWindowPositionToolStripMenuItem"; + this.saveWindowPositionToolStripMenuItem.Size = new System.Drawing.Size(199, 22); + this.saveWindowPositionToolStripMenuItem.Text = "Save Window Position"; + this.saveWindowPositionToolStripMenuItem.Click += new System.EventHandler(this.saveWindowPositionToolStripMenuItem_Click); + // + // autoloadConsoleToolStripMenuItem + // + this.autoloadConsoleToolStripMenuItem.Name = "autoloadConsoleToolStripMenuItem"; + this.autoloadConsoleToolStripMenuItem.Size = new System.Drawing.Size(199, 22); + this.autoloadConsoleToolStripMenuItem.Text = "Autoload Console"; + this.autoloadConsoleToolStripMenuItem.Click += new System.EventHandler(this.autoloadConsoleToolStripMenuItem_Click); + // + // toolStripSeparator5 + // + this.toolStripSeparator5.Name = "toolStripSeparator5"; + this.toolStripSeparator5.Size = new System.Drawing.Size(196, 6); + // + // restoreWindowSizeToolStripMenuItem + // + this.restoreWindowSizeToolStripMenuItem.Name = "restoreWindowSizeToolStripMenuItem"; + this.restoreWindowSizeToolStripMenuItem.Size = new System.Drawing.Size(199, 22); + this.restoreWindowSizeToolStripMenuItem.Text = "Restore Default Settings"; + this.restoreWindowSizeToolStripMenuItem.Click += new System.EventHandler(this.restoreWindowSizeToolStripMenuItem_Click); + // + // helpToolStripMenuItem + // + this.helpToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { this.luaFunctionsListToolStripMenuItem}); - this.helpToolStripMenuItem.Name = "helpToolStripMenuItem"; - this.helpToolStripMenuItem.Size = new System.Drawing.Size(44, 20); - this.helpToolStripMenuItem.Text = "&Help"; - // - // luaFunctionsListToolStripMenuItem - // - this.luaFunctionsListToolStripMenuItem.Name = "luaFunctionsListToolStripMenuItem"; - this.luaFunctionsListToolStripMenuItem.Size = new System.Drawing.Size(169, 22); - this.luaFunctionsListToolStripMenuItem.Text = "&Lua Functions List"; - this.luaFunctionsListToolStripMenuItem.Click += new System.EventHandler(this.luaFunctionsListToolStripMenuItem_Click); - // - // OutputBox - // - this.OutputBox.Location = new System.Drawing.Point(6, 17); - this.OutputBox.Name = "OutputBox"; - this.OutputBox.ReadOnly = true; - this.OutputBox.Size = new System.Drawing.Size(246, 259); - this.OutputBox.TabIndex = 2; - this.OutputBox.Text = ""; - // - // groupBox1 - // - this.groupBox1.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); - this.groupBox1.Controls.Add(this.OutputBox); - this.groupBox1.Location = new System.Drawing.Point(310, 71); - this.groupBox1.Name = "groupBox1"; - this.groupBox1.Size = new System.Drawing.Size(258, 280); - this.groupBox1.TabIndex = 3; - this.groupBox1.TabStop = false; - this.groupBox1.Text = "Output"; - // - // NumberOfScripts - // - this.NumberOfScripts.AutoSize = true; - this.NumberOfScripts.Location = new System.Drawing.Point(10, 53); - this.NumberOfScripts.Name = "NumberOfScripts"; - this.NumberOfScripts.Size = new System.Drawing.Size(66, 13); - this.NumberOfScripts.TabIndex = 4; - this.NumberOfScripts.Text = " 0 Scripts "; - // - // toolStrip1 - // - this.toolStrip1.ClickThrough = true; - this.toolStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { + this.helpToolStripMenuItem.Name = "helpToolStripMenuItem"; + this.helpToolStripMenuItem.Size = new System.Drawing.Size(44, 20); + this.helpToolStripMenuItem.Text = "&Help"; + // + // luaFunctionsListToolStripMenuItem + // + this.luaFunctionsListToolStripMenuItem.Name = "luaFunctionsListToolStripMenuItem"; + this.luaFunctionsListToolStripMenuItem.Size = new System.Drawing.Size(169, 22); + this.luaFunctionsListToolStripMenuItem.Text = "&Lua Functions List"; + this.luaFunctionsListToolStripMenuItem.Click += new System.EventHandler(this.luaFunctionsListToolStripMenuItem_Click); + // + // OutputBox + // + this.OutputBox.ContextMenuStrip = this.contextMenuStrip2; + this.OutputBox.Location = new System.Drawing.Point(6, 17); + this.OutputBox.Name = "OutputBox"; + this.OutputBox.ReadOnly = true; + this.OutputBox.Size = new System.Drawing.Size(246, 259); + this.OutputBox.TabIndex = 2; + this.OutputBox.Text = ""; + // + // groupBox1 + // + this.groupBox1.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); + this.groupBox1.Controls.Add(this.OutputBox); + this.groupBox1.Location = new System.Drawing.Point(310, 71); + this.groupBox1.Name = "groupBox1"; + this.groupBox1.Size = new System.Drawing.Size(258, 280); + this.groupBox1.TabIndex = 3; + this.groupBox1.TabStop = false; + this.groupBox1.Text = "Output"; + // + // NumberOfScripts + // + this.NumberOfScripts.AutoSize = true; + this.NumberOfScripts.Location = new System.Drawing.Point(10, 53); + this.NumberOfScripts.Name = "NumberOfScripts"; + this.NumberOfScripts.Size = new System.Drawing.Size(66, 13); + this.NumberOfScripts.TabIndex = 4; + this.NumberOfScripts.Text = " 0 Scripts "; + // + // toolStrip1 + // + this.toolStrip1.ClickThrough = true; + this.toolStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { this.openToolStripButton, this.copyToolStripButton, this.EditToolstripButton, @@ -523,114 +527,129 @@ this.toolStripSeparator2, this.toolStripButtonMoveUp, this.toolStripButtonMoveDown}); - this.toolStrip1.Location = new System.Drawing.Point(0, 24); - this.toolStrip1.Name = "toolStrip1"; - this.toolStrip1.Size = new System.Drawing.Size(584, 25); - this.toolStrip1.TabIndex = 5; - this.toolStrip1.Text = "toolStrip1"; - // - // openToolStripButton - // - this.openToolStripButton.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; - this.openToolStripButton.Image = ((System.Drawing.Image)(resources.GetObject("openToolStripButton.Image"))); - this.openToolStripButton.ImageTransparentColor = System.Drawing.Color.Magenta; - this.openToolStripButton.Name = "openToolStripButton"; - this.openToolStripButton.Size = new System.Drawing.Size(23, 22); - this.openToolStripButton.Text = "Open Script"; - this.openToolStripButton.Click += new System.EventHandler(this.openToolStripButton_Click); - // - // copyToolStripButton - // - this.copyToolStripButton.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; - this.copyToolStripButton.Image = global::BizHawk.MultiClient.Properties.Resources.Refresh1; - this.copyToolStripButton.ImageTransparentColor = System.Drawing.Color.Magenta; - this.copyToolStripButton.Name = "copyToolStripButton"; - this.copyToolStripButton.Size = new System.Drawing.Size(23, 22); - this.copyToolStripButton.Text = "Toggle Script"; - this.copyToolStripButton.Click += new System.EventHandler(this.copyToolStripButton_Click); - // - // EditToolstripButton - // - this.EditToolstripButton.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; - this.EditToolstripButton.Image = global::BizHawk.MultiClient.Properties.Resources.CutHS; - this.EditToolstripButton.ImageTransparentColor = System.Drawing.Color.Magenta; - this.EditToolstripButton.Name = "EditToolstripButton"; - this.EditToolstripButton.Size = new System.Drawing.Size(23, 22); - this.EditToolstripButton.Text = "Edit Script"; - this.EditToolstripButton.Click += new System.EventHandler(this.EditToolstripButton_Click); - // - // cutToolStripButton - // - this.cutToolStripButton.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; - this.cutToolStripButton.Image = global::BizHawk.MultiClient.Properties.Resources.Delete; - this.cutToolStripButton.ImageTransparentColor = System.Drawing.Color.Magenta; - this.cutToolStripButton.Name = "cutToolStripButton"; - this.cutToolStripButton.Size = new System.Drawing.Size(23, 22); - this.cutToolStripButton.Text = "Remove Script"; - this.cutToolStripButton.Click += new System.EventHandler(this.cutToolStripButton_Click); - // - // toolStripButtonSeparator - // - this.toolStripButtonSeparator.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; - this.toolStripButtonSeparator.Image = global::BizHawk.MultiClient.Properties.Resources.InsertSeparator; - this.toolStripButtonSeparator.ImageTransparentColor = System.Drawing.Color.Magenta; - this.toolStripButtonSeparator.Name = "toolStripButtonSeparator"; - this.toolStripButtonSeparator.Size = new System.Drawing.Size(23, 22); - this.toolStripButtonSeparator.Text = "Insert Separator"; - this.toolStripButtonSeparator.Click += new System.EventHandler(this.toolStripButtonSeparator_Click); - // - // toolStripSeparator2 - // - this.toolStripSeparator2.Name = "toolStripSeparator2"; - this.toolStripSeparator2.Size = new System.Drawing.Size(6, 25); - // - // toolStripButtonMoveUp - // - this.toolStripButtonMoveUp.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; - this.toolStripButtonMoveUp.Image = global::BizHawk.MultiClient.Properties.Resources.MoveUp; - this.toolStripButtonMoveUp.ImageTransparentColor = System.Drawing.Color.Magenta; - this.toolStripButtonMoveUp.Name = "toolStripButtonMoveUp"; - this.toolStripButtonMoveUp.Size = new System.Drawing.Size(23, 22); - this.toolStripButtonMoveUp.Text = "Move Up"; - this.toolStripButtonMoveUp.Click += new System.EventHandler(this.toolStripButtonMoveUp_Click); - // - // toolStripButtonMoveDown - // - this.toolStripButtonMoveDown.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; - this.toolStripButtonMoveDown.Image = global::BizHawk.MultiClient.Properties.Resources.MoveDown; - this.toolStripButtonMoveDown.ImageTransparentColor = System.Drawing.Color.Magenta; - this.toolStripButtonMoveDown.Name = "toolStripButtonMoveDown"; - this.toolStripButtonMoveDown.Size = new System.Drawing.Size(23, 22); - this.toolStripButtonMoveDown.Text = "Move Down"; - this.toolStripButtonMoveDown.Click += new System.EventHandler(this.toolStripButtonMoveDown_Click); - // - // LuaConsole - // - this.AllowDrop = true; - this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); - this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(584, 366); - this.Controls.Add(this.toolStrip1); - this.Controls.Add(this.groupBox1); - this.Controls.Add(this.NumberOfScripts); - this.Controls.Add(this.menuStrip1); - this.Controls.Add(this.LuaListView); - this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon"))); - this.MainMenuStrip = this.menuStrip1; - this.MinimumSize = new System.Drawing.Size(356, 132); - this.Name = "LuaConsole"; - this.Text = "Lua Console"; - this.Load += new System.EventHandler(this.LuaConsole_Load); - this.DragDrop += new System.Windows.Forms.DragEventHandler(this.LuaConsole_DragDrop); - this.DragEnter += new System.Windows.Forms.DragEventHandler(this.LuaConsole_DragEnter); - this.contextMenuStrip1.ResumeLayout(false); - this.menuStrip1.ResumeLayout(false); - this.menuStrip1.PerformLayout(); - this.groupBox1.ResumeLayout(false); - this.toolStrip1.ResumeLayout(false); - this.toolStrip1.PerformLayout(); - this.ResumeLayout(false); - this.PerformLayout(); + this.toolStrip1.Location = new System.Drawing.Point(0, 24); + this.toolStrip1.Name = "toolStrip1"; + this.toolStrip1.Size = new System.Drawing.Size(584, 25); + this.toolStrip1.TabIndex = 5; + this.toolStrip1.Text = "toolStrip1"; + // + // openToolStripButton + // + this.openToolStripButton.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; + this.openToolStripButton.Image = ((System.Drawing.Image)(resources.GetObject("openToolStripButton.Image"))); + this.openToolStripButton.ImageTransparentColor = System.Drawing.Color.Magenta; + this.openToolStripButton.Name = "openToolStripButton"; + this.openToolStripButton.Size = new System.Drawing.Size(23, 22); + this.openToolStripButton.Text = "Open Script"; + this.openToolStripButton.Click += new System.EventHandler(this.openToolStripButton_Click); + // + // copyToolStripButton + // + this.copyToolStripButton.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; + this.copyToolStripButton.Image = global::BizHawk.MultiClient.Properties.Resources.Refresh1; + this.copyToolStripButton.ImageTransparentColor = System.Drawing.Color.Magenta; + this.copyToolStripButton.Name = "copyToolStripButton"; + this.copyToolStripButton.Size = new System.Drawing.Size(23, 22); + this.copyToolStripButton.Text = "Toggle Script"; + this.copyToolStripButton.Click += new System.EventHandler(this.copyToolStripButton_Click); + // + // EditToolstripButton + // + this.EditToolstripButton.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; + this.EditToolstripButton.Image = global::BizHawk.MultiClient.Properties.Resources.CutHS; + this.EditToolstripButton.ImageTransparentColor = System.Drawing.Color.Magenta; + this.EditToolstripButton.Name = "EditToolstripButton"; + this.EditToolstripButton.Size = new System.Drawing.Size(23, 22); + this.EditToolstripButton.Text = "Edit Script"; + this.EditToolstripButton.Click += new System.EventHandler(this.EditToolstripButton_Click); + // + // cutToolStripButton + // + this.cutToolStripButton.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; + this.cutToolStripButton.Image = global::BizHawk.MultiClient.Properties.Resources.Delete; + this.cutToolStripButton.ImageTransparentColor = System.Drawing.Color.Magenta; + this.cutToolStripButton.Name = "cutToolStripButton"; + this.cutToolStripButton.Size = new System.Drawing.Size(23, 22); + this.cutToolStripButton.Text = "Remove Script"; + this.cutToolStripButton.Click += new System.EventHandler(this.cutToolStripButton_Click); + // + // toolStripButtonSeparator + // + this.toolStripButtonSeparator.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; + this.toolStripButtonSeparator.Image = global::BizHawk.MultiClient.Properties.Resources.InsertSeparator; + this.toolStripButtonSeparator.ImageTransparentColor = System.Drawing.Color.Magenta; + this.toolStripButtonSeparator.Name = "toolStripButtonSeparator"; + this.toolStripButtonSeparator.Size = new System.Drawing.Size(23, 22); + this.toolStripButtonSeparator.Text = "Insert Separator"; + this.toolStripButtonSeparator.Click += new System.EventHandler(this.toolStripButtonSeparator_Click); + // + // toolStripSeparator2 + // + this.toolStripSeparator2.Name = "toolStripSeparator2"; + this.toolStripSeparator2.Size = new System.Drawing.Size(6, 25); + // + // toolStripButtonMoveUp + // + this.toolStripButtonMoveUp.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; + this.toolStripButtonMoveUp.Image = global::BizHawk.MultiClient.Properties.Resources.MoveUp; + this.toolStripButtonMoveUp.ImageTransparentColor = System.Drawing.Color.Magenta; + this.toolStripButtonMoveUp.Name = "toolStripButtonMoveUp"; + this.toolStripButtonMoveUp.Size = new System.Drawing.Size(23, 22); + this.toolStripButtonMoveUp.Text = "Move Up"; + this.toolStripButtonMoveUp.Click += new System.EventHandler(this.toolStripButtonMoveUp_Click); + // + // toolStripButtonMoveDown + // + this.toolStripButtonMoveDown.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; + this.toolStripButtonMoveDown.Image = global::BizHawk.MultiClient.Properties.Resources.MoveDown; + this.toolStripButtonMoveDown.ImageTransparentColor = System.Drawing.Color.Magenta; + this.toolStripButtonMoveDown.Name = "toolStripButtonMoveDown"; + this.toolStripButtonMoveDown.Size = new System.Drawing.Size(23, 22); + this.toolStripButtonMoveDown.Text = "Move Down"; + this.toolStripButtonMoveDown.Click += new System.EventHandler(this.toolStripButtonMoveDown_Click); + // + // contextMenuStrip2 + // + this.contextMenuStrip2.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { + this.clearToolStripMenuItem2}); + this.contextMenuStrip2.Name = "contextMenuStrip2"; + this.contextMenuStrip2.Size = new System.Drawing.Size(102, 26); + // + // clearToolStripMenuItem2 + // + this.clearToolStripMenuItem2.Name = "clearToolStripMenuItem2"; + this.clearToolStripMenuItem2.Size = new System.Drawing.Size(152, 22); + this.clearToolStripMenuItem2.Text = "&Clear"; + this.clearToolStripMenuItem2.Click += new System.EventHandler(this.clearToolStripMenuItem2_Click); + // + // LuaConsole + // + this.AllowDrop = true; + this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); + this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; + this.ClientSize = new System.Drawing.Size(584, 366); + this.Controls.Add(this.toolStrip1); + this.Controls.Add(this.groupBox1); + this.Controls.Add(this.NumberOfScripts); + this.Controls.Add(this.menuStrip1); + this.Controls.Add(this.LuaListView); + this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon"))); + this.MainMenuStrip = this.menuStrip1; + this.MinimumSize = new System.Drawing.Size(356, 132); + this.Name = "LuaConsole"; + this.Text = "Lua Console"; + this.Load += new System.EventHandler(this.LuaConsole_Load); + this.DragDrop += new System.Windows.Forms.DragEventHandler(this.LuaConsole_DragDrop); + this.DragEnter += new System.Windows.Forms.DragEventHandler(this.LuaConsole_DragEnter); + this.contextMenuStrip1.ResumeLayout(false); + this.menuStrip1.ResumeLayout(false); + this.menuStrip1.PerformLayout(); + this.groupBox1.ResumeLayout(false); + this.toolStrip1.ResumeLayout(false); + this.toolStrip1.PerformLayout(); + this.contextMenuStrip2.ResumeLayout(false); + this.ResumeLayout(false); + this.PerformLayout(); } @@ -694,5 +713,7 @@ private System.Windows.Forms.ToolStripMenuItem clearToolStripMenuItem1; private System.Windows.Forms.ToolStripMenuItem helpToolStripMenuItem; private System.Windows.Forms.ToolStripMenuItem luaFunctionsListToolStripMenuItem; + private System.Windows.Forms.ContextMenuStrip contextMenuStrip2; + private System.Windows.Forms.ToolStripMenuItem clearToolStripMenuItem2; } } \ No newline at end of file diff --git a/BizHawk.MultiClient/tools/LuaConsole.cs b/BizHawk.MultiClient/tools/LuaConsole.cs index 1ad10397af..e9a3a69936 100644 --- a/BizHawk.MultiClient/tools/LuaConsole.cs +++ b/BizHawk.MultiClient/tools/LuaConsole.cs @@ -90,12 +90,12 @@ namespace BizHawk.MultiClient LoadConfigSettings(); } - private void StopScript(int x) - { - luaList[x].Enabled = false; - LuaImp.Close(); - LuaImp = new LuaImplementation(this); - } + private void StopScript(int x) + { + luaList[x].Enabled = false; + LuaImp.Close(); + LuaImp = new LuaImplementation(this); + } private void StopAllScripts() { @@ -152,8 +152,8 @@ namespace BizHawk.MultiClient ofd.InitialDirectory = PathManager.MakeAbsolutePath(Global.Config.LuaPath, ""); ofd.Filter = filter; ofd.RestoreDirectory = true; - - + + if (!Directory.Exists(ofd.InitialDirectory)) Directory.CreateDirectory(ofd.InitialDirectory); @@ -172,7 +172,7 @@ namespace BizHawk.MultiClient luaList.Add(l); LuaListView.ItemCount = luaList.Count; LuaListView.Refresh(); - Global.Config.RecentLua.Add(path); + Global.Config.RecentLua.Add(path); LuaImp.DoLuaFile(path); } @@ -227,14 +227,14 @@ namespace BizHawk.MultiClient { for (int x = 0; x < luaList.Count; x++) { - if (luaList[x].Enabled) - { - LuaImp.DoLuaFile(luaList[x].Path); - } - else - { - StopScript(x); - } + if (luaList[x].Enabled) + { + LuaImp.DoLuaFile(luaList[x].Path); + } + else + { + StopScript(x); + } } } @@ -261,7 +261,7 @@ namespace BizHawk.MultiClient private void LuaListView_DoubleClick(object sender, EventArgs e) { - MessageBox.Show(""); + MessageBox.Show(""); //Toggle(); } @@ -519,7 +519,7 @@ namespace BizHawk.MultiClient private void EditScript() { ListView.SelectedIndexCollection indexes = LuaListView.SelectedIndices; - if (indexes.Count == 0) + if (indexes.Count == 0) return; System.Diagnostics.Process.Start(luaList[indexes[0]].Path); } @@ -585,7 +585,7 @@ namespace BizHawk.MultiClient { if (!OutputBox.IsHandleCreated || OutputBox.IsDisposed) return; - + OutputBox.Text = ""; OutputBox.Refresh(); } @@ -690,9 +690,14 @@ namespace BizHawk.MultiClient OpenLuaFile(); } - private void LuaListView_ItemActivate(object sender, EventArgs e) - { - Toggle(); - } + private void LuaListView_ItemActivate(object sender, EventArgs e) + { + Toggle(); + } + + private void clearToolStripMenuItem2_Click(object sender, EventArgs e) + { + OutputBox.Text = ""; + } } } diff --git a/BizHawk.MultiClient/tools/LuaConsole.resx b/BizHawk.MultiClient/tools/LuaConsole.resx index 4b4b5fb1a1..501625a321 100644 --- a/BizHawk.MultiClient/tools/LuaConsole.resx +++ b/BizHawk.MultiClient/tools/LuaConsole.resx @@ -123,6 +123,9 @@ 17, 17 + + 333, 17 + 228, 17