summaryrefslogtreecommitdiffstatshomepage
path: root/src/frontend/mame/ui/mainmenu.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/frontend/mame/ui/mainmenu.cpp')
-rw-r--r--src/frontend/mame/ui/mainmenu.cpp94
1 files changed, 32 insertions, 62 deletions
diff --git a/src/frontend/mame/ui/mainmenu.cpp b/src/frontend/mame/ui/mainmenu.cpp
index 74f0060b6df..aebe9a5886b 100644
--- a/src/frontend/mame/ui/mainmenu.cpp
+++ b/src/frontend/mame/ui/mainmenu.cpp
@@ -12,7 +12,6 @@
#include "ui/mainmenu.h"
#include "ui/about.h"
-#include "ui/analogipt.h"
#include "ui/barcode.h"
#include "ui/cheatopt.h"
#include "ui/confswitch.h"
@@ -21,8 +20,7 @@
#include "ui/info.h"
#include "ui/info_pty.h"
#include "ui/inifile.h"
-#include "ui/inputmap.h"
-#include "ui/keyboard.h"
+#include "ui/inputopts.h"
#include "ui/miscmenu.h"
#include "ui/pluginopt.h"
#include "ui/selgame.h"
@@ -35,23 +33,20 @@
#include "mame.h"
#include "luaengine.h"
-#include "machine/bcreader.h"
#include "imagedev/cassette.h"
+#include "machine/bcreader.h"
#include "crsshair.h"
#include "dipty.h"
#include "emuopts.h"
-#include "natkeyboard.h"
namespace ui {
enum : unsigned {
- INPUT_GROUPS,
- INPUT_SPECIFIC,
+ INPUT_OPTIONS,
SETTINGS_DIP_SWITCHES,
SETTINGS_DRIVER_CONFIG,
- ANALOG,
BOOKKEEPING,
GAME_INFO,
WARN_INFO,
@@ -60,10 +55,8 @@ enum : unsigned {
TAPE_CONTROL,
SLOT_DEVICES,
NETWORK_DEVICES,
- KEYBOARD_MODE,
SLIDERS,
VIDEO_TARGETS,
- VIDEO_OPTIONS,
CROSSHAIR,
CHEAT,
PLUGINS,
@@ -118,99 +111,92 @@ void menu_main::populate(float &customtop, float &custombottom)
{
m_phase = machine().phase();
- item_append(_("Input (general)"), 0, (void *)INPUT_GROUPS);
-
- item_append(_("Input (this machine)"), 0, (void *)INPUT_SPECIFIC);
+ item_append(_("menu-main", "Input Settings"), 0, (void *)INPUT_OPTIONS);
- if (ui().machine_info().has_analog())
- item_append(_("Analog Controls"), 0, (void *)ANALOG);
if (ui().machine_info().has_dips())
- item_append(_("DIP Switches"), 0, (void *)SETTINGS_DIP_SWITCHES);
+ item_append(_("menu-main", "DIP Switches"), 0, (void *)SETTINGS_DIP_SWITCHES);
if (ui().machine_info().has_configs())
- item_append(_("Machine Configuration"), 0, (void *)SETTINGS_DRIVER_CONFIG);
+ item_append(_("menu-main", "Machine Configuration"), 0, (void *)SETTINGS_DRIVER_CONFIG);
- item_append(_("Bookkeeping Info"), 0, (void *)BOOKKEEPING);
+ item_append(_("menu-main", "Bookkeeping Info"), 0, (void *)BOOKKEEPING);
- item_append(_("Machine Information"), 0, (void *)GAME_INFO);
+ item_append(_("menu-main", "System Information"), 0, (void *)GAME_INFO);
if (ui().found_machine_warnings())
- item_append(_("Warning Information"), 0, (void *)WARN_INFO);
+ item_append(_("menu-main", "Warning Information"), 0, (void *)WARN_INFO);
for (device_image_interface &image : image_interface_enumerator(machine().root_device()))
{
if (image.user_loadable())
{
- item_append(_("Image Information"), 0, (void *)IMAGE_MENU_IMAGE_INFO);
+ item_append(_("menu-main", "Media Image Information"), 0, (void *)IMAGE_MENU_IMAGE_INFO);
- item_append(_("File Manager"), 0, (void *)IMAGE_MENU_FILE_MANAGER);
+ item_append(_("menu-main", "File Manager"), 0, (void *)IMAGE_MENU_FILE_MANAGER);
break;
}
}
if (cassette_device_enumerator(machine().root_device()).first() != nullptr)
- item_append(_("Tape Control"), 0, (void *)TAPE_CONTROL);
+ item_append(_("menu-main", "Tape Control"), 0, (void *)TAPE_CONTROL);
if (pty_interface_enumerator(machine().root_device()).first() != nullptr)
- item_append(_("Pseudo Terminals"), 0, (void *)PTY_INFO);
+ item_append(_("menu-main", "Pseudo Terminals"), 0, (void *)PTY_INFO);
if (ui().machine_info().has_bioses())
- item_append(_("BIOS Selection"), 0, (void *)BIOS_SELECTION);
+ item_append(_("menu-main", "BIOS Selection"), 0, (void *)BIOS_SELECTION);
if (slot_interface_enumerator(machine().root_device()).first() != nullptr)
- item_append(_("Slot Devices"), 0, (void *)SLOT_DEVICES);
+ item_append(_("menu-main", "Slot Devices"), 0, (void *)SLOT_DEVICES);
if (barcode_reader_device_enumerator(machine().root_device()).first() != nullptr)
- item_append(_("Barcode Reader"), 0, (void *)BARCODE_READ);
+ item_append(_("menu-main", "Barcode Reader"), 0, (void *)BARCODE_READ);
if (network_interface_enumerator(machine().root_device()).first() != nullptr)
- item_append(_("Network Devices"), 0, (void*)NETWORK_DEVICES);
+ item_append(_("menu-main", "Network Devices"), 0, (void*)NETWORK_DEVICES);
- if (machine().natkeyboard().keyboard_count())
- item_append(_("Keyboard Mode"), 0, (void *)KEYBOARD_MODE);
+ item_append(_("menu-main", "Slider Controls"), 0, (void *)SLIDERS);
- item_append(_("Slider Controls"), 0, (void *)SLIDERS);
-
- item_append(_("Video Options"), 0, (void *)VIDEO_TARGETS);
+ item_append(_("menu-main", "Video Options"), 0, (void *)VIDEO_TARGETS);
if (machine().crosshair().get_usage())
- item_append(_("Crosshair Options"), 0, (void *)CROSSHAIR);
+ item_append(_("menu-main", "Crosshair Options"), 0, (void *)CROSSHAIR);
if (machine().options().cheat())
- item_append(_("Cheat"), 0, (void *)CHEAT);
+ item_append(_("menu-main", "Cheat"), 0, (void *)CHEAT);
if (machine_phase::RESET <= m_phase)
{
if (machine().options().plugins() && !mame_machine_manager::instance()->lua()->get_menu().empty())
- item_append(_("Plugin Options"), 0, (void *)PLUGINS);
+ item_append(_("menu-main", "Plugin Options"), 0, (void *)PLUGINS);
if (mame_machine_manager::instance()->lua()->call_plugin_check<const char *>("data_list", "", true))
- item_append(_("External DAT View"), 0, (void *)EXTERNAL_DATS);
+ item_append(_("menu-main", "External DAT View"), 0, (void *)EXTERNAL_DATS);
}
item_append(menu_item_type::SEPARATOR);
if (!mame_machine_manager::instance()->favorite().is_favorite(machine()))
- item_append(_("Add To Favorites"), 0, (void *)ADD_FAVORITE);
+ item_append(_("menu-main", "Add To Favorites"), 0, (void *)ADD_FAVORITE);
else
- item_append(_("Remove From Favorites"), 0, (void *)REMOVE_FAVORITE);
+ item_append(_("menu-main", "Remove From Favorites"), 0, (void *)REMOVE_FAVORITE);
item_append(menu_item_type::SEPARATOR);
- item_append(string_format(_("About %1$s"), emulator_info::get_appname()), 0, (void *)ABOUT);
+ item_append(string_format(_("menu-main", "About %1$s"), emulator_info::get_appname()), 0, (void *)ABOUT);
item_append(menu_item_type::SEPARATOR);
-// item_append(_("Quit from Machine"), 0, (void *)QUIT_GAME);
+// item_append(_("menu-main", "Quit from System"), 0, (void *)QUIT_GAME);
if (machine_phase::INIT == m_phase)
{
- item_append(_("Start Machine"), 0, (void *)DISMISS);
+ item_append(_("menu-main", "Start System"), 0, (void *)DISMISS);
}
else
{
- item_append(_("Select New Machine"), 0, (void *)SELECT_GAME);
- item_append(_("Return to Machine"), 0, (void *)DISMISS);
+ item_append(_("menu-main", "Select New System"), 0, (void *)SELECT_GAME);
+ item_append(_("menu-main", "Close Menu"), 0, (void *)DISMISS);
}
}
@@ -226,12 +212,8 @@ void menu_main::handle(event const *ev)
{
switch (uintptr_t(ev->itemref))
{
- case INPUT_GROUPS:
- menu::stack_push<menu_input_groups>(ui(), container());
- break;
-
- case INPUT_SPECIFIC:
- menu::stack_push<menu_input_specific>(ui(), container());
+ case INPUT_OPTIONS:
+ menu::stack_push<menu_input_options>(ui(), container());
break;
case SETTINGS_DIP_SWITCHES:
@@ -242,10 +224,6 @@ void menu_main::handle(event const *ev)
menu::stack_push<menu_settings_machine_config>(ui(), container());
break;
- case ANALOG:
- menu::stack_push<menu_analog>(ui(), container());
- break;
-
case BOOKKEEPING:
menu::stack_push<menu_bookkeeping>(ui(), container());
break;
@@ -282,10 +260,6 @@ void menu_main::handle(event const *ev)
menu::stack_push<menu_network_devices>(ui(), container());
break;
- case KEYBOARD_MODE:
- menu::stack_push<menu_keyboard_mode>(ui(), container());
- break;
-
case SLIDERS:
menu::stack_push<menu_sliders>(ui(), container(), false);
break;
@@ -294,10 +268,6 @@ void menu_main::handle(event const *ev)
menu::stack_push<menu_video_targets>(ui(), container());
break;
- case VIDEO_OPTIONS:
- menu::stack_push<menu_video_options>(ui(), container(), *machine().render().first_target(), false);
- break;
-
case CROSSHAIR:
menu::stack_push<menu_crosshair>(ui(), container());
break;