diff --git a/src/BizHawk.Client.EmuHawk/tools/BasicBot/BasicBot.Designer.cs b/src/BizHawk.Client.EmuHawk/tools/BasicBot/BasicBot.Designer.cs index 7a707a5593..2a660c0393 100644 --- a/src/BizHawk.Client.EmuHawk/tools/BasicBot/BasicBot.Designer.cs +++ b/src/BizHawk.Client.EmuHawk/tools/BasicBot/BasicBot.Designer.cs @@ -39,8 +39,6 @@ namespace BizHawk.Client.EmuHawk this.SaveAsMenuItem = new BizHawk.WinForms.Controls.ToolStripMenuItemEx(); this.RecentSubMenu = new BizHawk.WinForms.Controls.ToolStripMenuItemEx(); this.toolStripSeparator2 = new BizHawk.WinForms.Controls.ToolStripSeparatorEx(); - this.toolStripSeparator1 = new BizHawk.WinForms.Controls.ToolStripSeparatorEx(); - this.ExitMenuItem = new BizHawk.WinForms.Controls.ToolStripMenuItemEx(); this.OptionsSubMenu = new BizHawk.WinForms.Controls.ToolStripMenuItemEx(); this.MemoryDomainsMenuItem = new BizHawk.WinForms.Controls.ToolStripMenuItemEx(); this.toolStripSeparator3 = new BizHawk.WinForms.Controls.ToolStripSeparatorEx(); @@ -158,9 +156,7 @@ namespace BizHawk.Client.EmuHawk this.OpenMenuItem, this.SaveMenuItem, this.SaveAsMenuItem, - this.RecentSubMenu, - this.toolStripSeparator1, - this.ExitMenuItem}); + this.RecentSubMenu}); this.FileSubMenu.Text = "&File"; this.FileSubMenu.DropDownOpened += new System.EventHandler(this.FileSubMenu_DropDownOpened); // @@ -196,12 +192,6 @@ namespace BizHawk.Client.EmuHawk this.RecentSubMenu.Text = "Recent"; this.RecentSubMenu.DropDownOpened += new System.EventHandler(this.RecentSubMenu_DropDownOpened); // - // ExitMenuItem - // - this.ExitMenuItem.ShortcutKeyDisplayString = "Alt+F4"; - this.ExitMenuItem.Text = "E&xit"; - this.ExitMenuItem.Click += new System.EventHandler(this.ExitMenuItem_Click); - // // OptionsSubMenu // this.OptionsSubMenu.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { @@ -1080,12 +1070,10 @@ namespace BizHawk.Client.EmuHawk private MenuStripEx BotMenu; private BizHawk.WinForms.Controls.ToolStripMenuItemEx FileSubMenu; - private BizHawk.WinForms.Controls.ToolStripMenuItemEx ExitMenuItem; private System.Windows.Forms.Button RunBtn; private BizHawk.WinForms.Controls.ToolStripMenuItemEx OpenMenuItem; private BizHawk.WinForms.Controls.ToolStripMenuItemEx SaveMenuItem; private BizHawk.WinForms.Controls.ToolStripMenuItemEx RecentSubMenu; - private BizHawk.WinForms.Controls.ToolStripSeparatorEx toolStripSeparator1; private System.Windows.Forms.StatusStrip BotStatusStrip; private System.Windows.Forms.GroupBox ControlsBox; private System.Windows.Forms.Panel ControlProbabilityPanel; diff --git a/src/BizHawk.Client.EmuHawk/tools/BasicBot/BasicBot.cs b/src/BizHawk.Client.EmuHawk/tools/BasicBot/BasicBot.cs index 8b0661b110..d1c9bafa1c 100644 --- a/src/BizHawk.Client.EmuHawk/tools/BasicBot/BasicBot.cs +++ b/src/BizHawk.Client.EmuHawk/tools/BasicBot/BasicBot.cs @@ -368,11 +368,6 @@ namespace BizHawk.Client.EmuHawk } } - private void ExitMenuItem_Click(object sender, EventArgs e) - { - Close(); - } - private void OptionsSubMenu_DropDownOpened(object sender, EventArgs e) { TurboWhileBottingMenuItem.Checked = Settings.TurboWhenBotting; @@ -995,17 +990,17 @@ namespace BizHawk.Client.EmuHawk { if (_replayMode) { - BotStatusButton.Image = Properties.Resources.Play; + BotStatusButton.Image = Resources.Play; BotStatusButton.ToolTipText = "Replaying best result"; } else if (_isBotting) { - BotStatusButton.Image = Properties.Resources.Record; + BotStatusButton.Image = Resources.Record; BotStatusButton.ToolTipText = "Botting in progress"; } else { - BotStatusButton.Image = Properties.Resources.Pause; + BotStatusButton.Image = Resources.Pause; BotStatusButton.ToolTipText = "Bot is currently not running"; } } diff --git a/src/BizHawk.Client.EmuHawk/tools/Cheats/Cheats.Designer.cs b/src/BizHawk.Client.EmuHawk/tools/Cheats/Cheats.Designer.cs index 14defd10ab..52248c7ae6 100644 --- a/src/BizHawk.Client.EmuHawk/tools/Cheats/Cheats.Designer.cs +++ b/src/BizHawk.Client.EmuHawk/tools/Cheats/Cheats.Designer.cs @@ -46,8 +46,6 @@ namespace BizHawk.Client.EmuHawk this.AppendMenuItem = new BizHawk.WinForms.Controls.ToolStripMenuItemEx(); this.RecentSubMenu = new BizHawk.WinForms.Controls.ToolStripMenuItemEx(); this.toolStripSeparator4 = new BizHawk.WinForms.Controls.ToolStripSeparatorEx(); - this.toolStripSeparator1 = new BizHawk.WinForms.Controls.ToolStripSeparatorEx(); - this.ExitMenuItem = new BizHawk.WinForms.Controls.ToolStripMenuItemEx(); this.CheatsSubMenu = new BizHawk.WinForms.Controls.ToolStripMenuItemEx(); this.RemoveCheatMenuItem = new BizHawk.WinForms.Controls.ToolStripMenuItemEx(); this.InsertSeparatorMenuItem = new BizHawk.WinForms.Controls.ToolStripMenuItemEx(); @@ -160,9 +158,7 @@ namespace BizHawk.Client.EmuHawk this.SaveMenuItem, this.SaveAsMenuItem, this.AppendMenuItem, - this.RecentSubMenu, - this.toolStripSeparator1, - this.ExitMenuItem}); + this.RecentSubMenu}); this.FileSubMenu.Text = "&File"; this.FileSubMenu.DropDownOpened += new System.EventHandler(this.FileSubMenu_DropDownOpened); // @@ -202,12 +198,6 @@ namespace BizHawk.Client.EmuHawk this.RecentSubMenu.Text = "Recent"; this.RecentSubMenu.DropDownOpened += new System.EventHandler(this.RecentSubMenu_DropDownOpened); // - // ExitMenuItem - // - this.ExitMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Alt | System.Windows.Forms.Keys.F4))); - this.ExitMenuItem.Text = "E&xit"; - this.ExitMenuItem.Click += new System.EventHandler(this.ExitMenuItem_Click); - // // CheatsSubMenu // this.CheatsSubMenu.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { @@ -465,8 +455,6 @@ namespace BizHawk.Client.EmuHawk private BizHawk.WinForms.Controls.ToolStripMenuItemEx AppendMenuItem; private BizHawk.WinForms.Controls.ToolStripMenuItemEx RecentSubMenu; private BizHawk.WinForms.Controls.ToolStripSeparatorEx toolStripSeparator4; - private BizHawk.WinForms.Controls.ToolStripSeparatorEx toolStripSeparator1; - private BizHawk.WinForms.Controls.ToolStripMenuItemEx ExitMenuItem; private BizHawk.WinForms.Controls.ToolStripMenuItemEx CheatsSubMenu; private BizHawk.WinForms.Controls.ToolStripMenuItemEx RemoveCheatMenuItem; private BizHawk.WinForms.Controls.ToolStripMenuItemEx InsertSeparatorMenuItem; diff --git a/src/BizHawk.Client.EmuHawk/tools/Cheats/Cheats.cs b/src/BizHawk.Client.EmuHawk/tools/Cheats/Cheats.cs index c17c407cfc..aa1d274a10 100644 --- a/src/BizHawk.Client.EmuHawk/tools/Cheats/Cheats.cs +++ b/src/BizHawk.Client.EmuHawk/tools/Cheats/Cheats.cs @@ -374,11 +374,6 @@ namespace BizHawk.Client.EmuHawk } } - private void ExitMenuItem_Click(object sender, EventArgs e) - { - Close(); - } - private void CheatsSubMenu_DropDownOpened(object sender, EventArgs e) { RemoveCheatMenuItem.Enabled = diff --git a/src/BizHawk.Client.EmuHawk/tools/Debugger/GenericDebugger.Designer.cs b/src/BizHawk.Client.EmuHawk/tools/Debugger/GenericDebugger.Designer.cs index 8bf4c03706..4ef65012af 100644 --- a/src/BizHawk.Client.EmuHawk/tools/Debugger/GenericDebugger.Designer.cs +++ b/src/BizHawk.Client.EmuHawk/tools/Debugger/GenericDebugger.Designer.cs @@ -33,7 +33,6 @@ namespace BizHawk.Client.EmuHawk this.components = new System.ComponentModel.Container(); this.menuStrip1 = new MenuStripEx(); this.fileToolStripMenuItem = new BizHawk.WinForms.Controls.ToolStripMenuItemEx(); - this.ExitMenuItem = new BizHawk.WinForms.Controls.ToolStripMenuItemEx(); this.DebugSubMenu = new BizHawk.WinForms.Controls.ToolStripMenuItemEx(); this.StepIntoMenuItem = new BizHawk.WinForms.Controls.ToolStripMenuItemEx(); this.StepOverMenuItem = new BizHawk.WinForms.Controls.ToolStripMenuItemEx(); @@ -74,16 +73,8 @@ namespace BizHawk.Client.EmuHawk // // fileToolStripMenuItem // - this.fileToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { - this.ExitMenuItem}); this.fileToolStripMenuItem.Text = "&File"; // - // ExitMenuItem - // - this.ExitMenuItem.ShortcutKeyDisplayString = "Alt+F4"; - this.ExitMenuItem.Text = "&Close"; - this.ExitMenuItem.Click += new System.EventHandler(this.ExitMenuItem_Click); - // // DebugSubMenu // this.DebugSubMenu.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { @@ -356,7 +347,6 @@ namespace BizHawk.Client.EmuHawk private MenuStripEx menuStrip1; private BizHawk.WinForms.Controls.ToolStripMenuItemEx fileToolStripMenuItem; - private BizHawk.WinForms.Controls.ToolStripMenuItemEx ExitMenuItem; private System.Windows.Forms.GroupBox RegistersGroupBox; private RegisterBoxControl RegisterPanel; private System.Windows.Forms.GroupBox BreakpointsGroupBox; diff --git a/src/BizHawk.Client.EmuHawk/tools/Debugger/GenericDebugger.cs b/src/BizHawk.Client.EmuHawk/tools/Debugger/GenericDebugger.cs index a4e9ffc1cd..17322c5c84 100644 --- a/src/BizHawk.Client.EmuHawk/tools/Debugger/GenericDebugger.cs +++ b/src/BizHawk.Client.EmuHawk/tools/Debugger/GenericDebugger.cs @@ -186,11 +186,6 @@ namespace BizHawk.Client.EmuHawk Disassembler.Cpu = ((ComboBox) sender).SelectedItem.ToString(); } - private void ExitMenuItem_Click(object sender, EventArgs e) - { - Close(); - } - private void RunBtn_Click(object sender, EventArgs e) { MainForm.UnpauseEmulator(); diff --git a/src/BizHawk.Client.EmuHawk/tools/Genesis/VDPViewer.Designer.cs b/src/BizHawk.Client.EmuHawk/tools/Genesis/VDPViewer.Designer.cs index 3102a09833..3e576402b8 100644 --- a/src/BizHawk.Client.EmuHawk/tools/Genesis/VDPViewer.Designer.cs +++ b/src/BizHawk.Client.EmuHawk/tools/Genesis/VDPViewer.Designer.cs @@ -48,8 +48,6 @@ namespace BizHawk.Client.EmuHawk this.saveTilesScreenshotToolStripMenuItem = new BizHawk.WinForms.Controls.ToolStripMenuItemEx(); this.saveWindowScreenshotToolStripMenuItem = new BizHawk.WinForms.Controls.ToolStripMenuItemEx(); this.savePaletteScreenshotToolStripMenuItem = new BizHawk.WinForms.Controls.ToolStripMenuItemEx(); - this.toolStripSeparator1 = new BizHawk.WinForms.Controls.ToolStripSeparatorEx(); - this.closeToolStripMenuItem = new BizHawk.WinForms.Controls.ToolStripMenuItemEx(); this.groupBox1.SuspendLayout(); this.groupBox2.SuspendLayout(); this.groupBox3.SuspendLayout(); @@ -168,9 +166,7 @@ namespace BizHawk.Client.EmuHawk this.saveBGBScreenshotToolStripMenuItem, this.saveTilesScreenshotToolStripMenuItem, this.saveWindowScreenshotToolStripMenuItem, - this.savePaletteScreenshotToolStripMenuItem, - this.toolStripSeparator1, - this.closeToolStripMenuItem}); + this.savePaletteScreenshotToolStripMenuItem}); this.fileToolStripMenuItem.Text = "&File"; // // saveBGAScreenshotToolStripMenuItem @@ -198,12 +194,6 @@ namespace BizHawk.Client.EmuHawk this.savePaletteScreenshotToolStripMenuItem.Text = "Save Palette Screenshot..."; this.savePaletteScreenshotToolStripMenuItem.Click += new System.EventHandler(this.SavePaletteScreenshotToolStripMenuItem_Click); // - // closeToolStripMenuItem - // - this.closeToolStripMenuItem.ShortcutKeyDisplayString = "Alt+F4"; - this.closeToolStripMenuItem.Text = "&Close"; - this.closeToolStripMenuItem.Click += new System.EventHandler(this.CloseMenuItem_Click); - // // GenVDPViewer // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); @@ -255,7 +245,5 @@ namespace BizHawk.Client.EmuHawk private BizHawk.WinForms.Controls.ToolStripMenuItemEx saveTilesScreenshotToolStripMenuItem; private BizHawk.WinForms.Controls.ToolStripMenuItemEx saveWindowScreenshotToolStripMenuItem; private BizHawk.WinForms.Controls.ToolStripMenuItemEx savePaletteScreenshotToolStripMenuItem; - private BizHawk.WinForms.Controls.ToolStripSeparatorEx toolStripSeparator1; - private BizHawk.WinForms.Controls.ToolStripMenuItemEx closeToolStripMenuItem; } } \ No newline at end of file diff --git a/src/BizHawk.Client.EmuHawk/tools/Genesis/VDPViewer.cs b/src/BizHawk.Client.EmuHawk/tools/Genesis/VDPViewer.cs index 22dccb8bb6..2efe3b99f7 100644 --- a/src/BizHawk.Client.EmuHawk/tools/Genesis/VDPViewer.cs +++ b/src/BizHawk.Client.EmuHawk/tools/Genesis/VDPViewer.cs @@ -204,10 +204,5 @@ namespace BizHawk.Client.EmuHawk { SaveAsFile(bmpViewNTA.Bmp, "Palettes"); } - - private void CloseMenuItem_Click(object sender, EventArgs e) - { - Close(); - } } } diff --git a/src/BizHawk.Client.EmuHawk/tools/HexEditor/HexEditor.Designer.cs b/src/BizHawk.Client.EmuHawk/tools/HexEditor/HexEditor.Designer.cs index f64390e146..8a373f1fe9 100644 --- a/src/BizHawk.Client.EmuHawk/tools/HexEditor/HexEditor.Designer.cs +++ b/src/BizHawk.Client.EmuHawk/tools/HexEditor/HexEditor.Designer.cs @@ -42,8 +42,6 @@ namespace BizHawk.Client.EmuHawk this.CloseTableFileMenuItem = new BizHawk.WinForms.Controls.ToolStripMenuItemEx(); this.RecentTablesSubMenu = new BizHawk.WinForms.Controls.ToolStripMenuItemEx(); this.noneToolStripMenuItem = new BizHawk.WinForms.Controls.ToolStripMenuItemEx(); - this.toolStripSeparator1 = new BizHawk.WinForms.Controls.ToolStripSeparatorEx(); - this.ExitMenuItem = new BizHawk.WinForms.Controls.ToolStripMenuItemEx(); this.EditMenuItem = new BizHawk.WinForms.Controls.ToolStripMenuItemEx(); this.CopyMenuItem = new BizHawk.WinForms.Controls.ToolStripMenuItemEx(); this.ExportMenuItem = new BizHawk.WinForms.Controls.ToolStripMenuItemEx(); @@ -117,9 +115,7 @@ namespace BizHawk.Client.EmuHawk this.toolStripSeparator4, this.LoadTableFileMenuItem, this.CloseTableFileMenuItem, - this.RecentTablesSubMenu, - this.toolStripSeparator1, - this.ExitMenuItem}); + this.RecentTablesSubMenu}); this.FileSubMenu.Text = "&File"; this.FileSubMenu.DropDownOpened += new System.EventHandler(this.FileSubMenu_DropDownOpened); // @@ -168,12 +164,6 @@ namespace BizHawk.Client.EmuHawk // this.noneToolStripMenuItem.Text = "None"; // - // ExitMenuItem - // - this.ExitMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Alt | System.Windows.Forms.Keys.F4))); - this.ExitMenuItem.Text = "E&xit"; - this.ExitMenuItem.Click += new System.EventHandler(this.ExitMenuItem_Click); - // // EditMenuItem // this.EditMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { @@ -505,8 +495,6 @@ namespace BizHawk.Client.EmuHawk public MenuStripEx HexMenuStrip; private BizHawk.WinForms.Controls.ToolStripMenuItemEx FileSubMenu; private BizHawk.WinForms.Controls.ToolStripMenuItemEx SaveAsTextMenuItem; - private BizHawk.WinForms.Controls.ToolStripSeparatorEx toolStripSeparator1; - private BizHawk.WinForms.Controls.ToolStripMenuItemEx ExitMenuItem; private BizHawk.WinForms.Controls.ToolStripMenuItemEx OptionsSubMenu; private BizHawk.WinForms.Controls.ToolStripMenuItemEx MemoryDomainsMenuItem; private BizHawk.WinForms.Controls.ToolStripMenuItemEx DataSizeSubMenu; diff --git a/src/BizHawk.Client.EmuHawk/tools/HexEditor/HexEditor.cs b/src/BizHawk.Client.EmuHawk/tools/HexEditor/HexEditor.cs index c2f2396d35..b466f61368 100644 --- a/src/BizHawk.Client.EmuHawk/tools/HexEditor/HexEditor.cs +++ b/src/BizHawk.Client.EmuHawk/tools/HexEditor/HexEditor.cs @@ -1362,11 +1362,6 @@ namespace BizHawk.Client.EmuHawk RecentTablesSubMenu.DropDownItems.AddRange(RecentTables.RecentMenu(LoadFileFromRecent, "Session")); } - private void ExitMenuItem_Click(object sender, EventArgs e) - { - Close(); - } - private void EditMenuItem_DropDownOpened(object sender, EventArgs e) { var data = Clipboard.GetDataObject(); diff --git a/src/BizHawk.Client.EmuHawk/tools/Lua/LuaConsole.Designer.cs b/src/BizHawk.Client.EmuHawk/tools/Lua/LuaConsole.Designer.cs index 8ee4500f93..e5cdd3c621 100644 --- a/src/BizHawk.Client.EmuHawk/tools/Lua/LuaConsole.Designer.cs +++ b/src/BizHawk.Client.EmuHawk/tools/Lua/LuaConsole.Designer.cs @@ -51,8 +51,6 @@ namespace BizHawk.Client.EmuHawk this.toolStripSeparator8 = new BizHawk.WinForms.Controls.ToolStripSeparatorEx(); this.RecentScriptsSubMenu = new BizHawk.WinForms.Controls.ToolStripMenuItemEx(); this.toolStripSeparator3 = new BizHawk.WinForms.Controls.ToolStripSeparatorEx(); - this.toolStripSeparator1 = new BizHawk.WinForms.Controls.ToolStripSeparatorEx(); - this.ExitMenuItem = new BizHawk.WinForms.Controls.ToolStripMenuItemEx(); this.ScriptSubMenu = new BizHawk.WinForms.Controls.ToolStripMenuItemEx(); this.NewScriptMenuItem = new BizHawk.WinForms.Controls.ToolStripMenuItemEx(); this.OpenScriptMenuItem = new BizHawk.WinForms.Controls.ToolStripMenuItemEx(); @@ -189,9 +187,7 @@ namespace BizHawk.Client.EmuHawk this.SaveSessionAsMenuItem, this.toolStripSeparator9, this.RecentSessionsSubMenu, - this.RecentScriptsSubMenu, - this.toolStripSeparator1, - this.ExitMenuItem}); + this.RecentScriptsSubMenu}); this.FileSubMenu.Text = "&File"; this.FileSubMenu.DropDownOpened += new System.EventHandler(this.FileSubMenu_DropDownOpened); // @@ -236,12 +232,6 @@ namespace BizHawk.Client.EmuHawk this.RecentScriptsSubMenu.Text = "Recent Scripts"; this.RecentScriptsSubMenu.DropDownOpened += new System.EventHandler(this.RecentScriptsSubMenu_DropDownOpened); // - // ExitMenuItem - // - this.ExitMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Alt | System.Windows.Forms.Keys.F4))); - this.ExitMenuItem.Text = "E&xit"; - this.ExitMenuItem.Click += new System.EventHandler(this.ExitMenuItem_Click); - // // ScriptSubMenu // this.ScriptSubMenu.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { @@ -717,8 +707,6 @@ namespace BizHawk.Client.EmuHawk private BizHawk.WinForms.Controls.ToolStripMenuItemEx FileSubMenu; private BizHawk.WinForms.Controls.ToolStripMenuItemEx SaveSessionMenuItem; private BizHawk.WinForms.Controls.ToolStripMenuItemEx SaveSessionAsMenuItem; - private BizHawk.WinForms.Controls.ToolStripSeparatorEx toolStripSeparator1; - private BizHawk.WinForms.Controls.ToolStripMenuItemEx ExitMenuItem; private BizHawk.WinForms.Controls.ToolStripMenuItemEx ScriptSubMenu; private BizHawk.WinForms.Controls.ToolStripMenuItemEx EditScriptMenuItem; private BizHawk.WinForms.Controls.ToolStripMenuItemEx ToggleScriptMenuItem; diff --git a/src/BizHawk.Client.EmuHawk/tools/Lua/LuaConsole.cs b/src/BizHawk.Client.EmuHawk/tools/Lua/LuaConsole.cs index ff93d07b8b..d7031e51cc 100644 --- a/src/BizHawk.Client.EmuHawk/tools/Lua/LuaConsole.cs +++ b/src/BizHawk.Client.EmuHawk/tools/Lua/LuaConsole.cs @@ -845,11 +845,6 @@ namespace BizHawk.Client.EmuHawk SaveSessionAs(); } - private void ExitMenuItem_Click(object sender, EventArgs e) - { - Close(); - } - private void ScriptSubMenu_DropDownOpened(object sender, EventArgs e) { ToggleScriptMenuItem.Enabled = diff --git a/src/BizHawk.Client.EmuHawk/tools/Macros/MacroInput.Designer.cs b/src/BizHawk.Client.EmuHawk/tools/Macros/MacroInput.Designer.cs index 15cdfecbfa..c3b0ad7610 100644 --- a/src/BizHawk.Client.EmuHawk/tools/Macros/MacroInput.Designer.cs +++ b/src/BizHawk.Client.EmuHawk/tools/Macros/MacroInput.Designer.cs @@ -34,8 +34,6 @@ this.loadMacroToolStripMenuItem = new BizHawk.WinForms.Controls.ToolStripMenuItemEx(); this.RecentToolStripMenuItem = new BizHawk.WinForms.Controls.ToolStripMenuItemEx(); this.toolStripSeparator1 = new BizHawk.WinForms.Controls.ToolStripSeparatorEx(); - this.sepToolStripMenuItem = new BizHawk.WinForms.Controls.ToolStripSeparatorEx(); - this.ExitMenuItem = new BizHawk.WinForms.Controls.ToolStripMenuItemEx(); this.NameTextbox = new System.Windows.Forms.TextBox(); this.ReplaceBox = new System.Windows.Forms.CheckBox(); this.label2 = new BizHawk.WinForms.Controls.LocLabelEx(); @@ -70,9 +68,7 @@ this.FileSubMenu.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { this.saveAsToolStripMenuItem, this.loadMacroToolStripMenuItem, - this.RecentToolStripMenuItem, - this.sepToolStripMenuItem, - this.ExitMenuItem}); + this.RecentToolStripMenuItem}); this.FileSubMenu.Text = "&File"; // // saveAsToolStripMenuItem @@ -92,12 +88,6 @@ this.RecentToolStripMenuItem.Text = "Recent"; this.RecentToolStripMenuItem.DropDownOpened += new System.EventHandler(this.RecentToolStripMenuItem_DropDownOpened); // - // ExitMenuItem - // - this.ExitMenuItem.ShortcutKeyDisplayString = "Alt+F4"; - this.ExitMenuItem.Text = "E&xit"; - this.ExitMenuItem.Click += new System.EventHandler(this.ExitMenuItem_Click); - // // NameTextbox // this.NameTextbox.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) @@ -273,7 +263,6 @@ private System.Windows.Forms.MenuStrip MacroMenu; private BizHawk.WinForms.Controls.ToolStripMenuItemEx FileSubMenu; - private BizHawk.WinForms.Controls.ToolStripMenuItemEx ExitMenuItem; private System.Windows.Forms.TextBox NameTextbox; private System.Windows.Forms.CheckBox ReplaceBox; private BizHawk.WinForms.Controls.LocLabelEx label2; @@ -288,7 +277,6 @@ private BizHawk.WinForms.Controls.ToolStripMenuItemEx saveAsToolStripMenuItem; private BizHawk.WinForms.Controls.ToolStripMenuItemEx loadMacroToolStripMenuItem; private BizHawk.WinForms.Controls.ToolStripMenuItemEx RecentToolStripMenuItem; - private BizHawk.WinForms.Controls.ToolStripSeparatorEx sepToolStripMenuItem; private System.Windows.Forms.Button CurrentButton; private BizHawk.WinForms.Controls.ToolStripSeparatorEx toolStripSeparator1; private System.Windows.Forms.CheckBox OverlayBox; diff --git a/src/BizHawk.Client.EmuHawk/tools/Macros/MacroInput.cs b/src/BizHawk.Client.EmuHawk/tools/Macros/MacroInput.cs index cbd8ca331d..d4448077f5 100644 --- a/src/BizHawk.Client.EmuHawk/tools/Macros/MacroInput.cs +++ b/src/BizHawk.Client.EmuHawk/tools/Macros/MacroInput.cs @@ -114,11 +114,6 @@ namespace BizHawk.Client.EmuHawk return true; } - private void ExitMenuItem_Click(object sender, EventArgs e) - { - Close(); - } - private void SetZoneButton_Click(object sender, EventArgs e) { if (StartNum.Value >= CurrentMovie.InputLogLength || EndNum.Value >= CurrentMovie.InputLogLength) diff --git a/src/BizHawk.Client.EmuHawk/tools/NES/NESMusicRipper.Designer.cs b/src/BizHawk.Client.EmuHawk/tools/NES/NESMusicRipper.Designer.cs index d75f0148d9..5928b0b745 100644 --- a/src/BizHawk.Client.EmuHawk/tools/NES/NESMusicRipper.Designer.cs +++ b/src/BizHawk.Client.EmuHawk/tools/NES/NESMusicRipper.Designer.cs @@ -43,8 +43,6 @@ namespace BizHawk.Client.EmuHawk this.groupBox2 = new System.Windows.Forms.GroupBox(); this.menuStrip1 = new MenuStripEx(); this.FileSubMenu = new BizHawk.WinForms.Controls.ToolStripMenuItemEx(); - this.toolStripSeparator2 = new BizHawk.WinForms.Controls.ToolStripSeparatorEx(); - this.ExitMenuItem = new BizHawk.WinForms.Controls.ToolStripMenuItemEx(); this.groupBox1.SuspendLayout(); this.groupBox2.SuspendLayout(); this.menuStrip1.SuspendLayout(); @@ -148,17 +146,8 @@ namespace BizHawk.Client.EmuHawk // // FileSubMenu // - this.FileSubMenu.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { - this.toolStripSeparator2, - this.ExitMenuItem}); this.FileSubMenu.Text = "&File"; // - // ExitMenuItem - // - this.ExitMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Alt | System.Windows.Forms.Keys.F4))); - this.ExitMenuItem.Text = "E&xit"; - this.ExitMenuItem.Click += new System.EventHandler(this.ExitMenuItem_Click); - // // NESMusicRipper // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); @@ -192,8 +181,6 @@ namespace BizHawk.Client.EmuHawk private BizHawk.WinForms.Controls.LocLabelEx lblContents; private MenuStripEx menuStrip1; private BizHawk.WinForms.Controls.ToolStripMenuItemEx FileSubMenu; - private BizHawk.WinForms.Controls.ToolStripSeparatorEx toolStripSeparator2; - private BizHawk.WinForms.Controls.ToolStripMenuItemEx ExitMenuItem; private System.Windows.Forms.TextBox textBox1; private System.Windows.Forms.TextBox txtPatternLength; private System.Windows.Forms.GroupBox groupBox1; diff --git a/src/BizHawk.Client.EmuHawk/tools/NES/NESMusicRipper.cs b/src/BizHawk.Client.EmuHawk/tools/NES/NESMusicRipper.cs index 6c3aedbfa0..7cdc6f80b3 100644 --- a/src/BizHawk.Client.EmuHawk/tools/NES/NESMusicRipper.cs +++ b/src/BizHawk.Client.EmuHawk/tools/NES/NESMusicRipper.cs @@ -514,11 +514,6 @@ namespace BizHawk.Client.EmuHawk } } - private void ExitMenuItem_Click(object sender, EventArgs e) - { - Close(); - } - private void NESMusicRipper_FormClosed(object sender, FormClosedEventArgs e) { var apu = Nes.apu; diff --git a/src/BizHawk.Client.EmuHawk/tools/NES/NESNameTableViewer.Designer.cs b/src/BizHawk.Client.EmuHawk/tools/NES/NESNameTableViewer.Designer.cs index 1cfb062f8f..1c266efcbd 100644 --- a/src/BizHawk.Client.EmuHawk/tools/NES/NESNameTableViewer.Designer.cs +++ b/src/BizHawk.Client.EmuHawk/tools/NES/NESNameTableViewer.Designer.cs @@ -41,8 +41,6 @@ namespace BizHawk.Client.EmuHawk this.FileSubMenu = new BizHawk.WinForms.Controls.ToolStripMenuItemEx(); this.ScreenshotMenuItem = new BizHawk.WinForms.Controls.ToolStripMenuItemEx(); this.ScreenshotToClipboardMenuItem = new BizHawk.WinForms.Controls.ToolStripMenuItemEx(); - this.toolStripSeparator2 = new BizHawk.WinForms.Controls.ToolStripSeparatorEx(); - this.ExitMenuItem = new BizHawk.WinForms.Controls.ToolStripMenuItemEx(); this.txtScanline = new System.Windows.Forms.TextBox(); this.rbNametableNW = new System.Windows.Forms.RadioButton(); this.rbNametableNE = new System.Windows.Forms.RadioButton(); @@ -133,9 +131,7 @@ namespace BizHawk.Client.EmuHawk // this.FileSubMenu.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { this.ScreenshotMenuItem, - this.ScreenshotToClipboardMenuItem, - this.toolStripSeparator2, - this.ExitMenuItem}); + this.ScreenshotToClipboardMenuItem}); this.FileSubMenu.Text = "&File"; // // ScreenshotMenuItem @@ -149,12 +145,6 @@ namespace BizHawk.Client.EmuHawk this.ScreenshotToClipboardMenuItem.Text = "Screenshot to &Clipboard"; this.ScreenshotToClipboardMenuItem.Click += new System.EventHandler(this.ScreenshotToClipboardMenuItem_Click); // - // ExitMenuItem - // - this.ExitMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Alt | System.Windows.Forms.Keys.F4))); - this.ExitMenuItem.Text = "E&xit"; - this.ExitMenuItem.Click += new System.EventHandler(this.ExitMenuItem_Click); - // // txtScanline // this.txtScanline.Location = new System.Drawing.Point(4, 19); @@ -428,8 +418,6 @@ namespace BizHawk.Client.EmuHawk private BizHawk.WinForms.Controls.LocLabelEx label7; private BizHawk.WinForms.Controls.ToolStripMenuItemEx FileSubMenu; private BizHawk.WinForms.Controls.ToolStripMenuItemEx ScreenshotMenuItem; - private BizHawk.WinForms.Controls.ToolStripSeparatorEx toolStripSeparator2; - private BizHawk.WinForms.Controls.ToolStripMenuItemEx ExitMenuItem; private System.Windows.Forms.ContextMenuStrip contextMenuStrip1; private BizHawk.WinForms.Controls.ToolStripMenuItemEx ScreenshotAsContextMenuItem; private BizHawk.WinForms.Controls.ToolStripMenuItemEx RefreshImageContextMenuItem; diff --git a/src/BizHawk.Client.EmuHawk/tools/NES/NESPPU.Designer.cs b/src/BizHawk.Client.EmuHawk/tools/NES/NESPPU.Designer.cs index 7d6c252d01..62cff9dabb 100644 --- a/src/BizHawk.Client.EmuHawk/tools/NES/NESPPU.Designer.cs +++ b/src/BizHawk.Client.EmuHawk/tools/NES/NESPPU.Designer.cs @@ -76,8 +76,6 @@ namespace BizHawk.Client.EmuHawk this.CopyPaletteToClipboardMenuItem = new BizHawk.WinForms.Controls.ToolStripMenuItemEx(); this.CopyPatternToClipboardMenuItem = new BizHawk.WinForms.Controls.ToolStripMenuItemEx(); this.CopySpriteToClipboardMenuItem = new BizHawk.WinForms.Controls.ToolStripMenuItemEx(); - this.toolStripSeparator2 = new BizHawk.WinForms.Controls.ToolStripSeparatorEx(); - this.ExitMenuItem = new BizHawk.WinForms.Controls.ToolStripMenuItemEx(); this.PatternSubMenu = new BizHawk.WinForms.Controls.ToolStripMenuItemEx(); this.Table0PaletteSubMenu = new BizHawk.WinForms.Controls.ToolStripMenuItemEx(); this.Table0P0MenuItem = new BizHawk.WinForms.Controls.ToolStripMenuItemEx(); @@ -464,9 +462,7 @@ namespace BizHawk.Client.EmuHawk this.toolStripSeparator1, this.CopyPaletteToClipboardMenuItem, this.CopyPatternToClipboardMenuItem, - this.CopySpriteToClipboardMenuItem, - this.toolStripSeparator2, - this.ExitMenuItem}); + this.CopySpriteToClipboardMenuItem}); this.FileSubMenu.Text = "&File"; // // SavePaletteScreenshotMenuItem @@ -499,11 +495,6 @@ namespace BizHawk.Client.EmuHawk this.CopySpriteToClipboardMenuItem.Text = "Copy Sprite to Clipboard"; this.CopySpriteToClipboardMenuItem.Click += new System.EventHandler(this.CopySpriteToClipboardMenuItem_Click); // - // ExitMenuItem - // - this.ExitMenuItem.Text = "E&xit"; - this.ExitMenuItem.Click += new System.EventHandler(this.ExitMenuItem_Click); - // // PatternSubMenu // this.PatternSubMenu.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { @@ -798,7 +789,6 @@ namespace BizHawk.Client.EmuHawk private BizHawk.WinForms.Controls.ToolStripMenuItemEx SavePatternScreenshotMenuItem; private BizHawk.WinForms.Controls.ToolStripMenuItemEx SaveSpriteScreenshotMenuItem; private BizHawk.WinForms.Controls.ToolStripSeparatorEx toolStripSeparator1; - private BizHawk.WinForms.Controls.ToolStripMenuItemEx ExitMenuItem; private System.Windows.Forms.ContextMenuStrip PaletteContext; private BizHawk.WinForms.Controls.ToolStripMenuItemEx PaletteSaveImageMenuItem; private BizHawk.WinForms.Controls.ToolStripMenuItemEx PaletteRefreshMenuItem; @@ -814,7 +804,6 @@ namespace BizHawk.Client.EmuHawk private BizHawk.WinForms.Controls.ToolStripMenuItemEx CopyPaletteToClipboardMenuItem; private BizHawk.WinForms.Controls.ToolStripMenuItemEx CopyPatternToClipboardMenuItem; private BizHawk.WinForms.Controls.ToolStripMenuItemEx CopySpriteToClipboardMenuItem; - private BizHawk.WinForms.Controls.ToolStripSeparatorEx toolStripSeparator2; private StatusStripEx NesPPUStatusBar; private System.Windows.Forms.ToolStripStatusLabel toolStripStatusLabel1; private System.Windows.Forms.Timer Messagetimer; diff --git a/src/BizHawk.Client.EmuHawk/tools/NES/NESPPU.cs b/src/BizHawk.Client.EmuHawk/tools/NES/NESPPU.cs index 0e48509a35..568f4ebc50 100644 --- a/src/BizHawk.Client.EmuHawk/tools/NES/NESPPU.cs +++ b/src/BizHawk.Client.EmuHawk/tools/NES/NESPPU.cs @@ -345,11 +345,6 @@ namespace BizHawk.Client.EmuHawk SpriteView.ToBitMap().ToClipBoard(); } - private void ExitMenuItem_Click(object sender, EventArgs e) - { - Close(); - } - private void Table0PaletteSubMenu_DropDownOpened(object sender, EventArgs e) { Table0P0MenuItem.Checked = PatternView.Pal0 == 0; diff --git a/src/BizHawk.Client.EmuHawk/tools/PCE/PCETileViewer.Designer.cs b/src/BizHawk.Client.EmuHawk/tools/PCE/PCETileViewer.Designer.cs index c94f865395..d39b5821da 100644 --- a/src/BizHawk.Client.EmuHawk/tools/PCE/PCETileViewer.Designer.cs +++ b/src/BizHawk.Client.EmuHawk/tools/PCE/PCETileViewer.Designer.cs @@ -42,8 +42,6 @@ namespace BizHawk.Client.EmuHawk this.FileSubMenu = new BizHawk.WinForms.Controls.ToolStripMenuItemEx(); this.saveBackgroundScreenshotToolStripMenuItem = new BizHawk.WinForms.Controls.ToolStripMenuItemEx(); this.saveSpriteScreenshotToolStripMenuItem = new BizHawk.WinForms.Controls.ToolStripMenuItemEx(); - this.toolStripSeparator1 = new BizHawk.WinForms.Controls.ToolStripSeparatorEx(); - this.closeToolStripMenuItem = new BizHawk.WinForms.Controls.ToolStripMenuItemEx(); this.groupBox1.SuspendLayout(); this.groupBox2.SuspendLayout(); this.menuStrip1.SuspendLayout(); @@ -132,9 +130,7 @@ namespace BizHawk.Client.EmuHawk // this.FileSubMenu.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { this.saveBackgroundScreenshotToolStripMenuItem, - this.saveSpriteScreenshotToolStripMenuItem, - this.toolStripSeparator1, - this.closeToolStripMenuItem}); + this.saveSpriteScreenshotToolStripMenuItem}); this.FileSubMenu.Text = "&File"; // // saveBackgroundScreenshotToolStripMenuItem @@ -147,12 +143,6 @@ namespace BizHawk.Client.EmuHawk this.saveSpriteScreenshotToolStripMenuItem.Text = "Save Sprite Screenshot..."; this.saveSpriteScreenshotToolStripMenuItem.Click += new System.EventHandler(this.SaveSpriteScreenshotMenuItem_Click); // - // closeToolStripMenuItem - // - this.closeToolStripMenuItem.ShortcutKeyDisplayString = "Alt+F4"; - this.closeToolStripMenuItem.Text = "&Close"; - this.closeToolStripMenuItem.Click += new System.EventHandler(this.CloseMenuItem_Click); - // // PCETileViewer // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); @@ -190,9 +180,7 @@ namespace BizHawk.Client.EmuHawk private BizHawk.WinForms.Controls.LocLabelEx label1; private MenuStripEx menuStrip1; private BizHawk.WinForms.Controls.ToolStripMenuItemEx FileSubMenu; - private BizHawk.WinForms.Controls.ToolStripMenuItemEx closeToolStripMenuItem; private BizHawk.WinForms.Controls.ToolStripMenuItemEx saveBackgroundScreenshotToolStripMenuItem; private BizHawk.WinForms.Controls.ToolStripMenuItemEx saveSpriteScreenshotToolStripMenuItem; - private BizHawk.WinForms.Controls.ToolStripSeparatorEx toolStripSeparator1; } } \ No newline at end of file diff --git a/src/BizHawk.Client.EmuHawk/tools/PCE/PCETileViewer.cs b/src/BizHawk.Client.EmuHawk/tools/PCE/PCETileViewer.cs index 96e870988a..184a47f9a0 100644 --- a/src/BizHawk.Client.EmuHawk/tools/PCE/PCETileViewer.cs +++ b/src/BizHawk.Client.EmuHawk/tools/PCE/PCETileViewer.cs @@ -198,11 +198,6 @@ namespace BizHawk.Client.EmuHawk } } - private void CloseMenuItem_Click(object sender, EventArgs e) - { - Close(); - } - private void SaveBackgroundScreenshotMenuItem_Click(object sender, EventArgs e) { bmpViewBG.SaveFile(); diff --git a/src/BizHawk.Client.EmuHawk/tools/SMS/VDPViewer.Designer.cs b/src/BizHawk.Client.EmuHawk/tools/SMS/VDPViewer.Designer.cs index 6bf1ac08c9..a96b941959 100644 --- a/src/BizHawk.Client.EmuHawk/tools/SMS/VDPViewer.Designer.cs +++ b/src/BizHawk.Client.EmuHawk/tools/SMS/VDPViewer.Designer.cs @@ -42,8 +42,6 @@ namespace BizHawk.Client.EmuHawk this.saveTilesScreenshotToolStripMenuItem = new BizHawk.WinForms.Controls.ToolStripMenuItemEx(); this.savePalettesScrenshotToolStripMenuItem = new BizHawk.WinForms.Controls.ToolStripMenuItemEx(); this.saveBGScreenshotToolStripMenuItem = new BizHawk.WinForms.Controls.ToolStripMenuItemEx(); - this.toolStripSeparator1 = new BizHawk.WinForms.Controls.ToolStripSeparatorEx(); - this.CloseMenuItem = new BizHawk.WinForms.Controls.ToolStripMenuItemEx(); this.groupBox1.SuspendLayout(); this.groupBox2.SuspendLayout(); this.groupBox3.SuspendLayout(); @@ -122,9 +120,7 @@ namespace BizHawk.Client.EmuHawk this.FileSubMenu.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { this.saveTilesScreenshotToolStripMenuItem, this.savePalettesScrenshotToolStripMenuItem, - this.saveBGScreenshotToolStripMenuItem, - this.toolStripSeparator1, - this.CloseMenuItem}); + this.saveBGScreenshotToolStripMenuItem}); this.FileSubMenu.Text = "&File"; // // saveTilesScreenshotToolStripMenuItem @@ -142,12 +138,6 @@ namespace BizHawk.Client.EmuHawk this.saveBGScreenshotToolStripMenuItem.Text = "Save BG Screenshot..."; this.saveBGScreenshotToolStripMenuItem.Click += new System.EventHandler(this.SaveBgScreenshotMenuItem_Click); // - // CloseMenuItem - // - this.CloseMenuItem.ShortcutKeyDisplayString = "Alt+F4"; - this.CloseMenuItem.Text = "&Close"; - this.CloseMenuItem.Click += new System.EventHandler(this.CloseMenuItem_Click); - // // SmsVDPViewer // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); @@ -185,9 +175,7 @@ namespace BizHawk.Client.EmuHawk private BizHawk.WinForms.Controls.LocLabelEx label1; private MenuStripEx menuStrip1; private BizHawk.WinForms.Controls.ToolStripMenuItemEx FileSubMenu; - private BizHawk.WinForms.Controls.ToolStripMenuItemEx CloseMenuItem; private BizHawk.WinForms.Controls.ToolStripMenuItemEx saveTilesScreenshotToolStripMenuItem; - private BizHawk.WinForms.Controls.ToolStripSeparatorEx toolStripSeparator1; private BizHawk.WinForms.Controls.ToolStripMenuItemEx savePalettesScrenshotToolStripMenuItem; private BizHawk.WinForms.Controls.ToolStripMenuItemEx saveBGScreenshotToolStripMenuItem; } diff --git a/src/BizHawk.Client.EmuHawk/tools/SMS/VDPViewer.cs b/src/BizHawk.Client.EmuHawk/tools/SMS/VDPViewer.cs index b084b09deb..4f4ad96f9a 100644 --- a/src/BizHawk.Client.EmuHawk/tools/SMS/VDPViewer.cs +++ b/src/BizHawk.Client.EmuHawk/tools/SMS/VDPViewer.cs @@ -190,11 +190,6 @@ namespace BizHawk.Client.EmuHawk } } - private void CloseMenuItem_Click(object sender, EventArgs e) - { - Close(); - } - private void saveTilesScreenshotToolStripMenuItem_Click(object sender, EventArgs e) { bmpViewTiles.SaveFile(); diff --git a/src/BizHawk.Client.EmuHawk/tools/SNES/SNESGraphicsDebugger.Designer.cs b/src/BizHawk.Client.EmuHawk/tools/SNES/SNESGraphicsDebugger.Designer.cs index e50b2b99f8..3ddf9b297d 100644 --- a/src/BizHawk.Client.EmuHawk/tools/SNES/SNESGraphicsDebugger.Designer.cs +++ b/src/BizHawk.Client.EmuHawk/tools/SNES/SNESGraphicsDebugger.Designer.cs @@ -36,8 +36,6 @@ namespace BizHawk.Client.EmuHawk this.fileToolStripMenuItem = new BizHawk.WinForms.Controls.ToolStripMenuItemEx(); this.saveScreenshotAsToolStripMenuItem = new BizHawk.WinForms.Controls.ToolStripMenuItemEx(); this.saveScreenshotToClipboardToolStripMenuItem = new BizHawk.WinForms.Controls.ToolStripMenuItemEx(); - this.toolStripSeparator1 = new BizHawk.WinForms.Controls.ToolStripSeparatorEx(); - this.exitToolStripMenuItem = new BizHawk.WinForms.Controls.ToolStripMenuItemEx(); this.tableLayoutPanel1 = new System.Windows.Forms.TableLayoutPanel(); this.panel1 = new System.Windows.Forms.Panel(); this.groupFreeze = new System.Windows.Forms.GroupBox(); @@ -281,9 +279,7 @@ namespace BizHawk.Client.EmuHawk // this.fileToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { this.saveScreenshotAsToolStripMenuItem, - this.saveScreenshotToClipboardToolStripMenuItem, - this.toolStripSeparator1, - this.exitToolStripMenuItem}); + this.saveScreenshotToClipboardToolStripMenuItem}); this.fileToolStripMenuItem.Text = "&File"; // // saveScreenshotAsToolStripMenuItem @@ -297,12 +293,6 @@ namespace BizHawk.Client.EmuHawk this.saveScreenshotToClipboardToolStripMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.C))); this.saveScreenshotToClipboardToolStripMenuItem.Text = "Save Screenshot to Clipboard"; // - // exitToolStripMenuItem - // - this.exitToolStripMenuItem.ShortcutKeyDisplayString = "Alt+F4"; - this.exitToolStripMenuItem.Text = "E&xit"; - this.exitToolStripMenuItem.Click += new System.EventHandler(this.exitToolStripMenuItem_Click); - // // tableLayoutPanel1 // this.tableLayoutPanel1.ColumnCount = 2; @@ -2512,8 +2502,6 @@ namespace BizHawk.Client.EmuHawk private BizHawk.WinForms.Controls.ToolStripMenuItemEx fileToolStripMenuItem; private BizHawk.WinForms.Controls.ToolStripMenuItemEx saveScreenshotAsToolStripMenuItem; private BizHawk.WinForms.Controls.ToolStripMenuItemEx saveScreenshotToClipboardToolStripMenuItem; - private BizHawk.WinForms.Controls.ToolStripSeparatorEx toolStripSeparator1; - private BizHawk.WinForms.Controls.ToolStripMenuItemEx exitToolStripMenuItem; private System.Windows.Forms.TableLayoutPanel tableLayoutPanel1; private System.Windows.Forms.Panel panel1; private System.Windows.Forms.GroupBox groupBox2; diff --git a/src/BizHawk.Client.EmuHawk/tools/SNES/SNESGraphicsDebugger.cs b/src/BizHawk.Client.EmuHawk/tools/SNES/SNESGraphicsDebugger.cs index 3dffee24b6..e42112ade9 100644 --- a/src/BizHawk.Client.EmuHawk/tools/SNES/SNESGraphicsDebugger.cs +++ b/src/BizHawk.Client.EmuHawk/tools/SNES/SNESGraphicsDebugger.cs @@ -532,11 +532,6 @@ namespace BizHawk.Client.EmuHawk comboBGProps.SelectedIndex = DisplayTypeBGNum(CurrDisplaySelection) - 1; } - private void exitToolStripMenuItem_Click(object sender, EventArgs e) - { - Close(); - } - private void SNESGraphicsDebugger_Load(object sender, EventArgs e) { if (UserBackdropColor != -1) diff --git a/src/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.Designer.cs b/src/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.Designer.cs index 46ff46373b..48fac7447c 100644 --- a/src/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.Designer.cs +++ b/src/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.Designer.cs @@ -51,8 +51,6 @@ namespace BizHawk.Client.EmuHawk this.toolStripSeparator22 = new BizHawk.WinForms.Controls.ToolStripSeparatorEx(); this.toolStripSeparator20 = new BizHawk.WinForms.Controls.ToolStripSeparatorEx(); this.ToBk2MenuItem = new BizHawk.WinForms.Controls.ToolStripMenuItemEx(); - this.toolStripSeparator2 = new BizHawk.WinForms.Controls.ToolStripSeparatorEx(); - this.ExitMenuItem = new BizHawk.WinForms.Controls.ToolStripMenuItemEx(); this.EditSubMenu = new BizHawk.WinForms.Controls.ToolStripMenuItemEx(); this.UndoMenuItem = new BizHawk.WinForms.Controls.ToolStripMenuItemEx(); this.RedoMenuItem = new BizHawk.WinForms.Controls.ToolStripMenuItemEx(); @@ -236,9 +234,7 @@ namespace BizHawk.Client.EmuHawk this.placeMacroAtSelectionToolStripMenuItem, this.recentMacrosToolStripMenuItem, this.toolStripSeparator20, - this.ToBk2MenuItem, - this.toolStripSeparator2, - this.ExitMenuItem}); + this.ToBk2MenuItem}); this.FileSubMenu.Text = "&File"; this.FileSubMenu.DropDownOpened += new System.EventHandler(this.FileSubMenu_DropDownOpened); // @@ -325,12 +321,6 @@ namespace BizHawk.Client.EmuHawk this.ToBk2MenuItem.Text = "&Export to Bk2"; this.ToBk2MenuItem.Click += new System.EventHandler(this.ToBk2MenuItem_Click); // - // ExitMenuItem - // - this.ExitMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Alt | System.Windows.Forms.Keys.F4))); - this.ExitMenuItem.Text = "E&xit"; - this.ExitMenuItem.Click += new System.EventHandler(this.ExitMenuItem_Click); - // // EditSubMenu // this.EditSubMenu.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { @@ -1233,12 +1223,10 @@ namespace BizHawk.Client.EmuHawk private BizHawk.WinForms.Controls.ToolStripMenuItemEx SaveTASMenuItem; private BizHawk.WinForms.Controls.ToolStripMenuItemEx SaveAsTASMenuItem; private BizHawk.WinForms.Controls.ToolStripSeparatorEx toolStripSeparator1; - private BizHawk.WinForms.Controls.ToolStripMenuItemEx ExitMenuItem; private BizHawk.WinForms.Controls.ToolStripMenuItemEx EditSubMenu; private BizHawk.WinForms.Controls.ToolStripMenuItemEx ConfigSubMenu; private InputRoll TasView; private BizHawk.WinForms.Controls.ToolStripMenuItemEx RecentSubMenu; - private BizHawk.WinForms.Controls.ToolStripSeparatorEx toolStripSeparator2; private BizHawk.WinForms.Controls.ToolStripSeparatorEx toolStripSeparator3; private BizHawk.WinForms.Controls.ToolStripMenuItemEx InsertFrameMenuItem; private BizHawk.WinForms.Controls.ToolStripSeparatorEx toolStripSeparator4; diff --git a/src/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.MenuItems.cs b/src/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.MenuItems.cs index 717bbb35a3..f3d6b08119 100644 --- a/src/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.MenuItems.cs +++ b/src/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.MenuItems.cs @@ -295,11 +295,6 @@ namespace BizHawk.Client.EmuHawk Cursor = Cursors.Default; } - private void ExitMenuItem_Click(object sender, EventArgs e) - { - Close(); - } - private void EditSubMenu_DropDownOpened(object sender, EventArgs e) { DeselectMenuItem.Enabled = diff --git a/src/BizHawk.Client.EmuHawk/tools/TI83/TI83KeyPad.Designer.cs b/src/BizHawk.Client.EmuHawk/tools/TI83/TI83KeyPad.Designer.cs index e320d33b15..606e445bcd 100644 --- a/src/BizHawk.Client.EmuHawk/tools/TI83/TI83KeyPad.Designer.cs +++ b/src/BizHawk.Client.EmuHawk/tools/TI83/TI83KeyPad.Designer.cs @@ -33,8 +33,7 @@ namespace BizHawk.Client.EmuHawk this.components = new System.ComponentModel.Container(); this.menuStrip1 = new MenuStripEx(); this.toolStripMenuItem1 = new BizHawk.WinForms.Controls.ToolStripMenuItemEx(); - this.KeyPadSubMenu = new BizHawk.WinForms.Controls.ToolStripMenuItemEx(); - this.ExitMenuItem = new BizHawk.WinForms.Controls.ToolStripMenuItemEx(); + this.FileSubMenu = new BizHawk.WinForms.Controls.ToolStripMenuItemEx(); this.SettingsSubMenu = new BizHawk.WinForms.Controls.ToolStripMenuItemEx(); this.ShowHotkeysMenuItem = new BizHawk.WinForms.Controls.ToolStripMenuItemEx(); this.YButton = new System.Windows.Forms.Button(); @@ -176,21 +175,13 @@ namespace BizHawk.Client.EmuHawk // this.menuStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { this.toolStripMenuItem1, - this.KeyPadSubMenu, + this.FileSubMenu, this.SettingsSubMenu}); this.menuStrip1.TabIndex = 0; // // KeyPadSubMenu // - this.KeyPadSubMenu.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { - this.ExitMenuItem}); - this.KeyPadSubMenu.Text = "Key Pad"; - // - // ExitMenuItem - // - this.ExitMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Alt | System.Windows.Forms.Keys.F4))); - this.ExitMenuItem.Text = "E&xit"; - this.ExitMenuItem.Click += new System.EventHandler(this.ExitMenuItem_Click); + this.FileSubMenu.Text = "&File"; // // OptionsSubMenu // @@ -1660,9 +1651,8 @@ namespace BizHawk.Client.EmuHawk private MenuStripEx menuStrip1; private BizHawk.WinForms.Controls.ToolStripMenuItemEx toolStripMenuItem1; - private BizHawk.WinForms.Controls.ToolStripMenuItemEx KeyPadSubMenu; - private BizHawk.WinForms.Controls.ToolStripMenuItemEx ExitMenuItem; - private BizHawk.WinForms.Controls.ToolStripMenuItemEx SettingsSubMenu; + private BizHawk.WinForms.Controls.ToolStripMenuItemEx FileSubMenu; + private BizHawk.WinForms.Controls.ToolStripMenuItemEx SettingsSubMenu; private System.Windows.Forms.Button YButton; private System.Windows.Forms.Button SecondButton; private System.Windows.Forms.Button WindowButton; diff --git a/src/BizHawk.Client.EmuHawk/tools/TI83/TI83KeyPad.cs b/src/BizHawk.Client.EmuHawk/tools/TI83/TI83KeyPad.cs index 194bb70cee..26845e4c66 100644 --- a/src/BizHawk.Client.EmuHawk/tools/TI83/TI83KeyPad.cs +++ b/src/BizHawk.Client.EmuHawk/tools/TI83/TI83KeyPad.cs @@ -104,11 +104,6 @@ namespace BizHawk.Client.EmuHawk KeyPadToolTips.RemoveAll(); } - private void ExitMenuItem_Click(object sender, EventArgs e) - { - Close(); - } - private void OptionsSubMenu_DropDownOpened(object sender, EventArgs e) { ShowHotkeysMenuItem.Checked = TI83ToolTips; diff --git a/src/BizHawk.Client.EmuHawk/tools/ToolManager.cs b/src/BizHawk.Client.EmuHawk/tools/ToolManager.cs index 06e34556b1..8680bf4f0c 100644 --- a/src/BizHawk.Client.EmuHawk/tools/ToolManager.cs +++ b/src/BizHawk.Client.EmuHawk/tools/ToolManager.cs @@ -12,6 +12,7 @@ using BizHawk.Client.Common; using BizHawk.Common; using BizHawk.Common.ReflectionExtensions; using BizHawk.Emulation.Common; +using BizHawk.WinForms.Controls; namespace BizHawk.Client.EmuHawk { @@ -253,6 +254,24 @@ namespace BizHawk.Client.EmuHawk form.Owner = settings.FloatingWindow ? null : _owner; } + private void AddCloseButton(ToolStripMenuItem subMenu, Form form) + { + if (subMenu.DropDownItems.Count > 0) + { + subMenu.DropDownItems.Add(new ToolStripSeparatorEx()); + } + + var closeMenuItem = new ToolStripMenuItem + { + Name = "CloseBtn", + Text = "&Close", + ShortcutKeyDisplayString = "Alt+F4" + }; + + closeMenuItem.Click += (o, e) => { form.Close(); }; + subMenu.DropDownItems.Add(closeMenuItem); + } + private void AttachSettingHooks(IToolFormAutoConfig tool, ToolDialogSettings settings) { var form = (Form)tool; @@ -268,7 +287,10 @@ namespace BizHawk.Client.EmuHawk { dest = submenu.DropDownItems; dest.Add(new ToolStripSeparator()); - break; + } + else if (submenu.Text.Contains("File")) + { + AddCloseButton(submenu, form); } } diff --git a/src/BizHawk.Client.EmuHawk/tools/Watch/RamSearch.Designer.cs b/src/BizHawk.Client.EmuHawk/tools/Watch/RamSearch.Designer.cs index 9807c3d282..67c71ba33a 100644 --- a/src/BizHawk.Client.EmuHawk/tools/Watch/RamSearch.Designer.cs +++ b/src/BizHawk.Client.EmuHawk/tools/Watch/RamSearch.Designer.cs @@ -55,8 +55,6 @@ namespace BizHawk.Client.EmuHawk this.TruncateFromFileMenuItem = new BizHawk.WinForms.Controls.ToolStripMenuItemEx(); this.RecentSubMenu = new BizHawk.WinForms.Controls.ToolStripMenuItemEx(); this.toolStripSeparator2 = new BizHawk.WinForms.Controls.ToolStripSeparatorEx(); - this.toolStripSeparator4 = new BizHawk.WinForms.Controls.ToolStripSeparatorEx(); - this.exitToolStripMenuItem = new BizHawk.WinForms.Controls.ToolStripMenuItemEx(); this.OptionsSubMenuMenuItem = new BizHawk.WinForms.Controls.ToolStripMenuItemEx(); this.modeToolStripMenuItem = new BizHawk.WinForms.Controls.ToolStripMenuItemEx(); this.DetailedMenuItem = new BizHawk.WinForms.Controls.ToolStripMenuItemEx(); @@ -275,9 +273,7 @@ namespace BizHawk.Client.EmuHawk this.SaveAsMenuItem, this.AppendFileMenuItem, this.TruncateFromFileMenuItem, - this.RecentSubMenu, - this.toolStripSeparator4, - this.exitToolStripMenuItem}); + this.RecentSubMenu}); this.fileToolStripMenuItem.Text = "&File"; this.fileToolStripMenuItem.DropDownOpened += new System.EventHandler(this.FileSubMenu_DropDownOpened); // @@ -317,12 +313,6 @@ namespace BizHawk.Client.EmuHawk this.RecentSubMenu.Text = "Recent"; this.RecentSubMenu.DropDownOpened += new System.EventHandler(this.RecentSubMenu_DropDownOpened); // - // exitToolStripMenuItem - // - this.exitToolStripMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Alt | System.Windows.Forms.Keys.F4))); - this.exitToolStripMenuItem.Text = "&Close"; - this.exitToolStripMenuItem.Click += new System.EventHandler(this.CloseMenuItem_Click); - // // settingsToolStripMenuItem // this.OptionsSubMenuMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { @@ -1079,14 +1069,12 @@ namespace BizHawk.Client.EmuHawk private BizHawk.WinForms.Controls.ToolStripMenuItemEx OpenMenuItem; private BizHawk.WinForms.Controls.ToolStripMenuItemEx SaveAsMenuItem; private BizHawk.WinForms.Controls.ToolStripMenuItemEx SaveMenuItem; - private BizHawk.WinForms.Controls.ToolStripMenuItemEx exitToolStripMenuItem; private BizHawk.WinForms.Controls.ToolStripMenuItemEx SettingsMenuItem; private BizHawk.WinForms.Controls.LocLabelEx MemDomainLabel; private BizHawk.WinForms.Controls.LocLabelEx MessageLabel; private BizHawk.WinForms.Controls.ToolStripMenuItemEx RecentSubMenu; private BizHawk.WinForms.Controls.ToolStripSeparatorEx toolStripSeparator2; private BizHawk.WinForms.Controls.ToolStripMenuItemEx AppendFileMenuItem; - private BizHawk.WinForms.Controls.ToolStripSeparatorEx toolStripSeparator4; private BizHawk.WinForms.Controls.ToolStripMenuItemEx searchToolStripMenuItem; private BizHawk.WinForms.Controls.ToolStripMenuItemEx ClearChangeCountsMenuItem; private BizHawk.WinForms.Controls.ToolStripMenuItemEx UndoMenuItem; diff --git a/src/BizHawk.Client.EmuHawk/tools/Watch/RamSearch.cs b/src/BizHawk.Client.EmuHawk/tools/Watch/RamSearch.cs index 7f690338f2..ab2c90d52a 100644 --- a/src/BizHawk.Client.EmuHawk/tools/Watch/RamSearch.cs +++ b/src/BizHawk.Client.EmuHawk/tools/Watch/RamSearch.cs @@ -1023,11 +1023,6 @@ namespace BizHawk.Client.EmuHawk } } - private void CloseMenuItem_Click(object sender, EventArgs e) - { - Close(); - } - private void OptionsSubMenu_DropDownOpened(object sender, EventArgs e) { CheckMisalignedMenuItem.Checked = _settings.CheckMisAligned; diff --git a/src/BizHawk.Client.EmuHawk/tools/Watch/RamWatch.Designer.cs b/src/BizHawk.Client.EmuHawk/tools/Watch/RamWatch.Designer.cs index d49ac85728..869d1aabc7 100644 --- a/src/BizHawk.Client.EmuHawk/tools/Watch/RamWatch.Designer.cs +++ b/src/BizHawk.Client.EmuHawk/tools/Watch/RamWatch.Designer.cs @@ -79,8 +79,6 @@ namespace BizHawk.Client.EmuHawk this.AppendMenuItem = new BizHawk.WinForms.Controls.ToolStripMenuItemEx(); this.RecentSubMenu = new BizHawk.WinForms.Controls.ToolStripMenuItemEx(); this.noneToolStripMenuItem = new BizHawk.WinForms.Controls.ToolStripMenuItemEx(); - this.toolStripSeparator1 = new BizHawk.WinForms.Controls.ToolStripSeparatorEx(); - this.ExitMenuItem = new BizHawk.WinForms.Controls.ToolStripMenuItemEx(); this.WatchesSubMenu = new BizHawk.WinForms.Controls.ToolStripMenuItemEx(); this.MemoryDomainsSubMenu = new BizHawk.WinForms.Controls.ToolStripMenuItemEx(); this.Separator2 = new BizHawk.WinForms.Controls.ToolStripSeparatorEx(); @@ -416,9 +414,7 @@ namespace BizHawk.Client.EmuHawk this.SaveMenuItem, this.SaveAsMenuItem, this.AppendMenuItem, - this.RecentSubMenu, - this.toolStripSeparator1, - this.ExitMenuItem}); + this.RecentSubMenu}); this.FileSubMenu.Text = "&Files"; this.FileSubMenu.DropDownOpened += new System.EventHandler(this.FileSubMenu_DropDownOpened); // @@ -462,13 +458,7 @@ namespace BizHawk.Client.EmuHawk // noneToolStripMenuItem // this.noneToolStripMenuItem.Text = "None"; - // - // ExitMenuItem - // - this.ExitMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Alt | System.Windows.Forms.Keys.F4))); - this.ExitMenuItem.Text = "&Close"; - this.ExitMenuItem.Click += new System.EventHandler(this.ExitMenuItem_Click); - // + // // WatchesSubMenu // this.WatchesSubMenu.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { @@ -682,8 +672,6 @@ namespace BizHawk.Client.EmuHawk private BizHawk.WinForms.Controls.ToolStripMenuItemEx AppendMenuItem; private BizHawk.WinForms.Controls.ToolStripMenuItemEx RecentSubMenu; private BizHawk.WinForms.Controls.ToolStripMenuItemEx noneToolStripMenuItem; - private BizHawk.WinForms.Controls.ToolStripSeparatorEx toolStripSeparator1; - private BizHawk.WinForms.Controls.ToolStripMenuItemEx ExitMenuItem; private BizHawk.WinForms.Controls.ToolStripMenuItemEx WatchesSubMenu; private BizHawk.WinForms.Controls.ToolStripMenuItemEx MemoryDomainsSubMenu; private BizHawk.WinForms.Controls.ToolStripSeparatorEx toolStripSeparator8; diff --git a/src/BizHawk.Client.EmuHawk/tools/Watch/RamWatch.cs b/src/BizHawk.Client.EmuHawk/tools/Watch/RamWatch.cs index 7b288ae37e..fe59bee9d4 100644 --- a/src/BizHawk.Client.EmuHawk/tools/Watch/RamWatch.cs +++ b/src/BizHawk.Client.EmuHawk/tools/Watch/RamWatch.cs @@ -683,11 +683,6 @@ namespace BizHawk.Client.EmuHawk RecentSubMenu.DropDownItems.AddRange(Config.RecentWatches.RecentMenu(LoadFileFromRecent, "Watches")); } - private void ExitMenuItem_Click(object sender, EventArgs e) - { - Close(); - } - private void WatchesSubMenu_DropDownOpened(object sender, EventArgs e) { EditWatchMenuItem.Enabled =