diff --git a/BizHawk.Client.Common/config/Config.cs b/BizHawk.Client.Common/config/Config.cs index 0c9510cb61..1164a31b90 100644 --- a/BizHawk.Client.Common/config/Config.cs +++ b/BizHawk.Client.Common/config/Config.cs @@ -586,6 +586,7 @@ namespace BizHawk.Client.Common public string LuaWriterFont = "Courier New"; public float LuaWriterZoom = 1; public bool LuaWriterStartEmpty = false; + public bool LuaShowLineNumbers = false; } // these are used in the defctrl.json or wherever diff --git a/BizHawk.Client.EmuHawk/tools/Lua/LuaConsole.Designer.cs b/BizHawk.Client.EmuHawk/tools/Lua/LuaConsole.Designer.cs index 13138d3bb7..4c12469769 100644 --- a/BizHawk.Client.EmuHawk/tools/Lua/LuaConsole.Designer.cs +++ b/BizHawk.Client.EmuHawk/tools/Lua/LuaConsole.Designer.cs @@ -28,85 +28,85 @@ /// private void InitializeComponent() { - this.components = new System.ComponentModel.Container(); - System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(LuaConsole)); - this.ScriptListContextMenu = new System.Windows.Forms.ContextMenuStrip(this.components); - this.ToggleScriptContextItem = new System.Windows.Forms.ToolStripMenuItem(); - this.PauseScriptContextItem = new System.Windows.Forms.ToolStripMenuItem(); - this.EditScriptContextItem = new System.Windows.Forms.ToolStripMenuItem(); - this.RemoveScriptContextItem = new System.Windows.Forms.ToolStripMenuItem(); - this.InsertSeperatorContextItem = new System.Windows.Forms.ToolStripMenuItem(); - this.ScriptContextSeparator = new System.Windows.Forms.ToolStripSeparator(); - this.StopAllScriptsContextItem = new System.Windows.Forms.ToolStripMenuItem(); - this.menuStrip1 = new MenuStripEx(); - this.FileSubMenu = new System.Windows.Forms.ToolStripMenuItem(); - this.NewSessionMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.OpenSessionMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.SaveSessionMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.SaveSessionAsMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.toolStripSeparator9 = new System.Windows.Forms.ToolStripSeparator(); - this.RecentSessionsSubMenu = new System.Windows.Forms.ToolStripMenuItem(); - this.toolStripSeparator8 = new System.Windows.Forms.ToolStripSeparator(); - this.RecentScriptsSubMenu = new System.Windows.Forms.ToolStripMenuItem(); - this.toolStripSeparator3 = new System.Windows.Forms.ToolStripSeparator(); - this.toolStripSeparator1 = new System.Windows.Forms.ToolStripSeparator(); - this.ExitMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.ScriptSubMenu = new System.Windows.Forms.ToolStripMenuItem(); - this.NewScriptMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.OpenScriptMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.ToggleScriptMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.PauseScriptMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.EditScriptMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.RemoveScriptMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.InsertSeparatorMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.toolStripSeparator7 = new System.Windows.Forms.ToolStripSeparator(); - this.MoveUpMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.MoveDownMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.SelectAllMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.toolStripSeparator6 = new System.Windows.Forms.ToolStripSeparator(); - this.StopAllScriptsMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.RegisteredFunctionsMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.OptionsSubMenu = new System.Windows.Forms.ToolStripMenuItem(); - this.SaveWindowPositionMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.AutoloadConsoleMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.AutoloadSessionMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.DisableScriptsOnLoadMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.toolStripSeparator5 = new System.Windows.Forms.ToolStripSeparator(); - this.RestoreDefaultSettingsMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.HelpSubMenu = new System.Windows.Forms.ToolStripMenuItem(); - this.FunctionsListMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.OnlineDocsMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.OutputBox = new System.Windows.Forms.RichTextBox(); - this.ConsoleContextMenu = new System.Windows.Forms.ContextMenuStrip(this.components); - this.ClearConsoleContextItem = new System.Windows.Forms.ToolStripMenuItem(); - this.RegisteredFunctionsContextItem = new System.Windows.Forms.ToolStripMenuItem(); - this.groupBox1 = new System.Windows.Forms.GroupBox(); - this.NumberOfScripts = new System.Windows.Forms.Label(); - this.OutputMessages = new System.Windows.Forms.Label(); - this.toolStrip1 = new ToolStripEx(); - this.NewScriptToolbarItem = new System.Windows.Forms.ToolStripButton(); - this.OpenScriptToolbarItem = new System.Windows.Forms.ToolStripButton(); - this.ToggleScriptToolbarItem = new System.Windows.Forms.ToolStripButton(); - this.PauseToolbarItem = new System.Windows.Forms.ToolStripButton(); - this.EditToolbarItem = new System.Windows.Forms.ToolStripButton(); - this.RemoveScriptToolbarItem = new System.Windows.Forms.ToolStripButton(); - this.InsertSeparatorToolbarItem = new System.Windows.Forms.ToolStripButton(); - this.toolStripSeparator2 = new System.Windows.Forms.ToolStripSeparator(); - this.MoveUpToolbarItem = new System.Windows.Forms.ToolStripButton(); - this.toolStripButtonMoveDown = new System.Windows.Forms.ToolStripButton(); - this.LuaListView = new BizHawk.Client.EmuHawk.VirtualListView(); - this.Script = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader())); - this.PathName = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader())); - this.ScriptListContextMenu.SuspendLayout(); - this.menuStrip1.SuspendLayout(); - this.ConsoleContextMenu.SuspendLayout(); - this.groupBox1.SuspendLayout(); - this.toolStrip1.SuspendLayout(); - this.SuspendLayout(); - // - // ScriptListContextMenu - // - this.ScriptListContextMenu.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { + this.components = new System.ComponentModel.Container(); + System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(LuaConsole)); + this.ScriptListContextMenu = new System.Windows.Forms.ContextMenuStrip(this.components); + this.ToggleScriptContextItem = new System.Windows.Forms.ToolStripMenuItem(); + this.PauseScriptContextItem = new System.Windows.Forms.ToolStripMenuItem(); + this.EditScriptContextItem = new System.Windows.Forms.ToolStripMenuItem(); + this.RemoveScriptContextItem = new System.Windows.Forms.ToolStripMenuItem(); + this.InsertSeperatorContextItem = new System.Windows.Forms.ToolStripMenuItem(); + this.ScriptContextSeparator = new System.Windows.Forms.ToolStripSeparator(); + this.StopAllScriptsContextItem = new System.Windows.Forms.ToolStripMenuItem(); + this.menuStrip1 = new MenuStripEx(); + this.FileSubMenu = new System.Windows.Forms.ToolStripMenuItem(); + this.NewSessionMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.OpenSessionMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.SaveSessionMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.SaveSessionAsMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.toolStripSeparator9 = new System.Windows.Forms.ToolStripSeparator(); + this.RecentSessionsSubMenu = new System.Windows.Forms.ToolStripMenuItem(); + this.toolStripSeparator8 = new System.Windows.Forms.ToolStripSeparator(); + this.RecentScriptsSubMenu = new System.Windows.Forms.ToolStripMenuItem(); + this.toolStripSeparator3 = new System.Windows.Forms.ToolStripSeparator(); + this.toolStripSeparator1 = new System.Windows.Forms.ToolStripSeparator(); + this.ExitMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.ScriptSubMenu = new System.Windows.Forms.ToolStripMenuItem(); + this.NewScriptMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.OpenScriptMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.ToggleScriptMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.PauseScriptMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.EditScriptMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.RemoveScriptMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.InsertSeparatorMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.toolStripSeparator7 = new System.Windows.Forms.ToolStripSeparator(); + this.MoveUpMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.MoveDownMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.SelectAllMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.toolStripSeparator6 = new System.Windows.Forms.ToolStripSeparator(); + this.StopAllScriptsMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.RegisteredFunctionsMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.OptionsSubMenu = new System.Windows.Forms.ToolStripMenuItem(); + this.SaveWindowPositionMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.AutoloadConsoleMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.AutoloadSessionMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.DisableScriptsOnLoadMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.toolStripSeparator5 = new System.Windows.Forms.ToolStripSeparator(); + this.RestoreDefaultSettingsMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.HelpSubMenu = new System.Windows.Forms.ToolStripMenuItem(); + this.FunctionsListMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.OnlineDocsMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.OutputBox = new System.Windows.Forms.RichTextBox(); + this.ConsoleContextMenu = new System.Windows.Forms.ContextMenuStrip(this.components); + this.ClearConsoleContextItem = new System.Windows.Forms.ToolStripMenuItem(); + this.RegisteredFunctionsContextItem = new System.Windows.Forms.ToolStripMenuItem(); + this.groupBox1 = new System.Windows.Forms.GroupBox(); + this.NumberOfScripts = new System.Windows.Forms.Label(); + this.OutputMessages = new System.Windows.Forms.Label(); + this.toolStrip1 = new ToolStripEx(); + this.NewScriptToolbarItem = new System.Windows.Forms.ToolStripButton(); + this.OpenScriptToolbarItem = new System.Windows.Forms.ToolStripButton(); + this.ToggleScriptToolbarItem = new System.Windows.Forms.ToolStripButton(); + this.PauseToolbarItem = new System.Windows.Forms.ToolStripButton(); + this.EditToolbarItem = new System.Windows.Forms.ToolStripButton(); + this.RemoveScriptToolbarItem = new System.Windows.Forms.ToolStripButton(); + this.InsertSeparatorToolbarItem = new System.Windows.Forms.ToolStripButton(); + this.toolStripSeparator2 = new System.Windows.Forms.ToolStripSeparator(); + this.MoveUpToolbarItem = new System.Windows.Forms.ToolStripButton(); + this.toolStripButtonMoveDown = new System.Windows.Forms.ToolStripButton(); + this.LuaListView = new BizHawk.Client.EmuHawk.VirtualListView(); + this.Script = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader())); + this.PathName = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader())); + this.ScriptListContextMenu.SuspendLayout(); + this.menuStrip1.SuspendLayout(); + this.ConsoleContextMenu.SuspendLayout(); + this.groupBox1.SuspendLayout(); + this.toolStrip1.SuspendLayout(); + this.SuspendLayout(); + // + // ScriptListContextMenu + // + this.ScriptListContextMenu.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { this.ToggleScriptContextItem, this.PauseScriptContextItem, this.EditScriptContextItem, @@ -114,80 +114,80 @@ this.InsertSeperatorContextItem, this.ScriptContextSeparator, this.StopAllScriptsContextItem}); - this.ScriptListContextMenu.Name = "contextMenuStrip1"; - this.ScriptListContextMenu.Size = new System.Drawing.Size(165, 142); - this.ScriptListContextMenu.Opening += new System.ComponentModel.CancelEventHandler(this.ScriptListContextMenu_Opening); - // - // ToggleScriptContextItem - // - this.ToggleScriptContextItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.Refresh1; - this.ToggleScriptContextItem.Name = "ToggleScriptContextItem"; - this.ToggleScriptContextItem.Size = new System.Drawing.Size(164, 22); - this.ToggleScriptContextItem.Text = "&Toggle"; - this.ToggleScriptContextItem.Click += new System.EventHandler(this.ToggleScriptMenuItem_Click); - // - // PauseScriptContextItem - // - this.PauseScriptContextItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.Pause; - this.PauseScriptContextItem.Name = "PauseScriptContextItem"; - this.PauseScriptContextItem.Size = new System.Drawing.Size(164, 22); - this.PauseScriptContextItem.Text = "Pause or Resume"; - this.PauseScriptContextItem.Click += new System.EventHandler(this.PauseScriptMenuItem_Click); - // - // EditScriptContextItem - // - this.EditScriptContextItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.CutHS; - this.EditScriptContextItem.Name = "EditScriptContextItem"; - this.EditScriptContextItem.Size = new System.Drawing.Size(164, 22); - this.EditScriptContextItem.Text = "&Edit"; - this.EditScriptContextItem.Click += new System.EventHandler(this.EditScriptMenuItem_Click); - // - // RemoveScriptContextItem - // - this.RemoveScriptContextItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.Close; - this.RemoveScriptContextItem.Name = "RemoveScriptContextItem"; - this.RemoveScriptContextItem.Size = new System.Drawing.Size(164, 22); - this.RemoveScriptContextItem.Text = "&Remove"; - this.RemoveScriptContextItem.Click += new System.EventHandler(this.RemoveScriptMenuItem_Click); - // - // InsertSeperatorContextItem - // - this.InsertSeperatorContextItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.InsertSeparator; - this.InsertSeperatorContextItem.Name = "InsertSeperatorContextItem"; - this.InsertSeperatorContextItem.Size = new System.Drawing.Size(164, 22); - this.InsertSeperatorContextItem.Text = "Insert Seperator"; - this.InsertSeperatorContextItem.Click += new System.EventHandler(this.InsertSeparatorMenuItem_Click); - // - // ScriptContextSeparator - // - this.ScriptContextSeparator.Name = "ScriptContextSeparator"; - this.ScriptContextSeparator.Size = new System.Drawing.Size(161, 6); - // - // StopAllScriptsContextItem - // - this.StopAllScriptsContextItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.Stop; - this.StopAllScriptsContextItem.Name = "StopAllScriptsContextItem"; - this.StopAllScriptsContextItem.Size = new System.Drawing.Size(164, 22); - this.StopAllScriptsContextItem.Text = "Stop All Scripts"; - this.StopAllScriptsContextItem.Click += new System.EventHandler(this.StopAllScriptsMenuItem_Click); - // - // menuStrip1 - // - this.menuStrip1.ClickThrough = true; - this.menuStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { + this.ScriptListContextMenu.Name = "contextMenuStrip1"; + this.ScriptListContextMenu.Size = new System.Drawing.Size(165, 142); + this.ScriptListContextMenu.Opening += new System.ComponentModel.CancelEventHandler(this.ScriptListContextMenu_Opening); + // + // ToggleScriptContextItem + // + this.ToggleScriptContextItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.Refresh1; + this.ToggleScriptContextItem.Name = "ToggleScriptContextItem"; + this.ToggleScriptContextItem.Size = new System.Drawing.Size(164, 22); + this.ToggleScriptContextItem.Text = "&Toggle"; + this.ToggleScriptContextItem.Click += new System.EventHandler(this.ToggleScriptMenuItem_Click); + // + // PauseScriptContextItem + // + this.PauseScriptContextItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.Pause; + this.PauseScriptContextItem.Name = "PauseScriptContextItem"; + this.PauseScriptContextItem.Size = new System.Drawing.Size(164, 22); + this.PauseScriptContextItem.Text = "Pause or Resume"; + this.PauseScriptContextItem.Click += new System.EventHandler(this.PauseScriptMenuItem_Click); + // + // EditScriptContextItem + // + this.EditScriptContextItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.CutHS; + this.EditScriptContextItem.Name = "EditScriptContextItem"; + this.EditScriptContextItem.Size = new System.Drawing.Size(164, 22); + this.EditScriptContextItem.Text = "&Edit"; + this.EditScriptContextItem.Click += new System.EventHandler(this.EditScriptMenuItem_Click); + // + // RemoveScriptContextItem + // + this.RemoveScriptContextItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.Close; + this.RemoveScriptContextItem.Name = "RemoveScriptContextItem"; + this.RemoveScriptContextItem.Size = new System.Drawing.Size(164, 22); + this.RemoveScriptContextItem.Text = "&Remove"; + this.RemoveScriptContextItem.Click += new System.EventHandler(this.RemoveScriptMenuItem_Click); + // + // InsertSeperatorContextItem + // + this.InsertSeperatorContextItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.InsertSeparator; + this.InsertSeperatorContextItem.Name = "InsertSeperatorContextItem"; + this.InsertSeperatorContextItem.Size = new System.Drawing.Size(164, 22); + this.InsertSeperatorContextItem.Text = "Insert Seperator"; + this.InsertSeperatorContextItem.Click += new System.EventHandler(this.InsertSeparatorMenuItem_Click); + // + // ScriptContextSeparator + // + this.ScriptContextSeparator.Name = "ScriptContextSeparator"; + this.ScriptContextSeparator.Size = new System.Drawing.Size(161, 6); + // + // StopAllScriptsContextItem + // + this.StopAllScriptsContextItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.Stop; + this.StopAllScriptsContextItem.Name = "StopAllScriptsContextItem"; + this.StopAllScriptsContextItem.Size = new System.Drawing.Size(164, 22); + this.StopAllScriptsContextItem.Text = "Stop All Scripts"; + this.StopAllScriptsContextItem.Click += new System.EventHandler(this.StopAllScriptsMenuItem_Click); + // + // menuStrip1 + // + this.menuStrip1.ClickThrough = true; + this.menuStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { this.FileSubMenu, this.ScriptSubMenu, this.OptionsSubMenu, this.HelpSubMenu}); - 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"; - // - // FileSubMenu - // - this.FileSubMenu.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"; + // + // FileSubMenu + // + this.FileSubMenu.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { this.NewSessionMenuItem, this.OpenSessionMenuItem, this.SaveSessionMenuItem, @@ -197,99 +197,99 @@ this.RecentScriptsSubMenu, this.toolStripSeparator1, this.ExitMenuItem}); - this.FileSubMenu.Name = "FileSubMenu"; - this.FileSubMenu.Size = new System.Drawing.Size(37, 20); - this.FileSubMenu.Text = "&File"; - this.FileSubMenu.DropDownOpened += new System.EventHandler(this.FileSubMenu_DropDownOpened); - // - // NewSessionMenuItem - // - this.NewSessionMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.NewFile; - this.NewSessionMenuItem.Name = "NewSessionMenuItem"; - this.NewSessionMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)(((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.Shift) + this.FileSubMenu.Name = "FileSubMenu"; + this.FileSubMenu.Size = new System.Drawing.Size(37, 20); + this.FileSubMenu.Text = "&File"; + this.FileSubMenu.DropDownOpened += new System.EventHandler(this.FileSubMenu_DropDownOpened); + // + // NewSessionMenuItem + // + this.NewSessionMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.NewFile; + this.NewSessionMenuItem.Name = "NewSessionMenuItem"; + this.NewSessionMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)(((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.Shift) | System.Windows.Forms.Keys.N))); - this.NewSessionMenuItem.Size = new System.Drawing.Size(237, 22); - this.NewSessionMenuItem.Text = "&New Session"; - this.NewSessionMenuItem.Click += new System.EventHandler(this.NewSessionMenuItem_Click); - // - // OpenSessionMenuItem - // - this.OpenSessionMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.OpenFile; - this.OpenSessionMenuItem.Name = "OpenSessionMenuItem"; - this.OpenSessionMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)(((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.Shift) + this.NewSessionMenuItem.Size = new System.Drawing.Size(237, 22); + this.NewSessionMenuItem.Text = "&New Session"; + this.NewSessionMenuItem.Click += new System.EventHandler(this.NewSessionMenuItem_Click); + // + // OpenSessionMenuItem + // + this.OpenSessionMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.OpenFile; + this.OpenSessionMenuItem.Name = "OpenSessionMenuItem"; + this.OpenSessionMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)(((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.Shift) | System.Windows.Forms.Keys.O))); - this.OpenSessionMenuItem.Size = new System.Drawing.Size(237, 22); - this.OpenSessionMenuItem.Text = "&Open Session..."; - this.OpenSessionMenuItem.Click += new System.EventHandler(this.OpenSessionMenuItem_Click); - // - // SaveSessionMenuItem - // - this.SaveSessionMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.SaveAs; - this.SaveSessionMenuItem.Name = "SaveSessionMenuItem"; - this.SaveSessionMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.S))); - this.SaveSessionMenuItem.Size = new System.Drawing.Size(237, 22); - this.SaveSessionMenuItem.Text = "&Save Session"; - this.SaveSessionMenuItem.Click += new System.EventHandler(this.SaveSessionMenuItem_Click); - // - // SaveSessionAsMenuItem - // - this.SaveSessionAsMenuItem.Name = "SaveSessionAsMenuItem"; - this.SaveSessionAsMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)(((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.Shift) + this.OpenSessionMenuItem.Size = new System.Drawing.Size(237, 22); + this.OpenSessionMenuItem.Text = "&Open Session..."; + this.OpenSessionMenuItem.Click += new System.EventHandler(this.OpenSessionMenuItem_Click); + // + // SaveSessionMenuItem + // + this.SaveSessionMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.SaveAs; + this.SaveSessionMenuItem.Name = "SaveSessionMenuItem"; + this.SaveSessionMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.S))); + this.SaveSessionMenuItem.Size = new System.Drawing.Size(237, 22); + this.SaveSessionMenuItem.Text = "&Save Session"; + this.SaveSessionMenuItem.Click += new System.EventHandler(this.SaveSessionMenuItem_Click); + // + // SaveSessionAsMenuItem + // + this.SaveSessionAsMenuItem.Name = "SaveSessionAsMenuItem"; + this.SaveSessionAsMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)(((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.Shift) | System.Windows.Forms.Keys.S))); - this.SaveSessionAsMenuItem.Size = new System.Drawing.Size(237, 22); - this.SaveSessionAsMenuItem.Text = "Save Session &As..."; - this.SaveSessionAsMenuItem.Click += new System.EventHandler(this.SaveSessionAsMenuItem_Click); - // - // toolStripSeparator9 - // - this.toolStripSeparator9.Name = "toolStripSeparator9"; - this.toolStripSeparator9.Size = new System.Drawing.Size(234, 6); - // - // RecentSessionsSubMenu - // - this.RecentSessionsSubMenu.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { + this.SaveSessionAsMenuItem.Size = new System.Drawing.Size(237, 22); + this.SaveSessionAsMenuItem.Text = "Save Session &As..."; + this.SaveSessionAsMenuItem.Click += new System.EventHandler(this.SaveSessionAsMenuItem_Click); + // + // toolStripSeparator9 + // + this.toolStripSeparator9.Name = "toolStripSeparator9"; + this.toolStripSeparator9.Size = new System.Drawing.Size(234, 6); + // + // RecentSessionsSubMenu + // + this.RecentSessionsSubMenu.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { this.toolStripSeparator8}); - this.RecentSessionsSubMenu.Name = "RecentSessionsSubMenu"; - this.RecentSessionsSubMenu.Size = new System.Drawing.Size(237, 22); - this.RecentSessionsSubMenu.Text = "Recent Sessions"; - this.RecentSessionsSubMenu.DropDownOpened += new System.EventHandler(this.RecentSessionsSubMenu_DropDownOpened); - // - // toolStripSeparator8 - // - this.toolStripSeparator8.Name = "toolStripSeparator8"; - this.toolStripSeparator8.Size = new System.Drawing.Size(57, 6); - // - // RecentScriptsSubMenu - // - this.RecentScriptsSubMenu.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { + this.RecentSessionsSubMenu.Name = "RecentSessionsSubMenu"; + this.RecentSessionsSubMenu.Size = new System.Drawing.Size(237, 22); + this.RecentSessionsSubMenu.Text = "Recent Sessions"; + this.RecentSessionsSubMenu.DropDownOpened += new System.EventHandler(this.RecentSessionsSubMenu_DropDownOpened); + // + // toolStripSeparator8 + // + this.toolStripSeparator8.Name = "toolStripSeparator8"; + this.toolStripSeparator8.Size = new System.Drawing.Size(57, 6); + // + // RecentScriptsSubMenu + // + this.RecentScriptsSubMenu.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { this.toolStripSeparator3}); - this.RecentScriptsSubMenu.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.Recent; - this.RecentScriptsSubMenu.Name = "RecentScriptsSubMenu"; - this.RecentScriptsSubMenu.Size = new System.Drawing.Size(237, 22); - this.RecentScriptsSubMenu.Text = "Recent Scripts"; - this.RecentScriptsSubMenu.DropDownOpened += new System.EventHandler(this.RecentScriptsSubMenu_DropDownOpened); - // - // toolStripSeparator3 - // - this.toolStripSeparator3.Name = "toolStripSeparator3"; - this.toolStripSeparator3.Size = new System.Drawing.Size(57, 6); - // - // toolStripSeparator1 - // - this.toolStripSeparator1.Name = "toolStripSeparator1"; - this.toolStripSeparator1.Size = new System.Drawing.Size(234, 6); - // - // ExitMenuItem - // - this.ExitMenuItem.Name = "ExitMenuItem"; - this.ExitMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Alt | System.Windows.Forms.Keys.F4))); - this.ExitMenuItem.Size = new System.Drawing.Size(237, 22); - this.ExitMenuItem.Text = "E&xit"; - this.ExitMenuItem.Click += new System.EventHandler(this.ExitMenuItem_Click); - // - // ScriptSubMenu - // - this.ScriptSubMenu.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { + this.RecentScriptsSubMenu.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.Recent; + this.RecentScriptsSubMenu.Name = "RecentScriptsSubMenu"; + this.RecentScriptsSubMenu.Size = new System.Drawing.Size(237, 22); + this.RecentScriptsSubMenu.Text = "Recent Scripts"; + this.RecentScriptsSubMenu.DropDownOpened += new System.EventHandler(this.RecentScriptsSubMenu_DropDownOpened); + // + // toolStripSeparator3 + // + this.toolStripSeparator3.Name = "toolStripSeparator3"; + this.toolStripSeparator3.Size = new System.Drawing.Size(57, 6); + // + // toolStripSeparator1 + // + this.toolStripSeparator1.Name = "toolStripSeparator1"; + this.toolStripSeparator1.Size = new System.Drawing.Size(234, 6); + // + // ExitMenuItem + // + this.ExitMenuItem.Name = "ExitMenuItem"; + this.ExitMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Alt | System.Windows.Forms.Keys.F4))); + this.ExitMenuItem.Size = new System.Drawing.Size(237, 22); + this.ExitMenuItem.Text = "E&xit"; + this.ExitMenuItem.Click += new System.EventHandler(this.ExitMenuItem_Click); + // + // ScriptSubMenu + // + this.ScriptSubMenu.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { this.NewScriptMenuItem, this.OpenScriptMenuItem, this.ToggleScriptMenuItem, @@ -304,274 +304,274 @@ this.toolStripSeparator6, this.StopAllScriptsMenuItem, this.RegisteredFunctionsMenuItem}); - this.ScriptSubMenu.Name = "ScriptSubMenu"; - this.ScriptSubMenu.Size = new System.Drawing.Size(49, 20); - this.ScriptSubMenu.Text = "&Script"; - this.ScriptSubMenu.DropDownOpened += new System.EventHandler(this.ScriptSubMenu_DropDownOpened); - // - // NewScriptMenuItem - // - this.NewScriptMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.NewFile; - this.NewScriptMenuItem.Name = "NewScriptMenuItem"; - this.NewScriptMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.N))); - this.NewScriptMenuItem.Size = new System.Drawing.Size(218, 22); - this.NewScriptMenuItem.Text = "New Script"; - this.NewScriptMenuItem.Click += new System.EventHandler(this.NewScriptMenuItem_Click); - // - // OpenScriptMenuItem - // - this.OpenScriptMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.OpenFile; - this.OpenScriptMenuItem.Name = "OpenScriptMenuItem"; - this.OpenScriptMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.O))); - this.OpenScriptMenuItem.Size = new System.Drawing.Size(218, 22); - this.OpenScriptMenuItem.Text = "&Open Script..."; - this.OpenScriptMenuItem.Click += new System.EventHandler(this.OpenScriptMenuItem_Click); - // - // ToggleScriptMenuItem - // - this.ToggleScriptMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.Refresh1; - this.ToggleScriptMenuItem.Name = "ToggleScriptMenuItem"; - this.ToggleScriptMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.T))); - this.ToggleScriptMenuItem.Size = new System.Drawing.Size(218, 22); - this.ToggleScriptMenuItem.Text = "&Toggle"; - this.ToggleScriptMenuItem.Click += new System.EventHandler(this.ToggleScriptMenuItem_Click); - // - // PauseScriptMenuItem - // - this.PauseScriptMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.Pause; - this.PauseScriptMenuItem.Name = "PauseScriptMenuItem"; - this.PauseScriptMenuItem.Size = new System.Drawing.Size(218, 22); - this.PauseScriptMenuItem.Text = "Pause or Resume"; - this.PauseScriptMenuItem.Click += new System.EventHandler(this.PauseScriptMenuItem_Click); - // - // EditScriptMenuItem - // - this.EditScriptMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.CutHS; - this.EditScriptMenuItem.Name = "EditScriptMenuItem"; - this.EditScriptMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.E))); - this.EditScriptMenuItem.Size = new System.Drawing.Size(218, 22); - this.EditScriptMenuItem.Text = "&Edit Script"; - this.EditScriptMenuItem.Click += new System.EventHandler(this.EditScriptMenuItem_Click); - // - // RemoveScriptMenuItem - // - this.RemoveScriptMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.Delete; - this.RemoveScriptMenuItem.Name = "RemoveScriptMenuItem"; - this.RemoveScriptMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.R))); - this.RemoveScriptMenuItem.Size = new System.Drawing.Size(218, 22); - this.RemoveScriptMenuItem.Text = "&Remove Script"; - this.RemoveScriptMenuItem.Click += new System.EventHandler(this.RemoveScriptMenuItem_Click); - // - // InsertSeparatorMenuItem - // - this.InsertSeparatorMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.InsertSeparator; - this.InsertSeparatorMenuItem.Name = "InsertSeparatorMenuItem"; - this.InsertSeparatorMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.I))); - this.InsertSeparatorMenuItem.Size = new System.Drawing.Size(218, 22); - this.InsertSeparatorMenuItem.Text = "Insert Separator"; - this.InsertSeparatorMenuItem.Click += new System.EventHandler(this.InsertSeparatorMenuItem_Click); - // - // toolStripSeparator7 - // - this.toolStripSeparator7.Name = "toolStripSeparator7"; - this.toolStripSeparator7.Size = new System.Drawing.Size(215, 6); - // - // MoveUpMenuItem - // - this.MoveUpMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.MoveUp; - this.MoveUpMenuItem.Name = "MoveUpMenuItem"; - this.MoveUpMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.U))); - this.MoveUpMenuItem.Size = new System.Drawing.Size(218, 22); - this.MoveUpMenuItem.Text = "Move &Up"; - this.MoveUpMenuItem.Click += new System.EventHandler(this.MoveUpMenuItem_Click); - // - // MoveDownMenuItem - // - this.MoveDownMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.MoveDown; - this.MoveDownMenuItem.Name = "MoveDownMenuItem"; - this.MoveDownMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.D))); - this.MoveDownMenuItem.Size = new System.Drawing.Size(218, 22); - this.MoveDownMenuItem.Text = "Move &Down"; - this.MoveDownMenuItem.Click += new System.EventHandler(this.MoveDownMenuItem_Click); - // - // SelectAllMenuItem - // - this.SelectAllMenuItem.Name = "SelectAllMenuItem"; - this.SelectAllMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.A))); - this.SelectAllMenuItem.Size = new System.Drawing.Size(218, 22); - this.SelectAllMenuItem.Text = "Select &All"; - this.SelectAllMenuItem.Click += new System.EventHandler(this.SelectAllMenuItem_Click); - // - // toolStripSeparator6 - // - this.toolStripSeparator6.Name = "toolStripSeparator6"; - this.toolStripSeparator6.Size = new System.Drawing.Size(215, 6); - // - // StopAllScriptsMenuItem - // - this.StopAllScriptsMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.Stop; - this.StopAllScriptsMenuItem.Name = "StopAllScriptsMenuItem"; - this.StopAllScriptsMenuItem.Size = new System.Drawing.Size(218, 22); - this.StopAllScriptsMenuItem.Text = "Stop All Scripts"; - this.StopAllScriptsMenuItem.Click += new System.EventHandler(this.StopAllScriptsMenuItem_Click); - // - // RegisteredFunctionsMenuItem - // - this.RegisteredFunctionsMenuItem.Name = "RegisteredFunctionsMenuItem"; - this.RegisteredFunctionsMenuItem.ShortcutKeyDisplayString = "F12"; - this.RegisteredFunctionsMenuItem.Size = new System.Drawing.Size(218, 22); - this.RegisteredFunctionsMenuItem.Text = "&Registered Functions..."; - this.RegisteredFunctionsMenuItem.Click += new System.EventHandler(this.RegisteredFunctionsMenuItem_Click); - // - // OptionsSubMenu - // - this.OptionsSubMenu.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { + this.ScriptSubMenu.Name = "ScriptSubMenu"; + this.ScriptSubMenu.Size = new System.Drawing.Size(49, 20); + this.ScriptSubMenu.Text = "&Script"; + this.ScriptSubMenu.DropDownOpened += new System.EventHandler(this.ScriptSubMenu_DropDownOpened); + // + // NewScriptMenuItem + // + this.NewScriptMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.NewFile; + this.NewScriptMenuItem.Name = "NewScriptMenuItem"; + this.NewScriptMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.N))); + this.NewScriptMenuItem.Size = new System.Drawing.Size(218, 22); + this.NewScriptMenuItem.Text = "New Script"; + this.NewScriptMenuItem.Click += new System.EventHandler(this.NewScriptMenuItem_Click); + // + // OpenScriptMenuItem + // + this.OpenScriptMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.OpenFile; + this.OpenScriptMenuItem.Name = "OpenScriptMenuItem"; + this.OpenScriptMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.O))); + this.OpenScriptMenuItem.Size = new System.Drawing.Size(218, 22); + this.OpenScriptMenuItem.Text = "&Open Script..."; + this.OpenScriptMenuItem.Click += new System.EventHandler(this.OpenScriptMenuItem_Click); + // + // ToggleScriptMenuItem + // + this.ToggleScriptMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.Refresh1; + this.ToggleScriptMenuItem.Name = "ToggleScriptMenuItem"; + this.ToggleScriptMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.T))); + this.ToggleScriptMenuItem.Size = new System.Drawing.Size(218, 22); + this.ToggleScriptMenuItem.Text = "&Toggle"; + this.ToggleScriptMenuItem.Click += new System.EventHandler(this.ToggleScriptMenuItem_Click); + // + // PauseScriptMenuItem + // + this.PauseScriptMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.Pause; + this.PauseScriptMenuItem.Name = "PauseScriptMenuItem"; + this.PauseScriptMenuItem.Size = new System.Drawing.Size(218, 22); + this.PauseScriptMenuItem.Text = "Pause or Resume"; + this.PauseScriptMenuItem.Click += new System.EventHandler(this.PauseScriptMenuItem_Click); + // + // EditScriptMenuItem + // + this.EditScriptMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.CutHS; + this.EditScriptMenuItem.Name = "EditScriptMenuItem"; + this.EditScriptMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.E))); + this.EditScriptMenuItem.Size = new System.Drawing.Size(218, 22); + this.EditScriptMenuItem.Text = "&Edit Script"; + this.EditScriptMenuItem.Click += new System.EventHandler(this.EditScriptMenuItem_Click); + // + // RemoveScriptMenuItem + // + this.RemoveScriptMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.Delete; + this.RemoveScriptMenuItem.Name = "RemoveScriptMenuItem"; + this.RemoveScriptMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.R))); + this.RemoveScriptMenuItem.Size = new System.Drawing.Size(218, 22); + this.RemoveScriptMenuItem.Text = "&Remove Script"; + this.RemoveScriptMenuItem.Click += new System.EventHandler(this.RemoveScriptMenuItem_Click); + // + // InsertSeparatorMenuItem + // + this.InsertSeparatorMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.InsertSeparator; + this.InsertSeparatorMenuItem.Name = "InsertSeparatorMenuItem"; + this.InsertSeparatorMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.I))); + this.InsertSeparatorMenuItem.Size = new System.Drawing.Size(218, 22); + this.InsertSeparatorMenuItem.Text = "Insert Separator"; + this.InsertSeparatorMenuItem.Click += new System.EventHandler(this.InsertSeparatorMenuItem_Click); + // + // toolStripSeparator7 + // + this.toolStripSeparator7.Name = "toolStripSeparator7"; + this.toolStripSeparator7.Size = new System.Drawing.Size(215, 6); + // + // MoveUpMenuItem + // + this.MoveUpMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.MoveUp; + this.MoveUpMenuItem.Name = "MoveUpMenuItem"; + this.MoveUpMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.U))); + this.MoveUpMenuItem.Size = new System.Drawing.Size(218, 22); + this.MoveUpMenuItem.Text = "Move &Up"; + this.MoveUpMenuItem.Click += new System.EventHandler(this.MoveUpMenuItem_Click); + // + // MoveDownMenuItem + // + this.MoveDownMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.MoveDown; + this.MoveDownMenuItem.Name = "MoveDownMenuItem"; + this.MoveDownMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.D))); + this.MoveDownMenuItem.Size = new System.Drawing.Size(218, 22); + this.MoveDownMenuItem.Text = "Move &Down"; + this.MoveDownMenuItem.Click += new System.EventHandler(this.MoveDownMenuItem_Click); + // + // SelectAllMenuItem + // + this.SelectAllMenuItem.Name = "SelectAllMenuItem"; + this.SelectAllMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.A))); + this.SelectAllMenuItem.Size = new System.Drawing.Size(218, 22); + this.SelectAllMenuItem.Text = "Select &All"; + this.SelectAllMenuItem.Click += new System.EventHandler(this.SelectAllMenuItem_Click); + // + // toolStripSeparator6 + // + this.toolStripSeparator6.Name = "toolStripSeparator6"; + this.toolStripSeparator6.Size = new System.Drawing.Size(215, 6); + // + // StopAllScriptsMenuItem + // + this.StopAllScriptsMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.Stop; + this.StopAllScriptsMenuItem.Name = "StopAllScriptsMenuItem"; + this.StopAllScriptsMenuItem.Size = new System.Drawing.Size(218, 22); + this.StopAllScriptsMenuItem.Text = "Stop All Scripts"; + this.StopAllScriptsMenuItem.Click += new System.EventHandler(this.StopAllScriptsMenuItem_Click); + // + // RegisteredFunctionsMenuItem + // + this.RegisteredFunctionsMenuItem.Name = "RegisteredFunctionsMenuItem"; + this.RegisteredFunctionsMenuItem.ShortcutKeyDisplayString = "F12"; + this.RegisteredFunctionsMenuItem.Size = new System.Drawing.Size(218, 22); + this.RegisteredFunctionsMenuItem.Text = "&Registered Functions..."; + this.RegisteredFunctionsMenuItem.Click += new System.EventHandler(this.RegisteredFunctionsMenuItem_Click); + // + // OptionsSubMenu + // + this.OptionsSubMenu.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { this.SaveWindowPositionMenuItem, this.AutoloadConsoleMenuItem, this.AutoloadSessionMenuItem, this.DisableScriptsOnLoadMenuItem, this.toolStripSeparator5, this.RestoreDefaultSettingsMenuItem}); - this.OptionsSubMenu.Name = "OptionsSubMenu"; - this.OptionsSubMenu.Size = new System.Drawing.Size(61, 20); - this.OptionsSubMenu.Text = "&Options"; - this.OptionsSubMenu.DropDownOpened += new System.EventHandler(this.OptionsSubMenu_DropDownOpened); - // - // SaveWindowPositionMenuItem - // - this.SaveWindowPositionMenuItem.Name = "SaveWindowPositionMenuItem"; - this.SaveWindowPositionMenuItem.Size = new System.Drawing.Size(199, 22); - this.SaveWindowPositionMenuItem.Text = "Save Window Position"; - this.SaveWindowPositionMenuItem.Click += new System.EventHandler(this.SaveWindowPositionMenuItem_Click); - // - // AutoloadConsoleMenuItem - // - this.AutoloadConsoleMenuItem.Name = "AutoloadConsoleMenuItem"; - this.AutoloadConsoleMenuItem.Size = new System.Drawing.Size(199, 22); - this.AutoloadConsoleMenuItem.Text = "Autoload Console"; - this.AutoloadConsoleMenuItem.Click += new System.EventHandler(this.AutoloadConsoleMenuItem_Click); - // - // AutoloadSessionMenuItem - // - this.AutoloadSessionMenuItem.Name = "AutoloadSessionMenuItem"; - this.AutoloadSessionMenuItem.Size = new System.Drawing.Size(199, 22); - this.AutoloadSessionMenuItem.Text = "Autoload Session"; - this.AutoloadSessionMenuItem.Click += new System.EventHandler(this.AutoloadSessionMenuItem_Click); - // - // DisableScriptsOnLoadMenuItem - // - this.DisableScriptsOnLoadMenuItem.Name = "DisableScriptsOnLoadMenuItem"; - this.DisableScriptsOnLoadMenuItem.Size = new System.Drawing.Size(199, 22); - this.DisableScriptsOnLoadMenuItem.Text = "Disable Scripts on Load"; - this.DisableScriptsOnLoadMenuItem.Click += new System.EventHandler(this.DisableScriptsOnLoadMenuItem_Click); - // - // toolStripSeparator5 - // - this.toolStripSeparator5.Name = "toolStripSeparator5"; - this.toolStripSeparator5.Size = new System.Drawing.Size(196, 6); - // - // RestoreDefaultSettingsMenuItem - // - this.RestoreDefaultSettingsMenuItem.Name = "RestoreDefaultSettingsMenuItem"; - this.RestoreDefaultSettingsMenuItem.Size = new System.Drawing.Size(199, 22); - this.RestoreDefaultSettingsMenuItem.Text = "Restore Default Settings"; - this.RestoreDefaultSettingsMenuItem.Click += new System.EventHandler(this.RestoreDefaultSettingsMenuItem_Click); - // - // HelpSubMenu - // - this.HelpSubMenu.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { + this.OptionsSubMenu.Name = "OptionsSubMenu"; + this.OptionsSubMenu.Size = new System.Drawing.Size(61, 20); + this.OptionsSubMenu.Text = "&Options"; + this.OptionsSubMenu.DropDownOpened += new System.EventHandler(this.OptionsSubMenu_DropDownOpened); + // + // SaveWindowPositionMenuItem + // + this.SaveWindowPositionMenuItem.Name = "SaveWindowPositionMenuItem"; + this.SaveWindowPositionMenuItem.Size = new System.Drawing.Size(199, 22); + this.SaveWindowPositionMenuItem.Text = "Save Window Position"; + this.SaveWindowPositionMenuItem.Click += new System.EventHandler(this.SaveWindowPositionMenuItem_Click); + // + // AutoloadConsoleMenuItem + // + this.AutoloadConsoleMenuItem.Name = "AutoloadConsoleMenuItem"; + this.AutoloadConsoleMenuItem.Size = new System.Drawing.Size(199, 22); + this.AutoloadConsoleMenuItem.Text = "Autoload Console"; + this.AutoloadConsoleMenuItem.Click += new System.EventHandler(this.AutoloadConsoleMenuItem_Click); + // + // AutoloadSessionMenuItem + // + this.AutoloadSessionMenuItem.Name = "AutoloadSessionMenuItem"; + this.AutoloadSessionMenuItem.Size = new System.Drawing.Size(199, 22); + this.AutoloadSessionMenuItem.Text = "Autoload Session"; + this.AutoloadSessionMenuItem.Click += new System.EventHandler(this.AutoloadSessionMenuItem_Click); + // + // DisableScriptsOnLoadMenuItem + // + this.DisableScriptsOnLoadMenuItem.Name = "DisableScriptsOnLoadMenuItem"; + this.DisableScriptsOnLoadMenuItem.Size = new System.Drawing.Size(199, 22); + this.DisableScriptsOnLoadMenuItem.Text = "Disable Scripts on Load"; + this.DisableScriptsOnLoadMenuItem.Click += new System.EventHandler(this.DisableScriptsOnLoadMenuItem_Click); + // + // toolStripSeparator5 + // + this.toolStripSeparator5.Name = "toolStripSeparator5"; + this.toolStripSeparator5.Size = new System.Drawing.Size(196, 6); + // + // RestoreDefaultSettingsMenuItem + // + this.RestoreDefaultSettingsMenuItem.Name = "RestoreDefaultSettingsMenuItem"; + this.RestoreDefaultSettingsMenuItem.Size = new System.Drawing.Size(199, 22); + this.RestoreDefaultSettingsMenuItem.Text = "Restore Default Settings"; + this.RestoreDefaultSettingsMenuItem.Click += new System.EventHandler(this.RestoreDefaultSettingsMenuItem_Click); + // + // HelpSubMenu + // + this.HelpSubMenu.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { this.FunctionsListMenuItem, this.OnlineDocsMenuItem}); - this.HelpSubMenu.Name = "HelpSubMenu"; - this.HelpSubMenu.Size = new System.Drawing.Size(44, 20); - this.HelpSubMenu.Text = "&Help"; - // - // FunctionsListMenuItem - // - this.FunctionsListMenuItem.Name = "FunctionsListMenuItem"; - this.FunctionsListMenuItem.Size = new System.Drawing.Size(202, 22); - this.FunctionsListMenuItem.Text = "&Lua Functions List"; - this.FunctionsListMenuItem.Click += new System.EventHandler(this.FunctionsListMenuItem_Click); - // - // OnlineDocsMenuItem - // - this.OnlineDocsMenuItem.Name = "OnlineDocsMenuItem"; - this.OnlineDocsMenuItem.Size = new System.Drawing.Size(202, 22); - this.OnlineDocsMenuItem.Text = "Documentation online..."; - this.OnlineDocsMenuItem.Click += new System.EventHandler(this.OnlineDocsMenuItem_Click); - // - // OutputBox - // - this.OutputBox.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) + this.HelpSubMenu.Name = "HelpSubMenu"; + this.HelpSubMenu.Size = new System.Drawing.Size(44, 20); + this.HelpSubMenu.Text = "&Help"; + // + // FunctionsListMenuItem + // + this.FunctionsListMenuItem.Name = "FunctionsListMenuItem"; + this.FunctionsListMenuItem.Size = new System.Drawing.Size(202, 22); + this.FunctionsListMenuItem.Text = "&Lua Functions List"; + this.FunctionsListMenuItem.Click += new System.EventHandler(this.FunctionsListMenuItem_Click); + // + // OnlineDocsMenuItem + // + this.OnlineDocsMenuItem.Name = "OnlineDocsMenuItem"; + this.OnlineDocsMenuItem.Size = new System.Drawing.Size(202, 22); + this.OnlineDocsMenuItem.Text = "Documentation online..."; + this.OnlineDocsMenuItem.Click += new System.EventHandler(this.OnlineDocsMenuItem_Click); + // + // OutputBox + // + this.OutputBox.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.OutputBox.ContextMenuStrip = this.ConsoleContextMenu; - 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, 283); - this.OutputBox.TabIndex = 2; - this.OutputBox.Text = ""; - this.OutputBox.KeyDown += new System.Windows.Forms.KeyEventHandler(this.OutputBox_KeyDown); - // - // ConsoleContextMenu - // - this.ConsoleContextMenu.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { + this.OutputBox.ContextMenuStrip = this.ConsoleContextMenu; + 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, 283); + this.OutputBox.TabIndex = 2; + this.OutputBox.Text = ""; + this.OutputBox.KeyDown += new System.Windows.Forms.KeyEventHandler(this.OutputBox_KeyDown); + // + // ConsoleContextMenu + // + this.ConsoleContextMenu.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { this.ClearConsoleContextItem, this.RegisteredFunctionsContextItem}); - this.ConsoleContextMenu.Name = "contextMenuStrip2"; - this.ConsoleContextMenu.Size = new System.Drawing.Size(185, 48); - this.ConsoleContextMenu.Opening += new System.ComponentModel.CancelEventHandler(this.ConsoleContextMenu_Opening); - // - // ClearConsoleContextItem - // - this.ClearConsoleContextItem.Name = "ClearConsoleContextItem"; - this.ClearConsoleContextItem.Size = new System.Drawing.Size(184, 22); - this.ClearConsoleContextItem.Text = "&Clear"; - this.ClearConsoleContextItem.Click += new System.EventHandler(this.ClearConsoleContextItem_Click); - // - // RegisteredFunctionsContextItem - // - this.RegisteredFunctionsContextItem.Name = "RegisteredFunctionsContextItem"; - this.RegisteredFunctionsContextItem.Size = new System.Drawing.Size(184, 22); - this.RegisteredFunctionsContextItem.Text = "&Registered Functions"; - this.RegisteredFunctionsContextItem.Click += new System.EventHandler(this.RegisteredFunctionsMenuItem_Click); - // - // groupBox1 - // - this.groupBox1.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) + this.ConsoleContextMenu.Name = "contextMenuStrip2"; + this.ConsoleContextMenu.Size = new System.Drawing.Size(185, 48); + this.ConsoleContextMenu.Opening += new System.ComponentModel.CancelEventHandler(this.ConsoleContextMenu_Opening); + // + // ClearConsoleContextItem + // + this.ClearConsoleContextItem.Name = "ClearConsoleContextItem"; + this.ClearConsoleContextItem.Size = new System.Drawing.Size(184, 22); + this.ClearConsoleContextItem.Text = "&Clear"; + this.ClearConsoleContextItem.Click += new System.EventHandler(this.ClearConsoleContextItem_Click); + // + // RegisteredFunctionsContextItem + // + this.RegisteredFunctionsContextItem.Name = "RegisteredFunctionsContextItem"; + this.RegisteredFunctionsContextItem.Size = new System.Drawing.Size(184, 22); + this.RegisteredFunctionsContextItem.Text = "&Registered Functions"; + this.RegisteredFunctionsContextItem.Click += new System.EventHandler(this.RegisteredFunctionsMenuItem_Click); + // + // groupBox1 + // + this.groupBox1.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) | 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, 304); - this.groupBox1.TabIndex = 3; - this.groupBox1.TabStop = false; - this.groupBox1.Text = "Output"; - // - // NumberOfScripts - // - this.NumberOfScripts.AutoSize = true; - this.NumberOfScripts.Location = new System.Drawing.Point(12, 53); - this.NumberOfScripts.Name = "NumberOfScripts"; - this.NumberOfScripts.Size = new System.Drawing.Size(56, 13); - this.NumberOfScripts.TabIndex = 4; - this.NumberOfScripts.Text = "0 script "; - // - // OutputMessages - // - this.OutputMessages.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); - this.OutputMessages.AutoSize = true; - this.OutputMessages.Location = new System.Drawing.Point(13, 384); - this.OutputMessages.Name = "OutputMessages"; - this.OutputMessages.Size = new System.Drawing.Size(106, 13); - this.OutputMessages.TabIndex = 6; - this.OutputMessages.Text = " "; - // - // toolStrip1 - // - this.toolStrip1.ClickThrough = true; - this.toolStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { + 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, 304); + this.groupBox1.TabIndex = 3; + this.groupBox1.TabStop = false; + this.groupBox1.Text = "Output"; + // + // NumberOfScripts + // + this.NumberOfScripts.AutoSize = true; + this.NumberOfScripts.Location = new System.Drawing.Point(12, 53); + this.NumberOfScripts.Name = "NumberOfScripts"; + this.NumberOfScripts.Size = new System.Drawing.Size(56, 13); + this.NumberOfScripts.TabIndex = 4; + this.NumberOfScripts.Text = "0 script "; + // + // OutputMessages + // + this.OutputMessages.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); + this.OutputMessages.AutoSize = true; + this.OutputMessages.Location = new System.Drawing.Point(13, 384); + this.OutputMessages.Name = "OutputMessages"; + this.OutputMessages.Size = new System.Drawing.Size(106, 13); + this.OutputMessages.TabIndex = 6; + this.OutputMessages.Text = " "; + // + // toolStrip1 + // + this.toolStrip1.ClickThrough = true; + this.toolStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { this.NewScriptToolbarItem, this.OpenScriptToolbarItem, this.ToggleScriptToolbarItem, @@ -582,173 +582,173 @@ this.toolStripSeparator2, this.MoveUpToolbarItem, 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"; - // - // NewScriptToolbarItem - // - this.NewScriptToolbarItem.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; - this.NewScriptToolbarItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.NewFile; - this.NewScriptToolbarItem.ImageTransparentColor = System.Drawing.Color.Magenta; - this.NewScriptToolbarItem.Name = "NewScriptToolbarItem"; - this.NewScriptToolbarItem.Size = new System.Drawing.Size(23, 22); - this.NewScriptToolbarItem.Text = "New Lua Script"; - this.NewScriptToolbarItem.Click += new System.EventHandler(this.NewScriptMenuItem_Click); - // - // OpenScriptToolbarItem - // - this.OpenScriptToolbarItem.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; - this.OpenScriptToolbarItem.Image = ((System.Drawing.Image)(resources.GetObject("OpenScriptToolbarItem.Image"))); - this.OpenScriptToolbarItem.ImageTransparentColor = System.Drawing.Color.Magenta; - this.OpenScriptToolbarItem.Name = "OpenScriptToolbarItem"; - this.OpenScriptToolbarItem.Size = new System.Drawing.Size(23, 22); - this.OpenScriptToolbarItem.Text = "Open Script"; - this.OpenScriptToolbarItem.Click += new System.EventHandler(this.OpenScriptMenuItem_Click); - // - // ToggleScriptToolbarItem - // - this.ToggleScriptToolbarItem.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; - this.ToggleScriptToolbarItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.Refresh1; - this.ToggleScriptToolbarItem.ImageTransparentColor = System.Drawing.Color.Magenta; - this.ToggleScriptToolbarItem.Name = "ToggleScriptToolbarItem"; - this.ToggleScriptToolbarItem.Size = new System.Drawing.Size(23, 22); - this.ToggleScriptToolbarItem.Text = "Toggle Script"; - this.ToggleScriptToolbarItem.Click += new System.EventHandler(this.ToggleScriptMenuItem_Click); - // - // PauseToolbarItem - // - this.PauseToolbarItem.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; - this.PauseToolbarItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.Pause; - this.PauseToolbarItem.ImageTransparentColor = System.Drawing.Color.Magenta; - this.PauseToolbarItem.Name = "PauseToolbarItem"; - this.PauseToolbarItem.Size = new System.Drawing.Size(23, 22); - this.PauseToolbarItem.Text = "Pause or Resume"; - this.PauseToolbarItem.Click += new System.EventHandler(this.PauseScriptMenuItem_Click); - // - // EditToolbarItem - // - this.EditToolbarItem.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; - this.EditToolbarItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.CutHS; - this.EditToolbarItem.ImageTransparentColor = System.Drawing.Color.Magenta; - this.EditToolbarItem.Name = "EditToolbarItem"; - this.EditToolbarItem.Size = new System.Drawing.Size(23, 22); - this.EditToolbarItem.Text = "Edit Script"; - this.EditToolbarItem.Click += new System.EventHandler(this.EditToolbarItem_Click); - // - // RemoveScriptToolbarItem - // - this.RemoveScriptToolbarItem.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; - this.RemoveScriptToolbarItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.Delete; - this.RemoveScriptToolbarItem.ImageTransparentColor = System.Drawing.Color.Magenta; - this.RemoveScriptToolbarItem.Name = "RemoveScriptToolbarItem"; - this.RemoveScriptToolbarItem.Size = new System.Drawing.Size(23, 22); - this.RemoveScriptToolbarItem.Text = "Remove Script"; - this.RemoveScriptToolbarItem.Click += new System.EventHandler(this.RemoveScriptMenuItem_Click); - // - // InsertSeparatorToolbarItem - // - this.InsertSeparatorToolbarItem.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; - this.InsertSeparatorToolbarItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.InsertSeparator; - this.InsertSeparatorToolbarItem.ImageTransparentColor = System.Drawing.Color.Magenta; - this.InsertSeparatorToolbarItem.Name = "InsertSeparatorToolbarItem"; - this.InsertSeparatorToolbarItem.Size = new System.Drawing.Size(23, 22); - this.InsertSeparatorToolbarItem.Text = "Insert Separator"; - this.InsertSeparatorToolbarItem.Click += new System.EventHandler(this.InsertSeparatorMenuItem_Click); - // - // toolStripSeparator2 - // - this.toolStripSeparator2.Name = "toolStripSeparator2"; - this.toolStripSeparator2.Size = new System.Drawing.Size(6, 25); - // - // MoveUpToolbarItem - // - this.MoveUpToolbarItem.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; - this.MoveUpToolbarItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.MoveUp; - this.MoveUpToolbarItem.ImageTransparentColor = System.Drawing.Color.Magenta; - this.MoveUpToolbarItem.Name = "MoveUpToolbarItem"; - this.MoveUpToolbarItem.Size = new System.Drawing.Size(23, 22); - this.MoveUpToolbarItem.Text = "Move Up"; - this.MoveUpToolbarItem.Click += new System.EventHandler(this.MoveUpMenuItem_Click); - // - // toolStripButtonMoveDown - // - this.toolStripButtonMoveDown.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; - this.toolStripButtonMoveDown.Image = global::BizHawk.Client.EmuHawk.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.MoveDownMenuItem_Click); - // - // LuaListView - // - this.LuaListView.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) + 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"; + // + // NewScriptToolbarItem + // + this.NewScriptToolbarItem.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; + this.NewScriptToolbarItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.NewFile; + this.NewScriptToolbarItem.ImageTransparentColor = System.Drawing.Color.Magenta; + this.NewScriptToolbarItem.Name = "NewScriptToolbarItem"; + this.NewScriptToolbarItem.Size = new System.Drawing.Size(23, 22); + this.NewScriptToolbarItem.Text = "New Lua Script"; + this.NewScriptToolbarItem.Click += new System.EventHandler(this.NewScriptMenuItem_Click); + // + // OpenScriptToolbarItem + // + this.OpenScriptToolbarItem.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; + this.OpenScriptToolbarItem.Image = ((System.Drawing.Image)(resources.GetObject("OpenScriptToolbarItem.Image"))); + this.OpenScriptToolbarItem.ImageTransparentColor = System.Drawing.Color.Magenta; + this.OpenScriptToolbarItem.Name = "OpenScriptToolbarItem"; + this.OpenScriptToolbarItem.Size = new System.Drawing.Size(23, 22); + this.OpenScriptToolbarItem.Text = "Open Script"; + this.OpenScriptToolbarItem.Click += new System.EventHandler(this.OpenScriptMenuItem_Click); + // + // ToggleScriptToolbarItem + // + this.ToggleScriptToolbarItem.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; + this.ToggleScriptToolbarItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.Refresh1; + this.ToggleScriptToolbarItem.ImageTransparentColor = System.Drawing.Color.Magenta; + this.ToggleScriptToolbarItem.Name = "ToggleScriptToolbarItem"; + this.ToggleScriptToolbarItem.Size = new System.Drawing.Size(23, 22); + this.ToggleScriptToolbarItem.Text = "Toggle Script"; + this.ToggleScriptToolbarItem.Click += new System.EventHandler(this.ToggleScriptMenuItem_Click); + // + // PauseToolbarItem + // + this.PauseToolbarItem.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; + this.PauseToolbarItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.Pause; + this.PauseToolbarItem.ImageTransparentColor = System.Drawing.Color.Magenta; + this.PauseToolbarItem.Name = "PauseToolbarItem"; + this.PauseToolbarItem.Size = new System.Drawing.Size(23, 22); + this.PauseToolbarItem.Text = "Pause or Resume"; + this.PauseToolbarItem.Click += new System.EventHandler(this.PauseScriptMenuItem_Click); + // + // EditToolbarItem + // + this.EditToolbarItem.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; + this.EditToolbarItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.CutHS; + this.EditToolbarItem.ImageTransparentColor = System.Drawing.Color.Magenta; + this.EditToolbarItem.Name = "EditToolbarItem"; + this.EditToolbarItem.Size = new System.Drawing.Size(23, 22); + this.EditToolbarItem.Text = "Edit Script"; + this.EditToolbarItem.Click += new System.EventHandler(this.EditToolbarItem_Click); + // + // RemoveScriptToolbarItem + // + this.RemoveScriptToolbarItem.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; + this.RemoveScriptToolbarItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.Delete; + this.RemoveScriptToolbarItem.ImageTransparentColor = System.Drawing.Color.Magenta; + this.RemoveScriptToolbarItem.Name = "RemoveScriptToolbarItem"; + this.RemoveScriptToolbarItem.Size = new System.Drawing.Size(23, 22); + this.RemoveScriptToolbarItem.Text = "Remove Script"; + this.RemoveScriptToolbarItem.Click += new System.EventHandler(this.RemoveScriptMenuItem_Click); + // + // InsertSeparatorToolbarItem + // + this.InsertSeparatorToolbarItem.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; + this.InsertSeparatorToolbarItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.InsertSeparator; + this.InsertSeparatorToolbarItem.ImageTransparentColor = System.Drawing.Color.Magenta; + this.InsertSeparatorToolbarItem.Name = "InsertSeparatorToolbarItem"; + this.InsertSeparatorToolbarItem.Size = new System.Drawing.Size(23, 22); + this.InsertSeparatorToolbarItem.Text = "Insert Separator"; + this.InsertSeparatorToolbarItem.Click += new System.EventHandler(this.InsertSeparatorMenuItem_Click); + // + // toolStripSeparator2 + // + this.toolStripSeparator2.Name = "toolStripSeparator2"; + this.toolStripSeparator2.Size = new System.Drawing.Size(6, 25); + // + // MoveUpToolbarItem + // + this.MoveUpToolbarItem.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; + this.MoveUpToolbarItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.MoveUp; + this.MoveUpToolbarItem.ImageTransparentColor = System.Drawing.Color.Magenta; + this.MoveUpToolbarItem.Name = "MoveUpToolbarItem"; + this.MoveUpToolbarItem.Size = new System.Drawing.Size(23, 22); + this.MoveUpToolbarItem.Text = "Move Up"; + this.MoveUpToolbarItem.Click += new System.EventHandler(this.MoveUpMenuItem_Click); + // + // toolStripButtonMoveDown + // + this.toolStripButtonMoveDown.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; + this.toolStripButtonMoveDown.Image = global::BizHawk.Client.EmuHawk.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.MoveDownMenuItem_Click); + // + // LuaListView + // + this.LuaListView.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.LuaListView.BlazingFast = false; - this.LuaListView.CheckBoxes = true; - this.LuaListView.Columns.AddRange(new System.Windows.Forms.ColumnHeader[] { + this.LuaListView.BlazingFast = false; + this.LuaListView.CheckBoxes = true; + this.LuaListView.Columns.AddRange(new System.Windows.Forms.ColumnHeader[] { this.Script, this.PathName}); - this.LuaListView.ContextMenuStrip = this.ScriptListContextMenu; - 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, 304); - this.LuaListView.TabIndex = 0; - this.LuaListView.UseCompatibleStateImageBehavior = false; - this.LuaListView.View = System.Windows.Forms.View.Details; - this.LuaListView.ColumnClick += new System.Windows.Forms.ColumnClickEventHandler(this.LuaListView_ColumnClick); - this.LuaListView.ItemActivate += new System.EventHandler(this.LuaListView_ItemActivate); - 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; - // - // 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, 402); - this.Controls.Add(this.OutputMessages); - 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(400, 180); - this.Name = "LuaConsole"; - this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent; - 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.ScriptListContextMenu.ResumeLayout(false); - this.menuStrip1.ResumeLayout(false); - this.menuStrip1.PerformLayout(); - this.ConsoleContextMenu.ResumeLayout(false); - this.groupBox1.ResumeLayout(false); - this.toolStrip1.ResumeLayout(false); - this.toolStrip1.PerformLayout(); - this.ResumeLayout(false); - this.PerformLayout(); + this.LuaListView.ContextMenuStrip = this.ScriptListContextMenu; + 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, 304); + this.LuaListView.TabIndex = 0; + this.LuaListView.UseCompatibleStateImageBehavior = false; + this.LuaListView.View = System.Windows.Forms.View.Details; + this.LuaListView.ColumnClick += new System.Windows.Forms.ColumnClickEventHandler(this.LuaListView_ColumnClick); + this.LuaListView.ItemActivate += new System.EventHandler(this.LuaListView_ItemActivate); + 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; + // + // 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, 402); + this.Controls.Add(this.OutputMessages); + 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(400, 180); + this.Name = "LuaConsole"; + this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent; + 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.ScriptListContextMenu.ResumeLayout(false); + this.menuStrip1.ResumeLayout(false); + this.menuStrip1.PerformLayout(); + this.ConsoleContextMenu.ResumeLayout(false); + this.groupBox1.ResumeLayout(false); + this.toolStrip1.ResumeLayout(false); + this.toolStrip1.PerformLayout(); + this.ResumeLayout(false); + this.PerformLayout(); } diff --git a/BizHawk.Client.EmuHawk/tools/Lua/LuaConsole.cs b/BizHawk.Client.EmuHawk/tools/Lua/LuaConsole.cs index 4298f44015..c678be834e 100644 --- a/BizHawk.Client.EmuHawk/tools/Lua/LuaConsole.cs +++ b/BizHawk.Client.EmuHawk/tools/Lua/LuaConsole.cs @@ -513,9 +513,9 @@ namespace BizHawk.Client.EmuHawk return true; } - private static void OpenLuaWriter(string path) + private void OpenLuaWriter(string path) { - var writer = new LuaWriter { CurrentFile = path }; + var writer = new LuaWriter(this) { CurrentFile = path }; writer.Show(); } diff --git a/BizHawk.Client.EmuHawk/tools/Lua/LuaWriter.Designer.cs b/BizHawk.Client.EmuHawk/tools/Lua/LuaWriter.Designer.cs index e4fe3282db..17f7d19fc3 100644 --- a/BizHawk.Client.EmuHawk/tools/Lua/LuaWriter.Designer.cs +++ b/BizHawk.Client.EmuHawk/tools/Lua/LuaWriter.Designer.cs @@ -28,108 +28,110 @@ /// 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 MenuStripEx(); - 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.backgroundColorToolStripMenuItem = 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.Client.EmuHawk.LuaWriterBox(); - this.Suggestion = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader())); - 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.ClickThrough = true; - 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 MenuStripEx(); + 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.backgroundColorToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.lineNumbersToolStripMenuItem = 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.Suggestion = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader())); + this.PositionLabel = new System.Windows.Forms.Label(); + this.ZoomLabel = new System.Windows.Forms.Label(); + this.LuaText = new BizHawk.Client.EmuHawk.LuaWriterBox(); + this.LuaLineTextBox = new System.Windows.Forms.RichTextBox(); + 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.ClickThrough = true; + 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(846, 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.Client.EmuHawk.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.Client.EmuHawk.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, @@ -142,254 +144,280 @@ this.searchToolStripMenuItem, this.replaceToolStripMenuItem, this.goToToolStripMenuItem}); - this.editToolStripMenuItem.Name = "editToolStripMenuItem"; - this.editToolStripMenuItem.Size = new System.Drawing.Size(39, 20); - this.editToolStripMenuItem.Text = "Edit"; - this.editToolStripMenuItem.DropDownOpened += new System.EventHandler(this.editToolStripMenuItem_DropDownOpened); - // - // undoToolStripMenuItem - // - this.undoToolStripMenuItem.Image = global::BizHawk.Client.EmuHawk.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.Client.EmuHawk.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.Client.EmuHawk.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.Client.EmuHawk.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.Client.EmuHawk.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.Client.EmuHawk.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"; + this.editToolStripMenuItem.DropDownOpened += new System.EventHandler(this.editToolStripMenuItem_DropDownOpened); + // + // undoToolStripMenuItem + // + this.undoToolStripMenuItem.Image = global::BizHawk.Client.EmuHawk.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.Client.EmuHawk.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.Client.EmuHawk.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.Client.EmuHawk.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.Client.EmuHawk.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.Client.EmuHawk.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.backgroundColorToolStripMenuItem, + this.lineNumbersToolStripMenuItem, 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); - // - // backgroundColorToolStripMenuItem - // - this.backgroundColorToolStripMenuItem.Name = "backgroundColorToolStripMenuItem"; - this.backgroundColorToolStripMenuItem.Size = new System.Drawing.Size(196, 22); - this.backgroundColorToolStripMenuItem.Text = "Background Color"; - this.backgroundColorToolStripMenuItem.Click += new System.EventHandler(this.backgroundColorToolStripMenuItem_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.Activation = System.Windows.Forms.ItemActivation.OneClick; - this.AutoCompleteView.AllowColumnReorder = true; - this.AutoCompleteView.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); - this.AutoCompleteView.Columns.AddRange(new System.Windows.Forms.ColumnHeader[] { + 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); + // + // backgroundColorToolStripMenuItem + // + this.backgroundColorToolStripMenuItem.Name = "backgroundColorToolStripMenuItem"; + this.backgroundColorToolStripMenuItem.Size = new System.Drawing.Size(196, 22); + this.backgroundColorToolStripMenuItem.Text = "Background Color"; + this.backgroundColorToolStripMenuItem.Click += new System.EventHandler(this.backgroundColorToolStripMenuItem_Click); + // + // lineNumbersToolStripMenuItem + // + this.lineNumbersToolStripMenuItem.CheckOnClick = true; + this.lineNumbersToolStripMenuItem.Name = "lineNumbersToolStripMenuItem"; + this.lineNumbersToolStripMenuItem.Size = new System.Drawing.Size(196, 22); + this.lineNumbersToolStripMenuItem.Text = "Show Linenumbers"; + this.lineNumbersToolStripMenuItem.Click += new System.EventHandler(this.toolStripMenuItem1_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, 484); + this.MessageLabel.Name = "MessageLabel"; + this.MessageLabel.Size = new System.Drawing.Size(91, 13); + this.MessageLabel.TabIndex = 2; + this.MessageLabel.Text = " "; + // + // AutoCompleteView + // + this.AutoCompleteView.Activation = System.Windows.Forms.ItemActivation.OneClick; + this.AutoCompleteView.AllowColumnReorder = true; + this.AutoCompleteView.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); + this.AutoCompleteView.Columns.AddRange(new System.Windows.Forms.ColumnHeader[] { this.Suggestion}); - this.AutoCompleteView.FullRowSelect = true; - this.AutoCompleteView.HeaderStyle = System.Windows.Forms.ColumnHeaderStyle.None; - this.AutoCompleteView.HideSelection = false; - this.AutoCompleteView.HoverSelection = true; - this.AutoCompleteView.Location = new System.Drawing.Point(324, 322); - this.AutoCompleteView.MultiSelect = false; - 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.Details; - this.AutoCompleteView.Visible = false; - this.AutoCompleteView.KeyDown += new System.Windows.Forms.KeyEventHandler(this.AutoComplete_KeyDown); - 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) + this.AutoCompleteView.FullRowSelect = true; + this.AutoCompleteView.HeaderStyle = System.Windows.Forms.ColumnHeaderStyle.None; + this.AutoCompleteView.HideSelection = false; + this.AutoCompleteView.HoverSelection = true; + this.AutoCompleteView.Location = new System.Drawing.Point(696, 382); + this.AutoCompleteView.MultiSelect = false; + 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.Details; + this.AutoCompleteView.Visible = false; + this.AutoCompleteView.KeyDown += new System.Windows.Forms.KeyEventHandler(this.AutoComplete_KeyDown); + this.AutoCompleteView.MouseDoubleClick += new System.Windows.Forms.MouseEventHandler(this.AutoCompleteView_MouseDoubleClick); + // + // Suggestion + // + this.Suggestion.Width = 114; + // + // 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); - // - // Suggestion - // - this.Suggestion.Width = 114; - // - // 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.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent; - 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(63, 50); + this.LuaText.Name = "LuaText"; + this.LuaText.ScrollBars = System.Windows.Forms.RichTextBoxScrollBars.Vertical; + this.LuaText.Size = new System.Drawing.Size(768, 429); + this.LuaText.TabIndex = 0; + this.LuaText.Text = ""; + this.LuaText.WordWrap = false; + this.LuaText.SelectionChanged += new System.EventHandler(this.LuaText_SelectionChanged); + this.LuaText.VScroll += new System.EventHandler(this.LuaText_VScroll); + 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); + // + // LuaLineTextBox + // + this.LuaLineTextBox.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) + | System.Windows.Forms.AnchorStyles.Left))); + this.LuaLineTextBox.BackColor = System.Drawing.SystemColors.ScrollBar; + this.LuaLineTextBox.Location = new System.Drawing.Point(0, 50); + this.LuaLineTextBox.Name = "LuaLineTextBox"; + this.LuaLineTextBox.ReadOnly = true; + this.LuaLineTextBox.ScrollBars = System.Windows.Forms.RichTextBoxScrollBars.None; + this.LuaLineTextBox.Size = new System.Drawing.Size(60, 429); + this.LuaLineTextBox.TabIndex = 6; + this.LuaLineTextBox.Text = ""; + this.LuaLineTextBox.Visible = false; + // + // 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(846, 501); + this.Controls.Add(this.LuaLineTextBox); + 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.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent; + 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(); } @@ -428,5 +456,7 @@ private System.Windows.Forms.ToolStripSeparator toolStripSeparator5; private System.Windows.Forms.ToolStripMenuItem backgroundColorToolStripMenuItem; private System.Windows.Forms.ColumnHeader Suggestion; + private System.Windows.Forms.RichTextBox LuaLineTextBox; + private System.Windows.Forms.ToolStripMenuItem lineNumbersToolStripMenuItem; } } \ No newline at end of file diff --git a/BizHawk.Client.EmuHawk/tools/Lua/LuaWriter.cs b/BizHawk.Client.EmuHawk/tools/Lua/LuaWriter.cs index fbe713e22d..5616315201 100644 --- a/BizHawk.Client.EmuHawk/tools/Lua/LuaWriter.cs +++ b/BizHawk.Client.EmuHawk/tools/Lua/LuaWriter.cs @@ -15,13 +15,15 @@ namespace BizHawk.Client.EmuHawk public partial class LuaWriter : Form { //TODO: - //ability to save new script (currently causes an exception) - //New scripts should be added to lua console automatically + //Loads of exceptions when closing the writer, primarily in System.Windows.Forms.dll and mscorlib.dll + + //ability to save new script (currently causes an exception) - done + //New scripts should be added to lua console automatically - done //make functions is string part of string or comment since the actual way of validating it isn't correct - //Save fontstyle to config - //Line numbers + //Save fontstyle to config - done + //Line numbersjn //Option to toggle line numbers - //Auto-complete drop down on functions in libraries + //Auto-complete drop down on functions in libraries - done //intellisense on library functions //Option to turn off basic lua script //Tool strip @@ -38,13 +40,24 @@ namespace BizHawk.Client.EmuHawk private bool redo; private bool hasChanged; private bool ProcessingText; + + private bool isFirst; + private bool DisableEvent; + private int lastLineofText; + private int lineIndex; + private int previousFirstVisibleChar; + private readonly char[] Symbols = { '+', '-', '*', '/', '%', '^', '#', '=', '<', '>', '(', ')', '{', '}', '[', ']', ';', ':', ',', '.' }; private List pos = new List(); + private LuaConsole _owner; - public LuaWriter() + public LuaWriter(LuaConsole owner) { InitializeComponent(); - LuaText.MouseWheel += LuaText_MouseWheel; + isFirst = true; + _owner = owner; + LuaText.MouseWheel += LuaText_MouseWheel; + lineNumbersToolStripMenuItem.Checked = Global.Config.LuaShowLineNumbers; } void LuaText_MouseWheel(object sender, MouseEventArgs e) @@ -54,15 +67,26 @@ namespace BizHawk.Client.EmuHawk Double Zoom; if ((LuaText.ZoomFactor == 0.1F && e.Delta < 0) || (LuaText.ZoomFactor == 5.0F && e.Delta > 0)) { - Zoom = (LuaText.ZoomFactor*100); + Zoom = (LuaText.ZoomFactor * 100); } else { - Zoom = (LuaText.ZoomFactor*100) + e.Delta/12; + Zoom = (LuaText.ZoomFactor * 100) + e.Delta / 12; } ZoomLabel.Text = string.Format("Zoom: {0:0}%", Zoom); } + else + { + + //UpdateLineTextBox(); + } + + } + + private void LuaText_VScroll(object sender, EventArgs e) + { + //UpdateLineTextBox(); } private void timer_Tick(object sender, EventArgs e) @@ -71,7 +95,6 @@ namespace BizHawk.Client.EmuHawk { return; } - // ProcessText(); // Commenting out until it's fixed to not scroll everything all the time hasChanged = false; } @@ -102,6 +125,8 @@ namespace BizHawk.Client.EmuHawk ProcessingText = false; LuaText.InhibitPaint = false; LuaText.Refresh(); + isFirst = false; + ShowLuaLineNumbersTextBox(); } private void AddNumbers() @@ -452,11 +477,13 @@ namespace BizHawk.Client.EmuHawk private void LoadFont() { LuaText.Font = new Font(Global.Config.LuaWriterFont, Global.Config.LuaWriterFontSize); + LuaLineTextBox.Font = new Font(Global.Config.LuaWriterFont, Global.Config.LuaWriterFontSize); } private void LuaWriter_Load(object sender, EventArgs e) { //LuaTextFont; + ProcessingText = true; LuaText.SelectionTabs = new[] { 20, 40, 60, 80, 100, 120, 140, 160, 180, 200, 220, 240, 260, 280, 300, 320, 340, 360, 380, 400, 420, 480, 500, 520, 540, 560, 580, 600 }; //adelikat: What a goofy way to have to do this LoadFont(); @@ -612,6 +639,12 @@ namespace BizHawk.Client.EmuHawk } private void LuaText_TextChanged(object sender, EventArgs e) + { + + HasTextChanged(); + } + + private void HasTextChanged () { if (!ProcessingText) { @@ -640,9 +673,9 @@ namespace BizHawk.Client.EmuHawk DialogResult result = f.ShowDialog(); if (result == DialogResult.OK) { - LuaText.Font = f.Font; Global.Config.LuaWriterFont = f.Font.Name; Global.Config.LuaWriterFontSize = f.Font.Size; + LoadFont(); ProcessText(); //Re-update coloring and such when font changes } } @@ -812,35 +845,6 @@ namespace BizHawk.Client.EmuHawk } -/* - private void SelectNextItem(bool Next) - { - - if (AutoCompleteView.SelectedItems.Count > 0) - { - if (Next) - { - if (AutoCompleteView.FocusedItem == AutoCompleteView.Items[AutoCompleteView.Items.Count - 1]) - return; - - AutoCompleteView.FocusedItem = AutoCompleteView.Items[AutoCompleteView.Items.IndexOf(AutoCompleteView.SelectedItems[0]) + 1]; - } - else - { - if (AutoCompleteView.FocusedItem == AutoCompleteView.Items[0]) - return; - - AutoCompleteView.FocusedItem = AutoCompleteView.Items[AutoCompleteView.Items.IndexOf(AutoCompleteView.SelectedItems[0]) - 1]; - } - } - else - { - if (Next) - AutoCompleteView.FocusedItem = AutoCompleteView.Items[0]; - - } - } -*/ private string CurrentWord() { int last = LuaText.SelectionStart; @@ -916,7 +920,11 @@ namespace BizHawk.Client.EmuHawk private void LuaText_SelectionChanged(object sender, EventArgs e) { - UpdateLineNumber(); + if (!DisableEvent && Global.Config.LuaShowLineNumbers && !isFirst) + { + UpdateLineNumber(); + ShowLuaLineNumbersTextBox(); + } } private void UpdateLineNumber() @@ -931,6 +939,50 @@ namespace BizHawk.Client.EmuHawk } } + private void UpdateLineTextBox() + { + DisableEvent = true; + int currentLocation = LuaText.SelectionStart; + int firstVisibleChar = LuaText.GetCharIndexFromPosition(new Point(0,0)); + LuaText.Select(firstVisibleChar, 0); + + + if (lastLineofText != LuaText.GetLineFromCharIndex(LuaText.TextLength) || previousFirstVisibleChar != LuaText.GetCharIndexFromPosition(new Point(0, 0))) + { + previousFirstVisibleChar = firstVisibleChar; + lastLineofText = LuaText.GetLineFromCharIndex(LuaText.TextLength); + lineIndex = LuaText.GetLineFromCharIndex(firstVisibleChar); + if (LuaText.GetLineFromCharIndex(currentLocation) == lastLineofText) + { + lineIndex++; + } + + LuaLineTextBox.Text = String.Empty; + for (int i = lineIndex + 1; i <= LuaText.GetLineFromCharIndex(LuaText.TextLength) + 1; i++) + { + if (i < 10) + { + LuaLineTextBox.Text += "00" + i; + } + else if (i >= 10 && i < 100) + { + LuaLineTextBox.Text += "0" + i; + } + else + { + LuaLineTextBox.Text += i; + } + if (i != LuaText.GetLineFromCharIndex(LuaText.TextLength) + 1) + { + LuaLineTextBox.Text += "\n"; + } + } + + } + LuaText.Select(currentLocation, 0); + DisableEvent = false; + } + private void LuaText_PreviewKeyDown(object sender, PreviewKeyDownEventArgs e) { @@ -938,12 +990,21 @@ namespace BizHawk.Client.EmuHawk private void exitToolStripMenuItem_Click(object sender, EventArgs e) { - //TODO: check for changes and ask save Close(); } private void LuaWriter_FormClosing(object sender, FormClosingEventArgs e) { + if (changes) + { + var result = MessageBox.Show("Save changes to this Document?", "Lua Writer", MessageBoxButtons.YesNoCancel, MessageBoxIcon.Question, MessageBoxDefaultButton.Button3); + if (result == DialogResult.Yes) + { + SaveScript(); + _owner.LoadLuaFile(CurrentFile); + } + } + Global.Config.LuaWriterZoom = LuaText.ZoomFactor; Global.Config.LuaWriterStartEmpty = startWithEmptyScriptToolStripMenuItem.Checked; Global.Config.LuaWriterBackColor = LuaText.BackColor.ToArgb(); @@ -1075,5 +1136,21 @@ namespace BizHawk.Client.EmuHawk redoToolStripMenuItem.Enabled = false; } } + + private void toolStripMenuItem1_Click(object sender, EventArgs e) + { + Global.Config.LuaShowLineNumbers = !Global.Config.LuaShowLineNumbers; + lineNumbersToolStripMenuItem.Checked = Global.Config.LuaShowLineNumbers; + ShowLuaLineNumbersTextBox(); + } + + private void ShowLuaLineNumbersTextBox() + { + LuaLineTextBox.Visible = Global.Config.LuaShowLineNumbers ; + if (LuaLineTextBox.Visible) + { + UpdateLineTextBox(); + } + } } } \ No newline at end of file