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

cleanup

This commit is contained in:
adelikat 2019-12-29 15:21:23 -06:00
parent 47eeba5053
commit 67419c980a
2 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
BizHawk.Client.EmuHawk/LogWindow.Designer.cs generated
View File

@ -1,6 +1,4 @@
using System.Windows.Forms; namespace BizHawk.Client.EmuHawk
namespace BizHawk.Client.EmuHawk
{ {
partial class LogWindow partial class LogWindow
{ {

10
BizHawk.Client.EmuHawk/LogWindow.cs
View File

@ -8,6 +8,7 @@ using BizHawk.Common;
using BizHawk.Emulation.Common; using BizHawk.Emulation.Common;
using BizHawk.Emulation.Common.IEmulatorExtensions; using BizHawk.Emulation.Common.IEmulatorExtensions;
using BizHawk.Client.Common; using BizHawk.Client.Common;
using BizHawk.Client.EmuHawk.WinFormExtensions;
// todo - perks - pause, copy to clipboard, backlog length limiting // todo - perks - pause, copy to clipboard, backlog length limiting
@ -20,6 +21,9 @@ namespace BizHawk.Client.EmuHawk
private readonly List<string> _lines = new List<string>(); private readonly List<string> _lines = new List<string>();
private LogStream _logStream; private LogStream _logStream;
[RequiredService]
private IEmulator Emulator { get; set; }
public LogWindow() public LogWindow()
{ {
InitializeComponent(); InitializeComponent();
@ -139,7 +143,7 @@ namespace BizHawk.Client.EmuHawk
private void HideShowGameDbButton() private void HideShowGameDbButton()
{ {
AddToGameDbBtn.Visible = Global.Emulator.CanGenerateGameDBEntries() AddToGameDbBtn.Visible = Emulator.CanGenerateGameDBEntries()
&& (Global.Game.Status == RomStatus.Unknown || Global.Game.Status == RomStatus.NotInDatabase); && (Global.Game.Status == RomStatus.Unknown || Global.Game.Status == RomStatus.NotInDatabase);
} }
@ -147,9 +151,9 @@ namespace BizHawk.Client.EmuHawk
{ {
using var picker = new RomStatusPicker(); using var picker = new RomStatusPicker();
var result = picker.ShowDialog(); var result = picker.ShowDialog();
if (result == DialogResult.OK) if (result.IsOk())
{ {
var gameDbEntry = Global.Emulator.AsGameDBEntryGenerator().GenerateGameDbEntry(); var gameDbEntry = Emulator.AsGameDBEntryGenerator().GenerateGameDbEntry();
var userDb = Path.Combine(PathManager.GetExeDirectoryAbsolute(), "gamedb", "gamedb_user.txt"); var userDb = Path.Combine(PathManager.GetExeDirectoryAbsolute(), "gamedb", "gamedb_user.txt");
Global.Game.Status = gameDbEntry.Status = picker.PickedStatus; Global.Game.Status = gameDbEntry.Status = picker.PickedStatus;
Database.SaveDatabaseEntry(userDb, gameDbEntry); Database.SaveDatabaseEntry(userDb, gameDbEntry);