From d92eed5845fb9aec5ba7181e7552ff2a1b0b8920 Mon Sep 17 00:00:00 2001 From: Hathor86 Date: Sat, 21 Nov 2015 01:03:48 +0100 Subject: [PATCH] Menuing Change the menu item name Change interface name turn menu item into a submenu dynamically filled --- .gitignore | 2 +- BizHawk.Client.Common/config/PathEntry.cs | 2 +- .../BizHawk.Client.EmuHawk.csproj | 2 +- BizHawk.Client.EmuHawk/MainForm.Designer.cs | 1480 +++++++++-------- BizHawk.Client.EmuHawk/MainForm.Events.cs | 66 +- BizHawk.Client.EmuHawk/MainForm.cs | 2 +- BizHawk.Client.EmuHawk/MainForm.resx | 66 +- ...CustomGameTool.cs => IExternalToolForm.cs} | 2 +- BizHawk.Client.EmuHawk/tools/ToolManager.cs | 6 +- BizHawk.Common/TempFileManager.cs | 5 +- 10 files changed, 840 insertions(+), 793 deletions(-) rename BizHawk.Client.EmuHawk/tools/{ICustomGameTool.cs => IExternalToolForm.cs} (83%) diff --git a/.gitignore b/.gitignore index 379422bb23..e43e824099 100644 --- a/.gitignore +++ b/.gitignore @@ -246,7 +246,7 @@ /References/*.xml /output/ELFSharp.dll /output/dll/ELFSharp.dll -/output/GameTools/*.dll +/output/ExternalTools/*.dll *.opensdf *.user *.suo diff --git a/BizHawk.Client.Common/config/PathEntry.cs b/BizHawk.Client.Common/config/PathEntry.cs index 9db7d454c0..99d75391c1 100644 --- a/BizHawk.Client.Common/config/PathEntry.cs +++ b/BizHawk.Client.Common/config/PathEntry.cs @@ -157,7 +157,7 @@ namespace BizHawk.Client.Common new PathEntry { System = "Global_NULL", SystemDisplayName="Global", Type = "Macros", Path = Path.Combine(".", "Movies", "Macros"), Ordinal = 10 }, new PathEntry { System = "Global_NULL", SystemDisplayName="Global", Type = "TAStudio states", Path = Path.Combine(".", "Movies", "TAStudio states"), Ordinal = 11 }, new PathEntry { System = "Global_NULL", SystemDisplayName="Global", Type = "Multi-Disk Bundles", Path = Path.Combine(".", "Tools"), Ordinal = 12 }, - new PathEntry { System = "Global_NULL", SystemDisplayName="Global", Type = "GameTools", Path = Path.Combine(".", "GameTools"), Ordinal = 13 }, + new PathEntry { System = "Global_NULL", SystemDisplayName="Global", Type = "External Tools", Path = Path.Combine(".", "ExternalTools"), Ordinal = 13 }, new PathEntry { System = "INTV", SystemDisplayName="Intellivision", Type = "Base", Path = Path.Combine(".", "Intellivision"), Ordinal = 0 }, new PathEntry { System = "INTV", SystemDisplayName="Intellivision", Type = "ROM", Path = ".", Ordinal = 1 }, diff --git a/BizHawk.Client.EmuHawk/BizHawk.Client.EmuHawk.csproj b/BizHawk.Client.EmuHawk/BizHawk.Client.EmuHawk.csproj index 20d4bb7b89..950646af80 100644 --- a/BizHawk.Client.EmuHawk/BizHawk.Client.EmuHawk.csproj +++ b/BizHawk.Client.EmuHawk/BizHawk.Client.EmuHawk.csproj @@ -805,7 +805,7 @@ HexFind.cs - + diff --git a/BizHawk.Client.EmuHawk/MainForm.Designer.cs b/BizHawk.Client.EmuHawk/MainForm.Designer.cs index 04e9f9d47e..a18e41fc28 100644 --- a/BizHawk.Client.EmuHawk/MainForm.Designer.cs +++ b/BizHawk.Client.EmuHawk/MainForm.Designer.cs @@ -24,6 +24,7 @@ this.OpenRomMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.RecentRomSubMenu = new System.Windows.Forms.ToolStripMenuItem(); this.toolStripSeparator3 = new System.Windows.Forms.ToolStripSeparator(); + this.OpenAdvancedMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.CloseRomMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.toolStripMenuItem1 = new System.Windows.Forms.ToolStripSeparator(); this.SaveStateSubMenu = new System.Windows.Forms.ToolStripMenuItem(); @@ -207,9 +208,10 @@ this.toolStripSeparator11 = new System.Windows.Forms.ToolStripSeparator(); this.CheatsMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.LuaConsoleMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.customToolToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.externalToolToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.toolStripSeparator29 = new System.Windows.Forms.ToolStripSeparator(); this.MultiDiskBundlerFileMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.gameSharkConverterToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.batchRunnerToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.NESSubMenu = new System.Windows.Forms.ToolStripMenuItem(); this.coreToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); @@ -407,9 +409,7 @@ this.ShowMenuContextMenuSeparator = new System.Windows.Forms.ToolStripSeparator(); this.ShowMenuContextMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.timerMouseIdle = new System.Windows.Forms.Timer(this.components); - this.OpenAdvancedMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - - this.gameSharkConverterToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.dummyExternalTool = new System.Windows.Forms.ToolStripMenuItem(); this.MainformMenu.SuspendLayout(); this.MainStatusBar.SuspendLayout(); this.MainFormContextMenu.SuspendLayout(); @@ -419,33 +419,33 @@ // this.MainformMenu.ClickThrough = true; this.MainformMenu.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { - this.FileSubMenu, - this.EmulationSubMenu, - this.ViewSubMenu, - this.ConfigSubMenu, - this.ToolsSubMenu, - this.NESSubMenu, - this.PCESubMenu, - this.SMSSubMenu, - this.TI83SubMenu, - this.AtariSubMenu, - this.GBSubMenu, - this.GBASubMenu, - this.PSXSubMenu, - this.SNESSubMenu, - this.ColecoSubMenu, - this.N64SubMenu, - this.SaturnSubMenu, - this.DGBSubMenu, - this.GenesisSubMenu, - this.wonderSwanToolStripMenuItem, - this.AppleSubMenu, - this.C64SubMenu, - this.HelpSubMenu}); + this.FileSubMenu, + this.EmulationSubMenu, + this.ViewSubMenu, + this.ConfigSubMenu, + this.ToolsSubMenu, + this.NESSubMenu, + this.PCESubMenu, + this.SMSSubMenu, + this.TI83SubMenu, + this.AtariSubMenu, + this.GBSubMenu, + this.GBASubMenu, + this.PSXSubMenu, + this.SNESSubMenu, + this.ColecoSubMenu, + this.N64SubMenu, + this.SaturnSubMenu, + this.DGBSubMenu, + this.GenesisSubMenu, + this.wonderSwanToolStripMenuItem, + this.AppleSubMenu, + this.C64SubMenu, + this.HelpSubMenu}); this.MainformMenu.LayoutStyle = System.Windows.Forms.ToolStripLayoutStyle.Flow; this.MainformMenu.Location = new System.Drawing.Point(0, 0); this.MainformMenu.Name = "MainformMenu"; - this.MainformMenu.Size = new System.Drawing.Size(470, 57); + this.MainformMenu.Size = new System.Drawing.Size(470, 61); this.MainformMenu.TabIndex = 0; this.MainformMenu.Text = "menuStrip1"; this.MainformMenu.MenuActivate += new System.EventHandler(this.MainformMenu_MenuActivate); @@ -471,7 +471,7 @@ this.toolStripSeparator4, this.ExitMenuItem}); this.FileSubMenu.Name = "FileSubMenu"; - this.FileSubMenu.Size = new System.Drawing.Size(35, 17); + this.FileSubMenu.Size = new System.Drawing.Size(37, 19); this.FileSubMenu.Text = "&File"; this.FileSubMenu.DropDownOpened += new System.EventHandler(this.FileSubMenu_DropDownOpened); // @@ -479,346 +479,353 @@ // this.OpenRomMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.OpenFile; this.OpenRomMenuItem.Name = "OpenRomMenuItem"; - this.OpenRomMenuItem.Size = new System.Drawing.Size(152, 22); + this.OpenRomMenuItem.Size = new System.Drawing.Size(159, 22); this.OpenRomMenuItem.Text = "&Open ROM"; this.OpenRomMenuItem.Click += new System.EventHandler(this.OpenRomMenuItem_Click); // // RecentRomSubMenu // this.RecentRomSubMenu.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { - this.toolStripSeparator3}); + this.toolStripSeparator3}); this.RecentRomSubMenu.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.Recent; this.RecentRomSubMenu.Name = "RecentRomSubMenu"; - this.RecentRomSubMenu.Size = new System.Drawing.Size(152, 22); + this.RecentRomSubMenu.Size = new System.Drawing.Size(159, 22); this.RecentRomSubMenu.Text = "&Recent ROM"; this.RecentRomSubMenu.DropDownOpened += new System.EventHandler(this.RecentRomMenuItem_DropDownOpened); // // toolStripSeparator3 // this.toolStripSeparator3.Name = "toolStripSeparator3"; - this.toolStripSeparator3.Size = new System.Drawing.Size(149, 6); + this.toolStripSeparator3.Size = new System.Drawing.Size(57, 6); + // + // OpenAdvancedMenuItem + // + this.OpenAdvancedMenuItem.Name = "OpenAdvancedMenuItem"; + this.OpenAdvancedMenuItem.Size = new System.Drawing.Size(159, 22); + this.OpenAdvancedMenuItem.Text = "Open Ad&vanced"; + this.OpenAdvancedMenuItem.Click += new System.EventHandler(this.OpenAdvancedMenuItem_Click); // // CloseRomMenuItem // this.CloseRomMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.Close; this.CloseRomMenuItem.Name = "CloseRomMenuItem"; - this.CloseRomMenuItem.Size = new System.Drawing.Size(152, 22); + this.CloseRomMenuItem.Size = new System.Drawing.Size(159, 22); this.CloseRomMenuItem.Text = "&Close ROM"; this.CloseRomMenuItem.Click += new System.EventHandler(this.CloseRomMenuItem_Click); // // toolStripMenuItem1 // this.toolStripMenuItem1.Name = "toolStripMenuItem1"; - this.toolStripMenuItem1.Size = new System.Drawing.Size(149, 6); + this.toolStripMenuItem1.Size = new System.Drawing.Size(156, 6); // // SaveStateSubMenu // this.SaveStateSubMenu.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { - this.SaveState1MenuItem, - this.SaveState2MenuItem, - this.SaveState3MenuItem, - this.SaveState4MenuItem, - this.SaveState5MenuItem, - this.SaveState6MenuItem, - this.SaveState7MenuItem, - this.SaveState8MenuItem, - this.SaveState9MenuItem, - this.SaveState0MenuItem, - this.toolStripSeparator6, - this.SaveNamedStateMenuItem}); + this.SaveState1MenuItem, + this.SaveState2MenuItem, + this.SaveState3MenuItem, + this.SaveState4MenuItem, + this.SaveState5MenuItem, + this.SaveState6MenuItem, + this.SaveState7MenuItem, + this.SaveState8MenuItem, + this.SaveState9MenuItem, + this.SaveState0MenuItem, + this.toolStripSeparator6, + this.SaveNamedStateMenuItem}); this.SaveStateSubMenu.Name = "SaveStateSubMenu"; - this.SaveStateSubMenu.Size = new System.Drawing.Size(152, 22); + this.SaveStateSubMenu.Size = new System.Drawing.Size(159, 22); this.SaveStateSubMenu.Text = "&Save State"; this.SaveStateSubMenu.DropDownOpened += new System.EventHandler(this.SaveStateSubMenu_DropDownOpened); // // SaveState1MenuItem // this.SaveState1MenuItem.Name = "SaveState1MenuItem"; - this.SaveState1MenuItem.Size = new System.Drawing.Size(175, 22); + this.SaveState1MenuItem.Size = new System.Drawing.Size(178, 22); this.SaveState1MenuItem.Text = "1"; this.SaveState1MenuItem.Click += new System.EventHandler(this.Savestate1MenuItem_Click); // // SaveState2MenuItem // this.SaveState2MenuItem.Name = "SaveState2MenuItem"; - this.SaveState2MenuItem.Size = new System.Drawing.Size(175, 22); + this.SaveState2MenuItem.Size = new System.Drawing.Size(178, 22); this.SaveState2MenuItem.Text = "2"; this.SaveState2MenuItem.Click += new System.EventHandler(this.Savestate2MenuItem_Click); // // SaveState3MenuItem // this.SaveState3MenuItem.Name = "SaveState3MenuItem"; - this.SaveState3MenuItem.Size = new System.Drawing.Size(175, 22); + this.SaveState3MenuItem.Size = new System.Drawing.Size(178, 22); this.SaveState3MenuItem.Text = "3"; this.SaveState3MenuItem.Click += new System.EventHandler(this.Savestate3MenuItem_Click); // // SaveState4MenuItem // this.SaveState4MenuItem.Name = "SaveState4MenuItem"; - this.SaveState4MenuItem.Size = new System.Drawing.Size(175, 22); + this.SaveState4MenuItem.Size = new System.Drawing.Size(178, 22); this.SaveState4MenuItem.Text = "4"; this.SaveState4MenuItem.Click += new System.EventHandler(this.Savestate4MenuItem_Click); // // SaveState5MenuItem // this.SaveState5MenuItem.Name = "SaveState5MenuItem"; - this.SaveState5MenuItem.Size = new System.Drawing.Size(175, 22); + this.SaveState5MenuItem.Size = new System.Drawing.Size(178, 22); this.SaveState5MenuItem.Text = "5"; this.SaveState5MenuItem.Click += new System.EventHandler(this.Savestate5MenuItem_Click); // // SaveState6MenuItem // this.SaveState6MenuItem.Name = "SaveState6MenuItem"; - this.SaveState6MenuItem.Size = new System.Drawing.Size(175, 22); + this.SaveState6MenuItem.Size = new System.Drawing.Size(178, 22); this.SaveState6MenuItem.Text = "6"; this.SaveState6MenuItem.Click += new System.EventHandler(this.Savestate6MenuItem_Click); // // SaveState7MenuItem // this.SaveState7MenuItem.Name = "SaveState7MenuItem"; - this.SaveState7MenuItem.Size = new System.Drawing.Size(175, 22); + this.SaveState7MenuItem.Size = new System.Drawing.Size(178, 22); this.SaveState7MenuItem.Text = "7"; this.SaveState7MenuItem.Click += new System.EventHandler(this.Savestate7MenuItem_Click); // // SaveState8MenuItem // this.SaveState8MenuItem.Name = "SaveState8MenuItem"; - this.SaveState8MenuItem.Size = new System.Drawing.Size(175, 22); + this.SaveState8MenuItem.Size = new System.Drawing.Size(178, 22); this.SaveState8MenuItem.Text = "8"; this.SaveState8MenuItem.Click += new System.EventHandler(this.Savestate8MenuItem_Click); // // SaveState9MenuItem // this.SaveState9MenuItem.Name = "SaveState9MenuItem"; - this.SaveState9MenuItem.Size = new System.Drawing.Size(175, 22); + this.SaveState9MenuItem.Size = new System.Drawing.Size(178, 22); this.SaveState9MenuItem.Text = "9"; this.SaveState9MenuItem.Click += new System.EventHandler(this.Savestate9MenuItem_Click); // // SaveState0MenuItem // this.SaveState0MenuItem.Name = "SaveState0MenuItem"; - this.SaveState0MenuItem.Size = new System.Drawing.Size(175, 22); + this.SaveState0MenuItem.Size = new System.Drawing.Size(178, 22); this.SaveState0MenuItem.Text = "0"; this.SaveState0MenuItem.Click += new System.EventHandler(this.Savestate0MenuItem_Click); // // toolStripSeparator6 // this.toolStripSeparator6.Name = "toolStripSeparator6"; - this.toolStripSeparator6.Size = new System.Drawing.Size(172, 6); + this.toolStripSeparator6.Size = new System.Drawing.Size(175, 6); // // SaveNamedStateMenuItem // this.SaveNamedStateMenuItem.Name = "SaveNamedStateMenuItem"; - this.SaveNamedStateMenuItem.Size = new System.Drawing.Size(175, 22); + this.SaveNamedStateMenuItem.Size = new System.Drawing.Size(178, 22); this.SaveNamedStateMenuItem.Text = "Save Named State..."; this.SaveNamedStateMenuItem.Click += new System.EventHandler(this.SaveNamedStateMenuItem_Click); // // LoadStateSubMenu // this.LoadStateSubMenu.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { - this.LoadState1MenuItem, - this.LoadState2MenuItem, - this.LoadState3MenuItem, - this.LoadState4MenuItem, - this.LoadState5MenuItem, - this.LoadState6MenuItem, - this.LoadState7MenuItem, - this.LoadState8MenuItem, - this.LoadState9MenuItem, - this.LoadState0MenuItem, - this.toolStripSeparator7, - this.LoadNamedStateMenuItem, - this.toolStripSeparator21, - this.AutoloadLastSlotMenuItem}); + this.LoadState1MenuItem, + this.LoadState2MenuItem, + this.LoadState3MenuItem, + this.LoadState4MenuItem, + this.LoadState5MenuItem, + this.LoadState6MenuItem, + this.LoadState7MenuItem, + this.LoadState8MenuItem, + this.LoadState9MenuItem, + this.LoadState0MenuItem, + this.toolStripSeparator7, + this.LoadNamedStateMenuItem, + this.toolStripSeparator21, + this.AutoloadLastSlotMenuItem}); this.LoadStateSubMenu.Name = "LoadStateSubMenu"; - this.LoadStateSubMenu.Size = new System.Drawing.Size(152, 22); + this.LoadStateSubMenu.Size = new System.Drawing.Size(159, 22); this.LoadStateSubMenu.Text = "&Load State"; this.LoadStateSubMenu.DropDownOpened += new System.EventHandler(this.LoadStateSubMenu_DropDownOpened); // // LoadState1MenuItem // this.LoadState1MenuItem.Name = "LoadState1MenuItem"; - this.LoadState1MenuItem.Size = new System.Drawing.Size(174, 22); + this.LoadState1MenuItem.Size = new System.Drawing.Size(180, 22); this.LoadState1MenuItem.Text = "1"; this.LoadState1MenuItem.Click += new System.EventHandler(this.Loadstate1MenuItem_Click); // // LoadState2MenuItem // this.LoadState2MenuItem.Name = "LoadState2MenuItem"; - this.LoadState2MenuItem.Size = new System.Drawing.Size(174, 22); + this.LoadState2MenuItem.Size = new System.Drawing.Size(180, 22); this.LoadState2MenuItem.Text = "2"; this.LoadState2MenuItem.Click += new System.EventHandler(this.Loadstate2MenuItem_Click); // // LoadState3MenuItem // this.LoadState3MenuItem.Name = "LoadState3MenuItem"; - this.LoadState3MenuItem.Size = new System.Drawing.Size(174, 22); + this.LoadState3MenuItem.Size = new System.Drawing.Size(180, 22); this.LoadState3MenuItem.Text = "3"; this.LoadState3MenuItem.Click += new System.EventHandler(this.Loadstate3MenuItem_Click); // // LoadState4MenuItem // this.LoadState4MenuItem.Name = "LoadState4MenuItem"; - this.LoadState4MenuItem.Size = new System.Drawing.Size(174, 22); + this.LoadState4MenuItem.Size = new System.Drawing.Size(180, 22); this.LoadState4MenuItem.Text = "4"; this.LoadState4MenuItem.Click += new System.EventHandler(this.Loadstate4MenuItem_Click); // // LoadState5MenuItem // this.LoadState5MenuItem.Name = "LoadState5MenuItem"; - this.LoadState5MenuItem.Size = new System.Drawing.Size(174, 22); + this.LoadState5MenuItem.Size = new System.Drawing.Size(180, 22); this.LoadState5MenuItem.Text = "5"; this.LoadState5MenuItem.Click += new System.EventHandler(this.Loadstate5MenuItem_Click); // // LoadState6MenuItem // this.LoadState6MenuItem.Name = "LoadState6MenuItem"; - this.LoadState6MenuItem.Size = new System.Drawing.Size(174, 22); + this.LoadState6MenuItem.Size = new System.Drawing.Size(180, 22); this.LoadState6MenuItem.Text = "6"; this.LoadState6MenuItem.Click += new System.EventHandler(this.Loadstate6MenuItem_Click); // // LoadState7MenuItem // this.LoadState7MenuItem.Name = "LoadState7MenuItem"; - this.LoadState7MenuItem.Size = new System.Drawing.Size(174, 22); + this.LoadState7MenuItem.Size = new System.Drawing.Size(180, 22); this.LoadState7MenuItem.Text = "7"; this.LoadState7MenuItem.Click += new System.EventHandler(this.Loadstate7MenuItem_Click); // // LoadState8MenuItem // this.LoadState8MenuItem.Name = "LoadState8MenuItem"; - this.LoadState8MenuItem.Size = new System.Drawing.Size(174, 22); + this.LoadState8MenuItem.Size = new System.Drawing.Size(180, 22); this.LoadState8MenuItem.Text = "8"; this.LoadState8MenuItem.Click += new System.EventHandler(this.Loadstate8MenuItem_Click); // // LoadState9MenuItem // this.LoadState9MenuItem.Name = "LoadState9MenuItem"; - this.LoadState9MenuItem.Size = new System.Drawing.Size(174, 22); + this.LoadState9MenuItem.Size = new System.Drawing.Size(180, 22); this.LoadState9MenuItem.Text = "9"; this.LoadState9MenuItem.Click += new System.EventHandler(this.Loadstate9MenuItem_Click); // // LoadState0MenuItem // this.LoadState0MenuItem.Name = "LoadState0MenuItem"; - this.LoadState0MenuItem.Size = new System.Drawing.Size(174, 22); + this.LoadState0MenuItem.Size = new System.Drawing.Size(180, 22); this.LoadState0MenuItem.Text = "0"; this.LoadState0MenuItem.Click += new System.EventHandler(this.Loadstate0MenuItem_Click); // // toolStripSeparator7 // this.toolStripSeparator7.Name = "toolStripSeparator7"; - this.toolStripSeparator7.Size = new System.Drawing.Size(171, 6); + this.toolStripSeparator7.Size = new System.Drawing.Size(177, 6); // // LoadNamedStateMenuItem // this.LoadNamedStateMenuItem.Name = "LoadNamedStateMenuItem"; - this.LoadNamedStateMenuItem.Size = new System.Drawing.Size(174, 22); + this.LoadNamedStateMenuItem.Size = new System.Drawing.Size(180, 22); this.LoadNamedStateMenuItem.Text = "Load Named State..."; this.LoadNamedStateMenuItem.Click += new System.EventHandler(this.LoadNamedStateMenuItem_Click); // // toolStripSeparator21 // this.toolStripSeparator21.Name = "toolStripSeparator21"; - this.toolStripSeparator21.Size = new System.Drawing.Size(171, 6); + this.toolStripSeparator21.Size = new System.Drawing.Size(177, 6); // // AutoloadLastSlotMenuItem // this.AutoloadLastSlotMenuItem.Name = "AutoloadLastSlotMenuItem"; - this.AutoloadLastSlotMenuItem.Size = new System.Drawing.Size(174, 22); + this.AutoloadLastSlotMenuItem.Size = new System.Drawing.Size(180, 22); this.AutoloadLastSlotMenuItem.Text = "Autoload last Slot"; this.AutoloadLastSlotMenuItem.Click += new System.EventHandler(this.AutoloadLastSlotMenuItem_Click); // // SaveSlotSubMenu // this.SaveSlotSubMenu.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { - this.SelectSlot0MenuItem, - this.SelectSlot1MenuItem, - this.SelectSlot2MenuItem, - this.SelectSlot3MenuItem, - this.SelectSlot4MenuItem, - this.SelectSlot5MenuItem, - this.SelectSlot6MenuItem, - this.SelectSlot7MenuItem, - this.SelectSlot8MenuItem, - this.SelectSlot9MenuItem, - this.PreviousSlotMenuItem, - this.NextSlotMenuItem, - this.toolStripSeparator5, - this.SaveToCurrentSlotMenuItem, - this.LoadCurrentSlotMenuItem}); + this.SelectSlot0MenuItem, + this.SelectSlot1MenuItem, + this.SelectSlot2MenuItem, + this.SelectSlot3MenuItem, + this.SelectSlot4MenuItem, + this.SelectSlot5MenuItem, + this.SelectSlot6MenuItem, + this.SelectSlot7MenuItem, + this.SelectSlot8MenuItem, + this.SelectSlot9MenuItem, + this.PreviousSlotMenuItem, + this.NextSlotMenuItem, + this.toolStripSeparator5, + this.SaveToCurrentSlotMenuItem, + this.LoadCurrentSlotMenuItem}); this.SaveSlotSubMenu.Name = "SaveSlotSubMenu"; - this.SaveSlotSubMenu.Size = new System.Drawing.Size(152, 22); + this.SaveSlotSubMenu.Size = new System.Drawing.Size(159, 22); this.SaveSlotSubMenu.Text = "Save S&lot"; this.SaveSlotSubMenu.DropDownOpened += new System.EventHandler(this.SaveSlotSubMenu_DropDownOpened); // // SelectSlot0MenuItem // this.SelectSlot0MenuItem.Name = "SelectSlot0MenuItem"; - this.SelectSlot0MenuItem.Size = new System.Drawing.Size(172, 22); + this.SelectSlot0MenuItem.Size = new System.Drawing.Size(178, 22); this.SelectSlot0MenuItem.Text = "Select Slot 0"; this.SelectSlot0MenuItem.Click += new System.EventHandler(this.SelectSlotMenuItems_Click); // // SelectSlot1MenuItem // this.SelectSlot1MenuItem.Name = "SelectSlot1MenuItem"; - this.SelectSlot1MenuItem.Size = new System.Drawing.Size(172, 22); + this.SelectSlot1MenuItem.Size = new System.Drawing.Size(178, 22); this.SelectSlot1MenuItem.Text = "Select Slot 1"; this.SelectSlot1MenuItem.Click += new System.EventHandler(this.SelectSlotMenuItems_Click); // // SelectSlot2MenuItem // this.SelectSlot2MenuItem.Name = "SelectSlot2MenuItem"; - this.SelectSlot2MenuItem.Size = new System.Drawing.Size(172, 22); + this.SelectSlot2MenuItem.Size = new System.Drawing.Size(178, 22); this.SelectSlot2MenuItem.Text = "Select Slot 2"; this.SelectSlot2MenuItem.Click += new System.EventHandler(this.SelectSlotMenuItems_Click); // // SelectSlot3MenuItem // this.SelectSlot3MenuItem.Name = "SelectSlot3MenuItem"; - this.SelectSlot3MenuItem.Size = new System.Drawing.Size(172, 22); + this.SelectSlot3MenuItem.Size = new System.Drawing.Size(178, 22); this.SelectSlot3MenuItem.Text = "Select Slot 3"; this.SelectSlot3MenuItem.Click += new System.EventHandler(this.SelectSlotMenuItems_Click); // // SelectSlot4MenuItem // this.SelectSlot4MenuItem.Name = "SelectSlot4MenuItem"; - this.SelectSlot4MenuItem.Size = new System.Drawing.Size(172, 22); + this.SelectSlot4MenuItem.Size = new System.Drawing.Size(178, 22); this.SelectSlot4MenuItem.Text = "Select Slot 4"; this.SelectSlot4MenuItem.Click += new System.EventHandler(this.SelectSlotMenuItems_Click); // // SelectSlot5MenuItem // this.SelectSlot5MenuItem.Name = "SelectSlot5MenuItem"; - this.SelectSlot5MenuItem.Size = new System.Drawing.Size(172, 22); + this.SelectSlot5MenuItem.Size = new System.Drawing.Size(178, 22); this.SelectSlot5MenuItem.Text = "Select Slot 5"; this.SelectSlot5MenuItem.Click += new System.EventHandler(this.SelectSlotMenuItems_Click); // // SelectSlot6MenuItem // this.SelectSlot6MenuItem.Name = "SelectSlot6MenuItem"; - this.SelectSlot6MenuItem.Size = new System.Drawing.Size(172, 22); + this.SelectSlot6MenuItem.Size = new System.Drawing.Size(178, 22); this.SelectSlot6MenuItem.Text = "Select Slot 6"; this.SelectSlot6MenuItem.Click += new System.EventHandler(this.SelectSlotMenuItems_Click); // // SelectSlot7MenuItem // this.SelectSlot7MenuItem.Name = "SelectSlot7MenuItem"; - this.SelectSlot7MenuItem.Size = new System.Drawing.Size(172, 22); + this.SelectSlot7MenuItem.Size = new System.Drawing.Size(178, 22); this.SelectSlot7MenuItem.Text = "Select Slot 7"; this.SelectSlot7MenuItem.Click += new System.EventHandler(this.SelectSlotMenuItems_Click); // // SelectSlot8MenuItem // this.SelectSlot8MenuItem.Name = "SelectSlot8MenuItem"; - this.SelectSlot8MenuItem.Size = new System.Drawing.Size(172, 22); + this.SelectSlot8MenuItem.Size = new System.Drawing.Size(178, 22); this.SelectSlot8MenuItem.Text = "Select Slot 8"; this.SelectSlot8MenuItem.Click += new System.EventHandler(this.SelectSlotMenuItems_Click); // // SelectSlot9MenuItem // this.SelectSlot9MenuItem.Name = "SelectSlot9MenuItem"; - this.SelectSlot9MenuItem.Size = new System.Drawing.Size(172, 22); + this.SelectSlot9MenuItem.Size = new System.Drawing.Size(178, 22); this.SelectSlot9MenuItem.Text = "Select Slot 9"; this.SelectSlot9MenuItem.Click += new System.EventHandler(this.SelectSlotMenuItems_Click); // @@ -826,7 +833,7 @@ // this.PreviousSlotMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.MoveLeft; this.PreviousSlotMenuItem.Name = "PreviousSlotMenuItem"; - this.PreviousSlotMenuItem.Size = new System.Drawing.Size(172, 22); + this.PreviousSlotMenuItem.Size = new System.Drawing.Size(178, 22); this.PreviousSlotMenuItem.Text = "Previous Slot"; this.PreviousSlotMenuItem.Click += new System.EventHandler(this.PreviousSlotMenuItem_Click); // @@ -834,70 +841,70 @@ // this.NextSlotMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.MoveRight; this.NextSlotMenuItem.Name = "NextSlotMenuItem"; - this.NextSlotMenuItem.Size = new System.Drawing.Size(172, 22); + this.NextSlotMenuItem.Size = new System.Drawing.Size(178, 22); this.NextSlotMenuItem.Text = "Next Slot"; this.NextSlotMenuItem.Click += new System.EventHandler(this.NextSlotMenuItem_Click); // // toolStripSeparator5 // this.toolStripSeparator5.Name = "toolStripSeparator5"; - this.toolStripSeparator5.Size = new System.Drawing.Size(169, 6); + this.toolStripSeparator5.Size = new System.Drawing.Size(175, 6); // // SaveToCurrentSlotMenuItem // this.SaveToCurrentSlotMenuItem.Name = "SaveToCurrentSlotMenuItem"; - this.SaveToCurrentSlotMenuItem.Size = new System.Drawing.Size(172, 22); + this.SaveToCurrentSlotMenuItem.Size = new System.Drawing.Size(178, 22); this.SaveToCurrentSlotMenuItem.Text = "Save to Current Slot"; this.SaveToCurrentSlotMenuItem.Click += new System.EventHandler(this.SaveToCurrentSlotMenuItem_Click); // // LoadCurrentSlotMenuItem // this.LoadCurrentSlotMenuItem.Name = "LoadCurrentSlotMenuItem"; - this.LoadCurrentSlotMenuItem.Size = new System.Drawing.Size(172, 22); + this.LoadCurrentSlotMenuItem.Size = new System.Drawing.Size(178, 22); this.LoadCurrentSlotMenuItem.Text = "Load Current Slot"; this.LoadCurrentSlotMenuItem.Click += new System.EventHandler(this.LoadCurrentSlotMenuItem_Click); // // SaveRAMSubMenu // this.SaveRAMSubMenu.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { - this.FlushSaveRAMMenuItem}); + this.FlushSaveRAMMenuItem}); this.SaveRAMSubMenu.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Bold); this.SaveRAMSubMenu.Name = "SaveRAMSubMenu"; - this.SaveRAMSubMenu.Size = new System.Drawing.Size(152, 22); + this.SaveRAMSubMenu.Size = new System.Drawing.Size(159, 22); this.SaveRAMSubMenu.Text = "Save &RAM"; // // FlushSaveRAMMenuItem // this.FlushSaveRAMMenuItem.Font = new System.Drawing.Font("Tahoma", 8.25F); this.FlushSaveRAMMenuItem.Name = "FlushSaveRAMMenuItem"; - this.FlushSaveRAMMenuItem.Size = new System.Drawing.Size(152, 22); + this.FlushSaveRAMMenuItem.Size = new System.Drawing.Size(150, 22); this.FlushSaveRAMMenuItem.Text = "&Flush Save Ram"; this.FlushSaveRAMMenuItem.Click += new System.EventHandler(this.FlushSaveRAMMenuItem_Click); // // toolStripMenuItem2 // this.toolStripMenuItem2.Name = "toolStripMenuItem2"; - this.toolStripMenuItem2.Size = new System.Drawing.Size(149, 6); + this.toolStripMenuItem2.Size = new System.Drawing.Size(156, 6); // // MovieSubMenu // this.MovieSubMenu.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { - this.ReadonlyMenuItem, - this.toolStripSeparator15, - this.RecentMovieSubMenu, - this.RecordMovieMenuItem, - this.PlayMovieMenuItem, - this.StopMovieMenuItem, - this.PlayFromBeginningMenuItem, - this.ImportMoviesMenuItem, - this.SaveMovieMenuItem, - this.StopMovieWithoutSavingMenuItem, - this.toolStripSeparator14, - this.AutomaticallyBackupMoviesMenuItem, - this.FullMovieLoadstatesMenuItem, - this.MovieEndSubMenu}); + this.ReadonlyMenuItem, + this.toolStripSeparator15, + this.RecentMovieSubMenu, + this.RecordMovieMenuItem, + this.PlayMovieMenuItem, + this.StopMovieMenuItem, + this.PlayFromBeginningMenuItem, + this.ImportMoviesMenuItem, + this.SaveMovieMenuItem, + this.StopMovieWithoutSavingMenuItem, + this.toolStripSeparator14, + this.AutomaticallyBackupMoviesMenuItem, + this.FullMovieLoadstatesMenuItem, + this.MovieEndSubMenu}); this.MovieSubMenu.Name = "MovieSubMenu"; - this.MovieSubMenu.Size = new System.Drawing.Size(152, 22); + this.MovieSubMenu.Size = new System.Drawing.Size(159, 22); this.MovieSubMenu.Text = "&Movie"; this.MovieSubMenu.DropDownOpened += new System.EventHandler(this.MovieSubMenu_DropDownOpened); // @@ -905,22 +912,22 @@ // this.ReadonlyMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.ReadOnly; this.ReadonlyMenuItem.Name = "ReadonlyMenuItem"; - this.ReadonlyMenuItem.Size = new System.Drawing.Size(211, 22); + this.ReadonlyMenuItem.Size = new System.Drawing.Size(231, 22); this.ReadonlyMenuItem.Text = "Read-only"; this.ReadonlyMenuItem.Click += new System.EventHandler(this.ReadonlyMenuItem_Click); // // toolStripSeparator15 // this.toolStripSeparator15.Name = "toolStripSeparator15"; - this.toolStripSeparator15.Size = new System.Drawing.Size(208, 6); + this.toolStripSeparator15.Size = new System.Drawing.Size(228, 6); // // RecentMovieSubMenu // this.RecentMovieSubMenu.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { - this.toolStripSeparator16}); + this.toolStripSeparator16}); this.RecentMovieSubMenu.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.Recent; this.RecentMovieSubMenu.Name = "RecentMovieSubMenu"; - this.RecentMovieSubMenu.Size = new System.Drawing.Size(211, 22); + this.RecentMovieSubMenu.Size = new System.Drawing.Size(231, 22); this.RecentMovieSubMenu.Text = "Recent"; this.RecentMovieSubMenu.DropDownOpened += new System.EventHandler(this.RecentMovieSubMenu_DropDownOpened); // @@ -933,7 +940,7 @@ // this.RecordMovieMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.RecordHS; this.RecordMovieMenuItem.Name = "RecordMovieMenuItem"; - this.RecordMovieMenuItem.Size = new System.Drawing.Size(211, 22); + this.RecordMovieMenuItem.Size = new System.Drawing.Size(231, 22); this.RecordMovieMenuItem.Text = "&Record Movie..."; this.RecordMovieMenuItem.Click += new System.EventHandler(this.RecordMovieMenuItem_Click); // @@ -941,7 +948,7 @@ // this.PlayMovieMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.Play; this.PlayMovieMenuItem.Name = "PlayMovieMenuItem"; - this.PlayMovieMenuItem.Size = new System.Drawing.Size(211, 22); + this.PlayMovieMenuItem.Size = new System.Drawing.Size(231, 22); this.PlayMovieMenuItem.Text = "&Play Movie..."; this.PlayMovieMenuItem.Click += new System.EventHandler(this.PlayMovieMenuItem_Click); // @@ -949,7 +956,7 @@ // this.StopMovieMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.Stop; this.StopMovieMenuItem.Name = "StopMovieMenuItem"; - this.StopMovieMenuItem.Size = new System.Drawing.Size(211, 22); + this.StopMovieMenuItem.Size = new System.Drawing.Size(231, 22); this.StopMovieMenuItem.Text = "Stop Movie"; this.StopMovieMenuItem.Click += new System.EventHandler(this.StopMovieMenuItem_Click); // @@ -957,7 +964,7 @@ // this.PlayFromBeginningMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.restart; this.PlayFromBeginningMenuItem.Name = "PlayFromBeginningMenuItem"; - this.PlayFromBeginningMenuItem.Size = new System.Drawing.Size(211, 22); + this.PlayFromBeginningMenuItem.Size = new System.Drawing.Size(231, 22); this.PlayFromBeginningMenuItem.Text = "Play from Beginning"; this.PlayFromBeginningMenuItem.Click += new System.EventHandler(this.PlayFromBeginningMenuItem_Click); // @@ -965,7 +972,7 @@ // this.ImportMoviesMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.Import; this.ImportMoviesMenuItem.Name = "ImportMoviesMenuItem"; - this.ImportMoviesMenuItem.Size = new System.Drawing.Size(211, 22); + this.ImportMoviesMenuItem.Size = new System.Drawing.Size(231, 22); this.ImportMoviesMenuItem.Text = "Import Movies..."; this.ImportMoviesMenuItem.Click += new System.EventHandler(this.ImportMovieMenuItem_Click); // @@ -973,7 +980,7 @@ // this.SaveMovieMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.SaveAs; this.SaveMovieMenuItem.Name = "SaveMovieMenuItem"; - this.SaveMovieMenuItem.Size = new System.Drawing.Size(211, 22); + this.SaveMovieMenuItem.Size = new System.Drawing.Size(231, 22); this.SaveMovieMenuItem.Text = "&Save Movie"; this.SaveMovieMenuItem.Click += new System.EventHandler(this.SaveMovieMenuItem_Click); // @@ -981,79 +988,79 @@ // this.StopMovieWithoutSavingMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.Stop; this.StopMovieWithoutSavingMenuItem.Name = "StopMovieWithoutSavingMenuItem"; - this.StopMovieWithoutSavingMenuItem.Size = new System.Drawing.Size(211, 22); + this.StopMovieWithoutSavingMenuItem.Size = new System.Drawing.Size(231, 22); this.StopMovieWithoutSavingMenuItem.Text = "Stop Movie without Saving"; this.StopMovieWithoutSavingMenuItem.Click += new System.EventHandler(this.StopMovieWithoutSavingMenuItem_Click); // // toolStripSeparator14 // this.toolStripSeparator14.Name = "toolStripSeparator14"; - this.toolStripSeparator14.Size = new System.Drawing.Size(208, 6); + this.toolStripSeparator14.Size = new System.Drawing.Size(228, 6); // // AutomaticallyBackupMoviesMenuItem // this.AutomaticallyBackupMoviesMenuItem.Name = "AutomaticallyBackupMoviesMenuItem"; - this.AutomaticallyBackupMoviesMenuItem.Size = new System.Drawing.Size(211, 22); + this.AutomaticallyBackupMoviesMenuItem.Size = new System.Drawing.Size(231, 22); this.AutomaticallyBackupMoviesMenuItem.Text = "Automatically Backup Movies"; this.AutomaticallyBackupMoviesMenuItem.Click += new System.EventHandler(this.AutomaticMovieBackupMenuItem_Click); // // FullMovieLoadstatesMenuItem // this.FullMovieLoadstatesMenuItem.Name = "FullMovieLoadstatesMenuItem"; - this.FullMovieLoadstatesMenuItem.Size = new System.Drawing.Size(211, 22); + this.FullMovieLoadstatesMenuItem.Size = new System.Drawing.Size(231, 22); this.FullMovieLoadstatesMenuItem.Text = "Full Movie Loadstates"; this.FullMovieLoadstatesMenuItem.Click += new System.EventHandler(this.FullMovieLoadstatesMenuItem_Click); // // MovieEndSubMenu // this.MovieEndSubMenu.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { - this.MovieEndFinishMenuItem, - this.MovieEndRecordMenuItem, - this.MovieEndStopMenuItem, - this.MovieEndPauseMenuItem}); + this.MovieEndFinishMenuItem, + this.MovieEndRecordMenuItem, + this.MovieEndStopMenuItem, + this.MovieEndPauseMenuItem}); this.MovieEndSubMenu.Name = "MovieEndSubMenu"; - this.MovieEndSubMenu.Size = new System.Drawing.Size(211, 22); + this.MovieEndSubMenu.Size = new System.Drawing.Size(231, 22); this.MovieEndSubMenu.Text = "On Movie End"; this.MovieEndSubMenu.DropDownOpened += new System.EventHandler(this.MovieEndSubMenu_DropDownOpened); // // MovieEndFinishMenuItem // this.MovieEndFinishMenuItem.Name = "MovieEndFinishMenuItem"; - this.MovieEndFinishMenuItem.Size = new System.Drawing.Size(160, 22); + this.MovieEndFinishMenuItem.Size = new System.Drawing.Size(170, 22); this.MovieEndFinishMenuItem.Text = "Switch to Finished"; this.MovieEndFinishMenuItem.Click += new System.EventHandler(this.MovieEndFinishMenuItem_Click); // // MovieEndRecordMenuItem // this.MovieEndRecordMenuItem.Name = "MovieEndRecordMenuItem"; - this.MovieEndRecordMenuItem.Size = new System.Drawing.Size(160, 22); + this.MovieEndRecordMenuItem.Size = new System.Drawing.Size(170, 22); this.MovieEndRecordMenuItem.Text = "Switch To Record"; this.MovieEndRecordMenuItem.Click += new System.EventHandler(this.MovieEndRecordMenuItem_Click); // // MovieEndStopMenuItem // this.MovieEndStopMenuItem.Name = "MovieEndStopMenuItem"; - this.MovieEndStopMenuItem.Size = new System.Drawing.Size(160, 22); + this.MovieEndStopMenuItem.Size = new System.Drawing.Size(170, 22); this.MovieEndStopMenuItem.Text = "Stop"; this.MovieEndStopMenuItem.Click += new System.EventHandler(this.MovieEndStopMenuItem_Click); // // MovieEndPauseMenuItem // this.MovieEndPauseMenuItem.Name = "MovieEndPauseMenuItem"; - this.MovieEndPauseMenuItem.Size = new System.Drawing.Size(160, 22); + this.MovieEndPauseMenuItem.Size = new System.Drawing.Size(170, 22); this.MovieEndPauseMenuItem.Text = "Pause"; this.MovieEndPauseMenuItem.Click += new System.EventHandler(this.MovieEndPauseMenuItem_Click); // // AVSubMenu // this.AVSubMenu.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { - this.RecordAVMenuItem, - this.StopAVIMenuItem, - this.toolStripSeparator19, - this.CaptureOSDMenuItem, - this.SynclessRecordingMenuItem}); + this.RecordAVMenuItem, + this.StopAVIMenuItem, + this.toolStripSeparator19, + this.CaptureOSDMenuItem, + this.SynclessRecordingMenuItem}); this.AVSubMenu.Name = "AVSubMenu"; - this.AVSubMenu.Size = new System.Drawing.Size(152, 22); + this.AVSubMenu.Size = new System.Drawing.Size(159, 22); this.AVSubMenu.Text = "&AVI/WAV"; this.AVSubMenu.DropDownOpened += new System.EventHandler(this.AVSubMenu_DropDownOpened); // @@ -1061,7 +1068,7 @@ // this.RecordAVMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.AVI; this.RecordAVMenuItem.Name = "RecordAVMenuItem"; - this.RecordAVMenuItem.Size = new System.Drawing.Size(194, 22); + this.RecordAVMenuItem.Size = new System.Drawing.Size(206, 22); this.RecordAVMenuItem.Text = "&Record AVI/WAV"; this.RecordAVMenuItem.Click += new System.EventHandler(this.RecordAVMenuItem_Click); // @@ -1069,40 +1076,40 @@ // this.StopAVIMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.Stop; this.StopAVIMenuItem.Name = "StopAVIMenuItem"; - this.StopAVIMenuItem.Size = new System.Drawing.Size(194, 22); + this.StopAVIMenuItem.Size = new System.Drawing.Size(206, 22); this.StopAVIMenuItem.Text = "&Stop AVI/WAV"; this.StopAVIMenuItem.Click += new System.EventHandler(this.StopAVMenuItem_Click); // // toolStripSeparator19 // this.toolStripSeparator19.Name = "toolStripSeparator19"; - this.toolStripSeparator19.Size = new System.Drawing.Size(191, 6); + this.toolStripSeparator19.Size = new System.Drawing.Size(203, 6); // // CaptureOSDMenuItem // this.CaptureOSDMenuItem.Name = "CaptureOSDMenuItem"; - this.CaptureOSDMenuItem.Size = new System.Drawing.Size(194, 22); + this.CaptureOSDMenuItem.Size = new System.Drawing.Size(206, 22); this.CaptureOSDMenuItem.Text = "Capture OSD"; this.CaptureOSDMenuItem.Click += new System.EventHandler(this.CaptureOSDMenuItem_Click); // // SynclessRecordingMenuItem // this.SynclessRecordingMenuItem.Name = "SynclessRecordingMenuItem"; - this.SynclessRecordingMenuItem.Size = new System.Drawing.Size(194, 22); + this.SynclessRecordingMenuItem.Size = new System.Drawing.Size(206, 22); this.SynclessRecordingMenuItem.Text = "S&yncless Recording Tools"; this.SynclessRecordingMenuItem.Click += new System.EventHandler(this.SynclessRecordingMenuItem_Click); // // ScreenshotSubMenu // this.ScreenshotSubMenu.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { - this.ScreenshotMenuItem, - this.ScreenshotAsMenuItem, - this.ScreenshotClipboardMenuItem, - this.ScreenshotClientClipboardMenuItem, - this.toolStripSeparator20, - this.ScreenshotCaptureOSDMenuItem1}); + this.ScreenshotMenuItem, + this.ScreenshotAsMenuItem, + this.ScreenshotClipboardMenuItem, + this.ScreenshotClientClipboardMenuItem, + this.toolStripSeparator20, + this.ScreenshotCaptureOSDMenuItem1}); this.ScreenshotSubMenu.Name = "ScreenshotSubMenu"; - this.ScreenshotSubMenu.Size = new System.Drawing.Size(152, 22); + this.ScreenshotSubMenu.Size = new System.Drawing.Size(159, 22); this.ScreenshotSubMenu.Text = "Scree&nshot"; this.ScreenshotSubMenu.DropDownOpening += new System.EventHandler(this.ScreenshotSubMenu_DropDownOpening); // @@ -1110,14 +1117,14 @@ // this.ScreenshotMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.camera; this.ScreenshotMenuItem.Name = "ScreenshotMenuItem"; - this.ScreenshotMenuItem.Size = new System.Drawing.Size(296, 22); + this.ScreenshotMenuItem.Size = new System.Drawing.Size(317, 22); this.ScreenshotMenuItem.Text = "Screenshot"; this.ScreenshotMenuItem.Click += new System.EventHandler(this.ScreenshotMenuItem_Click); // // ScreenshotAsMenuItem // this.ScreenshotAsMenuItem.Name = "ScreenshotAsMenuItem"; - this.ScreenshotAsMenuItem.Size = new System.Drawing.Size(296, 22); + this.ScreenshotAsMenuItem.Size = new System.Drawing.Size(317, 22); this.ScreenshotAsMenuItem.Text = "Screenshot As..."; this.ScreenshotAsMenuItem.Click += new System.EventHandler(this.ScreenshotAsMenuItem_Click); // @@ -1125,54 +1132,54 @@ // this.ScreenshotClipboardMenuItem.Name = "ScreenshotClipboardMenuItem"; this.ScreenshotClipboardMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.C))); - this.ScreenshotClipboardMenuItem.Size = new System.Drawing.Size(296, 22); + this.ScreenshotClipboardMenuItem.Size = new System.Drawing.Size(317, 22); this.ScreenshotClipboardMenuItem.Text = "Screenshot (raw) -> Clipboard"; this.ScreenshotClipboardMenuItem.Click += new System.EventHandler(this.ScreenshotClipboardMenuItem_Click); // // ScreenshotClientClipboardMenuItem // this.ScreenshotClientClipboardMenuItem.Name = "ScreenshotClientClipboardMenuItem"; - this.ScreenshotClientClipboardMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)(((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.Shift) - | System.Windows.Forms.Keys.C))); - this.ScreenshotClientClipboardMenuItem.Size = new System.Drawing.Size(296, 22); + this.ScreenshotClientClipboardMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)(((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.Shift) + | System.Windows.Forms.Keys.C))); + this.ScreenshotClientClipboardMenuItem.Size = new System.Drawing.Size(317, 22); this.ScreenshotClientClipboardMenuItem.Text = "Screenshot (client) -> Clipboard"; this.ScreenshotClientClipboardMenuItem.Click += new System.EventHandler(this.ScreenshotClientClipboardMenuItem_Click); // // toolStripSeparator20 // this.toolStripSeparator20.Name = "toolStripSeparator20"; - this.toolStripSeparator20.Size = new System.Drawing.Size(293, 6); + this.toolStripSeparator20.Size = new System.Drawing.Size(314, 6); // // ScreenshotCaptureOSDMenuItem1 // this.ScreenshotCaptureOSDMenuItem1.Name = "ScreenshotCaptureOSDMenuItem1"; - this.ScreenshotCaptureOSDMenuItem1.Size = new System.Drawing.Size(296, 22); + this.ScreenshotCaptureOSDMenuItem1.Size = new System.Drawing.Size(317, 22); this.ScreenshotCaptureOSDMenuItem1.Text = "Capture OSD"; this.ScreenshotCaptureOSDMenuItem1.Click += new System.EventHandler(this.ScreenshotCaptureOSDMenuItem_Click); // // toolStripSeparator4 // this.toolStripSeparator4.Name = "toolStripSeparator4"; - this.toolStripSeparator4.Size = new System.Drawing.Size(149, 6); + this.toolStripSeparator4.Size = new System.Drawing.Size(156, 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(152, 22); + this.ExitMenuItem.Size = new System.Drawing.Size(159, 22); this.ExitMenuItem.Text = "E&xit"; this.ExitMenuItem.Click += new System.EventHandler(this.ExitMenuItem_Click); // // EmulationSubMenu // this.EmulationSubMenu.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { - this.PauseMenuItem, - this.RebootCoreMenuItem, - this.toolStripSeparator1, - this.SoftResetMenuItem, - this.HardResetMenuItem}); + this.PauseMenuItem, + this.RebootCoreMenuItem, + this.toolStripSeparator1, + this.SoftResetMenuItem, + this.HardResetMenuItem}); this.EmulationSubMenu.Name = "EmulationSubMenu"; - this.EmulationSubMenu.Size = new System.Drawing.Size(65, 17); + this.EmulationSubMenu.Size = new System.Drawing.Size(73, 19); this.EmulationSubMenu.Text = "&Emulation"; this.EmulationSubMenu.DropDownOpened += new System.EventHandler(this.emulationToolStripMenuItem_DropDownOpened); // @@ -1180,7 +1187,7 @@ // this.PauseMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.Pause; this.PauseMenuItem.Name = "PauseMenuItem"; - this.PauseMenuItem.Size = new System.Drawing.Size(135, 22); + this.PauseMenuItem.Size = new System.Drawing.Size(140, 22); this.PauseMenuItem.Text = "&Pause"; this.PauseMenuItem.Click += new System.EventHandler(this.PauseMenuItem_Click); // @@ -1188,103 +1195,103 @@ // this.RebootCoreMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.reboot; this.RebootCoreMenuItem.Name = "RebootCoreMenuItem"; - this.RebootCoreMenuItem.Size = new System.Drawing.Size(135, 22); + this.RebootCoreMenuItem.Size = new System.Drawing.Size(140, 22); this.RebootCoreMenuItem.Text = "&Reboot Core"; this.RebootCoreMenuItem.Click += new System.EventHandler(this.PowerMenuItem_Click); // // toolStripSeparator1 // this.toolStripSeparator1.Name = "toolStripSeparator1"; - this.toolStripSeparator1.Size = new System.Drawing.Size(132, 6); + this.toolStripSeparator1.Size = new System.Drawing.Size(137, 6); // // SoftResetMenuItem // this.SoftResetMenuItem.Name = "SoftResetMenuItem"; - this.SoftResetMenuItem.Size = new System.Drawing.Size(135, 22); + this.SoftResetMenuItem.Size = new System.Drawing.Size(140, 22); this.SoftResetMenuItem.Text = "&Soft Reset"; this.SoftResetMenuItem.Click += new System.EventHandler(this.SoftResetMenuItem_Click); // // HardResetMenuItem // this.HardResetMenuItem.Name = "HardResetMenuItem"; - this.HardResetMenuItem.Size = new System.Drawing.Size(135, 22); + this.HardResetMenuItem.Size = new System.Drawing.Size(140, 22); this.HardResetMenuItem.Text = "&Hard Reset"; this.HardResetMenuItem.Click += new System.EventHandler(this.HardResetMenuItem_Click); // // ViewSubMenu // this.ViewSubMenu.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { - this.WindowSizeSubMenu, - this.SwitchToFullscreenMenuItem, - this.toolStripSeparator2, - this.DisplayFPSMenuItem, - this.DisplayFrameCounterMenuItem, - this.DisplayLagCounterMenuItem, - this.DisplayInputMenuItem, - this.DisplayRerecordCountMenuItem, - this.DisplaySubtitlesMenuItem, - this.toolStripMenuItem4, - this.DisplayStatusBarMenuItem, - this.DisplayMessagesMenuItem, - this.DisplayLogWindowMenuItem}); + this.WindowSizeSubMenu, + this.SwitchToFullscreenMenuItem, + this.toolStripSeparator2, + this.DisplayFPSMenuItem, + this.DisplayFrameCounterMenuItem, + this.DisplayLagCounterMenuItem, + this.DisplayInputMenuItem, + this.DisplayRerecordCountMenuItem, + this.DisplaySubtitlesMenuItem, + this.toolStripMenuItem4, + this.DisplayStatusBarMenuItem, + this.DisplayMessagesMenuItem, + this.DisplayLogWindowMenuItem}); this.ViewSubMenu.Name = "ViewSubMenu"; - this.ViewSubMenu.Size = new System.Drawing.Size(41, 17); + this.ViewSubMenu.Size = new System.Drawing.Size(44, 19); this.ViewSubMenu.Text = "&View"; this.ViewSubMenu.DropDownOpened += new System.EventHandler(this.ViewSubMenu_DropDownOpened); // // WindowSizeSubMenu // this.WindowSizeSubMenu.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { - this.x1MenuItem, - this.x2MenuItem, - this.x3MenuItem, - this.x4MenuItem, - this.x5MenuItem, - this.mzMenuItem}); + this.x1MenuItem, + this.x2MenuItem, + this.x3MenuItem, + this.x4MenuItem, + this.x5MenuItem, + this.mzMenuItem}); this.WindowSizeSubMenu.Name = "WindowSizeSubMenu"; - this.WindowSizeSubMenu.Size = new System.Drawing.Size(187, 22); + this.WindowSizeSubMenu.Size = new System.Drawing.Size(198, 22); this.WindowSizeSubMenu.Text = "&Window Size"; this.WindowSizeSubMenu.DropDownOpened += new System.EventHandler(this.WindowSizeSubMenu_DropDownOpened); // // x1MenuItem // this.x1MenuItem.Name = "x1MenuItem"; - this.x1MenuItem.Size = new System.Drawing.Size(94, 22); + this.x1MenuItem.Size = new System.Drawing.Size(96, 22); this.x1MenuItem.Text = "&1x"; this.x1MenuItem.Click += new System.EventHandler(this.WindowSize_Click); // // x2MenuItem // this.x2MenuItem.Name = "x2MenuItem"; - this.x2MenuItem.Size = new System.Drawing.Size(94, 22); + this.x2MenuItem.Size = new System.Drawing.Size(96, 22); this.x2MenuItem.Text = "&2x"; this.x2MenuItem.Click += new System.EventHandler(this.WindowSize_Click); // // x3MenuItem // this.x3MenuItem.Name = "x3MenuItem"; - this.x3MenuItem.Size = new System.Drawing.Size(94, 22); + this.x3MenuItem.Size = new System.Drawing.Size(96, 22); this.x3MenuItem.Text = "&3x"; this.x3MenuItem.Click += new System.EventHandler(this.WindowSize_Click); // // x4MenuItem // this.x4MenuItem.Name = "x4MenuItem"; - this.x4MenuItem.Size = new System.Drawing.Size(94, 22); + this.x4MenuItem.Size = new System.Drawing.Size(96, 22); this.x4MenuItem.Text = "&4x"; this.x4MenuItem.Click += new System.EventHandler(this.WindowSize_Click); // // x5MenuItem // this.x5MenuItem.Name = "x5MenuItem"; - this.x5MenuItem.Size = new System.Drawing.Size(94, 22); + this.x5MenuItem.Size = new System.Drawing.Size(96, 22); this.x5MenuItem.Text = "&5x"; this.x5MenuItem.Click += new System.EventHandler(this.WindowSize_Click); // // mzMenuItem // this.mzMenuItem.Name = "mzMenuItem"; - this.mzMenuItem.Size = new System.Drawing.Size(94, 22); + this.mzMenuItem.Size = new System.Drawing.Size(96, 22); this.mzMenuItem.Text = "&Max"; this.mzMenuItem.Click += new System.EventHandler(this.WindowSize_Click); // @@ -1292,107 +1299,107 @@ // this.SwitchToFullscreenMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.Fullscreen; this.SwitchToFullscreenMenuItem.Name = "SwitchToFullscreenMenuItem"; - this.SwitchToFullscreenMenuItem.Size = new System.Drawing.Size(187, 22); + this.SwitchToFullscreenMenuItem.Size = new System.Drawing.Size(198, 22); this.SwitchToFullscreenMenuItem.Text = "Switch to Fullscreen"; this.SwitchToFullscreenMenuItem.Click += new System.EventHandler(this.SwitchToFullscreenMenuItem_Click); // // toolStripSeparator2 // this.toolStripSeparator2.Name = "toolStripSeparator2"; - this.toolStripSeparator2.Size = new System.Drawing.Size(184, 6); + this.toolStripSeparator2.Size = new System.Drawing.Size(195, 6); // // DisplayFPSMenuItem // this.DisplayFPSMenuItem.Name = "DisplayFPSMenuItem"; - this.DisplayFPSMenuItem.Size = new System.Drawing.Size(187, 22); + this.DisplayFPSMenuItem.Size = new System.Drawing.Size(198, 22); this.DisplayFPSMenuItem.Text = "Display FPS"; this.DisplayFPSMenuItem.Click += new System.EventHandler(this.DisplayFPSMenuItem_Click); // // DisplayFrameCounterMenuItem // this.DisplayFrameCounterMenuItem.Name = "DisplayFrameCounterMenuItem"; - this.DisplayFrameCounterMenuItem.Size = new System.Drawing.Size(187, 22); + this.DisplayFrameCounterMenuItem.Size = new System.Drawing.Size(198, 22); this.DisplayFrameCounterMenuItem.Text = "Display FrameCounter"; this.DisplayFrameCounterMenuItem.Click += new System.EventHandler(this.DisplayFrameCounterMenuItem_Click); // // DisplayLagCounterMenuItem // this.DisplayLagCounterMenuItem.Name = "DisplayLagCounterMenuItem"; - this.DisplayLagCounterMenuItem.Size = new System.Drawing.Size(187, 22); + this.DisplayLagCounterMenuItem.Size = new System.Drawing.Size(198, 22); this.DisplayLagCounterMenuItem.Text = "Display Lag Counter"; this.DisplayLagCounterMenuItem.Click += new System.EventHandler(this.DisplayLagCounterMenuItem_Click); // // DisplayInputMenuItem // this.DisplayInputMenuItem.Name = "DisplayInputMenuItem"; - this.DisplayInputMenuItem.Size = new System.Drawing.Size(187, 22); + this.DisplayInputMenuItem.Size = new System.Drawing.Size(198, 22); this.DisplayInputMenuItem.Text = "Display Input"; this.DisplayInputMenuItem.Click += new System.EventHandler(this.DisplayInputMenuItem_Click); // // DisplayRerecordCountMenuItem // this.DisplayRerecordCountMenuItem.Name = "DisplayRerecordCountMenuItem"; - this.DisplayRerecordCountMenuItem.Size = new System.Drawing.Size(187, 22); + this.DisplayRerecordCountMenuItem.Size = new System.Drawing.Size(198, 22); this.DisplayRerecordCountMenuItem.Text = "Display Rerecord Count"; this.DisplayRerecordCountMenuItem.Click += new System.EventHandler(this.DisplayRerecordsMenuItem_Click); // // DisplaySubtitlesMenuItem // this.DisplaySubtitlesMenuItem.Name = "DisplaySubtitlesMenuItem"; - this.DisplaySubtitlesMenuItem.Size = new System.Drawing.Size(187, 22); + this.DisplaySubtitlesMenuItem.Size = new System.Drawing.Size(198, 22); this.DisplaySubtitlesMenuItem.Text = "Display Subtitles"; this.DisplaySubtitlesMenuItem.Click += new System.EventHandler(this.DisplaySubtitlesMenuItem_Click); // // toolStripMenuItem4 // this.toolStripMenuItem4.Name = "toolStripMenuItem4"; - this.toolStripMenuItem4.Size = new System.Drawing.Size(184, 6); + this.toolStripMenuItem4.Size = new System.Drawing.Size(195, 6); // // DisplayStatusBarMenuItem // this.DisplayStatusBarMenuItem.Name = "DisplayStatusBarMenuItem"; - this.DisplayStatusBarMenuItem.Size = new System.Drawing.Size(187, 22); + this.DisplayStatusBarMenuItem.Size = new System.Drawing.Size(198, 22); this.DisplayStatusBarMenuItem.Text = "Display Status Bar"; this.DisplayStatusBarMenuItem.Click += new System.EventHandler(this.DisplayStatusBarMenuItem_Click); // // DisplayMessagesMenuItem // this.DisplayMessagesMenuItem.Name = "DisplayMessagesMenuItem"; - this.DisplayMessagesMenuItem.Size = new System.Drawing.Size(187, 22); + this.DisplayMessagesMenuItem.Size = new System.Drawing.Size(198, 22); this.DisplayMessagesMenuItem.Text = "Display Messages"; this.DisplayMessagesMenuItem.Click += new System.EventHandler(this.DisplayMessagesMenuItem_Click); // // DisplayLogWindowMenuItem // this.DisplayLogWindowMenuItem.Name = "DisplayLogWindowMenuItem"; - this.DisplayLogWindowMenuItem.Size = new System.Drawing.Size(187, 22); + this.DisplayLogWindowMenuItem.Size = new System.Drawing.Size(198, 22); this.DisplayLogWindowMenuItem.Text = "Display Log Window"; this.DisplayLogWindowMenuItem.Click += new System.EventHandler(this.DisplayLogWindowMenuItem_Click); // // ConfigSubMenu // this.ConfigSubMenu.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { - this.ControllersMenuItem, - this.HotkeysMenuItem, - this.DisplayConfigMenuItem, - this.SoundMenuItem, - this.PathsMenuItem, - this.FirmwaresMenuItem, - this.MessagesMenuItem, - this.AutofireMenuItem, - this.RewindOptionsMenuItem, - this.extensionsToolStripMenuItem, - this.ClientOptionsMenuItem, - this.ProfilesMenuItem, - this.toolStripSeparator9, - this.SpeedSkipSubMenu, - this.KeyPrioritySubMenu, - this.CoresSubMenu, - this.toolStripSeparator10, - this.SaveConfigMenuItem, - this.LoadConfigMenuItem}); + this.ControllersMenuItem, + this.HotkeysMenuItem, + this.DisplayConfigMenuItem, + this.SoundMenuItem, + this.PathsMenuItem, + this.FirmwaresMenuItem, + this.MessagesMenuItem, + this.AutofireMenuItem, + this.RewindOptionsMenuItem, + this.extensionsToolStripMenuItem, + this.ClientOptionsMenuItem, + this.ProfilesMenuItem, + this.toolStripSeparator9, + this.SpeedSkipSubMenu, + this.KeyPrioritySubMenu, + this.CoresSubMenu, + this.toolStripSeparator10, + this.SaveConfigMenuItem, + this.LoadConfigMenuItem}); this.ConfigSubMenu.Name = "ConfigSubMenu"; - this.ConfigSubMenu.Size = new System.Drawing.Size(50, 17); + this.ConfigSubMenu.Size = new System.Drawing.Size(55, 19); this.ConfigSubMenu.Text = "&Config"; this.ConfigSubMenu.DropDownOpened += new System.EventHandler(this.ConfigSubMenu_DropDownOpened); // @@ -1400,7 +1407,7 @@ // this.ControllersMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.GameController; this.ControllersMenuItem.Name = "ControllersMenuItem"; - this.ControllersMenuItem.Size = new System.Drawing.Size(165, 22); + this.ControllersMenuItem.Size = new System.Drawing.Size(169, 22); this.ControllersMenuItem.Text = "&Controllers..."; this.ControllersMenuItem.Click += new System.EventHandler(this.ControllersMenuItem_Click); // @@ -1408,7 +1415,7 @@ // this.HotkeysMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.HotKeys; this.HotkeysMenuItem.Name = "HotkeysMenuItem"; - this.HotkeysMenuItem.Size = new System.Drawing.Size(165, 22); + this.HotkeysMenuItem.Size = new System.Drawing.Size(169, 22); this.HotkeysMenuItem.Text = "&Hotkeys..."; this.HotkeysMenuItem.Click += new System.EventHandler(this.HotkeysMenuItem_Click); // @@ -1416,7 +1423,7 @@ // this.DisplayConfigMenuItem.Image = ((System.Drawing.Image)(resources.GetObject("DisplayConfigMenuItem.Image"))); this.DisplayConfigMenuItem.Name = "DisplayConfigMenuItem"; - this.DisplayConfigMenuItem.Size = new System.Drawing.Size(165, 22); + this.DisplayConfigMenuItem.Size = new System.Drawing.Size(169, 22); this.DisplayConfigMenuItem.Text = "Display..."; this.DisplayConfigMenuItem.Click += new System.EventHandler(this.DisplayConfigMenuItem_Click); // @@ -1424,7 +1431,7 @@ // this.SoundMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.AudioHS; this.SoundMenuItem.Name = "SoundMenuItem"; - this.SoundMenuItem.Size = new System.Drawing.Size(165, 22); + this.SoundMenuItem.Size = new System.Drawing.Size(169, 22); this.SoundMenuItem.Text = "&Sound..."; this.SoundMenuItem.Click += new System.EventHandler(this.SoundMenuItem_Click); // @@ -1432,7 +1439,7 @@ // this.PathsMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.CopyFolderHS; this.PathsMenuItem.Name = "PathsMenuItem"; - this.PathsMenuItem.Size = new System.Drawing.Size(165, 22); + this.PathsMenuItem.Size = new System.Drawing.Size(169, 22); this.PathsMenuItem.Text = "Paths..."; this.PathsMenuItem.Click += new System.EventHandler(this.PathsMenuItem_Click); // @@ -1440,7 +1447,7 @@ // this.FirmwaresMenuItem.Image = ((System.Drawing.Image)(resources.GetObject("FirmwaresMenuItem.Image"))); this.FirmwaresMenuItem.Name = "FirmwaresMenuItem"; - this.FirmwaresMenuItem.Size = new System.Drawing.Size(165, 22); + this.FirmwaresMenuItem.Size = new System.Drawing.Size(169, 22); this.FirmwaresMenuItem.Text = "&Firmwares..."; this.FirmwaresMenuItem.Click += new System.EventHandler(this.FirmwaresMenuItem_Click); // @@ -1448,7 +1455,7 @@ // this.MessagesMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.MessageConfig; this.MessagesMenuItem.Name = "MessagesMenuItem"; - this.MessagesMenuItem.Size = new System.Drawing.Size(165, 22); + this.MessagesMenuItem.Size = new System.Drawing.Size(169, 22); this.MessagesMenuItem.Text = "&Messages..."; this.MessagesMenuItem.Click += new System.EventHandler(this.MessagesMenuItem_Click); // @@ -1456,7 +1463,7 @@ // this.AutofireMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.Lightning; this.AutofireMenuItem.Name = "AutofireMenuItem"; - this.AutofireMenuItem.Size = new System.Drawing.Size(165, 22); + this.AutofireMenuItem.Size = new System.Drawing.Size(169, 22); this.AutofireMenuItem.Text = "&Autofire..."; this.AutofireMenuItem.Click += new System.EventHandler(this.AutofireMenuItem_Click); // @@ -1464,21 +1471,21 @@ // this.RewindOptionsMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.Previous; this.RewindOptionsMenuItem.Name = "RewindOptionsMenuItem"; - this.RewindOptionsMenuItem.Size = new System.Drawing.Size(165, 22); + this.RewindOptionsMenuItem.Size = new System.Drawing.Size(169, 22); this.RewindOptionsMenuItem.Text = "&Rewind && States..."; this.RewindOptionsMenuItem.Click += new System.EventHandler(this.RewindOptionsMenuItem_Click); // // extensionsToolStripMenuItem // this.extensionsToolStripMenuItem.Name = "extensionsToolStripMenuItem"; - this.extensionsToolStripMenuItem.Size = new System.Drawing.Size(165, 22); + this.extensionsToolStripMenuItem.Size = new System.Drawing.Size(169, 22); this.extensionsToolStripMenuItem.Text = "File Extensions..."; this.extensionsToolStripMenuItem.Click += new System.EventHandler(this.FileExtensionsMenuItem_Click); // // ClientOptionsMenuItem // this.ClientOptionsMenuItem.Name = "ClientOptionsMenuItem"; - this.ClientOptionsMenuItem.Size = new System.Drawing.Size(165, 22); + this.ClientOptionsMenuItem.Size = new System.Drawing.Size(169, 22); this.ClientOptionsMenuItem.Text = "&Customize..."; this.ClientOptionsMenuItem.Click += new System.EventHandler(this.CustomizeMenuItem_Click); // @@ -1486,113 +1493,113 @@ // this.ProfilesMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.user_blue_small; this.ProfilesMenuItem.Name = "ProfilesMenuItem"; - this.ProfilesMenuItem.Size = new System.Drawing.Size(165, 22); + this.ProfilesMenuItem.Size = new System.Drawing.Size(169, 22); this.ProfilesMenuItem.Text = "&Profiles..."; this.ProfilesMenuItem.Click += new System.EventHandler(this.ProfilesMenuItem_Click); // // toolStripSeparator9 // this.toolStripSeparator9.Name = "toolStripSeparator9"; - this.toolStripSeparator9.Size = new System.Drawing.Size(162, 6); + this.toolStripSeparator9.Size = new System.Drawing.Size(166, 6); // // SpeedSkipSubMenu // this.SpeedSkipSubMenu.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { - this.ClockThrottleMenuItem, - this.AudioThrottleMenuItem, - this.VsyncThrottleMenuItem, - this.toolStripSeparator27, - this.VsyncEnabledMenuItem, - this.toolStripMenuItem3, - this.miUnthrottled, - this.MinimizeSkippingMenuItem, - this.NeverSkipMenuItem, - this.toolStripMenuItem17, - this.toolStripMenuItem5, - this.Speed50MenuItem, - this.Speed75MenuItem, - this.Speed100MenuItem, - this.Speed150MenuItem, - this.Speed200MenuItem, - this.Speed400MenuItem}); + this.ClockThrottleMenuItem, + this.AudioThrottleMenuItem, + this.VsyncThrottleMenuItem, + this.toolStripSeparator27, + this.VsyncEnabledMenuItem, + this.toolStripMenuItem3, + this.miUnthrottled, + this.MinimizeSkippingMenuItem, + this.NeverSkipMenuItem, + this.toolStripMenuItem17, + this.toolStripMenuItem5, + this.Speed50MenuItem, + this.Speed75MenuItem, + this.Speed100MenuItem, + this.Speed150MenuItem, + this.Speed200MenuItem, + this.Speed400MenuItem}); this.SpeedSkipSubMenu.Name = "SpeedSkipSubMenu"; - this.SpeedSkipSubMenu.Size = new System.Drawing.Size(165, 22); + this.SpeedSkipSubMenu.Size = new System.Drawing.Size(169, 22); this.SpeedSkipSubMenu.Text = "Speed/Skip"; this.SpeedSkipSubMenu.DropDownOpened += new System.EventHandler(this.FrameSkipMenuItem_DropDownOpened); // // ClockThrottleMenuItem // this.ClockThrottleMenuItem.Name = "ClockThrottleMenuItem"; - this.ClockThrottleMenuItem.Size = new System.Drawing.Size(181, 22); + this.ClockThrottleMenuItem.Size = new System.Drawing.Size(202, 22); this.ClockThrottleMenuItem.Text = "Clock Throttle"; this.ClockThrottleMenuItem.Click += new System.EventHandler(this.ClockThrottleMenuItem_Click); // // AudioThrottleMenuItem // this.AudioThrottleMenuItem.Name = "AudioThrottleMenuItem"; - this.AudioThrottleMenuItem.Size = new System.Drawing.Size(181, 22); + this.AudioThrottleMenuItem.Size = new System.Drawing.Size(202, 22); this.AudioThrottleMenuItem.Text = "Audio Throttle"; this.AudioThrottleMenuItem.Click += new System.EventHandler(this.AudioThrottleMenuItem_Click); // // VsyncThrottleMenuItem // this.VsyncThrottleMenuItem.Name = "VsyncThrottleMenuItem"; - this.VsyncThrottleMenuItem.Size = new System.Drawing.Size(181, 22); + this.VsyncThrottleMenuItem.Size = new System.Drawing.Size(202, 22); this.VsyncThrottleMenuItem.Text = "VSync Throttle"; this.VsyncThrottleMenuItem.Click += new System.EventHandler(this.VsyncThrottleMenuItem_Click); // // toolStripSeparator27 // this.toolStripSeparator27.Name = "toolStripSeparator27"; - this.toolStripSeparator27.Size = new System.Drawing.Size(178, 6); + this.toolStripSeparator27.Size = new System.Drawing.Size(199, 6); // // VsyncEnabledMenuItem // this.VsyncEnabledMenuItem.Name = "VsyncEnabledMenuItem"; - this.VsyncEnabledMenuItem.Size = new System.Drawing.Size(181, 22); + this.VsyncEnabledMenuItem.Size = new System.Drawing.Size(202, 22); this.VsyncEnabledMenuItem.Text = "VSync Enabled"; this.VsyncEnabledMenuItem.Click += new System.EventHandler(this.VsyncEnabledMenuItem_Click); // // toolStripMenuItem3 // this.toolStripMenuItem3.Name = "toolStripMenuItem3"; - this.toolStripMenuItem3.Size = new System.Drawing.Size(178, 6); + this.toolStripMenuItem3.Size = new System.Drawing.Size(199, 6); // // miUnthrottled // this.miUnthrottled.Name = "miUnthrottled"; - this.miUnthrottled.Size = new System.Drawing.Size(181, 22); + this.miUnthrottled.Size = new System.Drawing.Size(202, 22); this.miUnthrottled.Text = "Unthrottled"; this.miUnthrottled.Click += new System.EventHandler(this.miUnthrottled_Click); // // MinimizeSkippingMenuItem // this.MinimizeSkippingMenuItem.Name = "MinimizeSkippingMenuItem"; - this.MinimizeSkippingMenuItem.Size = new System.Drawing.Size(181, 22); + this.MinimizeSkippingMenuItem.Size = new System.Drawing.Size(202, 22); this.MinimizeSkippingMenuItem.Text = "Auto-minimize skipping"; this.MinimizeSkippingMenuItem.Click += new System.EventHandler(this.MinimizeSkippingMenuItem_Click); // // NeverSkipMenuItem // this.NeverSkipMenuItem.Name = "NeverSkipMenuItem"; - this.NeverSkipMenuItem.Size = new System.Drawing.Size(181, 22); + this.NeverSkipMenuItem.Size = new System.Drawing.Size(202, 22); this.NeverSkipMenuItem.Text = "Skip 0 (never)"; this.NeverSkipMenuItem.Click += new System.EventHandler(this.NeverSkipMenuItem_Click); // // toolStripMenuItem17 // this.toolStripMenuItem17.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { - this.Frameskip1MenuItem, - this.Frameskip2MenuItem, - this.Frameskip3MenuItem, - this.Frameskip4MenuItem, - this.Frameskip5MenuItem, - this.Frameskip6MenuItem, - this.Frameskip7MenuItem, - this.Frameskip8MenuItem, - this.Frameskip9MenuItem}); + this.Frameskip1MenuItem, + this.Frameskip2MenuItem, + this.Frameskip3MenuItem, + this.Frameskip4MenuItem, + this.Frameskip5MenuItem, + this.Frameskip6MenuItem, + this.Frameskip7MenuItem, + this.Frameskip8MenuItem, + this.Frameskip9MenuItem}); this.toolStripMenuItem17.Name = "toolStripMenuItem17"; - this.toolStripMenuItem17.Size = new System.Drawing.Size(181, 22); + this.toolStripMenuItem17.Size = new System.Drawing.Size(202, 22); this.toolStripMenuItem17.Text = "Skip 1..9"; // // Frameskip1MenuItem @@ -1661,79 +1668,79 @@ // toolStripMenuItem5 // this.toolStripMenuItem5.Name = "toolStripMenuItem5"; - this.toolStripMenuItem5.Size = new System.Drawing.Size(178, 6); + this.toolStripMenuItem5.Size = new System.Drawing.Size(199, 6); // // Speed50MenuItem // this.Speed50MenuItem.Name = "Speed50MenuItem"; - this.Speed50MenuItem.Size = new System.Drawing.Size(181, 22); + this.Speed50MenuItem.Size = new System.Drawing.Size(202, 22); this.Speed50MenuItem.Text = "Speed 50%"; this.Speed50MenuItem.Click += new System.EventHandler(this.Speed50MenuItem_Click); // // Speed75MenuItem // this.Speed75MenuItem.Name = "Speed75MenuItem"; - this.Speed75MenuItem.Size = new System.Drawing.Size(181, 22); + this.Speed75MenuItem.Size = new System.Drawing.Size(202, 22); this.Speed75MenuItem.Text = "Speed 75%"; this.Speed75MenuItem.Click += new System.EventHandler(this.Speed75MenuItem_Click); // // Speed100MenuItem // this.Speed100MenuItem.Name = "Speed100MenuItem"; - this.Speed100MenuItem.Size = new System.Drawing.Size(181, 22); + this.Speed100MenuItem.Size = new System.Drawing.Size(202, 22); this.Speed100MenuItem.Text = "Speed 100%"; this.Speed100MenuItem.Click += new System.EventHandler(this.Speed100MenuItem_Click); // // Speed150MenuItem // this.Speed150MenuItem.Name = "Speed150MenuItem"; - this.Speed150MenuItem.Size = new System.Drawing.Size(181, 22); + this.Speed150MenuItem.Size = new System.Drawing.Size(202, 22); this.Speed150MenuItem.Text = "Speed 150%"; this.Speed150MenuItem.Click += new System.EventHandler(this.Speed150MenuItem_Click); // // Speed200MenuItem // this.Speed200MenuItem.Name = "Speed200MenuItem"; - this.Speed200MenuItem.Size = new System.Drawing.Size(181, 22); + this.Speed200MenuItem.Size = new System.Drawing.Size(202, 22); this.Speed200MenuItem.Text = "Speed 200%"; this.Speed200MenuItem.Click += new System.EventHandler(this.Speed200MenuItem_Click); // // Speed400MenuItem // this.Speed400MenuItem.Name = "Speed400MenuItem"; - this.Speed400MenuItem.Size = new System.Drawing.Size(181, 22); + this.Speed400MenuItem.Size = new System.Drawing.Size(202, 22); this.Speed400MenuItem.Text = "Speed 400%"; this.Speed400MenuItem.Click += new System.EventHandler(this.Speed400MenuItem_Click); // // KeyPrioritySubMenu // this.KeyPrioritySubMenu.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { - this.BothHkAndControllerMenuItem, - this.InputOverHkMenuItem, - this.HkOverInputMenuItem}); + this.BothHkAndControllerMenuItem, + this.InputOverHkMenuItem, + this.HkOverInputMenuItem}); this.KeyPrioritySubMenu.Name = "KeyPrioritySubMenu"; - this.KeyPrioritySubMenu.Size = new System.Drawing.Size(165, 22); + this.KeyPrioritySubMenu.Size = new System.Drawing.Size(169, 22); this.KeyPrioritySubMenu.Text = "Key Priority"; this.KeyPrioritySubMenu.DropDownOpened += new System.EventHandler(this.KeyPriorityMenuItem_DropDownOpened); // // BothHkAndControllerMenuItem // this.BothHkAndControllerMenuItem.Name = "BothHkAndControllerMenuItem"; - this.BothHkAndControllerMenuItem.Size = new System.Drawing.Size(214, 22); + this.BothHkAndControllerMenuItem.Size = new System.Drawing.Size(229, 22); this.BothHkAndControllerMenuItem.Text = "Both Hotkeys and Controllers"; this.BothHkAndControllerMenuItem.Click += new System.EventHandler(this.BothHkAndControllerMenuItem_Click); // // InputOverHkMenuItem // this.InputOverHkMenuItem.Name = "InputOverHkMenuItem"; - this.InputOverHkMenuItem.Size = new System.Drawing.Size(214, 22); + this.InputOverHkMenuItem.Size = new System.Drawing.Size(229, 22); this.InputOverHkMenuItem.Text = "Input overrides Hotkeys"; this.InputOverHkMenuItem.Click += new System.EventHandler(this.InputOverHkMenuItem_Click); // // HkOverInputMenuItem // this.HkOverInputMenuItem.Name = "HkOverInputMenuItem"; - this.HkOverInputMenuItem.Size = new System.Drawing.Size(214, 22); + this.HkOverInputMenuItem.Size = new System.Drawing.Size(229, 22); this.HkOverInputMenuItem.Text = "Hotkeys override Input"; this.HkOverInputMenuItem.Click += new System.EventHandler(this.HkOverInputMenuItem_Click); // @@ -1748,68 +1755,68 @@ this.N64VideoPluginSettingsMenuItem, this.setLibretroCoreToolStripMenuItem}); this.CoresSubMenu.Name = "CoresSubMenu"; - this.CoresSubMenu.Size = new System.Drawing.Size(165, 22); + this.CoresSubMenu.Size = new System.Drawing.Size(169, 22); this.CoresSubMenu.Text = "Cores"; this.CoresSubMenu.DropDownOpened += new System.EventHandler(this.CoresSubMenu_DropDownOpened); // // GBInSGBMenuItem // this.GBInSGBMenuItem.Name = "GBInSGBMenuItem"; - this.GBInSGBMenuItem.Size = new System.Drawing.Size(195, 22); + this.GBInSGBMenuItem.Size = new System.Drawing.Size(210, 22); this.GBInSGBMenuItem.Text = "GB in SGB"; this.GBInSGBMenuItem.Click += new System.EventHandler(this.GBInSGBMenuItem_Click); // // NesInQuickNESMenuItem // this.NesInQuickNESMenuItem.Name = "NesInQuickNESMenuItem"; - this.NesInQuickNESMenuItem.Size = new System.Drawing.Size(195, 22); + this.NesInQuickNESMenuItem.Size = new System.Drawing.Size(210, 22); this.NesInQuickNESMenuItem.Text = "NES with QuickNES"; this.NesInQuickNESMenuItem.Click += new System.EventHandler(this.NesInQuickNESMenuItem_Click); // // SnesWithSnes9xMenuItem // this.SnesWithSnes9xMenuItem.Name = "SnesWithSnes9xMenuItem"; - this.SnesWithSnes9xMenuItem.Size = new System.Drawing.Size(195, 22); + this.SnesWithSnes9xMenuItem.Size = new System.Drawing.Size(210, 22); this.SnesWithSnes9xMenuItem.Text = "SNES with Snes9x"; this.SnesWithSnes9xMenuItem.Click += new System.EventHandler(this.SnesWithSnes9xMenuItem_Click); // // gBAWithMGBAToolStripMenuItem // this.gBAWithMGBAToolStripMenuItem.Name = "gBAWithMGBAToolStripMenuItem"; - this.gBAWithMGBAToolStripMenuItem.Size = new System.Drawing.Size(195, 22); + this.gBAWithMGBAToolStripMenuItem.Size = new System.Drawing.Size(210, 22); this.gBAWithMGBAToolStripMenuItem.Text = "GBA with mGBA"; this.gBAWithMGBAToolStripMenuItem.Click += new System.EventHandler(this.gBAWithMGBAToolStripMenuItem_Click); // // toolStripSeparator8 // this.toolStripSeparator8.Name = "toolStripSeparator8"; - this.toolStripSeparator8.Size = new System.Drawing.Size(192, 6); + this.toolStripSeparator8.Size = new System.Drawing.Size(207, 6); // // N64VideoPluginSettingsMenuItem // this.N64VideoPluginSettingsMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.monitor; this.N64VideoPluginSettingsMenuItem.Name = "N64VideoPluginSettingsMenuItem"; - this.N64VideoPluginSettingsMenuItem.Size = new System.Drawing.Size(195, 22); + this.N64VideoPluginSettingsMenuItem.Size = new System.Drawing.Size(210, 22); this.N64VideoPluginSettingsMenuItem.Text = "N64 Video Plugin Settings"; this.N64VideoPluginSettingsMenuItem.Click += new System.EventHandler(this.N64VideoPluginSettingsMenuItem_Click); // // setLibretroCoreToolStripMenuItem // this.setLibretroCoreToolStripMenuItem.Name = "setLibretroCoreToolStripMenuItem"; - this.setLibretroCoreToolStripMenuItem.Size = new System.Drawing.Size(195, 22); + this.setLibretroCoreToolStripMenuItem.Size = new System.Drawing.Size(210, 22); this.setLibretroCoreToolStripMenuItem.Text = "Set Libretro Core"; this.setLibretroCoreToolStripMenuItem.Click += new System.EventHandler(this.setLibretroCoreToolStripMenuItem_Click); // // toolStripSeparator10 // this.toolStripSeparator10.Name = "toolStripSeparator10"; - this.toolStripSeparator10.Size = new System.Drawing.Size(162, 6); + this.toolStripSeparator10.Size = new System.Drawing.Size(166, 6); // // SaveConfigMenuItem // this.SaveConfigMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.Save; this.SaveConfigMenuItem.Name = "SaveConfigMenuItem"; - this.SaveConfigMenuItem.Size = new System.Drawing.Size(165, 22); + this.SaveConfigMenuItem.Size = new System.Drawing.Size(169, 22); this.SaveConfigMenuItem.Text = "Save Config"; this.SaveConfigMenuItem.Click += new System.EventHandler(this.SaveConfigMenuItem_Click); // @@ -1817,38 +1824,36 @@ // this.LoadConfigMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.LoadConfig; this.LoadConfigMenuItem.Name = "LoadConfigMenuItem"; - this.LoadConfigMenuItem.Size = new System.Drawing.Size(165, 22); + this.LoadConfigMenuItem.Size = new System.Drawing.Size(169, 22); this.LoadConfigMenuItem.Text = "Load Config"; this.LoadConfigMenuItem.Click += new System.EventHandler(this.LoadConfigMenuItem_Click); // // ToolsSubMenu // this.ToolsSubMenu.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { - this.ToolBoxMenuItem, - this.toolStripSeparator12, - this.RamWatchMenuItem, - this.RamSearchMenuItem, - this.HexEditorMenuItem, - this.TraceLoggerMenuItem, - this.CodeDataLoggerMenuItem, - this.DebuggerMenuItem, - this.TAStudioMenuItem, - this.MacroToolMenuItem, - this.VirtualPadMenuItem, - this.AutoHawkMenuItem, - this.BasicBotMenuItem, - this.toolStripSeparator11, - this.CheatsMenuItem, - this.LuaConsoleMenuItem, - this.customToolToolStripMenuItem, - this.toolStripSeparator29, - this.MultiDiskBundlerFileMenuItem, - this.toolStripSeparator29, + this.ToolBoxMenuItem, + this.toolStripSeparator12, + this.RamWatchMenuItem, + this.RamSearchMenuItem, + this.HexEditorMenuItem, + this.TraceLoggerMenuItem, + this.CodeDataLoggerMenuItem, + this.DebuggerMenuItem, + this.TAStudioMenuItem, + this.MacroToolMenuItem, + this.VirtualPadMenuItem, + this.AutoHawkMenuItem, + this.BasicBotMenuItem, + this.toolStripSeparator11, + this.CheatsMenuItem, + this.LuaConsoleMenuItem, + this.externalToolToolStripMenuItem, + this.toolStripSeparator29, this.MultiDiskBundlerFileMenuItem, this.gameSharkConverterToolStripMenuItem, - this.batchRunnerToolStripMenuItem}); + this.batchRunnerToolStripMenuItem}); this.ToolsSubMenu.Name = "ToolsSubMenu"; - this.ToolsSubMenu.Size = new System.Drawing.Size(44, 17); + this.ToolsSubMenu.Size = new System.Drawing.Size(47, 19); this.ToolsSubMenu.Text = "&Tools"; this.ToolsSubMenu.DropDownOpened += new System.EventHandler(this.ToolsSubMenu_DropDownOpened); // @@ -1856,20 +1861,20 @@ // this.ToolBoxMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.ToolBox; this.ToolBoxMenuItem.Name = "ToolBoxMenuItem"; - this.ToolBoxMenuItem.Size = new System.Drawing.Size(162, 22); + this.ToolBoxMenuItem.Size = new System.Drawing.Size(189, 22); this.ToolBoxMenuItem.Text = "&Tool Box"; this.ToolBoxMenuItem.Click += new System.EventHandler(this.ToolBoxMenuItem_Click); // // toolStripSeparator12 // this.toolStripSeparator12.Name = "toolStripSeparator12"; - this.toolStripSeparator12.Size = new System.Drawing.Size(159, 6); + this.toolStripSeparator12.Size = new System.Drawing.Size(186, 6); // // RamWatchMenuItem // this.RamWatchMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.watch; this.RamWatchMenuItem.Name = "RamWatchMenuItem"; - this.RamWatchMenuItem.Size = new System.Drawing.Size(162, 22); + this.RamWatchMenuItem.Size = new System.Drawing.Size(189, 22); this.RamWatchMenuItem.Text = "RAM &Watch"; this.RamWatchMenuItem.Click += new System.EventHandler(this.RamWatchMenuItem_Click); // @@ -1877,7 +1882,7 @@ // this.RamSearchMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.search; this.RamSearchMenuItem.Name = "RamSearchMenuItem"; - this.RamSearchMenuItem.Size = new System.Drawing.Size(162, 22); + this.RamSearchMenuItem.Size = new System.Drawing.Size(189, 22); this.RamSearchMenuItem.Text = "RAM &Search"; this.RamSearchMenuItem.Click += new System.EventHandler(this.RamSearchMenuItem_Click); // @@ -1885,7 +1890,7 @@ // this.HexEditorMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.poke; this.HexEditorMenuItem.Name = "HexEditorMenuItem"; - this.HexEditorMenuItem.Size = new System.Drawing.Size(162, 22); + this.HexEditorMenuItem.Size = new System.Drawing.Size(189, 22); this.HexEditorMenuItem.Text = "&Hex Editor"; this.HexEditorMenuItem.Click += new System.EventHandler(this.HexEditorMenuItem_Click); // @@ -1893,7 +1898,7 @@ // this.TraceLoggerMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.pencil; this.TraceLoggerMenuItem.Name = "TraceLoggerMenuItem"; - this.TraceLoggerMenuItem.Size = new System.Drawing.Size(162, 22); + this.TraceLoggerMenuItem.Size = new System.Drawing.Size(189, 22); this.TraceLoggerMenuItem.Text = "Trace &Logger"; this.TraceLoggerMenuItem.Click += new System.EventHandler(this.TraceLoggerMenuItem_Click); // @@ -1901,7 +1906,7 @@ // this.CodeDataLoggerMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.cdlogger; this.CodeDataLoggerMenuItem.Name = "CodeDataLoggerMenuItem"; - this.CodeDataLoggerMenuItem.Size = new System.Drawing.Size(162, 22); + this.CodeDataLoggerMenuItem.Size = new System.Drawing.Size(189, 22); this.CodeDataLoggerMenuItem.Text = "Code-Data Logger"; this.CodeDataLoggerMenuItem.Click += new System.EventHandler(this.CodeDataLoggerMenuItem_Click); // @@ -1909,7 +1914,7 @@ // this.DebuggerMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.Bug; this.DebuggerMenuItem.Name = "DebuggerMenuItem"; - this.DebuggerMenuItem.Size = new System.Drawing.Size(162, 22); + this.DebuggerMenuItem.Size = new System.Drawing.Size(189, 22); this.DebuggerMenuItem.Text = "&Debugger"; this.DebuggerMenuItem.Click += new System.EventHandler(this.DebuggerMenuItem_Click); // @@ -1917,14 +1922,14 @@ // this.TAStudioMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.TAStudio; this.TAStudioMenuItem.Name = "TAStudioMenuItem"; - this.TAStudioMenuItem.Size = new System.Drawing.Size(162, 22); + this.TAStudioMenuItem.Size = new System.Drawing.Size(189, 22); this.TAStudioMenuItem.Text = "&TAStudio"; this.TAStudioMenuItem.Click += new System.EventHandler(this.TAStudioMenuItem_Click); // // MacroToolMenuItem // this.MacroToolMenuItem.Name = "MacroToolMenuItem"; - this.MacroToolMenuItem.Size = new System.Drawing.Size(162, 22); + this.MacroToolMenuItem.Size = new System.Drawing.Size(189, 22); this.MacroToolMenuItem.Text = "&Macro Tool"; this.MacroToolMenuItem.Click += new System.EventHandler(this.MacroToolMenuItem_Click); // @@ -1932,34 +1937,34 @@ // this.VirtualPadMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.GameController; this.VirtualPadMenuItem.Name = "VirtualPadMenuItem"; - this.VirtualPadMenuItem.Size = new System.Drawing.Size(162, 22); + this.VirtualPadMenuItem.Size = new System.Drawing.Size(189, 22); this.VirtualPadMenuItem.Text = "Virtual Pad"; this.VirtualPadMenuItem.Click += new System.EventHandler(this.VirtualPadMenuItem_Click); // // AutoHawkMenuItem // this.AutoHawkMenuItem.Name = "AutoHawkMenuItem"; - this.AutoHawkMenuItem.Size = new System.Drawing.Size(162, 22); + this.AutoHawkMenuItem.Size = new System.Drawing.Size(189, 22); this.AutoHawkMenuItem.Text = "AutoHawk"; this.AutoHawkMenuItem.Click += new System.EventHandler(this.AutoHawkMenuItem_Click); // // BasicBotMenuItem // this.BasicBotMenuItem.Name = "BasicBotMenuItem"; - this.BasicBotMenuItem.Size = new System.Drawing.Size(162, 22); + this.BasicBotMenuItem.Size = new System.Drawing.Size(189, 22); this.BasicBotMenuItem.Text = "Basic Bot"; this.BasicBotMenuItem.Click += new System.EventHandler(this.BasicBotMenuItem_Click); // // toolStripSeparator11 // this.toolStripSeparator11.Name = "toolStripSeparator11"; - this.toolStripSeparator11.Size = new System.Drawing.Size(159, 6); + this.toolStripSeparator11.Size = new System.Drawing.Size(186, 6); // // CheatsMenuItem // this.CheatsMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.Freeze; this.CheatsMenuItem.Name = "CheatsMenuItem"; - this.CheatsMenuItem.Size = new System.Drawing.Size(162, 22); + this.CheatsMenuItem.Size = new System.Drawing.Size(189, 22); this.CheatsMenuItem.Text = "Cheats"; this.CheatsMenuItem.Click += new System.EventHandler(this.CheatsMenuItem_Click); // @@ -1967,35 +1972,44 @@ // this.LuaConsoleMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.Lua; this.LuaConsoleMenuItem.Name = "LuaConsoleMenuItem"; - this.LuaConsoleMenuItem.Size = new System.Drawing.Size(162, 22); + this.LuaConsoleMenuItem.Size = new System.Drawing.Size(189, 22); this.LuaConsoleMenuItem.Text = "Lua Console"; this.LuaConsoleMenuItem.Click += new System.EventHandler(this.LuaConsoleMenuItem_Click); // - // customToolToolStripMenuItem + // externalToolToolStripMenuItem // - this.customToolToolStripMenuItem.Enabled = false; - this.customToolToolStripMenuItem.Name = "customToolToolStripMenuItem"; - this.customToolToolStripMenuItem.Size = new System.Drawing.Size(172, 22); - this.customToolToolStripMenuItem.Text = "Custom Tool"; - this.customToolToolStripMenuItem.Click += new System.EventHandler(this.CustomToolMenuItem_Click); + this.externalToolToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { + this.dummyExternalTool}); + this.externalToolToolStripMenuItem.Name = "externalToolToolStripMenuItem"; + this.externalToolToolStripMenuItem.Size = new System.Drawing.Size(189, 22); + this.externalToolToolStripMenuItem.Text = "External Tool"; + this.externalToolToolStripMenuItem.DropDownOpening += new System.EventHandler(this.ExternalToolToolStripMenuItem_DropDownOpening); // // toolStripSeparator29 // this.toolStripSeparator29.Name = "toolStripSeparator29"; - this.toolStripSeparator29.Size = new System.Drawing.Size(159, 6); + this.toolStripSeparator29.Size = new System.Drawing.Size(186, 6); // // MultiDiskBundlerFileMenuItem // this.MultiDiskBundlerFileMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.SaveConfig; this.MultiDiskBundlerFileMenuItem.Name = "MultiDiskBundlerFileMenuItem"; - this.MultiDiskBundlerFileMenuItem.Size = new System.Drawing.Size(162, 22); + this.MultiDiskBundlerFileMenuItem.Size = new System.Drawing.Size(189, 22); this.MultiDiskBundlerFileMenuItem.Text = "Multi-disk Bundler"; this.MultiDiskBundlerFileMenuItem.Click += new System.EventHandler(this.CreateMultigameFileMenuItem_Click); // + // gameSharkConverterToolStripMenuItem + // + this.gameSharkConverterToolStripMenuItem.Image = ((System.Drawing.Image)(resources.GetObject("gameSharkConverterToolStripMenuItem.Image"))); + this.gameSharkConverterToolStripMenuItem.Name = "gameSharkConverterToolStripMenuItem"; + this.gameSharkConverterToolStripMenuItem.Size = new System.Drawing.Size(189, 22); + this.gameSharkConverterToolStripMenuItem.Text = "GameShark Converter"; + this.gameSharkConverterToolStripMenuItem.Click += new System.EventHandler(this.gameSharkConverterToolStripMenuItem_Click); + // // batchRunnerToolStripMenuItem // this.batchRunnerToolStripMenuItem.Name = "batchRunnerToolStripMenuItem"; - this.batchRunnerToolStripMenuItem.Size = new System.Drawing.Size(162, 22); + this.batchRunnerToolStripMenuItem.Size = new System.Drawing.Size(189, 22); this.batchRunnerToolStripMenuItem.Text = "Batch Runner"; this.batchRunnerToolStripMenuItem.Visible = false; this.batchRunnerToolStripMenuItem.Click += new System.EventHandler(this.batchRunnerToolStripMenuItem_Click); @@ -2003,92 +2017,92 @@ // NESSubMenu // this.NESSubMenu.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { - this.coreToolStripMenuItem, - this.toolStripSeparator34, - this.NESPPUViewerMenuItem, - this.NESNametableViewerMenuItem, - this.NESGameGenieCodesMenuItem, - this.musicRipperToolStripMenuItem, - this.toolStripSeparator17, - this.NesControllerSettingsMenuItem, - this.NESGraphicSettingsMenuItem, - this.NESSoundChannelsMenuItem, - this.MovieSettingsMenuItem, - this.toolStripSeparator22, - this.FDSControlsMenuItem, - this.barcodeReaderToolStripMenuItem}); + this.coreToolStripMenuItem, + this.toolStripSeparator34, + this.NESPPUViewerMenuItem, + this.NESNametableViewerMenuItem, + this.NESGameGenieCodesMenuItem, + this.musicRipperToolStripMenuItem, + this.toolStripSeparator17, + this.NesControllerSettingsMenuItem, + this.NESGraphicSettingsMenuItem, + this.NESSoundChannelsMenuItem, + this.MovieSettingsMenuItem, + this.toolStripSeparator22, + this.FDSControlsMenuItem, + this.barcodeReaderToolStripMenuItem}); this.NESSubMenu.Name = "NESSubMenu"; - this.NESSubMenu.Size = new System.Drawing.Size(38, 17); + this.NESSubMenu.Size = new System.Drawing.Size(40, 19); this.NESSubMenu.Text = "&NES"; this.NESSubMenu.DropDownOpened += new System.EventHandler(this.NESSubMenu_DropDownOpened); // // coreToolStripMenuItem // this.coreToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { - this.quickNESToolStripMenuItem, - this.nesHawkToolStripMenuItem}); + this.quickNESToolStripMenuItem, + this.nesHawkToolStripMenuItem}); this.coreToolStripMenuItem.Name = "coreToolStripMenuItem"; - this.coreToolStripMenuItem.Size = new System.Drawing.Size(217, 22); + this.coreToolStripMenuItem.Size = new System.Drawing.Size(233, 22); this.coreToolStripMenuItem.Text = "&Core"; this.coreToolStripMenuItem.DropDownOpened += new System.EventHandler(this.coreToolStripMenuItem_DropDownOpened); // // quickNESToolStripMenuItem // this.quickNESToolStripMenuItem.Name = "quickNESToolStripMenuItem"; - this.quickNESToolStripMenuItem.Size = new System.Drawing.Size(118, 22); + this.quickNESToolStripMenuItem.Size = new System.Drawing.Size(125, 22); this.quickNESToolStripMenuItem.Text = "&QuickNes"; this.quickNESToolStripMenuItem.Click += new System.EventHandler(this.quickNESToolStripMenuItem_Click); // // nesHawkToolStripMenuItem // this.nesHawkToolStripMenuItem.Name = "nesHawkToolStripMenuItem"; - this.nesHawkToolStripMenuItem.Size = new System.Drawing.Size(118, 22); + this.nesHawkToolStripMenuItem.Size = new System.Drawing.Size(125, 22); this.nesHawkToolStripMenuItem.Text = "&NesHawk"; this.nesHawkToolStripMenuItem.Click += new System.EventHandler(this.nesHawkToolStripMenuItem_Click); // // toolStripSeparator34 // this.toolStripSeparator34.Name = "toolStripSeparator34"; - this.toolStripSeparator34.Size = new System.Drawing.Size(214, 6); + this.toolStripSeparator34.Size = new System.Drawing.Size(230, 6); // // NESPPUViewerMenuItem // this.NESPPUViewerMenuItem.Name = "NESPPUViewerMenuItem"; - this.NESPPUViewerMenuItem.Size = new System.Drawing.Size(217, 22); + this.NESPPUViewerMenuItem.Size = new System.Drawing.Size(233, 22); this.NESPPUViewerMenuItem.Text = "&PPU Viewer"; this.NESPPUViewerMenuItem.Click += new System.EventHandler(this.NESPPUViewerMenuItem_Click); // // NESNametableViewerMenuItem // this.NESNametableViewerMenuItem.Name = "NESNametableViewerMenuItem"; - this.NESNametableViewerMenuItem.Size = new System.Drawing.Size(217, 22); + this.NESNametableViewerMenuItem.Size = new System.Drawing.Size(233, 22); this.NESNametableViewerMenuItem.Text = "&Nametable Viewer"; this.NESNametableViewerMenuItem.Click += new System.EventHandler(this.NESNametableViewerMenuItem_Click); // // NESGameGenieCodesMenuItem // this.NESGameGenieCodesMenuItem.Name = "NESGameGenieCodesMenuItem"; - this.NESGameGenieCodesMenuItem.Size = new System.Drawing.Size(217, 22); + this.NESGameGenieCodesMenuItem.Size = new System.Drawing.Size(233, 22); this.NESGameGenieCodesMenuItem.Text = "&Game Genie Encoder/Decoder"; this.NESGameGenieCodesMenuItem.Click += new System.EventHandler(this.NESGameGenieCodesMenuItem_Click); // // musicRipperToolStripMenuItem // this.musicRipperToolStripMenuItem.Name = "musicRipperToolStripMenuItem"; - this.musicRipperToolStripMenuItem.Size = new System.Drawing.Size(217, 22); + this.musicRipperToolStripMenuItem.Size = new System.Drawing.Size(233, 22); this.musicRipperToolStripMenuItem.Text = "Music Ripper"; this.musicRipperToolStripMenuItem.Click += new System.EventHandler(this.musicRipperToolStripMenuItem_Click); // // toolStripSeparator17 // this.toolStripSeparator17.Name = "toolStripSeparator17"; - this.toolStripSeparator17.Size = new System.Drawing.Size(214, 6); + this.toolStripSeparator17.Size = new System.Drawing.Size(230, 6); // // NesControllerSettingsMenuItem // this.NesControllerSettingsMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.GameController; this.NesControllerSettingsMenuItem.Name = "NesControllerSettingsMenuItem"; - this.NesControllerSettingsMenuItem.Size = new System.Drawing.Size(217, 22); + this.NesControllerSettingsMenuItem.Size = new System.Drawing.Size(233, 22); this.NesControllerSettingsMenuItem.Text = "Controller Settings..."; this.NesControllerSettingsMenuItem.Click += new System.EventHandler(this.NesControllerSettingsMenuItem_Click); // @@ -2096,7 +2110,7 @@ // this.NESGraphicSettingsMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.tvIcon; this.NESGraphicSettingsMenuItem.Name = "NESGraphicSettingsMenuItem"; - this.NESGraphicSettingsMenuItem.Size = new System.Drawing.Size(217, 22); + this.NESGraphicSettingsMenuItem.Size = new System.Drawing.Size(233, 22); this.NESGraphicSettingsMenuItem.Text = "Graphics Settings..."; this.NESGraphicSettingsMenuItem.Click += new System.EventHandler(this.NESGraphicSettingsMenuItem_Click); // @@ -2104,60 +2118,60 @@ // this.NESSoundChannelsMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.AudioHS; this.NESSoundChannelsMenuItem.Name = "NESSoundChannelsMenuItem"; - this.NESSoundChannelsMenuItem.Size = new System.Drawing.Size(217, 22); + this.NESSoundChannelsMenuItem.Size = new System.Drawing.Size(233, 22); this.NESSoundChannelsMenuItem.Text = "Sound Channels..."; this.NESSoundChannelsMenuItem.Click += new System.EventHandler(this.NESSoundChannelsMenuItem_Click); // // MovieSettingsMenuItem // this.MovieSettingsMenuItem.Name = "MovieSettingsMenuItem"; - this.MovieSettingsMenuItem.Size = new System.Drawing.Size(217, 22); + this.MovieSettingsMenuItem.Size = new System.Drawing.Size(233, 22); this.MovieSettingsMenuItem.Text = "Advanced Settings..."; this.MovieSettingsMenuItem.Click += new System.EventHandler(this.MovieSettingsMenuItem_Click); // // toolStripSeparator22 // this.toolStripSeparator22.Name = "toolStripSeparator22"; - this.toolStripSeparator22.Size = new System.Drawing.Size(214, 6); + this.toolStripSeparator22.Size = new System.Drawing.Size(230, 6); // // FDSControlsMenuItem // this.FDSControlsMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { - this.FdsEjectDiskMenuItem}); + this.FdsEjectDiskMenuItem}); this.FDSControlsMenuItem.Name = "FDSControlsMenuItem"; - this.FDSControlsMenuItem.Size = new System.Drawing.Size(217, 22); + this.FDSControlsMenuItem.Size = new System.Drawing.Size(233, 22); this.FDSControlsMenuItem.Text = "FDS Controls"; this.FDSControlsMenuItem.DropDownOpened += new System.EventHandler(this.FdsControlsMenuItem_DropDownOpened); // // FdsEjectDiskMenuItem // this.FdsEjectDiskMenuItem.Name = "FdsEjectDiskMenuItem"; - this.FdsEjectDiskMenuItem.Size = new System.Drawing.Size(120, 22); + this.FdsEjectDiskMenuItem.Size = new System.Drawing.Size(124, 22); this.FdsEjectDiskMenuItem.Text = "&Eject Disk"; this.FdsEjectDiskMenuItem.Click += new System.EventHandler(this.FdsEjectDiskMenuItem_Click); // // barcodeReaderToolStripMenuItem // this.barcodeReaderToolStripMenuItem.Name = "barcodeReaderToolStripMenuItem"; - this.barcodeReaderToolStripMenuItem.Size = new System.Drawing.Size(217, 22); + this.barcodeReaderToolStripMenuItem.Size = new System.Drawing.Size(233, 22); this.barcodeReaderToolStripMenuItem.Text = "Barcode Reader"; this.barcodeReaderToolStripMenuItem.Click += new System.EventHandler(this.barcodeReaderToolStripMenuItem_Click); // // PCESubMenu // this.PCESubMenu.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { - this.PceControllerSettingsMenuItem, - this.PCEGraphicsSettingsMenuItem, - this.toolStripSeparator32, - this.PCEBGViewerMenuItem, - this.PCEtileViewerToolStripMenuItem, - this.PceSoundDebuggerToolStripMenuItem, - this.toolStripSeparator25, - this.PCEAlwaysPerformSpriteLimitMenuItem, - this.PCEAlwaysEqualizeVolumesMenuItem, - this.PCEArcadeCardRewindEnableMenuItem}); + this.PceControllerSettingsMenuItem, + this.PCEGraphicsSettingsMenuItem, + this.toolStripSeparator32, + this.PCEBGViewerMenuItem, + this.PCEtileViewerToolStripMenuItem, + this.PceSoundDebuggerToolStripMenuItem, + this.toolStripSeparator25, + this.PCEAlwaysPerformSpriteLimitMenuItem, + this.PCEAlwaysEqualizeVolumesMenuItem, + this.PCEArcadeCardRewindEnableMenuItem}); this.PCESubMenu.Name = "PCESubMenu"; - this.PCESubMenu.Size = new System.Drawing.Size(38, 17); + this.PCESubMenu.Size = new System.Drawing.Size(40, 19); this.PCESubMenu.Text = "&PCE"; this.PCESubMenu.DropDownOpened += new System.EventHandler(this.PCESubMenu_DropDownOpened); // @@ -2165,7 +2179,7 @@ // this.PceControllerSettingsMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.GameController; this.PceControllerSettingsMenuItem.Name = "PceControllerSettingsMenuItem"; - this.PceControllerSettingsMenuItem.Size = new System.Drawing.Size(240, 22); + this.PceControllerSettingsMenuItem.Size = new System.Drawing.Size(258, 22); this.PceControllerSettingsMenuItem.Text = "Controller Settings"; this.PceControllerSettingsMenuItem.Click += new System.EventHandler(this.PceControllerSettingsMenuItem_Click); // @@ -2173,244 +2187,244 @@ // this.PCEGraphicsSettingsMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.tvIcon; this.PCEGraphicsSettingsMenuItem.Name = "PCEGraphicsSettingsMenuItem"; - this.PCEGraphicsSettingsMenuItem.Size = new System.Drawing.Size(240, 22); + this.PCEGraphicsSettingsMenuItem.Size = new System.Drawing.Size(258, 22); this.PCEGraphicsSettingsMenuItem.Text = "Graphics Settings"; this.PCEGraphicsSettingsMenuItem.Click += new System.EventHandler(this.PCEGraphicsSettingsMenuItem_Click); // // toolStripSeparator32 // this.toolStripSeparator32.Name = "toolStripSeparator32"; - this.toolStripSeparator32.Size = new System.Drawing.Size(237, 6); + this.toolStripSeparator32.Size = new System.Drawing.Size(255, 6); // // PCEBGViewerMenuItem // this.PCEBGViewerMenuItem.Name = "PCEBGViewerMenuItem"; - this.PCEBGViewerMenuItem.Size = new System.Drawing.Size(240, 22); + this.PCEBGViewerMenuItem.Size = new System.Drawing.Size(258, 22); this.PCEBGViewerMenuItem.Text = "&BG Viewer"; this.PCEBGViewerMenuItem.Click += new System.EventHandler(this.PCEBGViewerMenuItem_Click); // // PCEtileViewerToolStripMenuItem // this.PCEtileViewerToolStripMenuItem.Name = "PCEtileViewerToolStripMenuItem"; - this.PCEtileViewerToolStripMenuItem.Size = new System.Drawing.Size(240, 22); + this.PCEtileViewerToolStripMenuItem.Size = new System.Drawing.Size(258, 22); this.PCEtileViewerToolStripMenuItem.Text = "&Tile Viewer"; this.PCEtileViewerToolStripMenuItem.Click += new System.EventHandler(this.PceTileViewerMenuItem_Click); // // PceSoundDebuggerToolStripMenuItem // this.PceSoundDebuggerToolStripMenuItem.Name = "PceSoundDebuggerToolStripMenuItem"; - this.PceSoundDebuggerToolStripMenuItem.Size = new System.Drawing.Size(240, 22); + this.PceSoundDebuggerToolStripMenuItem.Size = new System.Drawing.Size(258, 22); this.PceSoundDebuggerToolStripMenuItem.Text = "&Sound Debugger"; this.PceSoundDebuggerToolStripMenuItem.Click += new System.EventHandler(this.PceSoundDebuggerToolStripMenuItem_Click); // // toolStripSeparator25 // this.toolStripSeparator25.Name = "toolStripSeparator25"; - this.toolStripSeparator25.Size = new System.Drawing.Size(237, 6); + this.toolStripSeparator25.Size = new System.Drawing.Size(255, 6); // // PCEAlwaysPerformSpriteLimitMenuItem // this.PCEAlwaysPerformSpriteLimitMenuItem.Name = "PCEAlwaysPerformSpriteLimitMenuItem"; - this.PCEAlwaysPerformSpriteLimitMenuItem.Size = new System.Drawing.Size(240, 22); + this.PCEAlwaysPerformSpriteLimitMenuItem.Size = new System.Drawing.Size(258, 22); this.PCEAlwaysPerformSpriteLimitMenuItem.Text = "Always Perform Sprite Limit"; this.PCEAlwaysPerformSpriteLimitMenuItem.Click += new System.EventHandler(this.PCEAlwaysPerformSpriteLimitMenuItem_Click); // // PCEAlwaysEqualizeVolumesMenuItem // this.PCEAlwaysEqualizeVolumesMenuItem.Name = "PCEAlwaysEqualizeVolumesMenuItem"; - this.PCEAlwaysEqualizeVolumesMenuItem.Size = new System.Drawing.Size(240, 22); + this.PCEAlwaysEqualizeVolumesMenuItem.Size = new System.Drawing.Size(258, 22); this.PCEAlwaysEqualizeVolumesMenuItem.Text = "Always Equalize Volumes (PCE-CD)"; this.PCEAlwaysEqualizeVolumesMenuItem.Click += new System.EventHandler(this.PCEAlwaysEqualizeVolumesMenuItem_Click); // // PCEArcadeCardRewindEnableMenuItem // this.PCEArcadeCardRewindEnableMenuItem.Name = "PCEArcadeCardRewindEnableMenuItem"; - this.PCEArcadeCardRewindEnableMenuItem.Size = new System.Drawing.Size(240, 22); + this.PCEArcadeCardRewindEnableMenuItem.Size = new System.Drawing.Size(258, 22); this.PCEArcadeCardRewindEnableMenuItem.Text = "Arcade Card Rewind-Enable Hack"; this.PCEArcadeCardRewindEnableMenuItem.Click += new System.EventHandler(this.PCEArcadeCardRewindEnableMenuItem_Click); // // SMSSubMenu // this.SMSSubMenu.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { - this.SMSregionToolStripMenuItem, - this.SMSdisplayToolStripMenuItem, - this.SMStoolStripMenuItem2, - this.SMSenableBIOSToolStripMenuItem, - this.SMSEnableFMChipMenuItem, - this.SMSOverclockMenuItem, - this.SMSForceStereoMenuItem, - this.SMSSpriteLimitMenuItem, - this.SMSFix3DGameDisplayToolStripMenuItem, - this.ShowClippedRegionsMenuItem, - this.HighlightActiveDisplayRegionMenuItem, - this.SMSGraphicsSettingsMenuItem, - this.toolStripSeparator24, - this.SMSVDPViewerToolStripMenuItem, - this.GGGameGenieMenuItem}); + this.SMSregionToolStripMenuItem, + this.SMSdisplayToolStripMenuItem, + this.SMStoolStripMenuItem2, + this.SMSenableBIOSToolStripMenuItem, + this.SMSEnableFMChipMenuItem, + this.SMSOverclockMenuItem, + this.SMSForceStereoMenuItem, + this.SMSSpriteLimitMenuItem, + this.SMSFix3DGameDisplayToolStripMenuItem, + this.ShowClippedRegionsMenuItem, + this.HighlightActiveDisplayRegionMenuItem, + this.SMSGraphicsSettingsMenuItem, + this.toolStripSeparator24, + this.SMSVDPViewerToolStripMenuItem, + this.GGGameGenieMenuItem}); this.SMSSubMenu.Name = "SMSSubMenu"; - this.SMSSubMenu.Size = new System.Drawing.Size(39, 17); + this.SMSSubMenu.Size = new System.Drawing.Size(42, 19); this.SMSSubMenu.Text = "&SMS"; this.SMSSubMenu.DropDownOpened += new System.EventHandler(this.SMSSubMenu_DropDownOpened); // // SMSregionToolStripMenuItem // this.SMSregionToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { - this.SMSregionExportToolStripMenuItem, - this.SMSregionJapanToolStripMenuItem, - this.SMSregionAutoToolStripMenuItem}); + this.SMSregionExportToolStripMenuItem, + this.SMSregionJapanToolStripMenuItem, + this.SMSregionAutoToolStripMenuItem}); this.SMSregionToolStripMenuItem.Name = "SMSregionToolStripMenuItem"; - this.SMSregionToolStripMenuItem.Size = new System.Drawing.Size(221, 22); + this.SMSregionToolStripMenuItem.Size = new System.Drawing.Size(241, 22); this.SMSregionToolStripMenuItem.Text = "Region"; // // SMSregionExportToolStripMenuItem // this.SMSregionExportToolStripMenuItem.Name = "SMSregionExportToolStripMenuItem"; - this.SMSregionExportToolStripMenuItem.Size = new System.Drawing.Size(106, 22); + this.SMSregionExportToolStripMenuItem.Size = new System.Drawing.Size(107, 22); this.SMSregionExportToolStripMenuItem.Text = "Export"; this.SMSregionExportToolStripMenuItem.Click += new System.EventHandler(this.SMS_RegionExport_Click); // // SMSregionJapanToolStripMenuItem // this.SMSregionJapanToolStripMenuItem.Name = "SMSregionJapanToolStripMenuItem"; - this.SMSregionJapanToolStripMenuItem.Size = new System.Drawing.Size(106, 22); + this.SMSregionJapanToolStripMenuItem.Size = new System.Drawing.Size(107, 22); this.SMSregionJapanToolStripMenuItem.Text = "Japan"; this.SMSregionJapanToolStripMenuItem.Click += new System.EventHandler(this.SMS_RegionJapan_Click); // // SMSregionAutoToolStripMenuItem // this.SMSregionAutoToolStripMenuItem.Name = "SMSregionAutoToolStripMenuItem"; - this.SMSregionAutoToolStripMenuItem.Size = new System.Drawing.Size(106, 22); + this.SMSregionAutoToolStripMenuItem.Size = new System.Drawing.Size(107, 22); this.SMSregionAutoToolStripMenuItem.Text = "Auto"; this.SMSregionAutoToolStripMenuItem.Click += new System.EventHandler(this.SMS_RegionAuto_Click); // // SMSdisplayToolStripMenuItem // this.SMSdisplayToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { - this.SMSdisplayNtscToolStripMenuItem, - this.SMSdisplayPalToolStripMenuItem, - this.SMSdisplayAutoToolStripMenuItem}); + this.SMSdisplayNtscToolStripMenuItem, + this.SMSdisplayPalToolStripMenuItem, + this.SMSdisplayAutoToolStripMenuItem}); this.SMSdisplayToolStripMenuItem.Name = "SMSdisplayToolStripMenuItem"; - this.SMSdisplayToolStripMenuItem.Size = new System.Drawing.Size(221, 22); + this.SMSdisplayToolStripMenuItem.Size = new System.Drawing.Size(241, 22); this.SMSdisplayToolStripMenuItem.Text = "Display Type"; // // SMSdisplayNtscToolStripMenuItem // this.SMSdisplayNtscToolStripMenuItem.Name = "SMSdisplayNtscToolStripMenuItem"; - this.SMSdisplayNtscToolStripMenuItem.Size = new System.Drawing.Size(100, 22); + this.SMSdisplayNtscToolStripMenuItem.Size = new System.Drawing.Size(104, 22); this.SMSdisplayNtscToolStripMenuItem.Text = "NTSC"; this.SMSdisplayNtscToolStripMenuItem.Click += new System.EventHandler(this.SMS_DisplayNTSC_Click); // // SMSdisplayPalToolStripMenuItem // this.SMSdisplayPalToolStripMenuItem.Name = "SMSdisplayPalToolStripMenuItem"; - this.SMSdisplayPalToolStripMenuItem.Size = new System.Drawing.Size(100, 22); + this.SMSdisplayPalToolStripMenuItem.Size = new System.Drawing.Size(104, 22); this.SMSdisplayPalToolStripMenuItem.Text = "PAL"; this.SMSdisplayPalToolStripMenuItem.Click += new System.EventHandler(this.SMS_DisplayPAL_Click); // // SMSdisplayAutoToolStripMenuItem // this.SMSdisplayAutoToolStripMenuItem.Name = "SMSdisplayAutoToolStripMenuItem"; - this.SMSdisplayAutoToolStripMenuItem.Size = new System.Drawing.Size(100, 22); + this.SMSdisplayAutoToolStripMenuItem.Size = new System.Drawing.Size(104, 22); this.SMSdisplayAutoToolStripMenuItem.Text = "Auto"; this.SMSdisplayAutoToolStripMenuItem.Click += new System.EventHandler(this.SMS_DisplayAuto_Click); // // SMStoolStripMenuItem2 // this.SMStoolStripMenuItem2.Name = "SMStoolStripMenuItem2"; - this.SMStoolStripMenuItem2.Size = new System.Drawing.Size(218, 6); + this.SMStoolStripMenuItem2.Size = new System.Drawing.Size(238, 6); // // SMSenableBIOSToolStripMenuItem // this.SMSenableBIOSToolStripMenuItem.Name = "SMSenableBIOSToolStripMenuItem"; - this.SMSenableBIOSToolStripMenuItem.Size = new System.Drawing.Size(221, 22); + this.SMSenableBIOSToolStripMenuItem.Size = new System.Drawing.Size(241, 22); this.SMSenableBIOSToolStripMenuItem.Text = "Enable BIOS"; this.SMSenableBIOSToolStripMenuItem.Click += new System.EventHandler(this.SMS_BIOS_Click); // // SMSEnableFMChipMenuItem // this.SMSEnableFMChipMenuItem.Name = "SMSEnableFMChipMenuItem"; - this.SMSEnableFMChipMenuItem.Size = new System.Drawing.Size(221, 22); + this.SMSEnableFMChipMenuItem.Size = new System.Drawing.Size(241, 22); this.SMSEnableFMChipMenuItem.Text = "&Enable FM Chip"; this.SMSEnableFMChipMenuItem.Click += new System.EventHandler(this.SMSEnableFMChipMenuItem_Click); // // SMSOverclockMenuItem // this.SMSOverclockMenuItem.Name = "SMSOverclockMenuItem"; - this.SMSOverclockMenuItem.Size = new System.Drawing.Size(221, 22); + this.SMSOverclockMenuItem.Size = new System.Drawing.Size(241, 22); this.SMSOverclockMenuItem.Text = "&Overclock when Known Safe"; this.SMSOverclockMenuItem.Click += new System.EventHandler(this.SMSOverclockMenuItem_Click); // // SMSForceStereoMenuItem // this.SMSForceStereoMenuItem.Name = "SMSForceStereoMenuItem"; - this.SMSForceStereoMenuItem.Size = new System.Drawing.Size(221, 22); + this.SMSForceStereoMenuItem.Size = new System.Drawing.Size(241, 22); this.SMSForceStereoMenuItem.Text = "&Force Stereo Separation"; this.SMSForceStereoMenuItem.Click += new System.EventHandler(this.SMSForceStereoMenuItem_Click); // // SMSSpriteLimitMenuItem // this.SMSSpriteLimitMenuItem.Name = "SMSSpriteLimitMenuItem"; - this.SMSSpriteLimitMenuItem.Size = new System.Drawing.Size(221, 22); + this.SMSSpriteLimitMenuItem.Size = new System.Drawing.Size(241, 22); this.SMSSpriteLimitMenuItem.Text = "Sprite &Limit"; this.SMSSpriteLimitMenuItem.Click += new System.EventHandler(this.SMSSpriteLimitMenuItem_Click); // // SMSFix3DGameDisplayToolStripMenuItem // this.SMSFix3DGameDisplayToolStripMenuItem.Name = "SMSFix3DGameDisplayToolStripMenuItem"; - this.SMSFix3DGameDisplayToolStripMenuItem.Size = new System.Drawing.Size(221, 22); + this.SMSFix3DGameDisplayToolStripMenuItem.Size = new System.Drawing.Size(241, 22); this.SMSFix3DGameDisplayToolStripMenuItem.Text = "Fix 3D Game Display"; this.SMSFix3DGameDisplayToolStripMenuItem.Click += new System.EventHandler(this.SMSFix3DDisplayMenuItem_Click); // // ShowClippedRegionsMenuItem // this.ShowClippedRegionsMenuItem.Name = "ShowClippedRegionsMenuItem"; - this.ShowClippedRegionsMenuItem.Size = new System.Drawing.Size(221, 22); + this.ShowClippedRegionsMenuItem.Size = new System.Drawing.Size(241, 22); this.ShowClippedRegionsMenuItem.Text = "&Show Clipped Regions"; this.ShowClippedRegionsMenuItem.Click += new System.EventHandler(this.ShowClippedRegionsMenuItem_Click); // // HighlightActiveDisplayRegionMenuItem // this.HighlightActiveDisplayRegionMenuItem.Name = "HighlightActiveDisplayRegionMenuItem"; - this.HighlightActiveDisplayRegionMenuItem.Size = new System.Drawing.Size(221, 22); + this.HighlightActiveDisplayRegionMenuItem.Size = new System.Drawing.Size(241, 22); this.HighlightActiveDisplayRegionMenuItem.Text = "&Highlight Active Display Region"; this.HighlightActiveDisplayRegionMenuItem.Click += new System.EventHandler(this.HighlightActiveDisplayRegionMenuItem_Click); // // SMSGraphicsSettingsMenuItem // this.SMSGraphicsSettingsMenuItem.Name = "SMSGraphicsSettingsMenuItem"; - this.SMSGraphicsSettingsMenuItem.Size = new System.Drawing.Size(221, 22); + this.SMSGraphicsSettingsMenuItem.Size = new System.Drawing.Size(241, 22); this.SMSGraphicsSettingsMenuItem.Text = "&Graphics Settings..."; this.SMSGraphicsSettingsMenuItem.Click += new System.EventHandler(this.SMSGraphicsSettingsMenuItem_Click); // // toolStripSeparator24 // this.toolStripSeparator24.Name = "toolStripSeparator24"; - this.toolStripSeparator24.Size = new System.Drawing.Size(218, 6); + this.toolStripSeparator24.Size = new System.Drawing.Size(238, 6); // // SMSVDPViewerToolStripMenuItem // this.SMSVDPViewerToolStripMenuItem.Name = "SMSVDPViewerToolStripMenuItem"; - this.SMSVDPViewerToolStripMenuItem.Size = new System.Drawing.Size(221, 22); + this.SMSVDPViewerToolStripMenuItem.Size = new System.Drawing.Size(241, 22); this.SMSVDPViewerToolStripMenuItem.Text = "&VDP Viewer"; this.SMSVDPViewerToolStripMenuItem.Click += new System.EventHandler(this.SmsVdpViewerMenuItem_Click); // // GGGameGenieMenuItem // this.GGGameGenieMenuItem.Name = "GGGameGenieMenuItem"; - this.GGGameGenieMenuItem.Size = new System.Drawing.Size(221, 22); + this.GGGameGenieMenuItem.Size = new System.Drawing.Size(241, 22); this.GGGameGenieMenuItem.Text = "&Game Genie Encoder/Decoder"; this.GGGameGenieMenuItem.Click += new System.EventHandler(this.GGGameGenieMenuItem_Click); // // TI83SubMenu // this.TI83SubMenu.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { - this.KeypadMenuItem, - this.LoadTIFileMenuItem, - this.toolStripSeparator13, - this.AutoloadKeypadMenuItem, - this.paletteToolStripMenuItem}); + this.KeypadMenuItem, + this.LoadTIFileMenuItem, + this.toolStripSeparator13, + this.AutoloadKeypadMenuItem, + this.paletteToolStripMenuItem}); this.TI83SubMenu.Name = "TI83SubMenu"; - this.TI83SubMenu.Size = new System.Drawing.Size(41, 17); + this.TI83SubMenu.Size = new System.Drawing.Size(41, 19); this.TI83SubMenu.Text = "TI83"; this.TI83SubMenu.DropDownOpened += new System.EventHandler(this.TI83SubMenu_DropDownOpened); // @@ -2418,44 +2432,44 @@ // this.KeypadMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.calculator; this.KeypadMenuItem.Name = "KeypadMenuItem"; - this.KeypadMenuItem.Size = new System.Drawing.Size(157, 22); + this.KeypadMenuItem.Size = new System.Drawing.Size(165, 22); this.KeypadMenuItem.Text = "Keypad"; this.KeypadMenuItem.Click += new System.EventHandler(this.KeypadMenuItem_Click); // // LoadTIFileMenuItem // this.LoadTIFileMenuItem.Name = "LoadTIFileMenuItem"; - this.LoadTIFileMenuItem.Size = new System.Drawing.Size(157, 22); + this.LoadTIFileMenuItem.Size = new System.Drawing.Size(165, 22); this.LoadTIFileMenuItem.Text = "Load TI-83 File..."; this.LoadTIFileMenuItem.Click += new System.EventHandler(this.LoadTIFileMenuItem_Click); // // toolStripSeparator13 // this.toolStripSeparator13.Name = "toolStripSeparator13"; - this.toolStripSeparator13.Size = new System.Drawing.Size(154, 6); + this.toolStripSeparator13.Size = new System.Drawing.Size(162, 6); // // AutoloadKeypadMenuItem // this.AutoloadKeypadMenuItem.Checked = true; this.AutoloadKeypadMenuItem.CheckState = System.Windows.Forms.CheckState.Checked; this.AutoloadKeypadMenuItem.Name = "AutoloadKeypadMenuItem"; - this.AutoloadKeypadMenuItem.Size = new System.Drawing.Size(157, 22); + this.AutoloadKeypadMenuItem.Size = new System.Drawing.Size(165, 22); this.AutoloadKeypadMenuItem.Text = "Autoload Keypad"; this.AutoloadKeypadMenuItem.Click += new System.EventHandler(this.AutoloadKeypadMenuItem_Click); // // paletteToolStripMenuItem // this.paletteToolStripMenuItem.Name = "paletteToolStripMenuItem"; - this.paletteToolStripMenuItem.Size = new System.Drawing.Size(157, 22); + this.paletteToolStripMenuItem.Size = new System.Drawing.Size(165, 22); this.paletteToolStripMenuItem.Text = "Palette..."; this.paletteToolStripMenuItem.Click += new System.EventHandler(this.TI83PaletteMenuItem_Click); // // AtariSubMenu // this.AtariSubMenu.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { - this.AtariSettingsToolStripMenuItem}); + this.AtariSettingsToolStripMenuItem}); this.AtariSubMenu.Name = "AtariSubMenu"; - this.AtariSubMenu.Size = new System.Drawing.Size(42, 17); + this.AtariSubMenu.Size = new System.Drawing.Size(44, 19); this.AtariSubMenu.Text = "&Atari"; this.AtariSubMenu.DropDownOpened += new System.EventHandler(this.AtariSubMenu_DropDownOpened); // @@ -2469,112 +2483,112 @@ // GBSubMenu // this.GBSubMenu.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { - this.GBcoreSettingsToolStripMenuItem, - this.LoadGBInSGBMenuItem, - this.toolStripSeparator28, - this.GBGPUViewerMenuItem, - this.GBGameGenieMenuItem}); + this.GBcoreSettingsToolStripMenuItem, + this.LoadGBInSGBMenuItem, + this.toolStripSeparator28, + this.GBGPUViewerMenuItem, + this.GBGameGenieMenuItem}); this.GBSubMenu.Name = "GBSubMenu"; - this.GBSubMenu.Size = new System.Drawing.Size(32, 17); + this.GBSubMenu.Size = new System.Drawing.Size(34, 19); this.GBSubMenu.Text = "&GB"; this.GBSubMenu.DropDownOpened += new System.EventHandler(this.GBSubMenu_DropDownOpened); // // GBcoreSettingsToolStripMenuItem // this.GBcoreSettingsToolStripMenuItem.Name = "GBcoreSettingsToolStripMenuItem"; - this.GBcoreSettingsToolStripMenuItem.Size = new System.Drawing.Size(217, 22); + this.GBcoreSettingsToolStripMenuItem.Size = new System.Drawing.Size(233, 22); this.GBcoreSettingsToolStripMenuItem.Text = "Settings..."; this.GBcoreSettingsToolStripMenuItem.Click += new System.EventHandler(this.GBCoreSettingsMenuItem_Click); // // LoadGBInSGBMenuItem // this.LoadGBInSGBMenuItem.Name = "LoadGBInSGBMenuItem"; - this.LoadGBInSGBMenuItem.Size = new System.Drawing.Size(217, 22); + this.LoadGBInSGBMenuItem.Size = new System.Drawing.Size(233, 22); this.LoadGBInSGBMenuItem.Text = "Load GB in SGB"; this.LoadGBInSGBMenuItem.Click += new System.EventHandler(this.LoadGBInSGBMenuItem_Click); // // toolStripSeparator28 // this.toolStripSeparator28.Name = "toolStripSeparator28"; - this.toolStripSeparator28.Size = new System.Drawing.Size(214, 6); + this.toolStripSeparator28.Size = new System.Drawing.Size(230, 6); // // GBGPUViewerMenuItem // this.GBGPUViewerMenuItem.Name = "GBGPUViewerMenuItem"; - this.GBGPUViewerMenuItem.Size = new System.Drawing.Size(217, 22); + this.GBGPUViewerMenuItem.Size = new System.Drawing.Size(233, 22); this.GBGPUViewerMenuItem.Text = "GPU Viewer"; this.GBGPUViewerMenuItem.Click += new System.EventHandler(this.GBGPUViewerMenuItem_Click); // // GBGameGenieMenuItem // this.GBGameGenieMenuItem.Name = "GBGameGenieMenuItem"; - this.GBGameGenieMenuItem.Size = new System.Drawing.Size(217, 22); + this.GBGameGenieMenuItem.Size = new System.Drawing.Size(233, 22); this.GBGameGenieMenuItem.Text = "&Game Genie Encoder/Decoder"; this.GBGameGenieMenuItem.Click += new System.EventHandler(this.GBGameGenieMenuItem_Click); // // GBASubMenu // this.GBASubMenu.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { - this.GBACoreSelectionSubMenu, - this.GBAcoresettingsToolStripMenuItem1, - this.toolStripSeparator33, - this.GbaGpuViewerMenuItem}); + this.GBACoreSelectionSubMenu, + this.GBAcoresettingsToolStripMenuItem1, + this.toolStripSeparator33, + this.GbaGpuViewerMenuItem}); this.GBASubMenu.Name = "GBASubMenu"; - this.GBASubMenu.Size = new System.Drawing.Size(39, 17); + this.GBASubMenu.Size = new System.Drawing.Size(42, 19); this.GBASubMenu.Text = "GBA"; // // GBACoreSelectionSubMenu // this.GBACoreSelectionSubMenu.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { - this.GBAmGBAMenuItem, - this.GBAVBANextMenuItem}); + this.GBAmGBAMenuItem, + this.GBAVBANextMenuItem}); this.GBACoreSelectionSubMenu.Name = "GBACoreSelectionSubMenu"; - this.GBACoreSelectionSubMenu.Size = new System.Drawing.Size(129, 22); + this.GBACoreSelectionSubMenu.Size = new System.Drawing.Size(135, 22); this.GBACoreSelectionSubMenu.Text = "&Core"; this.GBACoreSelectionSubMenu.DropDownOpened += new System.EventHandler(this.GBACoreSelectionSubMenu_DropDownOpened); // // GBAmGBAMenuItem // this.GBAmGBAMenuItem.Name = "GBAmGBAMenuItem"; - this.GBAmGBAMenuItem.Size = new System.Drawing.Size(120, 22); + this.GBAmGBAMenuItem.Size = new System.Drawing.Size(125, 22); this.GBAmGBAMenuItem.Text = "mGBA"; this.GBAmGBAMenuItem.Click += new System.EventHandler(this.GBAmGBAMenuItem_Click); // // GBAVBANextMenuItem // this.GBAVBANextMenuItem.Name = "GBAVBANextMenuItem"; - this.GBAVBANextMenuItem.Size = new System.Drawing.Size(120, 22); + this.GBAVBANextMenuItem.Size = new System.Drawing.Size(125, 22); this.GBAVBANextMenuItem.Text = "&VBA-Next"; this.GBAVBANextMenuItem.Click += new System.EventHandler(this.GBAVBANextMenuItem_Click); // // GBAcoresettingsToolStripMenuItem1 // this.GBAcoresettingsToolStripMenuItem1.Name = "GBAcoresettingsToolStripMenuItem1"; - this.GBAcoresettingsToolStripMenuItem1.Size = new System.Drawing.Size(129, 22); + this.GBAcoresettingsToolStripMenuItem1.Size = new System.Drawing.Size(135, 22); this.GBAcoresettingsToolStripMenuItem1.Text = "&Settings..."; this.GBAcoresettingsToolStripMenuItem1.Click += new System.EventHandler(this.GBAcoresettingsToolStripMenuItem1_Click); // // toolStripSeparator33 // this.toolStripSeparator33.Name = "toolStripSeparator33"; - this.toolStripSeparator33.Size = new System.Drawing.Size(126, 6); + this.toolStripSeparator33.Size = new System.Drawing.Size(132, 6); // // GbaGpuViewerMenuItem // this.GbaGpuViewerMenuItem.Name = "GbaGpuViewerMenuItem"; - this.GbaGpuViewerMenuItem.Size = new System.Drawing.Size(129, 22); + this.GbaGpuViewerMenuItem.Size = new System.Drawing.Size(135, 22); this.GbaGpuViewerMenuItem.Text = "GPU Viewer"; this.GbaGpuViewerMenuItem.Click += new System.EventHandler(this.GbaGpuViewerMenuItem_Click); // // PSXSubMenu // this.PSXSubMenu.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { - this.PSXControllerSettingsMenuItem, - this.PSXOptionsMenuItem, - this.PSXDiscControlsMenuItem, - this.PSXHashDiscsToolStripMenuItem}); + this.PSXControllerSettingsMenuItem, + this.PSXOptionsMenuItem, + this.PSXDiscControlsMenuItem, + this.PSXHashDiscsToolStripMenuItem}); this.PSXSubMenu.Name = "PSXSubMenu"; - this.PSXSubMenu.Size = new System.Drawing.Size(37, 17); + this.PSXSubMenu.Size = new System.Drawing.Size(39, 19); this.PSXSubMenu.Text = "PSX"; this.PSXSubMenu.DropDownOpened += new System.EventHandler(this.PSXSubMenu_DropDownOpened); // @@ -2582,178 +2596,178 @@ // this.PSXControllerSettingsMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.GameController; this.PSXControllerSettingsMenuItem.Name = "PSXControllerSettingsMenuItem"; - this.PSXControllerSettingsMenuItem.Size = new System.Drawing.Size(216, 22); + this.PSXControllerSettingsMenuItem.Size = new System.Drawing.Size(234, 22); this.PSXControllerSettingsMenuItem.Text = "Controller / Memcard Settings"; this.PSXControllerSettingsMenuItem.Click += new System.EventHandler(this.PSXControllerSettingsMenuItem_Click); // // PSXOptionsMenuItem // this.PSXOptionsMenuItem.Name = "PSXOptionsMenuItem"; - this.PSXOptionsMenuItem.Size = new System.Drawing.Size(216, 22); + this.PSXOptionsMenuItem.Size = new System.Drawing.Size(234, 22); this.PSXOptionsMenuItem.Text = "&Options"; this.PSXOptionsMenuItem.Click += new System.EventHandler(this.PSXOptionsMenuItem_Click); // // PSXDiscControlsMenuItem // this.PSXDiscControlsMenuItem.Name = "PSXDiscControlsMenuItem"; - this.PSXDiscControlsMenuItem.Size = new System.Drawing.Size(216, 22); + this.PSXDiscControlsMenuItem.Size = new System.Drawing.Size(234, 22); this.PSXDiscControlsMenuItem.Text = "&Disc Controls"; this.PSXDiscControlsMenuItem.Click += new System.EventHandler(this.PSXDiscControlsMenuItem_Click); // // PSXHashDiscsToolStripMenuItem // this.PSXHashDiscsToolStripMenuItem.Name = "PSXHashDiscsToolStripMenuItem"; - this.PSXHashDiscsToolStripMenuItem.Size = new System.Drawing.Size(216, 22); + this.PSXHashDiscsToolStripMenuItem.Size = new System.Drawing.Size(234, 22); this.PSXHashDiscsToolStripMenuItem.Text = "&Hash Discs"; this.PSXHashDiscsToolStripMenuItem.Click += new System.EventHandler(this.PSXHashDiscsToolStripMenuItem_Click); // // SNESSubMenu // this.SNESSubMenu.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { - this.SNESDisplayMenuItem, - this.toolStripSeparator18, - this.SnesGfxDebuggerMenuItem, - this.SnesGBInSGBMenuItem, - this.SnesGameGenieMenuItem, - this.SnesOptionsMenuItem}); + this.SNESDisplayMenuItem, + this.toolStripSeparator18, + this.SnesGfxDebuggerMenuItem, + this.SnesGBInSGBMenuItem, + this.SnesGameGenieMenuItem, + this.SnesOptionsMenuItem}); this.SNESSubMenu.Name = "SNESSubMenu"; - this.SNESSubMenu.Size = new System.Drawing.Size(44, 17); + this.SNESSubMenu.Size = new System.Drawing.Size(46, 19); this.SNESSubMenu.Text = "&SNES"; this.SNESSubMenu.DropDownOpened += new System.EventHandler(this.SNESSubMenu_DropDownOpened); // // SNESDisplayMenuItem // this.SNESDisplayMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { - this.SnesBg1MenuItem, - this.SnesBg2MenuItem, - this.SnesBg3MenuItem, - this.SnesBg4MenuItem, - this.SnesObj1MenuItem, - this.SnesObj2MenuItem, - this.SnesObj3MenuItem, - this.SnesObj4MenuItem}); + this.SnesBg1MenuItem, + this.SnesBg2MenuItem, + this.SnesBg3MenuItem, + this.SnesBg4MenuItem, + this.SnesObj1MenuItem, + this.SnesObj2MenuItem, + this.SnesObj3MenuItem, + this.SnesObj4MenuItem}); this.SNESDisplayMenuItem.Name = "SNESDisplayMenuItem"; - this.SNESDisplayMenuItem.Size = new System.Drawing.Size(217, 22); + this.SNESDisplayMenuItem.Size = new System.Drawing.Size(233, 22); this.SNESDisplayMenuItem.Text = "Display"; this.SNESDisplayMenuItem.DropDownOpened += new System.EventHandler(this.SNESDisplayMenuItem_DropDownOpened); // // SnesBg1MenuItem // this.SnesBg1MenuItem.Name = "SnesBg1MenuItem"; - this.SnesBg1MenuItem.Size = new System.Drawing.Size(102, 22); + this.SnesBg1MenuItem.Size = new System.Drawing.Size(103, 22); this.SnesBg1MenuItem.Text = "BG 1"; this.SnesBg1MenuItem.Click += new System.EventHandler(this.SnesBg1MenuItem_Click); // // SnesBg2MenuItem // this.SnesBg2MenuItem.Name = "SnesBg2MenuItem"; - this.SnesBg2MenuItem.Size = new System.Drawing.Size(102, 22); + this.SnesBg2MenuItem.Size = new System.Drawing.Size(103, 22); this.SnesBg2MenuItem.Text = "BG 2"; this.SnesBg2MenuItem.Click += new System.EventHandler(this.SnesBg2MenuItem_Click); // // SnesBg3MenuItem // this.SnesBg3MenuItem.Name = "SnesBg3MenuItem"; - this.SnesBg3MenuItem.Size = new System.Drawing.Size(102, 22); + this.SnesBg3MenuItem.Size = new System.Drawing.Size(103, 22); this.SnesBg3MenuItem.Text = "BG 3"; this.SnesBg3MenuItem.Click += new System.EventHandler(this.SnesBg3MenuItem_Click); // // SnesBg4MenuItem // this.SnesBg4MenuItem.Name = "SnesBg4MenuItem"; - this.SnesBg4MenuItem.Size = new System.Drawing.Size(102, 22); + this.SnesBg4MenuItem.Size = new System.Drawing.Size(103, 22); this.SnesBg4MenuItem.Text = "BG 4"; this.SnesBg4MenuItem.Click += new System.EventHandler(this.SnesBg4MenuItem_Click); // // SnesObj1MenuItem // this.SnesObj1MenuItem.Name = "SnesObj1MenuItem"; - this.SnesObj1MenuItem.Size = new System.Drawing.Size(102, 22); + this.SnesObj1MenuItem.Size = new System.Drawing.Size(103, 22); this.SnesObj1MenuItem.Text = "OBJ 1"; this.SnesObj1MenuItem.Click += new System.EventHandler(this.SnesObj1MenuItem_Click); // // SnesObj2MenuItem // this.SnesObj2MenuItem.Name = "SnesObj2MenuItem"; - this.SnesObj2MenuItem.Size = new System.Drawing.Size(102, 22); + this.SnesObj2MenuItem.Size = new System.Drawing.Size(103, 22); this.SnesObj2MenuItem.Text = "OBJ 2"; this.SnesObj2MenuItem.Click += new System.EventHandler(this.SnesObj2MenuItem_Click); // // SnesObj3MenuItem // this.SnesObj3MenuItem.Name = "SnesObj3MenuItem"; - this.SnesObj3MenuItem.Size = new System.Drawing.Size(102, 22); + this.SnesObj3MenuItem.Size = new System.Drawing.Size(103, 22); this.SnesObj3MenuItem.Text = "OBJ 3"; this.SnesObj3MenuItem.Click += new System.EventHandler(this.SnesObj3MenuItem_Click); // // SnesObj4MenuItem // this.SnesObj4MenuItem.Name = "SnesObj4MenuItem"; - this.SnesObj4MenuItem.Size = new System.Drawing.Size(102, 22); + this.SnesObj4MenuItem.Size = new System.Drawing.Size(103, 22); this.SnesObj4MenuItem.Text = "OBJ 4"; this.SnesObj4MenuItem.Click += new System.EventHandler(this.SnesObj4MenuItem_Click); // // toolStripSeparator18 // this.toolStripSeparator18.Name = "toolStripSeparator18"; - this.toolStripSeparator18.Size = new System.Drawing.Size(214, 6); + this.toolStripSeparator18.Size = new System.Drawing.Size(230, 6); // // SnesGfxDebuggerMenuItem // this.SnesGfxDebuggerMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.Bug; this.SnesGfxDebuggerMenuItem.Name = "SnesGfxDebuggerMenuItem"; - this.SnesGfxDebuggerMenuItem.Size = new System.Drawing.Size(217, 22); + this.SnesGfxDebuggerMenuItem.Size = new System.Drawing.Size(233, 22); this.SnesGfxDebuggerMenuItem.Text = "Graphics Debugger"; this.SnesGfxDebuggerMenuItem.Click += new System.EventHandler(this.SnesGfxDebuggerMenuItem_Click); // // SnesGBInSGBMenuItem // this.SnesGBInSGBMenuItem.Name = "SnesGBInSGBMenuItem"; - this.SnesGBInSGBMenuItem.Size = new System.Drawing.Size(217, 22); + this.SnesGBInSGBMenuItem.Size = new System.Drawing.Size(233, 22); this.SnesGBInSGBMenuItem.Text = "Load GB in SGB"; this.SnesGBInSGBMenuItem.Click += new System.EventHandler(this.SnesGBInSGBMenuItem_Click); // // SnesGameGenieMenuItem // this.SnesGameGenieMenuItem.Name = "SnesGameGenieMenuItem"; - this.SnesGameGenieMenuItem.Size = new System.Drawing.Size(217, 22); + this.SnesGameGenieMenuItem.Size = new System.Drawing.Size(233, 22); this.SnesGameGenieMenuItem.Text = "&Game Genie Encoder/Decoder"; this.SnesGameGenieMenuItem.Click += new System.EventHandler(this.SnesGameGenieMenuItem_Click); // // SnesOptionsMenuItem // this.SnesOptionsMenuItem.Name = "SnesOptionsMenuItem"; - this.SnesOptionsMenuItem.Size = new System.Drawing.Size(217, 22); + this.SnesOptionsMenuItem.Size = new System.Drawing.Size(233, 22); this.SnesOptionsMenuItem.Text = "&Options"; this.SnesOptionsMenuItem.Click += new System.EventHandler(this.SnesOptionsMenuItem_Click); // // ColecoSubMenu // this.ColecoSubMenu.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { - this.ColecoSkipBiosMenuItem}); + this.ColecoSkipBiosMenuItem}); this.ColecoSubMenu.Name = "ColecoSubMenu"; - this.ColecoSubMenu.Size = new System.Drawing.Size(51, 17); + this.ColecoSubMenu.Size = new System.Drawing.Size(56, 19); this.ColecoSubMenu.Text = "&Coleco"; this.ColecoSubMenu.DropDownOpened += new System.EventHandler(this.ColecoSubMenu_DropDownOpened); // // ColecoSkipBiosMenuItem // this.ColecoSkipBiosMenuItem.Name = "ColecoSkipBiosMenuItem"; - this.ColecoSkipBiosMenuItem.Size = new System.Drawing.Size(145, 22); + this.ColecoSkipBiosMenuItem.Size = new System.Drawing.Size(152, 22); this.ColecoSkipBiosMenuItem.Text = "&Skip BIOS intro"; this.ColecoSkipBiosMenuItem.Click += new System.EventHandler(this.ColecoSkipBiosMenuItem_Click); // // N64SubMenu // this.N64SubMenu.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { - this.N64PluginSettingsMenuItem, - this.N64ControllerSettingsMenuItem, - this.toolStripSeparator23, - this.N64CircularAnalogRangeMenuItem, - this.MupenStyleLagMenuItem, - this.N64ExpansionSlotMenuItem}); + this.N64PluginSettingsMenuItem, + this.N64ControllerSettingsMenuItem, + this.toolStripSeparator23, + this.N64CircularAnalogRangeMenuItem, + this.MupenStyleLagMenuItem, + this.N64ExpansionSlotMenuItem}); this.N64SubMenu.Name = "N64SubMenu"; - this.N64SubMenu.Size = new System.Drawing.Size(38, 17); + this.N64SubMenu.Size = new System.Drawing.Size(40, 19); this.N64SubMenu.Text = "N64"; this.N64SubMenu.DropDownOpened += new System.EventHandler(this.N64SubMenu_DropDownOpened); // @@ -2761,7 +2775,7 @@ // this.N64PluginSettingsMenuItem.Image = ((System.Drawing.Image)(resources.GetObject("N64PluginSettingsMenuItem.Image"))); this.N64PluginSettingsMenuItem.Name = "N64PluginSettingsMenuItem"; - this.N64PluginSettingsMenuItem.Size = new System.Drawing.Size(180, 22); + this.N64PluginSettingsMenuItem.Size = new System.Drawing.Size(192, 22); this.N64PluginSettingsMenuItem.Text = "Plugins"; this.N64PluginSettingsMenuItem.Click += new System.EventHandler(this.N64PluginSettingsMenuItem_Click); // @@ -2769,42 +2783,42 @@ // this.N64ControllerSettingsMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.GameController; this.N64ControllerSettingsMenuItem.Name = "N64ControllerSettingsMenuItem"; - this.N64ControllerSettingsMenuItem.Size = new System.Drawing.Size(180, 22); + this.N64ControllerSettingsMenuItem.Size = new System.Drawing.Size(192, 22); this.N64ControllerSettingsMenuItem.Text = "Controller Settings..."; this.N64ControllerSettingsMenuItem.Click += new System.EventHandler(this.N64ControllerSettingsMenuItem_Click); // // toolStripSeparator23 // this.toolStripSeparator23.Name = "toolStripSeparator23"; - this.toolStripSeparator23.Size = new System.Drawing.Size(177, 6); + this.toolStripSeparator23.Size = new System.Drawing.Size(189, 6); // // N64CircularAnalogRangeMenuItem // this.N64CircularAnalogRangeMenuItem.Name = "N64CircularAnalogRangeMenuItem"; - this.N64CircularAnalogRangeMenuItem.Size = new System.Drawing.Size(180, 22); + this.N64CircularAnalogRangeMenuItem.Size = new System.Drawing.Size(192, 22); this.N64CircularAnalogRangeMenuItem.Text = "Circular Analog Range"; this.N64CircularAnalogRangeMenuItem.Click += new System.EventHandler(this.N64CircularAnalogRangeMenuItem_Click); // // MupenStyleLagMenuItem // this.MupenStyleLagMenuItem.Name = "MupenStyleLagMenuItem"; - this.MupenStyleLagMenuItem.Size = new System.Drawing.Size(180, 22); + this.MupenStyleLagMenuItem.Size = new System.Drawing.Size(192, 22); this.MupenStyleLagMenuItem.Text = "&Non-VI Lag Frames"; this.MupenStyleLagMenuItem.Click += new System.EventHandler(this.MupenStyleLagMenuItem_Click); // // N64ExpansionSlotMenuItem // this.N64ExpansionSlotMenuItem.Name = "N64ExpansionSlotMenuItem"; - this.N64ExpansionSlotMenuItem.Size = new System.Drawing.Size(180, 22); + this.N64ExpansionSlotMenuItem.Size = new System.Drawing.Size(192, 22); this.N64ExpansionSlotMenuItem.Text = "&Use Expansion Slot"; this.N64ExpansionSlotMenuItem.Click += new System.EventHandler(this.N64ExpansionSlotMenuItem_Click); // // SaturnSubMenu // this.SaturnSubMenu.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { - this.SaturnPreferencesMenuItem}); + this.SaturnPreferencesMenuItem}); this.SaturnSubMenu.Name = "SaturnSubMenu"; - this.SaturnSubMenu.Size = new System.Drawing.Size(51, 17); + this.SaturnSubMenu.Size = new System.Drawing.Size(53, 19); this.SaturnSubMenu.Text = "&Saturn"; // // SaturnPreferencesMenuItem @@ -2817,9 +2831,9 @@ // DGBSubMenu // this.DGBSubMenu.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { - this.DGBsettingsToolStripMenuItem}); + this.DGBsettingsToolStripMenuItem}); this.DGBSubMenu.Name = "DGBSubMenu"; - this.DGBSubMenu.Size = new System.Drawing.Size(53, 17); + this.DGBSubMenu.Size = new System.Drawing.Size(59, 19); this.DGBSubMenu.Text = "&GB Link"; // // DGBsettingsToolStripMenuItem @@ -2832,46 +2846,46 @@ // GenesisSubMenu // this.GenesisSubMenu.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { - this.vDPViewerToolStripMenuItem, - this.GenesisGameGenieECDC, - this.toolStripSeparator26, - this.GenesisSettingsToolStripMenuItem}); + this.vDPViewerToolStripMenuItem, + this.GenesisGameGenieECDC, + this.toolStripSeparator26, + this.GenesisSettingsToolStripMenuItem}); this.GenesisSubMenu.Name = "GenesisSubMenu"; - this.GenesisSubMenu.Size = new System.Drawing.Size(56, 17); + this.GenesisSubMenu.Size = new System.Drawing.Size(59, 19); this.GenesisSubMenu.Text = "&Genesis"; // // vDPViewerToolStripMenuItem // this.vDPViewerToolStripMenuItem.Name = "vDPViewerToolStripMenuItem"; - this.vDPViewerToolStripMenuItem.Size = new System.Drawing.Size(217, 22); + this.vDPViewerToolStripMenuItem.Size = new System.Drawing.Size(233, 22); this.vDPViewerToolStripMenuItem.Text = "&VDP Viewer"; this.vDPViewerToolStripMenuItem.Click += new System.EventHandler(this.GenVdpViewerMenuItem_Click); // // GenesisGameGenieECDC // this.GenesisGameGenieECDC.Name = "GenesisGameGenieECDC"; - this.GenesisGameGenieECDC.Size = new System.Drawing.Size(217, 22); + this.GenesisGameGenieECDC.Size = new System.Drawing.Size(233, 22); this.GenesisGameGenieECDC.Text = "&Game Genie Encoder/Decoder"; this.GenesisGameGenieECDC.Click += new System.EventHandler(this.GenesisGameGenieECDC_Click); // // toolStripSeparator26 // this.toolStripSeparator26.Name = "toolStripSeparator26"; - this.toolStripSeparator26.Size = new System.Drawing.Size(214, 6); + this.toolStripSeparator26.Size = new System.Drawing.Size(230, 6); // // GenesisSettingsToolStripMenuItem // this.GenesisSettingsToolStripMenuItem.Name = "GenesisSettingsToolStripMenuItem"; - this.GenesisSettingsToolStripMenuItem.Size = new System.Drawing.Size(217, 22); + this.GenesisSettingsToolStripMenuItem.Size = new System.Drawing.Size(233, 22); this.GenesisSettingsToolStripMenuItem.Text = "&Settings..."; this.GenesisSettingsToolStripMenuItem.Click += new System.EventHandler(this.GenesisSettingsMenuItem_Click); // // wonderSwanToolStripMenuItem // this.wonderSwanToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { - this.settingsToolStripMenuItem}); + this.settingsToolStripMenuItem}); this.wonderSwanToolStripMenuItem.Name = "wonderSwanToolStripMenuItem"; - this.wonderSwanToolStripMenuItem.Size = new System.Drawing.Size(83, 17); + this.wonderSwanToolStripMenuItem.Size = new System.Drawing.Size(89, 19); this.wonderSwanToolStripMenuItem.Text = "&WonderSwan"; // // settingsToolStripMenuItem @@ -2884,17 +2898,17 @@ // AppleSubMenu // this.AppleSubMenu.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { - this.AppleDisksSubMenu, - this.settingsToolStripMenuItem1}); + this.AppleDisksSubMenu, + this.settingsToolStripMenuItem1}); this.AppleSubMenu.Name = "AppleSubMenu"; - this.AppleSubMenu.Size = new System.Drawing.Size(46, 17); + this.AppleSubMenu.Size = new System.Drawing.Size(50, 19); this.AppleSubMenu.Text = "Apple"; this.AppleSubMenu.DropDownOpened += new System.EventHandler(this.AppleSubMenu_DropDownOpened); // // AppleDisksSubMenu // this.AppleDisksSubMenu.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { - this.toolStripSeparator31}); + this.toolStripSeparator31}); this.AppleDisksSubMenu.Name = "AppleDisksSubMenu"; this.AppleDisksSubMenu.Size = new System.Drawing.Size(125, 22); this.AppleDisksSubMenu.Text = "Disks"; @@ -2915,9 +2929,9 @@ // C64SubMenu // this.C64SubMenu.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { - this.C64SettingsMenuItem}); + this.C64SettingsMenuItem}); this.C64SubMenu.Name = "C64SubMenu"; - this.C64SubMenu.Size = new System.Drawing.Size(38, 17); + this.C64SubMenu.Size = new System.Drawing.Size(39, 19); this.C64SubMenu.Text = "&C64"; // // C64SettingsMenuItem @@ -2930,12 +2944,12 @@ // HelpSubMenu // this.HelpSubMenu.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { - this.OnlineHelpMenuItem, - this.ForumsMenuItem, - this.FeaturesMenuItem, - this.AboutMenuItem}); + this.OnlineHelpMenuItem, + this.ForumsMenuItem, + this.FeaturesMenuItem, + this.AboutMenuItem}); this.HelpSubMenu.Name = "HelpSubMenu"; - this.HelpSubMenu.Size = new System.Drawing.Size(40, 17); + this.HelpSubMenu.Size = new System.Drawing.Size(44, 19); this.HelpSubMenu.Text = "&Help"; this.HelpSubMenu.DropDownOpened += new System.EventHandler(this.HelpSubMenu_DropDownOpened); // @@ -2943,7 +2957,7 @@ // this.OnlineHelpMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.Help; this.OnlineHelpMenuItem.Name = "OnlineHelpMenuItem"; - this.OnlineHelpMenuItem.Size = new System.Drawing.Size(140, 22); + this.OnlineHelpMenuItem.Size = new System.Drawing.Size(146, 22); this.OnlineHelpMenuItem.Text = "&Online Help..."; this.OnlineHelpMenuItem.Click += new System.EventHandler(this.OnlineHelpMenuItem_Click); // @@ -2951,7 +2965,7 @@ // this.ForumsMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.TAStudio; this.ForumsMenuItem.Name = "ForumsMenuItem"; - this.ForumsMenuItem.Size = new System.Drawing.Size(140, 22); + this.ForumsMenuItem.Size = new System.Drawing.Size(146, 22); this.ForumsMenuItem.Text = "Forums..."; this.ForumsMenuItem.Click += new System.EventHandler(this.ForumsMenuItem_Click); // @@ -2959,7 +2973,7 @@ // this.FeaturesMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.kitchensink; this.FeaturesMenuItem.Name = "FeaturesMenuItem"; - this.FeaturesMenuItem.Size = new System.Drawing.Size(140, 22); + this.FeaturesMenuItem.Size = new System.Drawing.Size(146, 22); this.FeaturesMenuItem.Text = "&Features"; this.FeaturesMenuItem.Click += new System.EventHandler(this.FeaturesMenuItem_Click); // @@ -2967,7 +2981,7 @@ // this.AboutMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.CorpHawkSmall; this.AboutMenuItem.Name = "AboutMenuItem"; - this.AboutMenuItem.Size = new System.Drawing.Size(140, 22); + this.AboutMenuItem.Size = new System.Drawing.Size(146, 22); this.AboutMenuItem.Text = "&About"; this.AboutMenuItem.Click += new System.EventHandler(this.AboutMenuItem_Click); // @@ -2975,30 +2989,30 @@ // this.MainStatusBar.ClickThrough = true; this.MainStatusBar.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { - this.DumpStatusButton, - this.EmuStatus, - this.PlayRecordStatusButton, - this.PauseStatusButton, - this.RebootStatusBarIcon, - this.AVIStatusLabel, - this.LedLightStatusLabel, - this.SaveSlotsStatusLabel, - this.Slot1StatusButton, - this.Slot2StatusButton, - this.Slot3StatusButton, - this.Slot4StatusButton, - this.Slot5StatusButton, - this.Slot6StatusButton, - this.Slot7StatusButton, - this.Slot8StatusButton, - this.Slot9StatusButton, - this.Slot0StatusButton, - this.CheatStatusButton, - this.KeyPriorityStatusLabel, - this.CoreNameStatusBarButton, - this.ProfileFirstBootLabel, - this.LinkConnectStatusBarButton, - this.UpdateNotification}); + this.DumpStatusButton, + this.EmuStatus, + this.PlayRecordStatusButton, + this.PauseStatusButton, + this.RebootStatusBarIcon, + this.AVIStatusLabel, + this.LedLightStatusLabel, + this.SaveSlotsStatusLabel, + this.Slot1StatusButton, + this.Slot2StatusButton, + this.Slot3StatusButton, + this.Slot4StatusButton, + this.Slot5StatusButton, + this.Slot6StatusButton, + this.Slot7StatusButton, + this.Slot8StatusButton, + this.Slot9StatusButton, + this.Slot0StatusButton, + this.CheatStatusButton, + this.KeyPriorityStatusLabel, + this.CoreNameStatusBarButton, + this.ProfileFirstBootLabel, + this.LinkConnectStatusBarButton, + this.UpdateNotification}); this.MainStatusBar.Location = new System.Drawing.Point(0, 386); this.MainStatusBar.Name = "MainStatusBar"; this.MainStatusBar.ShowItemToolTips = true; @@ -3076,7 +3090,7 @@ // this.SaveSlotsStatusLabel.BackColor = System.Drawing.SystemColors.Control; this.SaveSlotsStatusLabel.Name = "SaveSlotsStatusLabel"; - this.SaveSlotsStatusLabel.Size = new System.Drawing.Size(56, 17); + this.SaveSlotsStatusLabel.Size = new System.Drawing.Size(58, 17); this.SaveSlotsStatusLabel.Text = "Save slots"; // // Slot1StatusButton @@ -3179,7 +3193,7 @@ // this.CoreNameStatusBarButton.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.CorpHawkSmall; this.CoreNameStatusBarButton.Name = "CoreNameStatusBarButton"; - this.CoreNameStatusBarButton.Size = new System.Drawing.Size(66, 17); + this.CoreNameStatusBarButton.Size = new System.Drawing.Size(71, 17); this.CoreNameStatusBarButton.Text = "Neshawk"; // // ProfileFirstBootLabel @@ -3209,7 +3223,7 @@ this.UpdateNotification.IsLink = true; this.UpdateNotification.LinkColor = System.Drawing.Color.Red; this.UpdateNotification.Name = "UpdateNotification"; - this.UpdateNotification.Size = new System.Drawing.Size(53, 17); + this.UpdateNotification.Size = new System.Drawing.Size(46, 17); this.UpdateNotification.Spring = true; this.UpdateNotification.Text = "New version available!"; this.UpdateNotification.TextAlign = System.Drawing.ContentAlignment.MiddleRight; @@ -3218,32 +3232,32 @@ // MainFormContextMenu // this.MainFormContextMenu.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { - this.OpenRomContextMenuItem, - this.LoadLastRomContextMenuItem, - this.StopAVContextMenuItem, - this.ContextSeparator_AfterROM, - this.RecordMovieContextMenuItem, - this.PlayMovieContextMenuItem, - this.RestartMovieContextMenuItem, - this.StopMovieContextMenuItem, - this.LoadLastMovieContextMenuItem, - this.BackupMovieContextMenuItem, - this.StopNoSaveContextMenuItem, - this.ViewSubtitlesContextMenuItem, - this.AddSubtitleContextMenuItem, - this.ViewCommentsContextMenuItem, - this.SaveMovieContextMenuItem, - this.ContextSeparator_AfterMovie, - this.UndoSavestateContextMenuItem, - this.ContextSeparator_AfterUndo, - this.ConfigContextMenuItem, - this.ScreenshotContextMenuItem, - this.CloseRomContextMenuItem, - this.ClearSRAMContextMenuItem, - this.ShowMenuContextMenuSeparator, - this.ShowMenuContextMenuItem}); + this.OpenRomContextMenuItem, + this.LoadLastRomContextMenuItem, + this.StopAVContextMenuItem, + this.ContextSeparator_AfterROM, + this.RecordMovieContextMenuItem, + this.PlayMovieContextMenuItem, + this.RestartMovieContextMenuItem, + this.StopMovieContextMenuItem, + this.LoadLastMovieContextMenuItem, + this.BackupMovieContextMenuItem, + this.StopNoSaveContextMenuItem, + this.ViewSubtitlesContextMenuItem, + this.AddSubtitleContextMenuItem, + this.ViewCommentsContextMenuItem, + this.SaveMovieContextMenuItem, + this.ContextSeparator_AfterMovie, + this.UndoSavestateContextMenuItem, + this.ContextSeparator_AfterUndo, + this.ConfigContextMenuItem, + this.ScreenshotContextMenuItem, + this.CloseRomContextMenuItem, + this.ClearSRAMContextMenuItem, + this.ShowMenuContextMenuSeparator, + this.ShowMenuContextMenuItem}); this.MainFormContextMenu.Name = "contextMenuStrip1"; - this.MainFormContextMenu.Size = new System.Drawing.Size(202, 468); + this.MainFormContextMenu.Size = new System.Drawing.Size(217, 468); this.MainFormContextMenu.Closing += new System.Windows.Forms.ToolStripDropDownClosingEventHandler(this.MainFormContextMenu_Closing); this.MainFormContextMenu.Opening += new System.ComponentModel.CancelEventHandler(this.MainFormContextMenu_Opening); // @@ -3251,7 +3265,7 @@ // this.OpenRomContextMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.OpenFile; this.OpenRomContextMenuItem.Name = "OpenRomContextMenuItem"; - this.OpenRomContextMenuItem.Size = new System.Drawing.Size(201, 22); + this.OpenRomContextMenuItem.Size = new System.Drawing.Size(216, 22); this.OpenRomContextMenuItem.Text = "Open Rom"; this.OpenRomContextMenuItem.Click += new System.EventHandler(this.OpenRomMenuItem_Click); // @@ -3259,7 +3273,7 @@ // this.LoadLastRomContextMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.Recent; this.LoadLastRomContextMenuItem.Name = "LoadLastRomContextMenuItem"; - this.LoadLastRomContextMenuItem.Size = new System.Drawing.Size(201, 22); + this.LoadLastRomContextMenuItem.Size = new System.Drawing.Size(216, 22); this.LoadLastRomContextMenuItem.Text = "Load Last ROM"; this.LoadLastRomContextMenuItem.Click += new System.EventHandler(this.LoadLastRomContextMenuItem_Click); // @@ -3267,20 +3281,20 @@ // this.StopAVContextMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.Stop; this.StopAVContextMenuItem.Name = "StopAVContextMenuItem"; - this.StopAVContextMenuItem.Size = new System.Drawing.Size(201, 22); + this.StopAVContextMenuItem.Size = new System.Drawing.Size(216, 22); this.StopAVContextMenuItem.Text = "Stop AVI/WAV"; this.StopAVContextMenuItem.Click += new System.EventHandler(this.StopAVMenuItem_Click); // // ContextSeparator_AfterROM // this.ContextSeparator_AfterROM.Name = "ContextSeparator_AfterROM"; - this.ContextSeparator_AfterROM.Size = new System.Drawing.Size(198, 6); + this.ContextSeparator_AfterROM.Size = new System.Drawing.Size(213, 6); // // RecordMovieContextMenuItem // this.RecordMovieContextMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.RecordHS; this.RecordMovieContextMenuItem.Name = "RecordMovieContextMenuItem"; - this.RecordMovieContextMenuItem.Size = new System.Drawing.Size(201, 22); + this.RecordMovieContextMenuItem.Size = new System.Drawing.Size(216, 22); this.RecordMovieContextMenuItem.Text = "Record Movie"; this.RecordMovieContextMenuItem.Click += new System.EventHandler(this.RecordMovieMenuItem_Click); // @@ -3288,7 +3302,7 @@ // this.PlayMovieContextMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.Play; this.PlayMovieContextMenuItem.Name = "PlayMovieContextMenuItem"; - this.PlayMovieContextMenuItem.Size = new System.Drawing.Size(201, 22); + this.PlayMovieContextMenuItem.Size = new System.Drawing.Size(216, 22); this.PlayMovieContextMenuItem.Text = "Play Movie"; this.PlayMovieContextMenuItem.Click += new System.EventHandler(this.PlayMovieMenuItem_Click); // @@ -3296,7 +3310,7 @@ // this.RestartMovieContextMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.restart; this.RestartMovieContextMenuItem.Name = "RestartMovieContextMenuItem"; - this.RestartMovieContextMenuItem.Size = new System.Drawing.Size(201, 22); + this.RestartMovieContextMenuItem.Size = new System.Drawing.Size(216, 22); this.RestartMovieContextMenuItem.Text = "Restart Movie"; this.RestartMovieContextMenuItem.Click += new System.EventHandler(this.PlayFromBeginningMenuItem_Click); // @@ -3304,7 +3318,7 @@ // this.StopMovieContextMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.Stop; this.StopMovieContextMenuItem.Name = "StopMovieContextMenuItem"; - this.StopMovieContextMenuItem.Size = new System.Drawing.Size(201, 22); + this.StopMovieContextMenuItem.Size = new System.Drawing.Size(216, 22); this.StopMovieContextMenuItem.Text = "Stop Movie"; this.StopMovieContextMenuItem.Click += new System.EventHandler(this.StopMovieMenuItem_Click); // @@ -3312,14 +3326,14 @@ // this.LoadLastMovieContextMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.Recent; this.LoadLastMovieContextMenuItem.Name = "LoadLastMovieContextMenuItem"; - this.LoadLastMovieContextMenuItem.Size = new System.Drawing.Size(201, 22); + this.LoadLastMovieContextMenuItem.Size = new System.Drawing.Size(216, 22); this.LoadLastMovieContextMenuItem.Text = "Load Last Movie"; this.LoadLastMovieContextMenuItem.Click += new System.EventHandler(this.LoadLastMovieContextMenuItem_Click); // // BackupMovieContextMenuItem // this.BackupMovieContextMenuItem.Name = "BackupMovieContextMenuItem"; - this.BackupMovieContextMenuItem.Size = new System.Drawing.Size(201, 22); + this.BackupMovieContextMenuItem.Size = new System.Drawing.Size(216, 22); this.BackupMovieContextMenuItem.Text = "Backup Movie"; this.BackupMovieContextMenuItem.Click += new System.EventHandler(this.BackupMovieContextMenuItem_Click); // @@ -3327,28 +3341,28 @@ // this.StopNoSaveContextMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.Stop; this.StopNoSaveContextMenuItem.Name = "StopNoSaveContextMenuItem"; - this.StopNoSaveContextMenuItem.Size = new System.Drawing.Size(201, 22); + this.StopNoSaveContextMenuItem.Size = new System.Drawing.Size(216, 22); this.StopNoSaveContextMenuItem.Text = "Stop Movie without Saving"; this.StopNoSaveContextMenuItem.Click += new System.EventHandler(this.StopMovieWithoutSavingMenuItem_Click); // // ViewSubtitlesContextMenuItem // this.ViewSubtitlesContextMenuItem.Name = "ViewSubtitlesContextMenuItem"; - this.ViewSubtitlesContextMenuItem.Size = new System.Drawing.Size(201, 22); + this.ViewSubtitlesContextMenuItem.Size = new System.Drawing.Size(216, 22); this.ViewSubtitlesContextMenuItem.Text = "View Subtitles"; this.ViewSubtitlesContextMenuItem.Click += new System.EventHandler(this.ViewSubtitlesContextMenuItem_Click); // // AddSubtitleContextMenuItem // this.AddSubtitleContextMenuItem.Name = "AddSubtitleContextMenuItem"; - this.AddSubtitleContextMenuItem.Size = new System.Drawing.Size(201, 22); + this.AddSubtitleContextMenuItem.Size = new System.Drawing.Size(216, 22); this.AddSubtitleContextMenuItem.Text = "Add Subtitle"; this.AddSubtitleContextMenuItem.Click += new System.EventHandler(this.AddSubtitleContextMenuItem_Click); // // ViewCommentsContextMenuItem // this.ViewCommentsContextMenuItem.Name = "ViewCommentsContextMenuItem"; - this.ViewCommentsContextMenuItem.Size = new System.Drawing.Size(201, 22); + this.ViewCommentsContextMenuItem.Size = new System.Drawing.Size(216, 22); this.ViewCommentsContextMenuItem.Text = "View Comments"; this.ViewCommentsContextMenuItem.Click += new System.EventHandler(this.ViewCommentsContextMenuItem_Click); // @@ -3356,57 +3370,57 @@ // this.SaveMovieContextMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.SaveAs; this.SaveMovieContextMenuItem.Name = "SaveMovieContextMenuItem"; - this.SaveMovieContextMenuItem.Size = new System.Drawing.Size(201, 22); + this.SaveMovieContextMenuItem.Size = new System.Drawing.Size(216, 22); this.SaveMovieContextMenuItem.Text = "Save Movie"; this.SaveMovieContextMenuItem.Click += new System.EventHandler(this.SaveMovieMenuItem_Click); // // ContextSeparator_AfterMovie // this.ContextSeparator_AfterMovie.Name = "ContextSeparator_AfterMovie"; - this.ContextSeparator_AfterMovie.Size = new System.Drawing.Size(198, 6); + this.ContextSeparator_AfterMovie.Size = new System.Drawing.Size(213, 6); // // UndoSavestateContextMenuItem // this.UndoSavestateContextMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.undo; this.UndoSavestateContextMenuItem.Name = "UndoSavestateContextMenuItem"; - this.UndoSavestateContextMenuItem.Size = new System.Drawing.Size(201, 22); + this.UndoSavestateContextMenuItem.Size = new System.Drawing.Size(216, 22); this.UndoSavestateContextMenuItem.Text = "Undo Savestate"; this.UndoSavestateContextMenuItem.Click += new System.EventHandler(this.UndoSavestateContextMenuItem_Click); // // ContextSeparator_AfterUndo // this.ContextSeparator_AfterUndo.Name = "ContextSeparator_AfterUndo"; - this.ContextSeparator_AfterUndo.Size = new System.Drawing.Size(198, 6); + this.ContextSeparator_AfterUndo.Size = new System.Drawing.Size(213, 6); // // ConfigContextMenuItem // this.ConfigContextMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { - this.toolStripMenuItem6, - this.toolStripMenuItem7, - this.toolStripMenuItem8, - this.toolStripMenuItem9, - this.toolStripMenuItem10, - this.toolStripMenuItem11, - this.toolStripMenuItem12, - this.toolStripMenuItem13, - this.toolStripMenuItem14, - this.toolStripMenuItem15, - this.customizeToolStripMenuItem, - this.toolStripSeparator30, - this.SavestateTypeContextSubMenu, - this.CoreSelectionContextSubMenu, - this.toolStripSeparator37, - this.toolStripMenuItem66, - this.toolStripMenuItem67}); + this.toolStripMenuItem6, + this.toolStripMenuItem7, + this.toolStripMenuItem8, + this.toolStripMenuItem9, + this.toolStripMenuItem10, + this.toolStripMenuItem11, + this.toolStripMenuItem12, + this.toolStripMenuItem13, + this.toolStripMenuItem14, + this.toolStripMenuItem15, + this.customizeToolStripMenuItem, + this.toolStripSeparator30, + this.SavestateTypeContextSubMenu, + this.CoreSelectionContextSubMenu, + this.toolStripSeparator37, + this.toolStripMenuItem66, + this.toolStripMenuItem67}); this.ConfigContextMenuItem.Name = "ConfigContextMenuItem"; - this.ConfigContextMenuItem.Size = new System.Drawing.Size(201, 22); + this.ConfigContextMenuItem.Size = new System.Drawing.Size(216, 22); this.ConfigContextMenuItem.Text = "Config"; // // toolStripMenuItem6 // this.toolStripMenuItem6.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.GameController; this.toolStripMenuItem6.Name = "toolStripMenuItem6"; - this.toolStripMenuItem6.Size = new System.Drawing.Size(157, 22); + this.toolStripMenuItem6.Size = new System.Drawing.Size(159, 22); this.toolStripMenuItem6.Text = "&Controllers..."; this.toolStripMenuItem6.Click += new System.EventHandler(this.ControllersMenuItem_Click); // @@ -3414,7 +3428,7 @@ // this.toolStripMenuItem7.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.HotKeys; this.toolStripMenuItem7.Name = "toolStripMenuItem7"; - this.toolStripMenuItem7.Size = new System.Drawing.Size(157, 22); + this.toolStripMenuItem7.Size = new System.Drawing.Size(159, 22); this.toolStripMenuItem7.Text = "&Hotkeys..."; this.toolStripMenuItem7.Click += new System.EventHandler(this.HotkeysMenuItem_Click); // @@ -3422,7 +3436,7 @@ // this.toolStripMenuItem8.Image = ((System.Drawing.Image)(resources.GetObject("toolStripMenuItem8.Image"))); this.toolStripMenuItem8.Name = "toolStripMenuItem8"; - this.toolStripMenuItem8.Size = new System.Drawing.Size(157, 22); + this.toolStripMenuItem8.Size = new System.Drawing.Size(159, 22); this.toolStripMenuItem8.Text = "Display..."; this.toolStripMenuItem8.Click += new System.EventHandler(this.DisplayConfigMenuItem_Click); // @@ -3430,7 +3444,7 @@ // this.toolStripMenuItem9.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.AudioHS; this.toolStripMenuItem9.Name = "toolStripMenuItem9"; - this.toolStripMenuItem9.Size = new System.Drawing.Size(157, 22); + this.toolStripMenuItem9.Size = new System.Drawing.Size(159, 22); this.toolStripMenuItem9.Text = "&Sound..."; this.toolStripMenuItem9.Click += new System.EventHandler(this.SoundMenuItem_Click); // @@ -3438,7 +3452,7 @@ // this.toolStripMenuItem10.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.CopyFolderHS; this.toolStripMenuItem10.Name = "toolStripMenuItem10"; - this.toolStripMenuItem10.Size = new System.Drawing.Size(157, 22); + this.toolStripMenuItem10.Size = new System.Drawing.Size(159, 22); this.toolStripMenuItem10.Text = "Paths..."; this.toolStripMenuItem10.Click += new System.EventHandler(this.PathsMenuItem_Click); // @@ -3446,7 +3460,7 @@ // this.toolStripMenuItem11.Image = ((System.Drawing.Image)(resources.GetObject("toolStripMenuItem11.Image"))); this.toolStripMenuItem11.Name = "toolStripMenuItem11"; - this.toolStripMenuItem11.Size = new System.Drawing.Size(157, 22); + this.toolStripMenuItem11.Size = new System.Drawing.Size(159, 22); this.toolStripMenuItem11.Text = "&Firmwares..."; this.toolStripMenuItem11.Click += new System.EventHandler(this.FirmwaresMenuItem_Click); // @@ -3454,7 +3468,7 @@ // this.toolStripMenuItem12.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.MessageConfig; this.toolStripMenuItem12.Name = "toolStripMenuItem12"; - this.toolStripMenuItem12.Size = new System.Drawing.Size(157, 22); + this.toolStripMenuItem12.Size = new System.Drawing.Size(159, 22); this.toolStripMenuItem12.Text = "&Messages..."; this.toolStripMenuItem12.Click += new System.EventHandler(this.MessagesMenuItem_Click); // @@ -3462,7 +3476,7 @@ // this.toolStripMenuItem13.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.Lightning; this.toolStripMenuItem13.Name = "toolStripMenuItem13"; - this.toolStripMenuItem13.Size = new System.Drawing.Size(157, 22); + this.toolStripMenuItem13.Size = new System.Drawing.Size(159, 22); this.toolStripMenuItem13.Text = "&Autofire..."; this.toolStripMenuItem13.Click += new System.EventHandler(this.AutofireMenuItem_Click); // @@ -3470,92 +3484,92 @@ // this.toolStripMenuItem14.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.Previous; this.toolStripMenuItem14.Name = "toolStripMenuItem14"; - this.toolStripMenuItem14.Size = new System.Drawing.Size(157, 22); + this.toolStripMenuItem14.Size = new System.Drawing.Size(159, 22); this.toolStripMenuItem14.Text = "&Rewind..."; this.toolStripMenuItem14.Click += new System.EventHandler(this.RewindOptionsMenuItem_Click); // // toolStripMenuItem15 // this.toolStripMenuItem15.Name = "toolStripMenuItem15"; - this.toolStripMenuItem15.Size = new System.Drawing.Size(157, 22); + this.toolStripMenuItem15.Size = new System.Drawing.Size(159, 22); this.toolStripMenuItem15.Text = "File Extensions..."; this.toolStripMenuItem15.Click += new System.EventHandler(this.FileExtensionsMenuItem_Click); // // customizeToolStripMenuItem // this.customizeToolStripMenuItem.Name = "customizeToolStripMenuItem"; - this.customizeToolStripMenuItem.Size = new System.Drawing.Size(157, 22); + this.customizeToolStripMenuItem.Size = new System.Drawing.Size(159, 22); this.customizeToolStripMenuItem.Text = "Customize..."; this.customizeToolStripMenuItem.Click += new System.EventHandler(this.CustomizeMenuItem_Click); // // toolStripSeparator30 // this.toolStripSeparator30.Name = "toolStripSeparator30"; - this.toolStripSeparator30.Size = new System.Drawing.Size(154, 6); + this.toolStripSeparator30.Size = new System.Drawing.Size(156, 6); // // SavestateTypeContextSubMenu // this.SavestateTypeContextSubMenu.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { - this.SavestateTypeDefaultContextMenuItem, - this.SavestateBinaryContextMenuItem, - this.SavestateTextContextMenuItem}); + this.SavestateTypeDefaultContextMenuItem, + this.SavestateBinaryContextMenuItem, + this.SavestateTextContextMenuItem}); this.SavestateTypeContextSubMenu.Name = "SavestateTypeContextSubMenu"; - this.SavestateTypeContextSubMenu.Size = new System.Drawing.Size(157, 22); + this.SavestateTypeContextSubMenu.Size = new System.Drawing.Size(159, 22); this.SavestateTypeContextSubMenu.Text = "Savestate Type"; this.SavestateTypeContextSubMenu.DropDownOpened += new System.EventHandler(this.SavestateTypeContextSubMenu_DropDownOpened); // // SavestateTypeDefaultContextMenuItem // this.SavestateTypeDefaultContextMenuItem.Name = "SavestateTypeDefaultContextMenuItem"; - this.SavestateTypeDefaultContextMenuItem.Size = new System.Drawing.Size(67, 22); + this.SavestateTypeDefaultContextMenuItem.Size = new System.Drawing.Size(112, 22); this.SavestateTypeDefaultContextMenuItem.Text = "&Default"; // // SavestateBinaryContextMenuItem // this.SavestateBinaryContextMenuItem.Name = "SavestateBinaryContextMenuItem"; - this.SavestateBinaryContextMenuItem.Size = new System.Drawing.Size(67, 22); + this.SavestateBinaryContextMenuItem.Size = new System.Drawing.Size(112, 22); this.SavestateBinaryContextMenuItem.Text = "&Binary"; // // SavestateTextContextMenuItem // this.SavestateTextContextMenuItem.Name = "SavestateTextContextMenuItem"; - this.SavestateTextContextMenuItem.Size = new System.Drawing.Size(67, 22); + this.SavestateTextContextMenuItem.Size = new System.Drawing.Size(112, 22); this.SavestateTextContextMenuItem.Text = "&Text"; // // CoreSelectionContextSubMenu // this.CoreSelectionContextSubMenu.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { - this.GBInSGBContextMenuItem, - this.NesInQuickNESContextMenuItem}); + this.GBInSGBContextMenuItem, + this.NesInQuickNESContextMenuItem}); this.CoreSelectionContextSubMenu.Name = "CoreSelectionContextSubMenu"; - this.CoreSelectionContextSubMenu.Size = new System.Drawing.Size(157, 22); + this.CoreSelectionContextSubMenu.Size = new System.Drawing.Size(159, 22); this.CoreSelectionContextSubMenu.Text = "Core Selection"; this.CoreSelectionContextSubMenu.DropDownOpened += new System.EventHandler(this.CoreSelectionContextSubMenu_DropDownOpened); // // GBInSGBContextMenuItem // this.GBInSGBContextMenuItem.Name = "GBInSGBContextMenuItem"; - this.GBInSGBContextMenuItem.Size = new System.Drawing.Size(152, 22); + this.GBInSGBContextMenuItem.Size = new System.Drawing.Size(163, 22); this.GBInSGBContextMenuItem.Text = "GB in SGB"; this.GBInSGBContextMenuItem.Click += new System.EventHandler(this.GBInSGBMenuItem_Click); // // NesInQuickNESContextMenuItem // this.NesInQuickNESContextMenuItem.Name = "NesInQuickNESContextMenuItem"; - this.NesInQuickNESContextMenuItem.Size = new System.Drawing.Size(152, 22); + this.NesInQuickNESContextMenuItem.Size = new System.Drawing.Size(163, 22); this.NesInQuickNESContextMenuItem.Text = "NES in QuickNES"; this.NesInQuickNESContextMenuItem.Click += new System.EventHandler(this.NesInQuickNESMenuItem_Click); // // toolStripSeparator37 // this.toolStripSeparator37.Name = "toolStripSeparator37"; - this.toolStripSeparator37.Size = new System.Drawing.Size(154, 6); + this.toolStripSeparator37.Size = new System.Drawing.Size(156, 6); // // toolStripMenuItem66 // this.toolStripMenuItem66.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.Save; this.toolStripMenuItem66.Name = "toolStripMenuItem66"; - this.toolStripMenuItem66.Size = new System.Drawing.Size(157, 22); + this.toolStripMenuItem66.Size = new System.Drawing.Size(159, 22); this.toolStripMenuItem66.Text = "Save Config"; this.toolStripMenuItem66.Click += new System.EventHandler(this.SaveConfigMenuItem_Click); // @@ -3563,7 +3577,7 @@ // this.toolStripMenuItem67.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.LoadConfig; this.toolStripMenuItem67.Name = "toolStripMenuItem67"; - this.toolStripMenuItem67.Size = new System.Drawing.Size(157, 22); + this.toolStripMenuItem67.Size = new System.Drawing.Size(159, 22); this.toolStripMenuItem67.Text = "Load Config"; this.toolStripMenuItem67.Click += new System.EventHandler(this.LoadConfigMenuItem_Click); // @@ -3571,7 +3585,7 @@ // this.ScreenshotContextMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.camera; this.ScreenshotContextMenuItem.Name = "ScreenshotContextMenuItem"; - this.ScreenshotContextMenuItem.Size = new System.Drawing.Size(201, 22); + this.ScreenshotContextMenuItem.Size = new System.Drawing.Size(216, 22); this.ScreenshotContextMenuItem.Text = "Screenshot"; this.ScreenshotContextMenuItem.Click += new System.EventHandler(this.ScreenshotMenuItem_Click); // @@ -3579,26 +3593,26 @@ // this.CloseRomContextMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.Close; this.CloseRomContextMenuItem.Name = "CloseRomContextMenuItem"; - this.CloseRomContextMenuItem.Size = new System.Drawing.Size(201, 22); + this.CloseRomContextMenuItem.Size = new System.Drawing.Size(216, 22); this.CloseRomContextMenuItem.Text = "Close ROM"; this.CloseRomContextMenuItem.Click += new System.EventHandler(this.CloseRomMenuItem_Click); // // ClearSRAMContextMenuItem // this.ClearSRAMContextMenuItem.Name = "ClearSRAMContextMenuItem"; - this.ClearSRAMContextMenuItem.Size = new System.Drawing.Size(201, 22); + this.ClearSRAMContextMenuItem.Size = new System.Drawing.Size(216, 22); this.ClearSRAMContextMenuItem.Text = "Close and Clear SRAM"; this.ClearSRAMContextMenuItem.Click += new System.EventHandler(this.ClearSRAMContextMenuItem_Click); // // ShowMenuContextMenuSeparator // this.ShowMenuContextMenuSeparator.Name = "ShowMenuContextMenuSeparator"; - this.ShowMenuContextMenuSeparator.Size = new System.Drawing.Size(198, 6); + this.ShowMenuContextMenuSeparator.Size = new System.Drawing.Size(213, 6); // // ShowMenuContextMenuItem // this.ShowMenuContextMenuItem.Name = "ShowMenuContextMenuItem"; - this.ShowMenuContextMenuItem.Size = new System.Drawing.Size(201, 22); + this.ShowMenuContextMenuItem.Size = new System.Drawing.Size(216, 22); this.ShowMenuContextMenuItem.Text = "Show Menu"; this.ShowMenuContextMenuItem.Click += new System.EventHandler(this.ShowMenuContextMenuItem_Click); // @@ -3608,20 +3622,11 @@ this.timerMouseIdle.Interval = 2000; this.timerMouseIdle.Tick += new System.EventHandler(this.timerMouseIdle_Tick); // - // OpenAdvancedMenuItem + // dummyExternalTool // - this.OpenAdvancedMenuItem.Name = "OpenAdvancedMenuItem"; - this.OpenAdvancedMenuItem.Size = new System.Drawing.Size(152, 22); - this.OpenAdvancedMenuItem.Text = "Open Ad&vanced"; - this.OpenAdvancedMenuItem.Click += new System.EventHandler(this.OpenAdvancedMenuItem_Click); - // - // gameSharkConverterToolStripMenuItem - // - this.gameSharkConverterToolStripMenuItem.Image = ((System.Drawing.Image)(resources.GetObject("gameSharkConverterToolStripMenuItem.Image"))); - this.gameSharkConverterToolStripMenuItem.Name = "gameSharkConverterToolStripMenuItem"; - this.gameSharkConverterToolStripMenuItem.Size = new System.Drawing.Size(189, 22); - this.gameSharkConverterToolStripMenuItem.Text = "GameShark Converter"; - this.gameSharkConverterToolStripMenuItem.Click += new System.EventHandler(this.gameSharkConverterToolStripMenuItem_Click); + this.dummyExternalTool.Name = "dummyExternalTool"; + this.dummyExternalTool.Size = new System.Drawing.Size(172, 22); + this.dummyExternalTool.Text = "DummyItemMenu"; // // MainForm // @@ -3649,7 +3654,7 @@ this.ResumeLayout(false); this.PerformLayout(); - } + } #endregion @@ -4038,10 +4043,11 @@ private System.Windows.Forms.ToolStripMenuItem DisplayMessagesMenuItem; private System.Windows.Forms.ToolStripMenuItem C64SubMenu; private System.Windows.Forms.ToolStripMenuItem C64SettingsMenuItem; - private System.Windows.Forms.ToolStripMenuItem customToolToolStripMenuItem; + private System.Windows.Forms.ToolStripMenuItem externalToolToolStripMenuItem; private System.Windows.Forms.ToolStripMenuItem CodeDataLoggerMenuItem; private System.Windows.Forms.ToolStripMenuItem setLibretroCoreToolStripMenuItem; private System.Windows.Forms.ToolStripMenuItem OpenAdvancedMenuItem; private System.Windows.Forms.ToolStripMenuItem gameSharkConverterToolStripMenuItem; + private System.Windows.Forms.ToolStripMenuItem dummyExternalTool; } } diff --git a/BizHawk.Client.EmuHawk/MainForm.Events.cs b/BizHawk.Client.EmuHawk/MainForm.Events.cs index 3d27de978e..33813d0ac3 100644 --- a/BizHawk.Client.EmuHawk/MainForm.Events.cs +++ b/BizHawk.Client.EmuHawk/MainForm.Events.cs @@ -2,6 +2,8 @@ using System; using System.Drawing; using System.IO; using System.Windows.Forms; +using System.Reflection; +using System.Linq; using BizHawk.Emulation.Common; using BizHawk.Emulation.Common.IEmulatorExtensions; @@ -51,7 +53,7 @@ namespace BizHawk.Client.EmuHawk var font = new System.Drawing.Font(SaveRAMSubMenu.Font, needBold ? FontStyle.Bold : FontStyle.Regular); SaveRAMSubMenu.Font.Dispose(); SaveRAMSubMenu.Font = font; - } + } } private void RecentRomMenuItem_DropDownOpened(object sender, EventArgs e) @@ -350,7 +352,7 @@ namespace BizHawk.Client.EmuHawk _lastOpenRomFilter = ofd.FilterIndex; //----------------- - + LoadRom(file.FullName, args); } @@ -1248,10 +1250,53 @@ namespace BizHawk.Client.EmuHawk AutoHawkMenuItem.Visible = VersionInfo.DeveloperBuild; BasicBotMenuItem.Enabled = GlobalWin.Tools.IsAvailable(); - - string toolPath = Path.Combine(Global.Config.PathEntries["Global", "GameTools"].Path, string.Format("{0}.dll", Global.Game.Name)); - customToolToolStripMenuItem.Enabled = File.Exists(toolPath); - gameSharkConverterToolStripMenuItem.Enabled = GlobalWin.Tools.IsAvailable(); + + gameSharkConverterToolStripMenuItem.Enabled = GlobalWin.Tools.IsAvailable(); + } + + private void ExternalToolToolStripMenuItem_DropDownOpening(object sender, EventArgs e) + { + externalToolToolStripMenuItem.DropDownItems.Clear(); + string path = Path.Combine(Global.Config.PathEntries["Global", "External Tools"].Path); + if (Directory.Exists(path)) + { + DirectoryInfo dInfo = new DirectoryInfo(path); + foreach (FileInfo fi in dInfo.GetFiles("*.dll")) + { + Assembly externalToolFile = Assembly.ReflectionOnlyLoadFrom(fi.FullName); + ToolStripMenuItem externalToolMenu = new ToolStripMenuItem(externalToolFile.GetName().Name); + Type[] assemblyTypes; + /* + The reason of using this ugly try catch is due to the use of ReflectionOnlyLoadFrom methods + When the assembly is loaded this way, referenced assemblies are not loaded and so, as soon as a type + existing in another assembly, it raises the exception. + + But the advantage of this is that memory footprint is reduced + */ + try + { + assemblyTypes = externalToolFile.GetTypes(); + } + catch(ReflectionTypeLoadException ex) + { + assemblyTypes = ex.Types.Where(t => t != null && t.FullName.Contains("BizHawk.Client.EmuHawk.CustomMainForm")).ToArray(); + } + + if (assemblyTypes.Count() == 1) + { + externalToolMenu.Image = Properties.Resources.Debugger; + } + else + { + externalToolMenu.Image = Properties.Resources.ExclamationRed; + } + externalToolToolStripMenuItem.DropDownItems.Add(externalToolMenu); + } + } + if(externalToolToolStripMenuItem.DropDownItems.Count == 0) + { + externalToolToolStripMenuItem.DropDownItems.Add("Dummy External Tool"); + } } private void AutoHawkMenuItem_Click(object sender, EventArgs e) @@ -1317,12 +1362,7 @@ namespace BizHawk.Client.EmuHawk private void LuaConsoleMenuItem_Click(object sender, EventArgs e) { OpenLuaConsole(); - } - - private void CustomToolMenuItem_Click(object sender, EventArgs e) - { - GlobalWin.Tools.Load(); - } + } private void batchRunnerToolStripMenuItem_Click(object sender, EventArgs e) { @@ -2748,7 +2788,7 @@ namespace BizHawk.Client.EmuHawk { var args = new LoadRomArgs(); args.OpenAdvanced = new OpenAdvanced_OpenRom { Path = filePaths[0] }; - LoadRom(filePaths[0],args); + LoadRom(filePaths[0], args); } } diff --git a/BizHawk.Client.EmuHawk/MainForm.cs b/BizHawk.Client.EmuHawk/MainForm.cs index 6d1565d6b4..53539b4375 100644 --- a/BizHawk.Client.EmuHawk/MainForm.cs +++ b/BizHawk.Client.EmuHawk/MainForm.cs @@ -3999,4 +3999,4 @@ namespace BizHawk.Client.EmuHawk } } -} +} diff --git a/BizHawk.Client.EmuHawk/MainForm.resx b/BizHawk.Client.EmuHawk/MainForm.resx index 76ad03062f..f1fca9c6e8 100644 --- a/BizHawk.Client.EmuHawk/MainForm.resx +++ b/BizHawk.Client.EmuHawk/MainForm.resx @@ -121,39 +121,6 @@ 17, 17 - - - iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAIAAAD8GO2jAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAJcEhZcwAADsQAAA7EAZUrDhsAAAY9SURBVEhLtZZpUJNXFIZRZ/SHf6BCEWrHpaAUbS0TkDAp - IEtAiMCAYisIsSASZJNNJJRYGECCEjZtyxI26RQIYcAAsoU97IsKOgQLLuA+Ou770jd+aQhpAP3hO3cy - X77cc557zzn33Ki8/8z6ZMC7d++eP3/+8OHDBw8e4PPRo0dPnz59/fq19Of/6RMAz549u3nz5j8fNDk5 - eeXKlatXr05PT9+4cQPv7969iwnSqXL6KMDjx4/h8eLFi3V1ddHR0VZW1uvWrdPU0tb+evU3Ojpubm5C - oXB0dHRoaGhgYGBwcBDP2ChhuwDg1atXcD08PJyenm68xVj1qzX6zvStcdkOBUKfmnMc4WBFU1tLS0tT - U1N9fX1tbW1FRUVxcXFQUBB2RnhQAnj79i1i+ubNm/v37589ezYnJ2fTpk2rfiBTWZnu5f17KoYiagZL - 2vpEXV2dHZ0CgQDLh2SAU6dO0el0qS8FwMuXLxHK69evT01NIb4TExO9vb1OO1xpRzL3loropd3+/O6S - tn6ot6enC4DOzqSkpNTUVHlAeHh4WVkZkk/4nAW4ffv20aNHEUECgOAgn+Pj4vbhEValiF3d1TM4TAS6 - 5z9AW5skRDIAn883s3O4PDV9/vx5wqdiiBCczMzMxsZGOcD42NjYhQsXYIOIKQXIcsBkMreH/FY/MNrQ - 0EDkWRGAEJWWlq7X068SVMsDUEIjIyNzAcrLy6uqqqqrq8mWtowsfk5dp7BZiPKFw1kAnCCQ12/Q2xF6 - hM46fqa+YS4AcgNAe3s7l8ttbm7e4+GJ5QcHB7scZDEyio+V1GJCd3c3fM4CoBzt7e2pu739krMYyVkR - ySeUAhBDR0enkpISpNfGzh5xN9/uXMHnG5pZwwojIZ8nEomQGPicASDDiYmJ+iSyb1wqRlDSib7hcwoA - 2FhTqYYWtlHHTxpTTANDwnbuC9jt5h4Qm7zTdZd7GAuGB+LTOHnFNTU1YMCtFICEtLa26ulvpIfG7GMm - YtS3dSrkAEc0MjIygZMRfyLXh5mwwyfI0d3Lj8W2dXU/wGJbOrrGpv3JLfqLk5q6b78vDjzKZAZw69at - iIgICpW2N4SJkc4tUqgihRwIW1pZx9LpBw9jMj79mXHFpbza2jNJ7CSdDd/W1DX4+/vjwM4AkBBDoy0/ - +QTQA8JDWQli8fj8AFSRSNTlGxrp5hu8P4x5WlCNMkVKdPX0fwkMn5iY9PPzIzxLAKj9vLy8kLCI3v4B - 9BDZSZ4f4O3tbUTZutPT5+8yHnKDFoTidnLb+we3MDc3l8fjzQDu3bsnFovhGk7ReBcEwN22bdu+MzC0 - c94VEc0iDhqF8qOVvZPzzx5jYrGDg8OLFy9mADii5ubmK1dqaWmvYjD85gJgGto1OuXq1WtIW0zMrWyt - bWmlZTwA4uPjN35vgDdZudzCwsKUlBTCOyQBwIxG225oRCYZkVM4aUoBcXFxmzdvVtf4UkdnPcnQmGpr - d5j562mBgDjJgYGBsN3t7nHp0iVLS8snT54Q3iEJAPXn7OICS4zs7GylgPJyflpaOoeTevLk75WVlcgB - surl5YWuBUBuLtfAgNTX189gMNAzCNeEpCHy8PBQU/sCA8d9wRygSRw6dGjFihXLly+n0WhISWNjU1kZ - r6CgAEjZXUZIArh27VpMTMzixYsXLVqkpqaGNjIXAN0tLCxMS0tLRUUF8wkTpBQdLD8/39TUFJcr4Vcm - CQD3DMpUW1sbZhAeUGeXP4gAICBsNhttatmyZcQcmdTV1YuKikJCQmJjY7Emwqm8JAAI20R5YDlSOxUV - DQ0NCwsLKpWqq6u7ZMkS6Vs5YbKJiQkaKroeiUTCpX3nzh3Cm7ykAFy/2KOLi4vUeiFpamqiM+IWioqK - MjMzI1q/UkkBEGqD+EOgqqoqdaNMa9euRcvr6+vD9Ysd4Fl2ppRqBoB5CDQqAac8NDSUQqEgmQj60qVL - ES4EwdPTE7vEjY8Jjo6O1tbW6BlS47k1A4DwLygjIwONEKcRhfGh/hrx2dHRgeaOLaLYyGQyShPviWa5 - oGYBIFQxmhK2gvVijTY2NsgzQgG/KEdkErWrUOnzSxEgE7ygy6IwwEN14+sn+ZWJAMCSGPNK8vtHTJPX - +/f/AtNpu+2UY3h4AAAAAElFTkSuQmCC - - iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO @@ -174,6 +141,39 @@ SgAAEEoBNcinnwAAAHBJREFUOE/NkOEKACEIg330e/NOA2PqTqL+XPBpbcMokUfGFUy0xTrFitogNHgG qUJDzs58ERpydua1/OwJiv967hQr4QkfaHJSPDzYICR4OwOOsOK3+c2Oh/I5QMUEDijD1gbMEiKZpaF5 BBW3kfECg6SiSi9TP3UAAAAASUVORK5CYII= + + + + + iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAIAAAD8GO2jAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO + xAAADsQBlSsOGwAABj1JREFUSEu1lmlQk1cUhlFn9Id/oEIRaseloBRtLROQMCkgS0CIwIBiKwixIBJk + k00klFgYQIISNm3LEjbpFAhhwACyhT3siwo6BAsu4D467vvSN35pCGkA/eE7dzJfvtxznnvPOffcqLz/ + zPpkwLt3754/f/7w4cMHDx7g89GjR0+fPn39+rX05//pEwDPnj27efPmPx80OTl55cqVq1evTk9P37hx + A+/v3r2LCdKpcvoowOPHj+Hx4sWLdXV10dHRVlbW69at09TS1v569Tc6Om5ubkKhcHR0dGhoaGBgYHBw + EM/YKGG7AODVq1dwPTw8nJ6ebrzFWPWrNfrO9K1x2Q4FQp+acxzhYEVTW0tLS1NTU319fW1tbUVFRXFx + cVBQEHZGeFACePv2LWL65s2b+/fvnz17NicnZ9OmTat+IFNZme7l/XsqhiJqBkva+kRdXZ0dnQKBAMuH + ZIBTp07R6XSpLwXAy5cvEcrr169PTU0hvhMTE729vU47XGlHMveWiuil3f787pK2fqi3p6cLgM7OpKSk + 1NRUeUB4eHhZWRmST/icBbh9+/bRo0cRQQKA4CCf4+Pi9uERVqWIXd3VMzhMBLrnP0BbmyREMgCfzzez + c7g8NX3+/HnCp2KIEJzMzMzGxkY5wPjY2NiFCxdgg4gpBchywGQyt4f8Vj8w2tDQQORZEYAQlZaWrtfT + rxJUywNQQiMjI3MBysvLq6qqqquryZa2jCx+Tl2nsFmI8oXDWQCcIJDXb9DbEXqEzjp+pr5hLgByA0B7 + ezuXy21ubt7j4YnlBwcHuxxkMTKKj5XUYkJ3dzd8zgKgHO3t7am7vf2SsxjJWRHJJ5QCEENHR6eSkhKk + 18bOHnE33+5cwecbmlnDCiMhnycSiZAY+JwBIMOJiYn6JLJvXCpGUNKJvuFzCgDYWFOphha2UcdPGlNM + A0PCdu4L2O3mHhCbvNN1l3sYC4YH4tM4ecU1NTVgwK0UgIS0trbq6W+kh8bsYyZi1Ld1KuQARzQyMjKB + kxF/IteHmbDDJ8jR3cuPxbZ1dT/AYls6usam/ckt+ouTmrpvvy8OPMpkBnDr1q2IiAgKlbY3hImRzi1S + qCKFHAhbWlnH0ukHD2MyPv2ZccWlvNraM0nsJJ0N39bUNfj7++PAzgCQEEOjLT/5BNADwkNZCWLx+PwA + VJFI1OUbGunmG7w/jHlaUI0yRUp09fR/CQyfmJj08/MjPEsAqP28vLyQsIje/gH0ENlJnh/g7e1tRNm6 + 09Pn7zIecoMWhOJ2ctv7B7cwNzeXx+PNAO7duycWi+EaTtF4FwTA3bZt274zMLRz3hURzSIOGoXyo5W9 + k/PPHmNisYODw4sXL2YAOKLm5uYrV2ppaa9iMPzmAmAa2jU65erVa0hbTMytbK1taaVlPADi4+M3fm+A + N1m53MLCwpSUFMI7JAHAjEbbbmhEJhmRUzhpSgFxcXGbN29W1/hSR2c9ydCYamt3mPnraYGAOMmBgYGw + 3e3ucenSJUtLyydPnhDeIQkA9efs4gJLjOzsbKWA8nJ+Wlo6h5N68uTvlZWVyAGy6uXlha4FQG4u18CA + 1NfXz2Aw0DMI14SkIfLw8FBT+wIDx33BHKBJHDp0aMWKFcuXL6fRaEhJY2NTWRmvoKAASNldRkgCuHbt + WkxMzOLFixctWqSmpoY2MhcA3S0sLExLS0tFRQXzCROkFB0sPz/f1NQUlyvhVyYJAPcMylRbWxtmEB5Q + Z5c/iAAgIGw2G21q2bJlxByZ1NXVi4qKQkJCYmNjsSbCqbwkAAjbRHlgOVI7FRUNDQ0LCwsqlaqrq7tk + yRLpWzlhsomJCRoquh6JRMKlfefOHcKbvKQAXL/Yo4uLi9R6IWlqaqIz4haKiooyMzMjWr9SSQEQaoP4 + Q6Cqqip1o0xr165Fy+vr68P1ix3gWXamlGoGgHkINCoBpzw0NJRCoSCZCPrSpUsRLgTB09MTu8SNjwmO + jo7W1tboGVLjuTUDgPAvKCMjA40QpxGF8aH+GvHZ0dGB5o4totjIZDJKE++JZrmgZgEgVDGaEraC9WKN + NjY2yDNCAb8oR2QStatQ6fNLESATvKDLojDAQ3Xj6yf5lYkAwJIY80ry+0dMk9f79/8C02m77ZRjeHgA + AAAASUVORK5CYII= diff --git a/BizHawk.Client.EmuHawk/tools/ICustomGameTool.cs b/BizHawk.Client.EmuHawk/tools/IExternalToolForm.cs similarity index 83% rename from BizHawk.Client.EmuHawk/tools/ICustomGameTool.cs rename to BizHawk.Client.EmuHawk/tools/IExternalToolForm.cs index 05021ee4d3..c758942ba7 100644 --- a/BizHawk.Client.EmuHawk/tools/ICustomGameTool.cs +++ b/BizHawk.Client.EmuHawk/tools/IExternalToolForm.cs @@ -8,7 +8,7 @@ namespace BizHawk.Client.EmuHawk /// /// Interface to implements in order to make a custom tool for a specific game /// - public interface ICustomGameTool:IToolForm + public interface IExternalToolForm :IToolForm { } } diff --git a/BizHawk.Client.EmuHawk/tools/ToolManager.cs b/BizHawk.Client.EmuHawk/tools/ToolManager.cs index 083a42ea32..bb7dbfa939 100644 --- a/BizHawk.Client.EmuHawk/tools/ToolManager.cs +++ b/BizHawk.Client.EmuHawk/tools/ToolManager.cs @@ -512,9 +512,9 @@ namespace BizHawk.Client.EmuHawk IToolForm tool; //Specific case for custom tools - if (toolType == typeof(ICustomGameTool)) + if (toolType == typeof(IExternalToolForm)) { - string path = Path.Combine(Global.Config.PathEntries["Global", "GameTools"].Path, string.Format("{0}.dll", Global.Game.Name)); + string path = Path.Combine(Global.Config.PathEntries["Global", "External Tools"].Path, string.Format("{0}.dll", Global.Game.Name)); if (File.Exists(path) && MessageBox.Show("A custom plugin has been found for the ROM you're loading. Do you want to load it?\r\nAccept ONLY if you trust the source and if you know what you're doing. In any other case, choose no." , "Answer to life, universe and everything else?", MessageBoxButtons.YesNo, MessageBoxIcon.Question) == DialogResult.Yes) @@ -522,7 +522,7 @@ namespace BizHawk.Client.EmuHawk try { // As the object is "remote"(external to the project), the CreateInstanceFrom returns a handle.We need to Unwrap in order to make the casting - tool = System.Activator.CreateInstanceFrom(path, "BizHawk.Client.EmuHawk.CustomMainForm").Unwrap() as IToolForm; + tool = Activator.CreateInstanceFrom(path, "BizHawk.Client.EmuHawk.CustomMainForm").Unwrap() as IToolForm; if (tool == null) { MessageBox.Show("It seems that the object CustomMainForm does not implement IToolForm. Please review the code.", "Boom!", MessageBoxButtons.OK, MessageBoxIcon.Exclamation); diff --git a/BizHawk.Common/TempFileManager.cs b/BizHawk.Common/TempFileManager.cs index 284d5034f7..895c9fef6e 100644 --- a/BizHawk.Common/TempFileManager.cs +++ b/BizHawk.Common/TempFileManager.cs @@ -46,7 +46,7 @@ namespace BizHawk.Common static void ThreadProc() { var di = new DirectoryInfo(Path.GetTempPath()); - for (; ; ) + for (;;) { var fis = di.GetFiles("bizdelete-*"); foreach (var fi in fis) @@ -73,4 +73,5 @@ namespace BizHawk.Common } static System.Threading.Thread thread; - } \ No newline at end of file + } +} \ No newline at end of file