cleanup this crap

This commit is contained in:
CasualPokePlayer 2021-10-29 22:34:08 -07:00
parent 7314cf9192
commit 1df985a5f6
3 changed files with 8 additions and 36 deletions

View File

@ -244,8 +244,6 @@ namespace BizHawk.Client.EmuHawk
this.toolStripSeparator28 = new BizHawk.WinForms.Controls.ToolStripSeparatorEx(); this.toolStripSeparator28 = new BizHawk.WinForms.Controls.ToolStripSeparatorEx();
this.GBGPUViewerMenuItem = new BizHawk.WinForms.Controls.ToolStripMenuItemEx(); this.GBGPUViewerMenuItem = new BizHawk.WinForms.Controls.ToolStripMenuItemEx();
this.GBPrinterViewerMenuItem = new BizHawk.WinForms.Controls.ToolStripMenuItemEx(); this.GBPrinterViewerMenuItem = new BizHawk.WinForms.Controls.ToolStripMenuItemEx();
this.NDSSubMenu = new BizHawk.WinForms.Controls.ToolStripMenuItemEx();
this.NdsSettingsMenuItem = new BizHawk.WinForms.Controls.ToolStripMenuItemEx();
this.PSXSubMenu = new BizHawk.WinForms.Controls.ToolStripMenuItemEx(); this.PSXSubMenu = new BizHawk.WinForms.Controls.ToolStripMenuItemEx();
this.PSXControllerSettingsMenuItem = new BizHawk.WinForms.Controls.ToolStripMenuItemEx(); this.PSXControllerSettingsMenuItem = new BizHawk.WinForms.Controls.ToolStripMenuItemEx();
this.PSXOptionsMenuItem = new BizHawk.WinForms.Controls.ToolStripMenuItemEx(); this.PSXOptionsMenuItem = new BizHawk.WinForms.Controls.ToolStripMenuItemEx();
@ -393,7 +391,6 @@ namespace BizHawk.Client.EmuHawk
this.TI83SubMenu, this.TI83SubMenu,
this.A7800SubMenu, this.A7800SubMenu,
this.GBSubMenu, this.GBSubMenu,
this.NDSSubMenu,
this.PSXSubMenu, this.PSXSubMenu,
this.SNESSubMenu, this.SNESSubMenu,
this.ColecoSubMenu, this.ColecoSubMenu,
@ -1636,17 +1633,6 @@ namespace BizHawk.Client.EmuHawk
this.GBPrinterViewerMenuItem.Text = "&Printer Viewer"; this.GBPrinterViewerMenuItem.Text = "&Printer Viewer";
this.GBPrinterViewerMenuItem.Click += new System.EventHandler(this.GbPrinterViewerMenuItem_Click); this.GBPrinterViewerMenuItem.Click += new System.EventHandler(this.GbPrinterViewerMenuItem_Click);
// //
// NDSSubMenu
//
this.NDSSubMenu.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
this.NdsSettingsMenuItem });
this.NDSSubMenu.Text = "NDS";
//
// NdsSettingsMenuItem
//
this.NdsSettingsMenuItem.Text = "Settings...";
this.NdsSettingsMenuItem.Click += new System.EventHandler(this.NDSSettingsMenuItem_Click);
//
// PSXSubMenu // PSXSubMenu
// //
this.PSXSubMenu.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { this.PSXSubMenu.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
@ -2787,8 +2773,6 @@ namespace BizHawk.Client.EmuHawk
private BizHawk.WinForms.Controls.ToolStripMenuItemEx AmstradCPCDisksSubMenu; private BizHawk.WinForms.Controls.ToolStripMenuItemEx AmstradCPCDisksSubMenu;
private BizHawk.WinForms.Controls.ToolStripMenuItemEx cpcd1ToolStripMenuItem; private BizHawk.WinForms.Controls.ToolStripMenuItemEx cpcd1ToolStripMenuItem;
private BizHawk.WinForms.Controls.ToolStripMenuItemEx AmstradCPCNonSyncSettingsToolStripMenuItem; private BizHawk.WinForms.Controls.ToolStripMenuItemEx AmstradCPCNonSyncSettingsToolStripMenuItem;
private BizHawk.WinForms.Controls.ToolStripMenuItemEx NDSSubMenu;
private BizHawk.WinForms.Controls.ToolStripMenuItemEx NdsSettingsMenuItem;
private BizHawk.WinForms.Controls.ToolStripSeparatorEx toolStripSeparator8; private BizHawk.WinForms.Controls.ToolStripSeparatorEx toolStripSeparator8;
private System.Windows.Forms.ToolStripMenuItem CaptureLuaMenuItem; private System.Windows.Forms.ToolStripMenuItem CaptureLuaMenuItem;
} }

View File

@ -19,7 +19,6 @@ using BizHawk.Emulation.Cores.Computers.AmstradCPC;
using BizHawk.Emulation.Cores.Computers.AppleII; using BizHawk.Emulation.Cores.Computers.AppleII;
using BizHawk.Emulation.Cores.Computers.Commodore64; using BizHawk.Emulation.Cores.Computers.Commodore64;
using BizHawk.Emulation.Cores.Computers.SinclairSpectrum; using BizHawk.Emulation.Cores.Computers.SinclairSpectrum;
using BizHawk.Emulation.Cores.Consoles.Nintendo.NDS;
using BizHawk.Emulation.Cores.Consoles.Nintendo.QuickNES; using BizHawk.Emulation.Cores.Consoles.Nintendo.QuickNES;
using BizHawk.Emulation.Cores.Intellivision; using BizHawk.Emulation.Cores.Intellivision;
using BizHawk.Emulation.Cores.Nintendo.BSNES; using BizHawk.Emulation.Cores.Nintendo.BSNES;
@ -1586,12 +1585,6 @@ namespace BizHawk.Client.EmuHawk
Tools.Load<GBPrinterView>(); Tools.Load<GBPrinterView>();
} }
private void NDSSettingsMenuItem_Click(object sender, EventArgs e)
{
GenericCoreConfig.DoDialog(this, "NDS Settings", false, false);
FrameBufferResized();
}
private void PsxSubMenu_DropDownOpened(object sender, EventArgs e) private void PsxSubMenu_DropDownOpened(object sender, EventArgs e)
{ {
PSXControllerSettingsMenuItem.Enabled = MovieSession.Movie.NotActive(); PSXControllerSettingsMenuItem.Enabled = MovieSession.Movie.NotActive();

View File

@ -15,30 +15,29 @@ using System.IO.Pipes;
using BizHawk.Common; using BizHawk.Common;
using BizHawk.Common.BufferExtensions; using BizHawk.Common.BufferExtensions;
using BizHawk.Common.PathExtensions;
using BizHawk.Common.StringExtensions;
using BizHawk.Client.Common; using BizHawk.Client.Common;
using BizHawk.Bizware.BizwareGL; using BizHawk.Bizware.BizwareGL;
using BizHawk.Emulation.Common; using BizHawk.Emulation.Common;
using BizHawk.Emulation.Common.Base_Implementations;
using BizHawk.Emulation.Cores; using BizHawk.Emulation.Cores;
using BizHawk.Emulation.Cores.Consoles.NEC.PCE;
using BizHawk.Emulation.Cores.Consoles.Nintendo.QuickNES; using BizHawk.Emulation.Cores.Consoles.Nintendo.QuickNES;
using BizHawk.Emulation.Cores.Consoles.SNK;
using BizHawk.Emulation.Cores.Nintendo.BSNES; using BizHawk.Emulation.Cores.Nintendo.BSNES;
using BizHawk.Emulation.Cores.Nintendo.Gameboy;
using BizHawk.Emulation.Cores.Nintendo.GBA; using BizHawk.Emulation.Cores.Nintendo.GBA;
using BizHawk.Emulation.Cores.Nintendo.N64;
using BizHawk.Emulation.Cores.Nintendo.NES; using BizHawk.Emulation.Cores.Nintendo.NES;
using BizHawk.Emulation.Cores.Nintendo.SNES; using BizHawk.Emulation.Cores.Nintendo.SNES;
using BizHawk.Emulation.Cores.Nintendo.N64; using BizHawk.Emulation.Cores.Nintendo.SNES9X;
using BizHawk.Client.EmuHawk.ToolExtensions; using BizHawk.Client.EmuHawk.ToolExtensions;
using BizHawk.Client.EmuHawk.CoreExtensions; using BizHawk.Client.EmuHawk.CoreExtensions;
using BizHawk.Client.EmuHawk.CustomControls; using BizHawk.Client.EmuHawk.CustomControls;
using BizHawk.Common.PathExtensions;
using BizHawk.Common.StringExtensions;
using BizHawk.Emulation.Common.Base_Implementations;
using BizHawk.Emulation.Cores.Consoles.NEC.PCE;
using BizHawk.Emulation.Cores.Nintendo.SNES9X;
using BizHawk.Emulation.Cores.Consoles.SNK;
using BizHawk.Emulation.Cores.Consoles.Nintendo.Gameboy;
using BizHawk.Emulation.Cores.Nintendo.Gameboy;
namespace BizHawk.Client.EmuHawk namespace BizHawk.Client.EmuHawk
{ {
@ -1948,7 +1947,6 @@ namespace BizHawk.Client.EmuHawk
TI83SubMenu.Visible = false; TI83SubMenu.Visible = false;
NESSubMenu.Visible = false; NESSubMenu.Visible = false;
GBSubMenu.Visible = false; GBSubMenu.Visible = false;
NDSSubMenu.Visible = false;
A7800SubMenu.Visible = false; A7800SubMenu.Visible = false;
SNESSubMenu.Visible = false; SNESSubMenu.Visible = false;
PSXSubMenu.Visible = false; PSXSubMenu.Visible = false;
@ -1986,9 +1984,6 @@ namespace BizHawk.Client.EmuHawk
case "N64": case "N64":
N64SubMenu.Visible = true; N64SubMenu.Visible = true;
break; break;
case "NDS":
NDSSubMenu.Visible = true;
break;
case "NES": case "NES":
NESSubMenu.Visible = true; NESSubMenu.Visible = true;
break; break;