diff options
author | Vas Crabb <cuavas@users.noreply.github.com> | 2022-06-11 21:47:19 +1000 |
---|---|---|
committer | GitHub <noreply@github.com> | 2022-06-11 21:47:19 +1000 |
commit | f47f9c3db3c7d20bea0526425cdbc469d5a10868 (patch) | |
tree | 4dd7ac860eb10169b511521eecb31b8760011434 /src/frontend/mame/ui/info.cpp | |
parent | 5214d7f31c6e682315a7803484ade265130cfb6b (diff) |
ui, docs: Added menus to fill a couple of gaps, improved consistency. (#9915)
Added menus for controlling toggle inputs, and showing recognised input
devices and control state. Moved input menu options off main menu to a
submenu, as there are a lot of them now.
Moved menu heading drawing into base class, added headings to more
menus, and made headings more consistent with the menu items used to
reach them. Also made terminology more consistent.
Changed the default names for buttons and hat switches/D-pads to use
1-based numbering. DirectInput still returns 0-based button numbers for
some devices.
Removed local copy of MinGW xaudio2.h as it’s now included in the MSYS2
package. Also fixed building the DirectSound sound output module with
the SDL OSD on Windows - the Windows headers are sensitive to include
order.
Started adding documentation for menus, to hopefully help people find
menus they remember seeing but can't recall how to access.
For translators, this makes terminology more consistent. In particular:
* "Settings" is preferred over "configuration" in a number of places, as
the latter can be construed as referring specifically to settings
stored in .cfg files in the cfg_directory folder. Also, references to
saving machine configuration could be interpreted as relating to the
settings on the "Machine Configuration" menu.
* The controls on host input devices (e.g. keys, buttons, joystick axes)
are referred to as "controls", while emulated inputs are referred to
as "inputs".
* The menus for assigning host controls to emulated inputs are called
"input assignments" menus to distinguish them from other input
settings menus.
* Combinations of controls that can be assigned to emulated inputs are
referred to as "combinations" rather than "sequences".
* The potentially confusing term "ROM set" has been removed altogether.
Use "short name" to refer to a device or system's identifier.
* "System" is used in almost places to refer to a complete, runnable
system rather than "Machine".
* "Driver" is now only used to refer to source files where systems or
devices are defined - it is no longer used to refer to individual
systems.
* A few more menus have message context for the messages. This makes it
a bit easier to guess where the messages are used. It also means you
can use different translations in different places if necessary (e.g.
if the same English text should be translated differently as an item
in one menu and as a heading in another).
Diffstat (limited to 'src/frontend/mame/ui/info.cpp')
-rw-r--r-- | src/frontend/mame/ui/info.cpp | 25 |
1 files changed, 11 insertions, 14 deletions
diff --git a/src/frontend/mame/ui/info.cpp b/src/frontend/mame/ui/info.cpp index 5d4b8c61cb2..fdabab41290 100644 --- a/src/frontend/mame/ui/info.cpp +++ b/src/frontend/mame/ui/info.cpp @@ -64,7 +64,7 @@ void get_general_warnings(std::ostream &buf, running_machine &machine, machine_f if (machine.rom_load().warnings() > 0) { bad_roms = true; - buf << _("One or more ROMs/CHDs for this machine are incorrect. The machine may not run correctly.\n"); + buf << _("One or more ROMs/disk images for this system are incorrect. The system may not run correctly.\n"); } if (!machine.rom_load().software_load_warnings_message().empty()) { @@ -77,12 +77,12 @@ void get_general_warnings(std::ostream &buf, running_machine &machine, machine_f { if (bad_roms) buf << '\n'; - buf << _("There are known problems with this machine\n\n"); + buf << _("There are known problems with this system\n\n"); } // add a warning if any ROMs are flagged BAD_DUMP/NO_DUMP if (machine.rom_load().knownbad() > 0) - buf << _("One or more ROMs/CHDs for this machine have not been correctly dumped.\n"); + buf << _("One or more ROMs/disk images for this system have not been correctly dumped.\n"); } void get_device_warnings(std::ostream &buf, device_t::feature_type unemulated, device_t::feature_type imperfect) @@ -129,17 +129,17 @@ void get_system_warnings(std::ostream &buf, running_machine &machine, machine_fl if (flags & ::machine_flags::NO_COCKTAIL) buf << _("Screen flipping in cocktail mode is not supported.\n"); if (flags & ::machine_flags::REQUIRES_ARTWORK) - buf << _("This machine requires external artwork files.\n"); + buf << _("This system requires external artwork files.\n"); if (flags & ::machine_flags::IS_INCOMPLETE) - buf << _("This machine was never completed. It may exhibit strange behavior or missing elements that are not bugs in the emulation.\n"); + buf << _("This system was never completed. It may exhibit strange behavior or missing elements that are not bugs in the emulation.\n"); if (flags & ::machine_flags::NO_SOUND_HW) - buf << _("This machine has no sound hardware, MAME will produce no sounds, this is expected behaviour.\n"); + buf << _("This system has no sound hardware, MAME will produce no sounds, this is expected behaviour.\n"); // these are more severe warnings if (flags & ::machine_flags::NOT_WORKING) - buf << _("\nTHIS MACHINE DOESN'T WORK. The emulation for this machine is not yet complete. There is nothing you can do to fix this problem except wait for the developers to improve the emulation.\n"); + buf << _("\nTHIS SYSTEM DOESN'T WORK. The emulation for this system is not yet complete. There is nothing you can do to fix this problem except wait for the developers to improve the emulation.\n"); if (flags & ::machine_flags::MECHANICAL) - buf << _("\nElements of this machine cannot be emulated as they require physical interaction or consist of mechanical devices. It is not possible to fully experience this machine.\n"); + buf << _("\nElements of this system cannot be emulated as they require physical interaction or consist of mechanical devices. It is not possible to fully experience this system.\n"); if ((flags & MACHINE_ERRORS) || ((machine.system().type.unemulated_features() | machine.system().type.imperfect_features()) & device_t::feature::PROTECTION)) { @@ -161,7 +161,7 @@ void get_system_warnings(std::ostream &buf, running_machine &machine, machine_fl { // this one works, add a header and display the name of the clone if (!foundworking) - util::stream_format(buf, _("\n\nThere are working clones of this machine: %s"), driver.name); + util::stream_format(buf, _("\n\nThere are working clones of this system: %s"), driver.name); else util::stream_format(buf, _(", %s"), driver.name); foundworking = true; @@ -615,6 +615,7 @@ void menu_warn_info::handle(event const *ev) menu_image_info::menu_image_info(mame_ui_manager &mui, render_container &container) : menu(mui, container) { + set_heading(_("Media Image Information")); } menu_image_info::~menu_image_info() @@ -628,10 +629,6 @@ void menu_image_info::menu_activated() void menu_image_info::populate(float &customtop, float &custombottom) { - ui_system_info const &system(system_list::instance().systems()[driver_list::find(machine().system().name)]); - item_append(system.description, FLAG_DISABLE, nullptr); - item_append(std::string(), FLAG_DISABLE, nullptr); - for (device_image_interface &image : image_interface_enumerator(machine().root_device())) image_info(&image); } @@ -680,7 +677,7 @@ void menu_image_info::image_info(device_image_interface *image) { item_append(image->brief_instance_name(), _("[empty]"), 0, nullptr); } - item_append(std::string(), FLAG_DISABLE, nullptr); + item_append(menu_item_type::SEPARATOR); } } // namespace ui |