diff --git a/menu/drivers/shared.h b/menu/drivers/shared.h index b78e3b175d..42d164a69e 100644 --- a/menu/drivers/shared.h +++ b/menu/drivers/shared.h @@ -93,9 +93,9 @@ static INLINE void get_title(const char *label, const char *dir, snprintf(title, sizeof_title, "CONFIG %s", dir); else if (!strcmp(label, "disk_image_append")) snprintf(title, sizeof_title, "DISK APPEND %s", dir); - else if (!strcmp(elem0, "Video Options")) + else if (!strcmp(elem0, "Video Settings")) { - strlcpy(title, "VIDEO OPTIONS", sizeof_title); + strlcpy(title, "VIDEO SETTINGS", sizeof_title); if (!strcmp(elem1, "Monitor")) strlcat(title, " - MONITOR", sizeof_title); else if (!strcmp(elem1, "Aspect")) @@ -109,11 +109,11 @@ static INLINE void get_title(const char *label, const char *dir, else if (!strcmp(elem1, "State")) strlcat(title, " - STATE", sizeof_title); } - else if (!strcmp(elem0, "Input Options") || + else if (!strcmp(elem0, "Input Settings") || menu_type == MENU_SETTINGS_CUSTOM_BIND || menu_type == MENU_SETTINGS_CUSTOM_BIND_KEYBOARD) { - strlcpy(title, "INPUT OPTIONS", sizeof_title); + strlcpy(title, "INPUT SETTINGS", sizeof_title); if (strstr(elem1, "User")) strlcat(title, " - USER", sizeof_title); else if (!strcmp(elem1, "Meta Keys")) @@ -127,15 +127,15 @@ static INLINE void get_title(const char *label, const char *dir, else if (!strcmp(elem1, "Miscellaneous")) strlcat(title, " - MISCELLANEOUS", sizeof_title); } - else if (!strcmp(elem0, "Overlay Options")) + else if (!strcmp(elem0, "Overlay Settings")) { - strlcpy(title, "OVERLAY OPTIONS", sizeof_title); + strlcpy(title, "OVERLAY SETTINGS", sizeof_title); if (!strcmp(elem1, "State")) strlcat(title, " - STATE", sizeof_title); } - else if (!strcmp(elem0, "Menu Options")) + else if (!strcmp(elem0, "Menu Settings")) { - strlcpy(title, "MENU OPTIONS", sizeof_title); + strlcpy(title, "MENU SETTINGS", sizeof_title); if (!strcmp(elem1, "State")) strlcat(title, " - STATE", sizeof_title); else if (!strcmp(elem1, "Navigation")) @@ -145,35 +145,35 @@ static INLINE void get_title(const char *label, const char *dir, else if (!strcmp(elem1, "Browser")) strlcat(title, " - BROWSER", sizeof_title); } - else if (!strcmp(elem0, "Onscreen Keyboard Overlay Options")) + else if (!strcmp(elem0, "Onscreen Keyboard Overlay Settings")) { - strlcpy(title, "ONSCREEN KEYBOARD OVERLAY OPTIONS", sizeof_title); + strlcpy(title, "ONSCREEN KEYBOARD OVERLAY SETTINGS", sizeof_title); if (!strcmp(elem1, "State")) strlcat(title, " - STATE", sizeof_title); } - else if (!strcmp(elem0, "Patch Options")) + else if (!strcmp(elem0, "Patch Settings")) { - strlcpy(title, "PATCH OPTIONS", sizeof_title); + strlcpy(title, "PATCH SETTINGS", sizeof_title); if (!strcmp(elem1, "State")) strlcat(title, " - STATE", sizeof_title); } - else if (!strcmp(elem0, "UI Options")) + else if (!strcmp(elem0, "UI Settings")) { - strlcpy(title, "UI OPTIONS", sizeof_title); + strlcpy(title, "UI SETTINGS", sizeof_title); if (!strcmp(elem1, "State")) strlcat(title, " - STATE", sizeof_title); } - else if (!strcmp(elem0, "Playlist Options")) + else if (!strcmp(elem0, "Playlist Settings")) { - strlcpy(title, "PLAYLIST OPTIONS", sizeof_title); + strlcpy(title, "PLAYLIST SETTINGS", sizeof_title); if (!strcmp(elem1, "State")) strlcat(title, " - STATE", sizeof_title); if (!strcmp(elem1, "History")) strlcat(title, " - HISTORY", sizeof_title); } - else if (!strcmp(elem0, "Network Options")) + else if (!strcmp(elem0, "Network Settings")) { - strlcpy(title, "NETWORK OPTIONS", sizeof_title); + strlcpy(title, "NETWORK SETTINGS", sizeof_title); if (!strcmp(elem1, "State")) strlcat(title, " - STATE", sizeof_title); if (!strcmp(elem1, "Netplay")) @@ -181,21 +181,21 @@ static INLINE void get_title(const char *label, const char *dir, if (!strcmp(elem1, "Miscellaneous")) strlcat(title, " - MISCELLANEOUS", sizeof_title); } - else if (!strcmp(elem0, "Core Updater Options")) + else if (!strcmp(elem0, "Core Updater Settings")) { - strlcpy(title, "CORE UPDATER OPTIONS", sizeof_title); + strlcpy(title, "CORE UPDATER SETTINGS", sizeof_title); if (!strcmp(elem1, "State")) strlcat(title, " - STATE", sizeof_title); } - else if (!strcmp(elem0, "User Options")) + else if (!strcmp(elem0, "User Settings")) { - strlcpy(title, "USER OPTIONS", sizeof_title); + strlcpy(title, "USER SETTINGS", sizeof_title); if (!strcmp(elem1, "State")) strlcat(title, " - STATE", sizeof_title); } - else if (!strcmp(elem0, "Path Options")) + else if (!strcmp(elem0, "Path Settings")) { - strlcpy(title, "PATH OPTIONS", sizeof_title); + strlcpy(title, "PATH SETTINGS", sizeof_title); if (!strcmp(elem1, "State")) strlcat(title, " - STATE", sizeof_title); if (!strcmp(elem1, "Paths")) @@ -203,9 +203,9 @@ static INLINE void get_title(const char *label, const char *dir, } else if (!strcmp(label, "settings")) strlcpy(title, "SETTINGS", sizeof_title); - else if (!strcmp(elem0, "Driver Options")) + else if (!strcmp(elem0, "Driver Settings")) { - strlcpy(title, "DRIVER OPTIONS", sizeof_title); + strlcpy(title, "DRIVER SETTINGS", sizeof_title); if (!strcmp(elem1, "State")) strlcat(title, " - STATE", sizeof_title); } @@ -215,15 +215,15 @@ static INLINE void get_title(const char *label, const char *dir, strlcpy(title, "FRONTEND PERFORMANCE COUNTERS", sizeof_title); else if (!strcmp(label, "core_counters")) strlcpy(title, "CORE PERFORMANCE COUNTERS", sizeof_title); - else if (!strcmp(elem0, "Shader Options")) + else if (!strcmp(elem0, "Shader Settings")) { - strlcpy(title, "SHADER OPTIONS", sizeof_title); + strlcpy(title, "SHADER SETTINGS", sizeof_title); if (!strcmp(elem1, "State")) strlcat(title, " - STATE", sizeof_title); } - else if (!strcmp(elem0, "Archive Options")) + else if (!strcmp(elem0, "Archive Settings")) { - strlcpy(title, "ARCHIVE OPTIONS", sizeof_title); + strlcpy(title, "ARCHIVE SETTINGS", sizeof_title); if (!strcmp(elem1, "State")) strlcat(title, " - STATE", sizeof_title); } @@ -231,21 +231,21 @@ static INLINE void get_title(const char *label, const char *dir, strlcpy(title, "SHADER PARAMETERS (CURRENT)", sizeof_title); else if (!strcmp(label, "video_shader_preset_parameters")) strlcpy(title, "SHADER PARAMETERS (MENU PRESET)", sizeof_title); - else if (!strcmp(elem0, "Font Options")) + else if (!strcmp(elem0, "Font Settings")) { - strlcpy(title, "FONT OPTIONS", sizeof_title); + strlcpy(title, "FONT SETTINGS", sizeof_title); if (!strcmp(elem1, "Messages")) strlcat(title, " - MESSAGES", sizeof_title); } - else if (!strcmp(elem0, "General Options")) + else if (!strcmp(elem0, "General Settings")) { - strlcpy(title, "GENERAL OPTIONS", sizeof_title); + strlcpy(title, "GENERAL SETTINGS", sizeof_title); if (!strcmp(elem1, "State")) strlcat(title, " - STATE", sizeof_title); } - else if (!strcmp(elem0, "Audio Options")) + else if (!strcmp(elem0, "Audio Settings")) { - strlcpy(title, "AUDIO OPTIONS", sizeof_title); + strlcpy(title, "AUDIO SETTINGS", sizeof_title); if (!strcmp(elem1, "State")) strlcat(title, " - STATE", sizeof_title); else if (!strcmp(elem1, "Synchronization")) @@ -257,15 +257,17 @@ static INLINE void get_title(const char *label, const char *dir, strlcpy(title, "DISK OPTIONS", sizeof_title); else if (!strcmp(label, "core_options")) strlcpy(title, "CORE OPTIONS", sizeof_title); + else if (!strcmp(label, "shader_options")) + strlcpy(title, "SHADER OPTIONS", sizeof_title); else if (!strcmp(label, "core_cheat_options")) strlcpy(title, "CORE CHEAT OPTIONS", sizeof_title); else if (!strcmp(label, "core_input_remapping_options")) strlcpy(title, "CORE INPUT REMAPPING OPTIONS", sizeof_title); else if (!strcmp(label, "core_information")) strlcpy(title, "CORE INFO", sizeof_title); - else if (!strcmp(elem0, "Privacy Options")) + else if (!strcmp(elem0, "Privacy Settings")) { - strlcpy(title, "PRIVACY OPTIONS", sizeof_title); + strlcpy(title, "PRIVACY SETTINGS", sizeof_title); if (!strcmp(elem1, "State")) strlcat(title, " - STATE", sizeof_title); } diff --git a/menu/menu_entries.c b/menu/menu_entries.c index 6cec1126b7..f2425b5cbc 100644 --- a/menu/menu_entries.c +++ b/menu/menu_entries.c @@ -98,7 +98,7 @@ int menu_entries_push_list(menu_handle_t *menu, /* Hack - should come up with something cleaner * here. */ - if (!strcmp(label, "Video Options")) + if (!strcmp(label, "Video Settings")) { #if defined(GEKKO) || defined(__CELLOS_LV2__) menu_list_push(list, "Screen Resolution", "", diff --git a/menu/menu_entries_cbs.c b/menu/menu_entries_cbs.c index a00ab8b8f2..a6ef8def37 100644 --- a/menu/menu_entries_cbs.c +++ b/menu/menu_entries_cbs.c @@ -312,7 +312,7 @@ static int action_ok_shader_pass_load(const char *path, /* This will reset any changed parameters. */ video_shader_resolve_parameters(NULL, driver.menu->shader); - menu_list_flush_stack_by_needle(driver.menu->menu_list, "Shader Options"); + menu_list_flush_stack_by_needle(driver.menu->menu_list, "shader_options"); return 0; #else return -1; @@ -564,7 +564,7 @@ static int action_ok_shader_preset_load(const char *path, menu_shader_manager_set_preset(driver.menu->shader, video_shader_parse_type(shader_path, RARCH_SHADER_NONE), shader_path); - menu_list_flush_stack_by_needle(driver.menu->menu_list, "Shader Options"); + menu_list_flush_stack_by_needle(driver.menu->menu_list, "shader_options"); return 0; #else return -1; @@ -2888,7 +2888,7 @@ static int deferred_push_settings(void *data, void *userdata, settings_list_free(driver.menu->list_settings); driver.menu->list_settings = (rarch_setting_t *)setting_data_new(SL_FLAG_ALL_SETTINGS); - setting = menu_action_find_setting("Driver Options"); + setting = menu_action_find_setting("Driver Settings"); menu_list_clear(list); @@ -3752,7 +3752,7 @@ static int action_iterate_help(const char *label, unsigned action) "Load a libretro core (Core).\n" "Load a content file (Load Content). \n" " \n" - "See Path Options to set directories for faster access to files.\n" + "See Path Settings to set directories for faster access to files.\n" " \n" "Press Accept/OK to continue.", @@ -5029,25 +5029,25 @@ static int is_rdb_entry(const char *label) static int is_settings_entry(const char *label) { return ( - !strcmp(label, "Driver Options") || - !strcmp(label, "General Options") || - !strcmp(label, "Video Options") || - !strcmp(label, "Shader Options") || - !strcmp(label, "Font Options") || - !strcmp(label, "Audio Options") || - !strcmp(label, "Input Options") || - !strcmp(label, "Overlay Options") || - !strcmp(label, "Menu Options") || - !strcmp(label, "UI Options") || - !strcmp(label, "Patch Options") || - !strcmp(label, "Playlist Options") || - !strcmp(label, "Onscreen Keyboard Overlay Options") || - !strcmp(label, "Core Updater Options") || - !strcmp(label, "Network Options") || - !strcmp(label, "Archive Options") || - !strcmp(label, "User Options") || - !strcmp(label, "Path Options") || - !strcmp(label, "Privacy Options")); + !strcmp(label, "Driver Settings") || + !strcmp(label, "General Settings") || + !strcmp(label, "Video Settings") || + !strcmp(label, "Shader Settings") || + !strcmp(label, "Font Settings") || + !strcmp(label, "Audio Settings") || + !strcmp(label, "Input Settings") || + !strcmp(label, "Overlay Settings") || + !strcmp(label, "Menu Settings") || + !strcmp(label, "UI Settings") || + !strcmp(label, "Patch Settings") || + !strcmp(label, "Playlist Settings") || + !strcmp(label, "Onscreen Keyboard Overlay Settings") || + !strcmp(label, "Core Updater Settings") || + !strcmp(label, "Network Settings") || + !strcmp(label, "Archive Settings") || + !strcmp(label, "User Settings") || + !strcmp(label, "Path Settings") || + !strcmp(label, "Privacy Settings")); } static void menu_entries_cbs_init_bind_ok(menu_file_list_cbs_t *cbs, @@ -5118,8 +5118,8 @@ static void menu_entries_cbs_init_bind_ok(menu_file_list_cbs_t *cbs, ) cbs->action_ok = action_ok_shader_parameters; else if ( - !strcmp(label, "Shader Options") || - !strcmp(label, "Input Options") || + !strcmp(label, "shader_options") || + !strcmp(label, "Input Settings") || !strcmp(label, "core_options") || !strcmp(label, "core_cheat_options") || !strcmp(label, "core_input_remapping_options") || @@ -5581,7 +5581,7 @@ static void menu_entries_cbs_init_bind_deferred_push(menu_file_list_cbs_t *cbs, cbs->action_deferred_push = deferred_push_remap_file_load; else if (!strcmp(label, "content_actions")) cbs->action_deferred_push = deferred_push_content_actions; - else if (!strcmp(label, "Shader Options")) + else if (!strcmp(label, "shader_options")) cbs->action_deferred_push = deferred_push_shader_options; else if (type == MENU_SETTING_GROUP) cbs->action_deferred_push = deferred_push_category; diff --git a/settings_data.c b/settings_data.c index 4c10bcbb3f..37d3d4991b 100644 --- a/settings_data.c +++ b/settings_data.c @@ -3279,6 +3279,12 @@ static bool setting_data_append_list_main_menu_options( } } + CONFIG_ACTION( + "shader_options", + "Shader Options", + group_info.name, + subgroup_info.name); + CONFIG_ACTION( "settings", "Settings", @@ -3391,7 +3397,7 @@ static bool setting_data_append_list_driver_options( rarch_setting_group_info_t group_info; rarch_setting_group_info_t subgroup_info; - START_GROUP(group_info, "Driver Options"); + START_GROUP(group_info, "Driver Settings"); START_SUB_GROUP(list, list_info, "State", group_info.name, subgroup_info); @@ -3506,7 +3512,7 @@ static bool setting_data_append_list_general_options( rarch_setting_group_info_t group_info; rarch_setting_group_info_t subgroup_info; - START_GROUP(group_info, "General Options"); + START_GROUP(group_info, "General Settings"); START_SUB_GROUP(list, list_info, "State", group_info.name, subgroup_info); CONFIG_BOOL( @@ -3750,7 +3756,7 @@ static bool setting_data_append_list_video_options( rarch_setting_group_info_t group_info; rarch_setting_group_info_t subgroup_info; - START_GROUP(group_info, "Video Options"); + START_GROUP(group_info, "Video Settings"); START_SUB_GROUP(list, list_info, "State", group_info.name, subgroup_info); CONFIG_BOOL( @@ -4327,7 +4333,7 @@ static bool setting_data_append_list_shader_options( rarch_setting_group_info_t group_info; rarch_setting_group_info_t subgroup_info; - START_GROUP(group_info, "Shader Options"); + START_GROUP(group_info, "Shader Settings"); START_SUB_GROUP(list, list_info, "State", group_info.name, subgroup_info); CONFIG_BOOL( @@ -4366,7 +4372,7 @@ static bool setting_data_append_list_font_options( rarch_setting_group_info_t group_info; rarch_setting_group_info_t subgroup_info; - START_GROUP(group_info, "Font Options"); + START_GROUP(group_info, "Font Settings"); START_SUB_GROUP(list, list_info, "Messages", group_info.name, subgroup_info); CONFIG_PATH( @@ -4443,7 +4449,7 @@ static bool setting_data_append_list_audio_options( rarch_setting_group_info_t group_info; rarch_setting_group_info_t subgroup_info; - START_GROUP(group_info, "Audio Options"); + START_GROUP(group_info, "Audio Settings"); START_SUB_GROUP(list, list_info, "State", group_info.name, subgroup_info); CONFIG_BOOL( @@ -4635,7 +4641,7 @@ static bool setting_data_append_list_input_options( rarch_setting_group_info_t subgroup_info; unsigned i, user; - START_GROUP(group_info, "Input Options"); + START_GROUP(group_info, "Input Settings"); START_SUB_GROUP(list, list_info, "State", group_info.name, subgroup_info); CONFIG_UINT( @@ -5004,7 +5010,7 @@ static bool setting_data_append_list_overlay_options( rarch_setting_group_info_t group_info; rarch_setting_group_info_t subgroup_info; - START_GROUP(group_info, "Overlay Options"); + START_GROUP(group_info, "Overlay Settings"); START_SUB_GROUP(list, list_info, "State", group_info.name, subgroup_info); CONFIG_BOOL( @@ -5076,7 +5082,7 @@ static bool setting_data_append_list_osk_overlay_options( rarch_setting_group_info_t group_info; rarch_setting_group_info_t subgroup_info; - START_GROUP(group_info, "Onscreen Keyboard Overlay Options"); + START_GROUP(group_info, "Onscreen Keyboard Overlay Settings"); START_SUB_GROUP(list, list_info, "State", group_info.name, subgroup_info); CONFIG_BOOL( @@ -5118,7 +5124,7 @@ static bool setting_data_append_list_menu_options( rarch_setting_group_info_t group_info; rarch_setting_group_info_t subgroup_info; - START_GROUP(group_info, "Menu Options"); + START_GROUP(group_info, "Menu Settings"); START_SUB_GROUP(list, list_info, "State", group_info.name, subgroup_info); CONFIG_PATH( @@ -5283,7 +5289,7 @@ static bool setting_data_append_list_ui_options( rarch_setting_group_info_t group_info; rarch_setting_group_info_t subgroup_info; - START_GROUP(group_info, "UI Options"); + START_GROUP(group_info, "UI Settings"); START_SUB_GROUP(list, list_info, "State", group_info.name, subgroup_info); CONFIG_BOOL( @@ -5350,7 +5356,7 @@ static bool setting_data_append_list_archive_options( rarch_setting_group_info_t group_info; rarch_setting_group_info_t subgroup_info; - START_GROUP(group_info, "Archive Options"); + START_GROUP(group_info, "Archive Settings"); START_SUB_GROUP(list, list_info, "State", group_info.name, subgroup_info); CONFIG_UINT( @@ -5380,7 +5386,7 @@ static bool setting_data_append_list_core_updater_options( rarch_setting_group_info_t group_info; rarch_setting_group_info_t subgroup_info; - START_GROUP(group_info, "Core Updater Options"); + START_GROUP(group_info, "Core Updater Settings"); START_SUB_GROUP(list, list_info, "State", group_info.name, subgroup_info); @@ -5433,7 +5439,7 @@ static bool setting_data_append_list_netplay_options( rarch_setting_group_info_t group_info; rarch_setting_group_info_t subgroup_info; - START_GROUP(group_info, "Network Options"); + START_GROUP(group_info, "Network Settings"); START_SUB_GROUP(list, list_info, "Netplay", group_info.name, subgroup_info); @@ -5565,7 +5571,7 @@ static bool setting_data_append_list_patch_options( rarch_setting_group_info_t group_info; rarch_setting_group_info_t subgroup_info; - START_GROUP(group_info, "Patch Options"); + START_GROUP(group_info, "Patch Settings"); START_SUB_GROUP(list, list_info, "State", group_info.name, subgroup_info); CONFIG_BOOL( @@ -5617,7 +5623,7 @@ static bool setting_data_append_list_playlist_options( rarch_setting_group_info_t group_info; rarch_setting_group_info_t subgroup_info; - START_GROUP(group_info, "Playlist Options"); + START_GROUP(group_info, "Playlist Settings"); START_SUB_GROUP(list, list_info, "History", group_info.name, subgroup_info); CONFIG_BOOL( @@ -5656,7 +5662,7 @@ static bool setting_data_append_list_user_options( rarch_setting_group_info_t group_info; rarch_setting_group_info_t subgroup_info; - START_GROUP(group_info, "User Options"); + START_GROUP(group_info, "User Settings"); START_SUB_GROUP(list, list_info, "State", group_info.name, subgroup_info); CONFIG_STRING( @@ -5704,7 +5710,7 @@ static bool setting_data_append_list_path_options( rarch_setting_group_info_t group_info; rarch_setting_group_info_t subgroup_info; - START_GROUP(group_info, "Path Options"); + START_GROUP(group_info, "Path Settings"); START_SUB_GROUP(list, list_info, "Paths", group_info.name, subgroup_info); #ifdef HAVE_MENU @@ -6086,7 +6092,7 @@ static bool setting_data_append_list_privacy_options( rarch_setting_group_info_t group_info; rarch_setting_group_info_t subgroup_info; - START_GROUP(group_info, "Privacy Options"); + START_GROUP(group_info, "Privacy Settings"); START_SUB_GROUP(list, list_info, "State", group_info.name, subgroup_info); CONFIG_BOOL(