diff --git a/BizHawk.MultiClient/BizHawk.MultiClient.csproj b/BizHawk.MultiClient/BizHawk.MultiClient.csproj index f5611b3816..cbb9b03b84 100644 --- a/BizHawk.MultiClient/BizHawk.MultiClient.csproj +++ b/BizHawk.MultiClient/BizHawk.MultiClient.csproj @@ -387,6 +387,12 @@ + + Form + + + SNESGameGenie.cs + Form @@ -566,6 +572,10 @@ SMSGraphicsConfig.cs + + SNESGameGenie.cs + Designer + SNESGraphicsDebugger.cs diff --git a/BizHawk.MultiClient/Config.cs b/BizHawk.MultiClient/Config.cs index 1a33cd3cbe..770f58b868 100644 --- a/BizHawk.MultiClient/Config.cs +++ b/BizHawk.MultiClient/Config.cs @@ -574,6 +574,12 @@ namespace BizHawk.MultiClient public int NESGGWndx = -1; public int NESGGWndy = -1; + // SNES Game Genie Encoder/Decoder + public bool SNESGGAutoload = false; + public bool SNESGGSaveWindowPosition = true; + public int SNESGGWndx = -1; + public int SNESGGWndy = -1; + //Movie Settings public RecentFiles RecentMovies = new RecentFiles(8); public bool AutoLoadMostRecentMovie = false; diff --git a/BizHawk.MultiClient/MainForm.Designer.cs b/BizHawk.MultiClient/MainForm.Designer.cs index b5c4128913..df0a6f262b 100644 --- a/BizHawk.MultiClient/MainForm.Designer.cs +++ b/BizHawk.MultiClient/MainForm.Designer.cs @@ -1,22 +1,22 @@ namespace BizHawk.MultiClient { - partial class MainForm - { - /// - /// Required designer variable. - /// - private System.ComponentModel.IContainer components = null; + partial class MainForm + { + /// + /// Required designer variable. + /// + private System.ComponentModel.IContainer components = null; - #region Windows Form Designer generated code + #region Windows Form Designer generated code - /// - /// Required method for Designer support - do not modify - /// the contents of this method with the code editor. - /// - private void InitializeComponent() - { + /// + /// Required method for Designer support - do not modify + /// the contents of this method with the code editor. + /// + private void InitializeComponent() + { this.components = new System.ComponentModel.Container(); this.menuStrip1 = new MenuStripEx(); this.fileToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); @@ -275,6 +275,7 @@ this.toolStripSeparator18 = new System.Windows.Forms.ToolStripSeparator(); this.graphicsDebuggerToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.loadGBInSGBToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.SNESgameGenieCodesToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.miSnesOptions = new System.Windows.Forms.ToolStripMenuItem(); this.colecoToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.skipBIOSIntroToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); @@ -334,25 +335,25 @@ // this.menuStrip1.ClickThrough = true; this.menuStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { - this.fileToolStripMenuItem, - this.emulationToolStripMenuItem, - this.viewToolStripMenuItem, - this.configToolStripMenuItem, - this.toolsToolStripMenuItem, - this.NESToolStripMenuItem, - this.pCEToolStripMenuItem, - this.sMSToolStripMenuItem, - this.tI83ToolStripMenuItem, - this.atariToolStripMenuItem, - this.gBToolStripMenuItem, - this.gBAToolStripMenuItem, - this.sNESToolStripMenuItem, - this.colecoToolStripMenuItem, - this.helpToolStripMenuItem}); + this.fileToolStripMenuItem, + this.emulationToolStripMenuItem, + this.viewToolStripMenuItem, + this.configToolStripMenuItem, + this.toolsToolStripMenuItem, + this.NESToolStripMenuItem, + this.pCEToolStripMenuItem, + this.sMSToolStripMenuItem, + this.tI83ToolStripMenuItem, + this.atariToolStripMenuItem, + this.gBToolStripMenuItem, + this.gBAToolStripMenuItem, + this.sNESToolStripMenuItem, + this.colecoToolStripMenuItem, + this.helpToolStripMenuItem}); this.menuStrip1.LayoutStyle = System.Windows.Forms.ToolStripLayoutStyle.Flow; this.menuStrip1.Location = new System.Drawing.Point(0, 0); this.menuStrip1.Name = "menuStrip1"; - this.menuStrip1.Size = new System.Drawing.Size(470, 42); + this.menuStrip1.Size = new System.Drawing.Size(470, 52); this.menuStrip1.TabIndex = 0; this.menuStrip1.Text = "menuStrip1"; this.menuStrip1.MenuActivate += new System.EventHandler(this.menuStrip1_MenuActivate); @@ -361,21 +362,21 @@ // fileToolStripMenuItem // this.fileToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { - this.openROMToolStripMenuItem, - this.recentROMToolStripMenuItem, - this.closeROMToolStripMenuItem, - this.toolStripMenuItem1, - this.saveStateToolStripMenuItem, - this.loadStateToolStripMenuItem, - this.saveSlotToolStripMenuItem, - this.toolStripMenuItem2, - this.movieToolStripMenuItem, - this.AVIWAVToolStripMenuItem, - this.screenshotToolStripMenuItem, - this.toolStripSeparator4, - this.exitToolStripMenuItem}); + this.openROMToolStripMenuItem, + this.recentROMToolStripMenuItem, + this.closeROMToolStripMenuItem, + this.toolStripMenuItem1, + this.saveStateToolStripMenuItem, + this.loadStateToolStripMenuItem, + this.saveSlotToolStripMenuItem, + this.toolStripMenuItem2, + this.movieToolStripMenuItem, + this.AVIWAVToolStripMenuItem, + this.screenshotToolStripMenuItem, + this.toolStripSeparator4, + this.exitToolStripMenuItem}); this.fileToolStripMenuItem.Name = "fileToolStripMenuItem"; - this.fileToolStripMenuItem.Size = new System.Drawing.Size(37, 19); + this.fileToolStripMenuItem.Size = new System.Drawing.Size(44, 24); this.fileToolStripMenuItem.Text = "&File"; this.fileToolStripMenuItem.DropDownOpened += new System.EventHandler(this.fileToolStripMenuItem_DropDownOpened); // @@ -383,45 +384,45 @@ // this.openROMToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.OpenFile; this.openROMToolStripMenuItem.Name = "openROMToolStripMenuItem"; - this.openROMToolStripMenuItem.Size = new System.Drawing.Size(152, 22); + this.openROMToolStripMenuItem.Size = new System.Drawing.Size(160, 24); this.openROMToolStripMenuItem.Text = "Open ROM"; this.openROMToolStripMenuItem.Click += new System.EventHandler(this.openROMToolStripMenuItem_Click); // // recentROMToolStripMenuItem // this.recentROMToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { - this.noneToolStripMenuItem, - this.toolStripSeparator3, - this.clearToolStripMenuItem, - this.autoloadMostRecentToolStripMenuItem}); + this.noneToolStripMenuItem, + this.toolStripSeparator3, + this.clearToolStripMenuItem, + this.autoloadMostRecentToolStripMenuItem}); this.recentROMToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.Recent; this.recentROMToolStripMenuItem.Name = "recentROMToolStripMenuItem"; - this.recentROMToolStripMenuItem.Size = new System.Drawing.Size(152, 22); + this.recentROMToolStripMenuItem.Size = new System.Drawing.Size(160, 24); this.recentROMToolStripMenuItem.Text = "Recent ROM"; this.recentROMToolStripMenuItem.DropDownOpened += new System.EventHandler(this.recentROMToolStripMenuItem_DropDownOpened); // // noneToolStripMenuItem // this.noneToolStripMenuItem.Name = "noneToolStripMenuItem"; - this.noneToolStripMenuItem.Size = new System.Drawing.Size(192, 22); + this.noneToolStripMenuItem.Size = new System.Drawing.Size(226, 24); this.noneToolStripMenuItem.Text = "None"; // // toolStripSeparator3 // this.toolStripSeparator3.Name = "toolStripSeparator3"; - this.toolStripSeparator3.Size = new System.Drawing.Size(189, 6); + this.toolStripSeparator3.Size = new System.Drawing.Size(223, 6); // // clearToolStripMenuItem // this.clearToolStripMenuItem.Name = "clearToolStripMenuItem"; - this.clearToolStripMenuItem.Size = new System.Drawing.Size(192, 22); + this.clearToolStripMenuItem.Size = new System.Drawing.Size(226, 24); this.clearToolStripMenuItem.Text = "&Clear"; this.clearToolStripMenuItem.Click += new System.EventHandler(this.clearToolStripMenuItem_Click); // // autoloadMostRecentToolStripMenuItem // this.autoloadMostRecentToolStripMenuItem.Name = "autoloadMostRecentToolStripMenuItem"; - this.autoloadMostRecentToolStripMenuItem.Size = new System.Drawing.Size(192, 22); + this.autoloadMostRecentToolStripMenuItem.Size = new System.Drawing.Size(226, 24); this.autoloadMostRecentToolStripMenuItem.Text = "&Autoload Most Recent"; this.autoloadMostRecentToolStripMenuItem.Click += new System.EventHandler(this.autoloadMostRecentToolStripMenuItem_Click); // @@ -429,323 +430,323 @@ // this.closeROMToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.Close; this.closeROMToolStripMenuItem.Name = "closeROMToolStripMenuItem"; - this.closeROMToolStripMenuItem.Size = new System.Drawing.Size(152, 22); + this.closeROMToolStripMenuItem.Size = new System.Drawing.Size(160, 24); this.closeROMToolStripMenuItem.Text = "&Close ROM"; this.closeROMToolStripMenuItem.Click += new System.EventHandler(this.closeROMToolStripMenuItem_Click); // // toolStripMenuItem1 // this.toolStripMenuItem1.Name = "toolStripMenuItem1"; - this.toolStripMenuItem1.Size = new System.Drawing.Size(149, 6); + this.toolStripMenuItem1.Size = new System.Drawing.Size(157, 6); // // saveStateToolStripMenuItem // this.saveStateToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { - this.savestate1toolStripMenuItem, - this.savestate2toolStripMenuItem, - this.savestate3toolStripMenuItem, - this.savestate4toolStripMenuItem, - this.savestate5toolStripMenuItem, - this.savestate6toolStripMenuItem, - this.savestate7toolStripMenuItem, - this.savestate8toolStripMenuItem, - this.savestate9toolStripMenuItem, - this.savestate0toolStripMenuItem, - this.toolStripSeparator6, - this.saveNamedStateToolStripMenuItem}); + this.savestate1toolStripMenuItem, + this.savestate2toolStripMenuItem, + this.savestate3toolStripMenuItem, + this.savestate4toolStripMenuItem, + this.savestate5toolStripMenuItem, + this.savestate6toolStripMenuItem, + this.savestate7toolStripMenuItem, + this.savestate8toolStripMenuItem, + this.savestate9toolStripMenuItem, + this.savestate0toolStripMenuItem, + this.toolStripSeparator6, + this.saveNamedStateToolStripMenuItem}); this.saveStateToolStripMenuItem.Name = "saveStateToolStripMenuItem"; - this.saveStateToolStripMenuItem.Size = new System.Drawing.Size(152, 22); + this.saveStateToolStripMenuItem.Size = new System.Drawing.Size(160, 24); this.saveStateToolStripMenuItem.Text = "Save State"; this.saveStateToolStripMenuItem.DropDownOpened += new System.EventHandler(this.saveStateToolStripMenuItem_DropDownOpened); // // savestate1toolStripMenuItem // this.savestate1toolStripMenuItem.Name = "savestate1toolStripMenuItem"; - this.savestate1toolStripMenuItem.Size = new System.Drawing.Size(178, 22); + this.savestate1toolStripMenuItem.Size = new System.Drawing.Size(209, 24); this.savestate1toolStripMenuItem.Text = "1"; this.savestate1toolStripMenuItem.Click += new System.EventHandler(this.savestate1toolStripMenuItem_Click); // // savestate2toolStripMenuItem // this.savestate2toolStripMenuItem.Name = "savestate2toolStripMenuItem"; - this.savestate2toolStripMenuItem.Size = new System.Drawing.Size(178, 22); + this.savestate2toolStripMenuItem.Size = new System.Drawing.Size(209, 24); this.savestate2toolStripMenuItem.Text = "2"; this.savestate2toolStripMenuItem.Click += new System.EventHandler(this.savestate2toolStripMenuItem_Click); // // savestate3toolStripMenuItem // this.savestate3toolStripMenuItem.Name = "savestate3toolStripMenuItem"; - this.savestate3toolStripMenuItem.Size = new System.Drawing.Size(178, 22); + this.savestate3toolStripMenuItem.Size = new System.Drawing.Size(209, 24); this.savestate3toolStripMenuItem.Text = "3"; this.savestate3toolStripMenuItem.Click += new System.EventHandler(this.savestate3toolStripMenuItem_Click); // // savestate4toolStripMenuItem // this.savestate4toolStripMenuItem.Name = "savestate4toolStripMenuItem"; - this.savestate4toolStripMenuItem.Size = new System.Drawing.Size(178, 22); + this.savestate4toolStripMenuItem.Size = new System.Drawing.Size(209, 24); this.savestate4toolStripMenuItem.Text = "4"; this.savestate4toolStripMenuItem.Click += new System.EventHandler(this.savestate4toolStripMenuItem_Click); // // savestate5toolStripMenuItem // this.savestate5toolStripMenuItem.Name = "savestate5toolStripMenuItem"; - this.savestate5toolStripMenuItem.Size = new System.Drawing.Size(178, 22); + this.savestate5toolStripMenuItem.Size = new System.Drawing.Size(209, 24); this.savestate5toolStripMenuItem.Text = "5"; this.savestate5toolStripMenuItem.Click += new System.EventHandler(this.savestate5toolStripMenuItem_Click); // // savestate6toolStripMenuItem // this.savestate6toolStripMenuItem.Name = "savestate6toolStripMenuItem"; - this.savestate6toolStripMenuItem.Size = new System.Drawing.Size(178, 22); + this.savestate6toolStripMenuItem.Size = new System.Drawing.Size(209, 24); this.savestate6toolStripMenuItem.Text = "6"; this.savestate6toolStripMenuItem.Click += new System.EventHandler(this.savestate6toolStripMenuItem_Click); // // savestate7toolStripMenuItem // this.savestate7toolStripMenuItem.Name = "savestate7toolStripMenuItem"; - this.savestate7toolStripMenuItem.Size = new System.Drawing.Size(178, 22); + this.savestate7toolStripMenuItem.Size = new System.Drawing.Size(209, 24); this.savestate7toolStripMenuItem.Text = "7"; this.savestate7toolStripMenuItem.Click += new System.EventHandler(this.savestate7toolStripMenuItem_Click); // // savestate8toolStripMenuItem // this.savestate8toolStripMenuItem.Name = "savestate8toolStripMenuItem"; - this.savestate8toolStripMenuItem.Size = new System.Drawing.Size(178, 22); + this.savestate8toolStripMenuItem.Size = new System.Drawing.Size(209, 24); this.savestate8toolStripMenuItem.Text = "8"; this.savestate8toolStripMenuItem.Click += new System.EventHandler(this.savestate8toolStripMenuItem_Click); // // savestate9toolStripMenuItem // this.savestate9toolStripMenuItem.Name = "savestate9toolStripMenuItem"; - this.savestate9toolStripMenuItem.Size = new System.Drawing.Size(178, 22); + this.savestate9toolStripMenuItem.Size = new System.Drawing.Size(209, 24); this.savestate9toolStripMenuItem.Text = "9"; this.savestate9toolStripMenuItem.Click += new System.EventHandler(this.savestate9toolStripMenuItem_Click); // // savestate0toolStripMenuItem // this.savestate0toolStripMenuItem.Name = "savestate0toolStripMenuItem"; - this.savestate0toolStripMenuItem.Size = new System.Drawing.Size(178, 22); + this.savestate0toolStripMenuItem.Size = new System.Drawing.Size(209, 24); this.savestate0toolStripMenuItem.Text = "0"; this.savestate0toolStripMenuItem.Click += new System.EventHandler(this.savestate0toolStripMenuItem_Click); // // toolStripSeparator6 // this.toolStripSeparator6.Name = "toolStripSeparator6"; - this.toolStripSeparator6.Size = new System.Drawing.Size(175, 6); + this.toolStripSeparator6.Size = new System.Drawing.Size(206, 6); // // saveNamedStateToolStripMenuItem // this.saveNamedStateToolStripMenuItem.Name = "saveNamedStateToolStripMenuItem"; - this.saveNamedStateToolStripMenuItem.Size = new System.Drawing.Size(178, 22); + this.saveNamedStateToolStripMenuItem.Size = new System.Drawing.Size(209, 24); this.saveNamedStateToolStripMenuItem.Text = "Save Named State..."; this.saveNamedStateToolStripMenuItem.Click += new System.EventHandler(this.saveNamedStateToolStripMenuItem_Click); // // loadStateToolStripMenuItem // this.loadStateToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { - this.loadstate1toolStripMenuItem, - this.loadstate2toolStripMenuItem, - this.loadstate3toolStripMenuItem, - this.loadstate4toolStripMenuItem, - this.loadstate5toolStripMenuItem, - this.loadstate6toolStripMenuItem, - this.loadstate7toolStripMenuItem, - this.loadstate8toolStripMenuItem, - this.loadstate9toolStripMenuItem, - this.loadstate0toolStripMenuItem, - this.toolStripSeparator7, - this.loadNamedStateToolStripMenuItem, - this.toolStripSeparator21, - this.autoLoadLastSlotToolStripMenuItem}); + this.loadstate1toolStripMenuItem, + this.loadstate2toolStripMenuItem, + this.loadstate3toolStripMenuItem, + this.loadstate4toolStripMenuItem, + this.loadstate5toolStripMenuItem, + this.loadstate6toolStripMenuItem, + this.loadstate7toolStripMenuItem, + this.loadstate8toolStripMenuItem, + this.loadstate9toolStripMenuItem, + this.loadstate0toolStripMenuItem, + this.toolStripSeparator7, + this.loadNamedStateToolStripMenuItem, + this.toolStripSeparator21, + this.autoLoadLastSlotToolStripMenuItem}); this.loadStateToolStripMenuItem.Name = "loadStateToolStripMenuItem"; - this.loadStateToolStripMenuItem.Size = new System.Drawing.Size(152, 22); + this.loadStateToolStripMenuItem.Size = new System.Drawing.Size(160, 24); this.loadStateToolStripMenuItem.Text = "Load State"; this.loadStateToolStripMenuItem.DropDownOpened += new System.EventHandler(this.loadStateToolStripMenuItem_DropDownOpened); // // loadstate1toolStripMenuItem // this.loadstate1toolStripMenuItem.Name = "loadstate1toolStripMenuItem"; - this.loadstate1toolStripMenuItem.Size = new System.Drawing.Size(180, 22); + this.loadstate1toolStripMenuItem.Size = new System.Drawing.Size(211, 24); this.loadstate1toolStripMenuItem.Text = "1"; this.loadstate1toolStripMenuItem.Click += new System.EventHandler(this.loadstate1toolStripMenuItem_Click); // // loadstate2toolStripMenuItem // this.loadstate2toolStripMenuItem.Name = "loadstate2toolStripMenuItem"; - this.loadstate2toolStripMenuItem.Size = new System.Drawing.Size(180, 22); + this.loadstate2toolStripMenuItem.Size = new System.Drawing.Size(211, 24); this.loadstate2toolStripMenuItem.Text = "2"; this.loadstate2toolStripMenuItem.Click += new System.EventHandler(this.loadstate2toolStripMenuItem_Click); // // loadstate3toolStripMenuItem // this.loadstate3toolStripMenuItem.Name = "loadstate3toolStripMenuItem"; - this.loadstate3toolStripMenuItem.Size = new System.Drawing.Size(180, 22); + this.loadstate3toolStripMenuItem.Size = new System.Drawing.Size(211, 24); this.loadstate3toolStripMenuItem.Text = "3"; this.loadstate3toolStripMenuItem.Click += new System.EventHandler(this.loadstate3toolStripMenuItem_Click); // // loadstate4toolStripMenuItem // this.loadstate4toolStripMenuItem.Name = "loadstate4toolStripMenuItem"; - this.loadstate4toolStripMenuItem.Size = new System.Drawing.Size(180, 22); + this.loadstate4toolStripMenuItem.Size = new System.Drawing.Size(211, 24); this.loadstate4toolStripMenuItem.Text = "4"; this.loadstate4toolStripMenuItem.Click += new System.EventHandler(this.loadstate4toolStripMenuItem_Click); // // loadstate5toolStripMenuItem // this.loadstate5toolStripMenuItem.Name = "loadstate5toolStripMenuItem"; - this.loadstate5toolStripMenuItem.Size = new System.Drawing.Size(180, 22); + this.loadstate5toolStripMenuItem.Size = new System.Drawing.Size(211, 24); this.loadstate5toolStripMenuItem.Text = "5"; this.loadstate5toolStripMenuItem.Click += new System.EventHandler(this.loadstate5toolStripMenuItem_Click); // // loadstate6toolStripMenuItem // this.loadstate6toolStripMenuItem.Name = "loadstate6toolStripMenuItem"; - this.loadstate6toolStripMenuItem.Size = new System.Drawing.Size(180, 22); + this.loadstate6toolStripMenuItem.Size = new System.Drawing.Size(211, 24); this.loadstate6toolStripMenuItem.Text = "6"; this.loadstate6toolStripMenuItem.Click += new System.EventHandler(this.loadstate6toolStripMenuItem_Click); // // loadstate7toolStripMenuItem // this.loadstate7toolStripMenuItem.Name = "loadstate7toolStripMenuItem"; - this.loadstate7toolStripMenuItem.Size = new System.Drawing.Size(180, 22); + this.loadstate7toolStripMenuItem.Size = new System.Drawing.Size(211, 24); this.loadstate7toolStripMenuItem.Text = "7"; this.loadstate7toolStripMenuItem.Click += new System.EventHandler(this.loadstate7toolStripMenuItem_Click); // // loadstate8toolStripMenuItem // this.loadstate8toolStripMenuItem.Name = "loadstate8toolStripMenuItem"; - this.loadstate8toolStripMenuItem.Size = new System.Drawing.Size(180, 22); + this.loadstate8toolStripMenuItem.Size = new System.Drawing.Size(211, 24); this.loadstate8toolStripMenuItem.Text = "8"; this.loadstate8toolStripMenuItem.Click += new System.EventHandler(this.loadstate8toolStripMenuItem_Click); // // loadstate9toolStripMenuItem // this.loadstate9toolStripMenuItem.Name = "loadstate9toolStripMenuItem"; - this.loadstate9toolStripMenuItem.Size = new System.Drawing.Size(180, 22); + this.loadstate9toolStripMenuItem.Size = new System.Drawing.Size(211, 24); this.loadstate9toolStripMenuItem.Text = "9"; this.loadstate9toolStripMenuItem.Click += new System.EventHandler(this.loadstate9toolStripMenuItem_Click); // // loadstate0toolStripMenuItem // this.loadstate0toolStripMenuItem.Name = "loadstate0toolStripMenuItem"; - this.loadstate0toolStripMenuItem.Size = new System.Drawing.Size(180, 22); + this.loadstate0toolStripMenuItem.Size = new System.Drawing.Size(211, 24); this.loadstate0toolStripMenuItem.Text = "0"; this.loadstate0toolStripMenuItem.Click += new System.EventHandler(this.loadstate0toolStripMenuItem_Click); // // toolStripSeparator7 // this.toolStripSeparator7.Name = "toolStripSeparator7"; - this.toolStripSeparator7.Size = new System.Drawing.Size(177, 6); + this.toolStripSeparator7.Size = new System.Drawing.Size(208, 6); // // loadNamedStateToolStripMenuItem // this.loadNamedStateToolStripMenuItem.Name = "loadNamedStateToolStripMenuItem"; - this.loadNamedStateToolStripMenuItem.Size = new System.Drawing.Size(180, 22); + this.loadNamedStateToolStripMenuItem.Size = new System.Drawing.Size(211, 24); this.loadNamedStateToolStripMenuItem.Text = "Load Named State..."; this.loadNamedStateToolStripMenuItem.Click += new System.EventHandler(this.loadNamedStateToolStripMenuItem_Click); // // toolStripSeparator21 // this.toolStripSeparator21.Name = "toolStripSeparator21"; - this.toolStripSeparator21.Size = new System.Drawing.Size(177, 6); + this.toolStripSeparator21.Size = new System.Drawing.Size(208, 6); // // autoLoadLastSlotToolStripMenuItem // this.autoLoadLastSlotToolStripMenuItem.Name = "autoLoadLastSlotToolStripMenuItem"; - this.autoLoadLastSlotToolStripMenuItem.Size = new System.Drawing.Size(180, 22); + this.autoLoadLastSlotToolStripMenuItem.Size = new System.Drawing.Size(211, 24); this.autoLoadLastSlotToolStripMenuItem.Text = "AutoLoad last Slot"; this.autoLoadLastSlotToolStripMenuItem.Click += new System.EventHandler(this.autoLoadLastSlotToolStripMenuItem_Click); // // saveSlotToolStripMenuItem // this.saveSlotToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { - this.selectSlot10ToolStripMenuItem, - this.selectSlot1ToolStripMenuItem, - this.selectSlot2ToolStripMenuItem, - this.selectSlot3ToolStripMenuItem, - this.selectSlot4ToolStripMenuItem, - this.selectSlot5ToolStripMenuItem, - this.selectSlot6ToolStripMenuItem, - this.selectSlot7ToolStripMenuItem, - this.selectSlot8ToolStripMenuItem, - this.selectSlot9ToolStripMenuItem, - this.previousSlotToolStripMenuItem, - this.nextSlotToolStripMenuItem, - this.toolStripSeparator5, - this.saveToCurrentSlotToolStripMenuItem, - this.loadCurrentSlotToolStripMenuItem}); + this.selectSlot10ToolStripMenuItem, + this.selectSlot1ToolStripMenuItem, + this.selectSlot2ToolStripMenuItem, + this.selectSlot3ToolStripMenuItem, + this.selectSlot4ToolStripMenuItem, + this.selectSlot5ToolStripMenuItem, + this.selectSlot6ToolStripMenuItem, + this.selectSlot7ToolStripMenuItem, + this.selectSlot8ToolStripMenuItem, + this.selectSlot9ToolStripMenuItem, + this.previousSlotToolStripMenuItem, + this.nextSlotToolStripMenuItem, + this.toolStripSeparator5, + this.saveToCurrentSlotToolStripMenuItem, + this.loadCurrentSlotToolStripMenuItem}); this.saveSlotToolStripMenuItem.Name = "saveSlotToolStripMenuItem"; - this.saveSlotToolStripMenuItem.Size = new System.Drawing.Size(152, 22); + this.saveSlotToolStripMenuItem.Size = new System.Drawing.Size(160, 24); this.saveSlotToolStripMenuItem.Text = "SaveSlot"; this.saveSlotToolStripMenuItem.DropDownOpened += new System.EventHandler(this.saveSlotToolStripMenuItem_DropDownOpened); // // selectSlot10ToolStripMenuItem // this.selectSlot10ToolStripMenuItem.Name = "selectSlot10ToolStripMenuItem"; - this.selectSlot10ToolStripMenuItem.Size = new System.Drawing.Size(178, 22); + this.selectSlot10ToolStripMenuItem.Size = new System.Drawing.Size(209, 24); this.selectSlot10ToolStripMenuItem.Text = "Select Slot 0"; this.selectSlot10ToolStripMenuItem.Click += new System.EventHandler(this.selectSlot10ToolStripMenuItem_Click); // // selectSlot1ToolStripMenuItem // this.selectSlot1ToolStripMenuItem.Name = "selectSlot1ToolStripMenuItem"; - this.selectSlot1ToolStripMenuItem.Size = new System.Drawing.Size(178, 22); + this.selectSlot1ToolStripMenuItem.Size = new System.Drawing.Size(209, 24); this.selectSlot1ToolStripMenuItem.Text = "Select Slot 1"; this.selectSlot1ToolStripMenuItem.Click += new System.EventHandler(this.selectSlot1ToolStripMenuItem_Click); // // selectSlot2ToolStripMenuItem // this.selectSlot2ToolStripMenuItem.Name = "selectSlot2ToolStripMenuItem"; - this.selectSlot2ToolStripMenuItem.Size = new System.Drawing.Size(178, 22); + this.selectSlot2ToolStripMenuItem.Size = new System.Drawing.Size(209, 24); this.selectSlot2ToolStripMenuItem.Text = "Select Slot 2"; this.selectSlot2ToolStripMenuItem.Click += new System.EventHandler(this.selectSlot2ToolStripMenuItem_Click); // // selectSlot3ToolStripMenuItem // this.selectSlot3ToolStripMenuItem.Name = "selectSlot3ToolStripMenuItem"; - this.selectSlot3ToolStripMenuItem.Size = new System.Drawing.Size(178, 22); + this.selectSlot3ToolStripMenuItem.Size = new System.Drawing.Size(209, 24); this.selectSlot3ToolStripMenuItem.Text = "Select Slot 3"; this.selectSlot3ToolStripMenuItem.Click += new System.EventHandler(this.selectSlot3ToolStripMenuItem_Click); // // selectSlot4ToolStripMenuItem // this.selectSlot4ToolStripMenuItem.Name = "selectSlot4ToolStripMenuItem"; - this.selectSlot4ToolStripMenuItem.Size = new System.Drawing.Size(178, 22); + this.selectSlot4ToolStripMenuItem.Size = new System.Drawing.Size(209, 24); this.selectSlot4ToolStripMenuItem.Text = "Select Slot 4"; this.selectSlot4ToolStripMenuItem.Click += new System.EventHandler(this.selectSlot4ToolStripMenuItem_Click); // // selectSlot5ToolStripMenuItem // this.selectSlot5ToolStripMenuItem.Name = "selectSlot5ToolStripMenuItem"; - this.selectSlot5ToolStripMenuItem.Size = new System.Drawing.Size(178, 22); + this.selectSlot5ToolStripMenuItem.Size = new System.Drawing.Size(209, 24); this.selectSlot5ToolStripMenuItem.Text = "Select Slot 5"; this.selectSlot5ToolStripMenuItem.Click += new System.EventHandler(this.selectSlot5ToolStripMenuItem_Click); // // selectSlot6ToolStripMenuItem // this.selectSlot6ToolStripMenuItem.Name = "selectSlot6ToolStripMenuItem"; - this.selectSlot6ToolStripMenuItem.Size = new System.Drawing.Size(178, 22); + this.selectSlot6ToolStripMenuItem.Size = new System.Drawing.Size(209, 24); this.selectSlot6ToolStripMenuItem.Text = "Select Slot 6"; this.selectSlot6ToolStripMenuItem.Click += new System.EventHandler(this.selectSlot6ToolStripMenuItem_Click); // // selectSlot7ToolStripMenuItem // this.selectSlot7ToolStripMenuItem.Name = "selectSlot7ToolStripMenuItem"; - this.selectSlot7ToolStripMenuItem.Size = new System.Drawing.Size(178, 22); + this.selectSlot7ToolStripMenuItem.Size = new System.Drawing.Size(209, 24); this.selectSlot7ToolStripMenuItem.Text = "Select Slot 7"; this.selectSlot7ToolStripMenuItem.Click += new System.EventHandler(this.selectSlot7ToolStripMenuItem_Click); // // selectSlot8ToolStripMenuItem // this.selectSlot8ToolStripMenuItem.Name = "selectSlot8ToolStripMenuItem"; - this.selectSlot8ToolStripMenuItem.Size = new System.Drawing.Size(178, 22); + this.selectSlot8ToolStripMenuItem.Size = new System.Drawing.Size(209, 24); this.selectSlot8ToolStripMenuItem.Text = "Select Slot 8"; this.selectSlot8ToolStripMenuItem.Click += new System.EventHandler(this.selectSlot8ToolStripMenuItem_Click); // // selectSlot9ToolStripMenuItem // this.selectSlot9ToolStripMenuItem.Name = "selectSlot9ToolStripMenuItem"; - this.selectSlot9ToolStripMenuItem.Size = new System.Drawing.Size(178, 22); + this.selectSlot9ToolStripMenuItem.Size = new System.Drawing.Size(209, 24); this.selectSlot9ToolStripMenuItem.Text = "Select Slot 9"; this.selectSlot9ToolStripMenuItem.Click += new System.EventHandler(this.selectSlot9ToolStripMenuItem_Click); // @@ -753,7 +754,7 @@ // this.previousSlotToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.MoveLeft; this.previousSlotToolStripMenuItem.Name = "previousSlotToolStripMenuItem"; - this.previousSlotToolStripMenuItem.Size = new System.Drawing.Size(178, 22); + this.previousSlotToolStripMenuItem.Size = new System.Drawing.Size(209, 24); this.previousSlotToolStripMenuItem.Text = "Previous Slot"; this.previousSlotToolStripMenuItem.Click += new System.EventHandler(this.previousSlotToolStripMenuItem_Click); // @@ -761,53 +762,53 @@ // this.nextSlotToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.MoveRight; this.nextSlotToolStripMenuItem.Name = "nextSlotToolStripMenuItem"; - this.nextSlotToolStripMenuItem.Size = new System.Drawing.Size(178, 22); + this.nextSlotToolStripMenuItem.Size = new System.Drawing.Size(209, 24); this.nextSlotToolStripMenuItem.Text = "Next Slot"; this.nextSlotToolStripMenuItem.Click += new System.EventHandler(this.nextSlotToolStripMenuItem_Click); // // toolStripSeparator5 // this.toolStripSeparator5.Name = "toolStripSeparator5"; - this.toolStripSeparator5.Size = new System.Drawing.Size(175, 6); + this.toolStripSeparator5.Size = new System.Drawing.Size(206, 6); // // saveToCurrentSlotToolStripMenuItem // this.saveToCurrentSlotToolStripMenuItem.Name = "saveToCurrentSlotToolStripMenuItem"; - this.saveToCurrentSlotToolStripMenuItem.Size = new System.Drawing.Size(178, 22); + this.saveToCurrentSlotToolStripMenuItem.Size = new System.Drawing.Size(209, 24); this.saveToCurrentSlotToolStripMenuItem.Text = "Save to Current Slot"; this.saveToCurrentSlotToolStripMenuItem.Click += new System.EventHandler(this.saveToCurrentSlotToolStripMenuItem_Click); // // loadCurrentSlotToolStripMenuItem // this.loadCurrentSlotToolStripMenuItem.Name = "loadCurrentSlotToolStripMenuItem"; - this.loadCurrentSlotToolStripMenuItem.Size = new System.Drawing.Size(178, 22); + this.loadCurrentSlotToolStripMenuItem.Size = new System.Drawing.Size(209, 24); this.loadCurrentSlotToolStripMenuItem.Text = "Load Current Slot"; this.loadCurrentSlotToolStripMenuItem.Click += new System.EventHandler(this.loadCurrentSlotToolStripMenuItem_Click); // // toolStripMenuItem2 // this.toolStripMenuItem2.Name = "toolStripMenuItem2"; - this.toolStripMenuItem2.Size = new System.Drawing.Size(149, 6); + this.toolStripMenuItem2.Size = new System.Drawing.Size(157, 6); // // movieToolStripMenuItem // this.movieToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { - this.readonlyToolStripMenuItem, - this.toolStripSeparator15, - this.recentToolStripMenuItem, - this.recordMovieToolStripMenuItem, - this.playMovieToolStripMenuItem, - this.stopMovieToolStripMenuItem, - this.playFromBeginningToolStripMenuItem, - this.importMovieToolStripMenuItem, - this.saveMovieToolStripMenuItem, - this.stopMovieWithoutSavingToolStripMenuItem, - this.toolStripSeparator14, - this.bindSavestatesToMoviesToolStripMenuItem, - this.automaticallyBackupMoviesToolStripMenuItem, - this.fullMovieLoadstatesToolStripMenuItem}); + this.readonlyToolStripMenuItem, + this.toolStripSeparator15, + this.recentToolStripMenuItem, + this.recordMovieToolStripMenuItem, + this.playMovieToolStripMenuItem, + this.stopMovieToolStripMenuItem, + this.playFromBeginningToolStripMenuItem, + this.importMovieToolStripMenuItem, + this.saveMovieToolStripMenuItem, + this.stopMovieWithoutSavingToolStripMenuItem, + this.toolStripSeparator14, + this.bindSavestatesToMoviesToolStripMenuItem, + this.automaticallyBackupMoviesToolStripMenuItem, + this.fullMovieLoadstatesToolStripMenuItem}); this.movieToolStripMenuItem.Name = "movieToolStripMenuItem"; - this.movieToolStripMenuItem.Size = new System.Drawing.Size(152, 22); + this.movieToolStripMenuItem.Size = new System.Drawing.Size(160, 24); this.movieToolStripMenuItem.Text = "Movie"; this.movieToolStripMenuItem.DropDownOpened += new System.EventHandler(this.movieToolStripMenuItem_DropDownOpened); // @@ -815,56 +816,56 @@ // this.readonlyToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.ReadOnly; this.readonlyToolStripMenuItem.Name = "readonlyToolStripMenuItem"; - this.readonlyToolStripMenuItem.Size = new System.Drawing.Size(231, 22); + this.readonlyToolStripMenuItem.Size = new System.Drawing.Size(273, 24); this.readonlyToolStripMenuItem.Text = "Read-only"; this.readonlyToolStripMenuItem.Click += new System.EventHandler(this.readonlyToolStripMenuItem_Click); // // toolStripSeparator15 // this.toolStripSeparator15.Name = "toolStripSeparator15"; - this.toolStripSeparator15.Size = new System.Drawing.Size(228, 6); + this.toolStripSeparator15.Size = new System.Drawing.Size(270, 6); // // recentToolStripMenuItem // this.recentToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { - this.noneToolStripMenuItem1, - this.toolStripSeparator16, - this.clearToolStripMenuItem1, - this.autoloadMostRecentToolStripMenuItem1}); + this.noneToolStripMenuItem1, + this.toolStripSeparator16, + this.clearToolStripMenuItem1, + this.autoloadMostRecentToolStripMenuItem1}); this.recentToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.Recent; this.recentToolStripMenuItem.Name = "recentToolStripMenuItem"; - this.recentToolStripMenuItem.Size = new System.Drawing.Size(231, 22); + this.recentToolStripMenuItem.Size = new System.Drawing.Size(273, 24); this.recentToolStripMenuItem.Text = "Recent"; this.recentToolStripMenuItem.DropDownOpened += new System.EventHandler(this.recentToolStripMenuItem_DropDownOpened); // // noneToolStripMenuItem1 // this.noneToolStripMenuItem1.Name = "noneToolStripMenuItem1"; - this.noneToolStripMenuItem1.Size = new System.Drawing.Size(192, 22); + this.noneToolStripMenuItem1.Size = new System.Drawing.Size(226, 24); this.noneToolStripMenuItem1.Text = "None"; // // toolStripSeparator16 // this.toolStripSeparator16.Name = "toolStripSeparator16"; - this.toolStripSeparator16.Size = new System.Drawing.Size(189, 6); + this.toolStripSeparator16.Size = new System.Drawing.Size(223, 6); // // clearToolStripMenuItem1 // this.clearToolStripMenuItem1.Name = "clearToolStripMenuItem1"; - this.clearToolStripMenuItem1.Size = new System.Drawing.Size(192, 22); + this.clearToolStripMenuItem1.Size = new System.Drawing.Size(226, 24); this.clearToolStripMenuItem1.Text = "Clear"; // // autoloadMostRecentToolStripMenuItem1 // this.autoloadMostRecentToolStripMenuItem1.Name = "autoloadMostRecentToolStripMenuItem1"; - this.autoloadMostRecentToolStripMenuItem1.Size = new System.Drawing.Size(192, 22); + this.autoloadMostRecentToolStripMenuItem1.Size = new System.Drawing.Size(226, 24); this.autoloadMostRecentToolStripMenuItem1.Text = "&Autoload Most Recent"; // // recordMovieToolStripMenuItem // this.recordMovieToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.RecordHS; this.recordMovieToolStripMenuItem.Name = "recordMovieToolStripMenuItem"; - this.recordMovieToolStripMenuItem.Size = new System.Drawing.Size(231, 22); + this.recordMovieToolStripMenuItem.Size = new System.Drawing.Size(273, 24); this.recordMovieToolStripMenuItem.Text = "&Record Movie..."; this.recordMovieToolStripMenuItem.Click += new System.EventHandler(this.recordMovieToolStripMenuItem_Click); // @@ -872,7 +873,7 @@ // this.playMovieToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.Play; this.playMovieToolStripMenuItem.Name = "playMovieToolStripMenuItem"; - this.playMovieToolStripMenuItem.Size = new System.Drawing.Size(231, 22); + this.playMovieToolStripMenuItem.Size = new System.Drawing.Size(273, 24); this.playMovieToolStripMenuItem.Text = "&Play Movie..."; this.playMovieToolStripMenuItem.Click += new System.EventHandler(this.playMovieToolStripMenuItem_Click); // @@ -880,7 +881,7 @@ // this.stopMovieToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.Stop; this.stopMovieToolStripMenuItem.Name = "stopMovieToolStripMenuItem"; - this.stopMovieToolStripMenuItem.Size = new System.Drawing.Size(231, 22); + this.stopMovieToolStripMenuItem.Size = new System.Drawing.Size(273, 24); this.stopMovieToolStripMenuItem.Text = "Stop Movie"; this.stopMovieToolStripMenuItem.Click += new System.EventHandler(this.stopMovieToolStripMenuItem_Click); // @@ -888,7 +889,7 @@ // this.playFromBeginningToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.restart; this.playFromBeginningToolStripMenuItem.Name = "playFromBeginningToolStripMenuItem"; - this.playFromBeginningToolStripMenuItem.Size = new System.Drawing.Size(231, 22); + this.playFromBeginningToolStripMenuItem.Size = new System.Drawing.Size(273, 24); this.playFromBeginningToolStripMenuItem.Text = "Play from Beginning"; this.playFromBeginningToolStripMenuItem.Click += new System.EventHandler(this.playFromBeginningToolStripMenuItem_Click); // @@ -896,7 +897,7 @@ // this.importMovieToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.Import; this.importMovieToolStripMenuItem.Name = "importMovieToolStripMenuItem"; - this.importMovieToolStripMenuItem.Size = new System.Drawing.Size(231, 22); + this.importMovieToolStripMenuItem.Size = new System.Drawing.Size(273, 24); this.importMovieToolStripMenuItem.Text = "Import Movies..."; this.importMovieToolStripMenuItem.Click += new System.EventHandler(this.importMovieToolStripMenuItem_Click); // @@ -904,7 +905,7 @@ // this.saveMovieToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.SaveAs; this.saveMovieToolStripMenuItem.Name = "saveMovieToolStripMenuItem"; - this.saveMovieToolStripMenuItem.Size = new System.Drawing.Size(231, 22); + this.saveMovieToolStripMenuItem.Size = new System.Drawing.Size(273, 24); this.saveMovieToolStripMenuItem.Text = "&Save Movie"; this.saveMovieToolStripMenuItem.Click += new System.EventHandler(this.saveMovieToolStripMenuItem_Click); // @@ -912,45 +913,45 @@ // this.stopMovieWithoutSavingToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.Stop; this.stopMovieWithoutSavingToolStripMenuItem.Name = "stopMovieWithoutSavingToolStripMenuItem"; - this.stopMovieWithoutSavingToolStripMenuItem.Size = new System.Drawing.Size(231, 22); + this.stopMovieWithoutSavingToolStripMenuItem.Size = new System.Drawing.Size(273, 24); this.stopMovieWithoutSavingToolStripMenuItem.Text = "Stop Movie without Saving"; this.stopMovieWithoutSavingToolStripMenuItem.Click += new System.EventHandler(this.stopMovieWithoutSavingToolStripMenuItem_Click); // // toolStripSeparator14 // this.toolStripSeparator14.Name = "toolStripSeparator14"; - this.toolStripSeparator14.Size = new System.Drawing.Size(228, 6); + this.toolStripSeparator14.Size = new System.Drawing.Size(270, 6); // // bindSavestatesToMoviesToolStripMenuItem // this.bindSavestatesToMoviesToolStripMenuItem.Name = "bindSavestatesToMoviesToolStripMenuItem"; - this.bindSavestatesToMoviesToolStripMenuItem.Size = new System.Drawing.Size(231, 22); + this.bindSavestatesToMoviesToolStripMenuItem.Size = new System.Drawing.Size(273, 24); this.bindSavestatesToMoviesToolStripMenuItem.Text = "Bind Savestates to Movies"; this.bindSavestatesToMoviesToolStripMenuItem.Click += new System.EventHandler(this.bindSavestatesToMoviesToolStripMenuItem_Click); // // automaticallyBackupMoviesToolStripMenuItem // this.automaticallyBackupMoviesToolStripMenuItem.Name = "automaticallyBackupMoviesToolStripMenuItem"; - this.automaticallyBackupMoviesToolStripMenuItem.Size = new System.Drawing.Size(231, 22); + this.automaticallyBackupMoviesToolStripMenuItem.Size = new System.Drawing.Size(273, 24); this.automaticallyBackupMoviesToolStripMenuItem.Text = "Automatically Backup Movies"; this.automaticallyBackupMoviesToolStripMenuItem.Click += new System.EventHandler(this.automaticallyBackupMoviesToolStripMenuItem_Click); // // fullMovieLoadstatesToolStripMenuItem // this.fullMovieLoadstatesToolStripMenuItem.Name = "fullMovieLoadstatesToolStripMenuItem"; - this.fullMovieLoadstatesToolStripMenuItem.Size = new System.Drawing.Size(231, 22); + this.fullMovieLoadstatesToolStripMenuItem.Size = new System.Drawing.Size(273, 24); this.fullMovieLoadstatesToolStripMenuItem.Text = "Full Movie Loadstates"; this.fullMovieLoadstatesToolStripMenuItem.Click += new System.EventHandler(this.fullMovieLoadstatesToolStripMenuItem_Click); // // AVIWAVToolStripMenuItem // this.AVIWAVToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { - this.recordAVIToolStripMenuItem, - this.stopAVIToolStripMenuItem, - this.toolStripSeparator19, - this.captureOSDToolStripMenuItem}); + this.recordAVIToolStripMenuItem, + this.stopAVIToolStripMenuItem, + this.toolStripSeparator19, + this.captureOSDToolStripMenuItem}); this.AVIWAVToolStripMenuItem.Name = "AVIWAVToolStripMenuItem"; - this.AVIWAVToolStripMenuItem.Size = new System.Drawing.Size(152, 22); + this.AVIWAVToolStripMenuItem.Size = new System.Drawing.Size(160, 24); this.AVIWAVToolStripMenuItem.Text = "AVI/WAV"; this.AVIWAVToolStripMenuItem.DropDownOpened += new System.EventHandler(this.aVIWAVToolStripMenuItem_DropDownOpened); // @@ -958,7 +959,7 @@ // this.recordAVIToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.AVI; this.recordAVIToolStripMenuItem.Name = "recordAVIToolStripMenuItem"; - this.recordAVIToolStripMenuItem.Size = new System.Drawing.Size(163, 22); + this.recordAVIToolStripMenuItem.Size = new System.Drawing.Size(191, 24); this.recordAVIToolStripMenuItem.Text = "Record AVI/WAV"; this.recordAVIToolStripMenuItem.Click += new System.EventHandler(this.recordAVIToolStripMenuItem_Click); // @@ -966,32 +967,32 @@ // this.stopAVIToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.Stop; this.stopAVIToolStripMenuItem.Name = "stopAVIToolStripMenuItem"; - this.stopAVIToolStripMenuItem.Size = new System.Drawing.Size(163, 22); + this.stopAVIToolStripMenuItem.Size = new System.Drawing.Size(191, 24); this.stopAVIToolStripMenuItem.Text = "Stop AVI/WAV"; this.stopAVIToolStripMenuItem.Click += new System.EventHandler(this.stopAVIToolStripMenuItem_Click); // // toolStripSeparator19 // this.toolStripSeparator19.Name = "toolStripSeparator19"; - this.toolStripSeparator19.Size = new System.Drawing.Size(160, 6); + this.toolStripSeparator19.Size = new System.Drawing.Size(188, 6); // // captureOSDToolStripMenuItem // this.captureOSDToolStripMenuItem.Name = "captureOSDToolStripMenuItem"; - this.captureOSDToolStripMenuItem.Size = new System.Drawing.Size(163, 22); + this.captureOSDToolStripMenuItem.Size = new System.Drawing.Size(191, 24); this.captureOSDToolStripMenuItem.Text = "Capture OSD"; this.captureOSDToolStripMenuItem.Click += new System.EventHandler(this.captureOSDToolStripMenuItem_Click); // // screenshotToolStripMenuItem // this.screenshotToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { - this.screenshotF12ToolStripMenuItem, - this.screenshotAsToolStripMenuItem, - this.screenshotClipboardToolStripMenuItem, - this.toolStripSeparator20, - this.captureOSDToolStripMenuItem1}); + this.screenshotF12ToolStripMenuItem, + this.screenshotAsToolStripMenuItem, + this.screenshotClipboardToolStripMenuItem, + this.toolStripSeparator20, + this.captureOSDToolStripMenuItem1}); this.screenshotToolStripMenuItem.Name = "screenshotToolStripMenuItem"; - this.screenshotToolStripMenuItem.Size = new System.Drawing.Size(152, 22); + this.screenshotToolStripMenuItem.Size = new System.Drawing.Size(160, 24); this.screenshotToolStripMenuItem.Text = "Screenshot"; this.screenshotToolStripMenuItem.DropDownOpening += new System.EventHandler(this.screenshotToolStripMenuItem_DropDownOpening); // @@ -999,14 +1000,14 @@ // this.screenshotF12ToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.camera; this.screenshotF12ToolStripMenuItem.Name = "screenshotF12ToolStripMenuItem"; - this.screenshotF12ToolStripMenuItem.Size = new System.Drawing.Size(245, 22); + this.screenshotF12ToolStripMenuItem.Size = new System.Drawing.Size(291, 24); this.screenshotF12ToolStripMenuItem.Text = "Screenshot"; this.screenshotF12ToolStripMenuItem.Click += new System.EventHandler(this.screenshotF12ToolStripMenuItem_Click); // // screenshotAsToolStripMenuItem // this.screenshotAsToolStripMenuItem.Name = "screenshotAsToolStripMenuItem"; - this.screenshotAsToolStripMenuItem.Size = new System.Drawing.Size(245, 22); + this.screenshotAsToolStripMenuItem.Size = new System.Drawing.Size(291, 24); this.screenshotAsToolStripMenuItem.Text = "Screenshot As..."; this.screenshotAsToolStripMenuItem.Click += new System.EventHandler(this.screenshotAsToolStripMenuItem_Click); // @@ -1014,45 +1015,45 @@ // this.screenshotClipboardToolStripMenuItem.Name = "screenshotClipboardToolStripMenuItem"; this.screenshotClipboardToolStripMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.C))); - this.screenshotClipboardToolStripMenuItem.Size = new System.Drawing.Size(245, 22); + this.screenshotClipboardToolStripMenuItem.Size = new System.Drawing.Size(291, 24); this.screenshotClipboardToolStripMenuItem.Text = "Screenshot -> Clipboard"; this.screenshotClipboardToolStripMenuItem.Click += new System.EventHandler(this.screenshotClipboardToolStripMenuItem_Click); // // toolStripSeparator20 // this.toolStripSeparator20.Name = "toolStripSeparator20"; - this.toolStripSeparator20.Size = new System.Drawing.Size(242, 6); + this.toolStripSeparator20.Size = new System.Drawing.Size(288, 6); // // captureOSDToolStripMenuItem1 // this.captureOSDToolStripMenuItem1.Name = "captureOSDToolStripMenuItem1"; - this.captureOSDToolStripMenuItem1.Size = new System.Drawing.Size(245, 22); + this.captureOSDToolStripMenuItem1.Size = new System.Drawing.Size(291, 24); this.captureOSDToolStripMenuItem1.Text = "Capture OSD"; this.captureOSDToolStripMenuItem1.Click += new System.EventHandler(this.captureOSDToolStripMenuItem1_Click); // // toolStripSeparator4 // this.toolStripSeparator4.Name = "toolStripSeparator4"; - this.toolStripSeparator4.Size = new System.Drawing.Size(149, 6); + this.toolStripSeparator4.Size = new System.Drawing.Size(157, 6); // // exitToolStripMenuItem // this.exitToolStripMenuItem.Name = "exitToolStripMenuItem"; this.exitToolStripMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Alt | System.Windows.Forms.Keys.F4))); - this.exitToolStripMenuItem.Size = new System.Drawing.Size(152, 22); + this.exitToolStripMenuItem.Size = new System.Drawing.Size(160, 24); this.exitToolStripMenuItem.Text = "Exit"; this.exitToolStripMenuItem.Click += new System.EventHandler(this.exitToolStripMenuItem_Click); // // emulationToolStripMenuItem // this.emulationToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { - this.pauseToolStripMenuItem, - this.rebootCoreToolStripMenuItem, - this.toolStripSeparator1, - this.resetToolStripMenuItem, - this.hardResetToolStripMenuItem}); + this.pauseToolStripMenuItem, + this.rebootCoreToolStripMenuItem, + this.toolStripSeparator1, + this.resetToolStripMenuItem, + this.hardResetToolStripMenuItem}); this.emulationToolStripMenuItem.Name = "emulationToolStripMenuItem"; - this.emulationToolStripMenuItem.Size = new System.Drawing.Size(73, 19); + this.emulationToolStripMenuItem.Size = new System.Drawing.Size(88, 24); this.emulationToolStripMenuItem.Text = "&Emulation"; this.emulationToolStripMenuItem.DropDownOpened += new System.EventHandler(this.emulationToolStripMenuItem_DropDownOpened); // @@ -1060,7 +1061,7 @@ // this.pauseToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.Pause; this.pauseToolStripMenuItem.Name = "pauseToolStripMenuItem"; - this.pauseToolStripMenuItem.Size = new System.Drawing.Size(140, 22); + this.pauseToolStripMenuItem.Size = new System.Drawing.Size(162, 24); this.pauseToolStripMenuItem.Text = "&Pause"; this.pauseToolStripMenuItem.Click += new System.EventHandler(this.pauseToolStripMenuItem_Click); // @@ -1068,141 +1069,141 @@ // this.rebootCoreToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.reboot; this.rebootCoreToolStripMenuItem.Name = "rebootCoreToolStripMenuItem"; - this.rebootCoreToolStripMenuItem.Size = new System.Drawing.Size(140, 22); + this.rebootCoreToolStripMenuItem.Size = new System.Drawing.Size(162, 24); this.rebootCoreToolStripMenuItem.Text = "&Reboot Core"; this.rebootCoreToolStripMenuItem.Click += new System.EventHandler(this.powerToolStripMenuItem_Click); // // toolStripSeparator1 // this.toolStripSeparator1.Name = "toolStripSeparator1"; - this.toolStripSeparator1.Size = new System.Drawing.Size(137, 6); + this.toolStripSeparator1.Size = new System.Drawing.Size(159, 6); // // resetToolStripMenuItem // this.resetToolStripMenuItem.Name = "resetToolStripMenuItem"; - this.resetToolStripMenuItem.Size = new System.Drawing.Size(140, 22); + this.resetToolStripMenuItem.Size = new System.Drawing.Size(162, 24); this.resetToolStripMenuItem.Text = "&Soft Reset"; this.resetToolStripMenuItem.Click += new System.EventHandler(this.resetToolStripMenuItem_Click); // // hardResetToolStripMenuItem // this.hardResetToolStripMenuItem.Name = "hardResetToolStripMenuItem"; - this.hardResetToolStripMenuItem.Size = new System.Drawing.Size(140, 22); + this.hardResetToolStripMenuItem.Size = new System.Drawing.Size(162, 24); this.hardResetToolStripMenuItem.Text = "&Hard Reset"; this.hardResetToolStripMenuItem.Click += new System.EventHandler(this.hardResetToolStripMenuItem_Click); // // viewToolStripMenuItem // this.viewToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { - this.windowFilterMenuItem, - this.windowSizeMenuItem, - this.switchToFullscreenToolStripMenuItem, - this.toolStripSeparator2, - this.displayFPSToolStripMenuItem, - this.displayFrameCounterToolStripMenuItem, - this.displayLagCounterToolStripMenuItem, - this.displayInputToolStripMenuItem, - this.displayRerecordCountToolStripMenuItem, - this.displaySubtitlesToolStripMenuItem, - this.toolStripMenuItem4, - this.displayStatusBarToolStripMenuItem, - this.displayLogWindowToolStripMenuItem}); + this.windowFilterMenuItem, + this.windowSizeMenuItem, + this.switchToFullscreenToolStripMenuItem, + this.toolStripSeparator2, + this.displayFPSToolStripMenuItem, + this.displayFrameCounterToolStripMenuItem, + this.displayLagCounterToolStripMenuItem, + this.displayInputToolStripMenuItem, + this.displayRerecordCountToolStripMenuItem, + this.displaySubtitlesToolStripMenuItem, + this.toolStripMenuItem4, + this.displayStatusBarToolStripMenuItem, + this.displayLogWindowToolStripMenuItem}); this.viewToolStripMenuItem.Name = "viewToolStripMenuItem"; - this.viewToolStripMenuItem.Size = new System.Drawing.Size(44, 19); + this.viewToolStripMenuItem.Size = new System.Drawing.Size(53, 24); this.viewToolStripMenuItem.Text = "&View"; this.viewToolStripMenuItem.DropDownOpened += new System.EventHandler(this.viewToolStripMenuItem_DropDownOpened); // // windowFilterMenuItem // this.windowFilterMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { - this.DisplayFilterNoneMenuItem, - this.x2SAIMenuItem, - this.SuperX2SAIMenuItem, - this.SuperEagleMenuItem}); + this.DisplayFilterNoneMenuItem, + this.x2SAIMenuItem, + this.SuperX2SAIMenuItem, + this.SuperEagleMenuItem}); this.windowFilterMenuItem.Name = "windowFilterMenuItem"; - this.windowFilterMenuItem.Size = new System.Drawing.Size(198, 22); + this.windowFilterMenuItem.Size = new System.Drawing.Size(234, 24); this.windowFilterMenuItem.Text = "Display Filter"; // // DisplayFilterNoneMenuItem // this.DisplayFilterNoneMenuItem.Name = "DisplayFilterNoneMenuItem"; - this.DisplayFilterNoneMenuItem.Size = new System.Drawing.Size(135, 22); + this.DisplayFilterNoneMenuItem.Size = new System.Drawing.Size(157, 24); this.DisplayFilterNoneMenuItem.Text = "None"; this.DisplayFilterNoneMenuItem.Click += new System.EventHandler(this.DisplayFilterMenuItem_Click); // // x2SAIMenuItem // this.x2SAIMenuItem.Name = "x2SAIMenuItem"; - this.x2SAIMenuItem.Size = new System.Drawing.Size(135, 22); + this.x2SAIMenuItem.Size = new System.Drawing.Size(157, 24); this.x2SAIMenuItem.Text = "2xSAI"; this.x2SAIMenuItem.Click += new System.EventHandler(this.DisplayFilterMenuItem_Click); // // SuperX2SAIMenuItem // this.SuperX2SAIMenuItem.Name = "SuperX2SAIMenuItem"; - this.SuperX2SAIMenuItem.Size = new System.Drawing.Size(135, 22); + this.SuperX2SAIMenuItem.Size = new System.Drawing.Size(157, 24); this.SuperX2SAIMenuItem.Text = "Super 2xSAI"; this.SuperX2SAIMenuItem.Click += new System.EventHandler(this.DisplayFilterMenuItem_Click); // // SuperEagleMenuItem // this.SuperEagleMenuItem.Name = "SuperEagleMenuItem"; - this.SuperEagleMenuItem.Size = new System.Drawing.Size(135, 22); + this.SuperEagleMenuItem.Size = new System.Drawing.Size(157, 24); this.SuperEagleMenuItem.Text = "Super Eagle"; this.SuperEagleMenuItem.Click += new System.EventHandler(this.DisplayFilterMenuItem_Click); // // windowSizeMenuItem // this.windowSizeMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { - this.x1MenuItem, - this.x2MenuItem, - this.x3MenuItem, - this.x4MenuItem, - this.x5MenuItem, - this.mzMenuItem}); + this.x1MenuItem, + this.x2MenuItem, + this.x3MenuItem, + this.x4MenuItem, + this.x5MenuItem, + this.mzMenuItem}); this.windowSizeMenuItem.Name = "windowSizeMenuItem"; - this.windowSizeMenuItem.Size = new System.Drawing.Size(198, 22); + this.windowSizeMenuItem.Size = new System.Drawing.Size(234, 24); this.windowSizeMenuItem.Text = "&Window Size"; // // x1MenuItem // this.x1MenuItem.Name = "x1MenuItem"; - this.x1MenuItem.Size = new System.Drawing.Size(96, 22); + this.x1MenuItem.Size = new System.Drawing.Size(106, 24); this.x1MenuItem.Text = "&1x"; this.x1MenuItem.Click += new System.EventHandler(this.zoomMenuItem_Click); // // x2MenuItem // this.x2MenuItem.Name = "x2MenuItem"; - this.x2MenuItem.Size = new System.Drawing.Size(96, 22); + this.x2MenuItem.Size = new System.Drawing.Size(106, 24); this.x2MenuItem.Text = "&2x"; this.x2MenuItem.Click += new System.EventHandler(this.zoomMenuItem_Click); // // x3MenuItem // this.x3MenuItem.Name = "x3MenuItem"; - this.x3MenuItem.Size = new System.Drawing.Size(96, 22); + this.x3MenuItem.Size = new System.Drawing.Size(106, 24); this.x3MenuItem.Text = "&3x"; this.x3MenuItem.Click += new System.EventHandler(this.zoomMenuItem_Click); // // x4MenuItem // this.x4MenuItem.Name = "x4MenuItem"; - this.x4MenuItem.Size = new System.Drawing.Size(96, 22); + this.x4MenuItem.Size = new System.Drawing.Size(106, 24); this.x4MenuItem.Text = "&4x"; this.x4MenuItem.Click += new System.EventHandler(this.zoomMenuItem_Click); // // x5MenuItem // this.x5MenuItem.Name = "x5MenuItem"; - this.x5MenuItem.Size = new System.Drawing.Size(96, 22); + this.x5MenuItem.Size = new System.Drawing.Size(106, 24); this.x5MenuItem.Text = "&5x"; this.x5MenuItem.Click += new System.EventHandler(this.zoomMenuItem_Click); // // mzMenuItem // this.mzMenuItem.Name = "mzMenuItem"; - this.mzMenuItem.Size = new System.Drawing.Size(96, 22); + this.mzMenuItem.Size = new System.Drawing.Size(106, 24); this.mzMenuItem.Text = "&Max"; this.mzMenuItem.Click += new System.EventHandler(this.zoomMenuItem_Click); // @@ -1210,102 +1211,102 @@ // this.switchToFullscreenToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.Fullscreen; this.switchToFullscreenToolStripMenuItem.Name = "switchToFullscreenToolStripMenuItem"; - this.switchToFullscreenToolStripMenuItem.Size = new System.Drawing.Size(198, 22); + this.switchToFullscreenToolStripMenuItem.Size = new System.Drawing.Size(234, 24); this.switchToFullscreenToolStripMenuItem.Text = "Switch to Fullscreen"; this.switchToFullscreenToolStripMenuItem.Click += new System.EventHandler(this.switchToFullscreenToolStripMenuItem_Click); // // toolStripSeparator2 // this.toolStripSeparator2.Name = "toolStripSeparator2"; - this.toolStripSeparator2.Size = new System.Drawing.Size(195, 6); + this.toolStripSeparator2.Size = new System.Drawing.Size(231, 6); // // displayFPSToolStripMenuItem // this.displayFPSToolStripMenuItem.Name = "displayFPSToolStripMenuItem"; - this.displayFPSToolStripMenuItem.Size = new System.Drawing.Size(198, 22); + this.displayFPSToolStripMenuItem.Size = new System.Drawing.Size(234, 24); this.displayFPSToolStripMenuItem.Text = "Display FPS"; this.displayFPSToolStripMenuItem.Click += new System.EventHandler(this.displayFPSToolStripMenuItem_Click); // // displayFrameCounterToolStripMenuItem // this.displayFrameCounterToolStripMenuItem.Name = "displayFrameCounterToolStripMenuItem"; - this.displayFrameCounterToolStripMenuItem.Size = new System.Drawing.Size(198, 22); + this.displayFrameCounterToolStripMenuItem.Size = new System.Drawing.Size(234, 24); this.displayFrameCounterToolStripMenuItem.Text = "Display FrameCounter"; this.displayFrameCounterToolStripMenuItem.Click += new System.EventHandler(this.displayFrameCounterToolStripMenuItem_Click); // // displayLagCounterToolStripMenuItem // this.displayLagCounterToolStripMenuItem.Name = "displayLagCounterToolStripMenuItem"; - this.displayLagCounterToolStripMenuItem.Size = new System.Drawing.Size(198, 22); + this.displayLagCounterToolStripMenuItem.Size = new System.Drawing.Size(234, 24); this.displayLagCounterToolStripMenuItem.Text = "Display Lag Counter"; this.displayLagCounterToolStripMenuItem.Click += new System.EventHandler(this.displayLagCounterToolStripMenuItem_Click); // // displayInputToolStripMenuItem // this.displayInputToolStripMenuItem.Name = "displayInputToolStripMenuItem"; - this.displayInputToolStripMenuItem.Size = new System.Drawing.Size(198, 22); + this.displayInputToolStripMenuItem.Size = new System.Drawing.Size(234, 24); this.displayInputToolStripMenuItem.Text = "Display Input"; this.displayInputToolStripMenuItem.Click += new System.EventHandler(this.displayInputToolStripMenuItem_Click); // // displayRerecordCountToolStripMenuItem // this.displayRerecordCountToolStripMenuItem.Name = "displayRerecordCountToolStripMenuItem"; - this.displayRerecordCountToolStripMenuItem.Size = new System.Drawing.Size(198, 22); + this.displayRerecordCountToolStripMenuItem.Size = new System.Drawing.Size(234, 24); this.displayRerecordCountToolStripMenuItem.Text = "Display Rerecord Count"; this.displayRerecordCountToolStripMenuItem.Click += new System.EventHandler(this.displayRerecordCountToolStripMenuItem_Click); // // displaySubtitlesToolStripMenuItem // this.displaySubtitlesToolStripMenuItem.Name = "displaySubtitlesToolStripMenuItem"; - this.displaySubtitlesToolStripMenuItem.Size = new System.Drawing.Size(198, 22); + this.displaySubtitlesToolStripMenuItem.Size = new System.Drawing.Size(234, 24); this.displaySubtitlesToolStripMenuItem.Text = "Display Subtitles"; this.displaySubtitlesToolStripMenuItem.Click += new System.EventHandler(this.displaySubtitlesToolStripMenuItem_Click); // // toolStripMenuItem4 // this.toolStripMenuItem4.Name = "toolStripMenuItem4"; - this.toolStripMenuItem4.Size = new System.Drawing.Size(195, 6); + this.toolStripMenuItem4.Size = new System.Drawing.Size(231, 6); // // displayStatusBarToolStripMenuItem // this.displayStatusBarToolStripMenuItem.Name = "displayStatusBarToolStripMenuItem"; - this.displayStatusBarToolStripMenuItem.Size = new System.Drawing.Size(198, 22); + this.displayStatusBarToolStripMenuItem.Size = new System.Drawing.Size(234, 24); this.displayStatusBarToolStripMenuItem.Text = "Display Status Bar"; this.displayStatusBarToolStripMenuItem.Click += new System.EventHandler(this.displayStatusBarToolStripMenuItem_Click); // // displayLogWindowToolStripMenuItem // this.displayLogWindowToolStripMenuItem.Name = "displayLogWindowToolStripMenuItem"; - this.displayLogWindowToolStripMenuItem.Size = new System.Drawing.Size(198, 22); + this.displayLogWindowToolStripMenuItem.Size = new System.Drawing.Size(234, 24); this.displayLogWindowToolStripMenuItem.Text = "Display Log Window"; this.displayLogWindowToolStripMenuItem.Click += new System.EventHandler(this.displayLogWindowToolStripMenuItem_Click); // // configToolStripMenuItem // this.configToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { - this.controllersToolStripMenuItem, - this.hotkeysToolStripMenuItem, - this.messagesToolStripMenuItem, - this.pathsToolStripMenuItem, - this.soundToolStripMenuItem, - this.autofireToolStripMenuItem, - this.toolStripSeparator9, - this.enableToolStripMenuItem, - this.gUIToolStripMenuItem, - this.frameSkipToolStripMenuItem, - this.keyPriorityToolStripMenuItem, - this.toolStripSeparator10, - this.saveConfigToolStripMenuItem, - this.loadConfigToolStripMenuItem}); + this.controllersToolStripMenuItem, + this.hotkeysToolStripMenuItem, + this.messagesToolStripMenuItem, + this.pathsToolStripMenuItem, + this.soundToolStripMenuItem, + this.autofireToolStripMenuItem, + this.toolStripSeparator9, + this.enableToolStripMenuItem, + this.gUIToolStripMenuItem, + this.frameSkipToolStripMenuItem, + this.keyPriorityToolStripMenuItem, + this.toolStripSeparator10, + this.saveConfigToolStripMenuItem, + this.loadConfigToolStripMenuItem}); this.configToolStripMenuItem.Name = "configToolStripMenuItem"; - this.configToolStripMenuItem.Size = new System.Drawing.Size(55, 19); + this.configToolStripMenuItem.Size = new System.Drawing.Size(65, 24); this.configToolStripMenuItem.Text = "&Config"; // // controllersToolStripMenuItem // this.controllersToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.GameController; this.controllersToolStripMenuItem.Name = "controllersToolStripMenuItem"; - this.controllersToolStripMenuItem.Size = new System.Drawing.Size(141, 22); + this.controllersToolStripMenuItem.Size = new System.Drawing.Size(159, 24); this.controllersToolStripMenuItem.Text = "&Controllers..."; this.controllersToolStripMenuItem.Click += new System.EventHandler(this.controllersToolStripMenuItem_Click); // @@ -1313,7 +1314,7 @@ // this.hotkeysToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.HotKeys; this.hotkeysToolStripMenuItem.Name = "hotkeysToolStripMenuItem"; - this.hotkeysToolStripMenuItem.Size = new System.Drawing.Size(141, 22); + this.hotkeysToolStripMenuItem.Size = new System.Drawing.Size(159, 24); this.hotkeysToolStripMenuItem.Text = "&Hotkeys..."; this.hotkeysToolStripMenuItem.Click += new System.EventHandler(this.hotkeysToolStripMenuItem_Click); // @@ -1321,7 +1322,7 @@ // this.messagesToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.MessageConfig; this.messagesToolStripMenuItem.Name = "messagesToolStripMenuItem"; - this.messagesToolStripMenuItem.Size = new System.Drawing.Size(141, 22); + this.messagesToolStripMenuItem.Size = new System.Drawing.Size(159, 24); this.messagesToolStripMenuItem.Text = "&Messages..."; this.messagesToolStripMenuItem.Click += new System.EventHandler(this.messagesToolStripMenuItem_Click); // @@ -1329,7 +1330,7 @@ // this.pathsToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.CopyFolderHS; this.pathsToolStripMenuItem.Name = "pathsToolStripMenuItem"; - this.pathsToolStripMenuItem.Size = new System.Drawing.Size(141, 22); + this.pathsToolStripMenuItem.Size = new System.Drawing.Size(159, 24); this.pathsToolStripMenuItem.Text = "Paths..."; this.pathsToolStripMenuItem.Click += new System.EventHandler(this.pathsToolStripMenuItem_Click); // @@ -1337,7 +1338,7 @@ // this.soundToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.AudioHS; this.soundToolStripMenuItem.Name = "soundToolStripMenuItem"; - this.soundToolStripMenuItem.Size = new System.Drawing.Size(141, 22); + this.soundToolStripMenuItem.Size = new System.Drawing.Size(159, 24); this.soundToolStripMenuItem.Text = "&Sound..."; this.soundToolStripMenuItem.Click += new System.EventHandler(this.soundToolStripMenuItem_Click); // @@ -1345,230 +1346,230 @@ // this.autofireToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.Lightning; this.autofireToolStripMenuItem.Name = "autofireToolStripMenuItem"; - this.autofireToolStripMenuItem.Size = new System.Drawing.Size(141, 22); + this.autofireToolStripMenuItem.Size = new System.Drawing.Size(159, 24); this.autofireToolStripMenuItem.Text = "&Autofire..."; this.autofireToolStripMenuItem.Click += new System.EventHandler(this.autofireToolStripMenuItem_Click); // // toolStripSeparator9 // this.toolStripSeparator9.Name = "toolStripSeparator9"; - this.toolStripSeparator9.Size = new System.Drawing.Size(138, 6); + this.toolStripSeparator9.Size = new System.Drawing.Size(156, 6); // // enableToolStripMenuItem // this.enableToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { - this.enableRewindToolStripMenuItem, - this.enableContextMenuToolStripMenuItem, - this.backupSavestatesToolStripMenuItem, - this.autoSavestatesToolStripMenuItem, - this.saveScreenshotWithSavestatesToolStripMenuItem, - this.frameAdvanceSkipLagFramesToolStripMenuItem, - this.backupSaveramToolStripMenuItem}); + this.enableRewindToolStripMenuItem, + this.enableContextMenuToolStripMenuItem, + this.backupSavestatesToolStripMenuItem, + this.autoSavestatesToolStripMenuItem, + this.saveScreenshotWithSavestatesToolStripMenuItem, + this.frameAdvanceSkipLagFramesToolStripMenuItem, + this.backupSaveramToolStripMenuItem}); this.enableToolStripMenuItem.Name = "enableToolStripMenuItem"; - this.enableToolStripMenuItem.Size = new System.Drawing.Size(141, 22); + this.enableToolStripMenuItem.Size = new System.Drawing.Size(159, 24); this.enableToolStripMenuItem.Text = "&Enable"; this.enableToolStripMenuItem.DropDownOpened += new System.EventHandler(this.enableToolStripMenuItem_DropDownOpened); // // enableRewindToolStripMenuItem // this.enableRewindToolStripMenuItem.Name = "enableRewindToolStripMenuItem"; - this.enableRewindToolStripMenuItem.Size = new System.Drawing.Size(252, 22); + this.enableRewindToolStripMenuItem.Size = new System.Drawing.Size(301, 24); this.enableRewindToolStripMenuItem.Text = "&Enable Rewind"; this.enableRewindToolStripMenuItem.Click += new System.EventHandler(this.enableRewindToolStripMenuItem_Click); // // enableContextMenuToolStripMenuItem // this.enableContextMenuToolStripMenuItem.Name = "enableContextMenuToolStripMenuItem"; - this.enableContextMenuToolStripMenuItem.Size = new System.Drawing.Size(252, 22); + this.enableContextMenuToolStripMenuItem.Size = new System.Drawing.Size(301, 24); this.enableContextMenuToolStripMenuItem.Text = "Enable Context Menu"; this.enableContextMenuToolStripMenuItem.Click += new System.EventHandler(this.enableContextMenuToolStripMenuItem_Click); // // backupSavestatesToolStripMenuItem // this.backupSavestatesToolStripMenuItem.Name = "backupSavestatesToolStripMenuItem"; - this.backupSavestatesToolStripMenuItem.Size = new System.Drawing.Size(252, 22); + this.backupSavestatesToolStripMenuItem.Size = new System.Drawing.Size(301, 24); this.backupSavestatesToolStripMenuItem.Text = "Backup Savestates"; this.backupSavestatesToolStripMenuItem.Click += new System.EventHandler(this.backupSavestatesToolStripMenuItem_Click); // // autoSavestatesToolStripMenuItem // this.autoSavestatesToolStripMenuItem.Name = "autoSavestatesToolStripMenuItem"; - this.autoSavestatesToolStripMenuItem.Size = new System.Drawing.Size(252, 22); + this.autoSavestatesToolStripMenuItem.Size = new System.Drawing.Size(301, 24); this.autoSavestatesToolStripMenuItem.Text = "Auto Savestates"; this.autoSavestatesToolStripMenuItem.Click += new System.EventHandler(this.autoSavestatesToolStripMenuItem_Click); // // saveScreenshotWithSavestatesToolStripMenuItem // this.saveScreenshotWithSavestatesToolStripMenuItem.Name = "saveScreenshotWithSavestatesToolStripMenuItem"; - this.saveScreenshotWithSavestatesToolStripMenuItem.Size = new System.Drawing.Size(252, 22); + this.saveScreenshotWithSavestatesToolStripMenuItem.Size = new System.Drawing.Size(301, 24); this.saveScreenshotWithSavestatesToolStripMenuItem.Text = "Save Screenshot with Savestates"; this.saveScreenshotWithSavestatesToolStripMenuItem.Click += new System.EventHandler(this.screenshotWithSavestatesToolStripMenuItem_Click); // // frameAdvanceSkipLagFramesToolStripMenuItem // this.frameAdvanceSkipLagFramesToolStripMenuItem.Name = "frameAdvanceSkipLagFramesToolStripMenuItem"; - this.frameAdvanceSkipLagFramesToolStripMenuItem.Size = new System.Drawing.Size(252, 22); + this.frameAdvanceSkipLagFramesToolStripMenuItem.Size = new System.Drawing.Size(301, 24); this.frameAdvanceSkipLagFramesToolStripMenuItem.Text = "Frame Advance - Skip Lag Frames"; this.frameAdvanceSkipLagFramesToolStripMenuItem.Click += new System.EventHandler(this.frameAdvanceSkipLagFramesToolStripMenuItem_Click); // // backupSaveramToolStripMenuItem // this.backupSaveramToolStripMenuItem.Name = "backupSaveramToolStripMenuItem"; - this.backupSaveramToolStripMenuItem.Size = new System.Drawing.Size(252, 22); + this.backupSaveramToolStripMenuItem.Size = new System.Drawing.Size(301, 24); this.backupSaveramToolStripMenuItem.Text = "Backup Saveram"; this.backupSaveramToolStripMenuItem.Click += new System.EventHandler(this.backupSaveramToolStripMenuItem_Click); // // gUIToolStripMenuItem // this.gUIToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { - this.pauseWhenMenuActivatedToolStripMenuItem, - this.startPausedToolStripMenuItem, - this.toolStripSeparator22, - this.saveWindowPositionToolStripMenuItem, - this.forceGDIPPresentationToolStripMenuItem, - this.blurryToolStripMenuItem, - this.miSuppressGuiLayer, - this.showMenuInFullScreenToolStripMenuItem, - this.runInBackgroundToolStripMenuItem, - this.acceptBackgroundInputToolStripMenuItem, - this.singleInstanceModeToolStripMenuItem, - this.neverBeAskedToSaveChangesToolStripMenuItem, - this.toolStripSeparator23, - this.logWindowAsConsoleToolStripMenuItem}); + this.pauseWhenMenuActivatedToolStripMenuItem, + this.startPausedToolStripMenuItem, + this.toolStripSeparator22, + this.saveWindowPositionToolStripMenuItem, + this.forceGDIPPresentationToolStripMenuItem, + this.blurryToolStripMenuItem, + this.miSuppressGuiLayer, + this.showMenuInFullScreenToolStripMenuItem, + this.runInBackgroundToolStripMenuItem, + this.acceptBackgroundInputToolStripMenuItem, + this.singleInstanceModeToolStripMenuItem, + this.neverBeAskedToSaveChangesToolStripMenuItem, + this.toolStripSeparator23, + this.logWindowAsConsoleToolStripMenuItem}); this.gUIToolStripMenuItem.Name = "gUIToolStripMenuItem"; - this.gUIToolStripMenuItem.Size = new System.Drawing.Size(141, 22); + this.gUIToolStripMenuItem.Size = new System.Drawing.Size(159, 24); this.gUIToolStripMenuItem.Text = "GUI"; this.gUIToolStripMenuItem.DropDownOpened += new System.EventHandler(this.gUIToolStripMenuItem_DropDownOpened); // // pauseWhenMenuActivatedToolStripMenuItem // this.pauseWhenMenuActivatedToolStripMenuItem.Name = "pauseWhenMenuActivatedToolStripMenuItem"; - this.pauseWhenMenuActivatedToolStripMenuItem.Size = new System.Drawing.Size(241, 22); + this.pauseWhenMenuActivatedToolStripMenuItem.Size = new System.Drawing.Size(289, 24); this.pauseWhenMenuActivatedToolStripMenuItem.Text = "Pause when menu activated"; this.pauseWhenMenuActivatedToolStripMenuItem.Click += new System.EventHandler(this.pauseWhenMenuActivatedToolStripMenuItem_Click); // // startPausedToolStripMenuItem // this.startPausedToolStripMenuItem.Name = "startPausedToolStripMenuItem"; - this.startPausedToolStripMenuItem.Size = new System.Drawing.Size(241, 22); + this.startPausedToolStripMenuItem.Size = new System.Drawing.Size(289, 24); this.startPausedToolStripMenuItem.Text = "Start paused"; this.startPausedToolStripMenuItem.Click += new System.EventHandler(this.startPausedToolStripMenuItem_Click); // // toolStripSeparator22 // this.toolStripSeparator22.Name = "toolStripSeparator22"; - this.toolStripSeparator22.Size = new System.Drawing.Size(238, 6); + this.toolStripSeparator22.Size = new System.Drawing.Size(286, 6); // // saveWindowPositionToolStripMenuItem // this.saveWindowPositionToolStripMenuItem.Name = "saveWindowPositionToolStripMenuItem"; - this.saveWindowPositionToolStripMenuItem.Size = new System.Drawing.Size(241, 22); + this.saveWindowPositionToolStripMenuItem.Size = new System.Drawing.Size(289, 24); this.saveWindowPositionToolStripMenuItem.Text = "Save window position"; this.saveWindowPositionToolStripMenuItem.Click += new System.EventHandler(this.saveWindowPositionToolStripMenuItem_Click); // // forceGDIPPresentationToolStripMenuItem // this.forceGDIPPresentationToolStripMenuItem.Name = "forceGDIPPresentationToolStripMenuItem"; - this.forceGDIPPresentationToolStripMenuItem.Size = new System.Drawing.Size(241, 22); + this.forceGDIPPresentationToolStripMenuItem.Size = new System.Drawing.Size(289, 24); this.forceGDIPPresentationToolStripMenuItem.Text = "Use GDI+ Display Method"; this.forceGDIPPresentationToolStripMenuItem.Click += new System.EventHandler(this.forceGDIPPresentationToolStripMenuItem_Click); // // blurryToolStripMenuItem // this.blurryToolStripMenuItem.Name = "blurryToolStripMenuItem"; - this.blurryToolStripMenuItem.Size = new System.Drawing.Size(241, 22); + this.blurryToolStripMenuItem.Size = new System.Drawing.Size(289, 24); this.blurryToolStripMenuItem.Text = "Use Bilinear Filtering"; this.blurryToolStripMenuItem.Click += new System.EventHandler(this.blurryToolStripMenuItem_Click); // // miSuppressGuiLayer // this.miSuppressGuiLayer.Name = "miSuppressGuiLayer"; - this.miSuppressGuiLayer.Size = new System.Drawing.Size(241, 22); + this.miSuppressGuiLayer.Size = new System.Drawing.Size(289, 24); this.miSuppressGuiLayer.Text = "Suppress GUI Layer"; this.miSuppressGuiLayer.Click += new System.EventHandler(this.miSuppressGuiLayer_Click); // // showMenuInFullScreenToolStripMenuItem // this.showMenuInFullScreenToolStripMenuItem.Name = "showMenuInFullScreenToolStripMenuItem"; - this.showMenuInFullScreenToolStripMenuItem.Size = new System.Drawing.Size(241, 22); + this.showMenuInFullScreenToolStripMenuItem.Size = new System.Drawing.Size(289, 24); this.showMenuInFullScreenToolStripMenuItem.Text = "Show Menu in Full Screen"; this.showMenuInFullScreenToolStripMenuItem.Click += new System.EventHandler(this.showMenuInFullScreenToolStripMenuItem_Click); // // runInBackgroundToolStripMenuItem // this.runInBackgroundToolStripMenuItem.Name = "runInBackgroundToolStripMenuItem"; - this.runInBackgroundToolStripMenuItem.Size = new System.Drawing.Size(241, 22); + this.runInBackgroundToolStripMenuItem.Size = new System.Drawing.Size(289, 24); this.runInBackgroundToolStripMenuItem.Text = "Run in Background"; this.runInBackgroundToolStripMenuItem.Click += new System.EventHandler(this.runInBackgroundToolStripMenuItem_Click); // // acceptBackgroundInputToolStripMenuItem // this.acceptBackgroundInputToolStripMenuItem.Name = "acceptBackgroundInputToolStripMenuItem"; - this.acceptBackgroundInputToolStripMenuItem.Size = new System.Drawing.Size(241, 22); + this.acceptBackgroundInputToolStripMenuItem.Size = new System.Drawing.Size(289, 24); this.acceptBackgroundInputToolStripMenuItem.Text = "Accept Background Input"; this.acceptBackgroundInputToolStripMenuItem.Click += new System.EventHandler(this.acceptBackgroundInputToolStripMenuItem_Click); // // singleInstanceModeToolStripMenuItem // this.singleInstanceModeToolStripMenuItem.Name = "singleInstanceModeToolStripMenuItem"; - this.singleInstanceModeToolStripMenuItem.Size = new System.Drawing.Size(241, 22); + this.singleInstanceModeToolStripMenuItem.Size = new System.Drawing.Size(289, 24); this.singleInstanceModeToolStripMenuItem.Text = "Single Instance Mode"; this.singleInstanceModeToolStripMenuItem.Click += new System.EventHandler(this.singleInstanceModeToolStripMenuItem_Click); // // neverBeAskedToSaveChangesToolStripMenuItem // this.neverBeAskedToSaveChangesToolStripMenuItem.Name = "neverBeAskedToSaveChangesToolStripMenuItem"; - this.neverBeAskedToSaveChangesToolStripMenuItem.Size = new System.Drawing.Size(241, 22); + this.neverBeAskedToSaveChangesToolStripMenuItem.Size = new System.Drawing.Size(289, 24); this.neverBeAskedToSaveChangesToolStripMenuItem.Text = "Never be asked to save changes"; this.neverBeAskedToSaveChangesToolStripMenuItem.Click += new System.EventHandler(this.neverBeAskedToSaveChangesToolStripMenuItem_Click); // // toolStripSeparator23 // this.toolStripSeparator23.Name = "toolStripSeparator23"; - this.toolStripSeparator23.Size = new System.Drawing.Size(238, 6); + this.toolStripSeparator23.Size = new System.Drawing.Size(286, 6); // // logWindowAsConsoleToolStripMenuItem // this.logWindowAsConsoleToolStripMenuItem.Name = "logWindowAsConsoleToolStripMenuItem"; - this.logWindowAsConsoleToolStripMenuItem.Size = new System.Drawing.Size(241, 22); + this.logWindowAsConsoleToolStripMenuItem.Size = new System.Drawing.Size(289, 24); this.logWindowAsConsoleToolStripMenuItem.Text = "Log Window as Console"; this.logWindowAsConsoleToolStripMenuItem.Click += new System.EventHandler(this.logWindowAsConsoleToolStripMenuItem_Click); // // frameSkipToolStripMenuItem // this.frameSkipToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { - this.miLimitFramerate, - this.audioThrottleToolStripMenuItem, - this.miDisplayVsync, - this.toolStripSeparator27, - this.vSyncEnabledToolStripMenuItem, - this.toolStripMenuItem3, - this.miAutoMinimizeSkipping, - this.miFrameskip0, - this.miFrameskip1, - this.miFrameskip2, - this.miFrameskip3, - this.miFrameskip4, - this.miFrameskip5, - this.miFrameskip6, - this.miFrameskip7, - this.miFrameskip8, - this.miFrameskip9, - this.toolStripMenuItem5, - this.miSpeed50, - this.miSpeed75, - this.miSpeed100, - this.miSpeed150, - this.miSpeed200}); + this.miLimitFramerate, + this.audioThrottleToolStripMenuItem, + this.miDisplayVsync, + this.toolStripSeparator27, + this.vSyncEnabledToolStripMenuItem, + this.toolStripMenuItem3, + this.miAutoMinimizeSkipping, + this.miFrameskip0, + this.miFrameskip1, + this.miFrameskip2, + this.miFrameskip3, + this.miFrameskip4, + this.miFrameskip5, + this.miFrameskip6, + this.miFrameskip7, + this.miFrameskip8, + this.miFrameskip9, + this.toolStripMenuItem5, + this.miSpeed50, + this.miSpeed75, + this.miSpeed100, + this.miSpeed150, + this.miSpeed200}); this.frameSkipToolStripMenuItem.Name = "frameSkipToolStripMenuItem"; - this.frameSkipToolStripMenuItem.Size = new System.Drawing.Size(141, 22); + this.frameSkipToolStripMenuItem.Size = new System.Drawing.Size(159, 24); this.frameSkipToolStripMenuItem.Text = "Speed/Skip"; this.frameSkipToolStripMenuItem.DropDownOpened += new System.EventHandler(this.frameSkipToolStripMenuItem_DropDownOpened); // // miLimitFramerate // this.miLimitFramerate.Name = "miLimitFramerate"; - this.miLimitFramerate.Size = new System.Drawing.Size(202, 22); + this.miLimitFramerate.Size = new System.Drawing.Size(237, 24); this.miLimitFramerate.Text = "Clock Throttle"; this.miLimitFramerate.DropDownOpened += new System.EventHandler(this.miLimitFramerate_DropDownOpened); this.miLimitFramerate.Click += new System.EventHandler(this.miLimitFramerate_Click); @@ -1576,193 +1577,193 @@ // audioThrottleToolStripMenuItem // this.audioThrottleToolStripMenuItem.Name = "audioThrottleToolStripMenuItem"; - this.audioThrottleToolStripMenuItem.Size = new System.Drawing.Size(202, 22); + this.audioThrottleToolStripMenuItem.Size = new System.Drawing.Size(237, 24); this.audioThrottleToolStripMenuItem.Text = "Audio Throttle"; this.audioThrottleToolStripMenuItem.Click += new System.EventHandler(this.audioThrottleToolStripMenuItem_Click); // // miDisplayVsync // this.miDisplayVsync.Name = "miDisplayVsync"; - this.miDisplayVsync.Size = new System.Drawing.Size(202, 22); + this.miDisplayVsync.Size = new System.Drawing.Size(237, 24); this.miDisplayVsync.Text = "VSync Throttle"; this.miDisplayVsync.Click += new System.EventHandler(this.miDisplayVsync_Click); // // toolStripSeparator27 // this.toolStripSeparator27.Name = "toolStripSeparator27"; - this.toolStripSeparator27.Size = new System.Drawing.Size(199, 6); + this.toolStripSeparator27.Size = new System.Drawing.Size(234, 6); // // vSyncEnabledToolStripMenuItem // this.vSyncEnabledToolStripMenuItem.Name = "vSyncEnabledToolStripMenuItem"; - this.vSyncEnabledToolStripMenuItem.Size = new System.Drawing.Size(202, 22); + this.vSyncEnabledToolStripMenuItem.Size = new System.Drawing.Size(237, 24); this.vSyncEnabledToolStripMenuItem.Text = "VSync Enabled"; this.vSyncEnabledToolStripMenuItem.Click += new System.EventHandler(this.vSyncEnabledToolStripMenuItem_Click); // // toolStripMenuItem3 // this.toolStripMenuItem3.Name = "toolStripMenuItem3"; - this.toolStripMenuItem3.Size = new System.Drawing.Size(199, 6); + this.toolStripMenuItem3.Size = new System.Drawing.Size(234, 6); // // miAutoMinimizeSkipping // this.miAutoMinimizeSkipping.Name = "miAutoMinimizeSkipping"; - this.miAutoMinimizeSkipping.Size = new System.Drawing.Size(202, 22); + this.miAutoMinimizeSkipping.Size = new System.Drawing.Size(237, 24); this.miAutoMinimizeSkipping.Text = "Auto-minimize skipping"; this.miAutoMinimizeSkipping.Click += new System.EventHandler(this.miAutoMinimizeSkipping_Click); // // miFrameskip0 // this.miFrameskip0.Name = "miFrameskip0"; - this.miFrameskip0.Size = new System.Drawing.Size(202, 22); + this.miFrameskip0.Size = new System.Drawing.Size(237, 24); this.miFrameskip0.Text = "0 (never skip)"; this.miFrameskip0.Click += new System.EventHandler(this.miFrameskip0_Click); // // miFrameskip1 // this.miFrameskip1.Name = "miFrameskip1"; - this.miFrameskip1.Size = new System.Drawing.Size(202, 22); + this.miFrameskip1.Size = new System.Drawing.Size(237, 24); this.miFrameskip1.Text = "1"; this.miFrameskip1.Click += new System.EventHandler(this.miFrameskip1_Click); // // miFrameskip2 // this.miFrameskip2.Name = "miFrameskip2"; - this.miFrameskip2.Size = new System.Drawing.Size(202, 22); + this.miFrameskip2.Size = new System.Drawing.Size(237, 24); this.miFrameskip2.Text = "2"; this.miFrameskip2.Click += new System.EventHandler(this.miFrameskip2_Click); // // miFrameskip3 // this.miFrameskip3.Name = "miFrameskip3"; - this.miFrameskip3.Size = new System.Drawing.Size(202, 22); + this.miFrameskip3.Size = new System.Drawing.Size(237, 24); this.miFrameskip3.Text = "3"; this.miFrameskip3.Click += new System.EventHandler(this.miFrameskip3_Click); // // miFrameskip4 // this.miFrameskip4.Name = "miFrameskip4"; - this.miFrameskip4.Size = new System.Drawing.Size(202, 22); + this.miFrameskip4.Size = new System.Drawing.Size(237, 24); this.miFrameskip4.Text = "4"; this.miFrameskip4.Click += new System.EventHandler(this.miFrameskip4_Click); // // miFrameskip5 // this.miFrameskip5.Name = "miFrameskip5"; - this.miFrameskip5.Size = new System.Drawing.Size(202, 22); + this.miFrameskip5.Size = new System.Drawing.Size(237, 24); this.miFrameskip5.Text = "5"; this.miFrameskip5.Click += new System.EventHandler(this.miFrameskip5_Click); // // miFrameskip6 // this.miFrameskip6.Name = "miFrameskip6"; - this.miFrameskip6.Size = new System.Drawing.Size(202, 22); + this.miFrameskip6.Size = new System.Drawing.Size(237, 24); this.miFrameskip6.Text = "6"; this.miFrameskip6.Click += new System.EventHandler(this.miFrameskip6_Click); // // miFrameskip7 // this.miFrameskip7.Name = "miFrameskip7"; - this.miFrameskip7.Size = new System.Drawing.Size(202, 22); + this.miFrameskip7.Size = new System.Drawing.Size(237, 24); this.miFrameskip7.Text = "7"; this.miFrameskip7.Click += new System.EventHandler(this.miFrameskip7_Click); // // miFrameskip8 // this.miFrameskip8.Name = "miFrameskip8"; - this.miFrameskip8.Size = new System.Drawing.Size(202, 22); + this.miFrameskip8.Size = new System.Drawing.Size(237, 24); this.miFrameskip8.Text = "8"; this.miFrameskip8.Click += new System.EventHandler(this.miFrameskip8_Click); // // miFrameskip9 // this.miFrameskip9.Name = "miFrameskip9"; - this.miFrameskip9.Size = new System.Drawing.Size(202, 22); + this.miFrameskip9.Size = new System.Drawing.Size(237, 24); this.miFrameskip9.Text = "9"; this.miFrameskip9.Click += new System.EventHandler(this.miFrameskip9_Click); // // toolStripMenuItem5 // this.toolStripMenuItem5.Name = "toolStripMenuItem5"; - this.toolStripMenuItem5.Size = new System.Drawing.Size(199, 6); + this.toolStripMenuItem5.Size = new System.Drawing.Size(234, 6); // // miSpeed50 // this.miSpeed50.Name = "miSpeed50"; - this.miSpeed50.Size = new System.Drawing.Size(202, 22); + this.miSpeed50.Size = new System.Drawing.Size(237, 24); this.miSpeed50.Text = "Speed 50%"; this.miSpeed50.Click += new System.EventHandler(this.miSpeed50_Click); // // miSpeed75 // this.miSpeed75.Name = "miSpeed75"; - this.miSpeed75.Size = new System.Drawing.Size(202, 22); + this.miSpeed75.Size = new System.Drawing.Size(237, 24); this.miSpeed75.Text = "Speed 75%"; this.miSpeed75.Click += new System.EventHandler(this.miSpeed75_Click); // // miSpeed100 // this.miSpeed100.Name = "miSpeed100"; - this.miSpeed100.Size = new System.Drawing.Size(202, 22); + this.miSpeed100.Size = new System.Drawing.Size(237, 24); this.miSpeed100.Text = "Speed 100%"; this.miSpeed100.Click += new System.EventHandler(this.miSpeed100_Click); // // miSpeed150 // this.miSpeed150.Name = "miSpeed150"; - this.miSpeed150.Size = new System.Drawing.Size(202, 22); + this.miSpeed150.Size = new System.Drawing.Size(237, 24); this.miSpeed150.Text = "Speed 150%"; this.miSpeed150.Click += new System.EventHandler(this.miSpeed150_Click); // // miSpeed200 // this.miSpeed200.Name = "miSpeed200"; - this.miSpeed200.Size = new System.Drawing.Size(202, 22); + this.miSpeed200.Size = new System.Drawing.Size(237, 24); this.miSpeed200.Text = "Speed 200%"; this.miSpeed200.Click += new System.EventHandler(this.miSpeed200_Click); // // keyPriorityToolStripMenuItem // this.keyPriorityToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { - this.bothHotkeysAndControllersToolStripMenuItem, - this.inputOverridesHotkeysToolStripMenuItem, - this.hotkeysOverrideInputToolStripMenuItem}); + this.bothHotkeysAndControllersToolStripMenuItem, + this.inputOverridesHotkeysToolStripMenuItem, + this.hotkeysOverrideInputToolStripMenuItem}); this.keyPriorityToolStripMenuItem.Name = "keyPriorityToolStripMenuItem"; - this.keyPriorityToolStripMenuItem.Size = new System.Drawing.Size(141, 22); + this.keyPriorityToolStripMenuItem.Size = new System.Drawing.Size(159, 24); this.keyPriorityToolStripMenuItem.Text = "Key Priority"; this.keyPriorityToolStripMenuItem.DropDownOpened += new System.EventHandler(this.keyPriorityToolStripMenuItem_DropDownOpened); // // bothHotkeysAndControllersToolStripMenuItem // this.bothHotkeysAndControllersToolStripMenuItem.Name = "bothHotkeysAndControllersToolStripMenuItem"; - this.bothHotkeysAndControllersToolStripMenuItem.Size = new System.Drawing.Size(229, 22); + this.bothHotkeysAndControllersToolStripMenuItem.Size = new System.Drawing.Size(271, 24); this.bothHotkeysAndControllersToolStripMenuItem.Text = "Both Hotkeys and Controllers"; this.bothHotkeysAndControllersToolStripMenuItem.Click += new System.EventHandler(this.bothHotkeysAndControllersToolStripMenuItem_Click); // // inputOverridesHotkeysToolStripMenuItem // this.inputOverridesHotkeysToolStripMenuItem.Name = "inputOverridesHotkeysToolStripMenuItem"; - this.inputOverridesHotkeysToolStripMenuItem.Size = new System.Drawing.Size(229, 22); + this.inputOverridesHotkeysToolStripMenuItem.Size = new System.Drawing.Size(271, 24); this.inputOverridesHotkeysToolStripMenuItem.Text = "Input overrides Hotkeys"; this.inputOverridesHotkeysToolStripMenuItem.Click += new System.EventHandler(this.inputOverridesHotkeysToolStripMenuItem_Click); // // hotkeysOverrideInputToolStripMenuItem // this.hotkeysOverrideInputToolStripMenuItem.Name = "hotkeysOverrideInputToolStripMenuItem"; - this.hotkeysOverrideInputToolStripMenuItem.Size = new System.Drawing.Size(229, 22); + this.hotkeysOverrideInputToolStripMenuItem.Size = new System.Drawing.Size(271, 24); this.hotkeysOverrideInputToolStripMenuItem.Text = "Hotkeys override Input"; this.hotkeysOverrideInputToolStripMenuItem.Click += new System.EventHandler(this.hotkeysOverrideInputToolStripMenuItem_Click); // // toolStripSeparator10 // this.toolStripSeparator10.Name = "toolStripSeparator10"; - this.toolStripSeparator10.Size = new System.Drawing.Size(138, 6); + this.toolStripSeparator10.Size = new System.Drawing.Size(156, 6); // // saveConfigToolStripMenuItem // this.saveConfigToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.Save; this.saveConfigToolStripMenuItem.Name = "saveConfigToolStripMenuItem"; - this.saveConfigToolStripMenuItem.Size = new System.Drawing.Size(141, 22); + this.saveConfigToolStripMenuItem.Size = new System.Drawing.Size(159, 24); this.saveConfigToolStripMenuItem.Text = "Save Config"; this.saveConfigToolStripMenuItem.Click += new System.EventHandler(this.saveConfigToolStripMenuItem_Click); // @@ -1770,27 +1771,27 @@ // this.loadConfigToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.LoadConfig; this.loadConfigToolStripMenuItem.Name = "loadConfigToolStripMenuItem"; - this.loadConfigToolStripMenuItem.Size = new System.Drawing.Size(141, 22); + this.loadConfigToolStripMenuItem.Size = new System.Drawing.Size(159, 24); this.loadConfigToolStripMenuItem.Text = "Load Config"; this.loadConfigToolStripMenuItem.Click += new System.EventHandler(this.loadConfigToolStripMenuItem_Click); // // toolsToolStripMenuItem // this.toolsToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { - this.toolBoxToolStripMenuItem, - this.toolStripSeparator12, - this.rAMWatchToolStripMenuItem, - this.rAMSearchToolStripMenuItem, - this.rAMPokeToolStripMenuItem, - this.hexEditorToolStripMenuItem, - this.traceLoggerToolStripMenuItem, - this.tAStudioToolStripMenuItem, - this.virtualPadToolStripMenuItem, - this.toolStripSeparator11, - this.luaConsoleToolStripMenuItem, - this.cheatsToolStripMenuItem}); + this.toolBoxToolStripMenuItem, + this.toolStripSeparator12, + this.rAMWatchToolStripMenuItem, + this.rAMSearchToolStripMenuItem, + this.rAMPokeToolStripMenuItem, + this.hexEditorToolStripMenuItem, + this.traceLoggerToolStripMenuItem, + this.tAStudioToolStripMenuItem, + this.virtualPadToolStripMenuItem, + this.toolStripSeparator11, + this.luaConsoleToolStripMenuItem, + this.cheatsToolStripMenuItem}); this.toolsToolStripMenuItem.Name = "toolsToolStripMenuItem"; - this.toolsToolStripMenuItem.Size = new System.Drawing.Size(48, 19); + this.toolsToolStripMenuItem.Size = new System.Drawing.Size(57, 24); this.toolsToolStripMenuItem.Text = "&Tools"; this.toolsToolStripMenuItem.DropDownOpened += new System.EventHandler(this.toolsToolStripMenuItem_DropDownOpened); // @@ -1798,20 +1799,20 @@ // this.toolBoxToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.ToolBox; this.toolBoxToolStripMenuItem.Name = "toolBoxToolStripMenuItem"; - this.toolBoxToolStripMenuItem.Size = new System.Drawing.Size(143, 22); + this.toolBoxToolStripMenuItem.Size = new System.Drawing.Size(165, 24); this.toolBoxToolStripMenuItem.Text = "&Tool Box"; this.toolBoxToolStripMenuItem.Click += new System.EventHandler(this.toolBoxToolStripMenuItem_Click); // // toolStripSeparator12 // this.toolStripSeparator12.Name = "toolStripSeparator12"; - this.toolStripSeparator12.Size = new System.Drawing.Size(140, 6); + this.toolStripSeparator12.Size = new System.Drawing.Size(162, 6); // // rAMWatchToolStripMenuItem // this.rAMWatchToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.FindHS; this.rAMWatchToolStripMenuItem.Name = "rAMWatchToolStripMenuItem"; - this.rAMWatchToolStripMenuItem.Size = new System.Drawing.Size(143, 22); + this.rAMWatchToolStripMenuItem.Size = new System.Drawing.Size(165, 24); this.rAMWatchToolStripMenuItem.Text = "RAM &Watch"; this.rAMWatchToolStripMenuItem.Click += new System.EventHandler(this.RAMWatchToolStripMenuItem_Click); // @@ -1819,7 +1820,7 @@ // this.rAMSearchToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.search; this.rAMSearchToolStripMenuItem.Name = "rAMSearchToolStripMenuItem"; - this.rAMSearchToolStripMenuItem.Size = new System.Drawing.Size(143, 22); + this.rAMSearchToolStripMenuItem.Size = new System.Drawing.Size(165, 24); this.rAMSearchToolStripMenuItem.Text = "RAM &Search"; this.rAMSearchToolStripMenuItem.Click += new System.EventHandler(this.rAMSearchToolStripMenuItem_Click); // @@ -1827,7 +1828,7 @@ // this.rAMPokeToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.poke; this.rAMPokeToolStripMenuItem.Name = "rAMPokeToolStripMenuItem"; - this.rAMPokeToolStripMenuItem.Size = new System.Drawing.Size(143, 22); + this.rAMPokeToolStripMenuItem.Size = new System.Drawing.Size(165, 24); this.rAMPokeToolStripMenuItem.Text = "RAM &Poke"; this.rAMPokeToolStripMenuItem.Click += new System.EventHandler(this.RAMPokeToolStripMenuItem_Click); // @@ -1835,7 +1836,7 @@ // this.hexEditorToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.poke; this.hexEditorToolStripMenuItem.Name = "hexEditorToolStripMenuItem"; - this.hexEditorToolStripMenuItem.Size = new System.Drawing.Size(143, 22); + this.hexEditorToolStripMenuItem.Size = new System.Drawing.Size(165, 24); this.hexEditorToolStripMenuItem.Text = "&Hex Editor"; this.hexEditorToolStripMenuItem.Click += new System.EventHandler(this.hexEditorToolStripMenuItem_Click); // @@ -1843,7 +1844,7 @@ // this.traceLoggerToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.pencil; this.traceLoggerToolStripMenuItem.Name = "traceLoggerToolStripMenuItem"; - this.traceLoggerToolStripMenuItem.Size = new System.Drawing.Size(143, 22); + this.traceLoggerToolStripMenuItem.Size = new System.Drawing.Size(165, 24); this.traceLoggerToolStripMenuItem.Text = "Trace &Logger"; this.traceLoggerToolStripMenuItem.Click += new System.EventHandler(this.traceLoggerToolStripMenuItem_Click); // @@ -1851,7 +1852,7 @@ // this.tAStudioToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.TAStudio; this.tAStudioToolStripMenuItem.Name = "tAStudioToolStripMenuItem"; - this.tAStudioToolStripMenuItem.Size = new System.Drawing.Size(143, 22); + this.tAStudioToolStripMenuItem.Size = new System.Drawing.Size(165, 24); this.tAStudioToolStripMenuItem.Text = "&TAStudio"; this.tAStudioToolStripMenuItem.Click += new System.EventHandler(this.tAStudioToolStripMenuItem_Click); // @@ -1859,20 +1860,20 @@ // this.virtualPadToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.GameController; this.virtualPadToolStripMenuItem.Name = "virtualPadToolStripMenuItem"; - this.virtualPadToolStripMenuItem.Size = new System.Drawing.Size(143, 22); + this.virtualPadToolStripMenuItem.Size = new System.Drawing.Size(165, 24); this.virtualPadToolStripMenuItem.Text = "Virtual Pad"; this.virtualPadToolStripMenuItem.Click += new System.EventHandler(this.virtualPadToolStripMenuItem_Click); // // toolStripSeparator11 // this.toolStripSeparator11.Name = "toolStripSeparator11"; - this.toolStripSeparator11.Size = new System.Drawing.Size(140, 6); + this.toolStripSeparator11.Size = new System.Drawing.Size(162, 6); // // luaConsoleToolStripMenuItem // this.luaConsoleToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.Lua; this.luaConsoleToolStripMenuItem.Name = "luaConsoleToolStripMenuItem"; - this.luaConsoleToolStripMenuItem.Size = new System.Drawing.Size(143, 22); + this.luaConsoleToolStripMenuItem.Size = new System.Drawing.Size(165, 24); this.luaConsoleToolStripMenuItem.Text = "Lua Console"; this.luaConsoleToolStripMenuItem.Click += new System.EventHandler(this.luaConsoleToolStripMenuItem_Click); // @@ -1880,211 +1881,211 @@ // this.cheatsToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.Freeze; this.cheatsToolStripMenuItem.Name = "cheatsToolStripMenuItem"; - this.cheatsToolStripMenuItem.Size = new System.Drawing.Size(143, 22); + this.cheatsToolStripMenuItem.Size = new System.Drawing.Size(165, 24); this.cheatsToolStripMenuItem.Text = "Cheats"; this.cheatsToolStripMenuItem.Click += new System.EventHandler(this.cheatsToolStripMenuItem_Click); // // NESToolStripMenuItem // this.NESToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { - this.debuggerToolStripMenuItem, - this.pPUViewerToolStripMenuItem, - this.nametableViewerToolStripMenuItem, - this.gameGenieCodesToolStripMenuItem, - this.toolStripSeparator17, - this.graphicsSettingsToolStripMenuItem, - this.soundChannelsToolStripMenuItem, - this.nESSpeicalToolStripMenuItem}); + this.debuggerToolStripMenuItem, + this.pPUViewerToolStripMenuItem, + this.nametableViewerToolStripMenuItem, + this.gameGenieCodesToolStripMenuItem, + this.toolStripSeparator17, + this.graphicsSettingsToolStripMenuItem, + this.soundChannelsToolStripMenuItem, + this.nESSpeicalToolStripMenuItem}); this.NESToolStripMenuItem.Name = "NESToolStripMenuItem"; - this.NESToolStripMenuItem.Size = new System.Drawing.Size(40, 19); + this.NESToolStripMenuItem.Size = new System.Drawing.Size(48, 24); this.NESToolStripMenuItem.Text = "&NES"; // // debuggerToolStripMenuItem // this.debuggerToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.Bug; this.debuggerToolStripMenuItem.Name = "debuggerToolStripMenuItem"; - this.debuggerToolStripMenuItem.Size = new System.Drawing.Size(233, 22); + this.debuggerToolStripMenuItem.Size = new System.Drawing.Size(280, 24); this.debuggerToolStripMenuItem.Text = "&Debugger"; this.debuggerToolStripMenuItem.Click += new System.EventHandler(this.debuggerToolStripMenuItem_Click); // // pPUViewerToolStripMenuItem // this.pPUViewerToolStripMenuItem.Name = "pPUViewerToolStripMenuItem"; - this.pPUViewerToolStripMenuItem.Size = new System.Drawing.Size(233, 22); + this.pPUViewerToolStripMenuItem.Size = new System.Drawing.Size(280, 24); this.pPUViewerToolStripMenuItem.Text = "&PPU Viewer"; this.pPUViewerToolStripMenuItem.Click += new System.EventHandler(this.PPUViewerToolStripMenuItem_Click); // // nametableViewerToolStripMenuItem // this.nametableViewerToolStripMenuItem.Name = "nametableViewerToolStripMenuItem"; - this.nametableViewerToolStripMenuItem.Size = new System.Drawing.Size(233, 22); + this.nametableViewerToolStripMenuItem.Size = new System.Drawing.Size(280, 24); this.nametableViewerToolStripMenuItem.Text = "&Nametable Viewer"; this.nametableViewerToolStripMenuItem.Click += new System.EventHandler(this.nametableViewerToolStripMenuItem_Click); // // gameGenieCodesToolStripMenuItem // this.gameGenieCodesToolStripMenuItem.Name = "gameGenieCodesToolStripMenuItem"; - this.gameGenieCodesToolStripMenuItem.Size = new System.Drawing.Size(233, 22); + this.gameGenieCodesToolStripMenuItem.Size = new System.Drawing.Size(280, 24); this.gameGenieCodesToolStripMenuItem.Text = "&Game Genie Encoder/Decoder"; this.gameGenieCodesToolStripMenuItem.Click += new System.EventHandler(this.gameGenieCodesToolStripMenuItem_Click); // // toolStripSeparator17 // this.toolStripSeparator17.Name = "toolStripSeparator17"; - this.toolStripSeparator17.Size = new System.Drawing.Size(230, 6); + this.toolStripSeparator17.Size = new System.Drawing.Size(277, 6); // // graphicsSettingsToolStripMenuItem // this.graphicsSettingsToolStripMenuItem.Name = "graphicsSettingsToolStripMenuItem"; - this.graphicsSettingsToolStripMenuItem.Size = new System.Drawing.Size(233, 22); + this.graphicsSettingsToolStripMenuItem.Size = new System.Drawing.Size(280, 24); this.graphicsSettingsToolStripMenuItem.Text = "Graphics Settings"; this.graphicsSettingsToolStripMenuItem.Click += new System.EventHandler(this.graphicsSettingsToolStripMenuItem_Click); // // soundChannelsToolStripMenuItem // this.soundChannelsToolStripMenuItem.Name = "soundChannelsToolStripMenuItem"; - this.soundChannelsToolStripMenuItem.Size = new System.Drawing.Size(233, 22); + this.soundChannelsToolStripMenuItem.Size = new System.Drawing.Size(280, 24); this.soundChannelsToolStripMenuItem.Text = "Sound Channels"; this.soundChannelsToolStripMenuItem.Click += new System.EventHandler(this.soundChannelsToolStripMenuItem_Click); // // nESSpeicalToolStripMenuItem // this.nESSpeicalToolStripMenuItem.Name = "nESSpeicalToolStripMenuItem"; - this.nESSpeicalToolStripMenuItem.Size = new System.Drawing.Size(233, 22); + this.nESSpeicalToolStripMenuItem.Size = new System.Drawing.Size(280, 24); this.nESSpeicalToolStripMenuItem.Text = "Special Controls"; // // pCEToolStripMenuItem // this.pCEToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { - this.pceBGViewerToolStripMenuItem, - this.toolStripSeparator25, - this.pceAlwaysPerformSpriteLimitToolStripMenuItem, - this.pceAlwaysEqualizeVolumesToolStripMenuItem, - this.pceArcadeCardRewindEnableHackToolStripMenuItem, - this.pceGraphicsSettingsToolStripMenuItem}); + this.pceBGViewerToolStripMenuItem, + this.toolStripSeparator25, + this.pceAlwaysPerformSpriteLimitToolStripMenuItem, + this.pceAlwaysEqualizeVolumesToolStripMenuItem, + this.pceArcadeCardRewindEnableHackToolStripMenuItem, + this.pceGraphicsSettingsToolStripMenuItem}); this.pCEToolStripMenuItem.Name = "pCEToolStripMenuItem"; - this.pCEToolStripMenuItem.Size = new System.Drawing.Size(40, 19); + this.pCEToolStripMenuItem.Size = new System.Drawing.Size(46, 24); this.pCEToolStripMenuItem.Text = "&PCE"; this.pCEToolStripMenuItem.DropDownOpened += new System.EventHandler(this.pCEToolStripMenuItem_DropDownOpened); // // pceBGViewerToolStripMenuItem // this.pceBGViewerToolStripMenuItem.Name = "pceBGViewerToolStripMenuItem"; - this.pceBGViewerToolStripMenuItem.Size = new System.Drawing.Size(259, 22); + this.pceBGViewerToolStripMenuItem.Size = new System.Drawing.Size(310, 24); this.pceBGViewerToolStripMenuItem.Text = "&BG Viewer"; this.pceBGViewerToolStripMenuItem.Click += new System.EventHandler(this.justatestToolStripMenuItem_Click); // // toolStripSeparator25 // this.toolStripSeparator25.Name = "toolStripSeparator25"; - this.toolStripSeparator25.Size = new System.Drawing.Size(256, 6); + this.toolStripSeparator25.Size = new System.Drawing.Size(307, 6); // // pceAlwaysPerformSpriteLimitToolStripMenuItem // this.pceAlwaysPerformSpriteLimitToolStripMenuItem.Name = "pceAlwaysPerformSpriteLimitToolStripMenuItem"; - this.pceAlwaysPerformSpriteLimitToolStripMenuItem.Size = new System.Drawing.Size(259, 22); + this.pceAlwaysPerformSpriteLimitToolStripMenuItem.Size = new System.Drawing.Size(310, 24); this.pceAlwaysPerformSpriteLimitToolStripMenuItem.Text = "Always Perform Sprite Limit"; this.pceAlwaysPerformSpriteLimitToolStripMenuItem.Click += new System.EventHandler(this.pceAlwaysPerformSpriteLimitToolStripMenuItem_Click); // // pceAlwaysEqualizeVolumesToolStripMenuItem // this.pceAlwaysEqualizeVolumesToolStripMenuItem.Name = "pceAlwaysEqualizeVolumesToolStripMenuItem"; - this.pceAlwaysEqualizeVolumesToolStripMenuItem.Size = new System.Drawing.Size(259, 22); + this.pceAlwaysEqualizeVolumesToolStripMenuItem.Size = new System.Drawing.Size(310, 24); this.pceAlwaysEqualizeVolumesToolStripMenuItem.Text = "Always Equalize Volumes (PCE-CD)"; this.pceAlwaysEqualizeVolumesToolStripMenuItem.Click += new System.EventHandler(this.pceAlwayEqualizeVolumesLimitToolStripMenuItem_Click); // // pceArcadeCardRewindEnableHackToolStripMenuItem // this.pceArcadeCardRewindEnableHackToolStripMenuItem.Name = "pceArcadeCardRewindEnableHackToolStripMenuItem"; - this.pceArcadeCardRewindEnableHackToolStripMenuItem.Size = new System.Drawing.Size(259, 22); + this.pceArcadeCardRewindEnableHackToolStripMenuItem.Size = new System.Drawing.Size(310, 24); this.pceArcadeCardRewindEnableHackToolStripMenuItem.Text = "Arcade Card Rewind-Enable Hack"; this.pceArcadeCardRewindEnableHackToolStripMenuItem.Click += new System.EventHandler(this.pceArcadeCardRewindEnableHackToolStripMenuItem_Click); // // pceGraphicsSettingsToolStripMenuItem // this.pceGraphicsSettingsToolStripMenuItem.Name = "pceGraphicsSettingsToolStripMenuItem"; - this.pceGraphicsSettingsToolStripMenuItem.Size = new System.Drawing.Size(259, 22); + this.pceGraphicsSettingsToolStripMenuItem.Size = new System.Drawing.Size(310, 24); this.pceGraphicsSettingsToolStripMenuItem.Text = "Graphics Settings"; this.pceGraphicsSettingsToolStripMenuItem.Click += new System.EventHandler(this.pceGraphicsSettingsToolStripMenuItem_Click); // // sMSToolStripMenuItem // this.sMSToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { - this.smsEnableFMChipToolStripMenuItem, - this.smsOverclockWhenKnownSafeToolStripMenuItem, - this.smsForceStereoSeparationToolStripMenuItem, - this.smsSpriteLimitToolStripMenuItem, - this.showClippedRegionsToolStripMenuItem, - this.highlightActiveDisplayRegionToolStripMenuItem, - this.toolStripSeparator24, - this.smsGraphicsSettingsToolStripMenuItem}); + this.smsEnableFMChipToolStripMenuItem, + this.smsOverclockWhenKnownSafeToolStripMenuItem, + this.smsForceStereoSeparationToolStripMenuItem, + this.smsSpriteLimitToolStripMenuItem, + this.showClippedRegionsToolStripMenuItem, + this.highlightActiveDisplayRegionToolStripMenuItem, + this.toolStripSeparator24, + this.smsGraphicsSettingsToolStripMenuItem}); this.sMSToolStripMenuItem.Name = "sMSToolStripMenuItem"; - this.sMSToolStripMenuItem.Size = new System.Drawing.Size(42, 19); + this.sMSToolStripMenuItem.Size = new System.Drawing.Size(50, 24); this.sMSToolStripMenuItem.Text = "&SMS"; this.sMSToolStripMenuItem.DropDownOpened += new System.EventHandler(this.sMSToolStripMenuItem_DropDownOpened); // // smsEnableFMChipToolStripMenuItem // this.smsEnableFMChipToolStripMenuItem.Name = "smsEnableFMChipToolStripMenuItem"; - this.smsEnableFMChipToolStripMenuItem.Size = new System.Drawing.Size(241, 22); + this.smsEnableFMChipToolStripMenuItem.Size = new System.Drawing.Size(289, 24); this.smsEnableFMChipToolStripMenuItem.Text = "&Enable FM Chip"; this.smsEnableFMChipToolStripMenuItem.Click += new System.EventHandler(this.smsEnableFMChipToolStripMenuItem_Click); // // smsOverclockWhenKnownSafeToolStripMenuItem // this.smsOverclockWhenKnownSafeToolStripMenuItem.Name = "smsOverclockWhenKnownSafeToolStripMenuItem"; - this.smsOverclockWhenKnownSafeToolStripMenuItem.Size = new System.Drawing.Size(241, 22); + this.smsOverclockWhenKnownSafeToolStripMenuItem.Size = new System.Drawing.Size(289, 24); this.smsOverclockWhenKnownSafeToolStripMenuItem.Text = "&Overclock when Known Safe"; this.smsOverclockWhenKnownSafeToolStripMenuItem.Click += new System.EventHandler(this.smsOverclockWhenKnownSafeToolStripMenuItem_Click); // // smsForceStereoSeparationToolStripMenuItem // this.smsForceStereoSeparationToolStripMenuItem.Name = "smsForceStereoSeparationToolStripMenuItem"; - this.smsForceStereoSeparationToolStripMenuItem.Size = new System.Drawing.Size(241, 22); + this.smsForceStereoSeparationToolStripMenuItem.Size = new System.Drawing.Size(289, 24); this.smsForceStereoSeparationToolStripMenuItem.Text = "&Force Stereo Separation"; this.smsForceStereoSeparationToolStripMenuItem.Click += new System.EventHandler(this.smsForceStereoSeparationToolStripMenuItem_Click); // // smsSpriteLimitToolStripMenuItem // this.smsSpriteLimitToolStripMenuItem.Name = "smsSpriteLimitToolStripMenuItem"; - this.smsSpriteLimitToolStripMenuItem.Size = new System.Drawing.Size(241, 22); + this.smsSpriteLimitToolStripMenuItem.Size = new System.Drawing.Size(289, 24); this.smsSpriteLimitToolStripMenuItem.Text = "Sprite &Limit"; this.smsSpriteLimitToolStripMenuItem.Click += new System.EventHandler(this.smsSpriteLimitToolStripMenuItem_Click); // // showClippedRegionsToolStripMenuItem // this.showClippedRegionsToolStripMenuItem.Name = "showClippedRegionsToolStripMenuItem"; - this.showClippedRegionsToolStripMenuItem.Size = new System.Drawing.Size(241, 22); + this.showClippedRegionsToolStripMenuItem.Size = new System.Drawing.Size(289, 24); this.showClippedRegionsToolStripMenuItem.Text = "&Show Clipped Regions"; this.showClippedRegionsToolStripMenuItem.Click += new System.EventHandler(this.showClippedRegionsToolStripMenuItem_Click); // // highlightActiveDisplayRegionToolStripMenuItem // this.highlightActiveDisplayRegionToolStripMenuItem.Name = "highlightActiveDisplayRegionToolStripMenuItem"; - this.highlightActiveDisplayRegionToolStripMenuItem.Size = new System.Drawing.Size(241, 22); + this.highlightActiveDisplayRegionToolStripMenuItem.Size = new System.Drawing.Size(289, 24); this.highlightActiveDisplayRegionToolStripMenuItem.Text = "&Highlight Active Display Region"; this.highlightActiveDisplayRegionToolStripMenuItem.Click += new System.EventHandler(this.highlightActiveDisplayRegionToolStripMenuItem_Click); // // toolStripSeparator24 // this.toolStripSeparator24.Name = "toolStripSeparator24"; - this.toolStripSeparator24.Size = new System.Drawing.Size(238, 6); + this.toolStripSeparator24.Size = new System.Drawing.Size(286, 6); // // smsGraphicsSettingsToolStripMenuItem // this.smsGraphicsSettingsToolStripMenuItem.Name = "smsGraphicsSettingsToolStripMenuItem"; - this.smsGraphicsSettingsToolStripMenuItem.Size = new System.Drawing.Size(241, 22); + this.smsGraphicsSettingsToolStripMenuItem.Size = new System.Drawing.Size(289, 24); this.smsGraphicsSettingsToolStripMenuItem.Text = "&Graphics Settings..."; this.smsGraphicsSettingsToolStripMenuItem.Click += new System.EventHandler(this.smsGraphicsSettingsToolStripMenuItem_Click); // // tI83ToolStripMenuItem // this.tI83ToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { - this.keypadToolStripMenuItem, - this.toolStripSeparator13, - this.autoloadVirtualKeyboardToolStripMenuItem}); + this.keypadToolStripMenuItem, + this.toolStripSeparator13, + this.autoloadVirtualKeyboardToolStripMenuItem}); this.tI83ToolStripMenuItem.Name = "tI83ToolStripMenuItem"; - this.tI83ToolStripMenuItem.Size = new System.Drawing.Size(41, 19); + this.tI83ToolStripMenuItem.Size = new System.Drawing.Size(49, 24); this.tI83ToolStripMenuItem.Text = "TI83"; this.tI83ToolStripMenuItem.DropDownOpened += new System.EventHandler(this.tI83ToolStripMenuItem_DropDownOpened); // @@ -2092,344 +2093,352 @@ // this.keypadToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.calculator; this.keypadToolStripMenuItem.Name = "keypadToolStripMenuItem"; - this.keypadToolStripMenuItem.Size = new System.Drawing.Size(165, 22); + this.keypadToolStripMenuItem.Size = new System.Drawing.Size(194, 24); this.keypadToolStripMenuItem.Text = "Keypad"; this.keypadToolStripMenuItem.Click += new System.EventHandler(this.keypadToolStripMenuItem_Click); // // toolStripSeparator13 // this.toolStripSeparator13.Name = "toolStripSeparator13"; - this.toolStripSeparator13.Size = new System.Drawing.Size(162, 6); + this.toolStripSeparator13.Size = new System.Drawing.Size(191, 6); // // autoloadVirtualKeyboardToolStripMenuItem // this.autoloadVirtualKeyboardToolStripMenuItem.Checked = true; this.autoloadVirtualKeyboardToolStripMenuItem.CheckState = System.Windows.Forms.CheckState.Checked; this.autoloadVirtualKeyboardToolStripMenuItem.Name = "autoloadVirtualKeyboardToolStripMenuItem"; - this.autoloadVirtualKeyboardToolStripMenuItem.Size = new System.Drawing.Size(165, 22); + this.autoloadVirtualKeyboardToolStripMenuItem.Size = new System.Drawing.Size(194, 24); this.autoloadVirtualKeyboardToolStripMenuItem.Text = "Autoload Keypad"; this.autoloadVirtualKeyboardToolStripMenuItem.Click += new System.EventHandler(this.autoloadVirtualKeyboardToolStripMenuItem_Click); // // atariToolStripMenuItem // this.atariToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { - this.bWToolStripMenuItem, - this.p0DifficultyToolStripMenuItem, - this.rightDifficultyToolStripMenuItem, - this.toolStripSeparator26, - this.showBGToolStripMenuItem, - this.showPlayfieldToolStripMenuItem, - this.showPlayer1ToolStripMenuItem, - this.showPlayer2ToolStripMenuItem, - this.showMissle1ToolStripMenuItem, - this.showMissle2ToolStripMenuItem, - this.showBallToolStripMenuItem}); + this.bWToolStripMenuItem, + this.p0DifficultyToolStripMenuItem, + this.rightDifficultyToolStripMenuItem, + this.toolStripSeparator26, + this.showBGToolStripMenuItem, + this.showPlayfieldToolStripMenuItem, + this.showPlayer1ToolStripMenuItem, + this.showPlayer2ToolStripMenuItem, + this.showMissle1ToolStripMenuItem, + this.showMissle2ToolStripMenuItem, + this.showBallToolStripMenuItem}); this.atariToolStripMenuItem.Name = "atariToolStripMenuItem"; - this.atariToolStripMenuItem.Size = new System.Drawing.Size(44, 19); + this.atariToolStripMenuItem.Size = new System.Drawing.Size(53, 24); this.atariToolStripMenuItem.Text = "&Atari"; this.atariToolStripMenuItem.DropDownOpened += new System.EventHandler(this.atariToolStripMenuItem_DropDownOpened); // // bWToolStripMenuItem // this.bWToolStripMenuItem.Name = "bWToolStripMenuItem"; - this.bWToolStripMenuItem.Size = new System.Drawing.Size(153, 22); + this.bWToolStripMenuItem.Size = new System.Drawing.Size(177, 24); this.bWToolStripMenuItem.Text = "B-W TV"; this.bWToolStripMenuItem.Click += new System.EventHandler(this.bWToolStripMenuItem_Click); // // p0DifficultyToolStripMenuItem // this.p0DifficultyToolStripMenuItem.Name = "p0DifficultyToolStripMenuItem"; - this.p0DifficultyToolStripMenuItem.Size = new System.Drawing.Size(153, 22); + this.p0DifficultyToolStripMenuItem.Size = new System.Drawing.Size(177, 24); this.p0DifficultyToolStripMenuItem.Text = "Left Difficulty"; this.p0DifficultyToolStripMenuItem.Click += new System.EventHandler(this.p0DifficultyToolStripMenuItem_Click); // // rightDifficultyToolStripMenuItem // this.rightDifficultyToolStripMenuItem.Name = "rightDifficultyToolStripMenuItem"; - this.rightDifficultyToolStripMenuItem.Size = new System.Drawing.Size(153, 22); + this.rightDifficultyToolStripMenuItem.Size = new System.Drawing.Size(177, 24); this.rightDifficultyToolStripMenuItem.Text = "Right Difficulty"; this.rightDifficultyToolStripMenuItem.Click += new System.EventHandler(this.rightDifficultyToolStripMenuItem_Click); // // toolStripSeparator26 // this.toolStripSeparator26.Name = "toolStripSeparator26"; - this.toolStripSeparator26.Size = new System.Drawing.Size(150, 6); + this.toolStripSeparator26.Size = new System.Drawing.Size(174, 6); // // showBGToolStripMenuItem // this.showBGToolStripMenuItem.Name = "showBGToolStripMenuItem"; - this.showBGToolStripMenuItem.Size = new System.Drawing.Size(153, 22); + this.showBGToolStripMenuItem.Size = new System.Drawing.Size(177, 24); this.showBGToolStripMenuItem.Text = "Show BG"; this.showBGToolStripMenuItem.Click += new System.EventHandler(this.showBGToolStripMenuItem_Click); // // showPlayfieldToolStripMenuItem // this.showPlayfieldToolStripMenuItem.Name = "showPlayfieldToolStripMenuItem"; - this.showPlayfieldToolStripMenuItem.Size = new System.Drawing.Size(153, 22); + this.showPlayfieldToolStripMenuItem.Size = new System.Drawing.Size(177, 24); this.showPlayfieldToolStripMenuItem.Text = "Show Playfield"; this.showPlayfieldToolStripMenuItem.Click += new System.EventHandler(this.showPlayfieldToolStripMenuItem_Click); // // showPlayer1ToolStripMenuItem // this.showPlayer1ToolStripMenuItem.Name = "showPlayer1ToolStripMenuItem"; - this.showPlayer1ToolStripMenuItem.Size = new System.Drawing.Size(153, 22); + this.showPlayer1ToolStripMenuItem.Size = new System.Drawing.Size(177, 24); this.showPlayer1ToolStripMenuItem.Text = "Show Player 1"; this.showPlayer1ToolStripMenuItem.Click += new System.EventHandler(this.showPlayer1ToolStripMenuItem_Click); // // showPlayer2ToolStripMenuItem // this.showPlayer2ToolStripMenuItem.Name = "showPlayer2ToolStripMenuItem"; - this.showPlayer2ToolStripMenuItem.Size = new System.Drawing.Size(153, 22); + this.showPlayer2ToolStripMenuItem.Size = new System.Drawing.Size(177, 24); this.showPlayer2ToolStripMenuItem.Text = "Show Player 2"; this.showPlayer2ToolStripMenuItem.Click += new System.EventHandler(this.showPlayer2ToolStripMenuItem_Click); // // showMissle1ToolStripMenuItem // this.showMissle1ToolStripMenuItem.Name = "showMissle1ToolStripMenuItem"; - this.showMissle1ToolStripMenuItem.Size = new System.Drawing.Size(153, 22); + this.showMissle1ToolStripMenuItem.Size = new System.Drawing.Size(177, 24); this.showMissle1ToolStripMenuItem.Text = "Show Missle 1"; this.showMissle1ToolStripMenuItem.Click += new System.EventHandler(this.showMissle1ToolStripMenuItem_Click); // // showMissle2ToolStripMenuItem // this.showMissle2ToolStripMenuItem.Name = "showMissle2ToolStripMenuItem"; - this.showMissle2ToolStripMenuItem.Size = new System.Drawing.Size(153, 22); + this.showMissle2ToolStripMenuItem.Size = new System.Drawing.Size(177, 24); this.showMissle2ToolStripMenuItem.Text = "Show Missle 2"; this.showMissle2ToolStripMenuItem.Click += new System.EventHandler(this.showMissle2ToolStripMenuItem_Click); // // showBallToolStripMenuItem // this.showBallToolStripMenuItem.Name = "showBallToolStripMenuItem"; - this.showBallToolStripMenuItem.Size = new System.Drawing.Size(153, 22); + this.showBallToolStripMenuItem.Size = new System.Drawing.Size(177, 24); this.showBallToolStripMenuItem.Text = "Show Ball"; this.showBallToolStripMenuItem.Click += new System.EventHandler(this.showBallToolStripMenuItem_Click); // // gBToolStripMenuItem // this.gBToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { - this.forceDMGModeToolStripMenuItem, - this.gBAInCGBModeToolStripMenuItem, - this.multicartCompatibilityToolStripMenuItem, - this.toolStripSeparator8, - this.changeDMGPalettesToolStripMenuItem, - this.loadGBInSGBToolStripMenuItem1, - this.toolStripSeparator28, - this.gPUViewerToolStripMenuItem}); + this.forceDMGModeToolStripMenuItem, + this.gBAInCGBModeToolStripMenuItem, + this.multicartCompatibilityToolStripMenuItem, + this.toolStripSeparator8, + this.changeDMGPalettesToolStripMenuItem, + this.loadGBInSGBToolStripMenuItem1, + this.toolStripSeparator28, + this.gPUViewerToolStripMenuItem}); this.gBToolStripMenuItem.Name = "gBToolStripMenuItem"; - this.gBToolStripMenuItem.Size = new System.Drawing.Size(34, 19); + this.gBToolStripMenuItem.Size = new System.Drawing.Size(40, 24); this.gBToolStripMenuItem.Text = "&GB"; this.gBToolStripMenuItem.DropDownOpened += new System.EventHandler(this.gBToolStripMenuItem_DropDownOpened); // // forceDMGModeToolStripMenuItem // this.forceDMGModeToolStripMenuItem.Name = "forceDMGModeToolStripMenuItem"; - this.forceDMGModeToolStripMenuItem.Size = new System.Drawing.Size(197, 22); + this.forceDMGModeToolStripMenuItem.Size = new System.Drawing.Size(231, 24); this.forceDMGModeToolStripMenuItem.Text = "Force DMG Mode"; this.forceDMGModeToolStripMenuItem.Click += new System.EventHandler(this.forceDMGModeToolStripMenuItem_Click); // // gBAInCGBModeToolStripMenuItem // this.gBAInCGBModeToolStripMenuItem.Name = "gBAInCGBModeToolStripMenuItem"; - this.gBAInCGBModeToolStripMenuItem.Size = new System.Drawing.Size(197, 22); + this.gBAInCGBModeToolStripMenuItem.Size = new System.Drawing.Size(231, 24); this.gBAInCGBModeToolStripMenuItem.Text = "GBA in CGB mode"; this.gBAInCGBModeToolStripMenuItem.Click += new System.EventHandler(this.gBAInCGBModeToolStripMenuItem_Click); // // multicartCompatibilityToolStripMenuItem // this.multicartCompatibilityToolStripMenuItem.Name = "multicartCompatibilityToolStripMenuItem"; - this.multicartCompatibilityToolStripMenuItem.Size = new System.Drawing.Size(197, 22); + this.multicartCompatibilityToolStripMenuItem.Size = new System.Drawing.Size(231, 24); this.multicartCompatibilityToolStripMenuItem.Text = "Multicart Compatibility"; this.multicartCompatibilityToolStripMenuItem.Click += new System.EventHandler(this.multicartCompatibilityToolStripMenuItem_Click); // // toolStripSeparator8 // this.toolStripSeparator8.Name = "toolStripSeparator8"; - this.toolStripSeparator8.Size = new System.Drawing.Size(194, 6); + this.toolStripSeparator8.Size = new System.Drawing.Size(228, 6); // // changeDMGPalettesToolStripMenuItem // this.changeDMGPalettesToolStripMenuItem.Name = "changeDMGPalettesToolStripMenuItem"; - this.changeDMGPalettesToolStripMenuItem.Size = new System.Drawing.Size(197, 22); + this.changeDMGPalettesToolStripMenuItem.Size = new System.Drawing.Size(231, 24); this.changeDMGPalettesToolStripMenuItem.Text = "Change Palettes..."; this.changeDMGPalettesToolStripMenuItem.Click += new System.EventHandler(this.changeDMGPalettesToolStripMenuItem_Click); // // loadGBInSGBToolStripMenuItem1 // this.loadGBInSGBToolStripMenuItem1.Name = "loadGBInSGBToolStripMenuItem1"; - this.loadGBInSGBToolStripMenuItem1.Size = new System.Drawing.Size(197, 22); + this.loadGBInSGBToolStripMenuItem1.Size = new System.Drawing.Size(231, 24); this.loadGBInSGBToolStripMenuItem1.Text = "Load GB in SGB"; this.loadGBInSGBToolStripMenuItem1.Click += new System.EventHandler(this.loadGBInSGBToolStripMenuItem1_Click); // // toolStripSeparator28 // this.toolStripSeparator28.Name = "toolStripSeparator28"; - this.toolStripSeparator28.Size = new System.Drawing.Size(194, 6); + this.toolStripSeparator28.Size = new System.Drawing.Size(228, 6); // // gPUViewerToolStripMenuItem // this.gPUViewerToolStripMenuItem.Name = "gPUViewerToolStripMenuItem"; - this.gPUViewerToolStripMenuItem.Size = new System.Drawing.Size(197, 22); + this.gPUViewerToolStripMenuItem.Size = new System.Drawing.Size(231, 24); this.gPUViewerToolStripMenuItem.Text = "GPU Viewer"; this.gPUViewerToolStripMenuItem.Click += new System.EventHandler(this.gPUViewerToolStripMenuItem_Click); // // gBAToolStripMenuItem // this.gBAToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { - this.gPUViewToolStripMenuItem}); + this.gPUViewToolStripMenuItem}); this.gBAToolStripMenuItem.Name = "gBAToolStripMenuItem"; - this.gBAToolStripMenuItem.Size = new System.Drawing.Size(42, 19); + this.gBAToolStripMenuItem.Size = new System.Drawing.Size(50, 24); this.gBAToolStripMenuItem.Text = "GBA"; // // gPUViewToolStripMenuItem // this.gPUViewToolStripMenuItem.Name = "gPUViewToolStripMenuItem"; - this.gPUViewToolStripMenuItem.Size = new System.Drawing.Size(135, 22); + this.gPUViewToolStripMenuItem.Size = new System.Drawing.Size(155, 24); this.gPUViewToolStripMenuItem.Text = "GPU Viewer"; this.gPUViewToolStripMenuItem.Click += new System.EventHandler(this.gPUViewToolStripMenuItem_Click); // // sNESToolStripMenuItem // this.sNESToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { - this.displayToolStripMenuItem, - this.toolStripSeparator18, - this.graphicsDebuggerToolStripMenuItem, - this.loadGBInSGBToolStripMenuItem, - this.miSnesOptions}); + this.displayToolStripMenuItem, + this.toolStripSeparator18, + this.graphicsDebuggerToolStripMenuItem, + this.loadGBInSGBToolStripMenuItem, + this.SNESgameGenieCodesToolStripMenuItem, + this.miSnesOptions}); this.sNESToolStripMenuItem.Name = "sNESToolStripMenuItem"; - this.sNESToolStripMenuItem.Size = new System.Drawing.Size(46, 19); + this.sNESToolStripMenuItem.Size = new System.Drawing.Size(56, 24); this.sNESToolStripMenuItem.Text = "&SNES"; this.sNESToolStripMenuItem.DropDownOpened += new System.EventHandler(this.sNESToolStripMenuItem_DropDownOpened); // // displayToolStripMenuItem // this.displayToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { - this.bG0ToolStripMenuItem, - this.bG1ToolStripMenuItem, - this.bG2ToolStripMenuItem, - this.bG3ToolStripMenuItem, - this.oBJ0ToolStripMenuItem, - this.oBJ1ToolStripMenuItem, - this.oBJ2ToolStripMenuItem, - this.oBJ3ToolStripMenuItem}); + this.bG0ToolStripMenuItem, + this.bG1ToolStripMenuItem, + this.bG2ToolStripMenuItem, + this.bG3ToolStripMenuItem, + this.oBJ0ToolStripMenuItem, + this.oBJ1ToolStripMenuItem, + this.oBJ2ToolStripMenuItem, + this.oBJ3ToolStripMenuItem}); this.displayToolStripMenuItem.Name = "displayToolStripMenuItem"; - this.displayToolStripMenuItem.Size = new System.Drawing.Size(175, 22); + this.displayToolStripMenuItem.Size = new System.Drawing.Size(280, 24); this.displayToolStripMenuItem.Text = "Display"; this.displayToolStripMenuItem.DropDownOpened += new System.EventHandler(this.displayToolStripMenuItem_DropDownOpened); // // bG0ToolStripMenuItem // this.bG0ToolStripMenuItem.Name = "bG0ToolStripMenuItem"; - this.bG0ToolStripMenuItem.Size = new System.Drawing.Size(103, 22); + this.bG0ToolStripMenuItem.Size = new System.Drawing.Size(115, 24); this.bG0ToolStripMenuItem.Text = "BG 1"; this.bG0ToolStripMenuItem.Click += new System.EventHandler(this.bG1ToolStripMenuItem_Click); // // bG1ToolStripMenuItem // this.bG1ToolStripMenuItem.Name = "bG1ToolStripMenuItem"; - this.bG1ToolStripMenuItem.Size = new System.Drawing.Size(103, 22); + this.bG1ToolStripMenuItem.Size = new System.Drawing.Size(115, 24); this.bG1ToolStripMenuItem.Text = "BG 2"; this.bG1ToolStripMenuItem.Click += new System.EventHandler(this.bG1ToolStripMenuItem_Click_1); // // bG2ToolStripMenuItem // this.bG2ToolStripMenuItem.Name = "bG2ToolStripMenuItem"; - this.bG2ToolStripMenuItem.Size = new System.Drawing.Size(103, 22); + this.bG2ToolStripMenuItem.Size = new System.Drawing.Size(115, 24); this.bG2ToolStripMenuItem.Text = "BG 3"; this.bG2ToolStripMenuItem.Click += new System.EventHandler(this.bG2ToolStripMenuItem_Click); // // bG3ToolStripMenuItem // this.bG3ToolStripMenuItem.Name = "bG3ToolStripMenuItem"; - this.bG3ToolStripMenuItem.Size = new System.Drawing.Size(103, 22); + this.bG3ToolStripMenuItem.Size = new System.Drawing.Size(115, 24); this.bG3ToolStripMenuItem.Text = "BG 4"; this.bG3ToolStripMenuItem.Click += new System.EventHandler(this.bG3ToolStripMenuItem_Click); // // oBJ0ToolStripMenuItem // this.oBJ0ToolStripMenuItem.Name = "oBJ0ToolStripMenuItem"; - this.oBJ0ToolStripMenuItem.Size = new System.Drawing.Size(103, 22); + this.oBJ0ToolStripMenuItem.Size = new System.Drawing.Size(115, 24); this.oBJ0ToolStripMenuItem.Text = "OBJ 1"; this.oBJ0ToolStripMenuItem.Click += new System.EventHandler(this.oBJ0ToolStripMenuItem_Click); // // oBJ1ToolStripMenuItem // this.oBJ1ToolStripMenuItem.Name = "oBJ1ToolStripMenuItem"; - this.oBJ1ToolStripMenuItem.Size = new System.Drawing.Size(103, 22); + this.oBJ1ToolStripMenuItem.Size = new System.Drawing.Size(115, 24); this.oBJ1ToolStripMenuItem.Text = "OBJ 2"; this.oBJ1ToolStripMenuItem.Click += new System.EventHandler(this.oBJ1ToolStripMenuItem_Click); // // oBJ2ToolStripMenuItem // this.oBJ2ToolStripMenuItem.Name = "oBJ2ToolStripMenuItem"; - this.oBJ2ToolStripMenuItem.Size = new System.Drawing.Size(103, 22); + this.oBJ2ToolStripMenuItem.Size = new System.Drawing.Size(115, 24); this.oBJ2ToolStripMenuItem.Text = "OBJ 3"; this.oBJ2ToolStripMenuItem.Click += new System.EventHandler(this.oBJ2ToolStripMenuItem_Click); // // oBJ3ToolStripMenuItem // this.oBJ3ToolStripMenuItem.Name = "oBJ3ToolStripMenuItem"; - this.oBJ3ToolStripMenuItem.Size = new System.Drawing.Size(103, 22); + this.oBJ3ToolStripMenuItem.Size = new System.Drawing.Size(115, 24); this.oBJ3ToolStripMenuItem.Text = "OBJ 4"; this.oBJ3ToolStripMenuItem.Click += new System.EventHandler(this.oBJ3ToolStripMenuItem_Click); // // toolStripSeparator18 // this.toolStripSeparator18.Name = "toolStripSeparator18"; - this.toolStripSeparator18.Size = new System.Drawing.Size(172, 6); + this.toolStripSeparator18.Size = new System.Drawing.Size(277, 6); // // graphicsDebuggerToolStripMenuItem // this.graphicsDebuggerToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.Bug; this.graphicsDebuggerToolStripMenuItem.Name = "graphicsDebuggerToolStripMenuItem"; - this.graphicsDebuggerToolStripMenuItem.Size = new System.Drawing.Size(175, 22); + this.graphicsDebuggerToolStripMenuItem.Size = new System.Drawing.Size(280, 24); this.graphicsDebuggerToolStripMenuItem.Text = "Graphics Debugger"; this.graphicsDebuggerToolStripMenuItem.Click += new System.EventHandler(this.graphicsDebuggerToolStripMenuItem_Click); // // loadGBInSGBToolStripMenuItem // this.loadGBInSGBToolStripMenuItem.Name = "loadGBInSGBToolStripMenuItem"; - this.loadGBInSGBToolStripMenuItem.Size = new System.Drawing.Size(175, 22); + this.loadGBInSGBToolStripMenuItem.Size = new System.Drawing.Size(280, 24); this.loadGBInSGBToolStripMenuItem.Text = "Load GB in SGB"; this.loadGBInSGBToolStripMenuItem.Click += new System.EventHandler(this.loadGBInSGBToolStripMenuItem_Click); // + // SNESgameGenieCodesToolStripMenuItem + // + this.SNESgameGenieCodesToolStripMenuItem.Name = "SNESgameGenieCodesToolStripMenuItem"; + this.SNESgameGenieCodesToolStripMenuItem.Size = new System.Drawing.Size(280, 24); + this.SNESgameGenieCodesToolStripMenuItem.Text = "&Game Genie Encoder/Decoder"; + this.SNESgameGenieCodesToolStripMenuItem.Click += new System.EventHandler(this.SNESgameGenieCodesToolStripMenuItem_Click); + // // miSnesOptions // this.miSnesOptions.Name = "miSnesOptions"; - this.miSnesOptions.Size = new System.Drawing.Size(175, 22); + this.miSnesOptions.Size = new System.Drawing.Size(280, 24); this.miSnesOptions.Text = "&Options"; this.miSnesOptions.Click += new System.EventHandler(this.miSnesOptions_Click); // // colecoToolStripMenuItem // this.colecoToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { - this.skipBIOSIntroToolStripMenuItem}); + this.skipBIOSIntroToolStripMenuItem}); this.colecoToolStripMenuItem.Name = "colecoToolStripMenuItem"; - this.colecoToolStripMenuItem.Size = new System.Drawing.Size(56, 19); + this.colecoToolStripMenuItem.Size = new System.Drawing.Size(67, 24); this.colecoToolStripMenuItem.Text = "&Coleco"; this.colecoToolStripMenuItem.DropDownOpened += new System.EventHandler(this.colecoToolStripMenuItem_DropDownOpened); // // skipBIOSIntroToolStripMenuItem // this.skipBIOSIntroToolStripMenuItem.Name = "skipBIOSIntroToolStripMenuItem"; - this.skipBIOSIntroToolStripMenuItem.Size = new System.Drawing.Size(152, 22); + this.skipBIOSIntroToolStripMenuItem.Size = new System.Drawing.Size(177, 24); this.skipBIOSIntroToolStripMenuItem.Text = "&Skip BIOS intro"; this.skipBIOSIntroToolStripMenuItem.Click += new System.EventHandler(this.skipBIOIntroToolStripMenuItem_Click); // // helpToolStripMenuItem // this.helpToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { - this.helpToolStripMenuItem1, - this.forumsToolStripMenuItem, - this.aboutToolStripMenuItem}); + this.helpToolStripMenuItem1, + this.forumsToolStripMenuItem, + this.aboutToolStripMenuItem}); this.helpToolStripMenuItem.Name = "helpToolStripMenuItem"; - this.helpToolStripMenuItem.Size = new System.Drawing.Size(44, 19); + this.helpToolStripMenuItem.Size = new System.Drawing.Size(53, 24); this.helpToolStripMenuItem.Text = "&Help"; // // helpToolStripMenuItem1 // this.helpToolStripMenuItem1.Image = global::BizHawk.MultiClient.Properties.Resources.Help; this.helpToolStripMenuItem1.Name = "helpToolStripMenuItem1"; - this.helpToolStripMenuItem1.Size = new System.Drawing.Size(146, 22); + this.helpToolStripMenuItem1.Size = new System.Drawing.Size(166, 24); this.helpToolStripMenuItem1.Text = "&Online Help..."; this.helpToolStripMenuItem1.Click += new System.EventHandler(this.helpToolStripMenuItem1_Click); // @@ -2437,7 +2446,7 @@ // this.forumsToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.TAStudio; this.forumsToolStripMenuItem.Name = "forumsToolStripMenuItem"; - this.forumsToolStripMenuItem.Size = new System.Drawing.Size(146, 22); + this.forumsToolStripMenuItem.Size = new System.Drawing.Size(166, 24); this.forumsToolStripMenuItem.Text = "Forums..."; this.forumsToolStripMenuItem.Click += new System.EventHandler(this.forumsToolStripMenuItem_Click); // @@ -2445,37 +2454,37 @@ // this.aboutToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.CorpHawkSmall; this.aboutToolStripMenuItem.Name = "aboutToolStripMenuItem"; - this.aboutToolStripMenuItem.Size = new System.Drawing.Size(146, 22); + this.aboutToolStripMenuItem.Size = new System.Drawing.Size(166, 24); this.aboutToolStripMenuItem.Text = "&About"; this.aboutToolStripMenuItem.Click += new System.EventHandler(this.aboutToolStripMenuItem_Click); // // StatusSlot0 // this.StatusSlot0.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { - this.DumpStatus, - this.EmuStatus, - this.PlayRecordStatus, - this.PauseStrip, - this.RebootStatusBarIcon, - this.AVIStatusLabel, - this.StatusBarLedLight, - this.toolStripStatusLabel1, - this.StatusSlot1, - this.StatusSlot2, - this.StatusSlot3, - this.StatusSlot4, - this.StatusSlot5, - this.StatusSlot6, - this.StatusSlot7, - this.StatusSlot8, - this.StatusSlot9, - this.StatusSlot10, - this.CheatStatus, - this.KeyPriorityStatusBarLabel}); - this.StatusSlot0.Location = new System.Drawing.Point(0, 386); + this.DumpStatus, + this.EmuStatus, + this.PlayRecordStatus, + this.PauseStrip, + this.RebootStatusBarIcon, + this.AVIStatusLabel, + this.StatusBarLedLight, + this.toolStripStatusLabel1, + this.StatusSlot1, + this.StatusSlot2, + this.StatusSlot3, + this.StatusSlot4, + this.StatusSlot5, + this.StatusSlot6, + this.StatusSlot7, + this.StatusSlot8, + this.StatusSlot9, + this.StatusSlot10, + this.CheatStatus, + this.KeyPriorityStatusBarLabel}); + this.StatusSlot0.Location = new System.Drawing.Point(0, 383); this.StatusSlot0.Name = "StatusSlot0"; this.StatusSlot0.ShowItemToolTips = true; - this.StatusSlot0.Size = new System.Drawing.Size(470, 22); + this.StatusSlot0.Size = new System.Drawing.Size(470, 25); this.StatusSlot0.SizingGrip = false; this.StatusSlot0.TabIndex = 1; this.StatusSlot0.Text = "0"; @@ -2487,14 +2496,14 @@ this.DumpStatus.ImageTransparentColor = System.Drawing.Color.Magenta; this.DumpStatus.Name = "DumpStatus"; this.DumpStatus.ShowDropDownArrow = false; - this.DumpStatus.Size = new System.Drawing.Size(20, 20); + this.DumpStatus.Size = new System.Drawing.Size(20, 23); this.DumpStatus.Text = "No ROM loaded"; this.DumpStatus.Click += new System.EventHandler(this.DumpStatus_Click); // // EmuStatus // this.EmuStatus.Name = "EmuStatus"; - this.EmuStatus.Size = new System.Drawing.Size(0, 17); + this.EmuStatus.Size = new System.Drawing.Size(0, 20); // // PlayRecordStatus // @@ -2503,7 +2512,7 @@ this.PlayRecordStatus.ImageTransparentColor = System.Drawing.Color.Magenta; this.PlayRecordStatus.Name = "PlayRecordStatus"; this.PlayRecordStatus.ShowDropDownArrow = false; - this.PlayRecordStatus.Size = new System.Drawing.Size(20, 20); + this.PlayRecordStatus.Size = new System.Drawing.Size(20, 23); this.PlayRecordStatus.Text = "No movie is active"; // // PauseStrip @@ -2514,7 +2523,7 @@ this.PauseStrip.ImageTransparentColor = System.Drawing.Color.Magenta; this.PauseStrip.Name = "PauseStrip"; this.PauseStrip.ShowDropDownArrow = false; - this.PauseStrip.Size = new System.Drawing.Size(20, 20); + this.PauseStrip.Size = new System.Drawing.Size(20, 23); this.PauseStrip.Text = "toolStripDropDownButton1"; this.PauseStrip.ToolTipText = "Emulator is paused"; this.PauseStrip.Click += new System.EventHandler(this.PauseStrip_Click); @@ -2525,7 +2534,7 @@ this.RebootStatusBarIcon.Image = global::BizHawk.MultiClient.Properties.Resources.reboot; this.RebootStatusBarIcon.Name = "RebootStatusBarIcon"; this.RebootStatusBarIcon.RightToLeft = System.Windows.Forms.RightToLeft.No; - this.RebootStatusBarIcon.Size = new System.Drawing.Size(16, 17); + this.RebootStatusBarIcon.Size = new System.Drawing.Size(16, 20); this.RebootStatusBarIcon.Text = "Reboot"; this.RebootStatusBarIcon.ToolTipText = "A reboot of the core is needed for a setting change to take affect"; this.RebootStatusBarIcon.Click += new System.EventHandler(this.toolStripStatusLabel2_Click); @@ -2535,97 +2544,97 @@ this.AVIStatusLabel.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; this.AVIStatusLabel.Image = global::BizHawk.MultiClient.Properties.Resources.Blank; this.AVIStatusLabel.Name = "AVIStatusLabel"; - this.AVIStatusLabel.Size = new System.Drawing.Size(16, 17); + this.AVIStatusLabel.Size = new System.Drawing.Size(16, 20); this.AVIStatusLabel.Text = "AVI Capture"; // // StatusBarLedLight // this.StatusBarLedLight.Image = global::BizHawk.MultiClient.Properties.Resources.LightOff; this.StatusBarLedLight.Name = "StatusBarLedLight"; - this.StatusBarLedLight.Size = new System.Drawing.Size(16, 17); + this.StatusBarLedLight.Size = new System.Drawing.Size(16, 20); this.StatusBarLedLight.ToolTipText = "Disk Drive LED Light"; // // toolStripStatusLabel1 // this.toolStripStatusLabel1.BackColor = System.Drawing.SystemColors.Control; this.toolStripStatusLabel1.Name = "toolStripStatusLabel1"; - this.toolStripStatusLabel1.Size = new System.Drawing.Size(58, 17); + this.toolStripStatusLabel1.Size = new System.Drawing.Size(74, 20); this.toolStripStatusLabel1.Text = "Save slots"; // // StatusSlot1 // this.StatusSlot1.Name = "StatusSlot1"; - this.StatusSlot1.Size = new System.Drawing.Size(13, 17); + this.StatusSlot1.Size = new System.Drawing.Size(17, 20); this.StatusSlot1.Text = "1"; this.StatusSlot1.MouseUp += new System.Windows.Forms.MouseEventHandler(this.StatusSlot1_MouseUp); // // StatusSlot2 // this.StatusSlot2.Name = "StatusSlot2"; - this.StatusSlot2.Size = new System.Drawing.Size(13, 17); + this.StatusSlot2.Size = new System.Drawing.Size(17, 20); this.StatusSlot2.Text = "2"; this.StatusSlot2.MouseUp += new System.Windows.Forms.MouseEventHandler(this.StatusSlot2_MouseUp); // // StatusSlot3 // this.StatusSlot3.Name = "StatusSlot3"; - this.StatusSlot3.Size = new System.Drawing.Size(13, 17); + this.StatusSlot3.Size = new System.Drawing.Size(17, 20); this.StatusSlot3.Text = "3"; this.StatusSlot3.MouseUp += new System.Windows.Forms.MouseEventHandler(this.StatusSlot3_MouseUp); // // StatusSlot4 // this.StatusSlot4.Name = "StatusSlot4"; - this.StatusSlot4.Size = new System.Drawing.Size(13, 17); + this.StatusSlot4.Size = new System.Drawing.Size(17, 20); this.StatusSlot4.Text = "4"; this.StatusSlot4.MouseUp += new System.Windows.Forms.MouseEventHandler(this.StatusSlot4_MouseUp); // // StatusSlot5 // this.StatusSlot5.Name = "StatusSlot5"; - this.StatusSlot5.Size = new System.Drawing.Size(13, 17); + this.StatusSlot5.Size = new System.Drawing.Size(17, 20); this.StatusSlot5.Text = "5"; this.StatusSlot5.MouseUp += new System.Windows.Forms.MouseEventHandler(this.StatusSlot5_MouseUp); // // StatusSlot6 // this.StatusSlot6.Name = "StatusSlot6"; - this.StatusSlot6.Size = new System.Drawing.Size(13, 17); + this.StatusSlot6.Size = new System.Drawing.Size(17, 20); this.StatusSlot6.Text = "6"; this.StatusSlot6.MouseUp += new System.Windows.Forms.MouseEventHandler(this.StatusSlot6_MouseUp); // // StatusSlot7 // this.StatusSlot7.Name = "StatusSlot7"; - this.StatusSlot7.Size = new System.Drawing.Size(13, 17); + this.StatusSlot7.Size = new System.Drawing.Size(17, 20); this.StatusSlot7.Text = "7"; this.StatusSlot7.MouseUp += new System.Windows.Forms.MouseEventHandler(this.StatusSlot7_MouseUp); // // StatusSlot8 // this.StatusSlot8.Name = "StatusSlot8"; - this.StatusSlot8.Size = new System.Drawing.Size(13, 17); + this.StatusSlot8.Size = new System.Drawing.Size(17, 20); this.StatusSlot8.Text = "8"; this.StatusSlot8.MouseUp += new System.Windows.Forms.MouseEventHandler(this.StatusSlot8_MouseUp); // // StatusSlot9 // this.StatusSlot9.Name = "StatusSlot9"; - this.StatusSlot9.Size = new System.Drawing.Size(13, 17); + this.StatusSlot9.Size = new System.Drawing.Size(17, 20); this.StatusSlot9.Text = "9"; this.StatusSlot9.MouseUp += new System.Windows.Forms.MouseEventHandler(this.StatusSlot9_MouseUp); // // StatusSlot10 // this.StatusSlot10.Name = "StatusSlot10"; - this.StatusSlot10.Size = new System.Drawing.Size(13, 17); + this.StatusSlot10.Size = new System.Drawing.Size(17, 20); this.StatusSlot10.Text = "0"; this.StatusSlot10.MouseUp += new System.Windows.Forms.MouseEventHandler(this.StatusSlot10_MouseUp); // // CheatStatus // this.CheatStatus.Name = "CheatStatus"; - this.CheatStatus.Size = new System.Drawing.Size(0, 17); + this.CheatStatus.Size = new System.Drawing.Size(0, 20); this.CheatStatus.Click += new System.EventHandler(this.FreezeStatus_Click); // // KeyPriorityStatusBarLabel @@ -2633,36 +2642,36 @@ this.KeyPriorityStatusBarLabel.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; this.KeyPriorityStatusBarLabel.Image = global::BizHawk.MultiClient.Properties.Resources.Both; this.KeyPriorityStatusBarLabel.Name = "KeyPriorityStatusBarLabel"; - this.KeyPriorityStatusBarLabel.Size = new System.Drawing.Size(16, 17); + this.KeyPriorityStatusBarLabel.Size = new System.Drawing.Size(16, 20); this.KeyPriorityStatusBarLabel.Text = "KeyPriority"; this.KeyPriorityStatusBarLabel.Click += new System.EventHandler(this.KeyPriorityStatusBarLabel_Click); // // contextMenuStrip1 // this.contextMenuStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { - this.cmiOpenRom, - this.cmiLoadLastRom, - this.toolStripSeparator_afterRomLoading, - this.cmiRecordMovie, - this.cmiPlayMovie, - this.cmiRestartMovie, - this.cmiStopMovie, - this.cmiLoadLastMovie, - this.cmiMakeMovieBackup, - this.ContextMenuStopMovieNoSaving, - this.cmiViewSubtitles, - this.cmiAddSubtitle, - this.cmiViewComments, - this.saveMovieToolStripMenuItem1, - this.toolStripSeparator_afterMovie, - this.cmiUndoSavestate, - this.cmiSeparator20, - this.cmiScreenshot, - this.cmiScreenshotClipboard, - this.cmiCloseRom, - this.cmiShowMenu}); + this.cmiOpenRom, + this.cmiLoadLastRom, + this.toolStripSeparator_afterRomLoading, + this.cmiRecordMovie, + this.cmiPlayMovie, + this.cmiRestartMovie, + this.cmiStopMovie, + this.cmiLoadLastMovie, + this.cmiMakeMovieBackup, + this.ContextMenuStopMovieNoSaving, + this.cmiViewSubtitles, + this.cmiAddSubtitle, + this.cmiViewComments, + this.saveMovieToolStripMenuItem1, + this.toolStripSeparator_afterMovie, + this.cmiUndoSavestate, + this.cmiSeparator20, + this.cmiScreenshot, + this.cmiScreenshotClipboard, + this.cmiCloseRom, + this.cmiShowMenu}); this.contextMenuStrip1.Name = "contextMenuStrip1"; - this.contextMenuStrip1.Size = new System.Drawing.Size(217, 418); + this.contextMenuStrip1.Size = new System.Drawing.Size(257, 454); this.contextMenuStrip1.Closing += new System.Windows.Forms.ToolStripDropDownClosingEventHandler(this.contextMenuStrip1_Closing); this.contextMenuStrip1.Opening += new System.ComponentModel.CancelEventHandler(this.contextMenuStrip1_Opening); // @@ -2670,7 +2679,7 @@ // this.cmiOpenRom.Image = global::BizHawk.MultiClient.Properties.Resources.OpenFile; this.cmiOpenRom.Name = "cmiOpenRom"; - this.cmiOpenRom.Size = new System.Drawing.Size(216, 22); + this.cmiOpenRom.Size = new System.Drawing.Size(256, 24); this.cmiOpenRom.Text = "Open Rom"; this.cmiOpenRom.Click += new System.EventHandler(this.openRomToolStripMenuItem1_Click); // @@ -2678,20 +2687,20 @@ // this.cmiLoadLastRom.Image = global::BizHawk.MultiClient.Properties.Resources.Recent; this.cmiLoadLastRom.Name = "cmiLoadLastRom"; - this.cmiLoadLastRom.Size = new System.Drawing.Size(216, 22); + this.cmiLoadLastRom.Size = new System.Drawing.Size(256, 24); this.cmiLoadLastRom.Text = "Load Last ROM"; this.cmiLoadLastRom.Click += new System.EventHandler(this.loadLastROMToolStripMenuItem_Click); // // toolStripSeparator_afterRomLoading // this.toolStripSeparator_afterRomLoading.Name = "toolStripSeparator_afterRomLoading"; - this.toolStripSeparator_afterRomLoading.Size = new System.Drawing.Size(213, 6); + this.toolStripSeparator_afterRomLoading.Size = new System.Drawing.Size(253, 6); // // cmiRecordMovie // this.cmiRecordMovie.Image = global::BizHawk.MultiClient.Properties.Resources.RecordHS; this.cmiRecordMovie.Name = "cmiRecordMovie"; - this.cmiRecordMovie.Size = new System.Drawing.Size(216, 22); + this.cmiRecordMovie.Size = new System.Drawing.Size(256, 24); this.cmiRecordMovie.Text = "Record Movie"; this.cmiRecordMovie.Click += new System.EventHandler(this.recordMovieToolStripMenuItem1_Click); // @@ -2699,7 +2708,7 @@ // this.cmiPlayMovie.Image = global::BizHawk.MultiClient.Properties.Resources.Play; this.cmiPlayMovie.Name = "cmiPlayMovie"; - this.cmiPlayMovie.Size = new System.Drawing.Size(216, 22); + this.cmiPlayMovie.Size = new System.Drawing.Size(256, 24); this.cmiPlayMovie.Text = "Play Movie"; this.cmiPlayMovie.Click += new System.EventHandler(this.playMovieToolStripMenuItem1_Click); // @@ -2707,7 +2716,7 @@ // this.cmiRestartMovie.Image = global::BizHawk.MultiClient.Properties.Resources.restart; this.cmiRestartMovie.Name = "cmiRestartMovie"; - this.cmiRestartMovie.Size = new System.Drawing.Size(216, 22); + this.cmiRestartMovie.Size = new System.Drawing.Size(256, 24); this.cmiRestartMovie.Text = "Restart Movie"; this.cmiRestartMovie.Click += new System.EventHandler(this.restartMovieToolStripMenuItem_Click); // @@ -2715,7 +2724,7 @@ // this.cmiStopMovie.Image = global::BizHawk.MultiClient.Properties.Resources.Stop; this.cmiStopMovie.Name = "cmiStopMovie"; - this.cmiStopMovie.Size = new System.Drawing.Size(216, 22); + this.cmiStopMovie.Size = new System.Drawing.Size(256, 24); this.cmiStopMovie.Text = "Stop Movie"; this.cmiStopMovie.Click += new System.EventHandler(this.stopMovieToolStripMenuItem1_Click); // @@ -2723,14 +2732,14 @@ // this.cmiLoadLastMovie.Image = global::BizHawk.MultiClient.Properties.Resources.Recent; this.cmiLoadLastMovie.Name = "cmiLoadLastMovie"; - this.cmiLoadLastMovie.Size = new System.Drawing.Size(216, 22); + this.cmiLoadLastMovie.Size = new System.Drawing.Size(256, 24); this.cmiLoadLastMovie.Text = "Load Last Movie"; this.cmiLoadLastMovie.Click += new System.EventHandler(this.loadLastMovieToolStripMenuItem_Click); // // cmiMakeMovieBackup // this.cmiMakeMovieBackup.Name = "cmiMakeMovieBackup"; - this.cmiMakeMovieBackup.Size = new System.Drawing.Size(216, 22); + this.cmiMakeMovieBackup.Size = new System.Drawing.Size(256, 24); this.cmiMakeMovieBackup.Text = "Make Movie Backup"; this.cmiMakeMovieBackup.Click += new System.EventHandler(this.makeMovieBackupToolStripMenuItem_Click); // @@ -2738,28 +2747,28 @@ // this.ContextMenuStopMovieNoSaving.Image = global::BizHawk.MultiClient.Properties.Resources.Stop; this.ContextMenuStopMovieNoSaving.Name = "ContextMenuStopMovieNoSaving"; - this.ContextMenuStopMovieNoSaving.Size = new System.Drawing.Size(216, 22); + this.ContextMenuStopMovieNoSaving.Size = new System.Drawing.Size(256, 24); this.ContextMenuStopMovieNoSaving.Text = "Stop Movie without Saving"; this.ContextMenuStopMovieNoSaving.Click += new System.EventHandler(this.toolStripMenuItem6_Click); // // cmiViewSubtitles // this.cmiViewSubtitles.Name = "cmiViewSubtitles"; - this.cmiViewSubtitles.Size = new System.Drawing.Size(216, 22); + this.cmiViewSubtitles.Size = new System.Drawing.Size(256, 24); this.cmiViewSubtitles.Text = "View Subtitles"; this.cmiViewSubtitles.Click += new System.EventHandler(this.viewSubtitlesToolStripMenuItem_Click); // // cmiAddSubtitle // this.cmiAddSubtitle.Name = "cmiAddSubtitle"; - this.cmiAddSubtitle.Size = new System.Drawing.Size(216, 22); + this.cmiAddSubtitle.Size = new System.Drawing.Size(256, 24); this.cmiAddSubtitle.Text = "Add Subtitle"; this.cmiAddSubtitle.Click += new System.EventHandler(this.AddSubtitleToolStripMenuItem_Click); // // cmiViewComments // this.cmiViewComments.Name = "cmiViewComments"; - this.cmiViewComments.Size = new System.Drawing.Size(216, 22); + this.cmiViewComments.Size = new System.Drawing.Size(256, 24); this.cmiViewComments.Text = "View Comments"; this.cmiViewComments.Click += new System.EventHandler(this.viewCommentsToolStripMenuItem_Click); // @@ -2767,40 +2776,40 @@ // this.saveMovieToolStripMenuItem1.Image = global::BizHawk.MultiClient.Properties.Resources.SaveAs; this.saveMovieToolStripMenuItem1.Name = "saveMovieToolStripMenuItem1"; - this.saveMovieToolStripMenuItem1.Size = new System.Drawing.Size(216, 22); + this.saveMovieToolStripMenuItem1.Size = new System.Drawing.Size(256, 24); this.saveMovieToolStripMenuItem1.Text = "Save Movie"; this.saveMovieToolStripMenuItem1.Click += new System.EventHandler(this.saveMovieToolStripMenuItem1_Click); // // toolStripSeparator_afterMovie // this.toolStripSeparator_afterMovie.Name = "toolStripSeparator_afterMovie"; - this.toolStripSeparator_afterMovie.Size = new System.Drawing.Size(213, 6); + this.toolStripSeparator_afterMovie.Size = new System.Drawing.Size(253, 6); // // cmiUndoSavestate // this.cmiUndoSavestate.Image = global::BizHawk.MultiClient.Properties.Resources.undo; this.cmiUndoSavestate.Name = "cmiUndoSavestate"; - this.cmiUndoSavestate.Size = new System.Drawing.Size(216, 22); + this.cmiUndoSavestate.Size = new System.Drawing.Size(256, 24); this.cmiUndoSavestate.Text = "Undo Savestate"; this.cmiUndoSavestate.Click += new System.EventHandler(this.undoSavestateToolStripMenuItem_Click); // // cmiSeparator20 // this.cmiSeparator20.Name = "cmiSeparator20"; - this.cmiSeparator20.Size = new System.Drawing.Size(213, 6); + this.cmiSeparator20.Size = new System.Drawing.Size(253, 6); // // cmiScreenshot // this.cmiScreenshot.Image = global::BizHawk.MultiClient.Properties.Resources.camera; this.cmiScreenshot.Name = "cmiScreenshot"; - this.cmiScreenshot.Size = new System.Drawing.Size(216, 22); + this.cmiScreenshot.Size = new System.Drawing.Size(256, 24); this.cmiScreenshot.Text = "Screenshot"; // // cmiScreenshotClipboard // this.cmiScreenshotClipboard.Image = global::BizHawk.MultiClient.Properties.Resources.camera; this.cmiScreenshotClipboard.Name = "cmiScreenshotClipboard"; - this.cmiScreenshotClipboard.Size = new System.Drawing.Size(216, 22); + this.cmiScreenshotClipboard.Size = new System.Drawing.Size(256, 24); this.cmiScreenshotClipboard.Text = "Screenshot -> Clipboard"; this.cmiScreenshotClipboard.Click += new System.EventHandler(this.screenshotToClipboardToolStripMenuItem_Click); // @@ -2808,20 +2817,20 @@ // this.cmiCloseRom.Image = global::BizHawk.MultiClient.Properties.Resources.Close; this.cmiCloseRom.Name = "cmiCloseRom"; - this.cmiCloseRom.Size = new System.Drawing.Size(216, 22); + this.cmiCloseRom.Size = new System.Drawing.Size(256, 24); this.cmiCloseRom.Text = "Close ROM"; this.cmiCloseRom.Click += new System.EventHandler(this.closeROMToolStripMenuItem1_Click); // // cmiShowMenu // this.cmiShowMenu.Name = "cmiShowMenu"; - this.cmiShowMenu.Size = new System.Drawing.Size(216, 22); + this.cmiShowMenu.Size = new System.Drawing.Size(256, 24); this.cmiShowMenu.Text = "Show Menu"; this.cmiShowMenu.Click += new System.EventHandler(this.showMenuToolStripMenuItem_Click); // // MainForm // - this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 14F); + this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 16F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; this.ClientSize = new System.Drawing.Size(470, 408); this.Controls.Add(this.StatusSlot0); @@ -2844,106 +2853,106 @@ this.ResumeLayout(false); this.PerformLayout(); - } + } - #endregion + #endregion private System.Windows.Forms.ToolStripMenuItem fileToolStripMenuItem; - private System.Windows.Forms.ToolStripMenuItem openROMToolStripMenuItem; - private System.Windows.Forms.ToolStripSeparator toolStripMenuItem1; - private System.Windows.Forms.ToolStripMenuItem exitToolStripMenuItem; - private System.Windows.Forms.ToolStripMenuItem saveStateToolStripMenuItem; - private System.Windows.Forms.ToolStripMenuItem savestate1toolStripMenuItem; - private System.Windows.Forms.ToolStripMenuItem savestate2toolStripMenuItem; - private System.Windows.Forms.ToolStripMenuItem savestate3toolStripMenuItem; - private System.Windows.Forms.ToolStripMenuItem savestate4toolStripMenuItem; - private System.Windows.Forms.ToolStripMenuItem savestate5toolStripMenuItem; - private System.Windows.Forms.ToolStripMenuItem savestate6toolStripMenuItem; - private System.Windows.Forms.ToolStripMenuItem savestate7toolStripMenuItem; - private System.Windows.Forms.ToolStripMenuItem savestate8toolStripMenuItem; - private System.Windows.Forms.ToolStripMenuItem savestate9toolStripMenuItem; - private System.Windows.Forms.ToolStripMenuItem savestate0toolStripMenuItem; - private System.Windows.Forms.ToolStripMenuItem loadStateToolStripMenuItem; - private System.Windows.Forms.ToolStripSeparator toolStripMenuItem2; - private System.Windows.Forms.ToolStripMenuItem loadstate1toolStripMenuItem; - private System.Windows.Forms.ToolStripMenuItem loadstate2toolStripMenuItem; - private System.Windows.Forms.ToolStripMenuItem loadstate3toolStripMenuItem; - private System.Windows.Forms.ToolStripMenuItem loadstate4toolStripMenuItem; - private System.Windows.Forms.ToolStripMenuItem loadstate5toolStripMenuItem; - private System.Windows.Forms.ToolStripMenuItem loadstate6toolStripMenuItem; - private System.Windows.Forms.ToolStripMenuItem loadstate7toolStripMenuItem; - private System.Windows.Forms.ToolStripMenuItem loadstate8toolStripMenuItem; - private System.Windows.Forms.ToolStripMenuItem loadstate9toolStripMenuItem; - private System.Windows.Forms.ToolStripMenuItem loadstate0toolStripMenuItem; - private System.Windows.Forms.ToolStripMenuItem emulationToolStripMenuItem; - private System.Windows.Forms.ToolStripMenuItem viewToolStripMenuItem; - private System.Windows.Forms.ToolStripMenuItem configToolStripMenuItem; - private System.Windows.Forms.ToolStripMenuItem toolsToolStripMenuItem; - private System.Windows.Forms.ToolStripMenuItem helpToolStripMenuItem; - private System.Windows.Forms.ToolStripMenuItem pauseToolStripMenuItem; - private System.Windows.Forms.ToolStripSeparator toolStripSeparator1; - private System.Windows.Forms.ToolStripMenuItem rebootCoreToolStripMenuItem; - private System.Windows.Forms.ToolStripMenuItem resetToolStripMenuItem; - private System.Windows.Forms.ToolStripMenuItem helpToolStripMenuItem1; - private System.Windows.Forms.ToolStripMenuItem aboutToolStripMenuItem; - private System.Windows.Forms.ToolStripMenuItem controllersToolStripMenuItem; - private System.Windows.Forms.ToolStripMenuItem hotkeysToolStripMenuItem; - private System.Windows.Forms.ToolStripMenuItem rAMWatchToolStripMenuItem; - private System.Windows.Forms.ToolStripMenuItem rAMSearchToolStripMenuItem; - private System.Windows.Forms.ToolStripMenuItem hexEditorToolStripMenuItem; - private System.Windows.Forms.ToolStripMenuItem windowSizeMenuItem; - private System.Windows.Forms.ToolStripSeparator toolStripSeparator2; - private System.Windows.Forms.ToolStripMenuItem displayFPSToolStripMenuItem; - private System.Windows.Forms.ToolStripMenuItem displayFrameCounterToolStripMenuItem; - private System.Windows.Forms.ToolStripMenuItem displayInputToolStripMenuItem; - private System.Windows.Forms.ToolStripMenuItem displayLagCounterToolStripMenuItem; - private System.Windows.Forms.ToolStripMenuItem luaConsoleToolStripMenuItem; - private System.Windows.Forms.ToolStripMenuItem recentROMToolStripMenuItem; - private System.Windows.Forms.ToolStripMenuItem noneToolStripMenuItem; - private System.Windows.Forms.ToolStripSeparator toolStripSeparator3; - private System.Windows.Forms.ToolStripMenuItem clearToolStripMenuItem; - private System.Windows.Forms.ToolStripMenuItem autoloadMostRecentToolStripMenuItem; - private System.Windows.Forms.ToolStripSeparator toolStripSeparator4; - private System.Windows.Forms.ToolStripMenuItem saveSlotToolStripMenuItem; - private System.Windows.Forms.ToolStripMenuItem selectSlot1ToolStripMenuItem; - private System.Windows.Forms.ToolStripMenuItem selectSlot2ToolStripMenuItem; - private System.Windows.Forms.ToolStripMenuItem selectSlot3ToolStripMenuItem; - private System.Windows.Forms.ToolStripMenuItem selectSlot4ToolStripMenuItem; - private System.Windows.Forms.ToolStripMenuItem selectSlot5ToolStripMenuItem; - private System.Windows.Forms.ToolStripMenuItem selectSlot6ToolStripMenuItem; - private System.Windows.Forms.ToolStripMenuItem selectSlot7ToolStripMenuItem; - private System.Windows.Forms.ToolStripMenuItem selectSlot8ToolStripMenuItem; - private System.Windows.Forms.ToolStripMenuItem selectSlot9ToolStripMenuItem; - private System.Windows.Forms.ToolStripMenuItem selectSlot10ToolStripMenuItem; - private System.Windows.Forms.ToolStripMenuItem previousSlotToolStripMenuItem; - private System.Windows.Forms.ToolStripMenuItem nextSlotToolStripMenuItem; - private System.Windows.Forms.ToolStripSeparator toolStripSeparator5; - private System.Windows.Forms.ToolStripMenuItem saveToCurrentSlotToolStripMenuItem; - private System.Windows.Forms.ToolStripMenuItem loadCurrentSlotToolStripMenuItem; - private System.Windows.Forms.ToolStripMenuItem closeROMToolStripMenuItem; - private System.Windows.Forms.ToolStripSeparator toolStripSeparator6; - private System.Windows.Forms.ToolStripMenuItem saveNamedStateToolStripMenuItem; - private System.Windows.Forms.ToolStripSeparator toolStripSeparator7; - private System.Windows.Forms.ToolStripMenuItem loadNamedStateToolStripMenuItem; - private System.Windows.Forms.ToolStripMenuItem x1MenuItem; - private System.Windows.Forms.ToolStripMenuItem x2MenuItem; - private System.Windows.Forms.ToolStripMenuItem x3MenuItem; - private System.Windows.Forms.ToolStripMenuItem x4MenuItem; - private System.Windows.Forms.ToolStripMenuItem x5MenuItem; + private System.Windows.Forms.ToolStripMenuItem openROMToolStripMenuItem; + private System.Windows.Forms.ToolStripSeparator toolStripMenuItem1; + private System.Windows.Forms.ToolStripMenuItem exitToolStripMenuItem; + private System.Windows.Forms.ToolStripMenuItem saveStateToolStripMenuItem; + private System.Windows.Forms.ToolStripMenuItem savestate1toolStripMenuItem; + private System.Windows.Forms.ToolStripMenuItem savestate2toolStripMenuItem; + private System.Windows.Forms.ToolStripMenuItem savestate3toolStripMenuItem; + private System.Windows.Forms.ToolStripMenuItem savestate4toolStripMenuItem; + private System.Windows.Forms.ToolStripMenuItem savestate5toolStripMenuItem; + private System.Windows.Forms.ToolStripMenuItem savestate6toolStripMenuItem; + private System.Windows.Forms.ToolStripMenuItem savestate7toolStripMenuItem; + private System.Windows.Forms.ToolStripMenuItem savestate8toolStripMenuItem; + private System.Windows.Forms.ToolStripMenuItem savestate9toolStripMenuItem; + private System.Windows.Forms.ToolStripMenuItem savestate0toolStripMenuItem; + private System.Windows.Forms.ToolStripMenuItem loadStateToolStripMenuItem; + private System.Windows.Forms.ToolStripSeparator toolStripMenuItem2; + private System.Windows.Forms.ToolStripMenuItem loadstate1toolStripMenuItem; + private System.Windows.Forms.ToolStripMenuItem loadstate2toolStripMenuItem; + private System.Windows.Forms.ToolStripMenuItem loadstate3toolStripMenuItem; + private System.Windows.Forms.ToolStripMenuItem loadstate4toolStripMenuItem; + private System.Windows.Forms.ToolStripMenuItem loadstate5toolStripMenuItem; + private System.Windows.Forms.ToolStripMenuItem loadstate6toolStripMenuItem; + private System.Windows.Forms.ToolStripMenuItem loadstate7toolStripMenuItem; + private System.Windows.Forms.ToolStripMenuItem loadstate8toolStripMenuItem; + private System.Windows.Forms.ToolStripMenuItem loadstate9toolStripMenuItem; + private System.Windows.Forms.ToolStripMenuItem loadstate0toolStripMenuItem; + private System.Windows.Forms.ToolStripMenuItem emulationToolStripMenuItem; + private System.Windows.Forms.ToolStripMenuItem viewToolStripMenuItem; + private System.Windows.Forms.ToolStripMenuItem configToolStripMenuItem; + private System.Windows.Forms.ToolStripMenuItem toolsToolStripMenuItem; + private System.Windows.Forms.ToolStripMenuItem helpToolStripMenuItem; + private System.Windows.Forms.ToolStripMenuItem pauseToolStripMenuItem; + private System.Windows.Forms.ToolStripSeparator toolStripSeparator1; + private System.Windows.Forms.ToolStripMenuItem rebootCoreToolStripMenuItem; + private System.Windows.Forms.ToolStripMenuItem resetToolStripMenuItem; + private System.Windows.Forms.ToolStripMenuItem helpToolStripMenuItem1; + private System.Windows.Forms.ToolStripMenuItem aboutToolStripMenuItem; + private System.Windows.Forms.ToolStripMenuItem controllersToolStripMenuItem; + private System.Windows.Forms.ToolStripMenuItem hotkeysToolStripMenuItem; + private System.Windows.Forms.ToolStripMenuItem rAMWatchToolStripMenuItem; + private System.Windows.Forms.ToolStripMenuItem rAMSearchToolStripMenuItem; + private System.Windows.Forms.ToolStripMenuItem hexEditorToolStripMenuItem; + private System.Windows.Forms.ToolStripMenuItem windowSizeMenuItem; + private System.Windows.Forms.ToolStripSeparator toolStripSeparator2; + private System.Windows.Forms.ToolStripMenuItem displayFPSToolStripMenuItem; + private System.Windows.Forms.ToolStripMenuItem displayFrameCounterToolStripMenuItem; + private System.Windows.Forms.ToolStripMenuItem displayInputToolStripMenuItem; + private System.Windows.Forms.ToolStripMenuItem displayLagCounterToolStripMenuItem; + private System.Windows.Forms.ToolStripMenuItem luaConsoleToolStripMenuItem; + private System.Windows.Forms.ToolStripMenuItem recentROMToolStripMenuItem; + private System.Windows.Forms.ToolStripMenuItem noneToolStripMenuItem; + private System.Windows.Forms.ToolStripSeparator toolStripSeparator3; + private System.Windows.Forms.ToolStripMenuItem clearToolStripMenuItem; + private System.Windows.Forms.ToolStripMenuItem autoloadMostRecentToolStripMenuItem; + private System.Windows.Forms.ToolStripSeparator toolStripSeparator4; + private System.Windows.Forms.ToolStripMenuItem saveSlotToolStripMenuItem; + private System.Windows.Forms.ToolStripMenuItem selectSlot1ToolStripMenuItem; + private System.Windows.Forms.ToolStripMenuItem selectSlot2ToolStripMenuItem; + private System.Windows.Forms.ToolStripMenuItem selectSlot3ToolStripMenuItem; + private System.Windows.Forms.ToolStripMenuItem selectSlot4ToolStripMenuItem; + private System.Windows.Forms.ToolStripMenuItem selectSlot5ToolStripMenuItem; + private System.Windows.Forms.ToolStripMenuItem selectSlot6ToolStripMenuItem; + private System.Windows.Forms.ToolStripMenuItem selectSlot7ToolStripMenuItem; + private System.Windows.Forms.ToolStripMenuItem selectSlot8ToolStripMenuItem; + private System.Windows.Forms.ToolStripMenuItem selectSlot9ToolStripMenuItem; + private System.Windows.Forms.ToolStripMenuItem selectSlot10ToolStripMenuItem; + private System.Windows.Forms.ToolStripMenuItem previousSlotToolStripMenuItem; + private System.Windows.Forms.ToolStripMenuItem nextSlotToolStripMenuItem; + private System.Windows.Forms.ToolStripSeparator toolStripSeparator5; + private System.Windows.Forms.ToolStripMenuItem saveToCurrentSlotToolStripMenuItem; + private System.Windows.Forms.ToolStripMenuItem loadCurrentSlotToolStripMenuItem; + private System.Windows.Forms.ToolStripMenuItem closeROMToolStripMenuItem; + private System.Windows.Forms.ToolStripSeparator toolStripSeparator6; + private System.Windows.Forms.ToolStripMenuItem saveNamedStateToolStripMenuItem; + private System.Windows.Forms.ToolStripSeparator toolStripSeparator7; + private System.Windows.Forms.ToolStripMenuItem loadNamedStateToolStripMenuItem; + private System.Windows.Forms.ToolStripMenuItem x1MenuItem; + private System.Windows.Forms.ToolStripMenuItem x2MenuItem; + private System.Windows.Forms.ToolStripMenuItem x3MenuItem; + private System.Windows.Forms.ToolStripMenuItem x4MenuItem; + private System.Windows.Forms.ToolStripMenuItem x5MenuItem; private System.Windows.Forms.ToolStripMenuItem mzMenuItem; - private System.Windows.Forms.ToolStripMenuItem movieToolStripMenuItem; - private System.Windows.Forms.ToolStripMenuItem recentToolStripMenuItem; - private System.Windows.Forms.ToolStripMenuItem recordMovieToolStripMenuItem; - private System.Windows.Forms.ToolStripMenuItem playMovieToolStripMenuItem; - private System.Windows.Forms.ToolStripMenuItem stopMovieToolStripMenuItem; + private System.Windows.Forms.ToolStripMenuItem movieToolStripMenuItem; + private System.Windows.Forms.ToolStripMenuItem recentToolStripMenuItem; + private System.Windows.Forms.ToolStripMenuItem recordMovieToolStripMenuItem; + private System.Windows.Forms.ToolStripMenuItem playMovieToolStripMenuItem; + private System.Windows.Forms.ToolStripMenuItem stopMovieToolStripMenuItem; private System.Windows.Forms.ToolStripMenuItem playFromBeginningToolStripMenuItem; - private System.Windows.Forms.ToolStripSeparator toolStripSeparator9; - private System.Windows.Forms.ToolStripMenuItem gUIToolStripMenuItem; - private System.Windows.Forms.ToolStripMenuItem pauseWhenMenuActivatedToolStripMenuItem; - private System.Windows.Forms.ToolStripMenuItem soundToolStripMenuItem; - private System.Windows.Forms.ToolStripMenuItem rAMPokeToolStripMenuItem; - private System.Windows.Forms.ToolStripMenuItem saveWindowPositionToolStripMenuItem; - private System.Windows.Forms.ToolStripMenuItem startPausedToolStripMenuItem; + private System.Windows.Forms.ToolStripSeparator toolStripSeparator9; + private System.Windows.Forms.ToolStripMenuItem gUIToolStripMenuItem; + private System.Windows.Forms.ToolStripMenuItem pauseWhenMenuActivatedToolStripMenuItem; + private System.Windows.Forms.ToolStripMenuItem soundToolStripMenuItem; + private System.Windows.Forms.ToolStripMenuItem rAMPokeToolStripMenuItem; + private System.Windows.Forms.ToolStripMenuItem saveWindowPositionToolStripMenuItem; + private System.Windows.Forms.ToolStripMenuItem startPausedToolStripMenuItem; private System.Windows.Forms.ToolStripMenuItem frameSkipToolStripMenuItem; private System.Windows.Forms.ToolStripMenuItem miDisplayVsync; private System.Windows.Forms.ToolStripSeparator toolStripMenuItem3; @@ -2965,45 +2974,45 @@ private System.Windows.Forms.ToolStripMenuItem miSpeed150; private System.Windows.Forms.ToolStripMenuItem miSpeed200; private System.Windows.Forms.ToolStripMenuItem miLimitFramerate; - private System.Windows.Forms.ToolStripSeparator toolStripSeparator10; - private System.Windows.Forms.ToolStripMenuItem saveConfigToolStripMenuItem; - private System.Windows.Forms.ToolStripMenuItem loadConfigToolStripMenuItem; - private System.Windows.Forms.ToolStripMenuItem NESToolStripMenuItem; - private System.Windows.Forms.ToolStripMenuItem pPUViewerToolStripMenuItem; + private System.Windows.Forms.ToolStripSeparator toolStripSeparator10; + private System.Windows.Forms.ToolStripMenuItem saveConfigToolStripMenuItem; + private System.Windows.Forms.ToolStripMenuItem loadConfigToolStripMenuItem; + private System.Windows.Forms.ToolStripMenuItem NESToolStripMenuItem; + private System.Windows.Forms.ToolStripMenuItem pPUViewerToolStripMenuItem; private System.Windows.Forms.ToolStripMenuItem gameGenieCodesToolStripMenuItem; - private System.Windows.Forms.ToolStripSeparator toolStripSeparator11; - private System.Windows.Forms.ToolStripMenuItem cheatsToolStripMenuItem; + private System.Windows.Forms.ToolStripSeparator toolStripSeparator11; + private System.Windows.Forms.ToolStripMenuItem cheatsToolStripMenuItem; private System.Windows.Forms.ToolStripMenuItem forceGDIPPresentationToolStripMenuItem; - private System.Windows.Forms.ToolStripMenuItem debuggerToolStripMenuItem; - private System.Windows.Forms.ToolStripMenuItem nametableViewerToolStripMenuItem; - private System.Windows.Forms.ToolStripMenuItem toolBoxToolStripMenuItem; - private System.Windows.Forms.ToolStripSeparator toolStripSeparator12; - private System.Windows.Forms.ToolStripMenuItem switchToFullscreenToolStripMenuItem; - private System.Windows.Forms.StatusStrip StatusSlot0; - private System.Windows.Forms.ToolStripStatusLabel EmuStatus; - private System.Windows.Forms.ToolStripMenuItem messagesToolStripMenuItem; - private System.Windows.Forms.ToolStripMenuItem tI83ToolStripMenuItem; - private System.Windows.Forms.ToolStripMenuItem autoloadVirtualKeyboardToolStripMenuItem; - private System.Windows.Forms.ToolStripMenuItem keypadToolStripMenuItem; + private System.Windows.Forms.ToolStripMenuItem debuggerToolStripMenuItem; + private System.Windows.Forms.ToolStripMenuItem nametableViewerToolStripMenuItem; + private System.Windows.Forms.ToolStripMenuItem toolBoxToolStripMenuItem; + private System.Windows.Forms.ToolStripSeparator toolStripSeparator12; + private System.Windows.Forms.ToolStripMenuItem switchToFullscreenToolStripMenuItem; + private System.Windows.Forms.StatusStrip StatusSlot0; + private System.Windows.Forms.ToolStripStatusLabel EmuStatus; + private System.Windows.Forms.ToolStripMenuItem messagesToolStripMenuItem; + private System.Windows.Forms.ToolStripMenuItem tI83ToolStripMenuItem; + private System.Windows.Forms.ToolStripMenuItem autoloadVirtualKeyboardToolStripMenuItem; + private System.Windows.Forms.ToolStripMenuItem keypadToolStripMenuItem; private System.Windows.Forms.ToolStripSeparator toolStripSeparator13; - private System.Windows.Forms.ToolStripMenuItem pathsToolStripMenuItem; - private System.Windows.Forms.ToolStripSeparator toolStripSeparator14; - private System.Windows.Forms.ToolStripMenuItem readonlyToolStripMenuItem; - private System.Windows.Forms.ToolStripSeparator toolStripSeparator15; - private System.Windows.Forms.ToolStripMenuItem noneToolStripMenuItem1; - private System.Windows.Forms.ToolStripMenuItem clearToolStripMenuItem1; - private System.Windows.Forms.ToolStripMenuItem autoloadMostRecentToolStripMenuItem1; - private System.Windows.Forms.ToolStripSeparator toolStripSeparator16; - private System.Windows.Forms.ToolStripMenuItem displayRerecordCountToolStripMenuItem; - private System.Windows.Forms.ToolStripMenuItem screenshotToolStripMenuItem; - private System.Windows.Forms.ToolStripMenuItem screenshotF12ToolStripMenuItem; - private System.Windows.Forms.ToolStripMenuItem screenshotAsToolStripMenuItem; - private System.Windows.Forms.ToolStripMenuItem runInBackgroundToolStripMenuItem; - private System.Windows.Forms.ToolStripMenuItem bindSavestatesToMoviesToolStripMenuItem; - private System.Windows.Forms.ToolStripMenuItem acceptBackgroundInputToolStripMenuItem; + private System.Windows.Forms.ToolStripMenuItem pathsToolStripMenuItem; + private System.Windows.Forms.ToolStripSeparator toolStripSeparator14; + private System.Windows.Forms.ToolStripMenuItem readonlyToolStripMenuItem; + private System.Windows.Forms.ToolStripSeparator toolStripSeparator15; + private System.Windows.Forms.ToolStripMenuItem noneToolStripMenuItem1; + private System.Windows.Forms.ToolStripMenuItem clearToolStripMenuItem1; + private System.Windows.Forms.ToolStripMenuItem autoloadMostRecentToolStripMenuItem1; + private System.Windows.Forms.ToolStripSeparator toolStripSeparator16; + private System.Windows.Forms.ToolStripMenuItem displayRerecordCountToolStripMenuItem; + private System.Windows.Forms.ToolStripMenuItem screenshotToolStripMenuItem; + private System.Windows.Forms.ToolStripMenuItem screenshotF12ToolStripMenuItem; + private System.Windows.Forms.ToolStripMenuItem screenshotAsToolStripMenuItem; + private System.Windows.Forms.ToolStripMenuItem runInBackgroundToolStripMenuItem; + private System.Windows.Forms.ToolStripMenuItem bindSavestatesToMoviesToolStripMenuItem; + private System.Windows.Forms.ToolStripMenuItem acceptBackgroundInputToolStripMenuItem; private System.Windows.Forms.ToolStripMenuItem tAStudioToolStripMenuItem; - private System.Windows.Forms.ToolStripSeparator toolStripMenuItem4; - private System.Windows.Forms.ToolStripMenuItem displayStatusBarToolStripMenuItem; + private System.Windows.Forms.ToolStripSeparator toolStripMenuItem4; + private System.Windows.Forms.ToolStripMenuItem displayStatusBarToolStripMenuItem; private System.Windows.Forms.ToolStripSeparator toolStripSeparator17; private System.Windows.Forms.ToolStripMenuItem graphicsSettingsToolStripMenuItem; private System.Windows.Forms.ContextMenuStrip contextMenuStrip1; @@ -3040,7 +3049,7 @@ private System.Windows.Forms.ToolStripStatusLabel StatusSlot9; private System.Windows.Forms.ToolStripStatusLabel StatusSlot10; private System.Windows.Forms.ToolStripMenuItem cmiViewComments; - private System.Windows.Forms.ToolStripMenuItem displayLogWindowToolStripMenuItem; + private System.Windows.Forms.ToolStripMenuItem displayLogWindowToolStripMenuItem; private System.Windows.Forms.ToolStripMenuItem displaySubtitlesToolStripMenuItem; private System.Windows.Forms.ToolStripMenuItem AVIWAVToolStripMenuItem; private System.Windows.Forms.ToolStripMenuItem recordAVIToolStripMenuItem; @@ -3155,6 +3164,7 @@ private System.Windows.Forms.ToolStripMenuItem fullMovieLoadstatesToolStripMenuItem; private System.Windows.Forms.ToolStripMenuItem ContextMenuStopMovieNoSaving; private System.Windows.Forms.ToolStripMenuItem stopMovieWithoutSavingToolStripMenuItem; - } + private System.Windows.Forms.ToolStripMenuItem SNESgameGenieCodesToolStripMenuItem; + } } diff --git a/BizHawk.MultiClient/MainForm.cs b/BizHawk.MultiClient/MainForm.cs index 82509a4de2..80b3f5c0f1 100644 --- a/BizHawk.MultiClient/MainForm.cs +++ b/BizHawk.MultiClient/MainForm.cs @@ -3308,8 +3308,16 @@ namespace BizHawk.MultiClient public void LoadGameGenieEC() { - NESGameGenie gg = new NESGameGenie(); - gg.Show(); + if (Global.Emulator is NES) + { + NESGameGenie gg = new NESGameGenie(); + gg.Show(); + } + else if (Global.Emulator is LibsnesCore) + { + SNESGameGenie gg = new SNESGameGenie(); + gg.Show(); + } } public void LoadSNESGraphicsDebugger() @@ -3515,7 +3523,7 @@ namespace BizHawk.MultiClient } else { - FormBorderStyle = FormBorderStyle.FixedSingle; + FormBorderStyle = FormBorderStyle.Sizable; WindowState = FormWindowState.Normal; MainMenuStrip.Visible = true; StatusSlot0.Visible = Global.Config.DisplayStatusBar; @@ -5048,5 +5056,12 @@ namespace BizHawk.MultiClient return EMUVERSION; } } + + private void SNESgameGenieCodesToolStripMenuItem_Click(object sender, EventArgs e) + { + LoadGameGenieEC(); + } + + } } diff --git a/BizHawk.MultiClient/SNESTools/SNESGameGenie.Designer.cs b/BizHawk.MultiClient/SNESTools/SNESGameGenie.Designer.cs new file mode 100644 index 0000000000..168e9761d1 --- /dev/null +++ b/BizHawk.MultiClient/SNESTools/SNESGameGenie.Designer.cs @@ -0,0 +1,521 @@ +namespace BizHawk.MultiClient +{ + partial class SNESGameGenie + { + /// + /// 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 Windows Form Designer generated code + + /// + /// Required method for Designer support - do not modify + /// the contents of this method with the code editor. + /// + private void InitializeComponent() + { + this.GameGenieCode = new System.Windows.Forms.TextBox(); + this.GameGenieCodeBox = new System.Windows.Forms.GroupBox(); + this.label3 = new System.Windows.Forms.Label(); + this.label1 = new System.Windows.Forms.Label(); + this.ValueBox = new BizHawk.HexTextBox(); + this.AddressBox = new BizHawk.HexTextBox(); + this.AddCheat = new System.Windows.Forms.Button(); + this.ButtonPanel = new System.Windows.Forms.Panel(); + this.BF = new System.Windows.Forms.Button(); + this.BD = new System.Windows.Forms.Button(); + this.BB = new System.Windows.Forms.Button(); + this.B9 = new System.Windows.Forms.Button(); + this.B7 = new System.Windows.Forms.Button(); + this.B5 = new System.Windows.Forms.Button(); + this.B3 = new System.Windows.Forms.Button(); + this.BE = new System.Windows.Forms.Button(); + this.B6 = new System.Windows.Forms.Button(); + this.B1 = new System.Windows.Forms.Button(); + this.BC = new System.Windows.Forms.Button(); + this.BA = new System.Windows.Forms.Button(); + this.B8 = new System.Windows.Forms.Button(); + this.B4 = new System.Windows.Forms.Button(); + this.B2 = new System.Windows.Forms.Button(); + this.B0 = new System.Windows.Forms.Button(); + this.groupBox1 = new System.Windows.Forms.GroupBox(); + this.label6 = new System.Windows.Forms.Label(); + this.label4 = new System.Windows.Forms.Label(); + this.ClearButton = new System.Windows.Forms.Button(); + this.menuStrip1 = new System.Windows.Forms.MenuStrip(); + this.optionsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.autoloadToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.saveWindowPositionToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.toolStripSeparator1 = new System.Windows.Forms.ToolStripSeparator(); + this.exitToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.GameGenieCodeBox.SuspendLayout(); + this.ButtonPanel.SuspendLayout(); + this.groupBox1.SuspendLayout(); + this.menuStrip1.SuspendLayout(); + this.SuspendLayout(); + // + // GameGenieCode + // + this.GameGenieCode.CharacterCasing = System.Windows.Forms.CharacterCasing.Upper; + this.GameGenieCode.Location = new System.Drawing.Point(8, 23); + this.GameGenieCode.Margin = new System.Windows.Forms.Padding(4); + this.GameGenieCode.MaxLength = 8; + this.GameGenieCode.Name = "GameGenieCode"; + this.GameGenieCode.Size = new System.Drawing.Size(113, 22); + this.GameGenieCode.TabIndex = 20; + this.GameGenieCode.TextChanged += new System.EventHandler(this.GameGenieCode_TextChanged); + this.GameGenieCode.KeyDown += new System.Windows.Forms.KeyEventHandler(this.GameGenieCode_KeyDown); + this.GameGenieCode.KeyPress += new System.Windows.Forms.KeyPressEventHandler(this.GameGenieCode_KeyPress); + // + // GameGenieCodeBox + // + this.GameGenieCodeBox.Controls.Add(this.GameGenieCode); + this.GameGenieCodeBox.Location = new System.Drawing.Point(41, 127); + this.GameGenieCodeBox.Margin = new System.Windows.Forms.Padding(4); + this.GameGenieCodeBox.Name = "GameGenieCodeBox"; + this.GameGenieCodeBox.Padding = new System.Windows.Forms.Padding(4); + this.GameGenieCodeBox.Size = new System.Drawing.Size(153, 66); + this.GameGenieCodeBox.TabIndex = 1; + this.GameGenieCodeBox.TabStop = false; + this.GameGenieCodeBox.Text = "Game Genie Code"; + // + // label3 + // + this.label3.AutoSize = true; + this.label3.Location = new System.Drawing.Point(11, 56); + this.label3.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + this.label3.Name = "label3"; + this.label3.Size = new System.Drawing.Size(44, 17); + this.label3.TabIndex = 5; + this.label3.Text = "Value"; + // + // label1 + // + this.label1.AutoSize = true; + this.label1.Location = new System.Drawing.Point(11, 20); + this.label1.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + this.label1.Name = "label1"; + this.label1.Size = new System.Drawing.Size(60, 17); + this.label1.TabIndex = 3; + this.label1.Text = "Address"; + // + // ValueBox + // + this.ValueBox.CharacterCasing = System.Windows.Forms.CharacterCasing.Upper; + this.ValueBox.Location = new System.Drawing.Point(140, 51); + this.ValueBox.Margin = new System.Windows.Forms.Padding(4); + this.ValueBox.MaxLength = 2; + this.ValueBox.Name = "ValueBox"; + this.ValueBox.RightToLeft = System.Windows.Forms.RightToLeft.Yes; + this.ValueBox.Size = new System.Drawing.Size(35, 22); + this.ValueBox.TabIndex = 23; + this.ValueBox.TextChanged += new System.EventHandler(this.ValueBox_TextChanged); + // + // AddressBox + // + this.AddressBox.CharacterCasing = System.Windows.Forms.CharacterCasing.Upper; + this.AddressBox.Location = new System.Drawing.Point(100, 16); + this.AddressBox.Margin = new System.Windows.Forms.Padding(4); + this.AddressBox.MaxLength = 6; + this.AddressBox.Name = "AddressBox"; + this.AddressBox.RightToLeft = System.Windows.Forms.RightToLeft.Yes; + this.AddressBox.Size = new System.Drawing.Size(75, 22); + this.AddressBox.TabIndex = 21; + this.AddressBox.TextChanged += new System.EventHandler(this.AddressBox_TextChanged); + // + // AddCheat + // + this.AddCheat.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); + this.AddCheat.Location = new System.Drawing.Point(268, 257); + this.AddCheat.Margin = new System.Windows.Forms.Padding(4); + this.AddCheat.Name = "AddCheat"; + this.AddCheat.Size = new System.Drawing.Size(92, 26); + this.AddCheat.TabIndex = 33; + this.AddCheat.Text = "&Add Cheat"; + this.AddCheat.UseVisualStyleBackColor = true; + this.AddCheat.Click += new System.EventHandler(this.AddCheat_Click); + // + // ButtonPanel + // + this.ButtonPanel.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D; + this.ButtonPanel.Controls.Add(this.BF); + this.ButtonPanel.Controls.Add(this.BD); + this.ButtonPanel.Controls.Add(this.BB); + this.ButtonPanel.Controls.Add(this.B9); + this.ButtonPanel.Controls.Add(this.B7); + this.ButtonPanel.Controls.Add(this.B5); + this.ButtonPanel.Controls.Add(this.B3); + this.ButtonPanel.Controls.Add(this.BE); + this.ButtonPanel.Controls.Add(this.B6); + this.ButtonPanel.Controls.Add(this.B1); + this.ButtonPanel.Controls.Add(this.BC); + this.ButtonPanel.Controls.Add(this.BA); + this.ButtonPanel.Controls.Add(this.B8); + this.ButtonPanel.Controls.Add(this.B4); + this.ButtonPanel.Controls.Add(this.B2); + this.ButtonPanel.Controls.Add(this.B0); + this.ButtonPanel.Location = new System.Drawing.Point(41, 37); + this.ButtonPanel.Margin = new System.Windows.Forms.Padding(4); + this.ButtonPanel.Name = "ButtonPanel"; + this.ButtonPanel.Size = new System.Drawing.Size(319, 82); + this.ButtonPanel.TabIndex = 4; + // + // BF + // + this.BF.Location = new System.Drawing.Point(275, 43); + this.BF.Margin = new System.Windows.Forms.Padding(4); + this.BF.Name = "BF"; + this.BF.Size = new System.Drawing.Size(35, 28); + this.BF.TabIndex = 16; + this.BF.Text = "F"; + this.BF.UseVisualStyleBackColor = true; + this.BF.Click += new System.EventHandler(this.Keypad_Click); + // + // BD + // + this.BD.Location = new System.Drawing.Point(199, 43); + this.BD.Margin = new System.Windows.Forms.Padding(4); + this.BD.Name = "BD"; + this.BD.Size = new System.Drawing.Size(35, 28); + this.BD.TabIndex = 14; + this.BD.Text = "D"; + this.BD.UseVisualStyleBackColor = true; + this.BD.Click += new System.EventHandler(this.Keypad_Click); + // + // BB + // + this.BB.Location = new System.Drawing.Point(121, 43); + this.BB.Margin = new System.Windows.Forms.Padding(4); + this.BB.Name = "BB"; + this.BB.Size = new System.Drawing.Size(35, 28); + this.BB.TabIndex = 12; + this.BB.Text = "B"; + this.BB.UseVisualStyleBackColor = true; + this.BB.Click += new System.EventHandler(this.Keypad_Click); + // + // B9 + // + this.B9.Location = new System.Drawing.Point(45, 43); + this.B9.Margin = new System.Windows.Forms.Padding(4); + this.B9.Name = "B9"; + this.B9.Size = new System.Drawing.Size(35, 28); + this.B9.TabIndex = 10; + this.B9.Text = "9"; + this.B9.UseVisualStyleBackColor = true; + this.B9.Click += new System.EventHandler(this.Keypad_Click); + // + // B7 + // + this.B7.Location = new System.Drawing.Point(275, 6); + this.B7.Margin = new System.Windows.Forms.Padding(4); + this.B7.Name = "B7"; + this.B7.Size = new System.Drawing.Size(35, 28); + this.B7.TabIndex = 8; + this.B7.Text = "7"; + this.B7.UseVisualStyleBackColor = true; + this.B7.Click += new System.EventHandler(this.Keypad_Click); + // + // B5 + // + this.B5.Location = new System.Drawing.Point(199, 7); + this.B5.Margin = new System.Windows.Forms.Padding(4); + this.B5.Name = "B5"; + this.B5.Size = new System.Drawing.Size(35, 28); + this.B5.TabIndex = 6; + this.B5.Text = "5"; + this.B5.UseVisualStyleBackColor = true; + this.B5.Click += new System.EventHandler(this.Keypad_Click); + // + // B3 + // + this.B3.Location = new System.Drawing.Point(121, 7); + this.B3.Margin = new System.Windows.Forms.Padding(4); + this.B3.Name = "B3"; + this.B3.Size = new System.Drawing.Size(35, 28); + this.B3.TabIndex = 4; + this.B3.Text = "3"; + this.B3.UseVisualStyleBackColor = true; + this.B3.Click += new System.EventHandler(this.Keypad_Click); + // + // BE + // + this.BE.Location = new System.Drawing.Point(237, 43); + this.BE.Margin = new System.Windows.Forms.Padding(4); + this.BE.Name = "BE"; + this.BE.Size = new System.Drawing.Size(35, 28); + this.BE.TabIndex = 15; + this.BE.Text = "E"; + this.BE.UseVisualStyleBackColor = true; + this.BE.Click += new System.EventHandler(this.Keypad_Click); + // + // B6 + // + this.B6.Location = new System.Drawing.Point(237, 6); + this.B6.Margin = new System.Windows.Forms.Padding(4); + this.B6.Name = "B6"; + this.B6.Size = new System.Drawing.Size(35, 28); + this.B6.TabIndex = 7; + this.B6.Text = "6"; + this.B6.UseVisualStyleBackColor = true; + this.B6.Click += new System.EventHandler(this.Keypad_Click); + // + // B1 + // + this.B1.Location = new System.Drawing.Point(45, 7); + this.B1.Margin = new System.Windows.Forms.Padding(4); + this.B1.Name = "B1"; + this.B1.Size = new System.Drawing.Size(35, 28); + this.B1.TabIndex = 2; + this.B1.Text = "1"; + this.B1.UseVisualStyleBackColor = true; + this.B1.Click += new System.EventHandler(this.Keypad_Click); + // + // BC + // + this.BC.Location = new System.Drawing.Point(161, 43); + this.BC.Margin = new System.Windows.Forms.Padding(4); + this.BC.Name = "BC"; + this.BC.Size = new System.Drawing.Size(35, 28); + this.BC.TabIndex = 13; + this.BC.Text = "C"; + this.BC.UseVisualStyleBackColor = true; + this.BC.Click += new System.EventHandler(this.Keypad_Click); + // + // BA + // + this.BA.Location = new System.Drawing.Point(84, 43); + this.BA.Margin = new System.Windows.Forms.Padding(4); + this.BA.Name = "BA"; + this.BA.Size = new System.Drawing.Size(35, 28); + this.BA.TabIndex = 11; + this.BA.Text = "A"; + this.BA.UseVisualStyleBackColor = true; + this.BA.Click += new System.EventHandler(this.Keypad_Click); + // + // B8 + // + this.B8.Location = new System.Drawing.Point(8, 43); + this.B8.Margin = new System.Windows.Forms.Padding(4); + this.B8.Name = "B8"; + this.B8.Size = new System.Drawing.Size(35, 28); + this.B8.TabIndex = 9; + this.B8.Text = "8"; + this.B8.UseVisualStyleBackColor = true; + this.B8.Click += new System.EventHandler(this.Keypad_Click); + // + // B4 + // + this.B4.Location = new System.Drawing.Point(161, 7); + this.B4.Margin = new System.Windows.Forms.Padding(4); + this.B4.Name = "B4"; + this.B4.Size = new System.Drawing.Size(35, 28); + this.B4.TabIndex = 5; + this.B4.Text = "4"; + this.B4.UseVisualStyleBackColor = true; + this.B4.Click += new System.EventHandler(this.Keypad_Click); + // + // B2 + // + this.B2.Location = new System.Drawing.Point(84, 7); + this.B2.Margin = new System.Windows.Forms.Padding(4); + this.B2.Name = "B2"; + this.B2.Size = new System.Drawing.Size(35, 28); + this.B2.TabIndex = 3; + this.B2.Text = "2"; + this.B2.UseVisualStyleBackColor = true; + this.B2.Click += new System.EventHandler(this.Keypad_Click); + // + // B0 + // + this.B0.Location = new System.Drawing.Point(8, 6); + this.B0.Margin = new System.Windows.Forms.Padding(4); + this.B0.Name = "B0"; + this.B0.Size = new System.Drawing.Size(35, 28); + this.B0.TabIndex = 1; + this.B0.Text = "0"; + this.B0.UseVisualStyleBackColor = true; + this.B0.Click += new System.EventHandler(this.Keypad_Click); + // + // groupBox1 + // + this.groupBox1.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); + this.groupBox1.Controls.Add(this.label6); + this.groupBox1.Controls.Add(this.label4); + this.groupBox1.Controls.Add(this.label3); + this.groupBox1.Controls.Add(this.label1); + this.groupBox1.Controls.Add(this.AddressBox); + this.groupBox1.Controls.Add(this.ValueBox); + this.groupBox1.Location = new System.Drawing.Point(41, 201); + this.groupBox1.Margin = new System.Windows.Forms.Padding(4); + this.groupBox1.Name = "groupBox1"; + this.groupBox1.Padding = new System.Windows.Forms.Padding(4); + this.groupBox1.Size = new System.Drawing.Size(183, 114); + this.groupBox1.TabIndex = 5; + this.groupBox1.TabStop = false; + // + // label6 + // + this.label6.AutoSize = true; + this.label6.Location = new System.Drawing.Point(116, 56); + this.label6.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + this.label6.Name = "label6"; + this.label6.Size = new System.Drawing.Size(22, 17); + this.label6.TabIndex = 9; + this.label6.Text = "0x"; + // + // label4 + // + this.label4.AutoSize = true; + this.label4.Location = new System.Drawing.Point(76, 20); + this.label4.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + this.label4.Name = "label4"; + this.label4.Size = new System.Drawing.Size(22, 17); + this.label4.TabIndex = 7; + this.label4.Text = "0x"; + // + // ClearButton + // + this.ClearButton.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); + this.ClearButton.Location = new System.Drawing.Point(288, 201); + this.ClearButton.Margin = new System.Windows.Forms.Padding(4); + this.ClearButton.Name = "ClearButton"; + this.ClearButton.Size = new System.Drawing.Size(72, 28); + this.ClearButton.TabIndex = 32; + this.ClearButton.Text = "&Clear"; + this.ClearButton.UseVisualStyleBackColor = true; + this.ClearButton.Click += new System.EventHandler(this.ClearButton_Click); + // + // menuStrip1 + // + this.menuStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { + this.optionsToolStripMenuItem}); + this.menuStrip1.Location = new System.Drawing.Point(0, 0); + this.menuStrip1.Name = "menuStrip1"; + this.menuStrip1.Padding = new System.Windows.Forms.Padding(8, 2, 0, 2); + this.menuStrip1.Size = new System.Drawing.Size(403, 28); + this.menuStrip1.TabIndex = 8; + this.menuStrip1.Text = "menuStrip1"; + // + // optionsToolStripMenuItem + // + this.optionsToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { + this.autoloadToolStripMenuItem, + this.saveWindowPositionToolStripMenuItem, + this.toolStripSeparator1, + this.exitToolStripMenuItem}); + this.optionsToolStripMenuItem.Name = "optionsToolStripMenuItem"; + this.optionsToolStripMenuItem.Size = new System.Drawing.Size(73, 24); + this.optionsToolStripMenuItem.Text = "&Options"; + this.optionsToolStripMenuItem.DropDownOpened += new System.EventHandler(this.optionsToolStripMenuItem_DropDownOpened); + // + // autoloadToolStripMenuItem + // + this.autoloadToolStripMenuItem.Name = "autoloadToolStripMenuItem"; + this.autoloadToolStripMenuItem.Size = new System.Drawing.Size(225, 24); + this.autoloadToolStripMenuItem.Text = "Auto-load"; + this.autoloadToolStripMenuItem.Click += new System.EventHandler(this.autoloadToolStripMenuItem_Click); + // + // saveWindowPositionToolStripMenuItem + // + this.saveWindowPositionToolStripMenuItem.Name = "saveWindowPositionToolStripMenuItem"; + this.saveWindowPositionToolStripMenuItem.Size = new System.Drawing.Size(225, 24); + this.saveWindowPositionToolStripMenuItem.Text = "Save Window Position"; + this.saveWindowPositionToolStripMenuItem.Click += new System.EventHandler(this.saveWindowPositionToolStripMenuItem_Click); + // + // toolStripSeparator1 + // + this.toolStripSeparator1.Name = "toolStripSeparator1"; + this.toolStripSeparator1.Size = new System.Drawing.Size(222, 6); + // + // exitToolStripMenuItem + // + this.exitToolStripMenuItem.Name = "exitToolStripMenuItem"; + this.exitToolStripMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Alt | System.Windows.Forms.Keys.F4))); + this.exitToolStripMenuItem.Size = new System.Drawing.Size(225, 24); + this.exitToolStripMenuItem.Text = "E&xit"; + this.exitToolStripMenuItem.Click += new System.EventHandler(this.exitToolStripMenuItem_Click); + // + // SNESGameGenie + // + this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 16F); + this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; + this.ClientSize = new System.Drawing.Size(403, 315); + this.Controls.Add(this.ClearButton); + this.Controls.Add(this.groupBox1); + this.Controls.Add(this.ButtonPanel); + this.Controls.Add(this.AddCheat); + this.Controls.Add(this.GameGenieCodeBox); + this.Controls.Add(this.menuStrip1); + this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.Fixed3D; + this.MainMenuStrip = this.menuStrip1; + this.Margin = new System.Windows.Forms.Padding(4); + this.MaximizeBox = false; + this.MaximumSize = new System.Drawing.Size(413, 354); + this.MinimumSize = new System.Drawing.Size(413, 354); + this.Name = "SNESGameGenie"; + this.ShowIcon = false; + this.Text = "Game Genie Encoder / Decoder"; + this.GameGenieCodeBox.ResumeLayout(false); + this.GameGenieCodeBox.PerformLayout(); + this.ButtonPanel.ResumeLayout(false); + this.groupBox1.ResumeLayout(false); + this.groupBox1.PerformLayout(); + this.menuStrip1.ResumeLayout(false); + this.menuStrip1.PerformLayout(); + this.ResumeLayout(false); + this.PerformLayout(); + + } + + #endregion + + private System.Windows.Forms.TextBox GameGenieCode; + private System.Windows.Forms.GroupBox GameGenieCodeBox; + private System.Windows.Forms.Label label3; + private System.Windows.Forms.Label label1; + private HexTextBox ValueBox; + private HexTextBox AddressBox; + private System.Windows.Forms.Button AddCheat; + private System.Windows.Forms.Panel ButtonPanel; + private System.Windows.Forms.Button B6; + private System.Windows.Forms.Button B4; + private System.Windows.Forms.Button B2; + private System.Windows.Forms.Button B0; + private System.Windows.Forms.Button BE; + private System.Windows.Forms.Button BC; + private System.Windows.Forms.Button BA; + private System.Windows.Forms.Button B8; + private System.Windows.Forms.Button BF; + private System.Windows.Forms.Button BD; + private System.Windows.Forms.Button BB; + private System.Windows.Forms.Button B9; + private System.Windows.Forms.Button B7; + private System.Windows.Forms.Button B5; + private System.Windows.Forms.Button B3; + private System.Windows.Forms.Button B1; + private System.Windows.Forms.GroupBox groupBox1; + private System.Windows.Forms.Label label6; + private System.Windows.Forms.Label label4; + private System.Windows.Forms.Button ClearButton; + private System.Windows.Forms.MenuStrip menuStrip1; + private System.Windows.Forms.ToolStripMenuItem optionsToolStripMenuItem; + private System.Windows.Forms.ToolStripMenuItem autoloadToolStripMenuItem; + private System.Windows.Forms.ToolStripMenuItem saveWindowPositionToolStripMenuItem; + private System.Windows.Forms.ToolStripSeparator toolStripSeparator1; + private System.Windows.Forms.ToolStripMenuItem exitToolStripMenuItem; + } +} \ No newline at end of file diff --git a/BizHawk.MultiClient/SNESTools/SNESGameGenie.cs b/BizHawk.MultiClient/SNESTools/SNESGameGenie.cs new file mode 100644 index 0000000000..418733d3e8 --- /dev/null +++ b/BizHawk.MultiClient/SNESTools/SNESGameGenie.cs @@ -0,0 +1,354 @@ +using System; +using System.Collections.Generic; +using System.Drawing; +using System.Windows.Forms; +using System.Globalization; + +namespace BizHawk.MultiClient +{ + public partial class SNESGameGenie : Form + { + public int Address = 0x000000; + public int Value = 0x00; + private readonly Dictionary GameGenieTable = new Dictionary(); + private bool Decoding = false; + private bool Encoding = false; + + + public SNESGameGenie() + { + InitializeComponent(); + Closing += (o, e) => SaveConfigSettings(); + //including transposition + //Code: D F 4 7 0 9 1 5 6 B C 8 A 2 3 E + //Hex: 0 1 2 3 4 5 6 7 8 9 A B C D E F + + GameGenieTable.Add('D', 0); //0000 + GameGenieTable.Add('F', 1); //0001 + GameGenieTable.Add('4', 2); //0010 + GameGenieTable.Add('7', 3); //0011 + GameGenieTable.Add('0', 4); //0100 + GameGenieTable.Add('9', 5); //0101 + GameGenieTable.Add('1', 6); //0110 + GameGenieTable.Add('5', 7); //0111 + GameGenieTable.Add('6', 8); //1000 + GameGenieTable.Add('B', 9); //1001 + GameGenieTable.Add('C', 10); //1010 + GameGenieTable.Add('8', 11); //1011 + GameGenieTable.Add('A', 12); //1100 + GameGenieTable.Add('2', 13); //1101 + GameGenieTable.Add('3', 14); //1110 + GameGenieTable.Add('E', 15); //1111 + } + + private void SNESGameGenie_Load(object sender, EventArgs e) + { + AddCheat.Enabled = false; + + if (Global.Config.SNESGGSaveWindowPosition && Global.Config.SNESGGWndx >= 0 && Global.Config.SNESGGWndy >= 0) + Location = new Point(Global.Config.SNESGGWndx, Global.Config.SNESGGWndy); + } + + private void SaveConfigSettings() + { + Global.Config.SNESGGWndx = Location.X; + Global.Config.SNESGGWndy = Location.Y; + } + + private void GameGenieCode_KeyPress(object sender, KeyPressEventArgs e) + { + + //Make uppercase + if (e.KeyChar >= 97 && e.KeyChar < 123) + e.KeyChar -= (char)32; + + if (!(GameGenieTable.ContainsKey(e.KeyChar))) + { + if (e.KeyChar != (char)Keys.Back || e.KeyChar == '\b' || e.KeyChar == 22 || e.KeyChar == 1 || e.KeyChar == 3) + { + e.Handled = true; + } + } + + } + + public void SNESDecodeGameGenieCode(string code) + { + + //Code: D F 4 7 0 9 1 5 6 B C 8 A 2 3 E + //Hex: 0 1 2 3 4 5 6 7 8 9 A B C D E F + //XXYY-YYYY, where XX is the value, and YY-YYYY is the address. + //Char # | 0 | 1 | 2 | 3 | 4 | 5 | 6 | 7 | + //Bit # |3|2|1|0|3|2|1|0|3|2|1|0|3|2|1|0|3|2|1|0|3|2|1|0|3|2|1|0|3|2|1|0| + //maps to| Value |i|j|k|l|q|r|s|t|o|p|a|b|c|d|u|v|w|x|e|f|g|h|m|n| + //order | Value |a|b|c|d|e|f|g|h|i|j|k|l|m|n|o|p|q|r|s|t|u|v|w|x| + //Decoding = true; + + int x; + byte[] val = { 0, 0}; + + // Getting Value + if (code.Length > 0) + { + GameGenieTable.TryGetValue(code[0], out x); + Value = x << 4; + } + + if (code.Length > 1) + { + GameGenieTable.TryGetValue(code[1], out x); + Value |= x; + } + //Address + if (code.Length > 2) + { + GameGenieTable.TryGetValue(code[2], out x); + Address = (x << 12); + } + + if (code.Length > 3) + { + GameGenieTable.TryGetValue(code[3], out x); + Address |= (x << 4); + } + + if (code.Length > 4) + { + GameGenieTable.TryGetValue(code[4], out x); + Address |= ((x & 0xC) << 6); + Address |= ((x & 0x3) << 22); + } + + if (code.Length > 5) + { + GameGenieTable.TryGetValue(code[5], out x); + Address |= ((x & 0xC) << 18); + Address |= ((x & 0x3) << 2); + } + + if (code.Length > 6) + { + GameGenieTable.TryGetValue(code[6], out x); + Address |= ((x & 0xC) >> 2); + Address |= ((x & 0x3) << 18); + } + + if (code.Length > 7) + { + GameGenieTable.TryGetValue(code[7], out x); + Address |= ((x & 0xC) << 14); + Address |= ((x & 0x3) << 10); + } + + SetProperties(); + + } + + private void SetProperties() + { + if (Address >= 0) + AddressBox.Text = String.Format("{0:X6}", Address); + else + AddressBox.Text = ""; + + if (Value >= 0) + ValueBox.Text = String.Format("{0:X2}", Value); + + } + + private void ClearProperties() + { + Address = -1; + Value = -1; + AddressBox.Text = ""; + ValueBox.Text = ""; + AddCheat.Enabled = false; + //Decoding = false; + } + + private void GameGenieCode_TextChanged(object sender, EventArgs e) + { + if (Encoding == false) + { + if (GameGenieCode.Text.Length > 0) + { + Decoding = true; + SNESDecodeGameGenieCode(GameGenieCode.Text); + } + else + ClearProperties(); + } + TryEnableAddCheat(); + Decoding = false; + } + + private void Keypad_Click(object sender, EventArgs e) + { + if (GameGenieCode.Text.Length < 8) + { + string code = ""; + if (sender == B0) code = "0"; + if (sender == B1) code += "1"; + if (sender == B2) code += "2"; + if (sender == B3) code += "3"; + if (sender == B4) code += "4"; + if (sender == B5) code += "5"; + if (sender == B6) code += "6"; + if (sender == B7) code += "7"; + if (sender == B8) code += "8"; + if (sender == B9) code += "9"; + if (sender == BA) code += "A"; + if (sender == BB) code += "B"; + if (sender == BC) code += "C"; + if (sender == BD) code += "D"; + if (sender == BE) code += "E"; + if (sender == BF) code += "F"; + + int x = GameGenieCode.SelectionStart; + GameGenieCode.Text = GameGenieCode.Text.Insert(x, code); + GameGenieCode.SelectionStart = x + 1; + } + } + + private void AddressBox_TextChanged(object sender, EventArgs e) + { + if (Decoding == false) + { + if (AddressBox.Text.Length > 0 ) + { + Address = int.Parse(AddressBox.Text, NumberStyles.HexNumber); + if (ValueBox.Text.Length > 0) + Value = int.Parse(ValueBox.Text, NumberStyles.HexNumber); + else + Value = 0; + Encoding = true; + SNESEncodeGameGenie(); + Encoding = false; + } + } + TryEnableAddCheat(); + + } + + + + private void TryEnableAddCheat() + { + if (AddressBox.Text.Length == 6 && ValueBox.Text.Length == 2) + AddCheat.Enabled = true; + else + AddCheat.Enabled = false; + } + + private void ValueBox_TextChanged(object sender, EventArgs e) + { + if (Decoding == false) + { + if (ValueBox.Text.Length > 0) + { + if (AddressBox.Text.Length > 0) + Address = int.Parse(AddressBox.Text, NumberStyles.HexNumber); + else + Address = 0x000000; + Value = int.Parse(ValueBox.Text, NumberStyles.HexNumber); + Encoding = true; + SNESEncodeGameGenie(); + Encoding = false; + } + } + TryEnableAddCheat(); + + } + + + private void SNESEncodeGameGenie() + { + //Code: D F 4 7 0 9 1 5 6 B C 8 A 2 3 E + //Hex: 0 1 2 3 4 5 6 7 8 9 A B C D E F + //Char # | 0 | 1 | 2 | 3 | 4 | 5 | 6 | 7 | + //Bit # |3|2|1|0|3|2|1|0|3|2|1|0|3|2|1|0|3|2|1|0|3|2|1|0|3|2|1|0|3|2|1|0| + //maps to| Value |i|j|k|l|q|r|s|t|o|p|a|b|c|d|u|v|w|x|e|f|g|h|m|n| + //order | Value |a|b|c|d|e|f|g|h|i|j|k|l|m|n|o|p|q|r|s|t|u|v|w|x| + char[] letters = { 'D', 'F', '4', '7', '0', '9', '1', '5', '6', 'B', 'C', '8', 'A', '2', '3', 'E' }; + GameGenieCode.Text = ""; + int[] num = { 0, 0, 0, 0, 0, 0, 0, 0 }; + num[0] = (Value & 0xF0) >>4; + num[1] = Value & 0x0F; + + num[2] = (Address & 0x00F000) >> 12; //ijkl + num[3] = (Address & 0x0000F0) >> 4; //qrst + num[4] = ((Address & 0x000300) >> 6) | ((Address & 0xC00000) >> 22); //opab + num[5] = ((Address & 0x300000) >> 18) | ((Address & 0x00000C) >>2); //cduv + num[6] = ((Address & 0x000003) << 2)| ((Address & 0x0C0000) >> 18);//wxef + num[7] = ((Address & 0x030000) >> 14) | ((Address & 0x000C00) >> 10);//ghmn*/ + for (int x = 0; x < 8; x++) + GameGenieCode.Text += letters[num[x]]; + } + + private void ClearButton_Click(object sender, EventArgs e) + { + ClearProperties(); + GameGenieCode.Text = ""; + } + + private void AddCheat_Click(object sender, EventArgs e) + { + AddCheatClick(); + } + + private void AddCheatClick() + { + Cheat c = new Cheat {name = GameGenieCode.Text}; + + if (String.IsNullOrWhiteSpace(AddressBox.Text)) + { + return; + } + else if (String.IsNullOrWhiteSpace(ValueBox.Text)) + { + return; + } + c.address = int.Parse(AddressBox.Text, NumberStyles.HexNumber); + c.value = byte.Parse(ValueBox.Text, NumberStyles.HexNumber); + c.compare = null; + c.domain = Global.Emulator.MemoryDomains[1]; //System Bus only + c.Enable(); + + Global.MainForm.Cheats1.AddCheat(c); + } + + private void exitToolStripMenuItem_Click(object sender, EventArgs e) + { + Close(); + } + + private void saveWindowPositionToolStripMenuItem_Click(object sender, EventArgs e) + { + Global.Config.SNESGGSaveWindowPosition ^= true; + } + + private void autoloadToolStripMenuItem_Click(object sender, EventArgs e) + { + Global.Config.SNESGGAutoload ^= true; + } + + private void optionsToolStripMenuItem_DropDownOpened(object sender, EventArgs e) + { + autoloadToolStripMenuItem.Checked = Global.Config.SNESGGAutoload; + saveWindowPositionToolStripMenuItem.Checked = Global.Config.SNESGGSaveWindowPosition; + } + + private void GameGenieCode_KeyDown(object sender, KeyEventArgs e) + { + if (e.KeyData == Keys.Enter) + { + if (AddCheat.Enabled) + { + AddCheatClick(); + } + } + } + + + } +} diff --git a/BizHawk.MultiClient/SNESTools/SNESGameGenie.resx b/BizHawk.MultiClient/SNESTools/SNESGameGenie.resx new file mode 100644 index 0000000000..25d918dd97 --- /dev/null +++ b/BizHawk.MultiClient/SNESTools/SNESGameGenie.resx @@ -0,0 +1,123 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 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 + + + 17, 17 + + \ No newline at end of file diff --git a/BizHawk.MultiClient/tools/ToolBox.Designer.cs b/BizHawk.MultiClient/tools/ToolBox.Designer.cs index c6dd2ab014..734132772c 100644 --- a/BizHawk.MultiClient/tools/ToolBox.Designer.cs +++ b/BizHawk.MultiClient/tools/ToolBox.Designer.cs @@ -1,33 +1,33 @@ namespace BizHawk.MultiClient { - partial class ToolBox - { - /// - /// Required designer variable. - /// - private System.ComponentModel.IContainer components = null; + partial class ToolBox + { + /// + /// 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); - } + /// + /// 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 Windows Form Designer generated code + #region Windows Form Designer generated code - /// - /// Required method for Designer support - do not modify - /// the contents of this method with the code editor. - /// - private void InitializeComponent() - { + /// + /// Required method for Designer support - do not modify + /// the contents of this method with the code editor. + /// + private void InitializeComponent() + { System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(ToolBox)); this.toolStrip1 = new System.Windows.Forms.ToolStrip(); this.toolStripButton1 = new System.Windows.Forms.ToolStripButton(); @@ -36,6 +36,7 @@ this.toolStripButton4 = new System.Windows.Forms.ToolStripButton(); this.HexEditor = new System.Windows.Forms.ToolStripButton(); this.toolStripButton5 = new System.Windows.Forms.ToolStripButton(); + this.toolStripButton6 = new System.Windows.Forms.ToolStripButton(); this.TAStudioButton = new System.Windows.Forms.ToolStripButton(); this.NESDebugger = new System.Windows.Forms.ToolStripButton(); this.NESPPU = new System.Windows.Forms.ToolStripButton(); @@ -44,7 +45,7 @@ this.KeypadTool = new System.Windows.Forms.ToolStripButton(); this.GameboyDebuggerTool = new System.Windows.Forms.ToolStripButton(); this.SNESGraphicsDebuggerButton = new System.Windows.Forms.ToolStripButton(); - this.toolStripButton6 = new System.Windows.Forms.ToolStripButton(); + this.SNESGameGenie = new System.Windows.Forms.ToolStripButton(); this.toolStrip1.SuspendLayout(); this.SuspendLayout(); // @@ -53,25 +54,26 @@ this.toolStrip1.BackColor = System.Drawing.SystemColors.Control; this.toolStrip1.Dock = System.Windows.Forms.DockStyle.None; this.toolStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { - this.toolStripButton1, - this.toolStripButton2, - this.toolStripButton3, - this.toolStripButton4, - this.HexEditor, - this.toolStripButton5, - this.toolStripButton6, - this.TAStudioButton, - this.NESDebugger, - this.NESPPU, - this.NESNameTable, - this.NESGameGenie, - this.KeypadTool, - this.GameboyDebuggerTool, - this.SNESGraphicsDebuggerButton}); + this.toolStripButton1, + this.toolStripButton2, + this.toolStripButton3, + this.toolStripButton4, + this.HexEditor, + this.toolStripButton5, + this.toolStripButton6, + this.TAStudioButton, + this.NESDebugger, + this.NESPPU, + this.NESNameTable, + this.NESGameGenie, + this.KeypadTool, + this.GameboyDebuggerTool, + this.SNESGraphicsDebuggerButton, + this.SNESGameGenie}); this.toolStrip1.LayoutStyle = System.Windows.Forms.ToolStripLayoutStyle.Table; - this.toolStrip1.Location = new System.Drawing.Point(9, 11); + this.toolStrip1.Location = new System.Drawing.Point(12, 14); this.toolStrip1.Name = "toolStrip1"; - this.toolStrip1.Size = new System.Drawing.Size(100, 348); + this.toolStrip1.Size = new System.Drawing.Size(123, 431); this.toolStrip1.TabIndex = 0; this.toolStrip1.TabStop = true; // @@ -80,7 +82,7 @@ this.toolStripButton1.Image = global::BizHawk.MultiClient.Properties.Resources.Freeze; this.toolStripButton1.ImageTransparentColor = System.Drawing.Color.Magenta; this.toolStripButton1.Name = "toolStripButton1"; - this.toolStripButton1.Size = new System.Drawing.Size(63, 20); + this.toolStripButton1.Size = new System.Drawing.Size(73, 24); this.toolStripButton1.Text = "Cheats"; this.toolStripButton1.Click += new System.EventHandler(this.toolStripButton1_Click); // @@ -89,7 +91,7 @@ this.toolStripButton2.Image = global::BizHawk.MultiClient.Properties.Resources.FindHS; this.toolStripButton2.ImageTransparentColor = System.Drawing.Color.Magenta; this.toolStripButton2.Name = "toolStripButton2"; - this.toolStripButton2.Size = new System.Drawing.Size(88, 20); + this.toolStripButton2.Size = new System.Drawing.Size(105, 24); this.toolStripButton2.Text = "Ram Watch"; this.toolStripButton2.Click += new System.EventHandler(this.toolStripButton2_Click); // @@ -98,7 +100,7 @@ this.toolStripButton3.Image = global::BizHawk.MultiClient.Properties.Resources.search; this.toolStripButton3.ImageTransparentColor = System.Drawing.Color.Magenta; this.toolStripButton3.Name = "toolStripButton3"; - this.toolStripButton3.Size = new System.Drawing.Size(89, 20); + this.toolStripButton3.Size = new System.Drawing.Size(107, 24); this.toolStripButton3.Text = "Ram Search"; this.toolStripButton3.Click += new System.EventHandler(this.toolStripButton3_Click); // @@ -107,7 +109,7 @@ this.toolStripButton4.Image = global::BizHawk.MultiClient.Properties.Resources.poke; this.toolStripButton4.ImageTransparentColor = System.Drawing.Color.Magenta; this.toolStripButton4.Name = "toolStripButton4"; - this.toolStripButton4.Size = new System.Drawing.Size(80, 20); + this.toolStripButton4.Size = new System.Drawing.Size(95, 24); this.toolStripButton4.Text = "Ram Poke"; this.toolStripButton4.Click += new System.EventHandler(this.toolStripButton4_Click); // @@ -116,7 +118,7 @@ this.HexEditor.Image = global::BizHawk.MultiClient.Properties.Resources.poke; this.HexEditor.ImageTransparentColor = System.Drawing.Color.Magenta; this.HexEditor.Name = "HexEditor"; - this.HexEditor.Size = new System.Drawing.Size(81, 20); + this.HexEditor.Size = new System.Drawing.Size(99, 24); this.HexEditor.Text = "Hex Editor"; this.HexEditor.Click += new System.EventHandler(this.HexEditor_Click); // @@ -125,16 +127,25 @@ this.toolStripButton5.Image = global::BizHawk.MultiClient.Properties.Resources.textdoc; this.toolStripButton5.ImageTransparentColor = System.Drawing.Color.Magenta; this.toolStripButton5.Name = "toolStripButton5"; - this.toolStripButton5.Size = new System.Drawing.Size(92, 20); + this.toolStripButton5.Size = new System.Drawing.Size(109, 24); this.toolStripButton5.Text = "Lua Console"; this.toolStripButton5.Click += new System.EventHandler(this.toolStripButton5_Click); // + // toolStripButton6 + // + this.toolStripButton6.Image = global::BizHawk.MultiClient.Properties.Resources.TAStudio; + this.toolStripButton6.ImageTransparentColor = System.Drawing.Color.Magenta; + this.toolStripButton6.Name = "toolStripButton6"; + this.toolStripButton6.Size = new System.Drawing.Size(90, 24); + this.toolStripButton6.Text = "TAStudio"; + this.toolStripButton6.Click += new System.EventHandler(this.TAStudioButton_Click); + // // TAStudioButton // this.TAStudioButton.Image = global::BizHawk.MultiClient.Properties.Resources.GameController; this.TAStudioButton.ImageTransparentColor = System.Drawing.Color.Magenta; this.TAStudioButton.Name = "TAStudioButton"; - this.TAStudioButton.Size = new System.Drawing.Size(86, 20); + this.TAStudioButton.Size = new System.Drawing.Size(103, 24); this.TAStudioButton.Text = "VirtualPads"; this.TAStudioButton.Click += new System.EventHandler(this.TAStudioButton_Click_1); // @@ -143,7 +154,7 @@ this.NESDebugger.Image = global::BizHawk.MultiClient.Properties.Resources.NESControllerIcon; this.NESDebugger.ImageTransparentColor = System.Drawing.Color.Magenta; this.NESDebugger.Name = "NESDebugger"; - this.NESDebugger.Size = new System.Drawing.Size(79, 20); + this.NESDebugger.Size = new System.Drawing.Size(96, 24); this.NESDebugger.Text = "Debugger"; this.NESDebugger.Click += new System.EventHandler(this.NESDebugger_Click); // @@ -152,7 +163,7 @@ this.NESPPU.Image = global::BizHawk.MultiClient.Properties.Resources.NESControllerIcon; this.NESPPU.ImageTransparentColor = System.Drawing.Color.Magenta; this.NESPPU.Name = "NESPPU"; - this.NESPPU.Size = new System.Drawing.Size(49, 20); + this.NESPPU.Size = new System.Drawing.Size(55, 24); this.NESPPU.Text = "PPU"; this.NESPPU.Click += new System.EventHandler(this.NESPPU_Click); // @@ -161,7 +172,7 @@ this.NESNameTable.Image = global::BizHawk.MultiClient.Properties.Resources.NESControllerIcon; this.NESNameTable.ImageTransparentColor = System.Drawing.Color.Magenta; this.NESNameTable.Name = "NESNameTable"; - this.NESNameTable.Size = new System.Drawing.Size(85, 20); + this.NESNameTable.Size = new System.Drawing.Size(103, 24); this.NESNameTable.Text = "Nametable"; this.NESNameTable.Click += new System.EventHandler(this.NESNameTable_Click); // @@ -170,7 +181,7 @@ this.NESGameGenie.Image = global::BizHawk.MultiClient.Properties.Resources.NESControllerIcon; this.NESGameGenie.ImageTransparentColor = System.Drawing.Color.Magenta; this.NESGameGenie.Name = "NESGameGenie"; - this.NESGameGenie.Size = new System.Drawing.Size(91, 20); + this.NESGameGenie.Size = new System.Drawing.Size(110, 24); this.NESGameGenie.Text = "Game Genie"; this.NESGameGenie.Click += new System.EventHandler(this.NESGameGenie_Click); // @@ -179,7 +190,7 @@ this.KeypadTool.Image = global::BizHawk.MultiClient.Properties.Resources.calculator; this.KeypadTool.ImageTransparentColor = System.Drawing.Color.Magenta; this.KeypadTool.Name = "KeypadTool"; - this.KeypadTool.Size = new System.Drawing.Size(66, 20); + this.KeypadTool.Size = new System.Drawing.Size(79, 24); this.KeypadTool.Text = "Keypad"; this.KeypadTool.Click += new System.EventHandler(this.KeyPadTool_Click); // @@ -193,27 +204,28 @@ this.SNESGraphicsDebuggerButton.Image = global::BizHawk.MultiClient.Properties.Resources.SNESControllerIcon; this.SNESGraphicsDebuggerButton.ImageTransparentColor = System.Drawing.Color.Magenta; this.SNESGraphicsDebuggerButton.Name = "SNESGraphicsDebuggerButton"; - this.SNESGraphicsDebuggerButton.Size = new System.Drawing.Size(99, 20); + this.SNESGraphicsDebuggerButton.Size = new System.Drawing.Size(122, 24); this.SNESGraphicsDebuggerButton.Text = "Gfx Debugger"; this.SNESGraphicsDebuggerButton.Click += new System.EventHandler(this.SNESGraphicsDebuggerButton_Click); // - // toolStripButton6 + // SNESGameGenie // - this.toolStripButton6.Image = global::BizHawk.MultiClient.Properties.Resources.TAStudio; - this.toolStripButton6.ImageTransparentColor = System.Drawing.Color.Magenta; - this.toolStripButton6.Name = "toolStripButton6"; - this.toolStripButton6.Size = new System.Drawing.Size(76, 20); - this.toolStripButton6.Text = "TAStudio"; - this.toolStripButton6.Click += new System.EventHandler(this.TAStudioButton_Click); + this.SNESGameGenie.Image = global::BizHawk.MultiClient.Properties.Resources.SNESControllerIcon; + this.SNESGameGenie.ImageTransparentColor = System.Drawing.Color.Magenta; + this.SNESGameGenie.Name = "SNESGameGenie"; + this.SNESGameGenie.Size = new System.Drawing.Size(110, 24); + this.SNESGameGenie.Text = "Game Genie"; + this.SNESGameGenie.Click += new System.EventHandler(this.SNESGameGenie_Click); // // ToolBox // - this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); + this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 16F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(116, 338); + this.ClientSize = new System.Drawing.Size(213, 416); this.Controls.Add(this.toolStrip1); this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon"))); - this.MinimumSize = new System.Drawing.Size(130, 64); + this.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.MinimumSize = new System.Drawing.Size(167, 68); this.Name = "ToolBox"; this.Text = "Tool Box"; this.Load += new System.EventHandler(this.ToolBox_Load); @@ -222,26 +234,27 @@ this.ResumeLayout(false); this.PerformLayout(); - } + } - #endregion + #endregion - private System.Windows.Forms.ToolStrip toolStrip1; - private System.Windows.Forms.ToolStripButton toolStripButton1; - private System.Windows.Forms.ToolStripButton toolStripButton2; - private System.Windows.Forms.ToolStripButton toolStripButton3; - private System.Windows.Forms.ToolStripButton toolStripButton4; - private System.Windows.Forms.ToolStripButton HexEditor; - private System.Windows.Forms.ToolStripButton toolStripButton5; - private System.Windows.Forms.ToolStripButton NESPPU; - private System.Windows.Forms.ToolStripButton NESDebugger; - private System.Windows.Forms.ToolStripButton NESGameGenie; - private System.Windows.Forms.ToolStripButton NESNameTable; - private System.Windows.Forms.ToolStripButton KeypadTool; + private System.Windows.Forms.ToolStrip toolStrip1; + private System.Windows.Forms.ToolStripButton toolStripButton1; + private System.Windows.Forms.ToolStripButton toolStripButton2; + private System.Windows.Forms.ToolStripButton toolStripButton3; + private System.Windows.Forms.ToolStripButton toolStripButton4; + private System.Windows.Forms.ToolStripButton HexEditor; + private System.Windows.Forms.ToolStripButton toolStripButton5; + private System.Windows.Forms.ToolStripButton NESPPU; + private System.Windows.Forms.ToolStripButton NESDebugger; + private System.Windows.Forms.ToolStripButton NESGameGenie; + private System.Windows.Forms.ToolStripButton NESNameTable; + private System.Windows.Forms.ToolStripButton KeypadTool; private System.Windows.Forms.ToolStripButton TAStudioButton; private System.Windows.Forms.ToolStripButton GameboyDebuggerTool; private System.Windows.Forms.ToolStripButton SNESGraphicsDebuggerButton; + private System.Windows.Forms.ToolStripButton SNESGameGenie; private System.Windows.Forms.ToolStripButton toolStripButton6; - } + } } \ No newline at end of file diff --git a/BizHawk.MultiClient/tools/ToolBox.cs b/BizHawk.MultiClient/tools/ToolBox.cs index 6ca63fbb7b..e5fa905810 100644 --- a/BizHawk.MultiClient/tools/ToolBox.cs +++ b/BizHawk.MultiClient/tools/ToolBox.cs @@ -56,10 +56,12 @@ namespace BizHawk.MultiClient if (Global.Emulator is LibsnesCore) { SNESGraphicsDebuggerButton.Visible = true; + SNESGameGenie.Visible = true; } else { SNESGraphicsDebuggerButton.Visible = false; + SNESGameGenie.Visible = false; } Size = new Size(Size.Width, toolStrip1.Size.Height + 50); @@ -141,5 +143,10 @@ namespace BizHawk.MultiClient { Global.MainForm.LoadVirtualPads(); } + + private void SNESGameGenie_Click(object sender, EventArgs e) + { + Global.MainForm.LoadGameGenieEC(); + } } }