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

path config - pass in config dependency

This commit is contained in:
adelikat 2019-12-16 19:42:42 -06:00
parent d15641da96
commit dc26b67446
3 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -995,7 +995,7 @@ namespace BizHawk.Client.EmuHawk
private void PathsMenuItem_Click(object sender, EventArgs e)
{
using var form = new PathConfig();
using var form = new PathConfig(Global.Config);
form.ShowDialog();
}

2
BizHawk.Client.EmuHawk/config/FirmwaresConfig.cs
View File

@ -558,7 +558,7 @@ namespace BizHawk.Client.EmuHawk
return;
}
using var pathConfig = new PathConfig();
using var pathConfig = new PathConfig(Global.Config);
pathConfig.ShowDialog(this);
RefreshBasePath();
}

17
BizHawk.Client.EmuHawk/config/PathConfig.cs
View File

@ -12,6 +12,8 @@ namespace BizHawk.Client.EmuHawk
{
public partial class PathConfig : Form
{
private readonly Config _config;
// All path text boxes should do some kind of error checking
// Config path under base, config will default to %exe%
private void LockDownCores()
@ -39,16 +41,17 @@ namespace BizHawk.Client.EmuHawk
"..\\",
};
public PathConfig()
public PathConfig(Config config)
{
_config = config;
InitializeComponent();
}
private void LoadSettings()
{
RecentForROMs.Checked = Global.Config.UseRecentForROMs;
RecentForROMs.Checked = _config.UseRecentForROMs;
DoTabs(Global.Config.PathEntries.ToList());
DoTabs(_config.PathEntries.ToList());
SetDefaultFocusedTab();
DoRomToggle();
}
@ -80,7 +83,7 @@ namespace BizHawk.Client.EmuHawk
PathTabControl.TabPages.Clear();
// Separate by system
var systems = Global.Config.PathEntries
var systems = _config.PathEntries
.Select(s => s.SystemDisplayName)
.Distinct()
.ToList();
@ -104,7 +107,7 @@ namespace BizHawk.Client.EmuHawk
foreach (var systemDisplayName in systems)
{
var systemId = Global.Config.PathEntries.First(p => p.SystemDisplayName == systemDisplayName).System;
var systemId = _config.PathEntries.First(p => p.SystemDisplayName == systemDisplayName).System;
var t = new TabPage
{
Text = systemDisplayName,
@ -249,11 +252,11 @@ namespace BizHawk.Client.EmuHawk
private void SaveSettings()
{
Global.Config.UseRecentForROMs = RecentForROMs.Checked;
_config.UseRecentForROMs = RecentForROMs.Checked;
foreach (var t in AllPathBoxes)
{
var pathEntry = Global.Config.PathEntries.First(p => p.System == t.Parent.Name && p.Type == t.Name);
var pathEntry = _config.PathEntries.First(p => p.System == t.Parent.Name && p.Type == t.Name);
pathEntry.Path = t.Text;
}
}