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

fix previous commit, fix dependencies in PathConfig and remove usage of GlobalWin in FirmwaresConfig

This commit is contained in:
adelikat 2020-11-28 11:03:38 -06:00
parent be8825fefc
commit 8550d2bd0d
4 changed files with 18 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/BizHawk.Client.EmuHawk/MainForm.Events.cs
View File

@ -873,13 +873,13 @@ namespace BizHawk.Client.EmuHawk
{
if (e is RomLoader.RomErrorArgs args)
{
using var configForm = new FirmwaresConfig(this, Config, true, args.RomPath);
using var configForm = new FirmwaresConfig(this, Config, Game, true, args.RomPath);
var result = configForm.ShowDialog();
args.Retry = result == DialogResult.Retry;
}
else
{
using var configForm = new FirmwaresConfig(this, Config);
using var configForm = new FirmwaresConfig(this, Config, Game);
configForm.ShowDialog();
}
}
@ -895,7 +895,7 @@ namespace BizHawk.Client.EmuHawk
private void PathsMenuItem_Click(object sender, EventArgs e)
{
using var form = new PathConfig(this, Config, Game.System);
using var form = new PathConfig(this, Config, Game);
form.ShowDialog();
}
@ -1787,7 +1787,7 @@ namespace BizHawk.Client.EmuHawk
{
if (Emulator is GambatteLink gambatte)
{
DGBPrefs.DoDGBPrefsDialog(this, Config, Game, gambatte);
DGBPrefs.DoDGBPrefsDialog(this, Config, Game, MovieSession, gambatte);
}
}

6
src/BizHawk.Client.EmuHawk/config/FirmwaresConfig.cs
View File

@ -30,6 +30,7 @@ namespace BizHawk.Client.EmuHawk
{
private readonly IMainFormForConfig _mainForm;
private readonly Config _config;
private readonly IGameInfo _game;
// friendlier names than the system Ids
// Redundant with SystemLookup? Not so fast. That data drives things. This is one step abstracted. Don't be such a smart guy. Keep this redundant list up to date.
@ -94,10 +95,11 @@ namespace BizHawk.Client.EmuHawk
private string _currSelectorDir;
private readonly ListViewSorter _listViewSorter;
public FirmwaresConfig(IMainFormForConfig mainForm, Config config, bool retryLoadRom = false, string reloadRomPath = null)
public FirmwaresConfig(IMainFormForConfig mainForm, Config config, IGameInfo game, bool retryLoadRom = false, string reloadRomPath = null)
{
_mainForm = mainForm;
_config = config;
_game = game;
InitializeComponent();
tbbGroup.Image
@ -592,7 +594,7 @@ namespace BizHawk.Client.EmuHawk
return;
}
using var pathConfig = new PathConfig(_mainForm, _config, GlobalWin.Game.System);
using var pathConfig = new PathConfig(_mainForm, _config, _game);
pathConfig.ShowDialog(this);
RefreshBasePath();
}

7
src/BizHawk.Client.EmuHawk/config/GB/DGBPrefs.cs
View File

@ -11,10 +11,11 @@ namespace BizHawk.Client.EmuHawk
private readonly IGameInfo _game;
private readonly IMovieSession _movieSession;
private DGBPrefs(Config config, IGameInfo game)
private DGBPrefs(Config config, IGameInfo game, IMovieSession movieSession)
{
_config = config;
_game = game;
_movieSession = movieSession;
InitializeComponent();
Icon = Properties.Resources.DualIcon;
}
@ -36,12 +37,12 @@ namespace BizHawk.Client.EmuHawk
private bool SyncSettingsChanged => gbPrefControl1.SyncSettingsChanged || gbPrefControl2.SyncSettingsChanged;
public static void DoDGBPrefsDialog(IMainFormForConfig mainForm, Config config, IGameInfo game, GambatteLink gambatte)
public static void DoDGBPrefsDialog(IMainFormForConfig mainForm, Config config, IGameInfo game, IMovieSession movieSession, GambatteLink gambatte)
{
var s = gambatte.GetSettings();
var ss = gambatte.GetSyncSettings();
using var dlg = new DGBPrefs(config, game);
using var dlg = new DGBPrefs(config, game, movieSession);
dlg.PutSettings(s, ss);
dlg.gbPrefControl1.ColorGameBoy = gambatte.IsCGBMode(false);

11
src/BizHawk.Client.EmuHawk/config/PathConfig.cs
View File

@ -6,14 +6,15 @@ using System.Windows.Forms;
using BizHawk.Client.Common;
using BizHawk.Common;
using BizHawk.Emulation.Common;
namespace BizHawk.Client.EmuHawk
{
public partial class PathConfig : Form
{
private readonly Config _config;
private readonly IGameInfo _game;
private readonly IMainFormForConfig _mainForm;
private readonly string _currentSystemId;
// All path text boxes should do some kind of error checking
// Config path under base, config will default to %exe%
@ -42,11 +43,11 @@ namespace BizHawk.Client.EmuHawk
"..\\"
};
public PathConfig(IMainFormForConfig mainForm, Config config, string currentSystemId)
public PathConfig(IMainFormForConfig mainForm, Config config, IGameInfo game)
{
_mainForm = mainForm;
_config = config;
_currentSystemId = currentSystemId;
_game = game;
InitializeComponent();
SpecialCommandsBtn.Image = Properties.Resources.Help;
}
@ -62,7 +63,7 @@ namespace BizHawk.Client.EmuHawk
private void SetDefaultFocusedTab()
{
var tab = FindTabByName(_currentSystemId);
var tab = FindTabByName(_game.System);
if (tab != null)
{
PathTabControl.SelectTab(tab);
@ -178,7 +179,7 @@ namespace BizHawk.Client.EmuHawk
return;
}
using var f = new FirmwaresConfig(_mainForm, _config) { TargetSystem = "Global" };
using var f = new FirmwaresConfig(_mainForm, _config, _game) { TargetSystem = "Global" };
f.ShowDialog(this);
};