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

move CDL config variables out of Config.cs and use ConfigPersist

This commit is contained in:
adelikat 2020-01-21 09:02:37 -06:00
parent 3d833af617
commit 2182b6b35d
2 changed files with 20 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,6 +1,5 @@
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Drawing;
using BizHawk.Common; using BizHawk.Common;
using BizHawk.Emulation.Common; using BizHawk.Emulation.Common;
@ -105,7 +104,6 @@ namespace BizHawk.Client.Common
public string Update_LatestVersion = ""; public string Update_LatestVersion = "";
public string Update_IgnoreVersion = ""; public string Update_IgnoreVersion = "";
public bool SkipOutdatedOSCheck = false; public bool SkipOutdatedOSCheck = false;
public bool CDLAutoSave = true, CDLAutoStart = true, CDLAutoResume = true;
/// <summary> /// <summary>
/// Makes a .bak file before any saveram-writing operation (could be extended to make timestamped backups) /// Makes a .bak file before any saveram-writing operation (could be extended to make timestamped backups)

31
BizHawk.Client.EmuHawk/tools/CDL.cs
View File

@ -28,6 +28,15 @@ namespace BizHawk.Client.EmuHawk
set => _recentFld = value; set => _recentFld = value;
} }
[ConfigPersist]
private bool CDLAutoSave { get; set; } = true;
[ConfigPersist]
private bool CDLAutoStart { get; set; } = true;
[ConfigPersist]
private bool CDLAutoResume { get; set; } = true;
void SetCurrentFilename(string fname) void SetCurrentFilename(string fname)
{ {
_currentFilename = fname; _currentFilename = fname;
@ -192,7 +201,7 @@ namespace BizHawk.Client.EmuHawk
return true; return true;
// try auto-saving if appropriate // try auto-saving if appropriate
if (Config.CDLAutoSave) if (CDLAutoSave)
{ {
if (_currentFilename != null) if (_currentFilename != null)
{ {
@ -250,7 +259,7 @@ namespace BizHawk.Client.EmuHawk
//ok, it's all good: //ok, it's all good:
_cdl = newCDL; _cdl = newCDL;
CodeDataLogger.SetCDL(null); CodeDataLogger.SetCDL(null);
if (tsbLoggingActive.Checked || Config.CDLAutoStart) if (tsbLoggingActive.Checked || CDLAutoStart)
{ {
tsbLoggingActive.Checked = true; tsbLoggingActive.Checked = true;
CodeDataLogger.SetCDL(_cdl); CodeDataLogger.SetCDL(_cdl);
@ -271,9 +280,9 @@ namespace BizHawk.Client.EmuHawk
DisassembleMenuItem.Enabled = DisassembleMenuItem.Enabled =
_cdl != null; _cdl != null;
miAutoSave.Checked = Config.CDLAutoSave; miAutoSave.Checked = CDLAutoSave;
miAutoStart.Checked = Config.CDLAutoStart; miAutoStart.Checked = CDLAutoStart;
miAutoResume.Checked = Config.CDLAutoResume; miAutoResume.Checked = CDLAutoResume;
} }
private void RecentSubMenu_DropDownOpened(object sender, EventArgs e) private void RecentSubMenu_DropDownOpened(object sender, EventArgs e)
@ -287,7 +296,7 @@ namespace BizHawk.Client.EmuHawk
_cdl = new CodeDataLog(); _cdl = new CodeDataLog();
CodeDataLogger.NewCDL(_cdl); CodeDataLogger.NewCDL(_cdl);
if (tsbLoggingActive.Checked || Config.CDLAutoStart) if (tsbLoggingActive.Checked || CDLAutoStart)
CodeDataLogger.SetCDL(_cdl); CodeDataLogger.SetCDL(_cdl);
else CodeDataLogger.SetCDL(null); else CodeDataLogger.SetCDL(null);
@ -464,7 +473,7 @@ namespace BizHawk.Client.EmuHawk
protected override void OnShown(EventArgs e) protected override void OnShown(EventArgs e)
{ {
if (Config.CDLAutoStart) if (CDLAutoStart)
{ {
if (_cdl == null) if (_cdl == null)
NewFileLogic(); NewFileLogic();
@ -479,7 +488,7 @@ namespace BizHawk.Client.EmuHawk
private void CDL_Load(object sender, EventArgs e) private void CDL_Load(object sender, EventArgs e)
{ {
if (Config.CDLAutoResume) if (CDLAutoResume)
{ {
try try
{ {
@ -571,17 +580,17 @@ namespace BizHawk.Client.EmuHawk
private void miAutoSave_Click(object sender, EventArgs e) private void miAutoSave_Click(object sender, EventArgs e)
{ {
Config.CDLAutoSave ^= true; CDLAutoSave ^= true;
} }
private void miAutoStart_Click(object sender, EventArgs e) private void miAutoStart_Click(object sender, EventArgs e)
{ {
Config.CDLAutoStart ^= true; CDLAutoStart ^= true;
} }
private void miAutoResume_Click(object sender, EventArgs e) private void miAutoResume_Click(object sender, EventArgs e)
{ {
Config.CDLAutoResume ^= true; CDLAutoResume ^= true;
} }
} }
} }