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

move Subneshawk menu to the nes submenu and enforce that you can not have quicknes=true and subneshawk=true, put "experiemental" on the menu item because while it is being officially "released" it is a very big edge case and I dont' want to confuse average TASers into thinking this is a core they should use for normal use cases

This commit is contained in:
adelikat 2019-06-17 18:22:49 -05:00
parent ef4cda38d1
commit 02a3e4ceaf
3 changed files with 3811 additions and 3802 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

272
BizHawk.Client.EmuHawk/MainForm.Designer.cs generated
View File

@ -186,6 +186,8 @@
this.NesCoreSubMenu = new System.Windows.Forms.ToolStripMenuItem(); this.NesCoreSubMenu = new System.Windows.Forms.ToolStripMenuItem();
this.QuicknesCoreMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.QuicknesCoreMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.NesCoreMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.NesCoreMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.toolStripSeparator38 = new System.Windows.Forms.ToolStripSeparator();
this.SubNesHawkMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.CoreSNESSubMenu = new System.Windows.Forms.ToolStripMenuItem(); this.CoreSNESSubMenu = new System.Windows.Forms.ToolStripMenuItem();
this.Coresnes9xMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.Coresnes9xMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.CorebsnesMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.CorebsnesMenuItem = new System.Windows.Forms.ToolStripMenuItem();
@ -199,7 +201,6 @@
this.GBGambatteMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.GBGambatteMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.GBGBHawkMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.GBGBHawkMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.GBInSGBMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.GBInSGBMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.SubNESHawkMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.toolStripMenuItem16 = new System.Windows.Forms.ToolStripSeparator(); this.toolStripMenuItem16 = new System.Windows.Forms.ToolStripSeparator();
this.allowGameDBCoreOverridesToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.allowGameDBCoreOverridesToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.toolStripSeparator8 = new System.Windows.Forms.ToolStripSeparator(); this.toolStripSeparator8 = new System.Windows.Forms.ToolStripSeparator();
@ -381,11 +382,6 @@
this.preferencesToolStripMenuItem1 = new System.Windows.Forms.ToolStripMenuItem(); this.preferencesToolStripMenuItem1 = new System.Windows.Forms.ToolStripMenuItem();
this.neoGeoPocketToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.neoGeoPocketToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.preferencesToolStripMenuItem2 = new System.Windows.Forms.ToolStripMenuItem(); this.preferencesToolStripMenuItem2 = new System.Windows.Forms.ToolStripMenuItem();
this.HelpSubMenu = new System.Windows.Forms.ToolStripMenuItem();
this.OnlineHelpMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.ForumsMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.FeaturesMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.AboutMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.zXSpectrumToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.zXSpectrumToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.ZXSpectrumCoreEmulationSettingsMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.ZXSpectrumCoreEmulationSettingsMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.ZXSpectrumControllerConfigurationMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.ZXSpectrumControllerConfigurationMenuItem = new System.Windows.Forms.ToolStripMenuItem();
@ -398,9 +394,15 @@
this.ZXSpectrumDisksSubMenu = new System.Windows.Forms.ToolStripMenuItem(); this.ZXSpectrumDisksSubMenu = new System.Windows.Forms.ToolStripMenuItem();
this.zxt2ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.zxt2ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.ZXSpectrumExportSnapshotMenuItemMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.ZXSpectrumExportSnapshotMenuItemMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.HelpSubMenu = new System.Windows.Forms.ToolStripMenuItem();
this.OnlineHelpMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.ForumsMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.FeaturesMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.AboutMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.amstradCPCToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.amstradCPCToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.amstradCPCCoreEmulationSettingsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.amstradCPCCoreEmulationSettingsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.AmstradCPCAudioSettingsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.AmstradCPCAudioSettingsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.AmstradCPCNonSyncSettingsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.AmstradCPCPokeMemoryToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.AmstradCPCPokeMemoryToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.AmstradCPCMediaToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.AmstradCPCMediaToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.AmstradCPCTapesSubMenu = new System.Windows.Forms.ToolStripMenuItem(); this.AmstradCPCTapesSubMenu = new System.Windows.Forms.ToolStripMenuItem();
@ -479,7 +481,6 @@
this.ShowMenuContextMenuSeparator = new System.Windows.Forms.ToolStripSeparator(); this.ShowMenuContextMenuSeparator = new System.Windows.Forms.ToolStripSeparator();
this.ShowMenuContextMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.ShowMenuContextMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.timerMouseIdle = new System.Windows.Forms.Timer(this.components); this.timerMouseIdle = new System.Windows.Forms.Timer(this.components);
this.AmstradCPCNonSyncSettingsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.MainformMenu.SuspendLayout(); this.MainformMenu.SuspendLayout();
this.MainStatusBar.SuspendLayout(); this.MainStatusBar.SuspendLayout();
this.MainFormContextMenu.SuspendLayout(); this.MainFormContextMenu.SuspendLayout();
@ -525,7 +526,7 @@
this.MainformMenu.LayoutStyle = System.Windows.Forms.ToolStripLayoutStyle.Flow; this.MainformMenu.LayoutStyle = System.Windows.Forms.ToolStripLayoutStyle.Flow;
this.MainformMenu.Location = new System.Drawing.Point(0, 0); this.MainformMenu.Location = new System.Drawing.Point(0, 0);
this.MainformMenu.Name = "MainformMenu"; this.MainformMenu.Name = "MainformMenu";
this.MainformMenu.Size = new System.Drawing.Size(470, 80); this.MainformMenu.Size = new System.Drawing.Size(470, 99);
this.MainformMenu.TabIndex = 0; this.MainformMenu.TabIndex = 0;
this.MainformMenu.Text = "menuStrip1"; this.MainformMenu.Text = "menuStrip1";
this.MainformMenu.MenuActivate += new System.EventHandler(this.MainformMenu_MenuActivate); this.MainformMenu.MenuActivate += new System.EventHandler(this.MainformMenu_MenuActivate);
@ -1157,7 +1158,7 @@
// //
this.RecordAVMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.RecordHS; this.RecordAVMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.RecordHS;
this.RecordAVMenuItem.Name = "RecordAVMenuItem"; this.RecordAVMenuItem.Name = "RecordAVMenuItem";
this.RecordAVMenuItem.Size = new System.Drawing.Size(225, 22); this.RecordAVMenuItem.Size = new System.Drawing.Size(223, 22);
this.RecordAVMenuItem.Text = "&Record AVI/WAV"; this.RecordAVMenuItem.Text = "&Record AVI/WAV";
this.RecordAVMenuItem.Click += new System.EventHandler(this.RecordAVMenuItem_Click); this.RecordAVMenuItem.Click += new System.EventHandler(this.RecordAVMenuItem_Click);
// //
@ -1165,7 +1166,7 @@
// //
this.ConfigAndRecordAVMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.AVI; this.ConfigAndRecordAVMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.AVI;
this.ConfigAndRecordAVMenuItem.Name = "ConfigAndRecordAVMenuItem"; this.ConfigAndRecordAVMenuItem.Name = "ConfigAndRecordAVMenuItem";
this.ConfigAndRecordAVMenuItem.Size = new System.Drawing.Size(225, 22); this.ConfigAndRecordAVMenuItem.Size = new System.Drawing.Size(223, 22);
this.ConfigAndRecordAVMenuItem.Text = "Config and Record AVI/WAV"; this.ConfigAndRecordAVMenuItem.Text = "Config and Record AVI/WAV";
this.ConfigAndRecordAVMenuItem.Click += new System.EventHandler(this.ConfigAndRecordAVMenuItem_Click); this.ConfigAndRecordAVMenuItem.Click += new System.EventHandler(this.ConfigAndRecordAVMenuItem_Click);
// //
@ -1173,26 +1174,26 @@
// //
this.StopAVIMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.Stop; this.StopAVIMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.Stop;
this.StopAVIMenuItem.Name = "StopAVIMenuItem"; this.StopAVIMenuItem.Name = "StopAVIMenuItem";
this.StopAVIMenuItem.Size = new System.Drawing.Size(225, 22); this.StopAVIMenuItem.Size = new System.Drawing.Size(223, 22);
this.StopAVIMenuItem.Text = "&Stop AVI/WAV"; this.StopAVIMenuItem.Text = "&Stop AVI/WAV";
this.StopAVIMenuItem.Click += new System.EventHandler(this.StopAVMenuItem_Click); this.StopAVIMenuItem.Click += new System.EventHandler(this.StopAVMenuItem_Click);
// //
// toolStripSeparator19 // toolStripSeparator19
// //
this.toolStripSeparator19.Name = "toolStripSeparator19"; this.toolStripSeparator19.Name = "toolStripSeparator19";
this.toolStripSeparator19.Size = new System.Drawing.Size(222, 6); this.toolStripSeparator19.Size = new System.Drawing.Size(220, 6);
// //
// CaptureOSDMenuItem // CaptureOSDMenuItem
// //
this.CaptureOSDMenuItem.Name = "CaptureOSDMenuItem"; this.CaptureOSDMenuItem.Name = "CaptureOSDMenuItem";
this.CaptureOSDMenuItem.Size = new System.Drawing.Size(225, 22); this.CaptureOSDMenuItem.Size = new System.Drawing.Size(223, 22);
this.CaptureOSDMenuItem.Text = "Capture OSD"; this.CaptureOSDMenuItem.Text = "Capture OSD";
this.CaptureOSDMenuItem.Click += new System.EventHandler(this.CaptureOSDMenuItem_Click); this.CaptureOSDMenuItem.Click += new System.EventHandler(this.CaptureOSDMenuItem_Click);
// //
// SynclessRecordingMenuItem // SynclessRecordingMenuItem
// //
this.SynclessRecordingMenuItem.Name = "SynclessRecordingMenuItem"; this.SynclessRecordingMenuItem.Name = "SynclessRecordingMenuItem";
this.SynclessRecordingMenuItem.Size = new System.Drawing.Size(225, 22); this.SynclessRecordingMenuItem.Size = new System.Drawing.Size(223, 22);
this.SynclessRecordingMenuItem.Text = "S&yncless Recording Tools"; this.SynclessRecordingMenuItem.Text = "S&yncless Recording Tools";
this.SynclessRecordingMenuItem.Click += new System.EventHandler(this.SynclessRecordingMenuItem_Click); this.SynclessRecordingMenuItem.Click += new System.EventHandler(this.SynclessRecordingMenuItem_Click);
// //
@ -1503,7 +1504,7 @@
// //
this.ControllersMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.GameController; this.ControllersMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.GameController;
this.ControllersMenuItem.Name = "ControllersMenuItem"; this.ControllersMenuItem.Name = "ControllersMenuItem";
this.ControllersMenuItem.Size = new System.Drawing.Size(179, 22); this.ControllersMenuItem.Size = new System.Drawing.Size(180, 22);
this.ControllersMenuItem.Text = "&Controllers..."; this.ControllersMenuItem.Text = "&Controllers...";
this.ControllersMenuItem.Click += new System.EventHandler(this.ControllersMenuItem_Click); this.ControllersMenuItem.Click += new System.EventHandler(this.ControllersMenuItem_Click);
// //
@ -1511,7 +1512,7 @@
// //
this.HotkeysMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.HotKeys; this.HotkeysMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.HotKeys;
this.HotkeysMenuItem.Name = "HotkeysMenuItem"; this.HotkeysMenuItem.Name = "HotkeysMenuItem";
this.HotkeysMenuItem.Size = new System.Drawing.Size(179, 22); this.HotkeysMenuItem.Size = new System.Drawing.Size(180, 22);
this.HotkeysMenuItem.Text = "&Hotkeys..."; this.HotkeysMenuItem.Text = "&Hotkeys...";
this.HotkeysMenuItem.Click += new System.EventHandler(this.HotkeysMenuItem_Click); this.HotkeysMenuItem.Click += new System.EventHandler(this.HotkeysMenuItem_Click);
// //
@ -1519,7 +1520,7 @@
// //
this.DisplayConfigMenuItem.Image = ((System.Drawing.Image)(resources.GetObject("DisplayConfigMenuItem.Image"))); this.DisplayConfigMenuItem.Image = ((System.Drawing.Image)(resources.GetObject("DisplayConfigMenuItem.Image")));
this.DisplayConfigMenuItem.Name = "DisplayConfigMenuItem"; this.DisplayConfigMenuItem.Name = "DisplayConfigMenuItem";
this.DisplayConfigMenuItem.Size = new System.Drawing.Size(179, 22); this.DisplayConfigMenuItem.Size = new System.Drawing.Size(180, 22);
this.DisplayConfigMenuItem.Text = "Display..."; this.DisplayConfigMenuItem.Text = "Display...";
this.DisplayConfigMenuItem.Click += new System.EventHandler(this.DisplayConfigMenuItem_Click); this.DisplayConfigMenuItem.Click += new System.EventHandler(this.DisplayConfigMenuItem_Click);
// //
@ -1527,7 +1528,7 @@
// //
this.SoundMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.AudioHS; this.SoundMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.AudioHS;
this.SoundMenuItem.Name = "SoundMenuItem"; this.SoundMenuItem.Name = "SoundMenuItem";
this.SoundMenuItem.Size = new System.Drawing.Size(179, 22); this.SoundMenuItem.Size = new System.Drawing.Size(180, 22);
this.SoundMenuItem.Text = "&Sound..."; this.SoundMenuItem.Text = "&Sound...";
this.SoundMenuItem.Click += new System.EventHandler(this.SoundMenuItem_Click); this.SoundMenuItem.Click += new System.EventHandler(this.SoundMenuItem_Click);
// //
@ -1535,7 +1536,7 @@
// //
this.PathsMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.CopyFolderHS; this.PathsMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.CopyFolderHS;
this.PathsMenuItem.Name = "PathsMenuItem"; this.PathsMenuItem.Name = "PathsMenuItem";
this.PathsMenuItem.Size = new System.Drawing.Size(179, 22); this.PathsMenuItem.Size = new System.Drawing.Size(180, 22);
this.PathsMenuItem.Text = "Paths..."; this.PathsMenuItem.Text = "Paths...";
this.PathsMenuItem.Click += new System.EventHandler(this.PathsMenuItem_Click); this.PathsMenuItem.Click += new System.EventHandler(this.PathsMenuItem_Click);
// //
@ -1543,7 +1544,7 @@
// //
this.FirmwaresMenuItem.Image = ((System.Drawing.Image)(resources.GetObject("FirmwaresMenuItem.Image"))); this.FirmwaresMenuItem.Image = ((System.Drawing.Image)(resources.GetObject("FirmwaresMenuItem.Image")));
this.FirmwaresMenuItem.Name = "FirmwaresMenuItem"; this.FirmwaresMenuItem.Name = "FirmwaresMenuItem";
this.FirmwaresMenuItem.Size = new System.Drawing.Size(179, 22); this.FirmwaresMenuItem.Size = new System.Drawing.Size(180, 22);
this.FirmwaresMenuItem.Text = "&Firmwares..."; this.FirmwaresMenuItem.Text = "&Firmwares...";
this.FirmwaresMenuItem.Click += new System.EventHandler(this.FirmwaresMenuItem_Click); this.FirmwaresMenuItem.Click += new System.EventHandler(this.FirmwaresMenuItem_Click);
// //
@ -1551,7 +1552,7 @@
// //
this.MessagesMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.MessageConfig; this.MessagesMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.MessageConfig;
this.MessagesMenuItem.Name = "MessagesMenuItem"; this.MessagesMenuItem.Name = "MessagesMenuItem";
this.MessagesMenuItem.Size = new System.Drawing.Size(179, 22); this.MessagesMenuItem.Size = new System.Drawing.Size(180, 22);
this.MessagesMenuItem.Text = "&Messages..."; this.MessagesMenuItem.Text = "&Messages...";
this.MessagesMenuItem.Click += new System.EventHandler(this.MessagesMenuItem_Click); this.MessagesMenuItem.Click += new System.EventHandler(this.MessagesMenuItem_Click);
// //
@ -1559,7 +1560,7 @@
// //
this.AutofireMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.Lightning; this.AutofireMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.Lightning;
this.AutofireMenuItem.Name = "AutofireMenuItem"; this.AutofireMenuItem.Name = "AutofireMenuItem";
this.AutofireMenuItem.Size = new System.Drawing.Size(179, 22); this.AutofireMenuItem.Size = new System.Drawing.Size(180, 22);
this.AutofireMenuItem.Text = "&Autofire..."; this.AutofireMenuItem.Text = "&Autofire...";
this.AutofireMenuItem.Click += new System.EventHandler(this.AutofireMenuItem_Click); this.AutofireMenuItem.Click += new System.EventHandler(this.AutofireMenuItem_Click);
// //
@ -1567,21 +1568,21 @@
// //
this.RewindOptionsMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.Previous; this.RewindOptionsMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.Previous;
this.RewindOptionsMenuItem.Name = "RewindOptionsMenuItem"; this.RewindOptionsMenuItem.Name = "RewindOptionsMenuItem";
this.RewindOptionsMenuItem.Size = new System.Drawing.Size(179, 22); this.RewindOptionsMenuItem.Size = new System.Drawing.Size(180, 22);
this.RewindOptionsMenuItem.Text = "&Rewind && States..."; this.RewindOptionsMenuItem.Text = "&Rewind && States...";
this.RewindOptionsMenuItem.Click += new System.EventHandler(this.RewindOptionsMenuItem_Click); this.RewindOptionsMenuItem.Click += new System.EventHandler(this.RewindOptionsMenuItem_Click);
// //
// extensionsToolStripMenuItem // extensionsToolStripMenuItem
// //
this.extensionsToolStripMenuItem.Name = "extensionsToolStripMenuItem"; this.extensionsToolStripMenuItem.Name = "extensionsToolStripMenuItem";
this.extensionsToolStripMenuItem.Size = new System.Drawing.Size(179, 22); this.extensionsToolStripMenuItem.Size = new System.Drawing.Size(180, 22);
this.extensionsToolStripMenuItem.Text = "File Extensions..."; this.extensionsToolStripMenuItem.Text = "File Extensions...";
this.extensionsToolStripMenuItem.Click += new System.EventHandler(this.FileExtensionsMenuItem_Click); this.extensionsToolStripMenuItem.Click += new System.EventHandler(this.FileExtensionsMenuItem_Click);
// //
// ClientOptionsMenuItem // ClientOptionsMenuItem
// //
this.ClientOptionsMenuItem.Name = "ClientOptionsMenuItem"; this.ClientOptionsMenuItem.Name = "ClientOptionsMenuItem";
this.ClientOptionsMenuItem.Size = new System.Drawing.Size(179, 22); this.ClientOptionsMenuItem.Size = new System.Drawing.Size(180, 22);
this.ClientOptionsMenuItem.Text = "&Customize..."; this.ClientOptionsMenuItem.Text = "&Customize...";
this.ClientOptionsMenuItem.Click += new System.EventHandler(this.CustomizeMenuItem_Click); this.ClientOptionsMenuItem.Click += new System.EventHandler(this.CustomizeMenuItem_Click);
// //
@ -1589,14 +1590,14 @@
// //
this.ProfilesMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.user_blue_small; this.ProfilesMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.user_blue_small;
this.ProfilesMenuItem.Name = "ProfilesMenuItem"; this.ProfilesMenuItem.Name = "ProfilesMenuItem";
this.ProfilesMenuItem.Size = new System.Drawing.Size(179, 22); this.ProfilesMenuItem.Size = new System.Drawing.Size(180, 22);
this.ProfilesMenuItem.Text = "&Profiles..."; this.ProfilesMenuItem.Text = "&Profiles...";
this.ProfilesMenuItem.Click += new System.EventHandler(this.ProfilesMenuItem_Click); this.ProfilesMenuItem.Click += new System.EventHandler(this.ProfilesMenuItem_Click);
// //
// toolStripSeparator9 // toolStripSeparator9
// //
this.toolStripSeparator9.Name = "toolStripSeparator9"; this.toolStripSeparator9.Name = "toolStripSeparator9";
this.toolStripSeparator9.Size = new System.Drawing.Size(176, 6); this.toolStripSeparator9.Size = new System.Drawing.Size(177, 6);
// //
// SpeedSkipSubMenu // SpeedSkipSubMenu
// //
@ -1619,7 +1620,7 @@
this.Speed200MenuItem, this.Speed200MenuItem,
this.Speed400MenuItem}); this.Speed400MenuItem});
this.SpeedSkipSubMenu.Name = "SpeedSkipSubMenu"; this.SpeedSkipSubMenu.Name = "SpeedSkipSubMenu";
this.SpeedSkipSubMenu.Size = new System.Drawing.Size(179, 22); this.SpeedSkipSubMenu.Size = new System.Drawing.Size(180, 22);
this.SpeedSkipSubMenu.Text = "Speed/Skip"; this.SpeedSkipSubMenu.Text = "Speed/Skip";
this.SpeedSkipSubMenu.DropDownOpened += new System.EventHandler(this.FrameSkipMenuItem_DropDownOpened); this.SpeedSkipSubMenu.DropDownOpened += new System.EventHandler(this.FrameSkipMenuItem_DropDownOpened);
// //
@ -1815,7 +1816,7 @@
this.InputOverHkMenuItem, this.InputOverHkMenuItem,
this.HkOverInputMenuItem}); this.HkOverInputMenuItem});
this.KeyPrioritySubMenu.Name = "KeyPrioritySubMenu"; this.KeyPrioritySubMenu.Name = "KeyPrioritySubMenu";
this.KeyPrioritySubMenu.Size = new System.Drawing.Size(179, 22); this.KeyPrioritySubMenu.Size = new System.Drawing.Size(180, 22);
this.KeyPrioritySubMenu.Text = "Key Priority"; this.KeyPrioritySubMenu.Text = "Key Priority";
this.KeyPrioritySubMenu.DropDownOpened += new System.EventHandler(this.KeyPriorityMenuItem_DropDownOpened); this.KeyPrioritySubMenu.DropDownOpened += new System.EventHandler(this.KeyPriorityMenuItem_DropDownOpened);
// //
@ -1849,14 +1850,13 @@
this.SGBCoreSubmenu, this.SGBCoreSubmenu,
this.GBCoreSubmenu, this.GBCoreSubmenu,
this.GBInSGBMenuItem, this.GBInSGBMenuItem,
this.SubNESHawkMenuItem,
this.toolStripMenuItem16, this.toolStripMenuItem16,
this.allowGameDBCoreOverridesToolStripMenuItem, this.allowGameDBCoreOverridesToolStripMenuItem,
this.toolStripSeparator8, this.toolStripSeparator8,
this.N64VideoPluginSettingsMenuItem, this.N64VideoPluginSettingsMenuItem,
this.setLibretroCoreToolStripMenuItem}); this.setLibretroCoreToolStripMenuItem});
this.CoresSubMenu.Name = "CoresSubMenu"; this.CoresSubMenu.Name = "CoresSubMenu";
this.CoresSubMenu.Size = new System.Drawing.Size(179, 22); this.CoresSubMenu.Size = new System.Drawing.Size(180, 22);
this.CoresSubMenu.Text = "Cores"; this.CoresSubMenu.Text = "Cores";
this.CoresSubMenu.DropDownOpened += new System.EventHandler(this.CoresSubMenu_DropDownOpened); this.CoresSubMenu.DropDownOpened += new System.EventHandler(this.CoresSubMenu_DropDownOpened);
// //
@ -1864,7 +1864,9 @@
// //
this.NesCoreSubMenu.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { this.NesCoreSubMenu.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
this.QuicknesCoreMenuItem, this.QuicknesCoreMenuItem,
this.NesCoreMenuItem}); this.NesCoreMenuItem,
this.toolStripSeparator38,
this.SubNesHawkMenuItem});
this.NesCoreSubMenu.Name = "NesCoreSubMenu"; this.NesCoreSubMenu.Name = "NesCoreSubMenu";
this.NesCoreSubMenu.Size = new System.Drawing.Size(239, 22); this.NesCoreSubMenu.Size = new System.Drawing.Size(239, 22);
this.NesCoreSubMenu.Text = "NES"; this.NesCoreSubMenu.Text = "NES";
@ -1873,17 +1875,29 @@
// QuicknesCoreMenuItem // QuicknesCoreMenuItem
// //
this.QuicknesCoreMenuItem.Name = "QuicknesCoreMenuItem"; this.QuicknesCoreMenuItem.Name = "QuicknesCoreMenuItem";
this.QuicknesCoreMenuItem.Size = new System.Drawing.Size(126, 22); this.QuicknesCoreMenuItem.Size = new System.Drawing.Size(223, 22);
this.QuicknesCoreMenuItem.Text = "QuickNES"; this.QuicknesCoreMenuItem.Text = "QuickNES";
this.QuicknesCoreMenuItem.Click += new System.EventHandler(this.NesCorePick_Click); this.QuicknesCoreMenuItem.Click += new System.EventHandler(this.NesCorePick_Click);
// //
// NesCoreMenuItem // NesCoreMenuItem
// //
this.NesCoreMenuItem.Name = "NesCoreMenuItem"; this.NesCoreMenuItem.Name = "NesCoreMenuItem";
this.NesCoreMenuItem.Size = new System.Drawing.Size(126, 22); this.NesCoreMenuItem.Size = new System.Drawing.Size(223, 22);
this.NesCoreMenuItem.Text = "NesHawk"; this.NesCoreMenuItem.Text = "NesHawk";
this.NesCoreMenuItem.Click += new System.EventHandler(this.NesCorePick_Click); this.NesCoreMenuItem.Click += new System.EventHandler(this.NesCorePick_Click);
// //
// toolStripSeparator38
//
this.toolStripSeparator38.Name = "toolStripSeparator38";
this.toolStripSeparator38.Size = new System.Drawing.Size(220, 6);
//
// subFrameNesHawkTASOnlyToolStripMenuItem
//
this.SubNesHawkMenuItem.Name = "SubNesHawkMenuItem";
this.SubNesHawkMenuItem.Size = new System.Drawing.Size(223, 22);
this.SubNesHawkMenuItem.Text = "SubNesHawk (Experimental)";
this.SubNesHawkMenuItem.Click += new System.EventHandler(this.SubNesCorePick_Click);
//
// CoreSNESSubMenu // CoreSNESSubMenu
// //
this.CoreSNESSubMenu.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { this.CoreSNESSubMenu.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
@ -1986,13 +2000,6 @@
this.GBInSGBMenuItem.Size = new System.Drawing.Size(239, 22); this.GBInSGBMenuItem.Size = new System.Drawing.Size(239, 22);
this.GBInSGBMenuItem.Text = "GB in SGB"; this.GBInSGBMenuItem.Text = "GB in SGB";
this.GBInSGBMenuItem.Click += new System.EventHandler(this.GbInSgbMenuItem_Click); this.GBInSGBMenuItem.Click += new System.EventHandler(this.GbInSgbMenuItem_Click);
//
// SubNESHawkMenuItem
//
this.SubNESHawkMenuItem.Name = "SubNESHawkMenuItem";
this.SubNESHawkMenuItem.Size = new System.Drawing.Size(239, 22);
this.SubNESHawkMenuItem.Text = "SubNESHawk";
this.SubNESHawkMenuItem.Click += new System.EventHandler(this.SubNESHawkMenuItem_Click);
// //
// toolStripMenuItem16 // toolStripMenuItem16
// //
@ -2029,20 +2036,20 @@
// toolStripSeparator10 // toolStripSeparator10
// //
this.toolStripSeparator10.Name = "toolStripSeparator10"; this.toolStripSeparator10.Name = "toolStripSeparator10";
this.toolStripSeparator10.Size = new System.Drawing.Size(176, 6); this.toolStripSeparator10.Size = new System.Drawing.Size(177, 6);
// //
// SaveConfigMenuItem // SaveConfigMenuItem
// //
this.SaveConfigMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.Save; this.SaveConfigMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.Save;
this.SaveConfigMenuItem.Name = "SaveConfigMenuItem"; this.SaveConfigMenuItem.Name = "SaveConfigMenuItem";
this.SaveConfigMenuItem.Size = new System.Drawing.Size(179, 22); this.SaveConfigMenuItem.Size = new System.Drawing.Size(180, 22);
this.SaveConfigMenuItem.Text = "Save Config"; this.SaveConfigMenuItem.Text = "Save Config";
this.SaveConfigMenuItem.Click += new System.EventHandler(this.SaveConfigMenuItem_Click); this.SaveConfigMenuItem.Click += new System.EventHandler(this.SaveConfigMenuItem_Click);
// //
// SaveConfigAsMenuItem // SaveConfigAsMenuItem
// //
this.SaveConfigAsMenuItem.Name = "SaveConfigAsMenuItem"; this.SaveConfigAsMenuItem.Name = "SaveConfigAsMenuItem";
this.SaveConfigAsMenuItem.Size = new System.Drawing.Size(179, 22); this.SaveConfigAsMenuItem.Size = new System.Drawing.Size(180, 22);
this.SaveConfigAsMenuItem.Text = "Save Config As..."; this.SaveConfigAsMenuItem.Text = "Save Config As...";
this.SaveConfigAsMenuItem.Click += new System.EventHandler(this.SaveConfigAsMenuItem_Click); this.SaveConfigAsMenuItem.Click += new System.EventHandler(this.SaveConfigAsMenuItem_Click);
// //
@ -2050,14 +2057,14 @@
// //
this.LoadConfigMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.LoadConfig; this.LoadConfigMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.LoadConfig;
this.LoadConfigMenuItem.Name = "LoadConfigMenuItem"; this.LoadConfigMenuItem.Name = "LoadConfigMenuItem";
this.LoadConfigMenuItem.Size = new System.Drawing.Size(179, 22); this.LoadConfigMenuItem.Size = new System.Drawing.Size(180, 22);
this.LoadConfigMenuItem.Text = "Load Config"; this.LoadConfigMenuItem.Text = "Load Config";
this.LoadConfigMenuItem.Click += new System.EventHandler(this.LoadConfigMenuItem_Click); this.LoadConfigMenuItem.Click += new System.EventHandler(this.LoadConfigMenuItem_Click);
// //
// LoadConfigFromMenuItem // LoadConfigFromMenuItem
// //
this.LoadConfigFromMenuItem.Name = "LoadConfigFromMenuItem"; this.LoadConfigFromMenuItem.Name = "LoadConfigFromMenuItem";
this.LoadConfigFromMenuItem.Size = new System.Drawing.Size(179, 22); this.LoadConfigFromMenuItem.Size = new System.Drawing.Size(180, 22);
this.LoadConfigFromMenuItem.Text = "Load Config From..."; this.LoadConfigFromMenuItem.Text = "Load Config From...";
this.LoadConfigFromMenuItem.Click += new System.EventHandler(this.LoadConfigFromMenuItem_Click); this.LoadConfigFromMenuItem.Click += new System.EventHandler(this.LoadConfigFromMenuItem_Click);
// //
@ -2086,7 +2093,7 @@
this.batchRunnerToolStripMenuItem, this.batchRunnerToolStripMenuItem,
this.ExperimentalToolsSubMenu}); this.ExperimentalToolsSubMenu});
this.ToolsSubMenu.Name = "ToolsSubMenu"; this.ToolsSubMenu.Name = "ToolsSubMenu";
this.ToolsSubMenu.Size = new System.Drawing.Size(48, 19); this.ToolsSubMenu.Size = new System.Drawing.Size(47, 19);
this.ToolsSubMenu.Text = "&Tools"; this.ToolsSubMenu.Text = "&Tools";
this.ToolsSubMenu.DropDownOpened += new System.EventHandler(this.ToolsSubMenu_DropDownOpened); this.ToolsSubMenu.DropDownOpened += new System.EventHandler(this.ToolsSubMenu_DropDownOpened);
// //
@ -2475,7 +2482,7 @@
// //
this.PceControllerSettingsMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.GameController; this.PceControllerSettingsMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.GameController;
this.PceControllerSettingsMenuItem.Name = "PceControllerSettingsMenuItem"; this.PceControllerSettingsMenuItem.Name = "PceControllerSettingsMenuItem";
this.PceControllerSettingsMenuItem.Size = new System.Drawing.Size(259, 22); this.PceControllerSettingsMenuItem.Size = new System.Drawing.Size(258, 22);
this.PceControllerSettingsMenuItem.Text = "Controller Settings"; this.PceControllerSettingsMenuItem.Text = "Controller Settings";
this.PceControllerSettingsMenuItem.Click += new System.EventHandler(this.PceControllerSettingsMenuItem_Click); this.PceControllerSettingsMenuItem.Click += new System.EventHandler(this.PceControllerSettingsMenuItem_Click);
// //
@ -2483,59 +2490,59 @@
// //
this.PCEGraphicsSettingsMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.tvIcon; this.PCEGraphicsSettingsMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.tvIcon;
this.PCEGraphicsSettingsMenuItem.Name = "PCEGraphicsSettingsMenuItem"; this.PCEGraphicsSettingsMenuItem.Name = "PCEGraphicsSettingsMenuItem";
this.PCEGraphicsSettingsMenuItem.Size = new System.Drawing.Size(259, 22); this.PCEGraphicsSettingsMenuItem.Size = new System.Drawing.Size(258, 22);
this.PCEGraphicsSettingsMenuItem.Text = "Graphics Settings"; this.PCEGraphicsSettingsMenuItem.Text = "Graphics Settings";
this.PCEGraphicsSettingsMenuItem.Click += new System.EventHandler(this.PceGraphicsSettingsMenuItem_Click); this.PCEGraphicsSettingsMenuItem.Click += new System.EventHandler(this.PceGraphicsSettingsMenuItem_Click);
// //
// toolStripSeparator32 // toolStripSeparator32
// //
this.toolStripSeparator32.Name = "toolStripSeparator32"; this.toolStripSeparator32.Name = "toolStripSeparator32";
this.toolStripSeparator32.Size = new System.Drawing.Size(256, 6); this.toolStripSeparator32.Size = new System.Drawing.Size(255, 6);
// //
// PCEBGViewerMenuItem // PCEBGViewerMenuItem
// //
this.PCEBGViewerMenuItem.Name = "PCEBGViewerMenuItem"; this.PCEBGViewerMenuItem.Name = "PCEBGViewerMenuItem";
this.PCEBGViewerMenuItem.Size = new System.Drawing.Size(259, 22); this.PCEBGViewerMenuItem.Size = new System.Drawing.Size(258, 22);
this.PCEBGViewerMenuItem.Text = "&BG Viewer"; this.PCEBGViewerMenuItem.Text = "&BG Viewer";
this.PCEBGViewerMenuItem.Click += new System.EventHandler(this.PceBgViewerMenuItem_Click); this.PCEBGViewerMenuItem.Click += new System.EventHandler(this.PceBgViewerMenuItem_Click);
// //
// PCEtileViewerToolStripMenuItem // PCEtileViewerToolStripMenuItem
// //
this.PCEtileViewerToolStripMenuItem.Name = "PCEtileViewerToolStripMenuItem"; this.PCEtileViewerToolStripMenuItem.Name = "PCEtileViewerToolStripMenuItem";
this.PCEtileViewerToolStripMenuItem.Size = new System.Drawing.Size(259, 22); this.PCEtileViewerToolStripMenuItem.Size = new System.Drawing.Size(258, 22);
this.PCEtileViewerToolStripMenuItem.Text = "&Tile Viewer"; this.PCEtileViewerToolStripMenuItem.Text = "&Tile Viewer";
this.PCEtileViewerToolStripMenuItem.Click += new System.EventHandler(this.PceTileViewerMenuItem_Click); this.PCEtileViewerToolStripMenuItem.Click += new System.EventHandler(this.PceTileViewerMenuItem_Click);
// //
// PceSoundDebuggerToolStripMenuItem // PceSoundDebuggerToolStripMenuItem
// //
this.PceSoundDebuggerToolStripMenuItem.Name = "PceSoundDebuggerToolStripMenuItem"; this.PceSoundDebuggerToolStripMenuItem.Name = "PceSoundDebuggerToolStripMenuItem";
this.PceSoundDebuggerToolStripMenuItem.Size = new System.Drawing.Size(259, 22); this.PceSoundDebuggerToolStripMenuItem.Size = new System.Drawing.Size(258, 22);
this.PceSoundDebuggerToolStripMenuItem.Text = "&Sound Debugger"; this.PceSoundDebuggerToolStripMenuItem.Text = "&Sound Debugger";
this.PceSoundDebuggerToolStripMenuItem.Click += new System.EventHandler(this.PceSoundDebuggerMenuItem_Click); this.PceSoundDebuggerToolStripMenuItem.Click += new System.EventHandler(this.PceSoundDebuggerMenuItem_Click);
// //
// toolStripSeparator25 // toolStripSeparator25
// //
this.toolStripSeparator25.Name = "toolStripSeparator25"; this.toolStripSeparator25.Name = "toolStripSeparator25";
this.toolStripSeparator25.Size = new System.Drawing.Size(256, 6); this.toolStripSeparator25.Size = new System.Drawing.Size(255, 6);
// //
// PCEAlwaysPerformSpriteLimitMenuItem // PCEAlwaysPerformSpriteLimitMenuItem
// //
this.PCEAlwaysPerformSpriteLimitMenuItem.Name = "PCEAlwaysPerformSpriteLimitMenuItem"; this.PCEAlwaysPerformSpriteLimitMenuItem.Name = "PCEAlwaysPerformSpriteLimitMenuItem";
this.PCEAlwaysPerformSpriteLimitMenuItem.Size = new System.Drawing.Size(259, 22); this.PCEAlwaysPerformSpriteLimitMenuItem.Size = new System.Drawing.Size(258, 22);
this.PCEAlwaysPerformSpriteLimitMenuItem.Text = "Always Perform Sprite Limit"; this.PCEAlwaysPerformSpriteLimitMenuItem.Text = "Always Perform Sprite Limit";
this.PCEAlwaysPerformSpriteLimitMenuItem.Click += new System.EventHandler(this.PCEAlwaysPerformSpriteLimitMenuItem_Click); this.PCEAlwaysPerformSpriteLimitMenuItem.Click += new System.EventHandler(this.PCEAlwaysPerformSpriteLimitMenuItem_Click);
// //
// PCEAlwaysEqualizeVolumesMenuItem // PCEAlwaysEqualizeVolumesMenuItem
// //
this.PCEAlwaysEqualizeVolumesMenuItem.Name = "PCEAlwaysEqualizeVolumesMenuItem"; this.PCEAlwaysEqualizeVolumesMenuItem.Name = "PCEAlwaysEqualizeVolumesMenuItem";
this.PCEAlwaysEqualizeVolumesMenuItem.Size = new System.Drawing.Size(259, 22); this.PCEAlwaysEqualizeVolumesMenuItem.Size = new System.Drawing.Size(258, 22);
this.PCEAlwaysEqualizeVolumesMenuItem.Text = "Always Equalize Volumes (PCE-CD)"; this.PCEAlwaysEqualizeVolumesMenuItem.Text = "Always Equalize Volumes (PCE-CD)";
this.PCEAlwaysEqualizeVolumesMenuItem.Click += new System.EventHandler(this.PCEAlwaysEqualizeVolumesMenuItem_Click); this.PCEAlwaysEqualizeVolumesMenuItem.Click += new System.EventHandler(this.PCEAlwaysEqualizeVolumesMenuItem_Click);
// //
// PCEArcadeCardRewindEnableMenuItem // PCEArcadeCardRewindEnableMenuItem
// //
this.PCEArcadeCardRewindEnableMenuItem.Name = "PCEArcadeCardRewindEnableMenuItem"; this.PCEArcadeCardRewindEnableMenuItem.Name = "PCEArcadeCardRewindEnableMenuItem";
this.PCEArcadeCardRewindEnableMenuItem.Size = new System.Drawing.Size(259, 22); this.PCEArcadeCardRewindEnableMenuItem.Size = new System.Drawing.Size(258, 22);
this.PCEArcadeCardRewindEnableMenuItem.Text = "Arcade Card Rewind-Enable Hack"; this.PCEArcadeCardRewindEnableMenuItem.Text = "Arcade Card Rewind-Enable Hack";
this.PCEArcadeCardRewindEnableMenuItem.Click += new System.EventHandler(this.PCEArcadeCardRewindEnableMenuItem_Click); this.PCEArcadeCardRewindEnableMenuItem.Click += new System.EventHandler(this.PCEArcadeCardRewindEnableMenuItem_Click);
// //
@ -2572,7 +2579,7 @@
this.SMSregionKoreaToolStripMenuItem, this.SMSregionKoreaToolStripMenuItem,
this.SMSregionAutoToolStripMenuItem}); this.SMSregionAutoToolStripMenuItem});
this.SMSregionToolStripMenuItem.Name = "SMSregionToolStripMenuItem"; this.SMSregionToolStripMenuItem.Name = "SMSregionToolStripMenuItem";
this.SMSregionToolStripMenuItem.Size = new System.Drawing.Size(278, 22); this.SMSregionToolStripMenuItem.Size = new System.Drawing.Size(277, 22);
this.SMSregionToolStripMenuItem.Text = "Region"; this.SMSregionToolStripMenuItem.Text = "Region";
// //
// SMSregionExportToolStripMenuItem // SMSregionExportToolStripMenuItem
@ -2610,7 +2617,7 @@
this.SMSdisplayPalToolStripMenuItem, this.SMSdisplayPalToolStripMenuItem,
this.SMSdisplayAutoToolStripMenuItem}); this.SMSdisplayAutoToolStripMenuItem});
this.SMSdisplayToolStripMenuItem.Name = "SMSdisplayToolStripMenuItem"; this.SMSdisplayToolStripMenuItem.Name = "SMSdisplayToolStripMenuItem";
this.SMSdisplayToolStripMenuItem.Size = new System.Drawing.Size(278, 22); this.SMSdisplayToolStripMenuItem.Size = new System.Drawing.Size(277, 22);
this.SMSdisplayToolStripMenuItem.Text = "Display Type"; this.SMSdisplayToolStripMenuItem.Text = "Display Type";
// //
// SMSdisplayNtscToolStripMenuItem // SMSdisplayNtscToolStripMenuItem
@ -2643,7 +2650,7 @@
this.SMSControllerSportsPadToolStripMenuItem, this.SMSControllerSportsPadToolStripMenuItem,
this.SMSControllerKeyboardToolStripMenuItem}); this.SMSControllerKeyboardToolStripMenuItem});
this.SMSControllerToolStripMenuItem.Name = "SMSControllerToolStripMenuItem"; this.SMSControllerToolStripMenuItem.Name = "SMSControllerToolStripMenuItem";
this.SMSControllerToolStripMenuItem.Size = new System.Drawing.Size(278, 22); this.SMSControllerToolStripMenuItem.Size = new System.Drawing.Size(277, 22);
this.SMSControllerToolStripMenuItem.Text = "&Controller Type"; this.SMSControllerToolStripMenuItem.Text = "&Controller Type";
// //
// SMSControllerStandardToolStripMenuItem // SMSControllerStandardToolStripMenuItem
@ -2684,94 +2691,94 @@
// SMStoolStripMenuItem2 // SMStoolStripMenuItem2
// //
this.SMStoolStripMenuItem2.Name = "SMStoolStripMenuItem2"; this.SMStoolStripMenuItem2.Name = "SMStoolStripMenuItem2";
this.SMStoolStripMenuItem2.Size = new System.Drawing.Size(275, 6); this.SMStoolStripMenuItem2.Size = new System.Drawing.Size(274, 6);
// //
// SMSenableBIOSToolStripMenuItem // SMSenableBIOSToolStripMenuItem
// //
this.SMSenableBIOSToolStripMenuItem.Name = "SMSenableBIOSToolStripMenuItem"; this.SMSenableBIOSToolStripMenuItem.Name = "SMSenableBIOSToolStripMenuItem";
this.SMSenableBIOSToolStripMenuItem.Size = new System.Drawing.Size(278, 22); this.SMSenableBIOSToolStripMenuItem.Size = new System.Drawing.Size(277, 22);
this.SMSenableBIOSToolStripMenuItem.Text = "Enable BIOS (Must be Enabled for TAS)"; this.SMSenableBIOSToolStripMenuItem.Text = "Enable BIOS (Must be Enabled for TAS)";
this.SMSenableBIOSToolStripMenuItem.Click += new System.EventHandler(this.SmsBiosMenuItem_Click); this.SMSenableBIOSToolStripMenuItem.Click += new System.EventHandler(this.SmsBiosMenuItem_Click);
// //
// SMSEnableFMChipMenuItem // SMSEnableFMChipMenuItem
// //
this.SMSEnableFMChipMenuItem.Name = "SMSEnableFMChipMenuItem"; this.SMSEnableFMChipMenuItem.Name = "SMSEnableFMChipMenuItem";
this.SMSEnableFMChipMenuItem.Size = new System.Drawing.Size(278, 22); this.SMSEnableFMChipMenuItem.Size = new System.Drawing.Size(277, 22);
this.SMSEnableFMChipMenuItem.Text = "&Enable FM Chip"; this.SMSEnableFMChipMenuItem.Text = "&Enable FM Chip";
this.SMSEnableFMChipMenuItem.Click += new System.EventHandler(this.SmsEnableFmChipMenuItem_Click); this.SMSEnableFMChipMenuItem.Click += new System.EventHandler(this.SmsEnableFmChipMenuItem_Click);
// //
// SMSOverclockMenuItem // SMSOverclockMenuItem
// //
this.SMSOverclockMenuItem.Name = "SMSOverclockMenuItem"; this.SMSOverclockMenuItem.Name = "SMSOverclockMenuItem";
this.SMSOverclockMenuItem.Size = new System.Drawing.Size(278, 22); this.SMSOverclockMenuItem.Size = new System.Drawing.Size(277, 22);
this.SMSOverclockMenuItem.Text = "&Overclock when Known Safe"; this.SMSOverclockMenuItem.Text = "&Overclock when Known Safe";
this.SMSOverclockMenuItem.Click += new System.EventHandler(this.SMSOverclockMenuItem_Click); this.SMSOverclockMenuItem.Click += new System.EventHandler(this.SMSOverclockMenuItem_Click);
// //
// SMSForceStereoMenuItem // SMSForceStereoMenuItem
// //
this.SMSForceStereoMenuItem.Name = "SMSForceStereoMenuItem"; this.SMSForceStereoMenuItem.Name = "SMSForceStereoMenuItem";
this.SMSForceStereoMenuItem.Size = new System.Drawing.Size(278, 22); this.SMSForceStereoMenuItem.Size = new System.Drawing.Size(277, 22);
this.SMSForceStereoMenuItem.Text = "&Force Stereo Separation"; this.SMSForceStereoMenuItem.Text = "&Force Stereo Separation";
this.SMSForceStereoMenuItem.Click += new System.EventHandler(this.SMSForceStereoMenuItem_Click); this.SMSForceStereoMenuItem.Click += new System.EventHandler(this.SMSForceStereoMenuItem_Click);
// //
// SMSSpriteLimitMenuItem // SMSSpriteLimitMenuItem
// //
this.SMSSpriteLimitMenuItem.Name = "SMSSpriteLimitMenuItem"; this.SMSSpriteLimitMenuItem.Name = "SMSSpriteLimitMenuItem";
this.SMSSpriteLimitMenuItem.Size = new System.Drawing.Size(278, 22); this.SMSSpriteLimitMenuItem.Size = new System.Drawing.Size(277, 22);
this.SMSSpriteLimitMenuItem.Text = "Sprite &Limit"; this.SMSSpriteLimitMenuItem.Text = "Sprite &Limit";
this.SMSSpriteLimitMenuItem.Click += new System.EventHandler(this.SMSSpriteLimitMenuItem_Click); this.SMSSpriteLimitMenuItem.Click += new System.EventHandler(this.SMSSpriteLimitMenuItem_Click);
// //
// SMSDisplayOverscanMenuItem // SMSDisplayOverscanMenuItem
// //
this.SMSDisplayOverscanMenuItem.Name = "SMSDisplayOverscanMenuItem"; this.SMSDisplayOverscanMenuItem.Name = "SMSDisplayOverscanMenuItem";
this.SMSDisplayOverscanMenuItem.Size = new System.Drawing.Size(278, 22); this.SMSDisplayOverscanMenuItem.Size = new System.Drawing.Size(277, 22);
this.SMSDisplayOverscanMenuItem.Text = "Display Overscan"; this.SMSDisplayOverscanMenuItem.Text = "Display Overscan";
this.SMSDisplayOverscanMenuItem.Click += new System.EventHandler(this.SMSDisplayOverscanMenuItem_Click); this.SMSDisplayOverscanMenuItem.Click += new System.EventHandler(this.SMSDisplayOverscanMenuItem_Click);
// //
// SMSFix3DGameDisplayToolStripMenuItem // SMSFix3DGameDisplayToolStripMenuItem
// //
this.SMSFix3DGameDisplayToolStripMenuItem.Name = "SMSFix3DGameDisplayToolStripMenuItem"; this.SMSFix3DGameDisplayToolStripMenuItem.Name = "SMSFix3DGameDisplayToolStripMenuItem";
this.SMSFix3DGameDisplayToolStripMenuItem.Size = new System.Drawing.Size(278, 22); this.SMSFix3DGameDisplayToolStripMenuItem.Size = new System.Drawing.Size(277, 22);
this.SMSFix3DGameDisplayToolStripMenuItem.Text = "Fix 3D Game Display"; this.SMSFix3DGameDisplayToolStripMenuItem.Text = "Fix 3D Game Display";
this.SMSFix3DGameDisplayToolStripMenuItem.Click += new System.EventHandler(this.SMSFix3DDisplayMenuItem_Click); this.SMSFix3DGameDisplayToolStripMenuItem.Click += new System.EventHandler(this.SMSFix3DDisplayMenuItem_Click);
// //
// ShowClippedRegionsMenuItem // ShowClippedRegionsMenuItem
// //
this.ShowClippedRegionsMenuItem.Name = "ShowClippedRegionsMenuItem"; this.ShowClippedRegionsMenuItem.Name = "ShowClippedRegionsMenuItem";
this.ShowClippedRegionsMenuItem.Size = new System.Drawing.Size(278, 22); this.ShowClippedRegionsMenuItem.Size = new System.Drawing.Size(277, 22);
this.ShowClippedRegionsMenuItem.Text = "&Show Clipped Regions"; this.ShowClippedRegionsMenuItem.Text = "&Show Clipped Regions";
this.ShowClippedRegionsMenuItem.Click += new System.EventHandler(this.ShowClippedRegionsMenuItem_Click); this.ShowClippedRegionsMenuItem.Click += new System.EventHandler(this.ShowClippedRegionsMenuItem_Click);
// //
// HighlightActiveDisplayRegionMenuItem // HighlightActiveDisplayRegionMenuItem
// //
this.HighlightActiveDisplayRegionMenuItem.Name = "HighlightActiveDisplayRegionMenuItem"; this.HighlightActiveDisplayRegionMenuItem.Name = "HighlightActiveDisplayRegionMenuItem";
this.HighlightActiveDisplayRegionMenuItem.Size = new System.Drawing.Size(278, 22); this.HighlightActiveDisplayRegionMenuItem.Size = new System.Drawing.Size(277, 22);
this.HighlightActiveDisplayRegionMenuItem.Text = "&Highlight Active Display Region"; this.HighlightActiveDisplayRegionMenuItem.Text = "&Highlight Active Display Region";
this.HighlightActiveDisplayRegionMenuItem.Click += new System.EventHandler(this.HighlightActiveDisplayRegionMenuItem_Click); this.HighlightActiveDisplayRegionMenuItem.Click += new System.EventHandler(this.HighlightActiveDisplayRegionMenuItem_Click);
// //
// SMSGraphicsSettingsMenuItem // SMSGraphicsSettingsMenuItem
// //
this.SMSGraphicsSettingsMenuItem.Name = "SMSGraphicsSettingsMenuItem"; this.SMSGraphicsSettingsMenuItem.Name = "SMSGraphicsSettingsMenuItem";
this.SMSGraphicsSettingsMenuItem.Size = new System.Drawing.Size(278, 22); this.SMSGraphicsSettingsMenuItem.Size = new System.Drawing.Size(277, 22);
this.SMSGraphicsSettingsMenuItem.Text = "&Graphics Settings..."; this.SMSGraphicsSettingsMenuItem.Text = "&Graphics Settings...";
this.SMSGraphicsSettingsMenuItem.Click += new System.EventHandler(this.SMSGraphicsSettingsMenuItem_Click); this.SMSGraphicsSettingsMenuItem.Click += new System.EventHandler(this.SMSGraphicsSettingsMenuItem_Click);
// //
// toolStripSeparator24 // toolStripSeparator24
// //
this.toolStripSeparator24.Name = "toolStripSeparator24"; this.toolStripSeparator24.Name = "toolStripSeparator24";
this.toolStripSeparator24.Size = new System.Drawing.Size(275, 6); this.toolStripSeparator24.Size = new System.Drawing.Size(274, 6);
// //
// SMSVDPViewerToolStripMenuItem // SMSVDPViewerToolStripMenuItem
// //
this.SMSVDPViewerToolStripMenuItem.Name = "SMSVDPViewerToolStripMenuItem"; this.SMSVDPViewerToolStripMenuItem.Name = "SMSVDPViewerToolStripMenuItem";
this.SMSVDPViewerToolStripMenuItem.Size = new System.Drawing.Size(278, 22); this.SMSVDPViewerToolStripMenuItem.Size = new System.Drawing.Size(277, 22);
this.SMSVDPViewerToolStripMenuItem.Text = "&VDP Viewer"; this.SMSVDPViewerToolStripMenuItem.Text = "&VDP Viewer";
this.SMSVDPViewerToolStripMenuItem.Click += new System.EventHandler(this.SmsVdpViewerMenuItem_Click); this.SMSVDPViewerToolStripMenuItem.Click += new System.EventHandler(this.SmsVdpViewerMenuItem_Click);
// //
// GGGameGenieMenuItem // GGGameGenieMenuItem
// //
this.GGGameGenieMenuItem.Name = "GGGameGenieMenuItem"; this.GGGameGenieMenuItem.Name = "GGGameGenieMenuItem";
this.GGGameGenieMenuItem.Size = new System.Drawing.Size(278, 22); this.GGGameGenieMenuItem.Size = new System.Drawing.Size(277, 22);
this.GGGameGenieMenuItem.Text = "&Game Genie Encoder/Decoder"; this.GGGameGenieMenuItem.Text = "&Game Genie Encoder/Decoder";
this.GGGameGenieMenuItem.Click += new System.EventHandler(this.GGGameGenieMenuItem_Click); this.GGGameGenieMenuItem.Click += new System.EventHandler(this.GGGameGenieMenuItem_Click);
// //
@ -3189,7 +3196,7 @@
// DGBsettingsToolStripMenuItem // DGBsettingsToolStripMenuItem
// //
this.DGBsettingsToolStripMenuItem.Name = "DGBsettingsToolStripMenuItem"; this.DGBsettingsToolStripMenuItem.Name = "DGBsettingsToolStripMenuItem";
this.DGBsettingsToolStripMenuItem.Size = new System.Drawing.Size(152, 22); this.DGBsettingsToolStripMenuItem.Size = new System.Drawing.Size(125, 22);
this.DGBsettingsToolStripMenuItem.Text = "Settings..."; this.DGBsettingsToolStripMenuItem.Text = "Settings...";
this.DGBsettingsToolStripMenuItem.Click += new System.EventHandler(this.DgbSettingsMenuItem_Click); this.DGBsettingsToolStripMenuItem.Click += new System.EventHandler(this.DgbSettingsMenuItem_Click);
// //
@ -3204,7 +3211,7 @@
// DGBHawksettingsToolStripMenuItem // DGBHawksettingsToolStripMenuItem
// //
this.DGBHawksettingsToolStripMenuItem.Name = "DGBHawksettingsToolStripMenuItem"; this.DGBHawksettingsToolStripMenuItem.Name = "DGBHawksettingsToolStripMenuItem";
this.DGBHawksettingsToolStripMenuItem.Size = new System.Drawing.Size(152, 22); this.DGBHawksettingsToolStripMenuItem.Size = new System.Drawing.Size(125, 22);
this.DGBHawksettingsToolStripMenuItem.Text = "Settings..."; this.DGBHawksettingsToolStripMenuItem.Text = "Settings...";
this.DGBHawksettingsToolStripMenuItem.Click += new System.EventHandler(this.DgbHawkSettingsMenuItem_Click); this.DGBHawksettingsToolStripMenuItem.Click += new System.EventHandler(this.DgbHawkSettingsMenuItem_Click);
// //
@ -3213,13 +3220,13 @@
this.GGLSubMenu.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { this.GGLSubMenu.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
this.GGLsettingsToolStripMenuItem}); this.GGLsettingsToolStripMenuItem});
this.GGLSubMenu.Name = "GGLSubMenu"; this.GGLSubMenu.Name = "GGLSubMenu";
this.GGLSubMenu.Size = new System.Drawing.Size(59, 19); this.GGLSubMenu.Size = new System.Drawing.Size(60, 19);
this.GGLSubMenu.Text = "&GG Link"; this.GGLSubMenu.Text = "&GG Link";
// //
// GGLsettingsToolStripMenuItem // GGLsettingsToolStripMenuItem
// //
this.GGLsettingsToolStripMenuItem.Name = "GGLsettingsToolStripMenuItem"; this.GGLsettingsToolStripMenuItem.Name = "GGLsettingsToolStripMenuItem";
this.GGLsettingsToolStripMenuItem.Size = new System.Drawing.Size(152, 22); this.GGLsettingsToolStripMenuItem.Size = new System.Drawing.Size(125, 22);
this.GGLsettingsToolStripMenuItem.Text = "Settings..."; this.GGLsettingsToolStripMenuItem.Text = "Settings...";
this.GGLsettingsToolStripMenuItem.Click += new System.EventHandler(this.GGLSettingsMenuItem_Click); this.GGLsettingsToolStripMenuItem.Click += new System.EventHandler(this.GGLSettingsMenuItem_Click);
// //
@ -3414,50 +3421,6 @@
this.preferencesToolStripMenuItem2.Text = "Preferences..."; this.preferencesToolStripMenuItem2.Text = "Preferences...";
this.preferencesToolStripMenuItem2.Click += new System.EventHandler(this.preferencesToolStripMenuItem2_Click); this.preferencesToolStripMenuItem2.Click += new System.EventHandler(this.preferencesToolStripMenuItem2_Click);
// //
// HelpSubMenu
//
this.HelpSubMenu.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
this.OnlineHelpMenuItem,
this.ForumsMenuItem,
this.FeaturesMenuItem,
this.AboutMenuItem});
this.HelpSubMenu.Name = "HelpSubMenu";
this.HelpSubMenu.Size = new System.Drawing.Size(44, 19);
this.HelpSubMenu.Text = "&Help";
this.HelpSubMenu.DropDownOpened += new System.EventHandler(this.HelpSubMenu_DropDownOpened);
//
// OnlineHelpMenuItem
//
this.OnlineHelpMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.Help;
this.OnlineHelpMenuItem.Name = "OnlineHelpMenuItem";
this.OnlineHelpMenuItem.Size = new System.Drawing.Size(146, 22);
this.OnlineHelpMenuItem.Text = "&Online Help...";
this.OnlineHelpMenuItem.Click += new System.EventHandler(this.OnlineHelpMenuItem_Click);
//
// ForumsMenuItem
//
this.ForumsMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.TAStudio;
this.ForumsMenuItem.Name = "ForumsMenuItem";
this.ForumsMenuItem.Size = new System.Drawing.Size(146, 22);
this.ForumsMenuItem.Text = "Forums...";
this.ForumsMenuItem.Click += new System.EventHandler(this.ForumsMenuItem_Click);
//
// FeaturesMenuItem
//
this.FeaturesMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.kitchensink;
this.FeaturesMenuItem.Name = "FeaturesMenuItem";
this.FeaturesMenuItem.Size = new System.Drawing.Size(146, 22);
this.FeaturesMenuItem.Text = "&Features";
this.FeaturesMenuItem.Click += new System.EventHandler(this.FeaturesMenuItem_Click);
//
// AboutMenuItem
//
this.AboutMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.CorpHawkSmall;
this.AboutMenuItem.Name = "AboutMenuItem";
this.AboutMenuItem.Size = new System.Drawing.Size(146, 22);
this.AboutMenuItem.Text = "&About";
this.AboutMenuItem.Click += new System.EventHandler(this.AboutMenuItem_Click);
//
// zXSpectrumToolStripMenuItem // zXSpectrumToolStripMenuItem
// //
this.zXSpectrumToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { this.zXSpectrumToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
@ -3555,6 +3518,50 @@
this.ZXSpectrumExportSnapshotMenuItemMenuItem.Text = "Export Snapshot"; this.ZXSpectrumExportSnapshotMenuItemMenuItem.Text = "Export Snapshot";
this.ZXSpectrumExportSnapshotMenuItemMenuItem.Click += new System.EventHandler(this.ZXSpectrumExportSnapshotMenuItemMenuItem_Click); this.ZXSpectrumExportSnapshotMenuItemMenuItem.Click += new System.EventHandler(this.ZXSpectrumExportSnapshotMenuItemMenuItem_Click);
// //
// HelpSubMenu
//
this.HelpSubMenu.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
this.OnlineHelpMenuItem,
this.ForumsMenuItem,
this.FeaturesMenuItem,
this.AboutMenuItem});
this.HelpSubMenu.Name = "HelpSubMenu";
this.HelpSubMenu.Size = new System.Drawing.Size(44, 19);
this.HelpSubMenu.Text = "&Help";
this.HelpSubMenu.DropDownOpened += new System.EventHandler(this.HelpSubMenu_DropDownOpened);
//
// OnlineHelpMenuItem
//
this.OnlineHelpMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.Help;
this.OnlineHelpMenuItem.Name = "OnlineHelpMenuItem";
this.OnlineHelpMenuItem.Size = new System.Drawing.Size(146, 22);
this.OnlineHelpMenuItem.Text = "&Online Help...";
this.OnlineHelpMenuItem.Click += new System.EventHandler(this.OnlineHelpMenuItem_Click);
//
// ForumsMenuItem
//
this.ForumsMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.TAStudio;
this.ForumsMenuItem.Name = "ForumsMenuItem";
this.ForumsMenuItem.Size = new System.Drawing.Size(146, 22);
this.ForumsMenuItem.Text = "Forums...";
this.ForumsMenuItem.Click += new System.EventHandler(this.ForumsMenuItem_Click);
//
// FeaturesMenuItem
//
this.FeaturesMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.kitchensink;
this.FeaturesMenuItem.Name = "FeaturesMenuItem";
this.FeaturesMenuItem.Size = new System.Drawing.Size(146, 22);
this.FeaturesMenuItem.Text = "&Features";
this.FeaturesMenuItem.Click += new System.EventHandler(this.FeaturesMenuItem_Click);
//
// AboutMenuItem
//
this.AboutMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.CorpHawkSmall;
this.AboutMenuItem.Name = "AboutMenuItem";
this.AboutMenuItem.Size = new System.Drawing.Size(146, 22);
this.AboutMenuItem.Text = "&About";
this.AboutMenuItem.Click += new System.EventHandler(this.AboutMenuItem_Click);
//
// amstradCPCToolStripMenuItem // amstradCPCToolStripMenuItem
// //
this.amstradCPCToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { this.amstradCPCToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
@ -3581,6 +3588,13 @@
this.AmstradCPCAudioSettingsToolStripMenuItem.Text = "Audio Settings"; this.AmstradCPCAudioSettingsToolStripMenuItem.Text = "Audio Settings";
this.AmstradCPCAudioSettingsToolStripMenuItem.Click += new System.EventHandler(this.AmstradCPCAudioSettingsToolStripMenuItem_Click); this.AmstradCPCAudioSettingsToolStripMenuItem.Click += new System.EventHandler(this.AmstradCPCAudioSettingsToolStripMenuItem_Click);
// //
// AmstradCPCNonSyncSettingsToolStripMenuItem
//
this.AmstradCPCNonSyncSettingsToolStripMenuItem.Name = "AmstradCPCNonSyncSettingsToolStripMenuItem";
this.AmstradCPCNonSyncSettingsToolStripMenuItem.Size = new System.Drawing.Size(201, 22);
this.AmstradCPCNonSyncSettingsToolStripMenuItem.Text = "Non-Sync Settings";
this.AmstradCPCNonSyncSettingsToolStripMenuItem.Click += new System.EventHandler(this.AmstradCPCNonSyncSettingsToolStripMenuItem_Click);
//
// AmstradCPCPokeMemoryToolStripMenuItem // AmstradCPCPokeMemoryToolStripMenuItem
// //
this.AmstradCPCPokeMemoryToolStripMenuItem.Name = "AmstradCPCPokeMemoryToolStripMenuItem"; this.AmstradCPCPokeMemoryToolStripMenuItem.Name = "AmstradCPCPokeMemoryToolStripMenuItem";
@ -3603,7 +3617,7 @@
this.AmstradCPCTapesSubMenu.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { this.AmstradCPCTapesSubMenu.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
this.cpct1ToolStripMenuItem}); this.cpct1ToolStripMenuItem});
this.AmstradCPCTapesSubMenu.Name = "AmstradCPCTapesSubMenu"; this.AmstradCPCTapesSubMenu.Name = "AmstradCPCTapesSubMenu";
this.AmstradCPCTapesSubMenu.Size = new System.Drawing.Size(105, 22); this.AmstradCPCTapesSubMenu.Size = new System.Drawing.Size(104, 22);
this.AmstradCPCTapesSubMenu.Text = "Tapes"; this.AmstradCPCTapesSubMenu.Text = "Tapes";
this.AmstradCPCTapesSubMenu.DropDownOpened += new System.EventHandler(this.AmstradCPCTapesSubMenu_DropDownOpened); this.AmstradCPCTapesSubMenu.DropDownOpened += new System.EventHandler(this.AmstradCPCTapesSubMenu_DropDownOpened);
// //
@ -3618,7 +3632,7 @@
this.AmstradCPCDisksSubMenu.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { this.AmstradCPCDisksSubMenu.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
this.cpcd1ToolStripMenuItem}); this.cpcd1ToolStripMenuItem});
this.AmstradCPCDisksSubMenu.Name = "AmstradCPCDisksSubMenu"; this.AmstradCPCDisksSubMenu.Name = "AmstradCPCDisksSubMenu";
this.AmstradCPCDisksSubMenu.Size = new System.Drawing.Size(105, 22); this.AmstradCPCDisksSubMenu.Size = new System.Drawing.Size(104, 22);
this.AmstradCPCDisksSubMenu.Text = "Disks"; this.AmstradCPCDisksSubMenu.Text = "Disks";
this.AmstradCPCDisksSubMenu.DropDownOpened += new System.EventHandler(this.AmstradCPCDisksSubMenu_DropDownOpened); this.AmstradCPCDisksSubMenu.DropDownOpened += new System.EventHandler(this.AmstradCPCDisksSubMenu_DropDownOpened);
// //
@ -4255,13 +4269,6 @@
this.timerMouseIdle.Interval = 2000; this.timerMouseIdle.Interval = 2000;
this.timerMouseIdle.Tick += new System.EventHandler(this.TimerMouseIdle_Tick); this.timerMouseIdle.Tick += new System.EventHandler(this.TimerMouseIdle_Tick);
// //
// AmstradCPCNonSyncSettingsToolStripMenuItem
//
this.AmstradCPCNonSyncSettingsToolStripMenuItem.Name = "AmstradCPCNonSyncSettingsToolStripMenuItem";
this.AmstradCPCNonSyncSettingsToolStripMenuItem.Size = new System.Drawing.Size(201, 22);
this.AmstradCPCNonSyncSettingsToolStripMenuItem.Text = "Non-Sync Settings";
this.AmstradCPCNonSyncSettingsToolStripMenuItem.Click += new System.EventHandler(this.AmstradCPCNonSyncSettingsToolStripMenuItem_Click);
//
// MainForm // MainForm
// //
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None; this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None;
@ -4562,7 +4569,6 @@
private System.Windows.Forms.ToolStripMenuItem MovieSettingsMenuItem; private System.Windows.Forms.ToolStripMenuItem MovieSettingsMenuItem;
private System.Windows.Forms.ToolStripMenuItem CoresSubMenu; private System.Windows.Forms.ToolStripMenuItem CoresSubMenu;
private System.Windows.Forms.ToolStripMenuItem GBInSGBMenuItem; private System.Windows.Forms.ToolStripMenuItem GBInSGBMenuItem;
private System.Windows.Forms.ToolStripMenuItem SubNESHawkMenuItem;
private System.Windows.Forms.ToolStripMenuItem batchRunnerToolStripMenuItem; private System.Windows.Forms.ToolStripMenuItem batchRunnerToolStripMenuItem;
private System.Windows.Forms.ToolStripMenuItem DisplayConfigMenuItem; private System.Windows.Forms.ToolStripMenuItem DisplayConfigMenuItem;
private System.Windows.Forms.ToolStripMenuItem PCEtileViewerToolStripMenuItem; private System.Windows.Forms.ToolStripMenuItem PCEtileViewerToolStripMenuItem;
@ -4753,5 +4759,7 @@
private System.Windows.Forms.ToolStripMenuItem AmstradCPCDisksSubMenu; private System.Windows.Forms.ToolStripMenuItem AmstradCPCDisksSubMenu;
private System.Windows.Forms.ToolStripMenuItem cpcd1ToolStripMenuItem; private System.Windows.Forms.ToolStripMenuItem cpcd1ToolStripMenuItem;
private System.Windows.Forms.ToolStripMenuItem AmstradCPCNonSyncSettingsToolStripMenuItem; private System.Windows.Forms.ToolStripMenuItem AmstradCPCNonSyncSettingsToolStripMenuItem;
private System.Windows.Forms.ToolStripMenuItem SubNesHawkMenuItem;
private System.Windows.Forms.ToolStripSeparator toolStripSeparator38;
} }
} }

27
BizHawk.Client.EmuHawk/MainForm.Events.cs
View File

@ -1217,20 +1217,20 @@ namespace BizHawk.Client.EmuHawk
private void CoresSubMenu_DropDownOpened(object sender, EventArgs e) private void CoresSubMenu_DropDownOpened(object sender, EventArgs e)
{ {
GBInSGBMenuItem.Checked = Global.Config.GB_AsSGB; GBInSGBMenuItem.Checked = Global.Config.GB_AsSGB;
SubNESHawkMenuItem.Checked = Global.Config.UseSubNESHawk;
allowGameDBCoreOverridesToolStripMenuItem.Checked = Global.Config.CoreForcingViaGameDB; allowGameDBCoreOverridesToolStripMenuItem.Checked = Global.Config.CoreForcingViaGameDB;
} }
private void NesCoreSubMenu_DropDownOpened(object sender, EventArgs e) private void NesCoreSubMenu_DropDownOpened(object sender, EventArgs e)
{ {
QuicknesCoreMenuItem.Checked = Global.Config.NES_InQuickNES; QuicknesCoreMenuItem.Checked = Global.Config.NES_InQuickNES;
NesCoreMenuItem.Checked = !Global.Config.NES_InQuickNES; NesCoreMenuItem.Checked = !Global.Config.NES_InQuickNES && !Global.Config.UseSubNESHawk;
SubNesHawkMenuItem.Checked = Global.Config.UseSubNESHawk;
} }
private void NesCorePick_Click(object sender, EventArgs e) private void NesCorePick_Click(object sender, EventArgs e)
{ {
Global.Config.NES_InQuickNES ^= true; Global.Config.NES_InQuickNES ^= true;
Global.Config.UseSubNESHawk = false;
if (Emulator.SystemId == "NES") if (Emulator.SystemId == "NES")
{ {
@ -1238,6 +1238,17 @@ namespace BizHawk.Client.EmuHawk
} }
} }
private void SubNesCorePick_Click(object sender, EventArgs e)
{
Global.Config.UseSubNESHawk = true;
Global.Config.NES_InQuickNES = false;
if (!Emulator.IsNull())
{
FlagNeedsReboot();
}
}
private void CoreSNESSubMenu_DropDownOpened(object sender, EventArgs e) private void CoreSNESSubMenu_DropDownOpened(object sender, EventArgs e)
{ {
Coresnes9xMenuItem.Checked = Global.Config.SNES_InSnes9x; Coresnes9xMenuItem.Checked = Global.Config.SNES_InSnes9x;
@ -1311,16 +1322,6 @@ namespace BizHawk.Client.EmuHawk
} }
} }
private void SubNESHawkMenuItem_Click(object sender, EventArgs e)
{
Global.Config.UseSubNESHawk ^= true;
if (!Emulator.IsNull())
{
FlagNeedsReboot();
}
}
private void AllowGameDBCoreOverridesToolStripMenuItem_Click(object sender, EventArgs e) private void AllowGameDBCoreOverridesToolStripMenuItem_Click(object sender, EventArgs e)
{ {
Global.Config.CoreForcingViaGameDB ^= true; Global.Config.CoreForcingViaGameDB ^= true;