From 909513e7ca83da0ec8080c8f0c23a7cf48c447c8 Mon Sep 17 00:00:00 2001 From: twinaphex Date: Fri, 19 Jun 2015 04:19:10 +0200 Subject: [PATCH] (Menu) More menu hashes --- menu/menu_hash.c | 6 ++++++ menu/menu_hash.h | 3 +++ menu/menu_setting.c | 10 +++++----- 3 files changed, 14 insertions(+), 5 deletions(-) diff --git a/menu/menu_hash.c b/menu/menu_hash.c index a862685e75..c2dc282425 100644 --- a/menu/menu_hash.c +++ b/menu/menu_hash.c @@ -124,12 +124,16 @@ static const char *menu_hash_to_str_english(uint32_t hash) case MENU_LABEL_VALUE_SETTINGS: return "Settings"; case MENU_LABEL_QUIT_RETROARCH: + return "quit_retroarch"; + case MENU_LABEL_VALUE_QUIT_RETROARCH: return "Quit RetroArch"; case MENU_LABEL_VALUE_HELP: return "Help"; case MENU_LABEL_HELP: return "help"; case MENU_LABEL_SAVE_NEW_CONFIG: + return "save_new_config"; + case MENU_LABEL_VALUE_SAVE_NEW_CONFIG: return "Save New Config"; case MENU_LABEL_RESTART_CONTENT: return "restart_content"; @@ -162,6 +166,8 @@ static const char *menu_hash_to_str_english(uint32_t hash) case MENU_LABEL_MANAGEMENT: return "Advanced Management"; case MENU_LABEL_PERFORMANCE_COUNTERS: + return "performance_counters"; + case MENU_LABEL_VALUE_PERFORMANCE_COUNTERS: return "Performance Counters"; case MENU_LABEL_SAVE_STATE: return "savestate"; diff --git a/menu/menu_hash.h b/menu/menu_hash.h index d2e0952863..f0e7907e9c 100644 --- a/menu/menu_hash.h +++ b/menu/menu_hash.h @@ -237,6 +237,7 @@ extern "C" { #define MENU_LABEL_RECORD_CONFIG 0x11c3daf9U #define MENU_LABEL_UNLOAD_CORE 0x4b622170U #define MENU_LABEL_QUIT_RETROARCH 0x84b0bc71U +#define MENU_LABEL_VALUE_QUIT_RETROARCH 0x8e7024f2U #define MENU_LABEL_DEFERRED_VIDEO_FILTER 0x966ad201U #define MENU_LABEL_DEFERRED_CORE_LIST_SET 0xa6d5fdb4U #define MENU_LABEL_DEFERRED_DATABASE_MANAGER_LIST 0x7c0b704fU @@ -263,6 +264,7 @@ extern "C" { #define MENU_LABEL_CONFIGURATIONS 0x3e930a50U #define MENU_LABEL_DISK_IMAGE_APPEND 0x5af7d709U #define MENU_LABEL_PERFORMANCE_COUNTERS 0xd8ab5049U +#define MENU_LABEL_VALUE_PERFORMANCE_COUNTERS 0x20eb18caU #define MENU_LABEL_CORE_LIST 0xa8c3bfc9U #define MENU_LABEL_MANAGEMENT 0xb8137ec2U #define MENU_LABEL_OPTIONS 0x71f05091U @@ -388,6 +390,7 @@ extern "C" { #define MENU_LABEL_PRIVACY_SETTINGS 0xce106254U #define MENU_LABEL_SHADER_APPLY_CHANGES 0x4f7306b9U #define MENU_LABEL_SAVE_NEW_CONFIG 0xcce9ab72U +#define MENU_LABEL_VALUE_SAVE_NEW_CONFIG 0xd49f2c94U #define MENU_LABEL_ONSCREEN_DISPLAY_SETTINGS 0x67571029U #define MENU_LABEL_CHEAT_APPLY_CHANGES 0xde88aa27U #define MENU_LABEL_CUSTOM_BIND 0x1e84b3fcU diff --git a/menu/menu_setting.c b/menu/menu_setting.c index 418430a950..b310d73cd6 100644 --- a/menu/menu_setting.c +++ b/menu/menu_setting.c @@ -3634,8 +3634,8 @@ static bool setting_append_list_main_menu_options( if (global->perfcnt_enable) { CONFIG_ACTION( - "performance_counters", menu_hash_to_str(MENU_LABEL_PERFORMANCE_COUNTERS), + menu_hash_to_str(MENU_LABEL_VALUE_PERFORMANCE_COUNTERS), group_info.name, subgroup_info.name, parent_group); @@ -3644,8 +3644,8 @@ static bool setting_append_list_main_menu_options( if (global->main_is_init && !global->libretro_dummy) { CONFIG_ACTION( - "savestate", menu_hash_to_str(MENU_LABEL_SAVE_STATE), + menu_hash_to_str(MENU_LABEL_VALUE_SAVE_STATE), group_info.name, subgroup_info.name, "N/A"); @@ -3658,8 +3658,8 @@ static bool setting_append_list_main_menu_options( menu_settings_list_current_add_cmd (list, list_info, EVENT_CMD_SAVE_STATE); CONFIG_ACTION( - "loadstate", menu_hash_to_str(MENU_LABEL_LOAD_STATE), + menu_hash_to_str(MENU_LABEL_VALUE_LOAD_STATE), group_info.name, subgroup_info.name, "N/A"); @@ -3717,8 +3717,8 @@ static bool setting_append_list_main_menu_options( parent_group); CONFIG_ACTION( - "save_new_config", menu_hash_to_str(MENU_LABEL_SAVE_NEW_CONFIG), + menu_hash_to_str(MENU_LABEL_VALUE_SAVE_NEW_CONFIG), group_info.name, subgroup_info.name, parent_group); @@ -3734,8 +3734,8 @@ static bool setting_append_list_main_menu_options( #if !defined(IOS) /* Apple rejects iOS apps that lets you forcibly quit an application. */ CONFIG_ACTION( - "quit_retroarch", menu_hash_to_str(MENU_LABEL_QUIT_RETROARCH), + menu_hash_to_str(MENU_LABEL_VALUE_QUIT_RETROARCH), group_info.name, subgroup_info.name, parent_group);