diff --git a/BizHawk.Client.EmuHawk/BizHawk.Client.EmuHawk.csproj b/BizHawk.Client.EmuHawk/BizHawk.Client.EmuHawk.csproj index ecf7ca4de9..62ae8d0077 100644 --- a/BizHawk.Client.EmuHawk/BizHawk.Client.EmuHawk.csproj +++ b/BizHawk.Client.EmuHawk/BizHawk.Client.EmuHawk.csproj @@ -1416,6 +1416,7 @@ + diff --git a/BizHawk.Client.EmuHawk/Properties/Resources.Designer.cs b/BizHawk.Client.EmuHawk/Properties/Resources.Designer.cs index 8fd35ebfc5..b65fbce312 100644 --- a/BizHawk.Client.EmuHawk/Properties/Resources.Designer.cs +++ b/BizHawk.Client.EmuHawk/Properties/Resources.Designer.cs @@ -1,7 +1,7 @@ //------------------------------------------------------------------------------ // // This code was generated by a tool. -// Runtime Version:4.0.30319.18052 +// Runtime Version:4.0.30319.18408 // // Changes to this file may cause incorrect behavior and will be lost if // the code is regenerated. @@ -270,6 +270,16 @@ namespace BizHawk.Client.EmuHawk.Properties { } } + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + internal static System.Drawing.Bitmap checkbox { + get { + object obj = ResourceManager.GetObject("checkbox", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + /// /// Looks up a localized resource of type System.Drawing.Bitmap. /// diff --git a/BizHawk.Client.EmuHawk/Properties/Resources.resx b/BizHawk.Client.EmuHawk/Properties/Resources.resx index cfb07c5279..c9616c1fc6 100644 --- a/BizHawk.Client.EmuHawk/Properties/Resources.resx +++ b/BizHawk.Client.EmuHawk/Properties/Resources.resx @@ -894,4 +894,7 @@ ..\images\tvIcon.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\images\checkbox.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + \ No newline at end of file diff --git a/BizHawk.Client.EmuHawk/images/checkbox.png b/BizHawk.Client.EmuHawk/images/checkbox.png new file mode 100644 index 0000000000..8dac55a029 Binary files /dev/null and b/BizHawk.Client.EmuHawk/images/checkbox.png differ diff --git a/BizHawk.Client.EmuHawk/tools/Lua/LuaConsole.Designer.cs b/BizHawk.Client.EmuHawk/tools/Lua/LuaConsole.Designer.cs index 236bd367a1..756e3ed0fc 100644 --- a/BizHawk.Client.EmuHawk/tools/Lua/LuaConsole.Designer.cs +++ b/BizHawk.Client.EmuHawk/tools/Lua/LuaConsole.Designer.cs @@ -54,6 +54,7 @@ this.ScriptSubMenu = new System.Windows.Forms.ToolStripMenuItem(); this.NewScriptMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.OpenScriptMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.RefreshScriptMenuItem = 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(); @@ -67,10 +68,13 @@ 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.toolStripSeparator4 = new System.Windows.Forms.ToolStripSeparator(); + this.SaveWindowPositionMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.AlwaysOnTopMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.FloatingWindowMenuItem = 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(); @@ -87,6 +91,7 @@ this.NewScriptToolbarItem = new System.Windows.Forms.ToolStripButton(); this.OpenScriptToolbarItem = new System.Windows.Forms.ToolStripButton(); this.ToggleScriptToolbarItem = new System.Windows.Forms.ToolStripButton(); + this.RefreshScriptToolbarItem = 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(); @@ -97,9 +102,6 @@ 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.AlwaysOnTopMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.FloatingWindowMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.toolStripSeparator4 = new System.Windows.Forms.ToolStripSeparator(); this.ScriptListContextMenu.SuspendLayout(); this.menuStrip1.SuspendLayout(); this.ConsoleContextMenu.SuspendLayout(); @@ -118,14 +120,14 @@ this.ScriptContextSeparator, this.StopAllScriptsContextItem}); this.ScriptListContextMenu.Name = "contextMenuStrip1"; - this.ScriptListContextMenu.Size = new System.Drawing.Size(165, 142); + this.ScriptListContextMenu.Size = new System.Drawing.Size(158, 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.Size = new System.Drawing.Size(157, 22); this.ToggleScriptContextItem.Text = "&Toggle"; this.ToggleScriptContextItem.Click += new System.EventHandler(this.ToggleScriptMenuItem_Click); // @@ -133,7 +135,7 @@ // 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.Size = new System.Drawing.Size(157, 22); this.PauseScriptContextItem.Text = "Pause or Resume"; this.PauseScriptContextItem.Click += new System.EventHandler(this.PauseScriptMenuItem_Click); // @@ -141,7 +143,7 @@ // 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.Size = new System.Drawing.Size(157, 22); this.EditScriptContextItem.Text = "&Edit"; this.EditScriptContextItem.Click += new System.EventHandler(this.EditScriptMenuItem_Click); // @@ -149,7 +151,7 @@ // 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.Size = new System.Drawing.Size(157, 22); this.RemoveScriptContextItem.Text = "&Remove"; this.RemoveScriptContextItem.Click += new System.EventHandler(this.RemoveScriptMenuItem_Click); // @@ -157,20 +159,20 @@ // 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.Size = new System.Drawing.Size(157, 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); + this.ScriptContextSeparator.Size = new System.Drawing.Size(154, 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.Size = new System.Drawing.Size(157, 22); this.StopAllScriptsContextItem.Text = "Stop All Scripts"; this.StopAllScriptsContextItem.Click += new System.EventHandler(this.StopAllScriptsMenuItem_Click); // @@ -201,7 +203,7 @@ this.toolStripSeparator1, this.ExitMenuItem}); this.FileSubMenu.Name = "FileSubMenu"; - this.FileSubMenu.Size = new System.Drawing.Size(37, 20); + this.FileSubMenu.Size = new System.Drawing.Size(35, 20); this.FileSubMenu.Text = "&File"; this.FileSubMenu.DropDownOpened += new System.EventHandler(this.FileSubMenu_DropDownOpened); // @@ -211,7 +213,7 @@ 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.Size = new System.Drawing.Size(232, 22); this.NewSessionMenuItem.Text = "&New Session"; this.NewSessionMenuItem.Click += new System.EventHandler(this.NewSessionMenuItem_Click); // @@ -221,7 +223,7 @@ 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.Size = new System.Drawing.Size(232, 22); this.OpenSessionMenuItem.Text = "&Open Session..."; this.OpenSessionMenuItem.Click += new System.EventHandler(this.OpenSessionMenuItem_Click); // @@ -230,7 +232,7 @@ 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.Size = new System.Drawing.Size(232, 22); this.SaveSessionMenuItem.Text = "&Save Session"; this.SaveSessionMenuItem.Click += new System.EventHandler(this.SaveSessionMenuItem_Click); // @@ -239,21 +241,21 @@ 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.Size = new System.Drawing.Size(232, 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); + this.toolStripSeparator9.Size = new System.Drawing.Size(229, 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.Size = new System.Drawing.Size(232, 22); this.RecentSessionsSubMenu.Text = "Recent Sessions"; this.RecentSessionsSubMenu.DropDownOpened += new System.EventHandler(this.RecentSessionsSubMenu_DropDownOpened); // @@ -268,7 +270,7 @@ 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.Size = new System.Drawing.Size(232, 22); this.RecentScriptsSubMenu.Text = "Recent Scripts"; this.RecentScriptsSubMenu.DropDownOpened += new System.EventHandler(this.RecentScriptsSubMenu_DropDownOpened); // @@ -280,13 +282,13 @@ // toolStripSeparator1 // this.toolStripSeparator1.Name = "toolStripSeparator1"; - this.toolStripSeparator1.Size = new System.Drawing.Size(234, 6); + this.toolStripSeparator1.Size = new System.Drawing.Size(229, 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.Size = new System.Drawing.Size(232, 22); this.ExitMenuItem.Text = "E&xit"; this.ExitMenuItem.Click += new System.EventHandler(this.ExitMenuItem_Click); // @@ -295,6 +297,7 @@ this.ScriptSubMenu.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { this.NewScriptMenuItem, this.OpenScriptMenuItem, + this.RefreshScriptMenuItem, this.ToggleScriptMenuItem, this.PauseScriptMenuItem, this.EditScriptMenuItem, @@ -308,7 +311,7 @@ this.StopAllScriptsMenuItem, this.RegisteredFunctionsMenuItem}); this.ScriptSubMenu.Name = "ScriptSubMenu"; - this.ScriptSubMenu.Size = new System.Drawing.Size(49, 20); + this.ScriptSubMenu.Size = new System.Drawing.Size(46, 20); this.ScriptSubMenu.Text = "&Script"; this.ScriptSubMenu.DropDownOpened += new System.EventHandler(this.ScriptSubMenu_DropDownOpened); // @@ -317,7 +320,7 @@ 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.Size = new System.Drawing.Size(212, 22); this.NewScriptMenuItem.Text = "New Script"; this.NewScriptMenuItem.Click += new System.EventHandler(this.NewScriptMenuItem_Click); // @@ -326,16 +329,25 @@ 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.Size = new System.Drawing.Size(212, 22); this.OpenScriptMenuItem.Text = "&Open Script..."; this.OpenScriptMenuItem.Click += new System.EventHandler(this.OpenScriptMenuItem_Click); // + // RefreshScriptMenuItem + // + this.RefreshScriptMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.Refresh1; + this.RefreshScriptMenuItem.Name = "RefreshScriptMenuItem"; + this.RefreshScriptMenuItem.ShortcutKeys = System.Windows.Forms.Keys.F5; + this.RefreshScriptMenuItem.Size = new System.Drawing.Size(212, 22); + this.RefreshScriptMenuItem.Text = "&Re&fresh"; + this.RefreshScriptMenuItem.Click += new System.EventHandler(this.RefreshScriptMenuItem_Click); + // // ToggleScriptMenuItem // - this.ToggleScriptMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.Refresh1; + this.ToggleScriptMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.checkbox; 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.Size = new System.Drawing.Size(212, 22); this.ToggleScriptMenuItem.Text = "&Toggle"; this.ToggleScriptMenuItem.Click += new System.EventHandler(this.ToggleScriptMenuItem_Click); // @@ -343,7 +355,7 @@ // 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.Size = new System.Drawing.Size(212, 22); this.PauseScriptMenuItem.Text = "Pause or Resume"; this.PauseScriptMenuItem.Click += new System.EventHandler(this.PauseScriptMenuItem_Click); // @@ -352,7 +364,7 @@ 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.Size = new System.Drawing.Size(212, 22); this.EditScriptMenuItem.Text = "&Edit Script"; this.EditScriptMenuItem.Click += new System.EventHandler(this.EditScriptMenuItem_Click); // @@ -360,8 +372,8 @@ // 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.ShortcutKeys = System.Windows.Forms.Keys.Delete; + this.RemoveScriptMenuItem.Size = new System.Drawing.Size(212, 22); this.RemoveScriptMenuItem.Text = "&Remove Script"; this.RemoveScriptMenuItem.Click += new System.EventHandler(this.RemoveScriptMenuItem_Click); // @@ -370,21 +382,21 @@ 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.Size = new System.Drawing.Size(212, 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); + this.toolStripSeparator7.Size = new System.Drawing.Size(209, 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.Size = new System.Drawing.Size(212, 22); this.MoveUpMenuItem.Text = "Move &Up"; this.MoveUpMenuItem.Click += new System.EventHandler(this.MoveUpMenuItem_Click); // @@ -393,7 +405,7 @@ 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.Size = new System.Drawing.Size(212, 22); this.MoveDownMenuItem.Text = "Move &Down"; this.MoveDownMenuItem.Click += new System.EventHandler(this.MoveDownMenuItem_Click); // @@ -401,20 +413,20 @@ // 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.Size = new System.Drawing.Size(212, 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); + this.toolStripSeparator6.Size = new System.Drawing.Size(209, 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.Size = new System.Drawing.Size(212, 22); this.StopAllScriptsMenuItem.Text = "Stop All Scripts"; this.StopAllScriptsMenuItem.Click += new System.EventHandler(this.StopAllScriptsMenuItem_Click); // @@ -422,7 +434,7 @@ // this.RegisteredFunctionsMenuItem.Name = "RegisteredFunctionsMenuItem"; this.RegisteredFunctionsMenuItem.ShortcutKeyDisplayString = "F12"; - this.RegisteredFunctionsMenuItem.Size = new System.Drawing.Size(218, 22); + this.RegisteredFunctionsMenuItem.Size = new System.Drawing.Size(212, 22); this.RegisteredFunctionsMenuItem.Text = "&Registered Functions..."; this.RegisteredFunctionsMenuItem.Click += new System.EventHandler(this.RegisteredFunctionsMenuItem_Click); // @@ -439,47 +451,66 @@ this.toolStripSeparator5, this.RestoreDefaultSettingsMenuItem}); this.OptionsSubMenu.Name = "OptionsSubMenu"; - this.OptionsSubMenu.Size = new System.Drawing.Size(61, 20); + this.OptionsSubMenu.Size = new System.Drawing.Size(56, 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.Size = new System.Drawing.Size(192, 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.Size = new System.Drawing.Size(192, 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.Size = new System.Drawing.Size(192, 22); this.DisableScriptsOnLoadMenuItem.Text = "Disable Scripts on Load"; this.DisableScriptsOnLoadMenuItem.Click += new System.EventHandler(this.DisableScriptsOnLoadMenuItem_Click); // + // toolStripSeparator4 + // + this.toolStripSeparator4.Name = "toolStripSeparator4"; + this.toolStripSeparator4.Size = new System.Drawing.Size(189, 6); + // + // SaveWindowPositionMenuItem + // + this.SaveWindowPositionMenuItem.Name = "SaveWindowPositionMenuItem"; + this.SaveWindowPositionMenuItem.Size = new System.Drawing.Size(192, 22); + this.SaveWindowPositionMenuItem.Text = "Save Window Position"; + this.SaveWindowPositionMenuItem.Click += new System.EventHandler(this.SaveWindowPositionMenuItem_Click); + // + // AlwaysOnTopMenuItem + // + this.AlwaysOnTopMenuItem.Name = "AlwaysOnTopMenuItem"; + this.AlwaysOnTopMenuItem.Size = new System.Drawing.Size(192, 22); + this.AlwaysOnTopMenuItem.Text = "Always On Top"; + this.AlwaysOnTopMenuItem.Click += new System.EventHandler(this.AlwaysOnTopMenuItem_Click); + // + // FloatingWindowMenuItem + // + this.FloatingWindowMenuItem.Name = "FloatingWindowMenuItem"; + this.FloatingWindowMenuItem.Size = new System.Drawing.Size(192, 22); + this.FloatingWindowMenuItem.Text = "Floating Window"; + this.FloatingWindowMenuItem.Click += new System.EventHandler(this.FloatingWindowMenuItem_Click); + // // toolStripSeparator5 // this.toolStripSeparator5.Name = "toolStripSeparator5"; - this.toolStripSeparator5.Size = new System.Drawing.Size(196, 6); + this.toolStripSeparator5.Size = new System.Drawing.Size(189, 6); // // RestoreDefaultSettingsMenuItem // this.RestoreDefaultSettingsMenuItem.Name = "RestoreDefaultSettingsMenuItem"; - this.RestoreDefaultSettingsMenuItem.Size = new System.Drawing.Size(199, 22); + this.RestoreDefaultSettingsMenuItem.Size = new System.Drawing.Size(192, 22); this.RestoreDefaultSettingsMenuItem.Text = "Restore Default Settings"; this.RestoreDefaultSettingsMenuItem.Click += new System.EventHandler(this.RestoreDefaultSettingsMenuItem_Click); // @@ -489,20 +520,20 @@ this.FunctionsListMenuItem, this.OnlineDocsMenuItem}); this.HelpSubMenu.Name = "HelpSubMenu"; - this.HelpSubMenu.Size = new System.Drawing.Size(44, 20); + this.HelpSubMenu.Size = new System.Drawing.Size(40, 20); this.HelpSubMenu.Text = "&Help"; // // FunctionsListMenuItem // this.FunctionsListMenuItem.Name = "FunctionsListMenuItem"; - this.FunctionsListMenuItem.Size = new System.Drawing.Size(202, 22); + this.FunctionsListMenuItem.Size = new System.Drawing.Size(189, 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.Size = new System.Drawing.Size(189, 22); this.OnlineDocsMenuItem.Text = "Documentation online..."; this.OnlineDocsMenuItem.Click += new System.EventHandler(this.OnlineDocsMenuItem_Click); // @@ -526,20 +557,20 @@ this.ClearConsoleContextItem, this.RegisteredFunctionsContextItem}); this.ConsoleContextMenu.Name = "contextMenuStrip2"; - this.ConsoleContextMenu.Size = new System.Drawing.Size(185, 48); + this.ConsoleContextMenu.Size = new System.Drawing.Size(176, 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.Size = new System.Drawing.Size(175, 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.Size = new System.Drawing.Size(175, 22); this.RegisteredFunctionsContextItem.Text = "&Registered Functions"; this.RegisteredFunctionsContextItem.Click += new System.EventHandler(this.RegisteredFunctionsMenuItem_Click); // @@ -581,6 +612,7 @@ this.NewScriptToolbarItem, this.OpenScriptToolbarItem, this.ToggleScriptToolbarItem, + this.RefreshScriptToolbarItem, this.PauseToolbarItem, this.EditToolbarItem, this.RemoveScriptToolbarItem, @@ -617,13 +649,23 @@ // ToggleScriptToolbarItem // this.ToggleScriptToolbarItem.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; - this.ToggleScriptToolbarItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.Refresh1; + this.ToggleScriptToolbarItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.checkbox; 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); // + // RefreshScriptToolbarItem + // + this.RefreshScriptToolbarItem.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; + this.RefreshScriptToolbarItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.Refresh1; + this.RefreshScriptToolbarItem.ImageTransparentColor = System.Drawing.Color.Magenta; + this.RefreshScriptToolbarItem.Name = "RefreshScriptToolbarItem"; + this.RefreshScriptToolbarItem.Size = new System.Drawing.Size(23, 22); + this.RefreshScriptToolbarItem.Text = "Reload Script"; + this.RefreshScriptToolbarItem.Click += new System.EventHandler(this.RefreshScriptMenuItem_Click); + // // PauseToolbarItem // this.PauseToolbarItem.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; @@ -725,25 +767,6 @@ this.PathName.Text = "Path"; this.PathName.Width = 195; // - // AlwaysOnTopMenuItem - // - this.AlwaysOnTopMenuItem.Name = "AlwaysOnTopMenuItem"; - this.AlwaysOnTopMenuItem.Size = new System.Drawing.Size(199, 22); - this.AlwaysOnTopMenuItem.Text = "Always On Top"; - this.AlwaysOnTopMenuItem.Click += new System.EventHandler(this.AlwaysOnTopMenuItem_Click); - // - // FloatingWindowMenuItem - // - this.FloatingWindowMenuItem.Name = "FloatingWindowMenuItem"; - this.FloatingWindowMenuItem.Size = new System.Drawing.Size(199, 22); - this.FloatingWindowMenuItem.Text = "Floating Window"; - this.FloatingWindowMenuItem.Click += new System.EventHandler(this.FloatingWindowMenuItem_Click); - // - // toolStripSeparator4 - // - this.toolStripSeparator4.Name = "toolStripSeparator4"; - this.toolStripSeparator4.Size = new System.Drawing.Size(196, 6); - // // LuaConsole // this.AllowDrop = true; @@ -849,5 +872,7 @@ private System.Windows.Forms.ToolStripSeparator toolStripSeparator4; private System.Windows.Forms.ToolStripMenuItem AlwaysOnTopMenuItem; private System.Windows.Forms.ToolStripMenuItem FloatingWindowMenuItem; + private System.Windows.Forms.ToolStripButton RefreshScriptToolbarItem; + private System.Windows.Forms.ToolStripMenuItem RefreshScriptMenuItem; } } \ No newline at end of file diff --git a/BizHawk.Client.EmuHawk/tools/Lua/LuaConsole.cs b/BizHawk.Client.EmuHawk/tools/Lua/LuaConsole.cs index 00c82cd64d..356c929a31 100644 --- a/BizHawk.Client.EmuHawk/tools/Lua/LuaConsole.cs +++ b/BizHawk.Client.EmuHawk/tools/Lua/LuaConsole.cs @@ -1100,8 +1100,16 @@ namespace BizHawk.Client.EmuHawk _sortReverse = !_sortReverse; } + private void RefreshScriptMenuItem_Click(object sender, EventArgs e) + { + ToggleScriptMenuItem_Click(sender, e); + ToggleScriptMenuItem_Click(sender, e); + } + #endregion #endregion + + } }