NES Menu - cleanup some logic, and restrict Nametable viewer and PPU Viewer to NesHawk only

This commit is contained in:
adelikat 2014-01-06 23:56:30 +00:00
parent 45e5f4b286
commit 78e672efb3
7 changed files with 326 additions and 323 deletions

File diff suppressed because it is too large Load Diff

View File

@ -1171,6 +1171,13 @@ namespace BizHawk.Client.EmuHawk
private void NESSubMenu_DropDownOpened(object sender, EventArgs e)
{
FDSControlsMenuItem.Enabled = Global.Emulator.BoardName == "FDS";
NESDebuggerMenuItem.Visible = VersionInfo.INTERIM;
NESDebuggerMenuItem.Enabled =
NESPPUViewerMenuItem.Enabled =
NESNametableViewerMenuItem.Enabled =
Global.Emulator is NES;
}
private void FdsControlsMenuItem_DropDownOpened(object sender, EventArgs e)
@ -1232,10 +1239,9 @@ namespace BizHawk.Client.EmuHawk
}
}
private void moiveSettingsToolStripMenuItem_Click(object sender, EventArgs e)
private void MovieSettingsMenuItem_Click(object sender, EventArgs e)
{
using (var dlg = new config.NES.NESSyncSettingsForm())
using (var dlg = new NESSyncSettingsForm())
{
dlg.ShowDialog(this);
}

View File

@ -361,11 +361,6 @@ namespace BizHawk.Client.EmuHawk
PauseEmulator();
}
if (!VersionInfo.INTERIM)
{
NESDebuggerMenuItem.Enabled = false;
}
// start dumping, if appropriate
if (cmdDumpType != null && cmdDumpName != null)
{

View File

@ -4,7 +4,7 @@ using System.Linq;
using System.Text;
using System.Data;
namespace BizHawk.Client.EmuHawk.config.NES
namespace BizHawk.Client.EmuHawk
{
public class DataTableDictionaryBind<TKey, TValue>
{

View File

@ -1,4 +1,4 @@
namespace BizHawk.Client.EmuHawk.config.NES
namespace BizHawk.Client.EmuHawk
{
partial class NESSyncSettingsForm
{

View File

@ -8,7 +8,7 @@ using System.Text;
using System.Windows.Forms;
using BizHawk.Client.Common;
namespace BizHawk.Client.EmuHawk.config.NES
namespace BizHawk.Client.EmuHawk
{
public partial class NESSyncSettingsForm : Form
{
@ -33,7 +33,9 @@ namespace BizHawk.Client.EmuHawk.config.NES
{
DialogResult = DialogResult.OK;
if (DTDB.WasModified)
{
GlobalWin.MainForm.PutCoreSyncSettings(SyncSettings);
}
}
private void buttonHelp_Click(object sender, EventArgs e)

View File

@ -2,7 +2,7 @@ static class VersionInfo
{
public const string MAINVERSION = "1.5.2";
public const string RELEASEDATE = "August 22, 2013";
public static bool INTERIM = true;
public static bool INTERIM = false;
public static string GetEmuVersion()
{