From f9e65e2fa77507c93e80e7ae03c7fbfc199f2f25 Mon Sep 17 00:00:00 2001 From: adelikat Date: Mon, 16 Dec 2019 18:51:06 -0600 Subject: [PATCH] FileExtensionPreferences - pass in dependencies --- BizHawk.Client.EmuHawk/MainForm.Events.cs | 7 +++++-- .../config/FileExtensionPreferences.cs | 11 ++++++----- 2 files changed, 11 insertions(+), 7 deletions(-) diff --git a/BizHawk.Client.EmuHawk/MainForm.Events.cs b/BizHawk.Client.EmuHawk/MainForm.Events.cs index cb88731c1c..688b88acca 100644 --- a/BizHawk.Client.EmuHawk/MainForm.Events.cs +++ b/BizHawk.Client.EmuHawk/MainForm.Events.cs @@ -1020,8 +1020,11 @@ namespace BizHawk.Client.EmuHawk private void FileExtensionsMenuItem_Click(object sender, EventArgs e) { - using var form = new FileExtensionPreferences(); - form.ShowDialog(); + using var form = new FileExtensionPreferences(Global.Config); + var result = form.ShowDialog(); + AddOnScreenMessage(result == DialogResult.OK + ? "Rom Extension Preferences changed" + : "Rom Extension Preferences cancelled"); } private void CustomizeMenuItem_Click(object sender, EventArgs e) diff --git a/BizHawk.Client.EmuHawk/config/FileExtensionPreferences.cs b/BizHawk.Client.EmuHawk/config/FileExtensionPreferences.cs index 086811bdcb..b8a15cef9d 100644 --- a/BizHawk.Client.EmuHawk/config/FileExtensionPreferences.cs +++ b/BizHawk.Client.EmuHawk/config/FileExtensionPreferences.cs @@ -9,8 +9,11 @@ namespace BizHawk.Client.EmuHawk { public partial class FileExtensionPreferences : Form { - public FileExtensionPreferences() + private readonly Config _config; + + public FileExtensionPreferences(Config config) { + _config = config; InitializeComponent(); } @@ -18,7 +21,7 @@ namespace BizHawk.Client.EmuHawk { int spacing = UIHelper.ScaleY(30); int count = 0; - foreach (var kvp in Global.Config.PreferredPlatformsForExtensions) + foreach (var kvp in _config.PreferredPlatformsForExtensions) { var picker = new FileExtensionPreferencesPicker { @@ -36,16 +39,14 @@ namespace BizHawk.Client.EmuHawk { foreach (var picker in PrefPanel.Controls.OfType()) { - Global.Config.PreferredPlatformsForExtensions[picker.FileExtension] = picker.CurrentlySelectedSystemId; + _config.PreferredPlatformsForExtensions[picker.FileExtension] = picker.CurrentlySelectedSystemId; } - GlobalWin.OSD.AddMessage("Rom Extension Preferences changed"); Close(); } private void CancelBtn_Click(object sender, EventArgs e) { - GlobalWin.OSD.AddMessage("Rom Extension Preferences cancelled"); Close(); } }