From 4dc47451224a8d491dd4044c1017705c01280774 Mon Sep 17 00:00:00 2001 From: zeromus Date: Fri, 19 Dec 2014 03:24:48 +0000 Subject: [PATCH] psx - revise disc swapping method. way cooler now, you get a list of discs in the virtualpad box, and changing between them maps to physical operations more logically. --- BizHawk.Client.Common/RomLoader.cs | 8 +- .../BizHawk.Client.EmuHawk.csproj | 9 + BizHawk.Client.EmuHawk/MainForm.Designer.cs | 666 +++++++++--------- BizHawk.Client.EmuHawk/MainForm.Events.cs | 5 + BizHawk.Client.EmuHawk/MainForm.cs | 1 + BizHawk.Client.EmuHawk/tools/ToolManager.cs | 4 +- .../tools/VirtualPads/VirtualPad.cs | 12 + .../VirtualPads/VirtualpadsTool.Designer.cs | 72 +- .../tools/VirtualPads/VirtualpadsTool.cs | 21 +- .../VirtualPadDiscManager.Designer.cs | 136 ++++ .../controls/VirtualPadDiscManager.cs | 127 ++++ .../controls/VirtualPadDiscManager.resx | 120 ++++ .../tools/VirtualPads/schema/PSXSchema.cs | 34 +- .../tools/VirtualPads/schema/PadSchema.cs | 4 +- .../Consoles/Sony/PSX/Octoshock.cs | 105 ++- output/dll/octoshock.dll | Bin 844800 -> 844800 bytes psx/octoshock/psx/psx.cpp | 12 +- 17 files changed, 922 insertions(+), 414 deletions(-) create mode 100644 BizHawk.Client.EmuHawk/tools/VirtualPads/controls/VirtualPadDiscManager.Designer.cs create mode 100644 BizHawk.Client.EmuHawk/tools/VirtualPads/controls/VirtualPadDiscManager.cs create mode 100644 BizHawk.Client.EmuHawk/tools/VirtualPads/controls/VirtualPadDiscManager.resx diff --git a/BizHawk.Client.Common/RomLoader.cs b/BizHawk.Client.Common/RomLoader.cs index d58ed11904..a4a94e8de6 100644 --- a/BizHawk.Client.Common/RomLoader.cs +++ b/BizHawk.Client.Common/RomLoader.cs @@ -216,6 +216,7 @@ namespace BizHawk.Client.Common //load discs for all the m3u m3u.Rebase(Path.GetDirectoryName(path)); List discs = new List(); + List discNames = new List(); foreach (var e in m3u.Entries) { Disc disc = null; @@ -229,9 +230,10 @@ namespace BizHawk.Client.Common disc = Disc.FromCCDPath(discPath); if(disc == null) throw new InvalidOperationException("Can't load one of the files specified in the M3U"); + discNames.Add(Path.GetFileNameWithoutExtension(discPath)); discs.Add(disc); } - nextEmulator = new Octoshock(nextComm, discs, null, GetCoreSettings(), GetCoreSyncSettings()); + nextEmulator = new Octoshock(nextComm, discs, discNames, null, GetCoreSettings(), GetCoreSyncSettings()); nextEmulator.CoreComm.RomStatusDetails = "PSX etc."; game = new GameInfo { Name = Path.GetFileNameWithoutExtension(file.Name) }; game.System = "PSX"; @@ -292,7 +294,7 @@ namespace BizHawk.Client.Common nextEmulator = new PSP(nextComm, file.Name); break; case "PSX": - nextEmulator = new Octoshock(nextComm, new List(new[]{disc}), null, GetCoreSettings(), GetCoreSyncSettings()); + nextEmulator = new Octoshock(nextComm, new List(new[]{disc}), new List(new[]{Path.GetFileNameWithoutExtension(path)}), null, GetCoreSettings(), GetCoreSyncSettings()); nextEmulator.CoreComm.RomStatusDetails = "PSX etc."; break; case "PCE": @@ -454,7 +456,7 @@ namespace BizHawk.Client.Common core = CoreInventory.Instance["GBA", "VBA-Next"]; break; case "PSX": - nextEmulator = new Octoshock(nextComm, null, rom.FileData, GetCoreSettings(), GetCoreSyncSettings()); + nextEmulator = new Octoshock(nextComm, null, null, rom.FileData, GetCoreSettings(), GetCoreSyncSettings()); nextEmulator.CoreComm.RomStatusDetails = "PSX etc."; break; case "DEBUG": diff --git a/BizHawk.Client.EmuHawk/BizHawk.Client.EmuHawk.csproj b/BizHawk.Client.EmuHawk/BizHawk.Client.EmuHawk.csproj index 235de5309d..c7980570df 100644 --- a/BizHawk.Client.EmuHawk/BizHawk.Client.EmuHawk.csproj +++ b/BizHawk.Client.EmuHawk/BizHawk.Client.EmuHawk.csproj @@ -982,6 +982,12 @@ Component + + UserControl + + + VirtualPadDiscManager.cs + UserControl @@ -1364,6 +1370,9 @@ VirtualPadAnalogStick.cs + + VirtualPadDiscManager.cs + VirtualPadTargetScreen.cs diff --git a/BizHawk.Client.EmuHawk/MainForm.Designer.cs b/BizHawk.Client.EmuHawk/MainForm.Designer.cs index 92f082d373..3d9fc908a3 100644 --- a/BizHawk.Client.EmuHawk/MainForm.Designer.cs +++ b/BizHawk.Client.EmuHawk/MainForm.Designer.cs @@ -377,6 +377,7 @@ this.ClearSRAMContextMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.ShowMenuContextMenuSeparator = new System.Windows.Forms.ToolStripSeparator(); this.ShowMenuContextMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.PSXDiscControlsMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.MainformMenu.SuspendLayout(); this.MainStatusBar.SuspendLayout(); this.MainFormContextMenu.SuspendLayout(); @@ -410,7 +411,7 @@ 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, 61); + this.MainformMenu.Size = new System.Drawing.Size(470, 57); this.MainformMenu.TabIndex = 0; this.MainformMenu.Text = "menuStrip1"; this.MainformMenu.MenuActivate += new System.EventHandler(this.MainformMenu_MenuActivate); @@ -435,7 +436,7 @@ this.toolStripSeparator4, this.ExitMenuItem}); this.FileSubMenu.Name = "FileSubMenu"; - this.FileSubMenu.Size = new System.Drawing.Size(37, 19); + this.FileSubMenu.Size = new System.Drawing.Size(35, 17); this.FileSubMenu.Text = "&File"; this.FileSubMenu.DropDownOpened += new System.EventHandler(this.FileSubMenu_DropDownOpened); // @@ -443,7 +444,7 @@ // this.OpenRomMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.OpenFile; this.OpenRomMenuItem.Name = "OpenRomMenuItem"; - this.OpenRomMenuItem.Size = new System.Drawing.Size(140, 22); + this.OpenRomMenuItem.Size = new System.Drawing.Size(134, 22); this.OpenRomMenuItem.Text = "Open ROM"; this.OpenRomMenuItem.Click += new System.EventHandler(this.OpenRomMenuItem_Click); // @@ -453,7 +454,7 @@ this.toolStripSeparator3}); this.RecentRomSubMenu.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.Recent; this.RecentRomSubMenu.Name = "RecentRomSubMenu"; - this.RecentRomSubMenu.Size = new System.Drawing.Size(140, 22); + this.RecentRomSubMenu.Size = new System.Drawing.Size(134, 22); this.RecentRomSubMenu.Text = "Recent ROM"; this.RecentRomSubMenu.DropDownOpened += new System.EventHandler(this.RecentRomMenuItem_DropDownOpened); // @@ -466,14 +467,14 @@ // this.CloseRomMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.Close; this.CloseRomMenuItem.Name = "CloseRomMenuItem"; - this.CloseRomMenuItem.Size = new System.Drawing.Size(140, 22); + this.CloseRomMenuItem.Size = new System.Drawing.Size(134, 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(137, 6); + this.toolStripMenuItem1.Size = new System.Drawing.Size(131, 6); // // SaveStateSubMenu // @@ -491,89 +492,89 @@ this.toolStripSeparator6, this.SaveNamedStateMenuItem}); this.SaveStateSubMenu.Name = "SaveStateSubMenu"; - this.SaveStateSubMenu.Size = new System.Drawing.Size(140, 22); + this.SaveStateSubMenu.Size = new System.Drawing.Size(134, 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(178, 22); + this.SaveState1MenuItem.Size = new System.Drawing.Size(175, 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(178, 22); + this.SaveState2MenuItem.Size = new System.Drawing.Size(175, 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(178, 22); + this.SaveState3MenuItem.Size = new System.Drawing.Size(175, 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(178, 22); + this.SaveState4MenuItem.Size = new System.Drawing.Size(175, 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(178, 22); + this.SaveState5MenuItem.Size = new System.Drawing.Size(175, 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(178, 22); + this.SaveState6MenuItem.Size = new System.Drawing.Size(175, 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(178, 22); + this.SaveState7MenuItem.Size = new System.Drawing.Size(175, 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(178, 22); + this.SaveState8MenuItem.Size = new System.Drawing.Size(175, 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(178, 22); + this.SaveState9MenuItem.Size = new System.Drawing.Size(175, 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(178, 22); + this.SaveState0MenuItem.Size = new System.Drawing.Size(175, 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(175, 6); + this.toolStripSeparator6.Size = new System.Drawing.Size(172, 6); // // SaveNamedStateMenuItem // this.SaveNamedStateMenuItem.Name = "SaveNamedStateMenuItem"; - this.SaveNamedStateMenuItem.Size = new System.Drawing.Size(178, 22); + this.SaveNamedStateMenuItem.Size = new System.Drawing.Size(175, 22); this.SaveNamedStateMenuItem.Text = "Save Named State..."; this.SaveNamedStateMenuItem.Click += new System.EventHandler(this.SaveNamedStateMenuItem_Click); // @@ -595,101 +596,101 @@ this.toolStripSeparator21, this.AutoloadLastSlotMenuItem}); this.LoadStateSubMenu.Name = "LoadStateSubMenu"; - this.LoadStateSubMenu.Size = new System.Drawing.Size(140, 22); + this.LoadStateSubMenu.Size = new System.Drawing.Size(134, 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(180, 22); + this.LoadState1MenuItem.Size = new System.Drawing.Size(174, 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(180, 22); + this.LoadState2MenuItem.Size = new System.Drawing.Size(174, 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(180, 22); + this.LoadState3MenuItem.Size = new System.Drawing.Size(174, 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(180, 22); + this.LoadState4MenuItem.Size = new System.Drawing.Size(174, 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(180, 22); + this.LoadState5MenuItem.Size = new System.Drawing.Size(174, 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(180, 22); + this.LoadState6MenuItem.Size = new System.Drawing.Size(174, 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(180, 22); + this.LoadState7MenuItem.Size = new System.Drawing.Size(174, 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(180, 22); + this.LoadState8MenuItem.Size = new System.Drawing.Size(174, 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(180, 22); + this.LoadState9MenuItem.Size = new System.Drawing.Size(174, 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(180, 22); + this.LoadState0MenuItem.Size = new System.Drawing.Size(174, 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(177, 6); + this.toolStripSeparator7.Size = new System.Drawing.Size(171, 6); // // LoadNamedStateMenuItem // this.LoadNamedStateMenuItem.Name = "LoadNamedStateMenuItem"; - this.LoadNamedStateMenuItem.Size = new System.Drawing.Size(180, 22); + this.LoadNamedStateMenuItem.Size = new System.Drawing.Size(174, 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(177, 6); + this.toolStripSeparator21.Size = new System.Drawing.Size(171, 6); // // AutoloadLastSlotMenuItem // this.AutoloadLastSlotMenuItem.Name = "AutoloadLastSlotMenuItem"; - this.AutoloadLastSlotMenuItem.Size = new System.Drawing.Size(180, 22); + this.AutoloadLastSlotMenuItem.Size = new System.Drawing.Size(174, 22); this.AutoloadLastSlotMenuItem.Text = "Autoload last Slot"; this.AutoloadLastSlotMenuItem.Click += new System.EventHandler(this.AutoloadLastSlotMenuItem_Click); // @@ -712,77 +713,77 @@ this.SaveToCurrentSlotMenuItem, this.LoadCurrentSlotMenuItem}); this.SaveSlotSubMenu.Name = "SaveSlotSubMenu"; - this.SaveSlotSubMenu.Size = new System.Drawing.Size(140, 22); + this.SaveSlotSubMenu.Size = new System.Drawing.Size(134, 22); this.SaveSlotSubMenu.Text = "Save Slot"; this.SaveSlotSubMenu.DropDownOpened += new System.EventHandler(this.SaveSlotSubMenu_DropDownOpened); // // SelectSlot0MenuItem // this.SelectSlot0MenuItem.Name = "SelectSlot0MenuItem"; - this.SelectSlot0MenuItem.Size = new System.Drawing.Size(178, 22); + this.SelectSlot0MenuItem.Size = new System.Drawing.Size(172, 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(178, 22); + this.SelectSlot1MenuItem.Size = new System.Drawing.Size(172, 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(178, 22); + this.SelectSlot2MenuItem.Size = new System.Drawing.Size(172, 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(178, 22); + this.SelectSlot3MenuItem.Size = new System.Drawing.Size(172, 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(178, 22); + this.SelectSlot4MenuItem.Size = new System.Drawing.Size(172, 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(178, 22); + this.SelectSlot5MenuItem.Size = new System.Drawing.Size(172, 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(178, 22); + this.SelectSlot6MenuItem.Size = new System.Drawing.Size(172, 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(178, 22); + this.SelectSlot7MenuItem.Size = new System.Drawing.Size(172, 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(178, 22); + this.SelectSlot8MenuItem.Size = new System.Drawing.Size(172, 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(178, 22); + this.SelectSlot9MenuItem.Size = new System.Drawing.Size(172, 22); this.SelectSlot9MenuItem.Text = "Select Slot 9"; this.SelectSlot9MenuItem.Click += new System.EventHandler(this.SelectSlotMenuItems_Click); // @@ -790,7 +791,7 @@ // this.PreviousSlotMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.MoveLeft; this.PreviousSlotMenuItem.Name = "PreviousSlotMenuItem"; - this.PreviousSlotMenuItem.Size = new System.Drawing.Size(178, 22); + this.PreviousSlotMenuItem.Size = new System.Drawing.Size(172, 22); this.PreviousSlotMenuItem.Text = "Previous Slot"; this.PreviousSlotMenuItem.Click += new System.EventHandler(this.PreviousSlotMenuItem_Click); // @@ -798,26 +799,26 @@ // this.NextSlotMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.MoveRight; this.NextSlotMenuItem.Name = "NextSlotMenuItem"; - this.NextSlotMenuItem.Size = new System.Drawing.Size(178, 22); + this.NextSlotMenuItem.Size = new System.Drawing.Size(172, 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(175, 6); + this.toolStripSeparator5.Size = new System.Drawing.Size(169, 6); // // SaveToCurrentSlotMenuItem // this.SaveToCurrentSlotMenuItem.Name = "SaveToCurrentSlotMenuItem"; - this.SaveToCurrentSlotMenuItem.Size = new System.Drawing.Size(178, 22); + this.SaveToCurrentSlotMenuItem.Size = new System.Drawing.Size(172, 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(178, 22); + this.LoadCurrentSlotMenuItem.Size = new System.Drawing.Size(172, 22); this.LoadCurrentSlotMenuItem.Text = "Load Current Slot"; this.LoadCurrentSlotMenuItem.Click += new System.EventHandler(this.LoadCurrentSlotMenuItem_Click); // @@ -827,7 +828,7 @@ 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(140, 22); + this.SaveRAMSubMenu.Size = new System.Drawing.Size(134, 22); this.SaveRAMSubMenu.Text = "Save RAM"; // // FlushSaveRAMMenuItem @@ -841,7 +842,7 @@ // toolStripMenuItem2 // this.toolStripMenuItem2.Name = "toolStripMenuItem2"; - this.toolStripMenuItem2.Size = new System.Drawing.Size(137, 6); + this.toolStripMenuItem2.Size = new System.Drawing.Size(131, 6); // // MovieSubMenu // @@ -861,7 +862,7 @@ this.FullMovieLoadstatesMenuItem, this.MovieEndSubMenu}); this.MovieSubMenu.Name = "MovieSubMenu"; - this.MovieSubMenu.Size = new System.Drawing.Size(140, 22); + this.MovieSubMenu.Size = new System.Drawing.Size(134, 22); this.MovieSubMenu.Text = "Movie"; this.MovieSubMenu.DropDownOpened += new System.EventHandler(this.MovieSubMenu_DropDownOpened); // @@ -869,14 +870,14 @@ // this.ReadonlyMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.ReadOnly; this.ReadonlyMenuItem.Name = "ReadonlyMenuItem"; - this.ReadonlyMenuItem.Size = new System.Drawing.Size(231, 22); + this.ReadonlyMenuItem.Size = new System.Drawing.Size(211, 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(228, 6); + this.toolStripSeparator15.Size = new System.Drawing.Size(208, 6); // // RecentMovieSubMenu // @@ -884,7 +885,7 @@ this.toolStripSeparator16}); this.RecentMovieSubMenu.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.Recent; this.RecentMovieSubMenu.Name = "RecentMovieSubMenu"; - this.RecentMovieSubMenu.Size = new System.Drawing.Size(231, 22); + this.RecentMovieSubMenu.Size = new System.Drawing.Size(211, 22); this.RecentMovieSubMenu.Text = "Recent"; this.RecentMovieSubMenu.DropDownOpened += new System.EventHandler(this.RecentMovieSubMenu_DropDownOpened); // @@ -897,7 +898,7 @@ // this.RecordMovieMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.RecordHS; this.RecordMovieMenuItem.Name = "RecordMovieMenuItem"; - this.RecordMovieMenuItem.Size = new System.Drawing.Size(231, 22); + this.RecordMovieMenuItem.Size = new System.Drawing.Size(211, 22); this.RecordMovieMenuItem.Text = "&Record Movie..."; this.RecordMovieMenuItem.Click += new System.EventHandler(this.RecordMovieMenuItem_Click); // @@ -905,7 +906,7 @@ // this.PlayMovieMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.Play; this.PlayMovieMenuItem.Name = "PlayMovieMenuItem"; - this.PlayMovieMenuItem.Size = new System.Drawing.Size(231, 22); + this.PlayMovieMenuItem.Size = new System.Drawing.Size(211, 22); this.PlayMovieMenuItem.Text = "&Play Movie..."; this.PlayMovieMenuItem.Click += new System.EventHandler(this.PlayMovieMenuItem_Click); // @@ -913,7 +914,7 @@ // this.StopMovieMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.Stop; this.StopMovieMenuItem.Name = "StopMovieMenuItem"; - this.StopMovieMenuItem.Size = new System.Drawing.Size(231, 22); + this.StopMovieMenuItem.Size = new System.Drawing.Size(211, 22); this.StopMovieMenuItem.Text = "Stop Movie"; this.StopMovieMenuItem.Click += new System.EventHandler(this.StopMovieMenuItem_Click); // @@ -921,7 +922,7 @@ // this.PlayFromBeginningMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.restart; this.PlayFromBeginningMenuItem.Name = "PlayFromBeginningMenuItem"; - this.PlayFromBeginningMenuItem.Size = new System.Drawing.Size(231, 22); + this.PlayFromBeginningMenuItem.Size = new System.Drawing.Size(211, 22); this.PlayFromBeginningMenuItem.Text = "Play from Beginning"; this.PlayFromBeginningMenuItem.Click += new System.EventHandler(this.PlayFromBeginningMenuItem_Click); // @@ -929,7 +930,7 @@ // this.ImportMoviesMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.Import; this.ImportMoviesMenuItem.Name = "ImportMoviesMenuItem"; - this.ImportMoviesMenuItem.Size = new System.Drawing.Size(231, 22); + this.ImportMoviesMenuItem.Size = new System.Drawing.Size(211, 22); this.ImportMoviesMenuItem.Text = "Import Movies..."; this.ImportMoviesMenuItem.Click += new System.EventHandler(this.ImportMovieMenuItem_Click); // @@ -937,7 +938,7 @@ // this.SaveMovieMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.SaveAs; this.SaveMovieMenuItem.Name = "SaveMovieMenuItem"; - this.SaveMovieMenuItem.Size = new System.Drawing.Size(231, 22); + this.SaveMovieMenuItem.Size = new System.Drawing.Size(211, 22); this.SaveMovieMenuItem.Text = "&Save Movie"; this.SaveMovieMenuItem.Click += new System.EventHandler(this.SaveMovieMenuItem_Click); // @@ -945,26 +946,26 @@ // this.StopMovieWithoutSavingMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.Stop; this.StopMovieWithoutSavingMenuItem.Name = "StopMovieWithoutSavingMenuItem"; - this.StopMovieWithoutSavingMenuItem.Size = new System.Drawing.Size(231, 22); + this.StopMovieWithoutSavingMenuItem.Size = new System.Drawing.Size(211, 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(228, 6); + this.toolStripSeparator14.Size = new System.Drawing.Size(208, 6); // // AutomaticallyBackupMoviesMenuItem // this.AutomaticallyBackupMoviesMenuItem.Name = "AutomaticallyBackupMoviesMenuItem"; - this.AutomaticallyBackupMoviesMenuItem.Size = new System.Drawing.Size(231, 22); + this.AutomaticallyBackupMoviesMenuItem.Size = new System.Drawing.Size(211, 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(231, 22); + this.FullMovieLoadstatesMenuItem.Size = new System.Drawing.Size(211, 22); this.FullMovieLoadstatesMenuItem.Text = "Full Movie Loadstates"; this.FullMovieLoadstatesMenuItem.Click += new System.EventHandler(this.FullMovieLoadstatesMenuItem_Click); // @@ -976,35 +977,35 @@ this.MovieEndStopMenuItem, this.MovieEndPauseMenuItem}); this.MovieEndSubMenu.Name = "MovieEndSubMenu"; - this.MovieEndSubMenu.Size = new System.Drawing.Size(231, 22); + this.MovieEndSubMenu.Size = new System.Drawing.Size(211, 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(170, 22); + this.MovieEndFinishMenuItem.Size = new System.Drawing.Size(160, 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(170, 22); + this.MovieEndRecordMenuItem.Size = new System.Drawing.Size(160, 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(170, 22); + this.MovieEndStopMenuItem.Size = new System.Drawing.Size(160, 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(170, 22); + this.MovieEndPauseMenuItem.Size = new System.Drawing.Size(160, 22); this.MovieEndPauseMenuItem.Text = "Pause"; this.MovieEndPauseMenuItem.Click += new System.EventHandler(this.MovieEndPauseMenuItem_Click); // @@ -1017,7 +1018,7 @@ this.CaptureOSDMenuItem, this.SynclessRecordingMenuItem}); this.AVSubMenu.Name = "AVSubMenu"; - this.AVSubMenu.Size = new System.Drawing.Size(140, 22); + this.AVSubMenu.Size = new System.Drawing.Size(134, 22); this.AVSubMenu.Text = "AVI/WAV"; this.AVSubMenu.DropDownOpened += new System.EventHandler(this.AVSubMenu_DropDownOpened); // @@ -1025,7 +1026,7 @@ // this.RecordAVMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.AVI; this.RecordAVMenuItem.Name = "RecordAVMenuItem"; - this.RecordAVMenuItem.Size = new System.Drawing.Size(207, 22); + this.RecordAVMenuItem.Size = new System.Drawing.Size(194, 22); this.RecordAVMenuItem.Text = "&Record AVI/WAV"; this.RecordAVMenuItem.Click += new System.EventHandler(this.RecordAVMenuItem_Click); // @@ -1033,26 +1034,26 @@ // this.StopAVIMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.Stop; this.StopAVIMenuItem.Name = "StopAVIMenuItem"; - this.StopAVIMenuItem.Size = new System.Drawing.Size(207, 22); + this.StopAVIMenuItem.Size = new System.Drawing.Size(194, 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(204, 6); + this.toolStripSeparator19.Size = new System.Drawing.Size(191, 6); // // CaptureOSDMenuItem // this.CaptureOSDMenuItem.Name = "CaptureOSDMenuItem"; - this.CaptureOSDMenuItem.Size = new System.Drawing.Size(207, 22); + this.CaptureOSDMenuItem.Size = new System.Drawing.Size(194, 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(207, 22); + this.SynclessRecordingMenuItem.Size = new System.Drawing.Size(194, 22); this.SynclessRecordingMenuItem.Text = "S&yncless Recording Tools"; this.SynclessRecordingMenuItem.Click += new System.EventHandler(this.SynclessRecordingMenuItem_Click); // @@ -1066,7 +1067,7 @@ this.toolStripSeparator20, this.ScreenshotCaptureOSDMenuItem1}); this.ScreenshotSubMenu.Name = "ScreenshotSubMenu"; - this.ScreenshotSubMenu.Size = new System.Drawing.Size(140, 22); + this.ScreenshotSubMenu.Size = new System.Drawing.Size(134, 22); this.ScreenshotSubMenu.Text = "Screenshot"; this.ScreenshotSubMenu.DropDownOpening += new System.EventHandler(this.ScreenshotSubMenu_DropDownOpening); // @@ -1074,14 +1075,14 @@ // this.ScreenshotMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.camera; this.ScreenshotMenuItem.Name = "ScreenshotMenuItem"; - this.ScreenshotMenuItem.Size = new System.Drawing.Size(317, 22); + this.ScreenshotMenuItem.Size = new System.Drawing.Size(296, 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(317, 22); + this.ScreenshotAsMenuItem.Size = new System.Drawing.Size(296, 22); this.ScreenshotAsMenuItem.Text = "Screenshot As..."; this.ScreenshotAsMenuItem.Click += new System.EventHandler(this.ScreenshotAsMenuItem_Click); // @@ -1089,7 +1090,7 @@ // 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(317, 22); + this.ScreenshotClipboardMenuItem.Size = new System.Drawing.Size(296, 22); this.ScreenshotClipboardMenuItem.Text = "Screenshot (raw) -> Clipboard"; this.ScreenshotClipboardMenuItem.Click += new System.EventHandler(this.ScreenshotClipboardMenuItem_Click); // @@ -1098,32 +1099,32 @@ 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(317, 22); + this.ScreenshotClientClipboardMenuItem.Size = new System.Drawing.Size(296, 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(314, 6); + this.toolStripSeparator20.Size = new System.Drawing.Size(293, 6); // // ScreenshotCaptureOSDMenuItem1 // this.ScreenshotCaptureOSDMenuItem1.Name = "ScreenshotCaptureOSDMenuItem1"; - this.ScreenshotCaptureOSDMenuItem1.Size = new System.Drawing.Size(317, 22); + this.ScreenshotCaptureOSDMenuItem1.Size = new System.Drawing.Size(296, 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(137, 6); + this.toolStripSeparator4.Size = new System.Drawing.Size(131, 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(140, 22); + this.ExitMenuItem.Size = new System.Drawing.Size(134, 22); this.ExitMenuItem.Text = "Exit"; this.ExitMenuItem.Click += new System.EventHandler(this.ExitMenuItem_Click); // @@ -1136,7 +1137,7 @@ this.SoftResetMenuItem, this.HardResetMenuItem}); this.EmulationSubMenu.Name = "EmulationSubMenu"; - this.EmulationSubMenu.Size = new System.Drawing.Size(73, 19); + this.EmulationSubMenu.Size = new System.Drawing.Size(65, 17); this.EmulationSubMenu.Text = "&Emulation"; this.EmulationSubMenu.DropDownOpened += new System.EventHandler(this.emulationToolStripMenuItem_DropDownOpened); // @@ -1144,7 +1145,7 @@ // this.PauseMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.Pause; this.PauseMenuItem.Name = "PauseMenuItem"; - this.PauseMenuItem.Size = new System.Drawing.Size(140, 22); + this.PauseMenuItem.Size = new System.Drawing.Size(135, 22); this.PauseMenuItem.Text = "&Pause"; this.PauseMenuItem.Click += new System.EventHandler(this.PauseMenuItem_Click); // @@ -1152,26 +1153,26 @@ // this.RebootCoreMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.reboot; this.RebootCoreMenuItem.Name = "RebootCoreMenuItem"; - this.RebootCoreMenuItem.Size = new System.Drawing.Size(140, 22); + this.RebootCoreMenuItem.Size = new System.Drawing.Size(135, 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(137, 6); + this.toolStripSeparator1.Size = new System.Drawing.Size(132, 6); // // SoftResetMenuItem // this.SoftResetMenuItem.Name = "SoftResetMenuItem"; - this.SoftResetMenuItem.Size = new System.Drawing.Size(140, 22); + this.SoftResetMenuItem.Size = new System.Drawing.Size(135, 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(140, 22); + this.HardResetMenuItem.Size = new System.Drawing.Size(135, 22); this.HardResetMenuItem.Text = "&Hard Reset"; this.HardResetMenuItem.Click += new System.EventHandler(this.HardResetMenuItem_Click); // @@ -1191,7 +1192,7 @@ this.DisplayStatusBarMenuItem, this.DisplayLogWindowMenuItem}); this.ViewSubMenu.Name = "ViewSubMenu"; - this.ViewSubMenu.Size = new System.Drawing.Size(44, 19); + this.ViewSubMenu.Size = new System.Drawing.Size(41, 17); this.ViewSubMenu.Text = "&View"; this.ViewSubMenu.DropDownOpened += new System.EventHandler(this.ViewSubMenu_DropDownOpened); // @@ -1205,49 +1206,49 @@ this.x5MenuItem, this.mzMenuItem}); this.WindowSizeSubMenu.Name = "WindowSizeSubMenu"; - this.WindowSizeSubMenu.Size = new System.Drawing.Size(198, 22); + this.WindowSizeSubMenu.Size = new System.Drawing.Size(187, 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(96, 22); + this.x1MenuItem.Size = new System.Drawing.Size(94, 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(96, 22); + this.x2MenuItem.Size = new System.Drawing.Size(94, 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(96, 22); + this.x3MenuItem.Size = new System.Drawing.Size(94, 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(96, 22); + this.x4MenuItem.Size = new System.Drawing.Size(94, 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(96, 22); + this.x5MenuItem.Size = new System.Drawing.Size(94, 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(96, 22); + this.mzMenuItem.Size = new System.Drawing.Size(94, 22); this.mzMenuItem.Text = "&Max"; this.mzMenuItem.Click += new System.EventHandler(this.WindowSize_Click); // @@ -1255,73 +1256,73 @@ // this.SwitchToFullscreenMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.Fullscreen; this.SwitchToFullscreenMenuItem.Name = "SwitchToFullscreenMenuItem"; - this.SwitchToFullscreenMenuItem.Size = new System.Drawing.Size(198, 22); + this.SwitchToFullscreenMenuItem.Size = new System.Drawing.Size(187, 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(195, 6); + this.toolStripSeparator2.Size = new System.Drawing.Size(184, 6); // // DisplayFPSMenuItem // this.DisplayFPSMenuItem.Name = "DisplayFPSMenuItem"; - this.DisplayFPSMenuItem.Size = new System.Drawing.Size(198, 22); + this.DisplayFPSMenuItem.Size = new System.Drawing.Size(187, 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(198, 22); + this.DisplayFrameCounterMenuItem.Size = new System.Drawing.Size(187, 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(198, 22); + this.DisplayLagCounterMenuItem.Size = new System.Drawing.Size(187, 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(198, 22); + this.DisplayInputMenuItem.Size = new System.Drawing.Size(187, 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(198, 22); + this.DisplayRerecordCountMenuItem.Size = new System.Drawing.Size(187, 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(198, 22); + this.DisplaySubtitlesMenuItem.Size = new System.Drawing.Size(187, 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(195, 6); + this.toolStripMenuItem4.Size = new System.Drawing.Size(184, 6); // // DisplayStatusBarMenuItem // this.DisplayStatusBarMenuItem.Name = "DisplayStatusBarMenuItem"; - this.DisplayStatusBarMenuItem.Size = new System.Drawing.Size(198, 22); + this.DisplayStatusBarMenuItem.Size = new System.Drawing.Size(187, 22); this.DisplayStatusBarMenuItem.Text = "Display Status Bar"; this.DisplayStatusBarMenuItem.Click += new System.EventHandler(this.DisplayStatusBarMenuItem_Click); // // DisplayLogWindowMenuItem // this.DisplayLogWindowMenuItem.Name = "DisplayLogWindowMenuItem"; - this.DisplayLogWindowMenuItem.Size = new System.Drawing.Size(198, 22); + this.DisplayLogWindowMenuItem.Size = new System.Drawing.Size(187, 22); this.DisplayLogWindowMenuItem.Text = "Display Log Window"; this.DisplayLogWindowMenuItem.Click += new System.EventHandler(this.DisplayLogWindowMenuItem_Click); // @@ -1348,7 +1349,7 @@ this.SaveConfigMenuItem, this.LoadConfigMenuItem}); this.ConfigSubMenu.Name = "ConfigSubMenu"; - this.ConfigSubMenu.Size = new System.Drawing.Size(55, 19); + this.ConfigSubMenu.Size = new System.Drawing.Size(50, 17); this.ConfigSubMenu.Text = "&Config"; this.ConfigSubMenu.DropDownOpened += new System.EventHandler(this.ConfigSubMenu_DropDownOpened); // @@ -1356,7 +1357,7 @@ // this.ControllersMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.GameController; this.ControllersMenuItem.Name = "ControllersMenuItem"; - this.ControllersMenuItem.Size = new System.Drawing.Size(169, 22); + this.ControllersMenuItem.Size = new System.Drawing.Size(165, 22); this.ControllersMenuItem.Text = "&Controllers..."; this.ControllersMenuItem.Click += new System.EventHandler(this.ControllersMenuItem_Click); // @@ -1364,7 +1365,7 @@ // this.HotkeysMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.HotKeys; this.HotkeysMenuItem.Name = "HotkeysMenuItem"; - this.HotkeysMenuItem.Size = new System.Drawing.Size(169, 22); + this.HotkeysMenuItem.Size = new System.Drawing.Size(165, 22); this.HotkeysMenuItem.Text = "&Hotkeys..."; this.HotkeysMenuItem.Click += new System.EventHandler(this.HotkeysMenuItem_Click); // @@ -1372,7 +1373,7 @@ // this.DisplayConfigMenuItem.Image = ((System.Drawing.Image)(resources.GetObject("DisplayConfigMenuItem.Image"))); this.DisplayConfigMenuItem.Name = "DisplayConfigMenuItem"; - this.DisplayConfigMenuItem.Size = new System.Drawing.Size(169, 22); + this.DisplayConfigMenuItem.Size = new System.Drawing.Size(165, 22); this.DisplayConfigMenuItem.Text = "Display..."; this.DisplayConfigMenuItem.Click += new System.EventHandler(this.DisplayConfigMenuItem_Click); // @@ -1380,7 +1381,7 @@ // this.SoundMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.AudioHS; this.SoundMenuItem.Name = "SoundMenuItem"; - this.SoundMenuItem.Size = new System.Drawing.Size(169, 22); + this.SoundMenuItem.Size = new System.Drawing.Size(165, 22); this.SoundMenuItem.Text = "&Sound..."; this.SoundMenuItem.Click += new System.EventHandler(this.SoundMenuItem_Click); // @@ -1388,7 +1389,7 @@ // this.PathsMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.CopyFolderHS; this.PathsMenuItem.Name = "PathsMenuItem"; - this.PathsMenuItem.Size = new System.Drawing.Size(169, 22); + this.PathsMenuItem.Size = new System.Drawing.Size(165, 22); this.PathsMenuItem.Text = "Paths..."; this.PathsMenuItem.Click += new System.EventHandler(this.PathsMenuItem_Click); // @@ -1396,7 +1397,7 @@ // this.FirmwaresMenuItem.Image = ((System.Drawing.Image)(resources.GetObject("FirmwaresMenuItem.Image"))); this.FirmwaresMenuItem.Name = "FirmwaresMenuItem"; - this.FirmwaresMenuItem.Size = new System.Drawing.Size(169, 22); + this.FirmwaresMenuItem.Size = new System.Drawing.Size(165, 22); this.FirmwaresMenuItem.Text = "&Firmwares..."; this.FirmwaresMenuItem.Click += new System.EventHandler(this.FirmwaresMenuItem_Click); // @@ -1404,7 +1405,7 @@ // this.MessagesMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.MessageConfig; this.MessagesMenuItem.Name = "MessagesMenuItem"; - this.MessagesMenuItem.Size = new System.Drawing.Size(169, 22); + this.MessagesMenuItem.Size = new System.Drawing.Size(165, 22); this.MessagesMenuItem.Text = "&Messages..."; this.MessagesMenuItem.Click += new System.EventHandler(this.MessagesMenuItem_Click); // @@ -1412,7 +1413,7 @@ // this.AutofireMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.Lightning; this.AutofireMenuItem.Name = "AutofireMenuItem"; - this.AutofireMenuItem.Size = new System.Drawing.Size(169, 22); + this.AutofireMenuItem.Size = new System.Drawing.Size(165, 22); this.AutofireMenuItem.Text = "&Autofire..."; this.AutofireMenuItem.Click += new System.EventHandler(this.AutofireMenuItem_Click); // @@ -1420,21 +1421,21 @@ // this.RewindOptionsMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.Previous; this.RewindOptionsMenuItem.Name = "RewindOptionsMenuItem"; - this.RewindOptionsMenuItem.Size = new System.Drawing.Size(169, 22); + this.RewindOptionsMenuItem.Size = new System.Drawing.Size(165, 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(169, 22); + this.extensionsToolStripMenuItem.Size = new System.Drawing.Size(165, 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(169, 22); + this.ClientOptionsMenuItem.Size = new System.Drawing.Size(165, 22); this.ClientOptionsMenuItem.Text = "&Customize..."; this.ClientOptionsMenuItem.Click += new System.EventHandler(this.CustomizeMenuItem_Click); // @@ -1442,14 +1443,14 @@ // this.ProfilesMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.user_blue_small; this.ProfilesMenuItem.Name = "ProfilesMenuItem"; - this.ProfilesMenuItem.Size = new System.Drawing.Size(169, 22); + this.ProfilesMenuItem.Size = new System.Drawing.Size(165, 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(166, 6); + this.toolStripSeparator9.Size = new System.Drawing.Size(162, 6); // // SpeedSkipSubMenu // @@ -1478,162 +1479,162 @@ this.Speed150MenuItem, this.Speed200MenuItem}); this.SpeedSkipSubMenu.Name = "SpeedSkipSubMenu"; - this.SpeedSkipSubMenu.Size = new System.Drawing.Size(169, 22); + this.SpeedSkipSubMenu.Size = new System.Drawing.Size(165, 22); this.SpeedSkipSubMenu.Text = "Speed/Skip"; this.SpeedSkipSubMenu.DropDownOpened += new System.EventHandler(this.FrameSkipMenuItem_DropDownOpened); // // ClickThrottleMenuItem // this.ClickThrottleMenuItem.Name = "ClickThrottleMenuItem"; - this.ClickThrottleMenuItem.Size = new System.Drawing.Size(202, 22); + this.ClickThrottleMenuItem.Size = new System.Drawing.Size(181, 22); this.ClickThrottleMenuItem.Text = "Clock Throttle"; this.ClickThrottleMenuItem.Click += new System.EventHandler(this.ClickThrottleMenuItem_Click); // // AudioThrottleMenuItem // this.AudioThrottleMenuItem.Name = "AudioThrottleMenuItem"; - this.AudioThrottleMenuItem.Size = new System.Drawing.Size(202, 22); + this.AudioThrottleMenuItem.Size = new System.Drawing.Size(181, 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(202, 22); + this.VsyncThrottleMenuItem.Size = new System.Drawing.Size(181, 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(199, 6); + this.toolStripSeparator27.Size = new System.Drawing.Size(178, 6); // // VsyncEnabledMenuItem // this.VsyncEnabledMenuItem.Name = "VsyncEnabledMenuItem"; - this.VsyncEnabledMenuItem.Size = new System.Drawing.Size(202, 22); + this.VsyncEnabledMenuItem.Size = new System.Drawing.Size(181, 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(199, 6); + this.toolStripMenuItem3.Size = new System.Drawing.Size(178, 6); // // MinimizeSkippingMenuItem // this.MinimizeSkippingMenuItem.Name = "MinimizeSkippingMenuItem"; - this.MinimizeSkippingMenuItem.Size = new System.Drawing.Size(202, 22); + this.MinimizeSkippingMenuItem.Size = new System.Drawing.Size(181, 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(202, 22); + this.NeverSkipMenuItem.Size = new System.Drawing.Size(181, 22); this.NeverSkipMenuItem.Text = "0 (never skip)"; this.NeverSkipMenuItem.Click += new System.EventHandler(this.NeverSkipMenuItem_Click); // // Frameskip1MenuItem // this.Frameskip1MenuItem.Name = "Frameskip1MenuItem"; - this.Frameskip1MenuItem.Size = new System.Drawing.Size(202, 22); + this.Frameskip1MenuItem.Size = new System.Drawing.Size(181, 22); this.Frameskip1MenuItem.Text = "1"; this.Frameskip1MenuItem.Click += new System.EventHandler(this.Frameskip1MenuItem_Click); // // Frameskip2MenuItem // this.Frameskip2MenuItem.Name = "Frameskip2MenuItem"; - this.Frameskip2MenuItem.Size = new System.Drawing.Size(202, 22); + this.Frameskip2MenuItem.Size = new System.Drawing.Size(181, 22); this.Frameskip2MenuItem.Text = "2"; this.Frameskip2MenuItem.Click += new System.EventHandler(this.Frameskip2MenuItem_Click); // // Frameskip3MenuItem // this.Frameskip3MenuItem.Name = "Frameskip3MenuItem"; - this.Frameskip3MenuItem.Size = new System.Drawing.Size(202, 22); + this.Frameskip3MenuItem.Size = new System.Drawing.Size(181, 22); this.Frameskip3MenuItem.Text = "3"; this.Frameskip3MenuItem.Click += new System.EventHandler(this.Frameskip3MenuItem_Click); // // Frameskip4MenuItem // this.Frameskip4MenuItem.Name = "Frameskip4MenuItem"; - this.Frameskip4MenuItem.Size = new System.Drawing.Size(202, 22); + this.Frameskip4MenuItem.Size = new System.Drawing.Size(181, 22); this.Frameskip4MenuItem.Text = "4"; this.Frameskip4MenuItem.Click += new System.EventHandler(this.Frameskip4MenuItem_Click); // // Frameskip5MenuItem // this.Frameskip5MenuItem.Name = "Frameskip5MenuItem"; - this.Frameskip5MenuItem.Size = new System.Drawing.Size(202, 22); + this.Frameskip5MenuItem.Size = new System.Drawing.Size(181, 22); this.Frameskip5MenuItem.Text = "5"; this.Frameskip5MenuItem.Click += new System.EventHandler(this.Frameskip5MenuItem_Click); // // Frameskip6MenuItem // this.Frameskip6MenuItem.Name = "Frameskip6MenuItem"; - this.Frameskip6MenuItem.Size = new System.Drawing.Size(202, 22); + this.Frameskip6MenuItem.Size = new System.Drawing.Size(181, 22); this.Frameskip6MenuItem.Text = "6"; this.Frameskip6MenuItem.Click += new System.EventHandler(this.Frameskip6MenuItem_Click); // // Frameskip7MenuItem // this.Frameskip7MenuItem.Name = "Frameskip7MenuItem"; - this.Frameskip7MenuItem.Size = new System.Drawing.Size(202, 22); + this.Frameskip7MenuItem.Size = new System.Drawing.Size(181, 22); this.Frameskip7MenuItem.Text = "7"; this.Frameskip7MenuItem.Click += new System.EventHandler(this.Frameskip7MenuItem_Click); // // Frameskip8MenuItem // this.Frameskip8MenuItem.Name = "Frameskip8MenuItem"; - this.Frameskip8MenuItem.Size = new System.Drawing.Size(202, 22); + this.Frameskip8MenuItem.Size = new System.Drawing.Size(181, 22); this.Frameskip8MenuItem.Text = "8"; this.Frameskip8MenuItem.Click += new System.EventHandler(this.Frameskip8MenuItem_Click); // // Frameskip9MenuItem // this.Frameskip9MenuItem.Name = "Frameskip9MenuItem"; - this.Frameskip9MenuItem.Size = new System.Drawing.Size(202, 22); + this.Frameskip9MenuItem.Size = new System.Drawing.Size(181, 22); this.Frameskip9MenuItem.Text = "9"; this.Frameskip9MenuItem.Click += new System.EventHandler(this.Frameskip9MenuItem_Click); // // toolStripMenuItem5 // this.toolStripMenuItem5.Name = "toolStripMenuItem5"; - this.toolStripMenuItem5.Size = new System.Drawing.Size(199, 6); + this.toolStripMenuItem5.Size = new System.Drawing.Size(178, 6); // // Speed50MenuItem // this.Speed50MenuItem.Name = "Speed50MenuItem"; - this.Speed50MenuItem.Size = new System.Drawing.Size(202, 22); + this.Speed50MenuItem.Size = new System.Drawing.Size(181, 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(202, 22); + this.Speed75MenuItem.Size = new System.Drawing.Size(181, 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(202, 22); + this.Speed100MenuItem.Size = new System.Drawing.Size(181, 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(202, 22); + this.Speed150MenuItem.Size = new System.Drawing.Size(181, 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(202, 22); + this.Speed200MenuItem.Size = new System.Drawing.Size(181, 22); this.Speed200MenuItem.Text = "Speed 200%"; this.Speed200MenuItem.Click += new System.EventHandler(this.Speed200MenuItem_Click); // @@ -1644,28 +1645,28 @@ this.InputOverHkMenuItem, this.HkOverInputMenuItem}); this.KeyPrioritySubMenu.Name = "KeyPrioritySubMenu"; - this.KeyPrioritySubMenu.Size = new System.Drawing.Size(169, 22); + this.KeyPrioritySubMenu.Size = new System.Drawing.Size(165, 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(229, 22); + this.BothHkAndControllerMenuItem.Size = new System.Drawing.Size(214, 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(229, 22); + this.InputOverHkMenuItem.Size = new System.Drawing.Size(214, 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(229, 22); + this.HkOverInputMenuItem.Size = new System.Drawing.Size(214, 22); this.HkOverInputMenuItem.Text = "Hotkeys override Input"; this.HkOverInputMenuItem.Click += new System.EventHandler(this.HkOverInputMenuItem_Click); // @@ -1678,54 +1679,54 @@ this.toolStripSeparator8, this.N64VideoPluginSettingsMenuItem}); this.CoresSubMenu.Name = "CoresSubMenu"; - this.CoresSubMenu.Size = new System.Drawing.Size(169, 22); + this.CoresSubMenu.Size = new System.Drawing.Size(165, 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(210, 22); + this.GBInSGBMenuItem.Size = new System.Drawing.Size(195, 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(210, 22); + this.NesInQuickNESMenuItem.Size = new System.Drawing.Size(195, 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(210, 22); + this.SnesWithSnes9xMenuItem.Size = new System.Drawing.Size(195, 22); this.SnesWithSnes9xMenuItem.Text = "SNES with Snes9x"; this.SnesWithSnes9xMenuItem.Click += new System.EventHandler(this.SnesWithSnes9xMenuItem_Click); // // toolStripSeparator8 // this.toolStripSeparator8.Name = "toolStripSeparator8"; - this.toolStripSeparator8.Size = new System.Drawing.Size(207, 6); + this.toolStripSeparator8.Size = new System.Drawing.Size(192, 6); // // N64VideoPluginSettingsMenuItem // this.N64VideoPluginSettingsMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.monitor; this.N64VideoPluginSettingsMenuItem.Name = "N64VideoPluginSettingsMenuItem"; - this.N64VideoPluginSettingsMenuItem.Size = new System.Drawing.Size(210, 22); + this.N64VideoPluginSettingsMenuItem.Size = new System.Drawing.Size(195, 22); this.N64VideoPluginSettingsMenuItem.Text = "N64 Video Plugin Settings"; this.N64VideoPluginSettingsMenuItem.Click += new System.EventHandler(this.N64VideoPluginSettingsMenuItem_Click); // // toolStripSeparator10 // this.toolStripSeparator10.Name = "toolStripSeparator10"; - this.toolStripSeparator10.Size = new System.Drawing.Size(166, 6); + this.toolStripSeparator10.Size = new System.Drawing.Size(162, 6); // // SaveConfigMenuItem // this.SaveConfigMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.Save; this.SaveConfigMenuItem.Name = "SaveConfigMenuItem"; - this.SaveConfigMenuItem.Size = new System.Drawing.Size(169, 22); + this.SaveConfigMenuItem.Size = new System.Drawing.Size(165, 22); this.SaveConfigMenuItem.Text = "Save Config"; this.SaveConfigMenuItem.Click += new System.EventHandler(this.SaveConfigMenuItem_Click); // @@ -1733,7 +1734,7 @@ // this.LoadConfigMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.LoadConfig; this.LoadConfigMenuItem.Name = "LoadConfigMenuItem"; - this.LoadConfigMenuItem.Size = new System.Drawing.Size(169, 22); + this.LoadConfigMenuItem.Size = new System.Drawing.Size(165, 22); this.LoadConfigMenuItem.Text = "Load Config"; this.LoadConfigMenuItem.Click += new System.EventHandler(this.LoadConfigMenuItem_Click); // @@ -1756,7 +1757,7 @@ this.CreateDualGbXmlMenuItem, this.batchRunnerToolStripMenuItem}); this.ToolsSubMenu.Name = "ToolsSubMenu"; - this.ToolsSubMenu.Size = new System.Drawing.Size(48, 19); + this.ToolsSubMenu.Size = new System.Drawing.Size(44, 17); this.ToolsSubMenu.Text = "&Tools"; this.ToolsSubMenu.DropDownOpened += new System.EventHandler(this.ToolsSubMenu_DropDownOpened); // @@ -1764,20 +1765,20 @@ // this.ToolBoxMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.ToolBox; this.ToolBoxMenuItem.Name = "ToolBoxMenuItem"; - this.ToolBoxMenuItem.Size = new System.Drawing.Size(183, 22); + this.ToolBoxMenuItem.Size = new System.Drawing.Size(178, 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(180, 6); + this.toolStripSeparator12.Size = new System.Drawing.Size(175, 6); // // RamWatchMenuItem // this.RamWatchMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.watch; this.RamWatchMenuItem.Name = "RamWatchMenuItem"; - this.RamWatchMenuItem.Size = new System.Drawing.Size(183, 22); + this.RamWatchMenuItem.Size = new System.Drawing.Size(178, 22); this.RamWatchMenuItem.Text = "RAM &Watch"; this.RamWatchMenuItem.Click += new System.EventHandler(this.RamWatchMenuItem_Click); // @@ -1785,7 +1786,7 @@ // this.RamSearchMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.search; this.RamSearchMenuItem.Name = "RamSearchMenuItem"; - this.RamSearchMenuItem.Size = new System.Drawing.Size(183, 22); + this.RamSearchMenuItem.Size = new System.Drawing.Size(178, 22); this.RamSearchMenuItem.Text = "RAM &Search"; this.RamSearchMenuItem.Click += new System.EventHandler(this.RamSearchMenuItem_Click); // @@ -1793,7 +1794,7 @@ // this.HexEditorMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.poke; this.HexEditorMenuItem.Name = "HexEditorMenuItem"; - this.HexEditorMenuItem.Size = new System.Drawing.Size(183, 22); + this.HexEditorMenuItem.Size = new System.Drawing.Size(178, 22); this.HexEditorMenuItem.Text = "&Hex Editor"; this.HexEditorMenuItem.Click += new System.EventHandler(this.HexEditorMenuItem_Click); // @@ -1801,7 +1802,7 @@ // this.TraceLoggerMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.pencil; this.TraceLoggerMenuItem.Name = "TraceLoggerMenuItem"; - this.TraceLoggerMenuItem.Size = new System.Drawing.Size(183, 22); + this.TraceLoggerMenuItem.Size = new System.Drawing.Size(178, 22); this.TraceLoggerMenuItem.Text = "Trace &Logger"; this.TraceLoggerMenuItem.Click += new System.EventHandler(this.TraceLoggerMenuItem_Click); // @@ -1809,7 +1810,7 @@ // this.DebuggerMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.Bug; this.DebuggerMenuItem.Name = "DebuggerMenuItem"; - this.DebuggerMenuItem.Size = new System.Drawing.Size(183, 22); + this.DebuggerMenuItem.Size = new System.Drawing.Size(178, 22); this.DebuggerMenuItem.Text = "&Debugger"; this.DebuggerMenuItem.Click += new System.EventHandler(this.DebuggerMenuItem_Click); // @@ -1817,7 +1818,7 @@ // this.TAStudioMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.TAStudio; this.TAStudioMenuItem.Name = "TAStudioMenuItem"; - this.TAStudioMenuItem.Size = new System.Drawing.Size(183, 22); + this.TAStudioMenuItem.Size = new System.Drawing.Size(178, 22); this.TAStudioMenuItem.Text = "&TAStudio"; this.TAStudioMenuItem.Click += new System.EventHandler(this.TAStudioMenuItem_Click); // @@ -1825,20 +1826,20 @@ // this.VirtualPadMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.GameController; this.VirtualPadMenuItem.Name = "VirtualPadMenuItem"; - this.VirtualPadMenuItem.Size = new System.Drawing.Size(183, 22); + this.VirtualPadMenuItem.Size = new System.Drawing.Size(178, 22); this.VirtualPadMenuItem.Text = "Virtual Pad"; this.VirtualPadMenuItem.Click += new System.EventHandler(this.VirtualPadMenuItem_Click); // // toolStripSeparator11 // this.toolStripSeparator11.Name = "toolStripSeparator11"; - this.toolStripSeparator11.Size = new System.Drawing.Size(180, 6); + this.toolStripSeparator11.Size = new System.Drawing.Size(175, 6); // // CheatsMenuItem // this.CheatsMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.Freeze; this.CheatsMenuItem.Name = "CheatsMenuItem"; - this.CheatsMenuItem.Size = new System.Drawing.Size(183, 22); + this.CheatsMenuItem.Size = new System.Drawing.Size(178, 22); this.CheatsMenuItem.Text = "Cheats"; this.CheatsMenuItem.Click += new System.EventHandler(this.CheatsMenuItem_Click); // @@ -1846,27 +1847,27 @@ // this.LuaConsoleMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.Lua; this.LuaConsoleMenuItem.Name = "LuaConsoleMenuItem"; - this.LuaConsoleMenuItem.Size = new System.Drawing.Size(183, 22); + this.LuaConsoleMenuItem.Size = new System.Drawing.Size(178, 22); this.LuaConsoleMenuItem.Text = "Lua Console"; this.LuaConsoleMenuItem.Click += new System.EventHandler(this.LuaConsoleMenuItem_Click); // // toolStripSeparator29 // this.toolStripSeparator29.Name = "toolStripSeparator29"; - this.toolStripSeparator29.Size = new System.Drawing.Size(180, 6); + this.toolStripSeparator29.Size = new System.Drawing.Size(175, 6); // // CreateDualGbXmlMenuItem // this.CreateDualGbXmlMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.dual; this.CreateDualGbXmlMenuItem.Name = "CreateDualGbXmlMenuItem"; - this.CreateDualGbXmlMenuItem.Size = new System.Drawing.Size(183, 22); + this.CreateDualGbXmlMenuItem.Size = new System.Drawing.Size(178, 22); this.CreateDualGbXmlMenuItem.Text = "Create Dual GB File..."; this.CreateDualGbXmlMenuItem.Click += new System.EventHandler(this.CreateDualGbXmlMenuItem_Click); // // batchRunnerToolStripMenuItem // this.batchRunnerToolStripMenuItem.Name = "batchRunnerToolStripMenuItem"; - this.batchRunnerToolStripMenuItem.Size = new System.Drawing.Size(183, 22); + this.batchRunnerToolStripMenuItem.Size = new System.Drawing.Size(178, 22); this.batchRunnerToolStripMenuItem.Text = "Batch Runner"; this.batchRunnerToolStripMenuItem.Visible = false; this.batchRunnerToolStripMenuItem.Click += new System.EventHandler(this.batchRunnerToolStripMenuItem_Click); @@ -1886,41 +1887,41 @@ this.FDSControlsMenuItem, this.barcodeReaderToolStripMenuItem}); this.NESSubMenu.Name = "NESSubMenu"; - this.NESSubMenu.Size = new System.Drawing.Size(40, 19); + this.NESSubMenu.Size = new System.Drawing.Size(38, 17); this.NESSubMenu.Text = "&NES"; this.NESSubMenu.DropDownOpened += new System.EventHandler(this.NESSubMenu_DropDownOpened); // // NESPPUViewerMenuItem // this.NESPPUViewerMenuItem.Name = "NESPPUViewerMenuItem"; - this.NESPPUViewerMenuItem.Size = new System.Drawing.Size(233, 22); + this.NESPPUViewerMenuItem.Size = new System.Drawing.Size(217, 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(233, 22); + this.NESNametableViewerMenuItem.Size = new System.Drawing.Size(217, 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(233, 22); + this.NESGameGenieCodesMenuItem.Size = new System.Drawing.Size(217, 22); this.NESGameGenieCodesMenuItem.Text = "&Game Genie Encoder/Decoder"; this.NESGameGenieCodesMenuItem.Click += new System.EventHandler(this.NESGameGenieCodesMenuItem_Click); // // toolStripSeparator17 // this.toolStripSeparator17.Name = "toolStripSeparator17"; - this.toolStripSeparator17.Size = new System.Drawing.Size(230, 6); + this.toolStripSeparator17.Size = new System.Drawing.Size(214, 6); // // NesControllerSettingsMenuItem // this.NesControllerSettingsMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.GameController; this.NesControllerSettingsMenuItem.Name = "NesControllerSettingsMenuItem"; - this.NesControllerSettingsMenuItem.Size = new System.Drawing.Size(233, 22); + this.NesControllerSettingsMenuItem.Size = new System.Drawing.Size(217, 22); this.NesControllerSettingsMenuItem.Text = "Controller Settings..."; this.NesControllerSettingsMenuItem.Click += new System.EventHandler(this.NesControllerSettingsMenuItem_Click); // @@ -1928,7 +1929,7 @@ // this.NESGraphicSettingsMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.tvIcon; this.NESGraphicSettingsMenuItem.Name = "NESGraphicSettingsMenuItem"; - this.NESGraphicSettingsMenuItem.Size = new System.Drawing.Size(233, 22); + this.NESGraphicSettingsMenuItem.Size = new System.Drawing.Size(217, 22); this.NESGraphicSettingsMenuItem.Text = "Graphics Settings..."; this.NESGraphicSettingsMenuItem.Click += new System.EventHandler(this.NESGraphicSettingsMenuItem_Click); // @@ -1936,42 +1937,42 @@ // this.NESSoundChannelsMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.AudioHS; this.NESSoundChannelsMenuItem.Name = "NESSoundChannelsMenuItem"; - this.NESSoundChannelsMenuItem.Size = new System.Drawing.Size(233, 22); + this.NESSoundChannelsMenuItem.Size = new System.Drawing.Size(217, 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(233, 22); + this.MovieSettingsMenuItem.Size = new System.Drawing.Size(217, 22); this.MovieSettingsMenuItem.Text = "Advanced Movie Settings..."; this.MovieSettingsMenuItem.Click += new System.EventHandler(this.MovieSettingsMenuItem_Click); // // toolStripSeparator22 // this.toolStripSeparator22.Name = "toolStripSeparator22"; - this.toolStripSeparator22.Size = new System.Drawing.Size(230, 6); + this.toolStripSeparator22.Size = new System.Drawing.Size(214, 6); // // FDSControlsMenuItem // this.FDSControlsMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { this.FdsEjectDiskMenuItem}); this.FDSControlsMenuItem.Name = "FDSControlsMenuItem"; - this.FDSControlsMenuItem.Size = new System.Drawing.Size(233, 22); + this.FDSControlsMenuItem.Size = new System.Drawing.Size(217, 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(124, 22); + this.FdsEjectDiskMenuItem.Size = new System.Drawing.Size(120, 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(233, 22); + this.barcodeReaderToolStripMenuItem.Size = new System.Drawing.Size(217, 22); this.barcodeReaderToolStripMenuItem.Text = "Barcode Reader"; this.barcodeReaderToolStripMenuItem.Click += new System.EventHandler(this.barcodeReaderToolStripMenuItem_Click); // @@ -1990,7 +1991,7 @@ this.PCEAlwaysEqualizeVolumesMenuItem, this.PCEArcadeCardRewindEnableMenuItem}); this.PCESubMenu.Name = "PCESubMenu"; - this.PCESubMenu.Size = new System.Drawing.Size(40, 19); + this.PCESubMenu.Size = new System.Drawing.Size(38, 17); this.PCESubMenu.Text = "&PCE"; this.PCESubMenu.DropDownOpened += new System.EventHandler(this.PCESubMenu_DropDownOpened); // @@ -1998,7 +1999,7 @@ // this.PceControllerSettingsMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.GameController; this.PceControllerSettingsMenuItem.Name = "PceControllerSettingsMenuItem"; - this.PceControllerSettingsMenuItem.Size = new System.Drawing.Size(259, 22); + this.PceControllerSettingsMenuItem.Size = new System.Drawing.Size(240, 22); this.PceControllerSettingsMenuItem.Text = "Controller Settings"; this.PceControllerSettingsMenuItem.Click += new System.EventHandler(this.PceControllerSettingsMenuItem_Click); // @@ -2006,66 +2007,66 @@ // this.PCEGraphicsSettingsMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.tvIcon; this.PCEGraphicsSettingsMenuItem.Name = "PCEGraphicsSettingsMenuItem"; - this.PCEGraphicsSettingsMenuItem.Size = new System.Drawing.Size(259, 22); + this.PCEGraphicsSettingsMenuItem.Size = new System.Drawing.Size(240, 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(256, 6); + this.toolStripSeparator32.Size = new System.Drawing.Size(237, 6); // // PCEBGViewerMenuItem // this.PCEBGViewerMenuItem.Name = "PCEBGViewerMenuItem"; - this.PCEBGViewerMenuItem.Size = new System.Drawing.Size(259, 22); + this.PCEBGViewerMenuItem.Size = new System.Drawing.Size(240, 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(259, 22); + this.PCEtileViewerToolStripMenuItem.Size = new System.Drawing.Size(240, 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(259, 22); + this.PceSoundDebuggerToolStripMenuItem.Size = new System.Drawing.Size(240, 22); this.PceSoundDebuggerToolStripMenuItem.Text = "&Sound Debugger"; this.PceSoundDebuggerToolStripMenuItem.Click += new System.EventHandler(this.PceSoundDebuggerToolStripMenuItem_Click); // // codeDataLoggerToolStripMenuItem // this.codeDataLoggerToolStripMenuItem.Name = "codeDataLoggerToolStripMenuItem"; - this.codeDataLoggerToolStripMenuItem.Size = new System.Drawing.Size(259, 22); + this.codeDataLoggerToolStripMenuItem.Size = new System.Drawing.Size(240, 22); this.codeDataLoggerToolStripMenuItem.Text = "Code-Data Logger"; this.codeDataLoggerToolStripMenuItem.Click += new System.EventHandler(this.CodeDataLoggerMenuItem_Click); // // toolStripSeparator25 // this.toolStripSeparator25.Name = "toolStripSeparator25"; - this.toolStripSeparator25.Size = new System.Drawing.Size(256, 6); + this.toolStripSeparator25.Size = new System.Drawing.Size(237, 6); // // PCEAlwaysPerformSpriteLimitMenuItem // this.PCEAlwaysPerformSpriteLimitMenuItem.Name = "PCEAlwaysPerformSpriteLimitMenuItem"; - this.PCEAlwaysPerformSpriteLimitMenuItem.Size = new System.Drawing.Size(259, 22); + this.PCEAlwaysPerformSpriteLimitMenuItem.Size = new System.Drawing.Size(240, 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(259, 22); + this.PCEAlwaysEqualizeVolumesMenuItem.Size = new System.Drawing.Size(240, 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(259, 22); + this.PCEArcadeCardRewindEnableMenuItem.Size = new System.Drawing.Size(240, 22); this.PCEArcadeCardRewindEnableMenuItem.Text = "Arcade Card Rewind-Enable Hack"; this.PCEArcadeCardRewindEnableMenuItem.Click += new System.EventHandler(this.PCEArcadeCardRewindEnableMenuItem_Click); // @@ -2088,7 +2089,7 @@ this.SMSVDPViewerToolStripMenuItem, this.GGGameGenieMenuItem}); this.SMSSubMenu.Name = "SMSSubMenu"; - this.SMSSubMenu.Size = new System.Drawing.Size(42, 19); + this.SMSSubMenu.Size = new System.Drawing.Size(39, 17); this.SMSSubMenu.Text = "&SMS"; this.SMSSubMenu.DropDownOpened += new System.EventHandler(this.SMSSubMenu_DropDownOpened); // @@ -2099,27 +2100,27 @@ this.SMSregionJapanToolStripMenuItem, this.SMSregionAutoToolStripMenuItem}); this.SMSregionToolStripMenuItem.Name = "SMSregionToolStripMenuItem"; - this.SMSregionToolStripMenuItem.Size = new System.Drawing.Size(241, 22); + this.SMSregionToolStripMenuItem.Size = new System.Drawing.Size(221, 22); this.SMSregionToolStripMenuItem.Text = "Region"; // // SMSregionExportToolStripMenuItem // this.SMSregionExportToolStripMenuItem.Name = "SMSregionExportToolStripMenuItem"; - this.SMSregionExportToolStripMenuItem.Size = new System.Drawing.Size(107, 22); + this.SMSregionExportToolStripMenuItem.Size = new System.Drawing.Size(106, 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(107, 22); + this.SMSregionJapanToolStripMenuItem.Size = new System.Drawing.Size(106, 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(107, 22); + this.SMSregionAutoToolStripMenuItem.Size = new System.Drawing.Size(106, 22); this.SMSregionAutoToolStripMenuItem.Text = "Auto"; this.SMSregionAutoToolStripMenuItem.Click += new System.EventHandler(this.SMS_RegionAuto_Click); // @@ -2130,114 +2131,114 @@ this.SMSdisplayPalToolStripMenuItem, this.SMSdisplayAutoToolStripMenuItem}); this.SMSdisplayToolStripMenuItem.Name = "SMSdisplayToolStripMenuItem"; - this.SMSdisplayToolStripMenuItem.Size = new System.Drawing.Size(241, 22); + this.SMSdisplayToolStripMenuItem.Size = new System.Drawing.Size(221, 22); this.SMSdisplayToolStripMenuItem.Text = "Display Type"; // // SMSdisplayNtscToolStripMenuItem // this.SMSdisplayNtscToolStripMenuItem.Name = "SMSdisplayNtscToolStripMenuItem"; - this.SMSdisplayNtscToolStripMenuItem.Size = new System.Drawing.Size(104, 22); + this.SMSdisplayNtscToolStripMenuItem.Size = new System.Drawing.Size(100, 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(104, 22); + this.SMSdisplayPalToolStripMenuItem.Size = new System.Drawing.Size(100, 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(104, 22); + this.SMSdisplayAutoToolStripMenuItem.Size = new System.Drawing.Size(100, 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(238, 6); + this.SMStoolStripMenuItem2.Size = new System.Drawing.Size(218, 6); // // SMSenableBIOSToolStripMenuItem // this.SMSenableBIOSToolStripMenuItem.Name = "SMSenableBIOSToolStripMenuItem"; - this.SMSenableBIOSToolStripMenuItem.Size = new System.Drawing.Size(241, 22); + this.SMSenableBIOSToolStripMenuItem.Size = new System.Drawing.Size(221, 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(241, 22); + this.SMSEnableFMChipMenuItem.Size = new System.Drawing.Size(221, 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(241, 22); + this.SMSOverclockMenuItem.Size = new System.Drawing.Size(221, 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(241, 22); + this.SMSForceStereoMenuItem.Size = new System.Drawing.Size(221, 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(241, 22); + this.SMSSpriteLimitMenuItem.Size = new System.Drawing.Size(221, 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(241, 22); + this.SMSFix3DGameDisplayToolStripMenuItem.Size = new System.Drawing.Size(221, 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(241, 22); + this.ShowClippedRegionsMenuItem.Size = new System.Drawing.Size(221, 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(241, 22); + this.HighlightActiveDisplayRegionMenuItem.Size = new System.Drawing.Size(221, 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(241, 22); + this.SMSGraphicsSettingsMenuItem.Size = new System.Drawing.Size(221, 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(238, 6); + this.toolStripSeparator24.Size = new System.Drawing.Size(218, 6); // // SMSVDPViewerToolStripMenuItem // this.SMSVDPViewerToolStripMenuItem.Name = "SMSVDPViewerToolStripMenuItem"; - this.SMSVDPViewerToolStripMenuItem.Size = new System.Drawing.Size(241, 22); + this.SMSVDPViewerToolStripMenuItem.Size = new System.Drawing.Size(221, 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(241, 22); + this.GGGameGenieMenuItem.Size = new System.Drawing.Size(221, 22); this.GGGameGenieMenuItem.Text = "&Game Genie Encoder/Decoder"; this.GGGameGenieMenuItem.Click += new System.EventHandler(this.GGGameGenieMenuItem_Click); // @@ -2250,7 +2251,7 @@ this.AutoloadKeypadMenuItem, this.paletteToolStripMenuItem}); this.TI83SubMenu.Name = "TI83SubMenu"; - this.TI83SubMenu.Size = new System.Drawing.Size(41, 19); + this.TI83SubMenu.Size = new System.Drawing.Size(41, 17); this.TI83SubMenu.Text = "TI83"; this.TI83SubMenu.DropDownOpened += new System.EventHandler(this.TI83SubMenu_DropDownOpened); // @@ -2258,35 +2259,35 @@ // this.KeypadMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.calculator; this.KeypadMenuItem.Name = "KeypadMenuItem"; - this.KeypadMenuItem.Size = new System.Drawing.Size(165, 22); + this.KeypadMenuItem.Size = new System.Drawing.Size(156, 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(165, 22); + this.LoadTIFileMenuItem.Size = new System.Drawing.Size(156, 22); this.LoadTIFileMenuItem.Text = "Load TI File..."; this.LoadTIFileMenuItem.Click += new System.EventHandler(this.LoadTIFileMenuItem_Click); // // toolStripSeparator13 // this.toolStripSeparator13.Name = "toolStripSeparator13"; - this.toolStripSeparator13.Size = new System.Drawing.Size(162, 6); + this.toolStripSeparator13.Size = new System.Drawing.Size(153, 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(165, 22); + this.AutoloadKeypadMenuItem.Size = new System.Drawing.Size(156, 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(165, 22); + this.paletteToolStripMenuItem.Size = new System.Drawing.Size(156, 22); this.paletteToolStripMenuItem.Text = "Palette..."; this.paletteToolStripMenuItem.Click += new System.EventHandler(this.paletteToolStripMenuItem_Click); // @@ -2295,14 +2296,14 @@ this.AtariSubMenu.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { this.AtariSettingsToolStripMenuItem}); this.AtariSubMenu.Name = "AtariSubMenu"; - this.AtariSubMenu.Size = new System.Drawing.Size(44, 19); + this.AtariSubMenu.Size = new System.Drawing.Size(42, 17); this.AtariSubMenu.Text = "&Atari"; this.AtariSubMenu.DropDownOpened += new System.EventHandler(this.AtariSubMenu_DropDownOpened); // // AtariSettingsToolStripMenuItem // this.AtariSettingsToolStripMenuItem.Name = "AtariSettingsToolStripMenuItem"; - this.AtariSettingsToolStripMenuItem.Size = new System.Drawing.Size(152, 22); + this.AtariSettingsToolStripMenuItem.Size = new System.Drawing.Size(125, 22); this.AtariSettingsToolStripMenuItem.Text = "Settings..."; this.AtariSettingsToolStripMenuItem.Click += new System.EventHandler(this.AtariSettingsToolStripMenuItem_Click); // @@ -2315,40 +2316,40 @@ this.GBGPUViewerMenuItem, this.GBGameGenieMenuItem}); this.GBSubMenu.Name = "GBSubMenu"; - this.GBSubMenu.Size = new System.Drawing.Size(34, 19); + this.GBSubMenu.Size = new System.Drawing.Size(32, 17); 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(233, 22); + this.GBcoreSettingsToolStripMenuItem.Size = new System.Drawing.Size(217, 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(233, 22); + this.LoadGBInSGBMenuItem.Size = new System.Drawing.Size(217, 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(230, 6); + this.toolStripSeparator28.Size = new System.Drawing.Size(214, 6); // // GBGPUViewerMenuItem // this.GBGPUViewerMenuItem.Name = "GBGPUViewerMenuItem"; - this.GBGPUViewerMenuItem.Size = new System.Drawing.Size(233, 22); + this.GBGPUViewerMenuItem.Size = new System.Drawing.Size(217, 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(233, 22); + this.GBGameGenieMenuItem.Size = new System.Drawing.Size(217, 22); this.GBGameGenieMenuItem.Text = "&Game Genie Encoder/Decoder"; this.GBGameGenieMenuItem.Click += new System.EventHandler(this.GBGameGenieMenuItem_Click); // @@ -2359,40 +2360,41 @@ this.toolStripSeparator33, this.GBAcoresettingsToolStripMenuItem1}); this.GBASubMenu.Name = "GBASubMenu"; - this.GBASubMenu.Size = new System.Drawing.Size(42, 19); + this.GBASubMenu.Size = new System.Drawing.Size(39, 17); this.GBASubMenu.Text = "GBA"; // // GbaGpuViewerMenuItem // this.GbaGpuViewerMenuItem.Name = "GbaGpuViewerMenuItem"; - this.GbaGpuViewerMenuItem.Size = new System.Drawing.Size(135, 22); + this.GbaGpuViewerMenuItem.Size = new System.Drawing.Size(129, 22); this.GbaGpuViewerMenuItem.Text = "GPU Viewer"; this.GbaGpuViewerMenuItem.Click += new System.EventHandler(this.GbaGpuViewerMenuItem_Click); // // toolStripSeparator33 // this.toolStripSeparator33.Name = "toolStripSeparator33"; - this.toolStripSeparator33.Size = new System.Drawing.Size(132, 6); + this.toolStripSeparator33.Size = new System.Drawing.Size(126, 6); // // GBAcoresettingsToolStripMenuItem1 // this.GBAcoresettingsToolStripMenuItem1.Name = "GBAcoresettingsToolStripMenuItem1"; - this.GBAcoresettingsToolStripMenuItem1.Size = new System.Drawing.Size(135, 22); + this.GBAcoresettingsToolStripMenuItem1.Size = new System.Drawing.Size(129, 22); this.GBAcoresettingsToolStripMenuItem1.Text = "&Settings..."; this.GBAcoresettingsToolStripMenuItem1.Click += new System.EventHandler(this.GBAcoresettingsToolStripMenuItem1_Click); // // PSXSubMenu // this.PSXSubMenu.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { - this.PSXOptionsMenuItem}); + this.PSXOptionsMenuItem, + this.PSXDiscControlsMenuItem}); this.PSXSubMenu.Name = "PSXSubMenu"; - this.PSXSubMenu.Size = new System.Drawing.Size(39, 19); + this.PSXSubMenu.Size = new System.Drawing.Size(37, 17); this.PSXSubMenu.Text = "PSX"; // // PSXOptionsMenuItem // this.PSXOptionsMenuItem.Name = "PSXOptionsMenuItem"; - this.PSXOptionsMenuItem.Size = new System.Drawing.Size(116, 22); + this.PSXOptionsMenuItem.Size = new System.Drawing.Size(152, 22); this.PSXOptionsMenuItem.Text = "&Options"; this.PSXOptionsMenuItem.Click += new System.EventHandler(this.PSXOptionsMenuItem_Click); // @@ -2406,7 +2408,7 @@ this.SnesGameGenieMenuItem, this.SnesOptionsMenuItem}); this.SNESSubMenu.Name = "SNESSubMenu"; - this.SNESSubMenu.Size = new System.Drawing.Size(46, 19); + this.SNESSubMenu.Size = new System.Drawing.Size(44, 17); this.SNESSubMenu.Text = "&SNES"; this.SNESSubMenu.DropDownOpened += new System.EventHandler(this.SNESSubMenu_DropDownOpened); // @@ -2422,97 +2424,97 @@ this.SnesObj3MenuItem, this.SnesObj4MenuItem}); this.SNESDisplayMenuItem.Name = "SNESDisplayMenuItem"; - this.SNESDisplayMenuItem.Size = new System.Drawing.Size(233, 22); + this.SNESDisplayMenuItem.Size = new System.Drawing.Size(217, 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(103, 22); + this.SnesBg1MenuItem.Size = new System.Drawing.Size(102, 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(103, 22); + this.SnesBg2MenuItem.Size = new System.Drawing.Size(102, 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(103, 22); + this.SnesBg3MenuItem.Size = new System.Drawing.Size(102, 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(103, 22); + this.SnesBg4MenuItem.Size = new System.Drawing.Size(102, 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(103, 22); + this.SnesObj1MenuItem.Size = new System.Drawing.Size(102, 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(103, 22); + this.SnesObj2MenuItem.Size = new System.Drawing.Size(102, 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(103, 22); + this.SnesObj3MenuItem.Size = new System.Drawing.Size(102, 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(103, 22); + this.SnesObj4MenuItem.Size = new System.Drawing.Size(102, 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(230, 6); + this.toolStripSeparator18.Size = new System.Drawing.Size(214, 6); // // SnesGfxDebuggerMenuItem // this.SnesGfxDebuggerMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.Bug; this.SnesGfxDebuggerMenuItem.Name = "SnesGfxDebuggerMenuItem"; - this.SnesGfxDebuggerMenuItem.Size = new System.Drawing.Size(233, 22); + this.SnesGfxDebuggerMenuItem.Size = new System.Drawing.Size(217, 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(233, 22); + this.SnesGBInSGBMenuItem.Size = new System.Drawing.Size(217, 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(233, 22); + this.SnesGameGenieMenuItem.Size = new System.Drawing.Size(217, 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(233, 22); + this.SnesOptionsMenuItem.Size = new System.Drawing.Size(217, 22); this.SnesOptionsMenuItem.Text = "&Options"; this.SnesOptionsMenuItem.Click += new System.EventHandler(this.SnesOptionsMenuItem_Click); // @@ -2521,14 +2523,14 @@ this.ColecoSubMenu.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { this.ColecoSkipBiosMenuItem}); this.ColecoSubMenu.Name = "ColecoSubMenu"; - this.ColecoSubMenu.Size = new System.Drawing.Size(56, 19); + this.ColecoSubMenu.Size = new System.Drawing.Size(51, 17); 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(152, 22); + this.ColecoSkipBiosMenuItem.Size = new System.Drawing.Size(145, 22); this.ColecoSkipBiosMenuItem.Text = "&Skip BIOS intro"; this.ColecoSkipBiosMenuItem.Click += new System.EventHandler(this.ColecoSkipBiosMenuItem_Click); // @@ -2542,7 +2544,7 @@ this.MupenStyleLagMenuItem, this.N64ExpansionSlotMenuItem}); this.N64SubMenu.Name = "N64SubMenu"; - this.N64SubMenu.Size = new System.Drawing.Size(40, 19); + this.N64SubMenu.Size = new System.Drawing.Size(38, 17); this.N64SubMenu.Text = "N64"; this.N64SubMenu.DropDownOpened += new System.EventHandler(this.N64SubMenu_DropDownOpened); // @@ -2550,7 +2552,7 @@ // this.N64PluginSettingsMenuItem.Image = ((System.Drawing.Image)(resources.GetObject("N64PluginSettingsMenuItem.Image"))); this.N64PluginSettingsMenuItem.Name = "N64PluginSettingsMenuItem"; - this.N64PluginSettingsMenuItem.Size = new System.Drawing.Size(192, 22); + this.N64PluginSettingsMenuItem.Size = new System.Drawing.Size(180, 22); this.N64PluginSettingsMenuItem.Text = "Plugins"; this.N64PluginSettingsMenuItem.Click += new System.EventHandler(this.N64PluginSettingsMenuItem_Click); // @@ -2558,33 +2560,33 @@ // this.N64ControllerSettingsMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.GameController; this.N64ControllerSettingsMenuItem.Name = "N64ControllerSettingsMenuItem"; - this.N64ControllerSettingsMenuItem.Size = new System.Drawing.Size(192, 22); + this.N64ControllerSettingsMenuItem.Size = new System.Drawing.Size(180, 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(189, 6); + this.toolStripSeparator23.Size = new System.Drawing.Size(177, 6); // // N64CircularAnalogRangeMenuItem // this.N64CircularAnalogRangeMenuItem.Name = "N64CircularAnalogRangeMenuItem"; - this.N64CircularAnalogRangeMenuItem.Size = new System.Drawing.Size(192, 22); + this.N64CircularAnalogRangeMenuItem.Size = new System.Drawing.Size(180, 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(192, 22); + this.MupenStyleLagMenuItem.Size = new System.Drawing.Size(180, 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(192, 22); + this.N64ExpansionSlotMenuItem.Size = new System.Drawing.Size(180, 22); this.N64ExpansionSlotMenuItem.Text = "&Use Expansion Slot"; this.N64ExpansionSlotMenuItem.Click += new System.EventHandler(this.N64ExpansionSlotMenuItem_Click); // @@ -2593,7 +2595,7 @@ this.SaturnSubMenu.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { this.SaturnPreferencesMenuItem}); this.SaturnSubMenu.Name = "SaturnSubMenu"; - this.SaturnSubMenu.Size = new System.Drawing.Size(53, 19); + this.SaturnSubMenu.Size = new System.Drawing.Size(51, 17); this.SaturnSubMenu.Text = "&Saturn"; // // SaturnPreferencesMenuItem @@ -2608,7 +2610,7 @@ this.DGBSubMenu.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { this.DGBsettingsToolStripMenuItem}); this.DGBSubMenu.Name = "DGBSubMenu"; - this.DGBSubMenu.Size = new System.Drawing.Size(59, 19); + this.DGBSubMenu.Size = new System.Drawing.Size(53, 17); this.DGBSubMenu.Text = "&GB Link"; // // DGBsettingsToolStripMenuItem @@ -2625,25 +2627,25 @@ this.toolStripSeparator26, this.GenesisSettingsToolStripMenuItem}); this.GenesisSubMenu.Name = "GenesisSubMenu"; - this.GenesisSubMenu.Size = new System.Drawing.Size(59, 19); + this.GenesisSubMenu.Size = new System.Drawing.Size(56, 17); this.GenesisSubMenu.Text = "&Genesis"; // // vDPViewerToolStripMenuItem // this.vDPViewerToolStripMenuItem.Name = "vDPViewerToolStripMenuItem"; - this.vDPViewerToolStripMenuItem.Size = new System.Drawing.Size(134, 22); + this.vDPViewerToolStripMenuItem.Size = new System.Drawing.Size(128, 22); this.vDPViewerToolStripMenuItem.Text = "&VDP Viewer"; this.vDPViewerToolStripMenuItem.Click += new System.EventHandler(this.GenVdpViewerMenuItem_Click); // // toolStripSeparator26 // this.toolStripSeparator26.Name = "toolStripSeparator26"; - this.toolStripSeparator26.Size = new System.Drawing.Size(131, 6); + this.toolStripSeparator26.Size = new System.Drawing.Size(125, 6); // // GenesisSettingsToolStripMenuItem // this.GenesisSettingsToolStripMenuItem.Name = "GenesisSettingsToolStripMenuItem"; - this.GenesisSettingsToolStripMenuItem.Size = new System.Drawing.Size(134, 22); + this.GenesisSettingsToolStripMenuItem.Size = new System.Drawing.Size(128, 22); this.GenesisSettingsToolStripMenuItem.Text = "&Settings..."; this.GenesisSettingsToolStripMenuItem.Click += new System.EventHandler(this.GenesisSettingsMenuItem_Click); // @@ -2652,7 +2654,7 @@ this.wonderSwanToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { this.settingsToolStripMenuItem}); this.wonderSwanToolStripMenuItem.Name = "wonderSwanToolStripMenuItem"; - this.wonderSwanToolStripMenuItem.Size = new System.Drawing.Size(89, 19); + this.wonderSwanToolStripMenuItem.Size = new System.Drawing.Size(83, 17); this.wonderSwanToolStripMenuItem.Text = "&WonderSwan"; // // settingsToolStripMenuItem @@ -2670,7 +2672,7 @@ this.FeaturesMenuItem, this.AboutMenuItem}); this.HelpSubMenu.Name = "HelpSubMenu"; - this.HelpSubMenu.Size = new System.Drawing.Size(44, 19); + this.HelpSubMenu.Size = new System.Drawing.Size(40, 17); this.HelpSubMenu.Text = "&Help"; this.HelpSubMenu.DropDownOpened += new System.EventHandler(this.HelpSubMenu_DropDownOpened); // @@ -2678,7 +2680,7 @@ // this.OnlineHelpMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.Help; this.OnlineHelpMenuItem.Name = "OnlineHelpMenuItem"; - this.OnlineHelpMenuItem.Size = new System.Drawing.Size(146, 22); + this.OnlineHelpMenuItem.Size = new System.Drawing.Size(140, 22); this.OnlineHelpMenuItem.Text = "&Online Help..."; this.OnlineHelpMenuItem.Click += new System.EventHandler(this.OnlineHelpMenuItem_Click); // @@ -2686,14 +2688,14 @@ // this.ForumsMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.TAStudio; this.ForumsMenuItem.Name = "ForumsMenuItem"; - this.ForumsMenuItem.Size = new System.Drawing.Size(146, 22); + this.ForumsMenuItem.Size = new System.Drawing.Size(140, 22); this.ForumsMenuItem.Text = "Forums..."; this.ForumsMenuItem.Click += new System.EventHandler(this.ForumsMenuItem_Click); // // FeaturesMenuItem // this.FeaturesMenuItem.Name = "FeaturesMenuItem"; - this.FeaturesMenuItem.Size = new System.Drawing.Size(146, 22); + this.FeaturesMenuItem.Size = new System.Drawing.Size(140, 22); this.FeaturesMenuItem.Text = "&Features"; this.FeaturesMenuItem.Click += new System.EventHandler(this.FeaturesMenuItem_Click); // @@ -2701,7 +2703,7 @@ // this.AboutMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.CorpHawkSmall; this.AboutMenuItem.Name = "AboutMenuItem"; - this.AboutMenuItem.Size = new System.Drawing.Size(146, 22); + this.AboutMenuItem.Size = new System.Drawing.Size(140, 22); this.AboutMenuItem.Text = "&About"; this.AboutMenuItem.Click += new System.EventHandler(this.AboutMenuItem_Click); // @@ -2809,7 +2811,7 @@ // this.SaveSlotsStatusLabel.BackColor = System.Drawing.SystemColors.Control; this.SaveSlotsStatusLabel.Name = "SaveSlotsStatusLabel"; - this.SaveSlotsStatusLabel.Size = new System.Drawing.Size(58, 17); + this.SaveSlotsStatusLabel.Size = new System.Drawing.Size(56, 17); this.SaveSlotsStatusLabel.Text = "Save slots"; // // Slot1StatusButton @@ -2912,7 +2914,7 @@ // this.CoreNameStatusBarButton.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.CorpHawkSmall; this.CoreNameStatusBarButton.Name = "CoreNameStatusBarButton"; - this.CoreNameStatusBarButton.Size = new System.Drawing.Size(71, 17); + this.CoreNameStatusBarButton.Size = new System.Drawing.Size(66, 17); this.CoreNameStatusBarButton.Text = "Neshawk"; // // ProfileFirstBootLabel @@ -2965,7 +2967,7 @@ this.ShowMenuContextMenuSeparator, this.ShowMenuContextMenuItem}); this.MainFormContextMenu.Name = "contextMenuStrip1"; - this.MainFormContextMenu.Size = new System.Drawing.Size(217, 468); + this.MainFormContextMenu.Size = new System.Drawing.Size(202, 468); this.MainFormContextMenu.Closing += new System.Windows.Forms.ToolStripDropDownClosingEventHandler(this.MainFormContextMenu_Closing); this.MainFormContextMenu.Opening += new System.ComponentModel.CancelEventHandler(this.MainFormContextMenu_Opening); // @@ -2973,7 +2975,7 @@ // this.OpenRomContextMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.OpenFile; this.OpenRomContextMenuItem.Name = "OpenRomContextMenuItem"; - this.OpenRomContextMenuItem.Size = new System.Drawing.Size(216, 22); + this.OpenRomContextMenuItem.Size = new System.Drawing.Size(201, 22); this.OpenRomContextMenuItem.Text = "Open Rom"; this.OpenRomContextMenuItem.Click += new System.EventHandler(this.OpenRomMenuItem_Click); // @@ -2981,7 +2983,7 @@ // this.LoadLastRomContextMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.Recent; this.LoadLastRomContextMenuItem.Name = "LoadLastRomContextMenuItem"; - this.LoadLastRomContextMenuItem.Size = new System.Drawing.Size(216, 22); + this.LoadLastRomContextMenuItem.Size = new System.Drawing.Size(201, 22); this.LoadLastRomContextMenuItem.Text = "Load Last ROM"; this.LoadLastRomContextMenuItem.Click += new System.EventHandler(this.LoadLastRomContextMenuItem_Click); // @@ -2989,20 +2991,20 @@ // this.StopAVContextMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.Stop; this.StopAVContextMenuItem.Name = "StopAVContextMenuItem"; - this.StopAVContextMenuItem.Size = new System.Drawing.Size(216, 22); + this.StopAVContextMenuItem.Size = new System.Drawing.Size(201, 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(213, 6); + this.ContextSeparator_AfterROM.Size = new System.Drawing.Size(198, 6); // // RecordMovieContextMenuItem // this.RecordMovieContextMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.RecordHS; this.RecordMovieContextMenuItem.Name = "RecordMovieContextMenuItem"; - this.RecordMovieContextMenuItem.Size = new System.Drawing.Size(216, 22); + this.RecordMovieContextMenuItem.Size = new System.Drawing.Size(201, 22); this.RecordMovieContextMenuItem.Text = "Record Movie"; this.RecordMovieContextMenuItem.Click += new System.EventHandler(this.RecordMovieMenuItem_Click); // @@ -3010,7 +3012,7 @@ // this.PlayMovieContextMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.Play; this.PlayMovieContextMenuItem.Name = "PlayMovieContextMenuItem"; - this.PlayMovieContextMenuItem.Size = new System.Drawing.Size(216, 22); + this.PlayMovieContextMenuItem.Size = new System.Drawing.Size(201, 22); this.PlayMovieContextMenuItem.Text = "Play Movie"; this.PlayMovieContextMenuItem.Click += new System.EventHandler(this.PlayMovieMenuItem_Click); // @@ -3018,7 +3020,7 @@ // this.RestartMovieContextMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.restart; this.RestartMovieContextMenuItem.Name = "RestartMovieContextMenuItem"; - this.RestartMovieContextMenuItem.Size = new System.Drawing.Size(216, 22); + this.RestartMovieContextMenuItem.Size = new System.Drawing.Size(201, 22); this.RestartMovieContextMenuItem.Text = "Restart Movie"; this.RestartMovieContextMenuItem.Click += new System.EventHandler(this.PlayFromBeginningMenuItem_Click); // @@ -3026,7 +3028,7 @@ // this.StopMovieContextMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.Stop; this.StopMovieContextMenuItem.Name = "StopMovieContextMenuItem"; - this.StopMovieContextMenuItem.Size = new System.Drawing.Size(216, 22); + this.StopMovieContextMenuItem.Size = new System.Drawing.Size(201, 22); this.StopMovieContextMenuItem.Text = "Stop Movie"; this.StopMovieContextMenuItem.Click += new System.EventHandler(this.StopMovieMenuItem_Click); // @@ -3034,14 +3036,14 @@ // this.LoadLastMovieContextMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.Recent; this.LoadLastMovieContextMenuItem.Name = "LoadLastMovieContextMenuItem"; - this.LoadLastMovieContextMenuItem.Size = new System.Drawing.Size(216, 22); + this.LoadLastMovieContextMenuItem.Size = new System.Drawing.Size(201, 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(216, 22); + this.BackupMovieContextMenuItem.Size = new System.Drawing.Size(201, 22); this.BackupMovieContextMenuItem.Text = "Backup Movie"; this.BackupMovieContextMenuItem.Click += new System.EventHandler(this.BackupMovieContextMenuItem_Click); // @@ -3049,28 +3051,28 @@ // this.StopNoSaveContextMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.Stop; this.StopNoSaveContextMenuItem.Name = "StopNoSaveContextMenuItem"; - this.StopNoSaveContextMenuItem.Size = new System.Drawing.Size(216, 22); + this.StopNoSaveContextMenuItem.Size = new System.Drawing.Size(201, 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(216, 22); + this.ViewSubtitlesContextMenuItem.Size = new System.Drawing.Size(201, 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(216, 22); + this.AddSubtitleContextMenuItem.Size = new System.Drawing.Size(201, 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(216, 22); + this.ViewCommentsContextMenuItem.Size = new System.Drawing.Size(201, 22); this.ViewCommentsContextMenuItem.Text = "View Comments"; this.ViewCommentsContextMenuItem.Click += new System.EventHandler(this.ViewCommentsContextMenuItem_Click); // @@ -3078,27 +3080,27 @@ // this.SaveMovieContextMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.SaveAs; this.SaveMovieContextMenuItem.Name = "SaveMovieContextMenuItem"; - this.SaveMovieContextMenuItem.Size = new System.Drawing.Size(216, 22); + this.SaveMovieContextMenuItem.Size = new System.Drawing.Size(201, 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(213, 6); + this.ContextSeparator_AfterMovie.Size = new System.Drawing.Size(198, 6); // // UndoSavestateContextMenuItem // this.UndoSavestateContextMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.undo; this.UndoSavestateContextMenuItem.Name = "UndoSavestateContextMenuItem"; - this.UndoSavestateContextMenuItem.Size = new System.Drawing.Size(216, 22); + this.UndoSavestateContextMenuItem.Size = new System.Drawing.Size(201, 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(213, 6); + this.ContextSeparator_AfterUndo.Size = new System.Drawing.Size(198, 6); // // ConfigContextMenuItem // @@ -3121,14 +3123,14 @@ this.toolStripMenuItem66, this.toolStripMenuItem67}); this.ConfigContextMenuItem.Name = "ConfigContextMenuItem"; - this.ConfigContextMenuItem.Size = new System.Drawing.Size(216, 22); + this.ConfigContextMenuItem.Size = new System.Drawing.Size(201, 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(159, 22); + this.toolStripMenuItem6.Size = new System.Drawing.Size(157, 22); this.toolStripMenuItem6.Text = "&Controllers..."; this.toolStripMenuItem6.Click += new System.EventHandler(this.ControllersMenuItem_Click); // @@ -3136,7 +3138,7 @@ // this.toolStripMenuItem7.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.HotKeys; this.toolStripMenuItem7.Name = "toolStripMenuItem7"; - this.toolStripMenuItem7.Size = new System.Drawing.Size(159, 22); + this.toolStripMenuItem7.Size = new System.Drawing.Size(157, 22); this.toolStripMenuItem7.Text = "&Hotkeys..."; this.toolStripMenuItem7.Click += new System.EventHandler(this.HotkeysMenuItem_Click); // @@ -3144,7 +3146,7 @@ // this.toolStripMenuItem8.Image = ((System.Drawing.Image)(resources.GetObject("toolStripMenuItem8.Image"))); this.toolStripMenuItem8.Name = "toolStripMenuItem8"; - this.toolStripMenuItem8.Size = new System.Drawing.Size(159, 22); + this.toolStripMenuItem8.Size = new System.Drawing.Size(157, 22); this.toolStripMenuItem8.Text = "Display..."; this.toolStripMenuItem8.Click += new System.EventHandler(this.DisplayConfigMenuItem_Click); // @@ -3152,7 +3154,7 @@ // this.toolStripMenuItem9.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.AudioHS; this.toolStripMenuItem9.Name = "toolStripMenuItem9"; - this.toolStripMenuItem9.Size = new System.Drawing.Size(159, 22); + this.toolStripMenuItem9.Size = new System.Drawing.Size(157, 22); this.toolStripMenuItem9.Text = "&Sound..."; this.toolStripMenuItem9.Click += new System.EventHandler(this.SoundMenuItem_Click); // @@ -3160,7 +3162,7 @@ // this.toolStripMenuItem10.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.CopyFolderHS; this.toolStripMenuItem10.Name = "toolStripMenuItem10"; - this.toolStripMenuItem10.Size = new System.Drawing.Size(159, 22); + this.toolStripMenuItem10.Size = new System.Drawing.Size(157, 22); this.toolStripMenuItem10.Text = "Paths..."; this.toolStripMenuItem10.Click += new System.EventHandler(this.PathsMenuItem_Click); // @@ -3168,7 +3170,7 @@ // this.toolStripMenuItem11.Image = ((System.Drawing.Image)(resources.GetObject("toolStripMenuItem11.Image"))); this.toolStripMenuItem11.Name = "toolStripMenuItem11"; - this.toolStripMenuItem11.Size = new System.Drawing.Size(159, 22); + this.toolStripMenuItem11.Size = new System.Drawing.Size(157, 22); this.toolStripMenuItem11.Text = "&Firmwares..."; this.toolStripMenuItem11.Click += new System.EventHandler(this.FirmwaresMenuItem_Click); // @@ -3176,7 +3178,7 @@ // this.toolStripMenuItem12.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.MessageConfig; this.toolStripMenuItem12.Name = "toolStripMenuItem12"; - this.toolStripMenuItem12.Size = new System.Drawing.Size(159, 22); + this.toolStripMenuItem12.Size = new System.Drawing.Size(157, 22); this.toolStripMenuItem12.Text = "&Messages..."; this.toolStripMenuItem12.Click += new System.EventHandler(this.MessagesMenuItem_Click); // @@ -3184,35 +3186,35 @@ // this.toolStripMenuItem13.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.Lightning; this.toolStripMenuItem13.Name = "toolStripMenuItem13"; - this.toolStripMenuItem13.Size = new System.Drawing.Size(159, 22); + this.toolStripMenuItem13.Size = new System.Drawing.Size(157, 22); this.toolStripMenuItem13.Text = "&Autofire..."; // // toolStripMenuItem14 // this.toolStripMenuItem14.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.Previous; this.toolStripMenuItem14.Name = "toolStripMenuItem14"; - this.toolStripMenuItem14.Size = new System.Drawing.Size(159, 22); + this.toolStripMenuItem14.Size = new System.Drawing.Size(157, 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(159, 22); + this.toolStripMenuItem15.Size = new System.Drawing.Size(157, 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(159, 22); + this.customizeToolStripMenuItem.Size = new System.Drawing.Size(157, 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(156, 6); + this.toolStripSeparator30.Size = new System.Drawing.Size(154, 6); // // SavestateTypeContextSubMenu // @@ -3221,7 +3223,7 @@ this.SavestateBinaryContextMenuItem, this.SavestateTextContextMenuItem}); this.SavestateTypeContextSubMenu.Name = "SavestateTypeContextSubMenu"; - this.SavestateTypeContextSubMenu.Size = new System.Drawing.Size(159, 22); + this.SavestateTypeContextSubMenu.Size = new System.Drawing.Size(157, 22); this.SavestateTypeContextSubMenu.Text = "Savestate Type"; this.SavestateTypeContextSubMenu.DropDownOpened += new System.EventHandler(this.SavestateTypeContextSubMenu_DropDownOpened); // @@ -3246,34 +3248,34 @@ this.GBInSGBContextMenuItem, this.NesInQuickNESContextMenuItem}); this.CoreSelectionContextSubMenu.Name = "CoreSelectionContextSubMenu"; - this.CoreSelectionContextSubMenu.Size = new System.Drawing.Size(159, 22); + this.CoreSelectionContextSubMenu.Size = new System.Drawing.Size(157, 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(163, 22); + this.GBInSGBContextMenuItem.Size = new System.Drawing.Size(152, 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(163, 22); + this.NesInQuickNESContextMenuItem.Size = new System.Drawing.Size(152, 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(156, 6); + this.toolStripSeparator37.Size = new System.Drawing.Size(154, 6); // // toolStripMenuItem66 // this.toolStripMenuItem66.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.Save; this.toolStripMenuItem66.Name = "toolStripMenuItem66"; - this.toolStripMenuItem66.Size = new System.Drawing.Size(159, 22); + this.toolStripMenuItem66.Size = new System.Drawing.Size(157, 22); this.toolStripMenuItem66.Text = "Save Config"; this.toolStripMenuItem66.Click += new System.EventHandler(this.SaveConfigMenuItem_Click); // @@ -3281,7 +3283,7 @@ // this.toolStripMenuItem67.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.LoadConfig; this.toolStripMenuItem67.Name = "toolStripMenuItem67"; - this.toolStripMenuItem67.Size = new System.Drawing.Size(159, 22); + this.toolStripMenuItem67.Size = new System.Drawing.Size(157, 22); this.toolStripMenuItem67.Text = "Load Config"; this.toolStripMenuItem67.Click += new System.EventHandler(this.LoadConfigMenuItem_Click); // @@ -3289,7 +3291,7 @@ // this.ScreenshotContextMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.camera; this.ScreenshotContextMenuItem.Name = "ScreenshotContextMenuItem"; - this.ScreenshotContextMenuItem.Size = new System.Drawing.Size(216, 22); + this.ScreenshotContextMenuItem.Size = new System.Drawing.Size(201, 22); this.ScreenshotContextMenuItem.Text = "Screenshot"; this.ScreenshotContextMenuItem.Click += new System.EventHandler(this.ScreenshotMenuItem_Click); // @@ -3297,29 +3299,36 @@ // this.CloseRomContextMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.Close; this.CloseRomContextMenuItem.Name = "CloseRomContextMenuItem"; - this.CloseRomContextMenuItem.Size = new System.Drawing.Size(216, 22); + this.CloseRomContextMenuItem.Size = new System.Drawing.Size(201, 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(216, 22); + this.ClearSRAMContextMenuItem.Size = new System.Drawing.Size(201, 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(213, 6); + this.ShowMenuContextMenuSeparator.Size = new System.Drawing.Size(198, 6); // // ShowMenuContextMenuItem // this.ShowMenuContextMenuItem.Name = "ShowMenuContextMenuItem"; - this.ShowMenuContextMenuItem.Size = new System.Drawing.Size(216, 22); + this.ShowMenuContextMenuItem.Size = new System.Drawing.Size(201, 22); this.ShowMenuContextMenuItem.Text = "Show Menu"; this.ShowMenuContextMenuItem.Click += new System.EventHandler(this.ShowMenuContextMenuItem_Click); // + // PSXDiscControlsMenuItem + // + this.PSXDiscControlsMenuItem.Name = "PSXDiscControlsMenuItem"; + this.PSXDiscControlsMenuItem.Size = new System.Drawing.Size(152, 22); + this.PSXDiscControlsMenuItem.Text = "&Disc Controls"; + this.PSXDiscControlsMenuItem.Click += new System.EventHandler(this.PSXDiscControlsMenuItem_Click); + // // MainForm // this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None; @@ -3707,6 +3716,7 @@ private System.Windows.Forms.ToolStripMenuItem PSXOptionsMenuItem; private System.Windows.Forms.ToolStripMenuItem SaveRAMSubMenu; private System.Windows.Forms.ToolStripMenuItem FlushSaveRAMMenuItem; + private System.Windows.Forms.ToolStripMenuItem PSXDiscControlsMenuItem; } } diff --git a/BizHawk.Client.EmuHawk/MainForm.Events.cs b/BizHawk.Client.EmuHawk/MainForm.Events.cs index b8d2dec228..2ac365a32f 100644 --- a/BizHawk.Client.EmuHawk/MainForm.Events.cs +++ b/BizHawk.Client.EmuHawk/MainForm.Events.cs @@ -1769,6 +1769,11 @@ namespace BizHawk.Client.EmuHawk } } + private void PSXDiscControlsMenuItem_Click(object sender, EventArgs e) + { + GlobalWin.Tools.Load().ScrollToPadSchema("Console"); + } + private void FlushSaveRAMMenuItem_Click(object sender, EventArgs e) { SaveRam(); diff --git a/BizHawk.Client.EmuHawk/MainForm.cs b/BizHawk.Client.EmuHawk/MainForm.cs index f2e3609351..50ef170ad8 100644 --- a/BizHawk.Client.EmuHawk/MainForm.cs +++ b/BizHawk.Client.EmuHawk/MainForm.cs @@ -3737,6 +3737,7 @@ namespace BizHawk.Client.EmuHawk FeaturesMenuItem.Visible = VersionInfo.DeveloperBuild; } + } diff --git a/BizHawk.Client.EmuHawk/tools/ToolManager.cs b/BizHawk.Client.EmuHawk/tools/ToolManager.cs index 0b65701cc7..2f79e2dfd7 100644 --- a/BizHawk.Client.EmuHawk/tools/ToolManager.cs +++ b/BizHawk.Client.EmuHawk/tools/ToolManager.cs @@ -21,9 +21,9 @@ namespace BizHawk.Client.EmuHawk /// /// Loads the tool dialog T, if it does not exist it will be created, if it is already open, it will be focused /// - public IToolForm Load() where T : IToolForm + public T Load() where T : IToolForm { - return Load(typeof(T)); + return (T)Load(typeof(T)); } /// diff --git a/BizHawk.Client.EmuHawk/tools/VirtualPads/VirtualPad.cs b/BizHawk.Client.EmuHawk/tools/VirtualPads/VirtualPad.cs index 73fecb78e1..6f4572e367 100644 --- a/BizHawk.Client.EmuHawk/tools/VirtualPads/VirtualPad.cs +++ b/BizHawk.Client.EmuHawk/tools/VirtualPads/VirtualPad.cs @@ -28,6 +28,8 @@ namespace BizHawk.Client.EmuHawk } } + public string PadSchemaDisplayName { get { return _schema.DisplayName; } } + public bool ReadOnly { get @@ -103,6 +105,16 @@ namespace BizHawk.Client.EmuHawk MaxValue = button.MaxValue }); break; + case PadSchema.PadInputType.DiscManager: + PadBox.Controls.Add(new VirtualPadDiscManager(button.SecondaryNames) + { + Name = button.Name, + //DisplayName = button.DisplayName, + Location = button.Location, + Size = button.TargetSize, + OwnerEmulator = button.OwnerEmulator + }); + break; } } } diff --git a/BizHawk.Client.EmuHawk/tools/VirtualPads/VirtualpadsTool.Designer.cs b/BizHawk.Client.EmuHawk/tools/VirtualPads/VirtualpadsTool.Designer.cs index 56ef14d260..0a2dbbcb1d 100644 --- a/BizHawk.Client.EmuHawk/tools/VirtualPads/VirtualpadsTool.Designer.cs +++ b/BizHawk.Client.EmuHawk/tools/VirtualPads/VirtualpadsTool.Designer.cs @@ -34,8 +34,11 @@ this.PadBoxContextMenu = new System.Windows.Forms.ContextMenuStrip(this.components); this.clearAllToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.StickyContextMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.ControllerPanel = new System.Windows.Forms.Panel(); this.PadMenu = new MenuStripEx(); this.OptionsSubMenu = new System.Windows.Forms.ToolStripMenuItem(); + this.ClearClearsAnalogInputMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.toolStripSeparator3 = new System.Windows.Forms.ToolStripSeparator(); this.AutoloadMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.SaveWindowPositionMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.AlwaysOnTopMenuItem = new System.Windows.Forms.ToolStripMenuItem(); @@ -47,8 +50,7 @@ this.PadsSubMenu = new System.Windows.Forms.ToolStripMenuItem(); this.ClearAllMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.StickyMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.toolStripSeparator3 = new System.Windows.Forms.ToolStripSeparator(); - this.ClearClearsAnalogInputMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.ControllerBox.SuspendLayout(); this.PadBoxContextMenu.SuspendLayout(); this.PadMenu.SuspendLayout(); this.SuspendLayout(); @@ -59,6 +61,7 @@ | System.Windows.Forms.AnchorStyles.Left) | System.Windows.Forms.AnchorStyles.Right))); this.ControllerBox.ContextMenuStrip = this.PadBoxContextMenu; + this.ControllerBox.Controls.Add(this.ControllerPanel); this.ControllerBox.Location = new System.Drawing.Point(12, 27); this.ControllerBox.Name = "ControllerBox"; this.ControllerBox.Size = new System.Drawing.Size(431, 277); @@ -72,24 +75,33 @@ this.clearAllToolStripMenuItem, this.StickyContextMenuItem}); this.PadBoxContextMenu.Name = "PadBoxContextMenu"; - this.PadBoxContextMenu.Size = new System.Drawing.Size(143, 48); + this.PadBoxContextMenu.Size = new System.Drawing.Size(136, 48); this.PadBoxContextMenu.Opening += new System.ComponentModel.CancelEventHandler(this.PadBoxContextMenu_Opening); // // clearAllToolStripMenuItem // this.clearAllToolStripMenuItem.Name = "clearAllToolStripMenuItem"; this.clearAllToolStripMenuItem.ShortcutKeyDisplayString = "Del"; - this.clearAllToolStripMenuItem.Size = new System.Drawing.Size(142, 22); + this.clearAllToolStripMenuItem.Size = new System.Drawing.Size(135, 22); this.clearAllToolStripMenuItem.Text = "Clear All"; this.clearAllToolStripMenuItem.Click += new System.EventHandler(this.ClearAllMenuItem_Click); // // StickyContextMenuItem // this.StickyContextMenuItem.Name = "StickyContextMenuItem"; - this.StickyContextMenuItem.Size = new System.Drawing.Size(142, 22); + this.StickyContextMenuItem.Size = new System.Drawing.Size(135, 22); this.StickyContextMenuItem.Text = "Sticky"; this.StickyContextMenuItem.Click += new System.EventHandler(this.StickyMenuItem_Click); // + // ControllerPanel + // + this.ControllerPanel.AutoScroll = true; + this.ControllerPanel.Dock = System.Windows.Forms.DockStyle.Fill; + this.ControllerPanel.Location = new System.Drawing.Point(3, 16); + this.ControllerPanel.Name = "ControllerPanel"; + this.ControllerPanel.Size = new System.Drawing.Size(425, 258); + this.ControllerPanel.TabIndex = 0; + // // PadMenu // this.PadMenu.ClickThrough = true; @@ -116,60 +128,72 @@ this.toolStripSeparator1, this.ExitMenuItem}); this.OptionsSubMenu.Name = "OptionsSubMenu"; - this.OptionsSubMenu.Size = new System.Drawing.Size(61, 20); + this.OptionsSubMenu.Size = new System.Drawing.Size(56, 20); this.OptionsSubMenu.Text = "&Options"; this.OptionsSubMenu.DropDownOpened += new System.EventHandler(this.OptionsSubMenu_DropDownOpened); // + // ClearClearsAnalogInputMenuItem + // + this.ClearClearsAnalogInputMenuItem.Name = "ClearClearsAnalogInputMenuItem"; + this.ClearClearsAnalogInputMenuItem.Size = new System.Drawing.Size(195, 22); + this.ClearClearsAnalogInputMenuItem.Text = "&Clear clears Analog Input"; + this.ClearClearsAnalogInputMenuItem.Click += new System.EventHandler(this.ClearClearsAnalogInputMenuItem_Click); + // + // toolStripSeparator3 + // + this.toolStripSeparator3.Name = "toolStripSeparator3"; + this.toolStripSeparator3.Size = new System.Drawing.Size(192, 6); + // // AutoloadMenuItem // this.AutoloadMenuItem.Name = "AutoloadMenuItem"; - this.AutoloadMenuItem.Size = new System.Drawing.Size(206, 22); + this.AutoloadMenuItem.Size = new System.Drawing.Size(195, 22); this.AutoloadMenuItem.Text = "&Autoload"; this.AutoloadMenuItem.Click += new System.EventHandler(this.AutoloadMenuItem_Click); // // SaveWindowPositionMenuItem // this.SaveWindowPositionMenuItem.Name = "SaveWindowPositionMenuItem"; - this.SaveWindowPositionMenuItem.Size = new System.Drawing.Size(206, 22); + this.SaveWindowPositionMenuItem.Size = new System.Drawing.Size(195, 22); this.SaveWindowPositionMenuItem.Text = "&Save Window Position"; this.SaveWindowPositionMenuItem.Click += new System.EventHandler(this.SaveWindowPositionMenuItem_Click); // // AlwaysOnTopMenuItem // this.AlwaysOnTopMenuItem.Name = "AlwaysOnTopMenuItem"; - this.AlwaysOnTopMenuItem.Size = new System.Drawing.Size(206, 22); + this.AlwaysOnTopMenuItem.Size = new System.Drawing.Size(195, 22); this.AlwaysOnTopMenuItem.Text = "Always On Top"; this.AlwaysOnTopMenuItem.Click += new System.EventHandler(this.AlwaysOnTopMenuItem_Click); // // FloatingWindowMenuItem // this.FloatingWindowMenuItem.Name = "FloatingWindowMenuItem"; - this.FloatingWindowMenuItem.Size = new System.Drawing.Size(206, 22); + this.FloatingWindowMenuItem.Size = new System.Drawing.Size(195, 22); this.FloatingWindowMenuItem.Text = "Floating Window"; this.FloatingWindowMenuItem.Click += new System.EventHandler(this.FloatingWindowMenuItem_Click); // // toolStripSeparator2 // this.toolStripSeparator2.Name = "toolStripSeparator2"; - this.toolStripSeparator2.Size = new System.Drawing.Size(203, 6); + this.toolStripSeparator2.Size = new System.Drawing.Size(192, 6); // // RestoreDefaultSettingsMenuItem // this.RestoreDefaultSettingsMenuItem.Name = "RestoreDefaultSettingsMenuItem"; - this.RestoreDefaultSettingsMenuItem.Size = new System.Drawing.Size(206, 22); + this.RestoreDefaultSettingsMenuItem.Size = new System.Drawing.Size(195, 22); this.RestoreDefaultSettingsMenuItem.Text = "Restore Default Settings"; this.RestoreDefaultSettingsMenuItem.Click += new System.EventHandler(this.RestoreDefaultSettingsMenuItem_Click); // // toolStripSeparator1 // this.toolStripSeparator1.Name = "toolStripSeparator1"; - this.toolStripSeparator1.Size = new System.Drawing.Size(203, 6); + this.toolStripSeparator1.Size = new System.Drawing.Size(192, 6); // // ExitMenuItem // this.ExitMenuItem.Name = "ExitMenuItem"; this.ExitMenuItem.ShortcutKeyDisplayString = "Alt+F4"; - this.ExitMenuItem.Size = new System.Drawing.Size(206, 22); + this.ExitMenuItem.Size = new System.Drawing.Size(195, 22); this.ExitMenuItem.Text = "E&xit"; this.ExitMenuItem.Click += new System.EventHandler(this.ExitMenuItem_Click); // @@ -179,7 +203,7 @@ this.ClearAllMenuItem, this.StickyMenuItem}); this.PadsSubMenu.Name = "PadsSubMenu"; - this.PadsSubMenu.Size = new System.Drawing.Size(44, 20); + this.PadsSubMenu.Size = new System.Drawing.Size(42, 20); this.PadsSubMenu.Text = "&Pads"; this.PadsSubMenu.DropDownOpened += new System.EventHandler(this.PadsSubMenu_DropDownOpened); // @@ -187,29 +211,17 @@ // this.ClearAllMenuItem.Name = "ClearAllMenuItem"; this.ClearAllMenuItem.ShortcutKeys = System.Windows.Forms.Keys.Delete; - this.ClearAllMenuItem.Size = new System.Drawing.Size(152, 22); + this.ClearAllMenuItem.Size = new System.Drawing.Size(135, 22); this.ClearAllMenuItem.Text = "&Clear All"; this.ClearAllMenuItem.Click += new System.EventHandler(this.ClearAllMenuItem_Click); // // StickyMenuItem // this.StickyMenuItem.Name = "StickyMenuItem"; - this.StickyMenuItem.Size = new System.Drawing.Size(152, 22); + this.StickyMenuItem.Size = new System.Drawing.Size(135, 22); this.StickyMenuItem.Text = "Sticky"; this.StickyMenuItem.Click += new System.EventHandler(this.StickyMenuItem_Click); // - // toolStripSeparator3 - // - this.toolStripSeparator3.Name = "toolStripSeparator3"; - this.toolStripSeparator3.Size = new System.Drawing.Size(203, 6); - // - // ClearClearsAnalogInputMenuItem - // - this.ClearClearsAnalogInputMenuItem.Name = "ClearClearsAnalogInputMenuItem"; - this.ClearClearsAnalogInputMenuItem.Size = new System.Drawing.Size(206, 22); - this.ClearClearsAnalogInputMenuItem.Text = "&Clear clears Analog Input"; - this.ClearClearsAnalogInputMenuItem.Click += new System.EventHandler(this.ClearClearsAnalogInputMenuItem_Click); - // // VirtualpadTool // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); @@ -221,6 +233,7 @@ this.Name = "VirtualpadTool"; this.Text = "Virtual Pads"; this.Load += new System.EventHandler(this.VirtualpadTool_Load); + this.ControllerBox.ResumeLayout(false); this.PadBoxContextMenu.ResumeLayout(false); this.PadMenu.ResumeLayout(false); this.PadMenu.PerformLayout(); @@ -250,5 +263,6 @@ private System.Windows.Forms.ToolStripMenuItem StickyContextMenuItem; private System.Windows.Forms.ToolStripMenuItem ClearClearsAnalogInputMenuItem; private System.Windows.Forms.ToolStripSeparator toolStripSeparator3; + private System.Windows.Forms.Panel ControllerPanel; } } \ No newline at end of file diff --git a/BizHawk.Client.EmuHawk/tools/VirtualPads/VirtualpadsTool.cs b/BizHawk.Client.EmuHawk/tools/VirtualPads/VirtualpadsTool.cs index 690cff3b72..e9f0df4d73 100644 --- a/BizHawk.Client.EmuHawk/tools/VirtualPads/VirtualpadsTool.cs +++ b/BizHawk.Client.EmuHawk/tools/VirtualPads/VirtualpadsTool.cs @@ -19,7 +19,7 @@ namespace BizHawk.Client.EmuHawk { get { - return ControllerBox.Controls + return ControllerPanel.Controls .OfType() .ToList(); } @@ -83,7 +83,7 @@ namespace BizHawk.Client.EmuHawk private void CreatePads() { - ControllerBox.Controls.Clear(); + ControllerPanel.Controls.Clear(); var schemaType = Assembly .GetExecutingAssembly() @@ -107,11 +107,22 @@ namespace BizHawk.Client.EmuHawk if (pads.Any()) { - ControllerBox.Controls.AddRange(pads.Reverse().ToArray()); + ControllerPanel.Controls.AddRange(pads.Reverse().ToArray()); } } } + public void ScrollToPadSchema(string padSchemaName) + { + foreach (var control in ControllerPanel.Controls) + { + VirtualPad vp = control as VirtualPad; + if (vp == null) continue; + if (vp.PadSchemaDisplayName == padSchemaName) + ControllerPanel.ScrollControlIntoView(vp); + } + } + private void CheckPads(IEnumerable schemas, BizHawk.Emulation.Common.ControllerDefinition def) { HashSet analogs = new HashSet(def.FloatControls); @@ -133,6 +144,10 @@ namespace BizHawk.Client.EmuHawk case PadSchema.PadInputType.Boolean: searchset = bools; break; + case PadSchema.PadInputType.DiscManager: + searchset = bools; + searchset.UnionWith(analogs); + break; } if (!searchset.Contains(button.Name)) { diff --git a/BizHawk.Client.EmuHawk/tools/VirtualPads/controls/VirtualPadDiscManager.Designer.cs b/BizHawk.Client.EmuHawk/tools/VirtualPads/controls/VirtualPadDiscManager.Designer.cs new file mode 100644 index 0000000000..1e4a0d11ef --- /dev/null +++ b/BizHawk.Client.EmuHawk/tools/VirtualPads/controls/VirtualPadDiscManager.Designer.cs @@ -0,0 +1,136 @@ +namespace BizHawk.Client.EmuHawk +{ + partial class VirtualPadDiscManager + { + /// + /// Required designer variable. + /// + private System.ComponentModel.IContainer components = null; + + /// + /// Clean up any resources being used. + /// + /// true if managed resources should be disposed; otherwise, false. + protected override void Dispose(bool disposing) + { + if (disposing && (components != null)) + { + components.Dispose(); + } + base.Dispose(disposing); + } + + #region Component Designer generated code + + /// + /// Required method for Designer support - do not modify + /// the contents of this method with the code editor. + /// + private void InitializeComponent() + { + this.groupBox1 = new System.Windows.Forms.GroupBox(); + this.lvDiscs = new System.Windows.Forms.ListView(); + this.columnHeader1 = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader())); + this.columnHeader2 = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader())); + this.btnInsert = new BizHawk.Client.EmuHawk.VirtualPadButton(); + this.btnEject = new BizHawk.Client.EmuHawk.VirtualPadButton(); + this.groupBox1.SuspendLayout(); + this.SuspendLayout(); + // + // groupBox1 + // + this.groupBox1.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) + | System.Windows.Forms.AnchorStyles.Left) + | System.Windows.Forms.AnchorStyles.Right))); + this.groupBox1.Controls.Add(this.lvDiscs); + this.groupBox1.Location = new System.Drawing.Point(3, 32); + this.groupBox1.Name = "groupBox1"; + this.groupBox1.Size = new System.Drawing.Size(279, 207); + this.groupBox1.TabIndex = 1; + this.groupBox1.TabStop = false; + this.groupBox1.Text = "Discs"; + this.groupBox1.Enter += new System.EventHandler(this.groupBox1_Enter); + // + // lvDiscs + // + this.lvDiscs.Columns.AddRange(new System.Windows.Forms.ColumnHeader[] { + this.columnHeader1, + this.columnHeader2}); + this.lvDiscs.Dock = System.Windows.Forms.DockStyle.Fill; + this.lvDiscs.FullRowSelect = true; + this.lvDiscs.GridLines = true; + this.lvDiscs.HeaderStyle = System.Windows.Forms.ColumnHeaderStyle.Nonclickable; + this.lvDiscs.HideSelection = false; + this.lvDiscs.Location = new System.Drawing.Point(3, 16); + this.lvDiscs.MultiSelect = false; + this.lvDiscs.Name = "lvDiscs"; + this.lvDiscs.Size = new System.Drawing.Size(273, 188); + this.lvDiscs.TabIndex = 0; + this.lvDiscs.UseCompatibleStateImageBehavior = false; + this.lvDiscs.View = System.Windows.Forms.View.Details; + this.lvDiscs.SelectedIndexChanged += new System.EventHandler(this.lvDiscs_SelectedIndexChanged); + // + // columnHeader1 + // + this.columnHeader1.Text = "#"; + this.columnHeader1.Width = 27; + // + // columnHeader2 + // + this.columnHeader2.Text = "Name"; + this.columnHeader2.Width = 228; + // + // btnInsert + // + this.btnInsert.Appearance = System.Windows.Forms.Appearance.Button; + this.btnInsert.AutoSize = true; + this.btnInsert.ForeColor = System.Drawing.SystemColors.ControlText; + this.btnInsert.Location = new System.Drawing.Point(50, 3); + this.btnInsert.Name = "btnInsert"; + this.btnInsert.ReadOnly = false; + this.btnInsert.RightClicked = false; + this.btnInsert.Size = new System.Drawing.Size(43, 23); + this.btnInsert.TabIndex = 2; + this.btnInsert.Text = "Insert"; + this.btnInsert.UseVisualStyleBackColor = true; + // + // btnEject + // + this.btnEject.Appearance = System.Windows.Forms.Appearance.Button; + this.btnEject.AutoSize = true; + this.btnEject.ForeColor = System.Drawing.SystemColors.ControlText; + this.btnEject.Location = new System.Drawing.Point(3, 3); + this.btnEject.Name = "btnEject"; + this.btnEject.ReadOnly = false; + this.btnEject.RightClicked = false; + this.btnEject.Size = new System.Drawing.Size(41, 23); + this.btnEject.TabIndex = 0; + this.btnEject.Text = "Eject"; + this.btnEject.UseVisualStyleBackColor = true; + // + // VirtualPadDiscManager + // + this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); + this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; + this.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D; + this.Controls.Add(this.btnInsert); + this.Controls.Add(this.groupBox1); + this.Controls.Add(this.btnEject); + this.Name = "VirtualPadDiscManager"; + this.Size = new System.Drawing.Size(286, 244); + this.groupBox1.ResumeLayout(false); + this.ResumeLayout(false); + this.PerformLayout(); + + } + + #endregion + + private VirtualPadButton btnEject; + private System.Windows.Forms.GroupBox groupBox1; + private System.Windows.Forms.ListView lvDiscs; + private System.Windows.Forms.ColumnHeader columnHeader1; + private System.Windows.Forms.ColumnHeader columnHeader2; + private VirtualPadButton btnInsert; + } +} diff --git a/BizHawk.Client.EmuHawk/tools/VirtualPads/controls/VirtualPadDiscManager.cs b/BizHawk.Client.EmuHawk/tools/VirtualPads/controls/VirtualPadDiscManager.cs new file mode 100644 index 0000000000..1c6784d301 --- /dev/null +++ b/BizHawk.Client.EmuHawk/tools/VirtualPads/controls/VirtualPadDiscManager.cs @@ -0,0 +1,127 @@ +using System; +using System.Collections.Generic; +using System.ComponentModel; +using System.Drawing; +using System.Data; +using System.Linq; +using System.Text; +using System.Windows.Forms; + +using BizHawk.Client.Common; +using BizHawk.Emulation.Common; +using BizHawk.Emulation.Cores.Sony.PSX; + +namespace BizHawk.Client.EmuHawk +{ + public partial class VirtualPadDiscManager : UserControl, IVirtualPadControl + { + public VirtualPadDiscManager(string[] buttonNames) + { + InitializeComponent(); + btnEject.Name = buttonNames[0]; + btnInsert.Name = buttonNames[1]; + _discSelectName = buttonNames[2]; + } + + string _discSelectName; + public object OwnerEmulator { get; set; } + + object lastCoreOwner; + + void UpdateCoreAssociation() + { + if (lastCoreOwner == OwnerEmulator) + return; + + lastCoreOwner = OwnerEmulator; + + if (!(OwnerEmulator is Octoshock)) + return; + + var psx = OwnerEmulator as Octoshock; + List buttons = new List(); + buttons.Add("- NONE -"); + buttons.AddRange(psx.HackyDiscButtons); + + lvDiscs.Items.Clear(); + + int idx = 0; + foreach (var button in buttons) + { + var lvi = new ListViewItem(); + lvi.Text = idx.ToString(); + lvi.SubItems.Add(button); + lvDiscs.Items.Add(lvi); + idx++; + } + } + + + #region IVirtualPadControl + + public void Clear() + { + } + + public void UpdateValues() + { + UpdateCoreAssociation(); + if (OwnerEmulator is Octoshock) + { + var psx = OwnerEmulator as Octoshock; + bool eject = psx.CurrentDiscEjected; + + btnEject.Enabled = !eject; + btnInsert.Enabled = eject; + + if (!btnEject.Enabled) btnEject.Checked = false; + if (!btnInsert.Enabled) btnInsert.Checked = false; + + //if we're not ejected, then the disc is frozen in the current configuration + lvDiscs.Enabled = eject; + if (!eject) + { + lvDiscs.SelectedIndices.Clear(); + lvDiscs.SelectedIndices.Add(psx.CurrentDiscIndexMounted); + } + } + + //make sure we try to keep something selected here, for clarity. + //but maybe later we'll just make it so that unselecting means no disc and dont display the disc 0 + if (lvDiscs.SelectedIndices.Count == 0) + lvDiscs.SelectedIndices.Add(0); + } + + public void Set(IController controller) + { + //controller.GetFloat("Disc Select") + } + + public bool ReadOnly { get; set; } + + #endregion //IVirtualPadControl + + private void groupBox1_Enter(object sender, EventArgs e) + { + + } + + private void lvDiscs_SelectedIndexChanged(object sender, EventArgs e) + { + //not a valid way to fight unselection, it results in craptons of ping-ponging logic and eventual malfunction + //if (lvDiscs.SelectedIndices.Count == 0) + // lvDiscs.SelectedIndices.Add(0); + //Global.StickyXORAdapter.SetFloat(_discSelectName, lvDiscs.SelectedIndices[0]); + + //emergency measure: if no selection, set no disc + if (lvDiscs.SelectedIndices.Count == 0) + Global.StickyXORAdapter.SetFloat(_discSelectName, 0); + else Global.StickyXORAdapter.SetFloat(_discSelectName, lvDiscs.SelectedIndices[0]); + } + + + + + + } +} diff --git a/BizHawk.Client.EmuHawk/tools/VirtualPads/controls/VirtualPadDiscManager.resx b/BizHawk.Client.EmuHawk/tools/VirtualPads/controls/VirtualPadDiscManager.resx new file mode 100644 index 0000000000..29dcb1b3a3 --- /dev/null +++ b/BizHawk.Client.EmuHawk/tools/VirtualPads/controls/VirtualPadDiscManager.resx @@ -0,0 +1,120 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + \ No newline at end of file diff --git a/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/PSXSchema.cs b/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/PSXSchema.cs index 990e31ec4e..46f70b336e 100644 --- a/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/PSXSchema.cs +++ b/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/PSXSchema.cs @@ -11,9 +11,10 @@ namespace BizHawk.Client.EmuHawk { public IEnumerable GetPadSchemas() { + var psx = ((Octoshock)Global.Emulator); yield return DualShockController(1); yield return DualShockController(2); - yield return ConsoleButtons(); + yield return ConsoleButtons(psx); } public static PadSchema DualShockController(int controller) @@ -22,6 +23,7 @@ namespace BizHawk.Client.EmuHawk { IsConsole = false, DefaultSize = new Size(420, 260), + DisplayName = "DualShock Player" + controller, Buttons = new[] { new PadSchema.ButtonScema @@ -152,7 +154,7 @@ namespace BizHawk.Client.EmuHawk Location = new Point(3, 120), Type = PadSchema.PadInputType.AnalogStick }, - new PadSchema.ButtonScema + new PadSchema.ButtonScema { Name = "P" + controller + " RStick X", MaxValue = 127, @@ -163,38 +165,30 @@ namespace BizHawk.Client.EmuHawk } }; } - private static PadSchema ConsoleButtons() + private static PadSchema ConsoleButtons(Octoshock psx) { return new PadSchema { DisplayName = "Console", IsConsole = true, - DefaultSize = new Size(360, 250), + DefaultSize = new Size(310, 400), Buttons = new[] { new PadSchema.ButtonScema { - Name = "Eject", - DisplayName = "Eject", + Name = "Reset", + DisplayName = "Reset", Location = new Point(10, 15), Type = PadSchema.PadInputType.Boolean }, new PadSchema.ButtonScema { - Name = "Reset", - DisplayName = "Reset", - Location = new Point(60, 15), - Type = PadSchema.PadInputType.Boolean - }, - new PadSchema.ButtonScema - { - Name = "Disc Select", - MinValue = 1, - MaxValue = 5, - DisplayName = "Disc Select", - Location = new Point(10, 40), - TargetSize = new Size(300,100), - Type = PadSchema.PadInputType.FloatSingle + Name = "Disc Select", //not really, but shuts up a warning + Type = PadSchema.PadInputType.DiscManager, + Location = new Point(10,54), + TargetSize = new Size(300,300), + OwnerEmulator = psx, + SecondaryNames = new [] { "Eject", "Insert", "Disc Select" } } } }; diff --git a/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/PadSchema.cs b/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/PadSchema.cs index eaef57ab40..4e5e6c9d13 100644 --- a/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/PadSchema.cs +++ b/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/PadSchema.cs @@ -10,7 +10,8 @@ namespace BizHawk.Client.EmuHawk Boolean, // A single on/off button AnalogStick, // An analog stick X,Y Pair FloatSingle, // A single analog button (pressure sensitive button for instance) - TargetedPair // A X,Y pair intended to be a screen cooridnate (for zappers, mouse, stylus, etc) + TargetedPair, // A X,Y pair intended to be a screen cooridnate (for zappers, mouse, stylus, etc) + DiscManager } // Default size of the pad @@ -31,6 +32,7 @@ namespace BizHawk.Client.EmuHawk public string[] SecondaryNames { get; set; } // Any other buttons necessary to operate (such as the Y axis) public int MaxValue { get; set; } // For non-boolean values, specifies the maximum value the button allows public int MinValue { get; set; } // For non-boolean values, specifies the minimum value the button allows + public object OwnerEmulator { get; set; } } } diff --git a/BizHawk.Emulation.Cores/Consoles/Sony/PSX/Octoshock.cs b/BizHawk.Emulation.Cores/Consoles/Sony/PSX/Octoshock.cs index e86f76874d..37289bee35 100644 --- a/BizHawk.Emulation.Cores/Consoles/Sony/PSX/Octoshock.cs +++ b/BizHawk.Emulation.Cores/Consoles/Sony/PSX/Octoshock.cs @@ -35,7 +35,7 @@ namespace BizHawk.Emulation.Cores.Sony.PSX { public string SystemId { get { return "PSX"; } } - public static readonly ControllerDefinition DualShockController = new ControllerDefinition + public static readonly ControllerDefinition PSXControllerDefinition = new ControllerDefinition { Name = "DualShock Controller", BoolButtons = @@ -44,7 +44,7 @@ namespace BizHawk.Emulation.Cores.Sony.PSX "P1 R1", "P1 L2", "P1 R2", "P1 L3", "P1 R3", "P1 MODE", "P2 Up", "P2 Down", "P2 Left", "P2 Right", "P2 Select", "P2 Start", "P2 Square", "P2 Triangle", "P2 Circle", "P2 Cross", "P2 L1", "P2 R1", "P2 L2", "P2 R2", "P2 L3", "P2 R3", "P2 MODE", - "Eject", "Reset", + "Eject", "Insert", "Reset", }, FloatControls = { @@ -63,7 +63,7 @@ namespace BizHawk.Emulation.Cores.Sony.PSX new[] {0.0f, 128.0f, 255.0f}, new[] {255.0f, 128.0f, 0.0f}, new[] {1.0f,1.0f,5.0f}, - } + }, }; public string BoardName { get { return null; } } @@ -190,23 +190,27 @@ namespace BizHawk.Emulation.Cores.Sony.PSX public OctoshockDll.eRegion SystemRegion { get; private set; } public OctoshockDll.eVidStandard SystemVidStandard { get; private set; } public System.Drawing.Size CurrentVideoSize { get; private set; } + + public bool CurrentDiscEjected { get; private set; } + public int CurrentDiscIndexMounted { get; private set; } + + public List HackyDiscButtons = new List(); //note: its annoying that we have to have a disc before constructing this. //might want to change that later. HOWEVER - we need to definitely have a region, at least - public Octoshock(CoreComm comm, List discs, byte[] exe, object settings, object syncSettings) + public Octoshock(CoreComm comm, List discs, List discNames, byte[] exe, object settings, object syncSettings) { - //analyze our first disc from the list by default, because i dont know - ServiceProvider = new BasicServiceProvider(this); CoreComm = comm; + DriveLightEnabled = true; _Settings = (Settings)settings ?? new Settings(); _SyncSettings = (SyncSettings)syncSettings ?? new SyncSettings(); - DriveLightEnabled = true; - Attach(); + HackyDiscButtons.AddRange(discNames); + //assume this region for EXE and PSF, maybe not correct though string firmwareRegion = "U"; SystemRegion = OctoshockDll.eRegion.NA; @@ -287,15 +291,27 @@ namespace BizHawk.Emulation.Cores.Sony.PSX frameBuffer = new int[BufferWidth * BufferHeight]; } + //TODO - should be able to cold boot system with disc isnerted if (discInterfaces.Count != 0) { - //disc will be set during first frame advance + //start with first disc inserted and tray closed + CurrentDiscEjected = false; + CurrentDiscIndexMounted = 1; + currentDiscInterface = discInterfaces[CurrentDiscIndexMounted - 1]; + OctoshockDll.shock_OpenTray(psx); + OctoshockDll.shock_SetDisc(psx, currentDiscInterface.OctoshockHandle); + OctoshockDll.shock_CloseTray(psx); } else { //must be an exe fixed (byte* pExeBuffer = exe) OctoshockDll.shock_MountEXE(psx, pExeBuffer, exe.Length); + + //start with no disc inserted and tray closed + CurrentDiscEjected = false; + CurrentDiscIndexMounted = 0; + OctoshockDll.shock_CloseTray(psx); } //connect two dualshocks, thats all we're doing right now @@ -431,28 +447,53 @@ namespace BizHawk.Emulation.Cores.Sony.PSX return new System.Drawing.Size(VirtualWidth, VirtualHeight); } + void FrameAdvance_PrepDiscState() + { + //if eject is requested, and valid, apply it + if (Controller["Eject"] && !CurrentDiscEjected) + { + OctoshockDll.shock_OpenTray(psx); + CurrentDiscEjected = true; + } + + //change the disc if needed, and valid + //TODO - warning if zero time change? + int requestedDisc = (int)Controller.GetFloat("Disc Select"); + if (requestedDisc != CurrentDiscIndexMounted && CurrentDiscEjected) + { + CurrentDiscIndexMounted = requestedDisc; + if (CurrentDiscIndexMounted == 0) + { + currentDiscInterface = null; + OctoshockDll.shock_SetDisc(psx, IntPtr.Zero); + } + else + { + currentDiscInterface = discInterfaces[CurrentDiscIndexMounted - 1]; + OctoshockDll.shock_SetDisc(psx, currentDiscInterface.OctoshockHandle); + } + } + + //if insert is requested, and valid, apply it + if (Controller["Insert"] && CurrentDiscEjected) + { + OctoshockDll.shock_CloseTray(psx); + CurrentDiscEjected = false; + } + } + public void FrameAdvance(bool render, bool rendersound) { Frame++; + + //clear drive light. itll get set to light up by sector-reading callbacks + //TODO - debounce this by a frame or so perhaps? DriveLightOn = false; + FrameAdvance_PrepDiscState(); + SetInput(); - if (Controller["Eject"]) OctoshockDll.shock_OpenTray(psx); - - //if requested disc is not matching current disc, set it now - int discChoice = (int)Controller.GetFloat("Disc Select") - 1; - if (discChoice >= discInterfaces.Count) - discChoice = discInterfaces.Count - 1; - if (discInterfaces[discChoice] != currentDiscInterface) - { - currentDiscInterface = discInterfaces[discChoice]; - if (!Controller["Eject"]) OctoshockDll.shock_OpenTray(psx); //open tray if needed - OctoshockDll.shock_SetDisc(psx, currentDiscInterface.OctoshockHandle); - } - - if (!Controller["Eject"]) OctoshockDll.shock_CloseTray(psx); - var ropts = new OctoshockDll.ShockRenderOptions() { scanline_start = SystemVidStandard == OctoshockDll.eVidStandard.NTSC ? _Settings.ScanlineStart_NTSC : _Settings.ScanlineStart_PAL, @@ -515,7 +556,7 @@ namespace BizHawk.Emulation.Cores.Sony.PSX } } - public ControllerDefinition ControllerDefinition { get { return DualShockController; } } + public ControllerDefinition ControllerDefinition { get { return PSXControllerDefinition; } } public IController Controller { get; set; } public int Frame { get; private set; } @@ -638,6 +679,8 @@ namespace BizHawk.Emulation.Cores.Sony.PSX public int Frame; public int LagCount; public bool IsLagFrame; + public bool CurrentDiscEjected; + public int CurrentDiscIndexMounted; } public void SaveStateText(TextWriter writer) @@ -657,6 +700,8 @@ namespace BizHawk.Emulation.Cores.Sony.PSX s.ExtraData.IsLagFrame = IsLagFrame; s.ExtraData.LagCount = LagCount; s.ExtraData.Frame = Frame; + s.ExtraData.CurrentDiscEjected = CurrentDiscEjected; + s.ExtraData.CurrentDiscIndexMounted = CurrentDiscIndexMounted; ser.Serialize(writer, s); // TODO write extra copy of stuff we don't use (WHY?) @@ -679,6 +724,8 @@ namespace BizHawk.Emulation.Cores.Sony.PSX IsLagFrame = s.ExtraData.IsLagFrame; LagCount = s.ExtraData.LagCount; Frame = s.ExtraData.Frame; + CurrentDiscEjected = s.ExtraData.CurrentDiscEjected; + CurrentDiscIndexMounted = s.ExtraData.CurrentDiscIndexMounted; } byte[] savebuff; @@ -690,7 +737,7 @@ namespace BizHawk.Emulation.Cores.Sony.PSX transaction.transaction = OctoshockDll.eShockStateTransaction.BinarySize; int size = OctoshockDll.shock_StateTransaction(psx, ref transaction); savebuff = new byte[size]; - savebuff2 = new byte[savebuff.Length + 13]; + savebuff2 = new byte[savebuff.Length + 4+ 4+4+1+1+4]; } public void SaveStateBinary(BinaryWriter writer) @@ -714,6 +761,8 @@ namespace BizHawk.Emulation.Cores.Sony.PSX writer.Write(IsLagFrame); writer.Write(LagCount); writer.Write(Frame); + writer.Write(CurrentDiscEjected); + writer.Write(CurrentDiscIndexMounted); } } @@ -740,6 +789,10 @@ namespace BizHawk.Emulation.Cores.Sony.PSX IsLagFrame = reader.ReadBoolean(); LagCount = reader.ReadInt32(); Frame = reader.ReadInt32(); + CurrentDiscEjected = reader.ReadBoolean(); + CurrentDiscIndexMounted = reader.ReadInt32(); + + //TODO - need a method to sneak the required disc, without having to do a proper eject sequence } } diff --git a/output/dll/octoshock.dll b/output/dll/octoshock.dll index d6b5e36cc76185ad11913e7cf189a86b0b7a904f..172ef0f5dd6ea34e377697e822bc760ebf5a40d1 100644 GIT binary patch delta 35893 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

a@i)w0U?3#|6!I~5e(R`uVr@5ec zpb@lHwH9p~?OWPO+WFegw7a$Ev_5>$O;=f`)3wnJ(4l2Ir)U5(*)ZR*(y-lh)O5jg z-@;obFzD`JHxHW;1qH2&D8GF2DO*<_w@=x2~$;*#?-{p!IEfE z1UUR}GYZ9N&1D2fA)8a+yM>AbmS~Vu)PZT?)0nljbus!#L%!jr@r>z!nOdlo+HTr! zI&L~++=`r#V~i$7+d|hu-@=e=Og1H(*I3qA*VxY3&p6IFBUy)eA-_mXq}Hr6>&=Ei z#zCe*W?~^$Vmn|z;5gvScjd#A7X#;OYU^t2Ya4tC#spJ>d8TEib*7Else?Lix^A)# z)x4qx%uP)U(u*;)Ft#wYFeh6MSYzyi;3Wo)slCyF$Mu6Z8PnW&SVx$ z!z(JGk7Vsl-5?Av!FJs$%dIHx3Q*Cpk_FM<4xlM3^m!3U^Uw!efFDJ8-nRda4P~KXMDm`ds9nwM4yaluWgDnpE2iKVr*u6 zf+HDU@Dvlt4vp>%W+w)IXN-~NL0Fu8%nw^aMKGkdK;SbvGnVE6=4U2$Rt)-B<5J{= zme&`Fkq}+JJ^`b+X>MUn#-=hm2e}Tg?DImM)Yc|oiesSAYP)8_Ln$s1 z+at-CiAc=D0ZYC$0sH7CTO_qoJOkEf+Uo9_)0~R9P`#o4sAZT7{cDsy(V@5DrS&cg z7_Sshku>8ZyTT(m>v~(#m~&!C+itjPQ+PvKthTLrk`r1=NZX*lXjP<#w4xfP$%#Lo zpvVZ-ojRw*$@&R|e4PfTO_A-B#6ss_s6I@$)N+(L=Y*V(8jji&c_Hnn=B2423#teU zC9m&o?ah)`hl$DeHm2DXaUpHH_OAIZ^VNjvclCFrfrfnV`iyrmQb{ayP7H~$hPD`K zNSmaYWSYcAlOol18!Q)Dg6SdOqQ;_jMMg*~sx4}EvY>%beVBf!bty|QJLJ36xYVu) zhBV(&?Nakn=A08cu(Z%Quh99WU7-jMja0YY@{$Erhl?Y1vSo@3X&1Fl%TlIkLfS<` ztX&Z=wL^@HEQTkf#Tt6s6p5ndQ!Le7G{rK}D>);9i!9p|$=TG~p-2yDOLZ45u}sSd zX}#G<0wL|9HrCRcC6FD`mKrYF6v2=dtL-ffGNfJ9$6`5|=2IwoYnGZWvZ+->h@*_f zdWzGfju1zA(HQGc#D%op*caloYeHJAu{TB;(w1s3nqyf4o{-ktuoR<|`q0Fh6@dux z(rdIjt<9}_Y=>>9Y#yJZnK#&-u(*+NB5-5wHJox_Y|T zbm_)LMrtguL|JQDM>xhgK6c!5KXogzLq26SiTWY>nfl|VbEd~8x2=`!E!$4#A?FPi zC>RRVQrA&8RCm^N#q`3IWFKXpV?XP@;(p=79WLZBL_bD9MPJ9PGsl~6;qig9XSufH zey_+2>F?|2>sIJmnmU>iO;NT|wyL&M&Wq052oWXTWVY)L=)Tu&FjMnBGyZQV$3C{C z>L_uPX+o0R3TWQ*0+G<*F`^vW4CJihRePjPAvUJ;Zhjm$|?WV(~qxLg+NWwvHsPSD* zz9w8-)D&Z?X)0=uvDdV-&Ud*KDN*7&@6{gDUeR7P+%<5{w0E#~cJ*PZn$oW&Tm|5%rx$_9I{-r+_2}_!yKjEmEAgV^M+=uyMBOv zq<)<_%e>3{)UI@tU^5n!Vrd3wMr!=}rTR>t{wvcC(@E1Q>qYB*YrcbXmSLMFC*)XN z(@@hy^P0Y$zQ2BeX_#rUX{L3qb+z@7^OW;4^UDj3E=pHQS5?=_)XCJ(w9vNFmMQLy z`|uFNSt`&(X=Amu3>w302DXHw%u{V?w&k`joxUy3qpTw}o{nKoYjQLXHDQKghH8dZ zmQI#_mW7U$j!c~Yp^k3hNsiODGIlcdGfuUnS(aN?*}t&ww(oHrbzK&(ej&e`+WXpY zT`6O%QEN0TkXxTa;VHQGIRT+Pwm(B9QP()wO%!*tQQ z(s%;4=p4Fuoa-&|EbP&B*1fIs>fX`4r<D%Z#>J#*R^l$2i>PPFx>!<49*ZcL$^q=ZK*JtU! z(P!%q>5u8Z)1T8{vgoht@8}=spXoV62}1=#oS~+{XmDYjS{b?<`WuoA!wjPh;|xB- zbVI7)b3>M4o8gGzq~R_Z>5pzqcC?EwHh8FUvT>I2L*pmLwZ<=vJB$a7$BjQ4bB*_m z4~?Zvv8LK4t;ud`ZfaxdY3gqpX?oW*)AWI9scDTV6Q|@p(-G4t(R`!PqMk%^#ZAU>ko+&UcQkNb=@K*Yc%WzObCIoUvTM3!|U#(x|kx zytS_Nb!%&DPwU&(k=A#tv#e>>d3c$$%(}{&Y29l*W4(bFOV6#vY_YcLHjAyLt&^>% zZ3cE>rY+l6)&9CY(f+=Djs3L!iQVexgBM3@u<^ce1RXy(BAk_-9h`%mi<}#=^Updj z`karP1g$K^sBI#XZ5%AMGY~A%7*HOx`xJBKRecLxM7ZA zmEjA+F2iBNMFYD+RWQ~vHZ;yQeq>x?yk*QYJ~r~EBBtV4p<1R3!2&(*o0{ zrZ4fr>y{}GHxu4m#9Z7QYp!LsnBC?s=Dy~k<}v08K65ITROzZmX@BD{+1Dzv6fkuH5O{wY55il^`qs688(3-MVE*4Hq#y{v<*?^>r= zKejHmW?8pd&s(op?^++?ErQy%=C%&DiJ0nHHot9$ZIA6++xNJ~H^w#Z4f_Je=Z-8= zWoC43UlC`tQ|&D69PgZg30~n0;H`jt&LhqraKXRleC!N!sa)kptN=>%Q*3<6~=eTvvdd^tcs58EfN2=k*DOig2xF(%6-Y`Bh z7Q;fAOmCR_V6V?Jt;TcQVbhPM`=&5+jJclKY4(_X1I+K3XXA10ORT^e>lfBa?l^Z1 zcO7>Fww2Na1^d6w8|n|6lC2(FXInR0FFe#;x3#l-aq(Dg-;DQIZrESiOFQa2nmW2W zypH*f4URpIbB=qCaA!r_@LM>0J4fR!mSxVfuFI^?3_(<=z1Te0 zEP}PYb)a>)b+k3bI>R~#*RiA4lh(7=2i5{>ZM^NHw^?m&tZi$oZh~!~Z6sEBCho0% z+=bWKw&0m_pY5#eN82^qL)$Z(!X9CdwwJ`?LODl0M>9uj$1cZVy!&(0;Y4Cd&Uc-@ zEax{)rK^OiJ=S#&)-%>!*KKh-@D%czySICU`yKasyy2q=;H1Lsv7Dx|rjw?R=6&2I z*J`$D_GlVut=f2PJ8fs}K-X!A=uhGrcpGm96ySXvwV^!jVzmqn3thq0(PDHNdm9HB-!_gkCSwDAU?g}d%Ql|J zB{R}g&QuwXf?Ax*Elk}_eN97f;hbjjn^xdvmTd}}z9Yrw;BCE{=K5y6*=lZXZf)*> zQ~NFR6!Tp3$Jkh_%^S_zap}B{H~R9;FU=9SbXLS0Rtb2!Z-8a6c)Tq8!TCtEx3>#wtR0nZ@FU0#nWTH<)uYsEoZHa7X%Hh9j)DP=6kIZaMwF!eQbT@ zvxeCOTP0gHo5|+H=ICfkv?bYw+oss&;~m0vwg4^x`|$cF$ChjR*~Z&T*elxW+BJ5U zy}7-UeSm$4{aw4yo@SqKUtwQor}iE8Blc7F%l6y$r*?&-7`9I>Je%6F$32c7jwHtj z$0Wxz$2`Xp$9mi}cRGCg9p5?5J8n7h9M2uRvy`)f)97?KTRA<>KF+tCL!CZnx|29p zIX`o5cJ9O@;1A9#&Rpknr{F4ui%V^n!DV-~5-%=8U87wou9>d+uEnmkt}k8NTzgzW z*AKYb|Ll713U`-umv`54H+0*uK|8p+x!-gTb&vDmjY<3!S=8?d)t!`|9qzGl8{E@o+HG2kZA)Y8h5 zfwzly`z%K+r!6^nG`er8X02^)YE7^v|9>@{dvsOB8O5(DB6$#5Nk9m+gong{z|1*k z&N*{t<_wPj0ZFYkWKksLjfhw=4Iz?*1H>f{AqgOX0%C|rQGp5y6$p?bFD1NEPfAS~y&Nq91zr80byqJH;KjxqCN?yf@=XnFYEU`+Q5D&{CG9RGR z218P6yefqAA4L6|?DzFejA5KV*XT!VS)Kxgs8hCcC{zl)_O}e?o%g&(p z#>qyIpbd$IcPEl0(u)vc5s##jr^zT1z`IwH3SdtoxeJu1-RTWQTyXSJ^cHZ4xTR3?TkcM`%01$qbQ|0l-kztUtb7zC+RHm28WGRpWfwV2W+U3KkQMR+ zSp!%8R>rCBs*idWtN1N&XPxSTf#gC9d;HJ+8~*y1BmY}es2V@wan|W1gIoxo?7e^_ zAaL1K)5UZxs`kCKiXNuNX*Gy)A`)aF62%9`A>*RaY=q2KW*a1kcBX^uFdJud(@e5l z+~fhc%W1IByH+etB?W}@EUxTq!2VKJ%HCva0Fvbh^_4iCdYn#_-Okpi2NIp2hjYoH zh+Qq;^#t!3-c%W0EE4od(Nzw>GK^J+RWx1~hWc5EWc@VL^*Z!jRA>_}P$X`TLteyM z*-ZA6CQ?jSq3(SFAAB{EdcAQA())!u91NUjb+f*-IwI(eXKz3|M_|+O_P)SAWaq$c z*WpFwI*hg%HXH9Iy2)<8uuPtIGclg&?re9iyA&q7-96-<2Bp@yjo{SQye&`U-FQFF zpq!C>49qo`7xE=w*A0ljA3;B-`4{{j{07E&pGSLfURR9Lf}%3LN!~0kSm3Qj6|u)V z>Rp1x{@~sBqOo_oieADJ!^N+}Z^bl`D+=*2vqF?3b?g$A;&X9U)B+#A7m>09_OmBP z$Y=(hepNlwV&xvf~C%ZqD%0kv&r9%XPuM&ZRD4G*!BkU%UA$(j?U8s zdY*nw@6~_N=k#TL4Lbi`-wi808h`f`|41uhlfiJ&u_TAQO1>ubkaPn+2D{e zP{?_4TQp&5JS?NJ9(K!0c}!O0eos>i)FQPKA9I7U{9pPRVVjxmN9rCx4oh?3VyIm- zUM%q^cu5NA-6NU|A@Q^?$la%d>2Mkcj4)6Q4MJ#+MEp&G6>~^_U107q_W=z~m}kwt z)-WsG8f|4+ldOYKd98KBx@|RC>0$HDV}+~;_qWAnBhfx3*e`?7OYF7w+fa1KNpzC1 z$_e^8C*RA!|PNb--SdURGiCJtUo5=FOT$|WltiW$rGiz`6 zu~Y3V`}dg3+x9N|sC^~uv=4yoQTW{boHWGJTxXfH$=T=BI1PZR$Ds2e?$`ivX$j>0 z3B=vth9GJS4Z%eIDlg?5u?UZWrZ4hZUdJOK;Kw}%pnu*g^oqdGA0s23^3Hh;P;Row zL_3f#mW$P5huA9)i!uRd;2pK`ITFK3Yu)OLd-FhA6ucO5Lq0RTWI}IMUV`bxt*?MpVk3a0LbdgeLpb zq1t@^5}JnAxD4@V8i;->j5~9n(iM7p%Q_ek9XgC3?MWAsOsoK}up?18%pfx%&^%I3 zH)E&n!yX-qlBvwtVnms}u_QfnEDECYW(*8J6P-_hrPu&6j$rLsZxqvo>@2&$YFQmK zAdGTQNR!ikI^kuY=dwO9BuN z!gYSdn~N#GhqCxnIP`a3lXuUH7adVPSi-|Y^JqA9HX>bx*dq3cODH0K5D!GM>?cjk zTFa3#3#G(D)Dn%dt9l+*`z}~^2g34xjPQi2Q5W!{5Y*$_-BI^dYd_BK46yCx6QBF3 zC@e<#Q!vq)Sm#UqmHv9a0&u&-Kjn8u-XvItsd~7cj=Y6oj{j+uMok#0BlNt6^C^f|$uf$Ar~uPwX-4vpLkS@b1(k+Pq{JaFZ~xwycR|P delta 36146 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 diff --git a/psx/octoshock/psx/psx.cpp b/psx/octoshock/psx/psx.cpp index 3b35deed4f..c5e6c1d69e 100644 --- a/psx/octoshock/psx/psx.cpp +++ b/psx/octoshock/psx/psx.cpp @@ -1262,6 +1262,7 @@ EW_EXPORT s32 shock_PowerOn(void* psx) { if(s_ShockState.power) return SHOCK_NOCANDO; + s_ShockState.power = true; PSX_Power(true); return SHOCK_OK; @@ -1844,9 +1845,16 @@ EW_EXPORT s32 shock_SetDisc(void* psx, ShockDiscRef* disc) //TODO - non-psx disc is legal here. should pass null ID to CDC setdisc //analyze disc so we dont have to annoyingly manage it from client + + //TODO - so junky ShockDiscInfo info; - s32 ret = shock_AnalyzeDisc(disc,&info); - if(ret != SHOCK_OK) return ret; + strcpy(info.id,"\0\0\0\0"); + info.region = REGION_NONE; + if(disc != NULL) + { + s32 ret = shock_AnalyzeDisc(disc,&info); + if(ret != SHOCK_OK) return ret; + } //heres a comment from some old savestating code. something to keep in mind (maybe or maybe not a surprise depending on your point of view) //"Call SetDisc() BEFORE we load CDC state, since SetDisc() has emulation side effects. We might want to clean this up in the future."