diff --git a/intl/msg_hash_lbl.h b/intl/msg_hash_lbl.h index 78d6b41a1e..a1131106e8 100644 --- a/intl/msg_hash_lbl.h +++ b/intl/msg_hash_lbl.h @@ -371,6 +371,8 @@ MSG_HASH(MENU_ENUM_LABEL_DEFERRED_MENU_VIEWS_SETTINGS_LIST, "deferred_menu_views_settings_list") MSG_HASH(MENU_ENUM_LABEL_DEFERRED_QUICK_MENU_VIEWS_SETTINGS_LIST, "deferred_quick_menu_views_settings_list") +MSG_HASH(MENU_ENUM_LABEL_DEFERRED_SETTINGS_VIEWS_SETTINGS_LIST, + "deferred_settings_views_settings_list") MSG_HASH(MENU_ENUM_LABEL_DEFERRED_NETWORK_SETTINGS_LIST, "deferred_network_settings_list") MSG_HASH(MENU_ENUM_LABEL_DEFERRED_ONSCREEN_DISPLAY_SETTINGS_LIST, diff --git a/intl/msg_hash_us.h b/intl/msg_hash_us.h index c2e92d1028..610a408282 100644 --- a/intl/msg_hash_us.h +++ b/intl/msg_hash_us.h @@ -9111,3 +9111,11 @@ MSG_HASH( MENU_ENUM_SUBLABEL_QUICK_MENU_SHOW_RESUME_CONTENT, "Show/hide the 'Resume Content' option." ) +MSG_HASH( + MENU_ENUM_LABEL_VALUE_SETTINGS_VIEWS_SETTINGS, + "Settings" + ) +MSG_HASH( + MENU_ENUM_SUBLABEL_SETTINGS_VIEWS_SETTINGS, + "Show or hide elements on the Settings screen." + ) diff --git a/menu/cbs/menu_cbs_deferred_push.c b/menu/cbs/menu_cbs_deferred_push.c index 4f60b024fc..f3055a1cf0 100644 --- a/menu/cbs/menu_cbs_deferred_push.c +++ b/menu/cbs/menu_cbs_deferred_push.c @@ -161,6 +161,7 @@ generic_deferred_push(deferred_push_onscreen_video_layout_settings_list, DISPLAY generic_deferred_push(deferred_push_menu_file_browser_settings_list,DISPLAYLIST_MENU_FILE_BROWSER_SETTINGS_LIST) generic_deferred_push(deferred_push_menu_views_settings_list, DISPLAYLIST_MENU_VIEWS_SETTINGS_LIST) generic_deferred_push(deferred_push_quick_menu_views_settings_list, DISPLAYLIST_QUICK_MENU_VIEWS_SETTINGS_LIST) +generic_deferred_push(deferred_push_settings_views_settings_list, DISPLAYLIST_SETTINGS_VIEWS_SETTINGS_LIST) generic_deferred_push(deferred_push_menu_settings_list, DISPLAYLIST_MENU_SETTINGS_LIST) generic_deferred_push(deferred_push_user_interface_settings_list, DISPLAYLIST_USER_INTERFACE_SETTINGS_LIST) generic_deferred_push(deferred_push_power_management_settings_list, DISPLAYLIST_POWER_MANAGEMENT_SETTINGS_LIST) @@ -785,6 +786,11 @@ static int menu_cbs_init_bind_deferred_push_compare_label( BIND_ACTION_DEFERRED_PUSH(cbs, deferred_push_menu_views_settings_list); return 0; } + else if (string_is_equal(label, msg_hash_to_str(MENU_ENUM_LABEL_DEFERRED_SETTINGS_VIEWS_SETTINGS_LIST))) + { + BIND_ACTION_DEFERRED_PUSH(cbs, deferred_push_settings_views_settings_list); + return 0; + } else if (string_is_equal(label, msg_hash_to_str(MENU_ENUM_LABEL_DEFERRED_QUICK_MENU_VIEWS_SETTINGS_LIST))) { BIND_ACTION_DEFERRED_PUSH(cbs, deferred_push_quick_menu_views_settings_list); diff --git a/menu/cbs/menu_cbs_ok.c b/menu/cbs/menu_cbs_ok.c index 9621da28c2..e0db50d681 100644 --- a/menu/cbs/menu_cbs_ok.c +++ b/menu/cbs/menu_cbs_ok.c @@ -226,6 +226,8 @@ static enum msg_hash_enums action_ok_dl_to_enum(unsigned lbl) return MENU_ENUM_LABEL_DEFERRED_MENU_SETTINGS_LIST; case ACTION_OK_DL_MENU_VIEWS_SETTINGS_LIST: return MENU_ENUM_LABEL_DEFERRED_MENU_VIEWS_SETTINGS_LIST; + case ACTION_OK_DL_SETTINGS_VIEWS_SETTINGS_LIST: + return MENU_ENUM_LABEL_DEFERRED_SETTINGS_VIEWS_SETTINGS_LIST; case ACTION_OK_DL_QUICK_MENU_VIEWS_SETTINGS_LIST: return MENU_ENUM_LABEL_DEFERRED_QUICK_MENU_VIEWS_SETTINGS_LIST; case ACTION_OK_DL_QUICK_MENU_OVERRIDE_OPTIONS_LIST: @@ -1004,6 +1006,7 @@ int generic_action_ok_displaylist_push(const char *path, #endif case ACTION_OK_DL_MENU_SETTINGS_LIST: case ACTION_OK_DL_MENU_VIEWS_SETTINGS_LIST: + case ACTION_OK_DL_SETTINGS_VIEWS_SETTINGS_LIST: case ACTION_OK_DL_QUICK_MENU_VIEWS_SETTINGS_LIST: case ACTION_OK_DL_QUICK_MENU_OVERRIDE_OPTIONS_LIST: case ACTION_OK_DL_USER_INTERFACE_SETTINGS_LIST: @@ -4590,6 +4593,7 @@ default_action_ok_func(action_ok_onscreen_video_layout_list, ACTION_OK_DL_ONSCRE default_action_ok_func(action_ok_menu_list, ACTION_OK_DL_MENU_SETTINGS_LIST) default_action_ok_func(action_ok_quick_menu_override_options, ACTION_OK_DL_QUICK_MENU_OVERRIDE_OPTIONS_LIST) default_action_ok_func(action_ok_menu_views_list, ACTION_OK_DL_MENU_VIEWS_SETTINGS_LIST) +default_action_ok_func(action_ok_settings_views_list, ACTION_OK_DL_SETTINGS_VIEWS_SETTINGS_LIST) default_action_ok_func(action_ok_quick_menu_views_list, ACTION_OK_DL_QUICK_MENU_VIEWS_SETTINGS_LIST) default_action_ok_func(action_ok_power_management_list, ACTION_OK_DL_POWER_MANAGEMENT_SETTINGS_LIST) default_action_ok_func(action_ok_menu_sounds_list, ACTION_OK_DL_MENU_SOUNDS_LIST) @@ -6490,6 +6494,9 @@ static int menu_cbs_init_bind_ok_compare_label(menu_file_list_cbs_t *cbs, case MENU_ENUM_LABEL_QUICK_MENU_OVERRIDE_OPTIONS: BIND_ACTION_OK(cbs, action_ok_quick_menu_override_options); break; + case MENU_ENUM_LABEL_SETTINGS_VIEWS_SETTINGS: + BIND_ACTION_OK(cbs, action_ok_settings_views_list); + break; case MENU_ENUM_LABEL_QUICK_MENU_VIEWS_SETTINGS: BIND_ACTION_OK(cbs, action_ok_quick_menu_views_list); break; diff --git a/menu/cbs/menu_cbs_sublabel.c b/menu/cbs/menu_cbs_sublabel.c index fa91b6f64e..e19e1f31cb 100644 --- a/menu/cbs/menu_cbs_sublabel.c +++ b/menu/cbs/menu_cbs_sublabel.c @@ -151,6 +151,7 @@ default_sublabel_macro(action_bind_sublabel_cheevos_verbose_enable, MENU_ default_sublabel_macro(action_bind_sublabel_cheevos_auto_screenshot, MENU_ENUM_SUBLABEL_CHEEVOS_AUTO_SCREENSHOT) default_sublabel_macro(action_bind_sublabel_menu_views_settings_list, MENU_ENUM_SUBLABEL_MENU_VIEWS_SETTINGS) default_sublabel_macro(action_bind_sublabel_quick_menu_views_settings_list, MENU_ENUM_SUBLABEL_QUICK_MENU_VIEWS_SETTINGS) +default_sublabel_macro(action_bind_sublabel_settings_views_settings_list, MENU_ENUM_SUBLABEL_SETTINGS_VIEWS_SETTINGS) default_sublabel_macro(action_bind_sublabel_menu_settings_list, MENU_ENUM_SUBLABEL_MENU_SETTINGS) default_sublabel_macro(action_bind_sublabel_video_settings_list, MENU_ENUM_SUBLABEL_VIDEO_SETTINGS) default_sublabel_macro(action_bind_sublabel_crt_switchres_settings_list, MENU_ENUM_SUBLABEL_CRT_SWITCHRES_SETTINGS) @@ -2447,6 +2448,9 @@ int menu_cbs_init_bind_sublabel(menu_file_list_cbs_t *cbs, case MENU_ENUM_LABEL_MENU_VIEWS_SETTINGS: BIND_ACTION_SUBLABEL(cbs, action_bind_sublabel_menu_views_settings_list); break; + case MENU_ENUM_LABEL_SETTINGS_VIEWS_SETTINGS: + BIND_ACTION_SUBLABEL(cbs, action_bind_sublabel_settings_views_settings_list); + break; case MENU_ENUM_LABEL_QUICK_MENU_VIEWS_SETTINGS: BIND_ACTION_SUBLABEL(cbs, action_bind_sublabel_quick_menu_views_settings_list); break; diff --git a/menu/cbs/menu_cbs_title.c b/menu/cbs/menu_cbs_title.c index e913d19bd6..5061a89561 100644 --- a/menu/cbs/menu_cbs_title.c +++ b/menu/cbs/menu_cbs_title.c @@ -178,6 +178,7 @@ default_title_macro(action_get_onscreen_overlay_settings_list, MENU_ENUM_LABEL_ default_title_macro(action_get_onscreen_video_layout_settings_list, MENU_ENUM_LABEL_VALUE_ONSCREEN_VIDEO_LAYOUT_SETTINGS) #endif default_title_macro(action_get_menu_views_settings_list, MENU_ENUM_LABEL_VALUE_MENU_VIEWS_SETTINGS) +default_title_macro(action_get_settings_views_settings_list, MENU_ENUM_LABEL_VALUE_SETTINGS_VIEWS_SETTINGS) default_title_macro(action_get_quick_menu_views_settings_list, MENU_ENUM_LABEL_VALUE_QUICK_MENU_VIEWS_SETTINGS) default_title_macro(action_get_menu_settings_list, MENU_ENUM_LABEL_VALUE_MENU_SETTINGS) default_title_macro(action_get_user_interface_settings_list, MENU_ENUM_LABEL_VALUE_USER_INTERFACE_SETTINGS) @@ -489,6 +490,11 @@ static int menu_cbs_init_bind_title_compare_label(menu_file_list_cbs_t *cbs, BIND_ACTION_GET_TITLE(cbs, action_get_menu_views_settings_list); return 0; } + else if (string_is_equal(label, msg_hash_to_str(MENU_ENUM_LABEL_DEFERRED_SETTINGS_VIEWS_SETTINGS_LIST))) + { + BIND_ACTION_GET_TITLE(cbs, action_get_settings_views_settings_list); + return 0; + } else if (string_is_equal(label, msg_hash_to_str(MENU_ENUM_LABEL_DEFERRED_QUICK_MENU_VIEWS_SETTINGS_LIST))) { BIND_ACTION_GET_TITLE(cbs, action_get_quick_menu_views_settings_list); diff --git a/menu/menu_cbs.h b/menu/menu_cbs.h index a28c0424ea..5293b4b99a 100644 --- a/menu/menu_cbs.h +++ b/menu/menu_cbs.h @@ -139,6 +139,7 @@ enum #endif ACTION_OK_DL_ONSCREEN_NOTIFICATIONS_SETTINGS_LIST, ACTION_OK_DL_MENU_VIEWS_SETTINGS_LIST, + ACTION_OK_DL_SETTINGS_VIEWS_SETTINGS_LIST, ACTION_OK_DL_QUICK_MENU_VIEWS_SETTINGS_LIST, ACTION_OK_DL_QUICK_MENU_OVERRIDE_OPTIONS_LIST, ACTION_OK_DL_MENU_SETTINGS_LIST, diff --git a/menu/menu_displaylist.c b/menu/menu_displaylist.c index f1956c899c..7e5fa19ba0 100644 --- a/menu/menu_displaylist.c +++ b/menu/menu_displaylist.c @@ -4513,6 +4513,7 @@ unsigned menu_displaylist_build_list(file_list_t *list, enum menu_displaylist_ct { menu_displaylist_build_info_t build_list[] = { {MENU_ENUM_LABEL_QUICK_MENU_VIEWS_SETTINGS, PARSE_ACTION }, + {MENU_ENUM_LABEL_SETTINGS_VIEWS_SETTINGS, PARSE_ACTION }, {MENU_ENUM_LABEL_MENU_SHOW_LOAD_CORE, PARSE_ONLY_BOOL }, {MENU_ENUM_LABEL_MENU_SHOW_LOAD_CONTENT, PARSE_ONLY_BOOL }, {MENU_ENUM_LABEL_MENU_SHOW_LOAD_DISC, PARSE_ONLY_BOOL }, @@ -4900,6 +4901,8 @@ unsigned menu_displaylist_build_list(file_list_t *list, enum menu_displaylist_ct } } break; + case DISPLAYLIST_SETTINGS_VIEWS_SETTINGS_LIST: + break; case DISPLAYLIST_QUICK_MENU_VIEWS_SETTINGS_LIST: { menu_displaylist_build_info_t build_list[] = { @@ -6885,6 +6888,7 @@ bool menu_displaylist_ctl(enum menu_displaylist_ctl_state type, case DISPLAYLIST_DIRECTORY_SETTINGS_LIST: case DISPLAYLIST_CONFIGURATION_SETTINGS_LIST: case DISPLAYLIST_CORE_SETTINGS_LIST: + case DISPLAYLIST_SETTINGS_VIEWS_SETTINGS_LIST: case DISPLAYLIST_QUICK_MENU_VIEWS_SETTINGS_LIST: case DISPLAYLIST_MENU_SOUNDS_LIST: case DISPLAYLIST_UPDATER_SETTINGS_LIST: diff --git a/menu/menu_displaylist.h b/menu/menu_displaylist.h index a5ead0616e..a8a78800e3 100644 --- a/menu/menu_displaylist.h +++ b/menu/menu_displaylist.h @@ -155,6 +155,7 @@ enum menu_displaylist_ctl_state DISPLAYLIST_MENU_FILE_BROWSER_SETTINGS_LIST, DISPLAYLIST_MENU_VIEWS_SETTINGS_LIST, DISPLAYLIST_QUICK_MENU_VIEWS_SETTINGS_LIST, + DISPLAYLIST_SETTINGS_VIEWS_SETTINGS_LIST, DISPLAYLIST_MENU_SETTINGS_LIST, DISPLAYLIST_USER_INTERFACE_SETTINGS_LIST, DISPLAYLIST_POWER_MANAGEMENT_SETTINGS_LIST, diff --git a/menu/menu_setting.c b/menu/menu_setting.c index e44aff2513..38561dc06a 100644 --- a/menu/menu_setting.c +++ b/menu/menu_setting.c @@ -7146,6 +7146,14 @@ static bool setting_append_list( &subgroup_info, parent_group); + CONFIG_ACTION( + list, list_info, + MENU_ENUM_LABEL_SETTINGS_VIEWS_SETTINGS, + MENU_ENUM_LABEL_VALUE_SETTINGS_VIEWS_SETTINGS, + &group_info, + &subgroup_info, + parent_group); + CONFIG_ACTION( list, list_info, MENU_ENUM_LABEL_USER_INTERFACE_SETTINGS, diff --git a/msg_hash.h b/msg_hash.h index 122d41d44a..23a2ebdb0a 100644 --- a/msg_hash.h +++ b/msg_hash.h @@ -1079,6 +1079,7 @@ enum msg_hash_enums MENU_LABEL(MENU_VIEWS_SETTINGS), MENU_LABEL(QUICK_MENU_VIEWS_SETTINGS), + MENU_LABEL(SETTINGS_VIEWS_SETTINGS), MENU_LABEL(MENU_SETTINGS), MENU_LABEL(THUMBNAILS_UPDATER_LIST), MENU_LABEL(PL_THUMBNAILS_UPDATER_LIST), @@ -1228,6 +1229,7 @@ enum msg_hash_enums MENU_ENUM_LABEL_DEFERRED_ONSCREEN_NOTIFICATIONS_SETTINGS_LIST, MENU_ENUM_LABEL_DEFERRED_MENU_VIEWS_SETTINGS_LIST, MENU_ENUM_LABEL_DEFERRED_QUICK_MENU_VIEWS_SETTINGS_LIST, + MENU_ENUM_LABEL_DEFERRED_SETTINGS_VIEWS_SETTINGS_LIST, MENU_ENUM_LABEL_DEFERRED_QUICK_MENU_OVERRIDE_OPTIONS, MENU_ENUM_LABEL_DEFERRED_MENU_SETTINGS_LIST, MENU_ENUM_LABEL_DEFERRED_USER_INTERFACE_SETTINGS_LIST,