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

Clarify "Autoload" text (from #971)

This commit is contained in:
YoshiRulz 2020-01-13 01:54:15 +10:00
parent c3a359a58c
commit 7062ba5b6a
No known key found for this signature in database
GPG Key ID: C4DE31C245353FB7
12 changed files with 17 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
BizHawk.Client.EmuHawk/Extensions/ToolExtensions.cs
View File

@ -14,7 +14,7 @@ namespace BizHawk.Client.EmuHawk.ToolExtensions
{
public static class ToolExtensions
{
public static ToolStripItem[] RecentMenu(this RecentFiles recent, Action<string> loadFileCallback, bool autoload = false, bool romLoading = false)
public static ToolStripItem[] RecentMenu(this RecentFiles recent, Action<string> loadFileCallback, string entrySemantic, bool noAutoload = false, bool romLoading = false)
{
var items = new List<ToolStripItem>();
@ -182,9 +182,9 @@ namespace BizHawk.Client.EmuHawk.ToolExtensions
freezeItem.Click += (o, ev) => recent.Frozen ^= true;
items.Add(freezeItem);
if (autoload)
if (!noAutoload)
{
var auto = new ToolStripMenuItem { Text = "&Autoload", Checked = recent.AutoLoad };
var auto = new ToolStripMenuItem { Text = $"&Autoload {entrySemantic}", Checked = recent.AutoLoad };
auto.Click += (o, ev) => recent.ToggleAutoLoad();
items.Add(auto);
}

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

@ -68,8 +68,7 @@ namespace BizHawk.Client.EmuHawk
private void RecentRomMenuItem_DropDownOpened(object sender, EventArgs e)
{
RecentRomSubMenu.DropDownItems.Clear();
RecentRomSubMenu.DropDownItems.AddRange(
Config.RecentRoms.RecentMenu(LoadRomFromRecent, true, true));
RecentRomSubMenu.DropDownItems.AddRange(Config.RecentRoms.RecentMenu(LoadRomFromRecent, "ROM", romLoading: true));
}
private void SaveStateSubMenu_DropDownOpened(object sender, EventArgs e)
@ -259,8 +258,7 @@ namespace BizHawk.Client.EmuHawk
private void RecentMovieSubMenu_DropDownOpened(object sender, EventArgs e)
{
RecentMovieSubMenu.DropDownItems.Clear();
RecentMovieSubMenu.DropDownItems.AddRange(
Config.RecentMovies.RecentMenu(LoadMoviesFromRecent, true));
RecentMovieSubMenu.DropDownItems.AddRange(Config.RecentMovies.RecentMenu(LoadMoviesFromRecent, "Movie"));
}
private void MovieEndSubMenu_DropDownOpened(object sender, EventArgs e)

3
BizHawk.Client.EmuHawk/tools/BasicBot/BasicBot.cs
View File

@ -371,8 +371,7 @@ namespace BizHawk.Client.EmuHawk
private void RecentSubMenu_DropDownOpened(object sender, EventArgs e)
{
RecentSubMenu.DropDownItems.Clear();
RecentSubMenu.DropDownItems.AddRange(
Settings.RecentBotFiles.RecentMenu(LoadFileFromRecent, true));
RecentSubMenu.DropDownItems.AddRange(Settings.RecentBotFiles.RecentMenu(LoadFileFromRecent, "Bot Parameters"));
}
private void NewMenuItem_Click(object sender, EventArgs e)

2
BizHawk.Client.EmuHawk/tools/CDL.cs
View File

@ -279,7 +279,7 @@ namespace BizHawk.Client.EmuHawk
private void RecentSubMenu_DropDownOpened(object sender, EventArgs e)
{
RecentSubMenu.DropDownItems.Clear();
RecentSubMenu.DropDownItems.AddRange(_recent.RecentMenu(LoadFile, true));
RecentSubMenu.DropDownItems.AddRange(_recent.RecentMenu(LoadFile, "Session"));
}
void NewFileLogic()

3
BizHawk.Client.EmuHawk/tools/Cheats/Cheats.cs
View File

@ -380,8 +380,7 @@ namespace BizHawk.Client.EmuHawk
private void RecentSubMenu_DropDownOpened(object sender, EventArgs e)
{
RecentSubMenu.DropDownItems.Clear();
RecentSubMenu.DropDownItems.AddRange(
Config.RecentCheats.RecentMenu(LoadFileFromRecent));
RecentSubMenu.DropDownItems.AddRange(Config.RecentCheats.RecentMenu(LoadFileFromRecent, "Cheats", noAutoload: true));
}
private void NewMenuItem_Click(object sender, EventArgs e)

3
BizHawk.Client.EmuHawk/tools/HexEditor/HexEditor.cs
View File

@ -1336,8 +1336,7 @@ namespace BizHawk.Client.EmuHawk
private void RecentTablesSubMenu_DropDownOpened(object sender, EventArgs e)
{
RecentTablesSubMenu.DropDownItems.Clear();
RecentTablesSubMenu.DropDownItems.AddRange(
RecentTables.RecentMenu(LoadFileFromRecent, true));
RecentTablesSubMenu.DropDownItems.AddRange(RecentTables.RecentMenu(LoadFileFromRecent, "Session"));
}
private void ExitMenuItem_Click(object sender, EventArgs e)

6
BizHawk.Client.EmuHawk/tools/Lua/LuaConsole.cs
View File

@ -680,15 +680,13 @@ namespace BizHawk.Client.EmuHawk
private void RecentSessionsSubMenu_DropDownOpened(object sender, EventArgs e)
{
RecentSessionsSubMenu.DropDownItems.Clear();
RecentSessionsSubMenu.DropDownItems.AddRange(
Config.RecentLuaSession.RecentMenu(LoadSessionFromRecent, true));
RecentSessionsSubMenu.DropDownItems.AddRange(Config.RecentLuaSession.RecentMenu(LoadSessionFromRecent, "Session"));
}
private void RecentScriptsSubMenu_DropDownOpened(object sender, EventArgs e)
{
RecentScriptsSubMenu.DropDownItems.Clear();
RecentScriptsSubMenu.DropDownItems.AddRange(
Config.RecentLua.RecentMenu(LoadLuaFile, true));
RecentScriptsSubMenu.DropDownItems.AddRange(Config.RecentLua.RecentMenu(LoadLuaFile, "Script"));
}
private void NewSessionMenuItem_Click(object sender, EventArgs e)

3
BizHawk.Client.EmuHawk/tools/Macros/MacroInput.cs
View File

@ -264,8 +264,7 @@ namespace BizHawk.Client.EmuHawk
private void RecentToolStripMenuItem_DropDownOpened(object sender, EventArgs e)
{
RecentToolStripMenuItem.DropDownItems.Clear();
RecentToolStripMenuItem.DropDownItems.AddRange(
Config.RecentMacros.RecentMenu(DummyLoadMacro, true));
RecentToolStripMenuItem.DropDownItems.AddRange(Config.RecentMacros.RecentMenu(DummyLoadMacro, "Macro"));
}
private void DummyLoadMacro(string path)

5
BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.MenuItems.cs
View File

@ -29,8 +29,7 @@ namespace BizHawk.Client.EmuHawk
private void RecentSubMenu_DropDownOpened(object sender, EventArgs e)
{
RecentSubMenu.DropDownItems.Clear();
RecentSubMenu.DropDownItems.AddRange(
Settings.RecentTas.RecentMenu(DummyLoadProject, true));
RecentSubMenu.DropDownItems.AddRange(Settings.RecentTas.RecentMenu(DummyLoadProject, "Project"));
}
private void NewTasMenuItem_Click(object sender, EventArgs e)
@ -262,7 +261,7 @@ namespace BizHawk.Client.EmuHawk
private void RecentMacrosMenuItem_DropDownOpened(object sender, EventArgs e)
{
recentMacrosToolStripMenuItem.DropDownItems.Clear();
recentMacrosToolStripMenuItem.DropDownItems.AddRange(Config.RecentMacros.RecentMenu(DummyLoadMacro));
recentMacrosToolStripMenuItem.DropDownItems.AddRange(Config.RecentMacros.RecentMenu(DummyLoadMacro, "Macro", noAutoload: true));
}
private void ToBk2MenuItem_Click(object sender, EventArgs e)

2
BizHawk.Client.EmuHawk/tools/ToolManager.cs
View File

@ -266,7 +266,7 @@ namespace BizHawk.Client.EmuHawk
dest.Add("Save Window &Position");
dest.Add("Stay on &Top");
dest.Add("&Float from Parent");
dest.Add("&Autoload");
dest.Add("&Autoload with EmuHawk");
dest.Add("Restore &Defaults");
RefreshSettings(form, dest, settings, idx);

3
BizHawk.Client.EmuHawk/tools/Watch/RamSearch.cs
View File

@ -1002,8 +1002,7 @@ namespace BizHawk.Client.EmuHawk
private void RecentSubMenu_DropDownOpened(object sender, EventArgs e)
{
RecentSubMenu.DropDownItems.Clear();
RecentSubMenu.DropDownItems.AddRange(
Settings.RecentSearches.RecentMenu(LoadFileFromRecent));
RecentSubMenu.DropDownItems.AddRange(Settings.RecentSearches.RecentMenu(LoadFileFromRecent, "Search", noAutoload: true));
}
private void OpenMenuItem_Click(object sender, EventArgs e)

3
BizHawk.Client.EmuHawk/tools/Watch/RamWatch.cs
View File

@ -688,8 +688,7 @@ namespace BizHawk.Client.EmuHawk
private void RecentSubMenu_DropDownOpened(object sender, EventArgs e)
{
RecentSubMenu.DropDownItems.Clear();
RecentSubMenu.DropDownItems.AddRange(
Config.RecentWatches.RecentMenu(LoadFileFromRecent, true));
RecentSubMenu.DropDownItems.AddRange(Config.RecentWatches.RecentMenu(LoadFileFromRecent, "Watches"));
}
private void ExitMenuItem_Click(object sender, EventArgs e)