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

NES Game Genie - convert to IToolFormAutoConfig, also fix a bug that would have made it never show up as available

This commit is contained in:
adelikat 2015-01-01 18:51:24 +00:00
parent 1854544f01
commit 93fe387311
4 changed files with 5 additions and 151 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
BizHawk.Client.Common/config/Config.cs
View File

@ -341,10 +341,6 @@ namespace BizHawk.Client.Common
// TAStudio
public TasStateManagerSettings DefaultTasProjSettings = new TasStateManagerSettings();
// NES Game Genie Encoder/Decoder
public ToolDialogSettings NesGGSettings = new ToolDialogSettings();
public bool NESGGAutoload = false;
// GB/GG Game Genie Encoder/Decoder
public ToolDialogSettings GbGGSettings = new ToolDialogSettings();
public bool GBGGAutoload = false;

5
BizHawk.Client.EmuHawk/MainForm.cs
View File

@ -367,11 +367,6 @@ namespace BizHawk.Client.EmuHawk
GlobalWin.Tools.Load<Cheats>();
}
if (Global.Config.NESGGAutoload)
{
GlobalWin.Tools.LoadGameGenieEc();
}
if (Global.Config.DisplayStatusBar == false)
{
MainStatusBar.Visible = false;

76
BizHawk.Client.EmuHawk/tools/NES/NESGameGenie.Designer.cs generated
View File

@ -61,17 +61,9 @@
this.Encoding = new System.Windows.Forms.CheckBox();
this.ClearButton = new System.Windows.Forms.Button();
this.MenuStrip = new MenuStripEx();
this.OptionsSubMenu = new System.Windows.Forms.ToolStripMenuItem();
this.AutoloadMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.SaveWindowPositionMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.AlwaysOnTopMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.FloatingWindowMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.toolStripSeparator1 = new System.Windows.Forms.ToolStripSeparator();
this.ExitMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.GameGenieCodeBox.SuspendLayout();
this.ButtonPanel.SuspendLayout();
this.groupBox1.SuspendLayout();
this.MenuStrip.SuspendLayout();
this.SuspendLayout();
//
// GameGenieCode
@ -431,69 +423,12 @@
// MenuStrip
//
this.MenuStrip.ClickThrough = true;
this.MenuStrip.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
this.OptionsSubMenu});
this.MenuStrip.Location = new System.Drawing.Point(0, 0);
this.MenuStrip.Name = "MenuStrip";
this.MenuStrip.Size = new System.Drawing.Size(292, 24);
this.MenuStrip.TabIndex = 8;
this.MenuStrip.Text = "menuStrip1";
//
// OptionsSubMenu
//
this.OptionsSubMenu.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
this.AutoloadMenuItem,
this.SaveWindowPositionMenuItem,
this.AlwaysOnTopMenuItem,
this.FloatingWindowMenuItem,
this.toolStripSeparator1,
this.ExitMenuItem});
this.OptionsSubMenu.Name = "OptionsSubMenu";
this.OptionsSubMenu.Size = new System.Drawing.Size(61, 20);
this.OptionsSubMenu.Text = "&Options";
this.OptionsSubMenu.DropDownOpened += new System.EventHandler(this.OptionsSubMenu_DropDownOpened);
//
// AutoloadMenuItem
//
this.AutoloadMenuItem.Name = "AutoloadMenuItem";
this.AutoloadMenuItem.Size = new System.Drawing.Size(191, 22);
this.AutoloadMenuItem.Text = "Autoload";
this.AutoloadMenuItem.Click += new System.EventHandler(this.AutoloadMenuItem_Click);
//
// SaveWindowPositionMenuItem
//
this.SaveWindowPositionMenuItem.Name = "SaveWindowPositionMenuItem";
this.SaveWindowPositionMenuItem.Size = new System.Drawing.Size(191, 22);
this.SaveWindowPositionMenuItem.Text = "Save Window Position";
this.SaveWindowPositionMenuItem.Click += new System.EventHandler(this.SaveWindowPositionMenuItem_Click);
//
// AlwaysOnTopMenuItem
//
this.AlwaysOnTopMenuItem.Name = "AlwaysOnTopMenuItem";
this.AlwaysOnTopMenuItem.Size = new System.Drawing.Size(191, 22);
this.AlwaysOnTopMenuItem.Text = "Always On Top";
this.AlwaysOnTopMenuItem.Click += new System.EventHandler(this.AlwaysOnTopMenuItem_Click);
//
// floatingWindowToolStripMenuItem
//
this.FloatingWindowMenuItem.Name = "floatingWindowToolStripMenuItem";
this.FloatingWindowMenuItem.Size = new System.Drawing.Size(191, 22);
this.FloatingWindowMenuItem.Text = "Floating Window";
this.FloatingWindowMenuItem.Click += new System.EventHandler(this.FloatingWindowMenuItem_Click);
//
// toolStripSeparator1
//
this.toolStripSeparator1.Name = "toolStripSeparator1";
this.toolStripSeparator1.Size = new System.Drawing.Size(188, 6);
//
// ExitMenuItem
//
this.ExitMenuItem.Name = "ExitMenuItem";
this.ExitMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Alt | System.Windows.Forms.Keys.F4)));
this.ExitMenuItem.Size = new System.Drawing.Size(191, 22);
this.ExitMenuItem.Text = "E&xit";
this.ExitMenuItem.Click += new System.EventHandler(this.ExitMenuItem_Click);
//
// NESGameGenie
//
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
@ -521,8 +456,6 @@
this.ButtonPanel.ResumeLayout(false);
this.groupBox1.ResumeLayout(false);
this.groupBox1.PerformLayout();
this.MenuStrip.ResumeLayout(false);
this.MenuStrip.PerformLayout();
this.ResumeLayout(false);
this.PerformLayout();
@ -562,13 +495,6 @@
private System.Windows.Forms.Label label5;
private System.Windows.Forms.Label label4;
private System.Windows.Forms.Button ClearButton;
private MenuStripEx MenuStrip;
private System.Windows.Forms.ToolStripMenuItem OptionsSubMenu;
private System.Windows.Forms.ToolStripMenuItem AutoloadMenuItem;
private System.Windows.Forms.ToolStripMenuItem SaveWindowPositionMenuItem;
private System.Windows.Forms.ToolStripSeparator toolStripSeparator1;
private System.Windows.Forms.ToolStripMenuItem ExitMenuItem;
private System.Windows.Forms.ToolStripMenuItem AlwaysOnTopMenuItem;
private System.Windows.Forms.ToolStripMenuItem FloatingWindowMenuItem;
private MenuStripEx MenuStrip;
}
}

71
BizHawk.Client.EmuHawk/tools/NES/NESGameGenie.cs
View File

@ -9,12 +9,14 @@ using BizHawk.Client.Common;
namespace BizHawk.Client.EmuHawk
{
public partial class NESGameGenie : Form, IToolForm
public partial class NESGameGenie : Form, IToolFormAutoConfig
{
[RequiredService]
private IEmulator Emulator { get; set; }
[RequiredService]
private MemoryDomainList MemoryDomains { get; set; }
private IMemoryDomains MemoryDomainService { get; set; }
private MemoryDomainList MemoryDomains { get { return MemoryDomainService.MemoryDomains; } }
private readonly Dictionary<char, int> _gameGenieTable = new Dictionary<char, int>
{
@ -70,12 +72,6 @@ namespace BizHawk.Client.EmuHawk
public NESGameGenie()
{
InitializeComponent();
Closing += (o, e) =>
{
Global.Config.NesGGSettings.Wndx = Location.X;
Global.Config.NesGGSettings.Wndy = Location.Y;
};
TopMost = Global.Config.NesGGSettings.TopMost;
AddressBox.SetHexProperties(0x10000);
ValueBox.SetHexProperties(0x100);
CompareBox.SetHexProperties(0x100);
@ -84,11 +80,6 @@ namespace BizHawk.Client.EmuHawk
private void NESGameGenie_Load(object sender, EventArgs e)
{
AddCheat.Enabled = false;
if (Global.Config.NesGGSettings.UseWindowPosition)
{
Location = Global.Config.NesGGSettings.WindowPosition;
}
}
public void DecodeGameGenieCode(string code)
@ -157,54 +148,8 @@ namespace BizHawk.Client.EmuHawk
GameGenieCode.Text = new NESGameGenieEncoder(_address.Value, _value.Value, _compare).Encode();
}
private void RefreshFloatingWindowControl()
{
Owner = Global.Config.NesGGSettings.FloatingWindow ? null : GlobalWin.MainForm;
}
#region Events
#region File Menu
private void OptionsSubMenu_DropDownOpened(object sender, EventArgs e)
{
AutoloadMenuItem.Checked = Global.Config.NESGGAutoload;
SaveWindowPositionMenuItem.Checked = Global.Config.NesGGSettings.SaveWindowPosition;
AlwaysOnTopMenuItem.Checked = Global.Config.NesGGSettings.TopMost;
FloatingWindowMenuItem.Checked = Global.Config.NesGGSettings.FloatingWindow;
}
private void AutoloadMenuItem_Click(object sender, EventArgs e)
{
Global.Config.NESGGAutoload ^= true;
}
private void SaveWindowPositionMenuItem_Click(object sender, EventArgs e)
{
Global.Config.NesGGSettings.SaveWindowPosition ^= true;
}
private void ExitMenuItem_Click(object sender, EventArgs e)
{
Close();
}
private void AlwaysOnTopMenuItem_Click(object sender, EventArgs e)
{
Global.Config.NesGGSettings.TopMost ^= true;
TopMost = Global.Config.NesGGSettings.TopMost;
}
private void FloatingWindowMenuItem_Click(object sender, EventArgs e)
{
Global.Config.NesGGSettings.FloatingWindow ^= true;
RefreshFloatingWindowControl();
}
#endregion
#region Control Events
private void GameGenieCode_KeyPress(object sender, KeyPressEventArgs e)
{
if (!_gameGenieTable.ContainsKey(char.ToUpper(e.KeyChar)))
@ -366,14 +311,6 @@ namespace BizHawk.Client.EmuHawk
TryEnableAddCheat();
}
protected override void OnShown(EventArgs e)
{
RefreshFloatingWindowControl();
base.OnShown(e);
}
#endregion
#endregion
}
}