diff --git a/BizHawk.MultiClient/MainForm.Designer.cs b/BizHawk.MultiClient/MainForm.Designer.cs index 2dd4c1d5b8..ed6ba7481a 100644 --- a/BizHawk.MultiClient/MainForm.Designer.cs +++ b/BizHawk.MultiClient/MainForm.Designer.cs @@ -95,7 +95,6 @@ this.stopMovieToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.playFromBeginningToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.toolStripSeparator14 = new System.Windows.Forms.ToolStripSeparator(); - this.replayInputLogToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.bindSavestatesToMoviesToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.screenshotToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.screenshotF12ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); @@ -141,6 +140,7 @@ this.enableRewindToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.forceGDIPPresentationToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.runInBackgroundToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.acceptBackgroundInputToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.frameSkipToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.miLimitFramerate = new System.Windows.Forms.ToolStripMenuItem(); this.miDisplayVsync = new System.Windows.Forms.ToolStripMenuItem(); @@ -190,7 +190,6 @@ this.aboutToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.statusStrip1 = new System.Windows.Forms.StatusStrip(); this.EmuStatus = new System.Windows.Forms.ToolStripStatusLabel(); - this.acceptBackgroundInputToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.menuStrip1.SuspendLayout(); this.statusStrip1.SuspendLayout(); this.SuspendLayout(); @@ -637,7 +636,6 @@ this.stopMovieToolStripMenuItem, this.playFromBeginningToolStripMenuItem, this.toolStripSeparator14, - this.replayInputLogToolStripMenuItem, this.bindSavestatesToMoviesToolStripMenuItem}); this.movieToolStripMenuItem.Name = "movieToolStripMenuItem"; this.movieToolStripMenuItem.Size = new System.Drawing.Size(152, 22); @@ -724,13 +722,6 @@ this.toolStripSeparator14.Name = "toolStripSeparator14"; this.toolStripSeparator14.Size = new System.Drawing.Size(208, 6); // - // replayInputLogToolStripMenuItem - // - this.replayInputLogToolStripMenuItem.Name = "replayInputLogToolStripMenuItem"; - this.replayInputLogToolStripMenuItem.Size = new System.Drawing.Size(211, 22); - this.replayInputLogToolStripMenuItem.Text = "Replay Input Log"; - this.replayInputLogToolStripMenuItem.Click += new System.EventHandler(this.replayInputLogToolStripMenuItem_Click); - // // bindSavestatesToMoviesToolStripMenuItem // this.bindSavestatesToMoviesToolStripMenuItem.Name = "bindSavestatesToMoviesToolStripMenuItem"; @@ -989,40 +980,40 @@ // controllersToolStripMenuItem // this.controllersToolStripMenuItem.Name = "controllersToolStripMenuItem"; - this.controllersToolStripMenuItem.Size = new System.Drawing.Size(152, 22); + this.controllersToolStripMenuItem.Size = new System.Drawing.Size(149, 22); this.controllersToolStripMenuItem.Text = "&Controllers..."; this.controllersToolStripMenuItem.Click += new System.EventHandler(this.controllersToolStripMenuItem_Click); // // hotkeysToolStripMenuItem // this.hotkeysToolStripMenuItem.Name = "hotkeysToolStripMenuItem"; - this.hotkeysToolStripMenuItem.Size = new System.Drawing.Size(152, 22); + this.hotkeysToolStripMenuItem.Size = new System.Drawing.Size(149, 22); this.hotkeysToolStripMenuItem.Text = "&Hotkeys..."; this.hotkeysToolStripMenuItem.Click += new System.EventHandler(this.hotkeysToolStripMenuItem_Click); // // messagesToolStripMenuItem // this.messagesToolStripMenuItem.Name = "messagesToolStripMenuItem"; - this.messagesToolStripMenuItem.Size = new System.Drawing.Size(152, 22); + this.messagesToolStripMenuItem.Size = new System.Drawing.Size(149, 22); this.messagesToolStripMenuItem.Text = "&Messages..."; this.messagesToolStripMenuItem.Click += new System.EventHandler(this.messagesToolStripMenuItem_Click); // // pathsToolStripMenuItem // this.pathsToolStripMenuItem.Name = "pathsToolStripMenuItem"; - this.pathsToolStripMenuItem.Size = new System.Drawing.Size(152, 22); + this.pathsToolStripMenuItem.Size = new System.Drawing.Size(149, 22); this.pathsToolStripMenuItem.Text = "Paths..."; this.pathsToolStripMenuItem.Click += new System.EventHandler(this.pathsToolStripMenuItem_Click); // // toolStripSeparator9 // this.toolStripSeparator9.Name = "toolStripSeparator9"; - this.toolStripSeparator9.Size = new System.Drawing.Size(149, 6); + this.toolStripSeparator9.Size = new System.Drawing.Size(146, 6); // // soundToolStripMenuItem // this.soundToolStripMenuItem.Name = "soundToolStripMenuItem"; - this.soundToolStripMenuItem.Size = new System.Drawing.Size(152, 22); + this.soundToolStripMenuItem.Size = new System.Drawing.Size(149, 22); this.soundToolStripMenuItem.Text = "&Sound"; this.soundToolStripMenuItem.Click += new System.EventHandler(this.soundToolStripMenuItem_Click); // @@ -1037,7 +1028,7 @@ this.runInBackgroundToolStripMenuItem, this.acceptBackgroundInputToolStripMenuItem}); this.gUIToolStripMenuItem.Name = "gUIToolStripMenuItem"; - this.gUIToolStripMenuItem.Size = new System.Drawing.Size(152, 22); + this.gUIToolStripMenuItem.Size = new System.Drawing.Size(149, 22); this.gUIToolStripMenuItem.Text = "GUI"; this.gUIToolStripMenuItem.DropDownOpened += new System.EventHandler(this.gUIToolStripMenuItem_DropDownOpened); // @@ -1083,6 +1074,13 @@ 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(220, 22); + this.acceptBackgroundInputToolStripMenuItem.Text = "Accept Background Input"; + this.acceptBackgroundInputToolStripMenuItem.Click += new System.EventHandler(this.acceptBackgroundInputToolStripMenuItem_Click); + // // frameSkipToolStripMenuItem // this.frameSkipToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { @@ -1107,7 +1105,7 @@ this.miSpeed150, this.miSpeed200}); this.frameSkipToolStripMenuItem.Name = "frameSkipToolStripMenuItem"; - this.frameSkipToolStripMenuItem.Size = new System.Drawing.Size(152, 22); + this.frameSkipToolStripMenuItem.Size = new System.Drawing.Size(149, 22); this.frameSkipToolStripMenuItem.Text = "Speed/Skip"; this.frameSkipToolStripMenuItem.DropDownOpened += new System.EventHandler(this.frameSkipToolStripMenuItem_DropDownOpened); // @@ -1250,19 +1248,19 @@ // toolStripSeparator10 // this.toolStripSeparator10.Name = "toolStripSeparator10"; - this.toolStripSeparator10.Size = new System.Drawing.Size(149, 6); + this.toolStripSeparator10.Size = new System.Drawing.Size(146, 6); // // saveConfigToolStripMenuItem // this.saveConfigToolStripMenuItem.Name = "saveConfigToolStripMenuItem"; - this.saveConfigToolStripMenuItem.Size = new System.Drawing.Size(152, 22); + this.saveConfigToolStripMenuItem.Size = new System.Drawing.Size(149, 22); this.saveConfigToolStripMenuItem.Text = "Save Config"; this.saveConfigToolStripMenuItem.Click += new System.EventHandler(this.saveConfigToolStripMenuItem_Click); // // loadConfigToolStripMenuItem // this.loadConfigToolStripMenuItem.Name = "loadConfigToolStripMenuItem"; - this.loadConfigToolStripMenuItem.Size = new System.Drawing.Size(152, 22); + this.loadConfigToolStripMenuItem.Size = new System.Drawing.Size(149, 22); this.loadConfigToolStripMenuItem.Text = "Load Config"; // // toolsToolStripMenuItem @@ -1285,59 +1283,59 @@ // toolBoxToolStripMenuItem // this.toolBoxToolStripMenuItem.Name = "toolBoxToolStripMenuItem"; - this.toolBoxToolStripMenuItem.Size = new System.Drawing.Size(152, 22); + this.toolBoxToolStripMenuItem.Size = new System.Drawing.Size(143, 22); 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(149, 6); + this.toolStripSeparator12.Size = new System.Drawing.Size(140, 6); // // rAMWatchToolStripMenuItem // this.rAMWatchToolStripMenuItem.Name = "rAMWatchToolStripMenuItem"; - this.rAMWatchToolStripMenuItem.Size = new System.Drawing.Size(152, 22); + this.rAMWatchToolStripMenuItem.Size = new System.Drawing.Size(143, 22); this.rAMWatchToolStripMenuItem.Text = "RAM &Watch"; this.rAMWatchToolStripMenuItem.Click += new System.EventHandler(this.RAMWatchToolStripMenuItem_Click); // // rAMSearchToolStripMenuItem // this.rAMSearchToolStripMenuItem.Name = "rAMSearchToolStripMenuItem"; - this.rAMSearchToolStripMenuItem.Size = new System.Drawing.Size(152, 22); + this.rAMSearchToolStripMenuItem.Size = new System.Drawing.Size(143, 22); this.rAMSearchToolStripMenuItem.Text = "RAM &Search"; this.rAMSearchToolStripMenuItem.Click += new System.EventHandler(this.rAMSearchToolStripMenuItem_Click); // // rAMPokeToolStripMenuItem // this.rAMPokeToolStripMenuItem.Name = "rAMPokeToolStripMenuItem"; - this.rAMPokeToolStripMenuItem.Size = new System.Drawing.Size(152, 22); + this.rAMPokeToolStripMenuItem.Size = new System.Drawing.Size(143, 22); this.rAMPokeToolStripMenuItem.Text = "RAM &Poke"; this.rAMPokeToolStripMenuItem.Click += new System.EventHandler(this.RAMPokeToolStripMenuItem_Click); // // hexEditorToolStripMenuItem // this.hexEditorToolStripMenuItem.Name = "hexEditorToolStripMenuItem"; - this.hexEditorToolStripMenuItem.Size = new System.Drawing.Size(152, 22); + this.hexEditorToolStripMenuItem.Size = new System.Drawing.Size(143, 22); this.hexEditorToolStripMenuItem.Text = "&Hex Editor"; this.hexEditorToolStripMenuItem.Click += new System.EventHandler(this.hexEditorToolStripMenuItem_Click); // // toolStripSeparator11 // this.toolStripSeparator11.Name = "toolStripSeparator11"; - this.toolStripSeparator11.Size = new System.Drawing.Size(149, 6); + this.toolStripSeparator11.Size = new System.Drawing.Size(140, 6); // // luaConsoleToolStripMenuItem // this.luaConsoleToolStripMenuItem.Name = "luaConsoleToolStripMenuItem"; - this.luaConsoleToolStripMenuItem.Size = new System.Drawing.Size(152, 22); + this.luaConsoleToolStripMenuItem.Size = new System.Drawing.Size(143, 22); this.luaConsoleToolStripMenuItem.Text = "Lua Console"; this.luaConsoleToolStripMenuItem.Click += new System.EventHandler(this.luaConsoleToolStripMenuItem_Click); // // cheatsToolStripMenuItem // this.cheatsToolStripMenuItem.Name = "cheatsToolStripMenuItem"; - this.cheatsToolStripMenuItem.Size = new System.Drawing.Size(152, 22); + this.cheatsToolStripMenuItem.Size = new System.Drawing.Size(143, 22); this.cheatsToolStripMenuItem.Text = "Cheats"; this.cheatsToolStripMenuItem.Click += new System.EventHandler(this.cheatsToolStripMenuItem_Click); // @@ -1463,13 +1461,6 @@ this.EmuStatus.Size = new System.Drawing.Size(143, 17); this.EmuStatus.Text = "Currently emulating: ur mom"; // - // acceptBackgroundInputToolStripMenuItem - // - this.acceptBackgroundInputToolStripMenuItem.Name = "acceptBackgroundInputToolStripMenuItem"; - this.acceptBackgroundInputToolStripMenuItem.Size = new System.Drawing.Size(220, 22); - this.acceptBackgroundInputToolStripMenuItem.Text = "Accept Background Input"; - this.acceptBackgroundInputToolStripMenuItem.Click += new System.EventHandler(this.acceptBackgroundInputToolStripMenuItem_Click); - // // MainForm // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 14F); @@ -1625,7 +1616,6 @@ private System.Windows.Forms.ToolStripSeparator toolStripSeparator10; private System.Windows.Forms.ToolStripMenuItem saveConfigToolStripMenuItem; private System.Windows.Forms.ToolStripMenuItem loadConfigToolStripMenuItem; - private System.Windows.Forms.ToolStripMenuItem replayInputLogToolStripMenuItem; private System.Windows.Forms.ToolStripMenuItem NESToolStripMenuItem; private System.Windows.Forms.ToolStripMenuItem pPUViewerToolStripMenuItem; private System.Windows.Forms.ToolStripMenuItem gameGenieCodesToolStripMenuItem; diff --git a/BizHawk.MultiClient/MainForm.MenuItems.cs b/BizHawk.MultiClient/MainForm.MenuItems.cs index 38bc33803f..1328bdbcf0 100644 --- a/BizHawk.MultiClient/MainForm.MenuItems.cs +++ b/BizHawk.MultiClient/MainForm.MenuItems.cs @@ -392,13 +392,6 @@ namespace BizHawk.MultiClient OpenROM(); } - private void replayInputLogToolStripMenuItem_Click(object sender, EventArgs e) - { - InputLog.StopMovie(); - InputLog.StartPlayback(); - LoadRom(CurrentlyOpenRom); - } - private void PPUViewerToolStripMenuItem_Click(object sender, EventArgs e) { LoadNESPPU();