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

added help key to HelpDialog

This commit is contained in:
thrust26 2021-04-20 08:35:02 +02:00
parent 0e139a47b9
commit 2f6a536e72
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/emucore/EventHandler.cxx
View File

@ -3306,8 +3306,8 @@ EventHandler::MenuActionList EventHandler::ourMenuActionList = { {
{ Event::UIPrevDir, "Parent directory", "" }, { Event::UIPrevDir, "Parent directory", "" },
{ Event::ToggleFullScreen, "Toggle fullscreen", "" }, { Event::ToggleFullScreen, "Toggle fullscreen", "" },
{ Event::Quit, "Quit", "" }, { Event::UIHelp, "Help", "" },
{ Event::UIHelp, "Help", "" } { Event::Quit, "Quit", "" }
} }; } };
// Event groups // Event groups

7
src/gui/HelpDialog.cxx
View File

@ -98,6 +98,8 @@ void HelpDialog::updateStrings(uInt8 page, uInt8 lines, string& title)
auto ADD_EVENT = [&](const Event::Type e, const string & d) auto ADD_EVENT = [&](const Event::Type e, const string & d)
{ {
string desc = instance().eventHandler().getMappingDesc(e, EventMode::kEmulationMode); string desc = instance().eventHandler().getMappingDesc(e, EventMode::kEmulationMode);
if(!desc.length())
desc = instance().eventHandler().getMappingDesc(e, EventMode::kMenuMode);
ADD_BIND(desc.length() ? desc : "None", d); ADD_BIND(desc.length() ? desc : "None", d);
}; };
auto ADD_TEXT = [&](const string& d) { ADD_BIND("", d); }; auto ADD_TEXT = [&](const string& d) { ADD_BIND("", d); };
@ -107,6 +109,8 @@ void HelpDialog::updateStrings(uInt8 page, uInt8 lines, string& title)
{ {
case 1: case 1:
title = "Common commands"; title = "Common commands";
ADD_EVENT(Event::UIHelp, "Open context-sensitive help");
ADD_LINE();
ADD_EVENT(Event::Quit, "Quit emulation"); ADD_EVENT(Event::Quit, "Quit emulation");
ADD_EVENT(Event::ExitMode, "Exit current mode/menu"); ADD_EVENT(Event::ExitMode, "Exit current mode/menu");
ADD_EVENT(Event::OptionsMenuMode, "Enter Options menu"); ADD_EVENT(Event::OptionsMenuMode, "Enter Options menu");
@ -115,8 +119,6 @@ void HelpDialog::updateStrings(uInt8 page, uInt8 lines, string& title)
ADD_EVENT(Event::VidmodeDecrease, "Decrease window size"); ADD_EVENT(Event::VidmodeDecrease, "Decrease window size");
ADD_EVENT(Event::ToggleFullScreen, "Toggle fullscreen /"); ADD_EVENT(Event::ToggleFullScreen, "Toggle fullscreen /");
ADD_BIND("", " windowed mode"); ADD_BIND("", " windowed mode");
ADD_EVENT(Event::OverscanIncrease, "Increase overscan in FS mode");
ADD_EVENT(Event::OverscanDecrease, "Decrease overscan in FS mode");
break; break;
case 2: case 2:
@ -163,7 +165,6 @@ void HelpDialog::updateStrings(uInt8 page, uInt8 lines, string& title)
case 5: case 5:
title = "All other commands"; title = "All other commands";
ADD_LINE();
ADD_BIND("Remapped Events", ""); ADD_BIND("Remapped Events", "");
ADD_TEXT("Most other commands can be"); ADD_TEXT("Most other commands can be");
ADD_TEXT("remapped. Please consult the"); ADD_TEXT("remapped. Please consult the");