From fe2917e1c9f4ef419c89f9f41d08a8b38a164583 Mon Sep 17 00:00:00 2001 From: Twinaphex Date: Sat, 20 Jun 2015 19:28:50 +0200 Subject: [PATCH] (Menu) More label updates --- menu/menu_hash.c | 16 ++++++++++++++++ menu/menu_hash.h | 10 ++++++++++ menu/menu_setting.c | 16 ++++++++-------- 3 files changed, 34 insertions(+), 8 deletions(-) diff --git a/menu/menu_hash.c b/menu/menu_hash.c index 9c130b4ea8..c516dd9b17 100644 --- a/menu/menu_hash.c +++ b/menu/menu_hash.c @@ -311,6 +311,22 @@ static const char *menu_hash_to_str_english(uint32_t hash) { switch (hash) { + case MENU_LABEL_THREADED_DATA_RUNLOOP_ENABLE: + return "threaded_data_runloop_enable"; + case MENU_LABEL_VALUE_THREADED_DATA_RUNLOOP_ENABLE: + return "Threaded data runloop"; + case MENU_LABEL_ENTRY_NORMAL_COLOR: + return "menu_entry_normal_color"; + case MENU_LABEL_VALUE_ENTRY_NORMAL_COLOR: + return "Menu entry normal color"; + case MENU_LABEL_SHOW_ADVANCED_SETTINGS: + return "menu_show_advanced_settings"; + case MENU_LABEL_VALUE_SHOW_ADVANCED_SETTINGS: + return "Show Advanced Settings"; + case MENU_LABEL_COLLAPSE_SUBGROUPS_ENABLE: + return "menu_collapse_subgroups_enable"; + case MENU_LABEL_VALUE_COLLAPSE_SUBGROUPS_ENABLE: + return "Collapse Subgroups"; case MENU_LABEL_MOUSE_ENABLE: return "menu_mouse_enable"; case MENU_LABEL_VALUE_MOUSE_ENABLE: diff --git a/menu/menu_hash.h b/menu/menu_hash.h index d5bb673352..ade619b69b 100644 --- a/menu/menu_hash.h +++ b/menu/menu_hash.h @@ -26,9 +26,15 @@ extern "C" { #define MENU_LABEL_MOUSE_ENABLE 0x1240fa88U #define MENU_LABEL_VALUE_MOUSE_ENABLE 0xd5bf366bU +#define MENU_LABEL_SHOW_ADVANCED_SETTINGS 0xbc6ac8dfU +#define MENU_LABEL_VALUE_SHOW_ADVANCED_SETTINGS 0x851ee46dU + #define MENU_LABEL_POINTER_ENABLE 0xf051a7a0U #define MENU_LABEL_VALUE_POINTER_ENABLE 0x1e24b9e5U +#define MENU_LABEL_COLLAPSE_SUBGROUPS_ENABLE 0x585ad75bU +#define MENU_LABEL_VALUE_COLLAPSE_SUBGROUPS_ENABLE 0xdb677262U + #define MENU_LABEL_RESET 0x10474288U #define MENU_LABEL_SLOWMOTION 0x6a269ea0U #define MENU_LABEL_HOLD_FAST_FORWARD 0xebe2e4cdU @@ -109,8 +115,12 @@ extern "C" { #define MENU_LABEL_REWIND_GRANULARITY 0xe859cbdfU #define MENU_LABEL_VALUE_REWIND_GRANULARITY 0x6e1ae4c0U #define MENU_LABEL_VALUE_VIDEO_ROTATION 0x9efcecf5U +#define MENU_LABEL_THREADED_DATA_RUNLOOP_ENABLE 0xdf5c6d33U +#define MENU_LABEL_VALUE_THREADED_DATA_RUNLOOP_ENABLE 0x04d8c10fU #define MENU_LABEL_VIDEO_THREADED 0x0626179cU #define MENU_LABEL_VALUE_VIDEO_THREADED 0xc7524afdU +#define MENU_LABEL_ENTRY_NORMAL_COLOR 0x5154ffd1U +#define MENU_LABEL_VALUE_ENTRY_NORMAL_COLOR 0xa989a754U #define MENU_LABEL_AUDIO_SYNC 0xe0cd6bd3U #define MENU_LABEL_VALUE_AUDIO_SYNC 0xcbeb903bU #define MENU_LABEL_VIDEO_VSYNC 0x09c2d34eU diff --git a/menu/menu_setting.c b/menu/menu_setting.c index 0d538e5f01..fe57981e8a 100644 --- a/menu/menu_setting.c +++ b/menu/menu_setting.c @@ -5815,8 +5815,8 @@ static bool setting_append_list_menu_options( CONFIG_BOOL( settings->menu.collapse_subgroups_enable, - "menu_collapse_subgroups_enable", - "Collapse SubGroups", + menu_hash_to_str(MENU_LABEL_COLLAPSE_SUBGROUPS_ENABLE), + menu_hash_to_str(MENU_LABEL_VALUE_COLLAPSE_SUBGROUPS_ENABLE), collapse_subgroups_enable, menu_hash_to_str(MENU_VALUE_OFF), menu_hash_to_str(MENU_VALUE_ON), @@ -5829,8 +5829,8 @@ static bool setting_append_list_menu_options( CONFIG_BOOL( settings->menu.show_advanced_settings, - "menu_show_advanced_settings", - "Show advanced settings", + menu_hash_to_str(MENU_LABEL_SHOW_ADVANCED_SETTINGS), + menu_hash_to_str(MENU_LABEL_VALUE_SHOW_ADVANCED_SETTINGS), show_advanced_settings, menu_hash_to_str(MENU_VALUE_OFF), menu_hash_to_str(MENU_VALUE_ON), @@ -5843,8 +5843,8 @@ static bool setting_append_list_menu_options( #ifdef HAVE_THREADS CONFIG_BOOL( settings->menu.threaded_data_runloop_enable, - "threaded_data_runloop_enable", - "Threaded data runloop", + menu_hash_to_str(MENU_LABEL_THREADED_DATA_RUNLOOP_ENABLE), + menu_hash_to_str(MENU_LABEL_VALUE_THREADED_DATA_RUNLOOP_ENABLE), threaded_data_runloop_enable, menu_hash_to_str(MENU_VALUE_OFF), menu_hash_to_str(MENU_VALUE_ON), @@ -5859,8 +5859,8 @@ static bool setting_append_list_menu_options( /* These colors are hints. The menu driver is not required to use them. */ CONFIG_HEX( settings->menu.entry_normal_color, - "menu_entry_normal_color", - "Menu entry normal color", + menu_hash_to_str(MENU_LABEL_ENTRY_NORMAL_COLOR), + menu_hash_to_str(MENU_LABEL_VALUE_ENTRY_NORMAL_COLOR), menu_entry_normal_color, group_info.name, subgroup_info.name,