diff options
author | 2021-10-31 12:31:16 +1100 | |
---|---|---|
committer | 2021-10-31 12:31:16 +1100 | |
commit | d64ea5331b2312f81df464fb22dcef0191216d86 (patch) | |
tree | a3f3784371da401e6a675e5b6b9734b88281a08d /src/frontend/mame/ui/filemngr.cpp | |
parent | cfffc54b61cabc5ef9533396bf87324eb5eeb63e (diff) |
-frontend: Refactored menu event handling and fixed a number of issues. (#8777)
* Moved common code for drawing about box, info viewer, and other text box menus to a base class; removed the last of the info viewer logic and the multi-line item hack from the base menu class.
* Added previous/next group navigation for general inputs and plugin input selection menus.
* Moved message catalog logic to lib/util, allowing osd and emu to use localised messages.
* Made the base menu class use the UI manager’s feature for holding session state rather than a static map and mutex.
* Improved menu event handling model, and fixed many issues, particularly with menus behaving badly when hidden/shown.
* Added better support for menus that don’t participate in the usual menu stack, like the menuless sliders and the save/load state menus.
* Made a number of menus refresh state when being shown after being hidden (fixes MT08121 among other issues).
* Fixed indication of mounted slot option in the slot option details menu.
* Improved appearance of background menus when emulation isn't running - draw all menus in the stack, and darken the background menus to make the edges of the active menu clearer.
* Fixed locale issues in -listxml.
-debugger: Made GUI debuggers more uniform.
* Added new memory view features to Win32 debugger.
* Fixed spelling of hexadecimal in Cocoa debugger and added decimal address option.
* Fixed duplicate keyboard shortcut in Cocoa debugger (Shift-Cmd-D was both new device window and 64-bit float format).
* Made keyboard shortcuts slightly more consistent across debuggers.
-plugins: Moved input selection menu and sequence polling code to a common library. Fixed the issue that prevented keyboard inputs being mapped with -steadykey on.
-docs: Started adding some documentation for MAME's internal UI, and updated the list of example front-ends.
-Regenerated message catalog sources. For translators, the new strings are mostly:
* The names of the inputs provided by the OS-dependent layer for things like fullscreen and video features. These show up in the user interface inputs menu.
* The names for automatically generated views. These show up in the video options menu - test with a system with a lot of screens to see more variants.
* The input macro plugin UI.
* A few format strings for analog input assignments.
* A few strings for the about box header.
Diffstat (limited to 'src/frontend/mame/ui/filemngr.cpp')
-rw-r--r-- | src/frontend/mame/ui/filemngr.cpp | 22 |
1 files changed, 8 insertions, 14 deletions
diff --git a/src/frontend/mame/ui/filemngr.cpp b/src/frontend/mame/ui/filemngr.cpp index 1ef861e5475..029950865d4 100644 --- a/src/frontend/mame/ui/filemngr.cpp +++ b/src/frontend/mame/ui/filemngr.cpp @@ -106,7 +106,6 @@ void menu_file_manager::fill_image_line(device_image_interface *img, std::string void menu_file_manager::populate(float &customtop, float &custombottom) { std::string tmp_inst, tmp_name; - bool first_entry = true; if (!m_warnings.empty()) { @@ -132,18 +131,14 @@ void menu_file_manager::populate(float &customtop, float &custombottom) if (!scan.user_loadable()) continue; - // if it is a children device, and not something further down the device tree, we want it in the menu! + // if it is a child device, and not something further down the device tree, we want it in the menu! if (strcmp(scan.device().owner()->tag(), dev.tag()) == 0) if (devtags.insert(scan.device().tag()).second) { // check whether we already had some devices with the same owner: if not, output the owner tag! if (!tag_appended) { - if (first_entry) - first_entry = false; - else - item_append(menu_item_type::SEPARATOR); - item_append(string_format("[root%s]", dev.tag()), 0, nullptr); + item_append(string_format(_("[root%1$s]"), dev.tag()), FLAG_UI_HEADING | FLAG_DISABLE, nullptr); tag_appended = true; } // finally, append the image interface to the menu @@ -156,7 +151,7 @@ void menu_file_manager::populate(float &customtop, float &custombottom) item_append(menu_item_type::SEPARATOR); if (m_warnings.empty() || m_curr_selected) - item_append("Reset", 0, (void *)1); + item_append(_("Reset Machine"), 0, (void *)1); custombottom = ui().get_line_height() + 3.0f * ui().box_tb_border(); } @@ -166,19 +161,18 @@ void menu_file_manager::populate(float &customtop, float &custombottom) // handle //------------------------------------------------- -void menu_file_manager::handle() +void menu_file_manager::handle(event const *ev) { // process the menu - const event *event = process(0); - if (event && event->itemref && (event->iptkey == IPT_UI_SELECT)) + if (ev && ev->itemref && (ev->iptkey == IPT_UI_SELECT)) { - if ((uintptr_t)event->itemref == 1) + if ((uintptr_t)ev->itemref == 1) { machine().schedule_hard_reset(); } else { - selected_device = (device_image_interface *) event->itemref; + selected_device = (device_image_interface *) ev->itemref; if (selected_device) { m_curr_selected = true; @@ -199,7 +193,7 @@ void menu_file_manager::handle() void menu_file_manager::force_file_manager(mame_ui_manager &mui, render_container &container, const char *warnings) { // reset the menu stack - menu::stack_reset(mui.machine()); + menu::stack_reset(mui); // add the quit entry followed by the game select entry menu::stack_push_special_main<menu_quit_game>(mui, container); |