ShuriZma
/
BizHawk
mirror of https://github.com/TASEmulators/BizHawk.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

convert PCE to generic core menu

This commit is contained in:
adelikat 2020-06-20 13:42:00 -05:00
parent 5570af6514
commit 8bfe6011bc
9 changed files with 8 additions and 88 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

58
src/BizHawk.Client.EmuHawk/MainForm.Designer.cs generated
View File

@ -227,12 +227,6 @@
this.VSInsertCoinP2MenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.VSServiceSwitchMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.BarcodeReaderMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.PCESubMenu = new System.Windows.Forms.ToolStripMenuItem();
this.PceSettingsMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.toolStripSeparator32 = new System.Windows.Forms.ToolStripSeparator();
this.PCEBGViewerMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.PCEtileViewerToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.PceSoundDebuggerToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.SMSSubMenu = new System.Windows.Forms.ToolStripMenuItem();
this.SmsSettingsMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.SmsMenuSeparator = new System.Windows.Forms.ToolStripSeparator();
@ -398,7 +392,6 @@
this.ConfigSubMenu,
this.ToolsSubMenu,
this.NESSubMenu,
this.PCESubMenu,
this.SMSSubMenu,
this.TI83SubMenu,
this.A7800SubMenu,
@ -2052,51 +2045,6 @@
this.BarcodeReaderMenuItem.Text = "Barcode Reader";
this.BarcodeReaderMenuItem.Click += new System.EventHandler(this.BarcodeReaderMenuItem_Click);
//
// PCESubMenu
//
this.PCESubMenu.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
this.PceSettingsMenuItem,
this.toolStripSeparator32,
this.PCEBGViewerMenuItem,
this.PCEtileViewerToolStripMenuItem,
this.PceSoundDebuggerToolStripMenuItem});
this.PCESubMenu.Name = "PCESubMenu";
this.PCESubMenu.Size = new System.Drawing.Size(38, 17);
this.PCESubMenu.Text = "&PCE";
//
// PceSettingsMenuItem
//
this.PceSettingsMenuItem.Name = "PceSettingsMenuItem";
this.PceSettingsMenuItem.Size = new System.Drawing.Size(240, 22);
this.PceSettingsMenuItem.Text = "Settings...";
this.PceSettingsMenuItem.Click += new System.EventHandler(this.PceSettingsMenuItem_Click);
//
// toolStripSeparator32
//
this.toolStripSeparator32.Name = "toolStripSeparator32";
this.toolStripSeparator32.Size = new System.Drawing.Size(237, 6);
//
// PCEBGViewerMenuItem
//
this.PCEBGViewerMenuItem.Name = "PCEBGViewerMenuItem";
this.PCEBGViewerMenuItem.Size = new System.Drawing.Size(240, 22);
this.PCEBGViewerMenuItem.Text = "&BG Viewer";
this.PCEBGViewerMenuItem.Click += new System.EventHandler(this.PceBgViewerMenuItem_Click);
//
// PCEtileViewerToolStripMenuItem
//
this.PCEtileViewerToolStripMenuItem.Name = "PCEtileViewerToolStripMenuItem";
this.PCEtileViewerToolStripMenuItem.Size = new System.Drawing.Size(240, 22);
this.PCEtileViewerToolStripMenuItem.Text = "&Tile Viewer";
this.PCEtileViewerToolStripMenuItem.Click += new System.EventHandler(this.PceTileViewerMenuItem_Click);
//
// PceSoundDebuggerToolStripMenuItem
//
this.PceSoundDebuggerToolStripMenuItem.Name = "PceSoundDebuggerToolStripMenuItem";
this.PceSoundDebuggerToolStripMenuItem.Size = new System.Drawing.Size(240, 22);
this.PceSoundDebuggerToolStripMenuItem.Text = "&Sound Debugger";
this.PceSoundDebuggerToolStripMenuItem.Click += new System.EventHandler(this.PceSoundDebuggerMenuItem_Click);
//
// SMSSubMenu
//
this.SMSSubMenu.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
@ -3513,9 +3461,7 @@
private System.Windows.Forms.ToolStripMenuItem ImportMoviesMenuItem;
private System.Windows.Forms.ToolStripMenuItem ForumsMenuItem;
private System.Windows.Forms.ToolStripMenuItem ScreenshotClipboardMenuItem;
private System.Windows.Forms.ToolStripMenuItem PCESubMenu;
private System.Windows.Forms.ToolStripMenuItem SMSSubMenu;
private System.Windows.Forms.ToolStripMenuItem PCEBGViewerMenuItem;
private System.Windows.Forms.ToolStripMenuItem ScreenshotContextMenuItem;
private System.Windows.Forms.ToolStripMenuItem A7800SubMenu;
private System.Windows.Forms.ToolStripMenuItem NESSoundChannelsMenuItem;
@ -3574,7 +3520,6 @@
private System.Windows.Forms.ToolStripMenuItem CoresSubMenu;
private System.Windows.Forms.ToolStripMenuItem BatchRunnerMenuItem;
private System.Windows.Forms.ToolStripMenuItem DisplayConfigMenuItem;
private System.Windows.Forms.ToolStripMenuItem PCEtileViewerToolStripMenuItem;
private System.Windows.Forms.ToolStripMenuItem SmsVdpViewerMenuItem;
private System.Windows.Forms.ToolStripMenuItem SmsSettingsMenuItem;
private System.Windows.Forms.ToolStripMenuItem extensionsToolStripMenuItem;
@ -3602,10 +3547,7 @@
private System.Windows.Forms.ToolStripMenuItem N64CircularAnalogRangeMenuItem;
private System.Windows.Forms.ToolStripMenuItem paletteToolStripMenuItem;
private System.Windows.Forms.ToolStripMenuItem ProfilesMenuItem;
private System.Windows.Forms.ToolStripMenuItem PceSoundDebuggerToolStripMenuItem;
private System.Windows.Forms.ToolStripMenuItem SynclessRecordingMenuItem;
private System.Windows.Forms.ToolStripMenuItem PceSettingsMenuItem;
private System.Windows.Forms.ToolStripSeparator toolStripSeparator32;
private System.Windows.Forms.ToolStripStatusLabel ProfileFirstBootLabel;
private System.Windows.Forms.ToolStripMenuItem MovieEndSubMenu;
private System.Windows.Forms.ToolStripMenuItem MovieEndFinishMenuItem;

20
src/BizHawk.Client.EmuHawk/MainForm.Events.cs
View File

@ -1548,26 +1548,6 @@ namespace BizHawk.Client.EmuHawk
Tools.Load<BarcodeEntry>();
}
private void PceSettingsMenuItem_Click(object sender, EventArgs e)
{
GenericCoreConfig.DoDialog(this, "PCE Settings");
}
private void PceBgViewerMenuItem_Click(object sender, EventArgs e)
{
Tools.Load<PceBgViewer>();
}
private void PceTileViewerMenuItem_Click(object sender, EventArgs e)
{
Tools.Load<PceTileViewer>();
}
private void PceSoundDebuggerMenuItem_Click(object sender, EventArgs e)
{
Tools.Load<PCESoundDebugger>();
}
private void SmsSubMenu_DropDownOpened(object sender, EventArgs e)
{
SmsVdpViewerMenuItem.Visible = Game.System != "SG";

8
src/BizHawk.Client.EmuHawk/MainForm.cs
View File

@ -1807,7 +1807,6 @@ namespace BizHawk.Client.EmuHawk
GenericCoreSubMenu.Visible = false;
TI83SubMenu.Visible = false;
NESSubMenu.Visible = false;
PCESubMenu.Visible = false;
SMSSubMenu.Visible = false;
GBSubMenu.Visible = false;
NDSSubMenu.Visible = false;
@ -1836,11 +1835,6 @@ namespace BizHawk.Client.EmuHawk
case "NES":
NESSubMenu.Visible = true;
break;
case "PCE":
case "PCECD":
case "SGX":
PCESubMenu.Visible = true;
break;
case "SMS":
SMSSubMenu.Text = "&SMS";
SMSSubMenu.Visible = true;
@ -1951,7 +1945,7 @@ namespace BizHawk.Client.EmuHawk
var dispName = tool.GetCustomAttribute<SpecializedToolAttribute>().DisplayName;
var item = new ToolStripMenuItem
{
Text = dispName
Text = "&" + dispName
};
item.Click += (o, e) =>

1
src/BizHawk.Client.EmuHawk/tools/PCE/PCEBGViewer.cs
View File

@ -9,6 +9,7 @@ using BizHawk.Emulation.Common;
namespace BizHawk.Client.EmuHawk
{
[SpecializedTool("BG Viewer")]
public partial class PceBgViewer : ToolFormBase, IToolFormAutoConfig
{
[RequiredService]

1
src/BizHawk.Client.EmuHawk/tools/PCE/PCESoundDebugger.cs
View File

@ -12,6 +12,7 @@ using ICSharpCode.SharpZipLib.Zip;
namespace BizHawk.Client.EmuHawk
{
[SpecializedTool("Sound Debugger")]
public partial class PCESoundDebugger : ToolFormBase, IToolFormAutoConfig
{
[RequiredService]

1
src/BizHawk.Client.EmuHawk/tools/PCE/PCETileViewer.cs
View File

@ -10,6 +10,7 @@ using BizHawk.Emulation.Common;
namespace BizHawk.Client.EmuHawk
{
[SpecializedTool("Tile Viewer")]
public partial class PceTileViewer : ToolFormBase, IToolFormAutoConfig
{
[RequiredService]

2
src/BizHawk.Emulation.Cores/Consoles/NEC/PCE/HyperNyma.cs
View File

@ -11,7 +11,7 @@ using BizHawk.Emulation.DiscSystem;
namespace BizHawk.Emulation.Cores.Consoles.NEC.PCE
{
[Core(CoreNames.HyperNyma, "Mednafen Team", true, true, "1.24.3", "https://mednafen.github.io/releases/", false)]
[Core(CoreNames.HyperNyma, "Mednafen Team", true, true, "1.24.3", "https://mednafen.github.io/releases/", false, "PCE")]
public class HyperNyma : NymaCore, IRegionable, IPceGpuView
{
private readonly LibHyperNyma _terboGrafix;

2
src/BizHawk.Emulation.Cores/Consoles/NEC/PCE/TurboNyma.cs
View File

@ -11,7 +11,7 @@ using BizHawk.Emulation.DiscSystem;
namespace BizHawk.Emulation.Cores.Consoles.NEC.PCE
{
[Core(CoreNames.TurboNyma, "Mednafen Team", true, true, "1.24.3", "https://mednafen.github.io/releases/", false)]
[Core(CoreNames.TurboNyma, "Mednafen Team", true, true, "1.24.3", "https://mednafen.github.io/releases/", false, "PCE")]
public class TurboNyma : NymaCore, IRegionable, IPceGpuView
{
private readonly LibTurboNyma _terboGrafix;

3
src/BizHawk.Emulation.Cores/Consoles/PC Engine/PCEngine.cs
View File

@ -15,7 +15,8 @@ namespace BizHawk.Emulation.Cores.PCEngine
CoreNames.PceHawk,
"Vecna",
isPorted: false,
isReleased: true)]
isReleased: true,
displayName: "PCE")]
public sealed partial class PCEngine : IEmulator, ISaveRam, IInputPollable, IVideoLogicalOffsets, IRomInfo,
IDebuggable, ISettable<PCEngine.PCESettings, PCEngine.PCESyncSettings>, IDriveLight, ICodeDataLogger,
IPceGpuView