ShuriZma
/
RetroArch
mirror of https://github.com/libretro/RetroArch.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

(Menu) Updates

This commit is contained in:
twinaphex 2015-06-21 03:32:57 +02:00
parent dca63a1011
commit 62ea9a9ef6
3 changed files with 29 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
menu/menu_hash.c
View File

@ -339,6 +339,10 @@ static const char *menu_hash_to_str_english(uint32_t hash)
{ {
switch (hash) switch (hash)
{ {
case MENU_VALUE_DIRECTORY_DEFAULT:
return "<Default>";
case MENU_VALUE_DIRECTORY_NONE:
return "<None>";
case MENU_VALUE_NOT_AVAILABLE: case MENU_VALUE_NOT_AVAILABLE:
return "N/A"; return "N/A";
case MENU_LABEL_INPUT_REMAPPING_DIRECTORY: case MENU_LABEL_INPUT_REMAPPING_DIRECTORY:

2
menu/menu_hash.h
View File

@ -20,6 +20,8 @@
extern "C" { extern "C" {
#endif #endif
#define MENU_VALUE_DIRECTORY_NONE 0x9996c10fU
#define MENU_VALUE_DIRECTORY_DEFAULT 0xdcc3a2e4U
#define MENU_VALUE_NOT_AVAILABLE 0x0b880503U #define MENU_VALUE_NOT_AVAILABLE 0x0b880503U
#define MENU_LABEL_CORE_ENABLE 0x2f37fe48U #define MENU_LABEL_CORE_ENABLE 0x2f37fe48U

46
menu/menu_setting.c
View File

@ -1499,7 +1499,7 @@ static void setting_get_string_representation_uint_libretro_device(void *data,
name = "None"; name = "None";
break; break;
case RETRO_DEVICE_JOYPAD: case RETRO_DEVICE_JOYPAD:
name = "RetroPad"; name = menu_hash_to_str(MENU_VALUE_RETROPAD);
break; break;
case RETRO_DEVICE_ANALOG: case RETRO_DEVICE_ANALOG:
name = "RetroPad w/ Analog"; name = "RetroPad w/ Analog";
@ -6515,7 +6515,7 @@ static bool setting_append_list_directory_options(
menu_hash_to_str(MENU_LABEL_CORE_ASSETS_DIRECTORY), menu_hash_to_str(MENU_LABEL_CORE_ASSETS_DIRECTORY),
menu_hash_to_str(MENU_LABEL_VALUE_CORE_ASSETS_DIRECTORY), menu_hash_to_str(MENU_LABEL_VALUE_CORE_ASSETS_DIRECTORY),
"", "",
"<default>", menu_hash_to_str(MENU_VALUE_DIRECTORY_DEFAULT),
group_info.name, group_info.name,
subgroup_info.name, subgroup_info.name,
parent_group, parent_group,
@ -6531,7 +6531,7 @@ static bool setting_append_list_directory_options(
menu_hash_to_str(MENU_LABEL_ASSETS_DIRECTORY), menu_hash_to_str(MENU_LABEL_ASSETS_DIRECTORY),
menu_hash_to_str(MENU_LABEL_VALUE_ASSETS_DIRECTORY), menu_hash_to_str(MENU_LABEL_VALUE_ASSETS_DIRECTORY),
"", "",
"<default>", menu_hash_to_str(MENU_VALUE_DIRECTORY_DEFAULT),
group_info.name, group_info.name,
subgroup_info.name, subgroup_info.name,
parent_group, parent_group,
@ -6547,7 +6547,7 @@ static bool setting_append_list_directory_options(
menu_hash_to_str(MENU_LABEL_DYNAMIC_WALLPAPERS_DIRECTORY), menu_hash_to_str(MENU_LABEL_DYNAMIC_WALLPAPERS_DIRECTORY),
menu_hash_to_str(MENU_LABEL_VALUE_DYNAMIC_WALLPAPERS_DIRECTORY), menu_hash_to_str(MENU_LABEL_VALUE_DYNAMIC_WALLPAPERS_DIRECTORY),
"", "",
"<default>", menu_hash_to_str(MENU_VALUE_DIRECTORY_DEFAULT),
group_info.name, group_info.name,
subgroup_info.name, subgroup_info.name,
parent_group, parent_group,
@ -6563,7 +6563,7 @@ static bool setting_append_list_directory_options(
menu_hash_to_str(MENU_LABEL_BOXARTS_DIRECTORY), menu_hash_to_str(MENU_LABEL_BOXARTS_DIRECTORY),
menu_hash_to_str(MENU_LABEL_VALUE_BOXARTS_DIRECTORY), menu_hash_to_str(MENU_LABEL_VALUE_BOXARTS_DIRECTORY),
"", "",
"<default>", menu_hash_to_str(MENU_VALUE_DIRECTORY_DEFAULT),
group_info.name, group_info.name,
subgroup_info.name, subgroup_info.name,
parent_group, parent_group,
@ -6579,7 +6579,7 @@ static bool setting_append_list_directory_options(
menu_hash_to_str(MENU_LABEL_RGUI_BROWSER_DIRECTORY), menu_hash_to_str(MENU_LABEL_RGUI_BROWSER_DIRECTORY),
menu_hash_to_str(MENU_LABEL_VALUE_RGUI_BROWSER_DIRECTORY), menu_hash_to_str(MENU_LABEL_VALUE_RGUI_BROWSER_DIRECTORY),
"", "",
"<default>", menu_hash_to_str(MENU_VALUE_DIRECTORY_DEFAULT),
group_info.name, group_info.name,
subgroup_info.name, subgroup_info.name,
parent_group, parent_group,
@ -6596,7 +6596,7 @@ static bool setting_append_list_directory_options(
menu_hash_to_str(MENU_LABEL_RGUI_CONFIG_DIRECTORY), menu_hash_to_str(MENU_LABEL_RGUI_CONFIG_DIRECTORY),
menu_hash_to_str(MENU_LABEL_VALUE_RGUI_CONFIG_DIRECTORY), menu_hash_to_str(MENU_LABEL_VALUE_RGUI_CONFIG_DIRECTORY),
"", "",
"<default>", menu_hash_to_str(MENU_VALUE_DIRECTORY_DEFAULT),
group_info.name, group_info.name,
subgroup_info.name, subgroup_info.name,
parent_group, parent_group,
@ -6613,7 +6613,7 @@ static bool setting_append_list_directory_options(
menu_hash_to_str(MENU_LABEL_LIBRETRO_DIR_PATH), menu_hash_to_str(MENU_LABEL_LIBRETRO_DIR_PATH),
menu_hash_to_str(MENU_LABEL_VALUE_LIBRETRO_DIR_PATH), menu_hash_to_str(MENU_LABEL_VALUE_LIBRETRO_DIR_PATH),
g_defaults.core_dir, g_defaults.core_dir,
"<None>", menu_hash_to_str(MENU_VALUE_DIRECTORY_NONE),
group_info.name, group_info.name,
subgroup_info.name, subgroup_info.name,
parent_group, parent_group,
@ -6630,7 +6630,7 @@ static bool setting_append_list_directory_options(
menu_hash_to_str(MENU_LABEL_LIBRETRO_INFO_PATH), menu_hash_to_str(MENU_LABEL_LIBRETRO_INFO_PATH),
menu_hash_to_str(MENU_LABEL_VALUE_LIBRETRO_INFO_PATH), menu_hash_to_str(MENU_LABEL_VALUE_LIBRETRO_INFO_PATH),
g_defaults.core_info_dir, g_defaults.core_info_dir,
"<None>", menu_hash_to_str(MENU_VALUE_DIRECTORY_NONE),
group_info.name, group_info.name,
subgroup_info.name, subgroup_info.name,
parent_group, parent_group,
@ -6648,7 +6648,7 @@ static bool setting_append_list_directory_options(
menu_hash_to_str(MENU_LABEL_CONTENT_DATABASE_DIRECTORY), menu_hash_to_str(MENU_LABEL_CONTENT_DATABASE_DIRECTORY),
menu_hash_to_str(MENU_LABEL_VALUE_CONTENT_DATABASE_DIRECTORY), menu_hash_to_str(MENU_LABEL_VALUE_CONTENT_DATABASE_DIRECTORY),
"", "",
"<None>", menu_hash_to_str(MENU_VALUE_DIRECTORY_NONE),
group_info.name, group_info.name,
subgroup_info.name, subgroup_info.name,
parent_group, parent_group,
@ -6664,7 +6664,7 @@ static bool setting_append_list_directory_options(
menu_hash_to_str(MENU_LABEL_CURSOR_DIRECTORY), menu_hash_to_str(MENU_LABEL_CURSOR_DIRECTORY),
menu_hash_to_str(MENU_LABEL_VALUE_CURSOR_DIRECTORY), menu_hash_to_str(MENU_LABEL_VALUE_CURSOR_DIRECTORY),
"", "",
"<None>", menu_hash_to_str(MENU_VALUE_DIRECTORY_NONE),
group_info.name, group_info.name,
subgroup_info.name, subgroup_info.name,
parent_group, parent_group,
@ -6681,7 +6681,7 @@ static bool setting_append_list_directory_options(
menu_hash_to_str(MENU_LABEL_CHEAT_DATABASE_PATH), menu_hash_to_str(MENU_LABEL_CHEAT_DATABASE_PATH),
menu_hash_to_str(MENU_LABEL_VALUE_CHEAT_DATABASE_PATH), menu_hash_to_str(MENU_LABEL_VALUE_CHEAT_DATABASE_PATH),
"", "",
"<None>", menu_hash_to_str(MENU_VALUE_DIRECTORY_NONE),
group_info.name, group_info.name,
subgroup_info.name, subgroup_info.name,
parent_group, parent_group,
@ -6697,7 +6697,7 @@ static bool setting_append_list_directory_options(
menu_hash_to_str(MENU_LABEL_VIDEO_FILTER_DIR), menu_hash_to_str(MENU_LABEL_VIDEO_FILTER_DIR),
menu_hash_to_str(MENU_LABEL_VALUE_VIDEO_FILTER_DIR), menu_hash_to_str(MENU_LABEL_VALUE_VIDEO_FILTER_DIR),
"", "",
"<default>", menu_hash_to_str(MENU_VALUE_DIRECTORY_DEFAULT),
group_info.name, group_info.name,
subgroup_info.name, subgroup_info.name,
parent_group, parent_group,
@ -6713,7 +6713,7 @@ static bool setting_append_list_directory_options(
menu_hash_to_str(MENU_LABEL_AUDIO_FILTER_DIR), menu_hash_to_str(MENU_LABEL_AUDIO_FILTER_DIR),
menu_hash_to_str(MENU_LABEL_VALUE_AUDIO_FILTER_DIR), menu_hash_to_str(MENU_LABEL_VALUE_AUDIO_FILTER_DIR),
"", "",
"<default>", menu_hash_to_str(MENU_VALUE_DIRECTORY_DEFAULT),
group_info.name, group_info.name,
subgroup_info.name, subgroup_info.name,
parent_group, parent_group,
@ -6729,7 +6729,7 @@ static bool setting_append_list_directory_options(
menu_hash_to_str(MENU_LABEL_VIDEO_SHADER_DIR), menu_hash_to_str(MENU_LABEL_VIDEO_SHADER_DIR),
menu_hash_to_str(MENU_LABEL_VALUE_VIDEO_SHADER_DIR), menu_hash_to_str(MENU_LABEL_VALUE_VIDEO_SHADER_DIR),
g_defaults.shader_dir, g_defaults.shader_dir,
"<default>", menu_hash_to_str(MENU_VALUE_DIRECTORY_DEFAULT),
group_info.name, group_info.name,
subgroup_info.name, subgroup_info.name,
parent_group, parent_group,
@ -6745,7 +6745,7 @@ static bool setting_append_list_directory_options(
menu_hash_to_str(MENU_LABEL_RECORDING_OUTPUT_DIRECTORY), menu_hash_to_str(MENU_LABEL_RECORDING_OUTPUT_DIRECTORY),
menu_hash_to_str(MENU_LABEL_VALUE_RECORDING_OUTPUT_DIRECTORY), menu_hash_to_str(MENU_LABEL_VALUE_RECORDING_OUTPUT_DIRECTORY),
"", "",
"<default>", menu_hash_to_str(MENU_VALUE_DIRECTORY_DEFAULT),
group_info.name, group_info.name,
subgroup_info.name, subgroup_info.name,
parent_group, parent_group,
@ -6761,7 +6761,7 @@ static bool setting_append_list_directory_options(
menu_hash_to_str(MENU_LABEL_RECORDING_CONFIG_DIRECTORY), menu_hash_to_str(MENU_LABEL_RECORDING_CONFIG_DIRECTORY),
menu_hash_to_str(MENU_LABEL_VALUE_RECORDING_CONFIG_DIRECTORY), menu_hash_to_str(MENU_LABEL_VALUE_RECORDING_CONFIG_DIRECTORY),
"", "",
"<default>", menu_hash_to_str(MENU_VALUE_DIRECTORY_DEFAULT),
group_info.name, group_info.name,
subgroup_info.name, subgroup_info.name,
parent_group, parent_group,
@ -6778,7 +6778,7 @@ static bool setting_append_list_directory_options(
menu_hash_to_str(MENU_LABEL_OVERLAY_DIRECTORY), menu_hash_to_str(MENU_LABEL_OVERLAY_DIRECTORY),
menu_hash_to_str(MENU_LABEL_VALUE_OVERLAY_DIRECTORY), menu_hash_to_str(MENU_LABEL_VALUE_OVERLAY_DIRECTORY),
g_defaults.overlay_dir, g_defaults.overlay_dir,
"<default>", menu_hash_to_str(MENU_VALUE_DIRECTORY_DEFAULT),
group_info.name, group_info.name,
subgroup_info.name, subgroup_info.name,
parent_group, parent_group,
@ -6794,7 +6794,7 @@ static bool setting_append_list_directory_options(
menu_hash_to_str(MENU_LABEL_OSK_OVERLAY_DIRECTORY), menu_hash_to_str(MENU_LABEL_OSK_OVERLAY_DIRECTORY),
menu_hash_to_str(MENU_LABEL_VALUE_OSK_OVERLAY_DIRECTORY), menu_hash_to_str(MENU_LABEL_VALUE_OSK_OVERLAY_DIRECTORY),
g_defaults.osk_overlay_dir, g_defaults.osk_overlay_dir,
"<default>", menu_hash_to_str(MENU_VALUE_DIRECTORY_DEFAULT),
group_info.name, group_info.name,
subgroup_info.name, subgroup_info.name,
parent_group, parent_group,
@ -6827,7 +6827,7 @@ static bool setting_append_list_directory_options(
menu_hash_to_str(MENU_LABEL_JOYPAD_AUTOCONFIG_DIR), menu_hash_to_str(MENU_LABEL_JOYPAD_AUTOCONFIG_DIR),
menu_hash_to_str(MENU_LABEL_VALUE_JOYPAD_AUTOCONFIG_DIR), menu_hash_to_str(MENU_LABEL_VALUE_JOYPAD_AUTOCONFIG_DIR),
"", "",
"<default>", menu_hash_to_str(MENU_VALUE_DIRECTORY_DEFAULT),
group_info.name, group_info.name,
subgroup_info.name, subgroup_info.name,
parent_group, parent_group,
@ -6843,7 +6843,7 @@ static bool setting_append_list_directory_options(
menu_hash_to_str(MENU_LABEL_INPUT_REMAPPING_DIRECTORY), menu_hash_to_str(MENU_LABEL_INPUT_REMAPPING_DIRECTORY),
menu_hash_to_str(MENU_LABEL_VALUE_INPUT_REMAPPING_DIRECTORY), menu_hash_to_str(MENU_LABEL_VALUE_INPUT_REMAPPING_DIRECTORY),
"", "",
"<None>", menu_hash_to_str(MENU_VALUE_DIRECTORY_NONE),
group_info.name, group_info.name,
subgroup_info.name, subgroup_info.name,
parent_group, parent_group,
@ -6859,7 +6859,7 @@ static bool setting_append_list_directory_options(
menu_hash_to_str(MENU_LABEL_PLAYLIST_DIRECTORY), menu_hash_to_str(MENU_LABEL_PLAYLIST_DIRECTORY),
menu_hash_to_str(MENU_LABEL_VALUE_PLAYLIST_DIRECTORY), menu_hash_to_str(MENU_LABEL_VALUE_PLAYLIST_DIRECTORY),
"", "",
"<default>", menu_hash_to_str(MENU_VALUE_DIRECTORY_DEFAULT),
group_info.name, group_info.name,
subgroup_info.name, subgroup_info.name,
parent_group, parent_group,
@ -6923,7 +6923,7 @@ static bool setting_append_list_directory_options(
menu_hash_to_str(MENU_LABEL_EXTRACTION_DIRECTORY), menu_hash_to_str(MENU_LABEL_EXTRACTION_DIRECTORY),
menu_hash_to_str(MENU_LABEL_VALUE_EXTRACTION_DIRECTORY), menu_hash_to_str(MENU_LABEL_VALUE_EXTRACTION_DIRECTORY),
"", "",
"<None>", menu_hash_to_str(MENU_VALUE_DIRECTORY_NONE),
group_info.name, group_info.name,
subgroup_info.name, subgroup_info.name,
parent_group, parent_group,