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

cleanup PlatformChooser and don't use globals

This commit is contained in:
adelikat 2019-12-21 12:45:28 -06:00
parent 8ec8400ab2
commit bab3dbca98
2 changed files with 18 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -3604,7 +3604,7 @@ namespace BizHawk.Client.EmuHawk
private string ChoosePlatformForRom(RomGame rom) private string ChoosePlatformForRom(RomGame rom)
{ {
using var platformChooser = new PlatformChooser using var platformChooser = new PlatformChooser(Config)
{ {
RomGame = rom RomGame = rom
}; };

46
BizHawk.Client.EmuHawk/PlatformChooser.cs
View File

@ -1,10 +1,7 @@
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.ComponentModel;
using System.Data;
using System.Drawing; using System.Drawing;
using System.Linq; using System.Linq;
using System.Text;
using System.Windows.Forms; using System.Windows.Forms;
using BizHawk.Emulation.Common; using BizHawk.Emulation.Common;
@ -14,41 +11,32 @@ namespace BizHawk.Client.EmuHawk
{ {
public partial class PlatformChooser : Form public partial class PlatformChooser : Form
{ {
private readonly Config _config;
private readonly List<SystemLookup.SystemInfo> _availableSystems = new SystemLookup().AllSystems.ToList();
public PlatformChooser(Config config)
{
_config = config;
InitializeComponent();
}
public RomGame RomGame { get; set; } public RomGame RomGame { get; set; }
public string PlatformChoice { get; set; } public string PlatformChoice { get; set; }
private RadioButton SelectedRadio private RadioButton SelectedRadio => PlatformsGroupBox.Controls.OfType<RadioButton>().FirstOrDefault(x => x.Checked);
{
get
{
return PlatformsGroupBox.Controls.OfType<RadioButton>().FirstOrDefault(x => x.Checked);
}
}
public PlatformChooser()
{
InitializeComponent();
AvailableSystems = new SystemLookup().AllSystems.ToList();
}
private readonly List<SystemLookup.SystemInfo> AvailableSystems;
private void PlatformChooser_Load(object sender, EventArgs e) private void PlatformChooser_Load(object sender, EventArgs e)
{ {
if (RomGame.RomData.Length > 10 * 1024 * 1024) // If 10mb, show in megabytes RomSizeLabel.Text = RomGame.RomData.Length > 10 * 1024 * 1024
{ ? $"{RomGame.RomData.Length / 1024 / 1024:n0}mb"
RomSizeLabel.Text = $"{RomGame.RomData.Length / 1024 / 1024:n0}mb"; : $"{RomGame.RomData.Length / 1024:n0}kb";
}
else
{
RomSizeLabel.Text = $"{RomGame.RomData.Length / 1024:n0}kb";
}
ExtensionLabel.Text = RomGame.Extension.ToLower(); ExtensionLabel.Text = RomGame.Extension.ToLower();
HashBox.Text = RomGame.GameInfo.Hash; HashBox.Text = RomGame.GameInfo.Hash;
int count = 0; int count = 0;
int spacing = 25; int spacing = 25;
foreach (var platform in AvailableSystems) foreach (var platform in _availableSystems)
{ {
var radio = new RadioButton var radio = new RadioButton
{ {
@ -75,11 +63,11 @@ namespace BizHawk.Client.EmuHawk
private void OkBtn_Click(object sender, EventArgs e) private void OkBtn_Click(object sender, EventArgs e)
{ {
var selectedValue = SelectedRadio != null ? SelectedRadio.Text : ""; var selectedValue = SelectedRadio != null ? SelectedRadio.Text : "";
PlatformChoice = AvailableSystems.FirstOrDefault(x => x.FullName == selectedValue).SystemId; PlatformChoice = _availableSystems.First(x => x.FullName == selectedValue).SystemId;
if (AlwaysCheckbox.Checked) if (AlwaysCheckbox.Checked)
{ {
Global.Config.PreferredPlatformsForExtensions[RomGame.Extension.ToLower()] = PlatformChoice; _config.PreferredPlatformsForExtensions[RomGame.Extension.ToLower()] = PlatformChoice;
} }
Close(); Close();