diff --git a/BizHawk.MultiClient/MainForm.Designer.cs b/BizHawk.MultiClient/MainForm.Designer.cs index 6d28610356..008ffbef3b 100644 --- a/BizHawk.MultiClient/MainForm.Designer.cs +++ b/BizHawk.MultiClient/MainForm.Designer.cs @@ -31,6 +31,12 @@ this.menuStrip1 = new System.Windows.Forms.MenuStrip(); this.fileToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.openROMToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.recentROMToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.noneToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.toolStripSeparator3 = new System.Windows.Forms.ToolStripSeparator(); + this.clearToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.autoloadMostRecentToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.advancedLoadToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.toolStripMenuItem1 = new System.Windows.Forms.ToolStripSeparator(); this.saveStateToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.toolStripMenuItem4 = new System.Windows.Forms.ToolStripMenuItem(); @@ -59,22 +65,11 @@ this.toolStripMenuItem2 = new System.Windows.Forms.ToolStripSeparator(); this.exitToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.emulationToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.viewToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.configToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.toolsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.helpToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.pauseToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.toolStripSeparator1 = new System.Windows.Forms.ToolStripSeparator(); this.powerToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.resetToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.aboutToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.helpToolStripMenuItem1 = new System.Windows.Forms.ToolStripMenuItem(); - this.rAMWatchToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.rAMSearchToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.debuggerToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.hexEditorToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.controllersToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.hotkeysToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.viewToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.xToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.xToolStripMenuItem1 = new System.Windows.Forms.ToolStripMenuItem(); this.toolStripSeparator2 = new System.Windows.Forms.ToolStripSeparator(); @@ -82,13 +77,20 @@ this.displayFrameCounterToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.displayInputToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.displayLagCounterToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.configToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.controllersToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.hotkeysToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.toolsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.rAMWatchToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.rAMSearchToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.debuggerToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.hexEditorToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.luaConsoleToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.recentROMToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.advancedLoadToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.noneToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.toolStripSeparator3 = new System.Windows.Forms.ToolStripSeparator(); - this.clearToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.autoloadMostRecentToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.helpToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.helpToolStripMenuItem1 = new System.Windows.Forms.ToolStripMenuItem(); + this.aboutToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.toolStripSeparator4 = new System.Windows.Forms.ToolStripSeparator(); + this.screenshotF12ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.menuStrip1.SuspendLayout(); this.SuspendLayout(); // @@ -119,6 +121,8 @@ this.saveNamedStateToolStripMenuItem, this.loadNamedStateToolStripMenuItem, this.toolStripMenuItem2, + this.screenshotF12ToolStripMenuItem, + this.toolStripSeparator4, this.exitToolStripMenuItem}); this.fileToolStripMenuItem.Name = "fileToolStripMenuItem"; this.fileToolStripMenuItem.Size = new System.Drawing.Size(35, 20); @@ -132,6 +136,46 @@ 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.recentROMToolStripMenuItem.Name = "recentROMToolStripMenuItem"; + this.recentROMToolStripMenuItem.Size = new System.Drawing.Size(212, 22); + this.recentROMToolStripMenuItem.Text = "Recent ROM"; + // + // noneToolStripMenuItem + // + this.noneToolStripMenuItem.Name = "noneToolStripMenuItem"; + this.noneToolStripMenuItem.Size = new System.Drawing.Size(191, 22); + this.noneToolStripMenuItem.Text = "None"; + // + // toolStripSeparator3 + // + this.toolStripSeparator3.Name = "toolStripSeparator3"; + this.toolStripSeparator3.Size = new System.Drawing.Size(188, 6); + // + // clearToolStripMenuItem + // + this.clearToolStripMenuItem.Name = "clearToolStripMenuItem"; + this.clearToolStripMenuItem.Size = new System.Drawing.Size(191, 22); + this.clearToolStripMenuItem.Text = "Clear"; + // + // autoloadMostRecentToolStripMenuItem + // + this.autoloadMostRecentToolStripMenuItem.Name = "autoloadMostRecentToolStripMenuItem"; + this.autoloadMostRecentToolStripMenuItem.Size = new System.Drawing.Size(191, 22); + this.autoloadMostRecentToolStripMenuItem.Text = "Autoload Most Recent"; + // + // advancedLoadToolStripMenuItem + // + this.advancedLoadToolStripMenuItem.Name = "advancedLoadToolStripMenuItem"; + this.advancedLoadToolStripMenuItem.Size = new System.Drawing.Size(212, 22); + this.advancedLoadToolStripMenuItem.Text = "Advanced Load"; + // // toolStripMenuItem1 // this.toolStripMenuItem1.Name = "toolStripMenuItem1"; @@ -158,7 +202,7 @@ // this.toolStripMenuItem4.Name = "toolStripMenuItem4"; this.toolStripMenuItem4.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Shift | System.Windows.Forms.Keys.F1))); - this.toolStripMenuItem4.Size = new System.Drawing.Size(146, 22); + this.toolStripMenuItem4.Size = new System.Drawing.Size(152, 22); this.toolStripMenuItem4.Text = "1"; this.toolStripMenuItem4.Click += new System.EventHandler(this.toolStripMenuItem4_Click); // @@ -166,7 +210,7 @@ // this.toolStripMenuItem5.Name = "toolStripMenuItem5"; this.toolStripMenuItem5.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Shift | System.Windows.Forms.Keys.F2))); - this.toolStripMenuItem5.Size = new System.Drawing.Size(146, 22); + this.toolStripMenuItem5.Size = new System.Drawing.Size(152, 22); this.toolStripMenuItem5.Text = "2"; this.toolStripMenuItem5.Click += new System.EventHandler(this.toolStripMenuItem5_Click); // @@ -174,7 +218,7 @@ // this.toolStripMenuItem6.Name = "toolStripMenuItem6"; this.toolStripMenuItem6.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Shift | System.Windows.Forms.Keys.F3))); - this.toolStripMenuItem6.Size = new System.Drawing.Size(146, 22); + this.toolStripMenuItem6.Size = new System.Drawing.Size(152, 22); this.toolStripMenuItem6.Text = "3"; this.toolStripMenuItem6.Click += new System.EventHandler(this.toolStripMenuItem6_Click); // @@ -182,7 +226,7 @@ // this.toolStripMenuItem7.Name = "toolStripMenuItem7"; this.toolStripMenuItem7.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Shift | System.Windows.Forms.Keys.F4))); - this.toolStripMenuItem7.Size = new System.Drawing.Size(146, 22); + this.toolStripMenuItem7.Size = new System.Drawing.Size(152, 22); this.toolStripMenuItem7.Text = "4"; this.toolStripMenuItem7.Click += new System.EventHandler(this.toolStripMenuItem7_Click); // @@ -190,7 +234,7 @@ // this.toolStripMenuItem8.Name = "toolStripMenuItem8"; this.toolStripMenuItem8.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Shift | System.Windows.Forms.Keys.F5))); - this.toolStripMenuItem8.Size = new System.Drawing.Size(146, 22); + this.toolStripMenuItem8.Size = new System.Drawing.Size(152, 22); this.toolStripMenuItem8.Text = "5"; this.toolStripMenuItem8.Click += new System.EventHandler(this.toolStripMenuItem8_Click); // @@ -198,7 +242,7 @@ // this.toolStripMenuItem9.Name = "toolStripMenuItem9"; this.toolStripMenuItem9.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Shift | System.Windows.Forms.Keys.F6))); - this.toolStripMenuItem9.Size = new System.Drawing.Size(146, 22); + this.toolStripMenuItem9.Size = new System.Drawing.Size(152, 22); this.toolStripMenuItem9.Text = "6"; this.toolStripMenuItem9.Click += new System.EventHandler(this.toolStripMenuItem9_Click); // @@ -206,7 +250,7 @@ // this.toolStripMenuItem10.Name = "toolStripMenuItem10"; this.toolStripMenuItem10.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Shift | System.Windows.Forms.Keys.F7))); - this.toolStripMenuItem10.Size = new System.Drawing.Size(146, 22); + this.toolStripMenuItem10.Size = new System.Drawing.Size(152, 22); this.toolStripMenuItem10.Text = "7"; this.toolStripMenuItem10.Click += new System.EventHandler(this.toolStripMenuItem10_Click); // @@ -214,7 +258,7 @@ // this.toolStripMenuItem11.Name = "toolStripMenuItem11"; this.toolStripMenuItem11.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Shift | System.Windows.Forms.Keys.F8))); - this.toolStripMenuItem11.Size = new System.Drawing.Size(146, 22); + this.toolStripMenuItem11.Size = new System.Drawing.Size(152, 22); this.toolStripMenuItem11.Text = "8"; this.toolStripMenuItem11.Click += new System.EventHandler(this.toolStripMenuItem11_Click); // @@ -222,7 +266,7 @@ // this.toolStripMenuItem12.Name = "toolStripMenuItem12"; this.toolStripMenuItem12.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Shift | System.Windows.Forms.Keys.F9))); - this.toolStripMenuItem12.Size = new System.Drawing.Size(146, 22); + this.toolStripMenuItem12.Size = new System.Drawing.Size(152, 22); this.toolStripMenuItem12.Text = "9"; this.toolStripMenuItem12.Click += new System.EventHandler(this.toolStripMenuItem12_Click); // @@ -230,7 +274,7 @@ // this.toolStripMenuItem13.Name = "toolStripMenuItem13"; this.toolStripMenuItem13.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Shift | System.Windows.Forms.Keys.F10))); - this.toolStripMenuItem13.Size = new System.Drawing.Size(146, 22); + this.toolStripMenuItem13.Size = new System.Drawing.Size(152, 22); this.toolStripMenuItem13.Text = "0"; this.toolStripMenuItem13.Click += new System.EventHandler(this.toolStripMenuItem13_Click); // @@ -370,50 +414,6 @@ this.emulationToolStripMenuItem.Size = new System.Drawing.Size(65, 20); this.emulationToolStripMenuItem.Text = "&Emulation"; // - // viewToolStripMenuItem - // - this.viewToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { - this.xToolStripMenuItem, - this.xToolStripMenuItem1, - this.toolStripSeparator2, - this.displayFPSToolStripMenuItem, - this.displayFrameCounterToolStripMenuItem, - this.displayInputToolStripMenuItem, - this.displayLagCounterToolStripMenuItem}); - this.viewToolStripMenuItem.Name = "viewToolStripMenuItem"; - this.viewToolStripMenuItem.Size = new System.Drawing.Size(41, 20); - this.viewToolStripMenuItem.Text = "&View"; - // - // configToolStripMenuItem - // - this.configToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { - this.controllersToolStripMenuItem, - this.hotkeysToolStripMenuItem}); - this.configToolStripMenuItem.Name = "configToolStripMenuItem"; - this.configToolStripMenuItem.Size = new System.Drawing.Size(50, 20); - this.configToolStripMenuItem.Text = "&Config"; - // - // toolsToolStripMenuItem - // - this.toolsToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { - this.rAMWatchToolStripMenuItem, - this.rAMSearchToolStripMenuItem, - this.debuggerToolStripMenuItem, - this.hexEditorToolStripMenuItem, - this.luaConsoleToolStripMenuItem}); - this.toolsToolStripMenuItem.Name = "toolsToolStripMenuItem"; - this.toolsToolStripMenuItem.Size = new System.Drawing.Size(44, 20); - this.toolsToolStripMenuItem.Text = "&Tools"; - // - // helpToolStripMenuItem - // - this.helpToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { - this.helpToolStripMenuItem1, - this.aboutToolStripMenuItem}); - this.helpToolStripMenuItem.Name = "helpToolStripMenuItem"; - this.helpToolStripMenuItem.Size = new System.Drawing.Size(40, 20); - this.helpToolStripMenuItem.Text = "&Help"; - // // pauseToolStripMenuItem // this.pauseToolStripMenuItem.Name = "pauseToolStripMenuItem"; @@ -440,62 +440,24 @@ this.resetToolStripMenuItem.Text = "&Reset"; this.resetToolStripMenuItem.Click += new System.EventHandler(this.resetToolStripMenuItem_Click); // - // aboutToolStripMenuItem + // viewToolStripMenuItem // - this.aboutToolStripMenuItem.Name = "aboutToolStripMenuItem"; - this.aboutToolStripMenuItem.Size = new System.Drawing.Size(152, 22); - this.aboutToolStripMenuItem.Text = "&About"; - this.aboutToolStripMenuItem.Click += new System.EventHandler(this.aboutToolStripMenuItem_Click); - // - // helpToolStripMenuItem1 - // - this.helpToolStripMenuItem1.Name = "helpToolStripMenuItem1"; - this.helpToolStripMenuItem1.Size = new System.Drawing.Size(152, 22); - this.helpToolStripMenuItem1.Text = "&Help"; - this.helpToolStripMenuItem1.Click += new System.EventHandler(this.helpToolStripMenuItem1_Click); - // - // rAMWatchToolStripMenuItem - // - this.rAMWatchToolStripMenuItem.Name = "rAMWatchToolStripMenuItem"; - this.rAMWatchToolStripMenuItem.Size = new System.Drawing.Size(152, 22); - this.rAMWatchToolStripMenuItem.Text = "RAM &Watch"; - // - // rAMSearchToolStripMenuItem - // - this.rAMSearchToolStripMenuItem.Name = "rAMSearchToolStripMenuItem"; - this.rAMSearchToolStripMenuItem.Size = new System.Drawing.Size(152, 22); - this.rAMSearchToolStripMenuItem.Text = "RAM &Search"; - // - // debuggerToolStripMenuItem - // - this.debuggerToolStripMenuItem.Name = "debuggerToolStripMenuItem"; - this.debuggerToolStripMenuItem.Size = new System.Drawing.Size(152, 22); - this.debuggerToolStripMenuItem.Text = "&Debugger"; - // - // hexEditorToolStripMenuItem - // - this.hexEditorToolStripMenuItem.Name = "hexEditorToolStripMenuItem"; - this.hexEditorToolStripMenuItem.Size = new System.Drawing.Size(152, 22); - this.hexEditorToolStripMenuItem.Text = "&Hex Editor"; - // - // controllersToolStripMenuItem - // - this.controllersToolStripMenuItem.Name = "controllersToolStripMenuItem"; - this.controllersToolStripMenuItem.Size = new System.Drawing.Size(152, 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.Text = "&Hotkeys"; - this.hotkeysToolStripMenuItem.Click += new System.EventHandler(this.hotkeysToolStripMenuItem_Click); + this.viewToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { + this.xToolStripMenuItem, + this.xToolStripMenuItem1, + this.toolStripSeparator2, + this.displayFPSToolStripMenuItem, + this.displayFrameCounterToolStripMenuItem, + this.displayInputToolStripMenuItem, + this.displayLagCounterToolStripMenuItem}); + this.viewToolStripMenuItem.Name = "viewToolStripMenuItem"; + this.viewToolStripMenuItem.Size = new System.Drawing.Size(41, 20); + this.viewToolStripMenuItem.Text = "&View"; // // xToolStripMenuItem // this.xToolStripMenuItem.Name = "xToolStripMenuItem"; - this.xToolStripMenuItem.Size = new System.Drawing.Size(152, 22); + this.xToolStripMenuItem.Size = new System.Drawing.Size(191, 22); this.xToolStripMenuItem.Text = "1x"; // // xToolStripMenuItem1 @@ -537,51 +499,106 @@ this.displayLagCounterToolStripMenuItem.Text = "Display Lag Counter"; this.displayLagCounterToolStripMenuItem.Click += new System.EventHandler(this.displayLagCounterToolStripMenuItem_Click); // + // configToolStripMenuItem + // + this.configToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { + this.controllersToolStripMenuItem, + this.hotkeysToolStripMenuItem}); + this.configToolStripMenuItem.Name = "configToolStripMenuItem"; + this.configToolStripMenuItem.Size = new System.Drawing.Size(50, 20); + this.configToolStripMenuItem.Text = "&Config"; + // + // controllersToolStripMenuItem + // + this.controllersToolStripMenuItem.Name = "controllersToolStripMenuItem"; + this.controllersToolStripMenuItem.Size = new System.Drawing.Size(137, 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(137, 22); + this.hotkeysToolStripMenuItem.Text = "&Hotkeys"; + this.hotkeysToolStripMenuItem.Click += new System.EventHandler(this.hotkeysToolStripMenuItem_Click); + // + // toolsToolStripMenuItem + // + this.toolsToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { + this.rAMWatchToolStripMenuItem, + this.rAMSearchToolStripMenuItem, + this.debuggerToolStripMenuItem, + this.hexEditorToolStripMenuItem, + this.luaConsoleToolStripMenuItem}); + this.toolsToolStripMenuItem.Name = "toolsToolStripMenuItem"; + this.toolsToolStripMenuItem.Size = new System.Drawing.Size(44, 20); + this.toolsToolStripMenuItem.Text = "&Tools"; + // + // rAMWatchToolStripMenuItem + // + this.rAMWatchToolStripMenuItem.Name = "rAMWatchToolStripMenuItem"; + this.rAMWatchToolStripMenuItem.Size = new System.Drawing.Size(143, 22); + this.rAMWatchToolStripMenuItem.Text = "RAM &Watch"; + // + // rAMSearchToolStripMenuItem + // + this.rAMSearchToolStripMenuItem.Name = "rAMSearchToolStripMenuItem"; + this.rAMSearchToolStripMenuItem.Size = new System.Drawing.Size(143, 22); + this.rAMSearchToolStripMenuItem.Text = "RAM &Search"; + // + // debuggerToolStripMenuItem + // + this.debuggerToolStripMenuItem.Name = "debuggerToolStripMenuItem"; + this.debuggerToolStripMenuItem.Size = new System.Drawing.Size(143, 22); + this.debuggerToolStripMenuItem.Text = "&Debugger"; + // + // hexEditorToolStripMenuItem + // + this.hexEditorToolStripMenuItem.Name = "hexEditorToolStripMenuItem"; + this.hexEditorToolStripMenuItem.Size = new System.Drawing.Size(143, 22); + this.hexEditorToolStripMenuItem.Text = "&Hex Editor"; + // // 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"; // - // recentROMToolStripMenuItem + // helpToolStripMenuItem // - this.recentROMToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { - this.noneToolStripMenuItem, - this.toolStripSeparator3, - this.clearToolStripMenuItem, - this.autoloadMostRecentToolStripMenuItem}); - this.recentROMToolStripMenuItem.Name = "recentROMToolStripMenuItem"; - this.recentROMToolStripMenuItem.Size = new System.Drawing.Size(212, 22); - this.recentROMToolStripMenuItem.Text = "Recent ROM"; + this.helpToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { + this.helpToolStripMenuItem1, + this.aboutToolStripMenuItem}); + this.helpToolStripMenuItem.Name = "helpToolStripMenuItem"; + this.helpToolStripMenuItem.Size = new System.Drawing.Size(40, 20); + this.helpToolStripMenuItem.Text = "&Help"; // - // advancedLoadToolStripMenuItem + // helpToolStripMenuItem1 // - this.advancedLoadToolStripMenuItem.Name = "advancedLoadToolStripMenuItem"; - this.advancedLoadToolStripMenuItem.Size = new System.Drawing.Size(212, 22); - this.advancedLoadToolStripMenuItem.Text = "Advanced Load"; + this.helpToolStripMenuItem1.Name = "helpToolStripMenuItem1"; + this.helpToolStripMenuItem1.Size = new System.Drawing.Size(114, 22); + this.helpToolStripMenuItem1.Text = "&Help"; + this.helpToolStripMenuItem1.Click += new System.EventHandler(this.helpToolStripMenuItem1_Click); // - // noneToolStripMenuItem + // aboutToolStripMenuItem // - this.noneToolStripMenuItem.Name = "noneToolStripMenuItem"; - this.noneToolStripMenuItem.Size = new System.Drawing.Size(191, 22); - this.noneToolStripMenuItem.Text = "None"; + this.aboutToolStripMenuItem.Name = "aboutToolStripMenuItem"; + this.aboutToolStripMenuItem.Size = new System.Drawing.Size(114, 22); + this.aboutToolStripMenuItem.Text = "&About"; + this.aboutToolStripMenuItem.Click += new System.EventHandler(this.aboutToolStripMenuItem_Click); // - // toolStripSeparator3 + // toolStripSeparator4 // - this.toolStripSeparator3.Name = "toolStripSeparator3"; - this.toolStripSeparator3.Size = new System.Drawing.Size(188, 6); + this.toolStripSeparator4.Name = "toolStripSeparator4"; + this.toolStripSeparator4.Size = new System.Drawing.Size(209, 6); // - // clearToolStripMenuItem + // screenshotF12ToolStripMenuItem // - this.clearToolStripMenuItem.Name = "clearToolStripMenuItem"; - this.clearToolStripMenuItem.Size = new System.Drawing.Size(191, 22); - this.clearToolStripMenuItem.Text = "Clear"; - // - // autoloadMostRecentToolStripMenuItem - // - this.autoloadMostRecentToolStripMenuItem.Name = "autoloadMostRecentToolStripMenuItem"; - this.autoloadMostRecentToolStripMenuItem.Size = new System.Drawing.Size(191, 22); - this.autoloadMostRecentToolStripMenuItem.Text = "Autoload Most Recent"; + this.screenshotF12ToolStripMenuItem.Name = "screenshotF12ToolStripMenuItem"; + this.screenshotF12ToolStripMenuItem.ShortcutKeys = System.Windows.Forms.Keys.F12; + this.screenshotF12ToolStripMenuItem.Size = new System.Drawing.Size(212, 22); + this.screenshotF12ToolStripMenuItem.Text = "Screenshot"; + this.screenshotF12ToolStripMenuItem.Click += new System.EventHandler(this.screenshotF12ToolStripMenuItem_Click); // // MainForm // @@ -662,6 +679,8 @@ private System.Windows.Forms.ToolStripSeparator toolStripSeparator3; private System.Windows.Forms.ToolStripMenuItem clearToolStripMenuItem; private System.Windows.Forms.ToolStripMenuItem autoloadMostRecentToolStripMenuItem; + private System.Windows.Forms.ToolStripMenuItem screenshotF12ToolStripMenuItem; + private System.Windows.Forms.ToolStripSeparator toolStripSeparator4; } } diff --git a/BizHawk.MultiClient/MainForm.cs b/BizHawk.MultiClient/MainForm.cs index c55c906f04..ff3dff2cd7 100644 --- a/BizHawk.MultiClient/MainForm.cs +++ b/BizHawk.MultiClient/MainForm.cs @@ -451,5 +451,10 @@ namespace BizHawk.MultiClient { } + + private void screenshotF12ToolStripMenuItem_Click(object sender, EventArgs e) + { + TakeScreenshot(); + } } } \ No newline at end of file