diff --git a/menu/menu_hash.c b/menu/menu_hash.c index e1c90fb40d..3ebaf851e2 100644 --- a/menu/menu_hash.c +++ b/menu/menu_hash.c @@ -57,8 +57,6 @@ const char *menu_hash_to_str(uint32_t hash) return "deferred_core_list"; case MENU_LABEL_DEFERRED_CORE_LIST_SET: return "deferred_core_list_set"; - case MENU_LABEL_VALUE_OPTIONS: - return "Options"; case MENU_LABEL_VALUE_TAKE_SCREENSHOT: return "Take Screenshot"; case MENU_LABEL_VALUE_RESUME: @@ -91,7 +89,9 @@ const char *menu_hash_to_str(uint32_t hash) return "Recording Settings"; case MENU_VALUE_MAIN_MENU: return "Main Menu"; - case MENU_VALUE_SETTINGS: + case MENU_LABEL_SETTINGS: + return "settings"; + case MENU_LABEL_VALUE_SETTINGS: return "Settings"; case MENU_LABEL_QUIT_RETROARCH: return "Quit RetroArch"; @@ -100,14 +100,20 @@ const char *menu_hash_to_str(uint32_t hash) case MENU_LABEL_SAVE_NEW_CONFIG: return "Save New Config"; case MENU_LABEL_RESTART_CONTENT: + return "restart_content"; + case MENU_LABEL_VALUE_RESTART_CONTENT: return "Restart Content"; case MENU_LABEL_TAKE_SCREENSHOT: return "take_screenshot"; case MENU_LABEL_CORE_UPDATER_LIST: return "Core Updater"; case MENU_LABEL_SYSTEM_INFORMATION: + return "system_information"; + case MENU_LABEL_VALUE_SYSTEM_INFORMATION: return "System Information"; case MENU_LABEL_OPTIONS: + return "options"; + case MENU_LABEL_VALUE_OPTIONS: return "Options"; case MENU_LABEL_CORE_INFORMATION: return "core_information"; @@ -125,8 +131,10 @@ const char *menu_hash_to_str(uint32_t hash) return "Save State"; case MENU_LABEL_LOAD_STATE: return "Load State"; - case MENU_LABEL_RESUME_CONTENT: + case MENU_LABEL_VALUE_RESUME_CONTENT: return "Resume Content"; + case MENU_LABEL_RESUME_CONTENT: + return "resume_content"; case MENU_LABEL_DRIVER_SETTINGS: return "Driver Settings"; case MENU_LABEL_OVERLAY_SCALE: diff --git a/menu/menu_hash.h b/menu/menu_hash.h index a8de08fc8d..3b8a63c20d 100644 --- a/menu/menu_hash.h +++ b/menu/menu_hash.h @@ -199,7 +199,8 @@ extern "C" { #define MENU_VALUE_MORE 0x0b877cafU #define MENU_VALUE_HORIZONTAL_MENU 0x35761704U #define MENU_VALUE_MAIN_MENU 0x1625971fU -#define MENU_VALUE_SETTINGS 0x8aca3ff6U +#define MENU_LABEL_SETTINGS 0x1304dc16U +#define MENU_LABEL_VALUE_SETTINGS 0x8aca3ff6U #define MENU_VALUE_RECORDING_SETTINGS 0x1a80b313U #define MENU_VALUE_INPUT_SETTINGS 0xddd30846U #define MENU_VALUE_ON 0x005974c2U @@ -265,6 +266,7 @@ extern "C" { #define MENU_LABEL_HISTORY_LIST 0x60d82032U #define MENU_LABEL_INFO_SCREEN 0xd97853d0U #define MENU_LABEL_SYSTEM_INFORMATION 0x206ebf0fU +#define MENU_LABEL_VALUE_SYSTEM_INFORMATION 0xa62fd7f0U #define MENU_LABEL_CORE_INFORMATION 0xb638e0d3U #define MENU_LABEL_VALUE_CORE_INFORMATION 0x781981b4U #define MENU_LABEL_VIDEO_SHADER_PARAMETERS 0x9895c3e5U @@ -383,8 +385,10 @@ extern "C" { #define MENU_LABEL_SAVESTATE 0x3a4849b5U #define MENU_LABEL_LOADSTATE 0xa39eb286U #define MENU_LABEL_RESUME_CONTENT 0xd9f088b0U +#define MENU_LABEL_VALUE_RESUME_CONTENT 0xae6e5911U #define MENU_LABEL_VALUE_RESUME 0xce8ac2f6U #define MENU_LABEL_RESTART_CONTENT 0x1ea2e224U +#define MENU_LABEL_VALUE_RESTART_CONTENT 0xf23a2e85U #define MENU_LABEL_TAKE_SCREENSHOT 0x6786e867U #define MENU_LABEL_VALUE_TAKE_SCREENSHOT 0xab767128U #define MENU_LABEL_FILE_LOAD_OR_RESUME 0x952941f4U diff --git a/menu/menu_setting.c b/menu/menu_setting.c index bd18ba9452..e223f7d5ef 100644 --- a/menu/menu_setting.c +++ b/menu/menu_setting.c @@ -3599,8 +3599,8 @@ static bool setting_append_list_main_menu_options( settings_data_list_current_add_flags(list, list_info, SD_FLAG_ADVANCED); CONFIG_ACTION( - "options", menu_hash_to_str(MENU_LABEL_OPTIONS), + menu_hash_to_str(MENU_LABEL_VALUE_OPTIONS), group_info.name, subgroup_info.name, parent_group); @@ -3608,16 +3608,16 @@ static bool setting_append_list_main_menu_options( if (mask & SL_FLAG_MAIN_MENU_SETTINGS) { CONFIG_ACTION( - "settings", - menu_hash_to_str(MENU_VALUE_SETTINGS), + menu_hash_to_str(MENU_LABEL_SETTINGS), + menu_hash_to_str(MENU_LABEL_VALUE_SETTINGS), group_info.name, subgroup_info.name, parent_group); } CONFIG_ACTION( - "system_information", menu_hash_to_str(MENU_LABEL_SYSTEM_INFORMATION), + menu_hash_to_str(MENU_LABEL_VALUE_SYSTEM_INFORMATION), group_info.name, subgroup_info.name, parent_group); @@ -3680,8 +3680,8 @@ static bool setting_append_list_main_menu_options( menu_settings_list_current_add_cmd (list, list_info, EVENT_CMD_TAKE_SCREENSHOT); CONFIG_ACTION( - "resume_content", menu_hash_to_str(MENU_LABEL_RESUME_CONTENT), + menu_hash_to_str(MENU_LABEL_VALUE_RESUME_CONTENT), group_info.name, subgroup_info.name, parent_group); @@ -3690,8 +3690,8 @@ static bool setting_append_list_main_menu_options( (*list)[list_info->index - 1].action_select = &setting_bool_action_ok_exit; CONFIG_ACTION( - "restart_content", menu_hash_to_str(MENU_LABEL_RESTART_CONTENT), + menu_hash_to_str(MENU_LABEL_VALUE_RESTART_CONTENT), group_info.name, subgroup_info.name, parent_group); @@ -3759,7 +3759,7 @@ static bool setting_append_list_driver_options( START_GROUP(group_info, menu_hash_to_str(MENU_LABEL_DRIVER_SETTINGS), parent_group); - parent_group = menu_hash_to_str(MENU_VALUE_SETTINGS); + parent_group = menu_hash_to_str(MENU_LABEL_VALUE_SETTINGS); START_SUB_GROUP(list, list_info, "State", group_info.name, subgroup_info, parent_group); @@ -3899,7 +3899,7 @@ static bool setting_append_list_core_options( START_GROUP(group_info, "Core Settings", parent_group); settings_data_list_current_add_flags(list, list_info, SD_FLAG_ADVANCED); - parent_group = menu_hash_to_str(MENU_VALUE_SETTINGS); + parent_group = menu_hash_to_str(MENU_LABEL_VALUE_SETTINGS); START_SUB_GROUP(list, list_info, "State", group_info.name, subgroup_info, parent_group); @@ -3963,7 +3963,7 @@ static bool setting_append_list_configuration_options( START_GROUP(group_info, "Configuration Settings", parent_group); - parent_group = menu_hash_to_str(MENU_VALUE_SETTINGS); + parent_group = menu_hash_to_str(MENU_LABEL_VALUE_SETTINGS); START_SUB_GROUP(list, list_info, "State", group_info.name, subgroup_info, parent_group); @@ -4036,7 +4036,7 @@ static bool setting_append_list_saving_options( START_GROUP(group_info, "Saving Settings", parent_group); - parent_group = menu_hash_to_str(MENU_VALUE_SETTINGS); + parent_group = menu_hash_to_str(MENU_LABEL_VALUE_SETTINGS); START_SUB_GROUP(list, list_info, "State", group_info.name, subgroup_info, parent_group); @@ -4157,7 +4157,7 @@ static bool setting_append_list_logging_options( START_GROUP(group_info, "Logging Settings", parent_group); settings_data_list_current_add_flags(list, list_info, SD_FLAG_ADVANCED); - parent_group = menu_hash_to_str(MENU_VALUE_SETTINGS); + parent_group = menu_hash_to_str(MENU_LABEL_VALUE_SETTINGS); START_SUB_GROUP(list, list_info, "State", group_info.name, subgroup_info, parent_group); @@ -4226,7 +4226,7 @@ static bool setting_append_list_frame_throttling_options( START_GROUP(group_info, "Frame Throttle Settings", parent_group); - parent_group = menu_hash_to_str(MENU_VALUE_SETTINGS); + parent_group = menu_hash_to_str(MENU_LABEL_VALUE_SETTINGS); START_SUB_GROUP(list, list_info, "State", group_info.name, subgroup_info, parent_group); @@ -4285,7 +4285,7 @@ static bool setting_append_list_rewind_options( START_GROUP(group_info, "Rewind Settings", parent_group); - parent_group = menu_hash_to_str(MENU_VALUE_SETTINGS); + parent_group = menu_hash_to_str(MENU_LABEL_VALUE_SETTINGS); START_SUB_GROUP(list, list_info, "State", group_info.name, subgroup_info, parent_group); @@ -4346,7 +4346,7 @@ static bool setting_append_list_recording_options( START_GROUP(group_info, "Recording Settings", parent_group); - parent_group = menu_hash_to_str(MENU_VALUE_SETTINGS); + parent_group = menu_hash_to_str(MENU_LABEL_VALUE_SETTINGS); START_SUB_GROUP(list, list_info, "State", group_info.name, subgroup_info, parent_group); @@ -4451,7 +4451,7 @@ static bool setting_append_list_video_options( START_GROUP(group_info, "Video Settings", parent_group); - parent_group = menu_hash_to_str(MENU_VALUE_SETTINGS); + parent_group = menu_hash_to_str(MENU_LABEL_VALUE_SETTINGS); START_SUB_GROUP(list, list_info, "State", group_info.name, subgroup_info, parent_group); @@ -4947,7 +4947,7 @@ static bool setting_append_list_font_options( START_GROUP(group_info, "Onscreen Display Settings", parent_group); - parent_group = menu_hash_to_str(MENU_VALUE_SETTINGS); + parent_group = menu_hash_to_str(MENU_LABEL_VALUE_SETTINGS); START_SUB_GROUP(list, list_info, "Messages", group_info.name, subgroup_info, parent_group); @@ -5035,7 +5035,7 @@ static bool setting_append_list_audio_options( START_GROUP(group_info, "Audio Settings", parent_group); - parent_group = menu_hash_to_str(MENU_VALUE_SETTINGS); + parent_group = menu_hash_to_str(MENU_LABEL_VALUE_SETTINGS); START_SUB_GROUP(list, list_info, "State", group_info.name, subgroup_info, parent_group); @@ -5098,7 +5098,7 @@ static bool setting_append_list_audio_options( END_SUB_GROUP(list, list_info, parent_group); - parent_group = menu_hash_to_str(MENU_VALUE_SETTINGS); + parent_group = menu_hash_to_str(MENU_LABEL_VALUE_SETTINGS); START_SUB_GROUP( list, @@ -5191,7 +5191,7 @@ static bool setting_append_list_audio_options( END_SUB_GROUP(list, list_info, parent_group); - parent_group = menu_hash_to_str(MENU_VALUE_SETTINGS); + parent_group = menu_hash_to_str(MENU_LABEL_VALUE_SETTINGS); START_SUB_GROUP( list, @@ -5257,7 +5257,7 @@ static bool setting_append_list_input_hotkey_options( START_GROUP(group_info, "Input Hotkey Binds", parent_group); - parent_group = menu_hash_to_str(MENU_VALUE_SETTINGS); + parent_group = menu_hash_to_str(MENU_LABEL_VALUE_SETTINGS); START_SUB_GROUP(list, list_info, "State", group_info.name, subgroup_info, parent_group); @@ -5296,7 +5296,7 @@ static bool setting_append_list_input_options( START_GROUP(group_info, "Input Settings", parent_group); - parent_group = menu_hash_to_str(MENU_VALUE_SETTINGS); + parent_group = menu_hash_to_str(MENU_LABEL_VALUE_SETTINGS); START_SUB_GROUP(list, list_info, "State", group_info.name, subgroup_info, parent_group); @@ -5583,7 +5583,7 @@ static bool setting_append_list_overlay_options( START_GROUP(group_info, "Onscreen Overlay Settings", parent_group); - parent_group = menu_hash_to_str(MENU_VALUE_SETTINGS); + parent_group = menu_hash_to_str(MENU_LABEL_VALUE_SETTINGS); START_SUB_GROUP(list, list_info, "State", group_info.name, subgroup_info, parent_group); @@ -5693,7 +5693,7 @@ static bool setting_append_list_menu_options( START_GROUP(group_info, "Menu Settings", parent_group); - parent_group = menu_hash_to_str(MENU_VALUE_SETTINGS); + parent_group = menu_hash_to_str(MENU_LABEL_VALUE_SETTINGS); START_SUB_GROUP(list, list_info, "State", group_info.name, subgroup_info, parent_group); @@ -5996,7 +5996,7 @@ static bool setting_append_list_ui_options( START_GROUP(group_info, "UI Settings", parent_group); - parent_group = menu_hash_to_str(MENU_VALUE_SETTINGS); + parent_group = menu_hash_to_str(MENU_LABEL_VALUE_SETTINGS); START_SUB_GROUP(list, list_info, "State", group_info.name, subgroup_info, parent_group); @@ -6085,7 +6085,7 @@ static bool setting_append_list_archive_options( START_GROUP(group_info, "Archive Settings", parent_group); - parent_group = menu_hash_to_str(MENU_VALUE_SETTINGS); + parent_group = menu_hash_to_str(MENU_LABEL_VALUE_SETTINGS); START_SUB_GROUP(list, list_info, "State", group_info.name, subgroup_info, parent_group); @@ -6179,7 +6179,7 @@ static bool setting_append_list_netplay_options( START_GROUP(group_info, "Network Settings", parent_group); - parent_group = menu_hash_to_str(MENU_VALUE_SETTINGS); + parent_group = menu_hash_to_str(MENU_LABEL_VALUE_SETTINGS); START_SUB_GROUP(list, list_info, "Netplay", group_info.name, subgroup_info, parent_group); @@ -6343,7 +6343,7 @@ static bool setting_append_list_patch_options( START_GROUP(group_info, "Patch Settings", parent_group); - parent_group = menu_hash_to_str(MENU_VALUE_SETTINGS); + parent_group = menu_hash_to_str(MENU_LABEL_VALUE_SETTINGS); START_SUB_GROUP(list, list_info, "State", group_info.name, subgroup_info); @@ -6402,7 +6402,7 @@ static bool setting_append_list_playlist_options( START_GROUP(group_info, "Playlist Settings", parent_group); settings_data_list_current_add_flags(list, list_info, SD_FLAG_ADVANCED); - parent_group = menu_hash_to_str(MENU_VALUE_SETTINGS); + parent_group = menu_hash_to_str(MENU_LABEL_VALUE_SETTINGS); START_SUB_GROUP(list, list_info, "History", group_info.name, subgroup_info, parent_group); @@ -6448,7 +6448,7 @@ static bool setting_append_list_user_options( START_GROUP(group_info, "User Settings", parent_group); - parent_group = menu_hash_to_str(MENU_VALUE_SETTINGS); + parent_group = menu_hash_to_str(MENU_LABEL_VALUE_SETTINGS); START_SUB_GROUP(list, list_info, "State", group_info.name, subgroup_info, parent_group); @@ -6504,7 +6504,7 @@ static bool setting_append_list_directory_options( START_GROUP(group_info, "Directory Settings", parent_group); - parent_group = menu_hash_to_str(MENU_VALUE_SETTINGS); + parent_group = menu_hash_to_str(MENU_LABEL_VALUE_SETTINGS); START_SUB_GROUP(list, list_info, "State", group_info.name, subgroup_info, parent_group); @@ -6949,7 +6949,7 @@ static bool setting_append_list_privacy_options( START_GROUP(group_info, "Privacy Settings", parent_group); - parent_group = menu_hash_to_str(MENU_VALUE_SETTINGS); + parent_group = menu_hash_to_str(MENU_LABEL_VALUE_SETTINGS); START_SUB_GROUP(list, list_info, "State", group_info.name, subgroup_info, parent_group); @@ -7013,7 +7013,7 @@ static bool setting_append_list_input_player_options( START_GROUP(group_info, group_lbl[user], parent_group); - parent_group = menu_hash_to_str(MENU_VALUE_SETTINGS); + parent_group = menu_hash_to_str(MENU_LABEL_VALUE_SETTINGS); START_SUB_GROUP( list,