From c76d3ea331c7ad66741d2ecba1a1b7304566df10 Mon Sep 17 00:00:00 2001 From: twinaphex Date: Sun, 21 Jun 2015 09:43:34 +0200 Subject: [PATCH] (Menu) Menu labels/cleanups --- menu/menu_displaylist.c | 2 +- menu/menu_hash.c | 18 +++++++++++++++--- menu/menu_hash.h | 14 +++++++------- menu/menu_setting.c | 15 ++++++++------- 4 files changed, 31 insertions(+), 18 deletions(-) diff --git a/menu/menu_displaylist.c b/menu/menu_displaylist.c index ed1d32499c..1e01bea38d 100644 --- a/menu/menu_displaylist.c +++ b/menu/menu_displaylist.c @@ -1990,7 +1990,7 @@ int menu_displaylist_push_list(menu_displaylist_info_t *info, unsigned type) menu_list_clear(info->list); menu_displaylist_realloc_settings(&menu->entries, SL_FLAG_ALL_SETTINGS); - setting = menu_setting_find(menu_hash_to_str(MENU_LABEL_DRIVER_SETTINGS)); + setting = menu_setting_find(menu_hash_to_str(MENU_LABEL_VALUE_DRIVER_SETTINGS)); if (settings->menu.collapse_subgroups_enable) { diff --git a/menu/menu_hash.c b/menu/menu_hash.c index 72da76d370..e4ee60d27c 100644 --- a/menu/menu_hash.c +++ b/menu/menu_hash.c @@ -272,7 +272,7 @@ static const char *menu_hash_to_str_french(uint32_t hash) return "Charger un etat"; case MENU_LABEL_VALUE_RESUME_CONTENT: return "Reprendre"; - case MENU_LABEL_DRIVER_SETTINGS: + case MENU_LABEL_VALUE_DRIVER_SETTINGS: return "Reglage des pilotes"; case MENU_LABEL_VALUE_UNABLE_TO_READ_COMPRESSED_FILE: return "Impossible de lire l'archive."; @@ -344,6 +344,20 @@ static const char *menu_hash_to_str_english(uint32_t hash) { switch (hash) { + case MENU_LABEL_VALUE_DRIVER_SETTINGS: + return "Driver Settings"; + case MENU_LABEL_VALUE_CONFIGURATION_SETTINGS: + return "Configuration Settings"; + case MENU_LABEL_VALUE_CORE_SETTINGS: + return "Core Settings"; + case MENU_LABEL_VALUE_VIDEO_SETTINGS: + return "Video Settings"; + case MENU_LABEL_VALUE_LOGGING_SETTINGS: + return "Logging Settings"; + case MENU_LABEL_VALUE_SAVING_SETTINGS: + return "Saving Settings"; + case MENU_LABEL_VALUE_REWIND_SETTINGS: + return "Rewind Settings"; case MENU_LABEL_CUSTOM_VIEWPORT_1: return "custom_viewport_1"; case MENU_LABEL_VALUE_CUSTOM_VIEWPORT_1: @@ -1256,8 +1270,6 @@ static const char *menu_hash_to_str_english(uint32_t hash) return "Resume Content"; case MENU_LABEL_RESUME_CONTENT: return "resume_content"; - case MENU_LABEL_DRIVER_SETTINGS: - return "Driver Settings"; case MENU_LABEL_INPUT_DRIVER: return "input_driver"; case MENU_LABEL_VALUE_INPUT_DRIVER: diff --git a/menu/menu_hash.h b/menu/menu_hash.h index 84e66468d5..ec1fb88212 100644 --- a/menu/menu_hash.h +++ b/menu/menu_hash.h @@ -643,13 +643,13 @@ extern "C" { #define MENU_LABEL_VALUE_JOYPAD_AUTOCONFIG_DIR 0x8bb1c2c9U #define MENU_LABEL_VALUE_INPUT_AUTODETECT_ENABLE 0xf5209bdbU #define MENU_LABEL_INPUT_AUTODETECT_ENABLE 0xb1e07facU -#define MENU_LABEL_DRIVER_SETTINGS 0x81cd2d62U -#define MENU_LABEL_CORE_SETTINGS 0x06795dffU -#define MENU_LABEL_CONFIGURATION_SETTINGS 0x5a1558ceU -#define MENU_LABEL_LOGGING_SETTINGS 0x902c003dU -#define MENU_LABEL_SAVING_SETTINGS 0x32fea87eU -#define MENU_LABEL_REWIND_SETTINGS 0xbff7775fU -#define MENU_LABEL_VIDEO_SETTINGS 0x9dd23badU +#define MENU_LABEL_VALUE_DRIVER_SETTINGS 0x81cd2d62U +#define MENU_LABEL_VALUE_CORE_SETTINGS 0x06795dffU +#define MENU_LABEL_VALUE_CONFIGURATION_SETTINGS 0x5a1558ceU +#define MENU_LABEL_VALUE_LOGGING_SETTINGS 0x902c003dU +#define MENU_LABEL_VALUE_SAVING_SETTINGS 0x32fea87eU +#define MENU_LABEL_VALUE_REWIND_SETTINGS 0xbff7775fU +#define MENU_LABEL_VALUE_VIDEO_SETTINGS 0x9dd23badU #define MENU_LABEL_RECORDING_SETTINGS 0x1a80b313U #define MENU_LABEL_FRAME_THROTTLE_SETTINGS 0x573b8837U #define MENU_LABEL_VALUE_FRAME_THROTTLE_SETTINGS 0x936f04a8U diff --git a/menu/menu_setting.c b/menu/menu_setting.c index c8cefc10b9..8df72147e4 100644 --- a/menu/menu_setting.c +++ b/menu/menu_setting.c @@ -3758,7 +3758,7 @@ static bool setting_append_list_driver_options( rarch_setting_group_info_t subgroup_info = {0}; settings_t *settings = config_get_ptr(); - START_GROUP(group_info, menu_hash_to_str(MENU_LABEL_DRIVER_SETTINGS), parent_group); + START_GROUP(group_info, menu_hash_to_str(MENU_LABEL_VALUE_DRIVER_SETTINGS), parent_group); parent_group = menu_hash_to_str(MENU_LABEL_VALUE_SETTINGS); @@ -3897,7 +3897,7 @@ static bool setting_append_list_core_options( rarch_setting_group_info_t subgroup_info = {0}; settings_t *settings = config_get_ptr(); - START_GROUP(group_info, "Core Settings", parent_group); + START_GROUP(group_info, menu_hash_to_str(MENU_LABEL_VALUE_CORE_SETTINGS), parent_group); settings_data_list_current_add_flags(list, list_info, SD_FLAG_ADVANCED); parent_group = menu_hash_to_str(MENU_LABEL_VALUE_SETTINGS); @@ -3962,7 +3962,8 @@ static bool setting_append_list_configuration_options( rarch_setting_group_info_t subgroup_info = {0}; settings_t *settings = config_get_ptr(); - START_GROUP(group_info, "Configuration Settings", parent_group); + START_GROUP(group_info, + menu_hash_to_str(MENU_LABEL_VALUE_CONFIGURATION_SETTINGS), parent_group); parent_group = menu_hash_to_str(MENU_LABEL_VALUE_SETTINGS); @@ -4035,7 +4036,7 @@ static bool setting_append_list_saving_options( rarch_setting_group_info_t subgroup_info = {0}; settings_t *settings = config_get_ptr(); - START_GROUP(group_info, "Saving Settings", parent_group); + START_GROUP(group_info, menu_hash_to_str(MENU_LABEL_VALUE_SAVING_SETTINGS), parent_group); parent_group = menu_hash_to_str(MENU_LABEL_VALUE_SETTINGS); @@ -4155,7 +4156,7 @@ static bool setting_append_list_logging_options( settings_t *settings = config_get_ptr(); global_t *global = global_get_ptr(); - START_GROUP(group_info, "Logging Settings", parent_group); + START_GROUP(group_info, menu_hash_to_str(MENU_LABEL_VALUE_LOGGING_SETTINGS), parent_group); settings_data_list_current_add_flags(list, list_info, SD_FLAG_ADVANCED); parent_group = menu_hash_to_str(MENU_LABEL_VALUE_SETTINGS); @@ -4284,7 +4285,7 @@ static bool setting_append_list_rewind_options( rarch_setting_group_info_t subgroup_info = {0}; settings_t *settings = config_get_ptr(); - START_GROUP(group_info, "Rewind Settings", parent_group); + START_GROUP(group_info, menu_hash_to_str(MENU_LABEL_VALUE_REWIND_SETTINGS), parent_group); parent_group = menu_hash_to_str(MENU_LABEL_VALUE_SETTINGS); @@ -4450,7 +4451,7 @@ static bool setting_append_list_video_options( (void)global; - START_GROUP(group_info, "Video Settings", parent_group); + START_GROUP(group_info, menu_hash_to_str(MENU_LABEL_VALUE_VIDEO_SETTINGS), parent_group); parent_group = menu_hash_to_str(MENU_LABEL_VALUE_SETTINGS);