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

use AddOnScreenMessage method in other mainform files

This commit is contained in:
adelikat 2019-12-17 14:55:26 -06:00
parent f8fbc57780
commit 7ba8af1cb9
3 changed files with 26 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1313,7 +1313,7 @@ namespace BizHawk.Client.EmuHawk
private void SaveConfigMenuItem_Click(object sender, EventArgs e)
{
SaveConfig();
GlobalWin.OSD.AddMessage("Saved settings");
AddOnScreenMessage("Saved settings");
}
private void SaveConfigAsMenuItem_Click(object sender, EventArgs e)
@ -1329,7 +1329,7 @@ namespace BizHawk.Client.EmuHawk
if (sfd.ShowHawkDialog().IsOk())
{
SaveConfig(sfd.FileName);
GlobalWin.OSD.AddMessage("Copied settings");
AddOnScreenMessage("Copied settings");
}
}
@ -1338,7 +1338,7 @@ namespace BizHawk.Client.EmuHawk
Global.Config = ConfigService.Load<Config>(PathManager.DefaultIniPath);
Global.Config.ResolveDefaults();
InitControls(); // rebind hotkeys
GlobalWin.OSD.AddMessage($"Config file loaded: {PathManager.DefaultIniPath}");
AddOnScreenMessage($"Config file loaded: {PathManager.DefaultIniPath}");
}
private void LoadConfigFromMenuItem_Click(object sender, EventArgs e)
@ -1356,7 +1356,7 @@ namespace BizHawk.Client.EmuHawk
Global.Config = ConfigService.Load<Config>(ofd.FileName);
Global.Config.ResolveDefaults();
InitControls(); // rebind hotkeys
GlobalWin.OSD.AddMessage($"Config file loaded: {ofd.FileName}");
AddOnScreenMessage($"Config file loaded: {ofd.FileName}");
}
}
@ -1636,7 +1636,7 @@ namespace BizHawk.Client.EmuHawk
if (!Global.MovieSession.Movie.IsPlaying || Global.MovieSession.Movie.IsFinished)
{
Global.ClickyVirtualPadController.Click("FDS Eject");
GlobalWin.OSD.AddMessage("FDS disk ejected.");
AddOnScreenMessage("FDS disk ejected.");
}
}
@ -1648,7 +1648,7 @@ namespace BizHawk.Client.EmuHawk
if (!Global.MovieSession.Movie.IsPlaying || Global.MovieSession.Movie.IsFinished)
{
Global.ClickyVirtualPadController.Click("Insert Coin P1");
GlobalWin.OSD.AddMessage("P1 Coin Inserted");
AddOnScreenMessage("P1 Coin Inserted");
}
}
}
@ -1661,7 +1661,7 @@ namespace BizHawk.Client.EmuHawk
if (!Global.MovieSession.Movie.IsPlaying || Global.MovieSession.Movie.IsFinished)
{
Global.ClickyVirtualPadController.Click("Insert Coin P2");
GlobalWin.OSD.AddMessage("P2 Coin Inserted");
AddOnScreenMessage("P2 Coin Inserted");
}
}
}
@ -1674,7 +1674,7 @@ namespace BizHawk.Client.EmuHawk
if (!Global.MovieSession.Movie.IsPlaying || Global.MovieSession.Movie.IsFinished)
{
Global.ClickyVirtualPadController.Click("Service Switch");
GlobalWin.OSD.AddMessage("Service Switch Pressed");
AddOnScreenMessage("Service Switch Pressed");
}
}
}
@ -2333,7 +2333,7 @@ namespace BizHawk.Client.EmuHawk
{
if (Emulator.IsNull())
{
GlobalWin.OSD.AddMessage("Plugin settings saved");
AddOnScreenMessage("Plugin settings saved");
}
else
{
@ -2342,7 +2342,7 @@ namespace BizHawk.Client.EmuHawk
}
else
{
GlobalWin.OSD.AddMessage("Plugin settings aborted");
AddOnScreenMessage("Plugin settings aborted");
}
}
@ -3079,7 +3079,7 @@ namespace BizHawk.Client.EmuHawk
private void BackupMovieContextMenuItem_Click(object sender, EventArgs e)
{
Global.MovieSession.Movie.SaveBackup();
GlobalWin.OSD.AddMessage("Backup movie saved.");
AddOnScreenMessage("Backup movie saved.");
}
private void ViewSubtitlesContextMenuItem_Click(object sender, EventArgs e)
@ -3141,8 +3141,7 @@ namespace BizHawk.Client.EmuHawk
private void UndoSavestateContextMenuItem_Click(object sender, EventArgs e)
{
_stateSlots.SwapBackupSavestate($"{PathManager.SaveStatePrefix(Global.Game)}.QuickSave{Global.Config.SaveSlot}.State");
GlobalWin.OSD.AddMessage($"Save slot {Global.Config.SaveSlot} restored.");
AddOnScreenMessage($"Save slot {Global.Config.SaveSlot} restored.");
}
private void ClearSramContextMenuItem_Click(object sender, EventArgs e)

21
BizHawk.Client.EmuHawk/MainForm.Hotkey.cs
View File

@ -126,7 +126,7 @@ namespace BizHawk.Client.EmuHawk
break;
case "Toggle Skip Lag Frame":
Global.Config.SkipLagFrame ^= true;
GlobalWin.OSD.AddMessage($"Skip Lag Frames toggled {(Global.Config.SkipLagFrame ? "On" : "Off")}");
AddOnScreenMessage($"Skip Lag Frames toggled {(Global.Config.SkipLagFrame ? "On" : "Off")}");
break;
case "Toggle Key Priority":
ToggleKeyPriority();
@ -351,7 +351,8 @@ namespace BizHawk.Client.EmuHawk
{
x.Toggle();
}
GlobalWin.OSD.AddMessage($"Cheats toggled{type}");
AddOnScreenMessage($"Cheats toggled{type}");
}
break;
@ -705,22 +706,22 @@ namespace BizHawk.Client.EmuHawk
// GB
case "GB Toggle BG":
if (Emulator is Gameboy)
if (Emulator is Gameboy gb)
{
var s = ((Gameboy)Emulator).GetSettings();
var s = gb.GetSettings();
s.DisplayBG ^= true;
((Gameboy)Emulator).PutSettings(s);
GlobalWin.OSD.AddMessage($"BG toggled {(s.DisplayBG ? "on" : "off")}");
gb.PutSettings(s);
AddOnScreenMessage($"BG toggled {(s.DisplayBG ? "on" : "off")}");
}
break;
case "GB Toggle Obj":
if (Emulator is Gameboy)
if (Emulator is Gameboy gb2)
{
var s = ((Gameboy)Emulator).GetSettings();
var s = gb2.GetSettings();
s.DisplayOBJ ^= true;
((Gameboy)Emulator).PutSettings(s);
GlobalWin.OSD.AddMessage($"OBJ toggled {(s.DisplayBG ? "on" : "off")}");
gb2.PutSettings(s);
AddOnScreenMessage($"OBJ toggled {(s.DisplayBG ? "on" : "off")}");
}
break;

11
BizHawk.Client.EmuHawk/MainForm.Movie.cs
View File

@ -90,15 +90,10 @@ namespace BizHawk.Client.EmuHawk
if (Global.MovieSession.Movie.Hash != Global.Game.Hash)
{
GlobalWin.OSD.AddMessage("Warning: Movie hash does not match the ROM");
AddOnScreenMessage("Warning: Movie hash does not match the ROM");
}
if (Emulator is NullEmulator)
{
return false;
}
return true;
return !(Emulator is NullEmulator);
}
public void SetMainformMovieInfo()
@ -137,7 +132,7 @@ namespace BizHawk.Client.EmuHawk
if (Global.MovieSession.Movie.IsActive)
{
StartNewMovie(Global.MovieSession.Movie, false);
GlobalWin.OSD.AddMessage("Replaying movie file in read-only mode");
AddOnScreenMessage("Replaying movie file in read-only mode");
}
}
}