mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-04-07 13:23:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

Get rid of hardcoded strings in menu_setting.c

Browse Source
This commit is contained in:
twinaphex 2015-11-15 23:08:52 +01:00
parent 74464f1843
commit 884b697393
3 changed files with 22 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
menu/intl/menu_hash_us.c
View File

@ -26,6 +26,10 @@ static const char *menu_hash_to_str_us_label(uint32_t hash)
{ {
switch (hash) switch (hash)
{ {
case MENU_LABEL_CHEEVOS_TEST_UNOFFICIAL:
return "cheevos_test_unofficial";
case MENU_LABEL_CHEEVOS_ENABLE:
return "cheevos_enable";
case MENU_LABEL_INPUT_ICADE_ENABLE: case MENU_LABEL_INPUT_ICADE_ENABLE:
return "input_icade_enable"; return "input_icade_enable";
case MENU_LABEL_INPUT_KEYBOARD_GAMEPAD_MAPPING_TYPE: case MENU_LABEL_INPUT_KEYBOARD_GAMEPAD_MAPPING_TYPE:
@ -694,6 +698,10 @@ const char *menu_hash_to_str_us(uint32_t hash)
switch (hash) switch (hash)
{ {
case MENU_LABEL_VALUE_CHEEVOS_TEST_UNOFFICIAL:
return "Test unofficial";
case MENU_LABEL_VALUE_CHEEVOS_SETTINGS:
return "Retro Achievements";
case MENU_LABEL_VALUE_INPUT_ICADE_ENABLE: case MENU_LABEL_VALUE_INPUT_ICADE_ENABLE:
return "Keyboard Gamepad Mapping Enable"; return "Keyboard Gamepad Mapping Enable";
case MENU_LABEL_VALUE_INPUT_KEYBOARD_GAMEPAD_MAPPING_TYPE: case MENU_LABEL_VALUE_INPUT_KEYBOARD_GAMEPAD_MAPPING_TYPE:
@ -1600,6 +1608,8 @@ const char *menu_hash_to_str_us(uint32_t hash)
return "Search:"; return "Search:";
case MENU_LABEL_VALUE_USE_BUILTIN_IMAGE_VIEWER: case MENU_LABEL_VALUE_USE_BUILTIN_IMAGE_VIEWER:
return "Use Builtin Image Viewer"; return "Use Builtin Image Viewer";
case MENU_LABEL_VALUE_ENABLE:
return "Enable";
default: default:
break; break;
} }

9
menu/menu_hash.h
View File

@ -22,6 +22,15 @@
extern "C" { extern "C" {
#endif #endif
#define MENU_LABEL_CHEEVOS_TEST_UNOFFICIAL 0xa1ae28f0U
#define MENU_LABEL_VALUE_CHEEVOS_TEST_UNOFFICIAL 0x0698e665U
#define MENU_LABEL_VALUE_ENABLE 0xb0d05f8cU
#define MENU_LABEL_VALUE_CHEEVOS_SETTINGS 0x1fe3be93U
#define MENU_LABEL_CHEEVOS_ENABLE 0x2748f998U
#define MENU_LABEL_VALUE_INPUT_KEYBOARD_GAMEPAD_MAPPING_TYPE 0x507c52f3U #define MENU_LABEL_VALUE_INPUT_KEYBOARD_GAMEPAD_MAPPING_TYPE 0x507c52f3U
#define MENU_LABEL_INPUT_KEYBOARD_GAMEPAD_MAPPING_TYPE 0x3665cbb0U #define MENU_LABEL_INPUT_KEYBOARD_GAMEPAD_MAPPING_TYPE 0x3665cbb0U

28
menu/menu_setting.c
View File

@ -5731,23 +5731,14 @@ static bool setting_append_list_cheevos_options(
settings_t *settings = config_get_ptr(); settings_t *settings = config_get_ptr();
START_GROUP(group_info, START_GROUP(group_info,
#if 0
menu_hash_to_str(MENU_LABEL_VALUE_CHEEVOS_SETTINGS), menu_hash_to_str(MENU_LABEL_VALUE_CHEEVOS_SETTINGS),
#else
"Retro Achievements",
#endif
parent_group); parent_group);
START_SUB_GROUP(list, list_info, "State", group_info.name, subgroup_info, parent_group); START_SUB_GROUP(list, list_info, "State", group_info.name, subgroup_info, parent_group);
CONFIG_BOOL( CONFIG_BOOL(
settings->cheevos.enable, settings->cheevos.enable,
#if 0
menu_hash_to_str(MENU_LABEL_CHEEVOS_ENABLE), menu_hash_to_str(MENU_LABEL_CHEEVOS_ENABLE),
menu_hash_to_str(MENU_LABEL_VALUE_CHEEVOS_ENABLE), menu_hash_to_str(MENU_LABEL_VALUE_ENABLE),
#else
"cheevos_enable",
"Enable",
#endif
false, false,
menu_hash_to_str(MENU_VALUE_OFF), menu_hash_to_str(MENU_VALUE_OFF),
menu_hash_to_str(MENU_VALUE_ON), menu_hash_to_str(MENU_VALUE_ON),
@ -5759,13 +5750,8 @@ static bool setting_append_list_cheevos_options(
CONFIG_BOOL( CONFIG_BOOL(
settings->cheevos.test_unofficial, settings->cheevos.test_unofficial,
#if 0
menu_hash_to_str(MENU_LABEL_CHEEVOS_TEST_UNOFFICIAL), menu_hash_to_str(MENU_LABEL_CHEEVOS_TEST_UNOFFICIAL),
menu_hash_to_str(MENU_LABEL_VALUE_CHEEVOS_TEST_UNOFFICIAL), menu_hash_to_str(MENU_LABEL_VALUE_CHEEVOS_TEST_UNOFFICIAL),
#else
"cheevos_test_unofficial",
"Test unofficial",
#endif
true, true,
menu_hash_to_str(MENU_VALUE_OFF), menu_hash_to_str(MENU_VALUE_OFF),
menu_hash_to_str(MENU_VALUE_ON), menu_hash_to_str(MENU_VALUE_ON),
@ -6112,11 +6098,7 @@ static bool setting_append_list_accounts_cheevos_options(
CONFIG_STRING( CONFIG_STRING(
settings->cheevos.username, settings->cheevos.username,
menu_hash_to_str(MENU_LABEL_CHEEVOS_USERNAME), menu_hash_to_str(MENU_LABEL_CHEEVOS_USERNAME),
#if 0 menu_hash_to_str(MENU_LABEL_VALUE_ACCOUNTS_CHEEVOS_USERNAME),
menu_hash_to_str(MENU_LABEL_VALUE_CHEEVOS_USERNAME),
#else
"Username",
#endif
"", "",
group_info.name, group_info.name,
subgroup_info.name, subgroup_info.name,
@ -6128,11 +6110,7 @@ static bool setting_append_list_accounts_cheevos_options(
CONFIG_STRING( CONFIG_STRING(
settings->cheevos.password, settings->cheevos.password,
menu_hash_to_str(MENU_LABEL_CHEEVOS_PASSWORD), menu_hash_to_str(MENU_LABEL_CHEEVOS_PASSWORD),
#if 0 menu_hash_to_str(MENU_LABEL_VALUE_ACCOUNTS_CHEEVOS_PASSWORD),
menu_hash_to_str(MENU_LABEL_VALUE_CHEEVOS_PASSWORD),
#else
"Password",
#endif
"", "",
group_info.name, group_info.name,
subgroup_info.name, subgroup_info.name,