From cab866371307fcd6ea1971ff07a62893846a3d6a Mon Sep 17 00:00:00 2001 From: twinaphex Date: Wed, 4 Dec 2019 08:25:24 +0100 Subject: [PATCH] (Accessibility) Start adding Accessibility settings - empty for now --- intl/msg_hash_lbl.h | 4 ++++ intl/msg_hash_us.h | 8 ++++++++ menu/cbs/menu_cbs_deferred_push.c | 2 ++ menu/cbs/menu_cbs_ok.c | 7 +++++++ menu/cbs/menu_cbs_sublabel.c | 4 ++++ menu/cbs/menu_cbs_title.c | 2 ++ menu/menu_cbs.h | 1 + menu/menu_displaylist.c | 4 ++++ menu/menu_displaylist.h | 1 + menu/menu_setting.c | 8 ++++++++ msg_hash.h | 2 ++ 11 files changed, 43 insertions(+) diff --git a/intl/msg_hash_lbl.h b/intl/msg_hash_lbl.h index 11af2d613b..50ee7db4ea 100644 --- a/intl/msg_hash_lbl.h +++ b/intl/msg_hash_lbl.h @@ -361,6 +361,8 @@ MSG_HASH(MENU_ENUM_LABEL_DEFERRED_LATENCY_SETTINGS_LIST, "deferred_latency_settings_list") MSG_HASH(MENU_ENUM_LABEL_DEFERRED_AI_SERVICE_SETTINGS_LIST, "deferred_ai_service_settings_list") +MSG_HASH(MENU_ENUM_LABEL_DEFERRED_ACCESSIBILITY_SETTINGS_LIST, + "deferred_accessibility_settings_list") MSG_HASH(MENU_ENUM_LABEL_DEFERRED_LAKKA_LIST, "deferred_lakka_list") MSG_HASH(MENU_ENUM_LABEL_DEFERRED_LAKKA_SERVICES_LIST, @@ -2039,6 +2041,8 @@ MSG_HASH(MENU_ENUM_LABEL_QUICK_MENU_SHOW_CLOSE_CONTENT, "quick_menu_show_close_content") MSG_HASH(MENU_ENUM_LABEL_SETTINGS_SHOW_INPUT, "settings_show_input") +MSG_HASH(MENU_ENUM_LABEL_ACCESSIBILITY_SETTINGS, + "accessibility_settings") MSG_HASH(MENU_ENUM_LABEL_AI_SERVICE_SETTINGS, "ai_service_settings") MSG_HASH(MENU_ENUM_LABEL_AI_SERVICE_MODE, diff --git a/intl/msg_hash_us.h b/intl/msg_hash_us.h index 6edd272916..91edef2e24 100644 --- a/intl/msg_hash_us.h +++ b/intl/msg_hash_us.h @@ -9490,6 +9490,14 @@ MSG_HASH( MENU_ENUM_SUBLABEL_SETTINGS_SHOW_INPUT, "Show or hide 'Input Settings' on the Settings screen." ) +MSG_HASH( + MENU_ENUM_LABEL_VALUE_ACCESSIBILITY_SETTINGS, + "Accessibility" + ) +MSG_HASH( + MENU_ENUM_SUBLABEL_ACCESSIBILITY_SETTINGS, + "Change settings for the Accessibility narrator." + ) MSG_HASH( MENU_ENUM_LABEL_VALUE_AI_SERVICE_SETTINGS, "AI Service" diff --git a/menu/cbs/menu_cbs_deferred_push.c b/menu/cbs/menu_cbs_deferred_push.c index 6ef2f69341..e76bc9ce17 100644 --- a/menu/cbs/menu_cbs_deferred_push.c +++ b/menu/cbs/menu_cbs_deferred_push.c @@ -181,6 +181,7 @@ generic_deferred_push(deferred_push_audio_settings_list, DISPLAYLIST_ generic_deferred_push(deferred_push_audio_mixer_settings_list, DISPLAYLIST_AUDIO_MIXER_SETTINGS_LIST) generic_deferred_push(deferred_push_input_settings_list, DISPLAYLIST_INPUT_SETTINGS_LIST) generic_deferred_push(deferred_push_ai_service_settings_list, DISPLAYLIST_AI_SERVICE_SETTINGS_LIST) +generic_deferred_push(deferred_push_accessibility_settings_list, DISPLAYLIST_ACCESSIBILITY_SETTINGS_LIST) generic_deferred_push(deferred_push_latency_settings_list, DISPLAYLIST_LATENCY_SETTINGS_LIST) generic_deferred_push(deferred_push_recording_settings_list, DISPLAYLIST_RECORDING_SETTINGS_LIST) generic_deferred_push(deferred_push_playlist_settings_list, DISPLAYLIST_PLAYLIST_SETTINGS_LIST) @@ -713,6 +714,7 @@ static int menu_cbs_init_bind_deferred_push_compare_label( {MENU_ENUM_LABEL_DEFERRED_VIDEO_LIST, deferred_video_history_list}, {MENU_ENUM_LABEL_DEFERRED_INPUT_SETTINGS_LIST, deferred_push_input_settings_list}, {MENU_ENUM_LABEL_DEFERRED_AI_SERVICE_SETTINGS_LIST, deferred_push_ai_service_settings_list}, + {MENU_ENUM_LABEL_DEFERRED_ACCESSIBILITY_SETTINGS_LIST, deferred_push_accessibility_settings_list}, {MENU_ENUM_LABEL_CORE_INFORMATION, deferred_push_core_information}, {MENU_ENUM_LABEL_DISC_INFORMATION, deferred_push_disc_information}, {MENU_ENUM_LABEL_SYSTEM_INFORMATION, deferred_push_system_information}, diff --git a/menu/cbs/menu_cbs_ok.c b/menu/cbs/menu_cbs_ok.c index e92a24719e..5884f351ce 100644 --- a/menu/cbs/menu_cbs_ok.c +++ b/menu/cbs/menu_cbs_ok.c @@ -243,6 +243,8 @@ static enum msg_hash_enums action_ok_dl_to_enum(unsigned lbl) return MENU_ENUM_LABEL_DEFERRED_USER_INTERFACE_SETTINGS_LIST; case ACTION_OK_DL_AI_SERVICE_SETTINGS_LIST: return MENU_ENUM_LABEL_DEFERRED_AI_SERVICE_SETTINGS_LIST; + case ACTION_OK_DL_ACCESSIBILITY_SETTINGS_LIST: + return MENU_ENUM_LABEL_DEFERRED_ACCESSIBILITY_SETTINGS_LIST; case ACTION_OK_DL_POWER_MANAGEMENT_SETTINGS_LIST: return MENU_ENUM_LABEL_DEFERRED_POWER_MANAGEMENT_SETTINGS_LIST; case ACTION_OK_DL_MENU_SOUNDS_LIST: @@ -1020,6 +1022,7 @@ int generic_action_ok_displaylist_push(const char *path, case ACTION_OK_DL_QUICK_MENU_OVERRIDE_OPTIONS_LIST: case ACTION_OK_DL_USER_INTERFACE_SETTINGS_LIST: case ACTION_OK_DL_AI_SERVICE_SETTINGS_LIST: + case ACTION_OK_DL_ACCESSIBILITY_SETTINGS_LIST: case ACTION_OK_DL_POWER_MANAGEMENT_SETTINGS_LIST: case ACTION_OK_DL_MENU_SOUNDS_LIST: case ACTION_OK_DL_MENU_FILE_BROWSER_SETTINGS_LIST: @@ -4717,6 +4720,7 @@ default_action_ok_func(action_ok_push_audio_settings_list, ACTION_OK_DL_AUDIO_SE default_action_ok_func(action_ok_push_audio_mixer_settings_list, ACTION_OK_DL_AUDIO_MIXER_SETTINGS_LIST) #endif default_action_ok_func(action_ok_push_ai_service_settings_list, ACTION_OK_DL_AI_SERVICE_SETTINGS_LIST) +default_action_ok_func(action_ok_push_accessibility_settings_list, ACTION_OK_DL_ACCESSIBILITY_SETTINGS_LIST) default_action_ok_func(action_ok_push_input_settings_list, ACTION_OK_DL_INPUT_SETTINGS_LIST) default_action_ok_func(action_ok_push_latency_settings_list, ACTION_OK_DL_LATENCY_SETTINGS_LIST) default_action_ok_func(action_ok_push_recording_settings_list, ACTION_OK_DL_RECORDING_SETTINGS_LIST) @@ -6347,6 +6351,9 @@ static int menu_cbs_init_bind_ok_compare_label(menu_file_list_cbs_t *cbs, case MENU_ENUM_LABEL_ACCOUNTS_LIST: BIND_ACTION_OK(cbs, action_ok_push_accounts_list); break; + case MENU_ENUM_LABEL_ACCESSIBILITY_SETTINGS: + BIND_ACTION_OK(cbs, action_ok_push_accessibility_settings_list); + break; case MENU_ENUM_LABEL_AI_SERVICE_SETTINGS: BIND_ACTION_OK(cbs, action_ok_push_ai_service_settings_list); break; diff --git a/menu/cbs/menu_cbs_sublabel.c b/menu/cbs/menu_cbs_sublabel.c index f9f5b3e05f..a77adb225b 100644 --- a/menu/cbs/menu_cbs_sublabel.c +++ b/menu/cbs/menu_cbs_sublabel.c @@ -128,6 +128,7 @@ default_sublabel_macro(action_bind_sublabel_saving_settings_list, MENU_ default_sublabel_macro(action_bind_sublabel_logging_settings_list, MENU_ENUM_SUBLABEL_LOGGING_SETTINGS) default_sublabel_macro(action_bind_sublabel_user_interface_settings_list, MENU_ENUM_SUBLABEL_USER_INTERFACE_SETTINGS) default_sublabel_macro(action_bind_sublabel_ai_service_settings_list, MENU_ENUM_SUBLABEL_AI_SERVICE_SETTINGS) +default_sublabel_macro(action_bind_sublabel_accessibility_settings_list, MENU_ENUM_SUBLABEL_ACCESSIBILITY_SETTINGS) default_sublabel_macro(action_bind_sublabel_ai_service_mode, MENU_ENUM_SUBLABEL_AI_SERVICE_MODE) default_sublabel_macro(action_bind_sublabel_ai_service_pause, MENU_ENUM_SUBLABEL_AI_SERVICE_PAUSE) default_sublabel_macro(action_bind_sublabel_ai_service_target_lang, MENU_ENUM_SUBLABEL_AI_SERVICE_TARGET_LANG) @@ -2793,6 +2794,9 @@ int menu_cbs_init_bind_sublabel(menu_file_list_cbs_t *cbs, case MENU_ENUM_LABEL_AI_SERVICE_SETTINGS: BIND_ACTION_SUBLABEL(cbs, action_bind_sublabel_ai_service_settings_list); break; + case MENU_ENUM_LABEL_ACCESSIBILITY_SETTINGS: + BIND_ACTION_SUBLABEL(cbs, action_bind_sublabel_accessibility_settings_list); + break; case MENU_ENUM_LABEL_USER_INTERFACE_SETTINGS: BIND_ACTION_SUBLABEL(cbs, action_bind_sublabel_user_interface_settings_list); break; diff --git a/menu/cbs/menu_cbs_title.c b/menu/cbs/menu_cbs_title.c index 1a100dc9a4..2d0b382509 100644 --- a/menu/cbs/menu_cbs_title.c +++ b/menu/cbs/menu_cbs_title.c @@ -352,6 +352,7 @@ default_title_macro(action_get_quick_menu_views_settings_list, MENU_ENUM_LABEL_ 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) default_title_macro(action_get_ai_service_settings_list, MENU_ENUM_LABEL_VALUE_AI_SERVICE_SETTINGS) +default_title_macro(action_get_accessibility_settings_list, MENU_ENUM_LABEL_VALUE_ACCESSIBILITY_SETTINGS) default_title_macro(action_get_power_management_settings_list, MENU_ENUM_LABEL_VALUE_POWER_MANAGEMENT_SETTINGS) default_title_macro(action_get_menu_sounds_list, MENU_ENUM_LABEL_VALUE_MENU_SOUNDS) default_title_macro(action_get_menu_file_browser_settings_list, MENU_ENUM_LABEL_VALUE_MENU_FILE_BROWSER_SETTINGS) @@ -631,6 +632,7 @@ static int menu_cbs_init_bind_title_compare_label(menu_file_list_cbs_t *cbs, {MENU_ENUM_LABEL_DEFERRED_MENU_SETTINGS_LIST, action_get_menu_settings_list}, {MENU_ENUM_LABEL_DEFERRED_USER_INTERFACE_SETTINGS_LIST, action_get_user_interface_settings_list}, {MENU_ENUM_LABEL_DEFERRED_AI_SERVICE_SETTINGS_LIST, action_get_ai_service_settings_list}, + {MENU_ENUM_LABEL_DEFERRED_ACCESSIBILITY_SETTINGS_LIST, action_get_accessibility_settings_list}, {MENU_ENUM_LABEL_DEFERRED_POWER_MANAGEMENT_SETTINGS_LIST, action_get_power_management_settings_list}, {MENU_ENUM_LABEL_DEFERRED_MENU_SOUNDS_LIST, action_get_menu_sounds_list}, {MENU_ENUM_LABEL_DEFERRED_MENU_FILE_BROWSER_SETTINGS_LIST, action_get_menu_file_browser_settings_list}, diff --git a/menu/menu_cbs.h b/menu/menu_cbs.h index 87edd85558..fb1f879522 100644 --- a/menu/menu_cbs.h +++ b/menu/menu_cbs.h @@ -150,6 +150,7 @@ enum ACTION_OK_DL_QUICK_MENU_OVERRIDE_OPTIONS_LIST, ACTION_OK_DL_MENU_SETTINGS_LIST, ACTION_OK_DL_AI_SERVICE_SETTINGS_LIST, + ACTION_OK_DL_ACCESSIBILITY_SETTINGS_LIST, ACTION_OK_DL_USER_INTERFACE_SETTINGS_LIST, ACTION_OK_DL_POWER_MANAGEMENT_SETTINGS_LIST, ACTION_OK_DL_MENU_SOUNDS_LIST, diff --git a/menu/menu_displaylist.c b/menu/menu_displaylist.c index 42e4e1ba24..90970a2951 100644 --- a/menu/menu_displaylist.c +++ b/menu/menu_displaylist.c @@ -4785,6 +4785,8 @@ unsigned menu_displaylist_build_list(file_list_t *list, enum menu_displaylist_ct } break; + case DISPLAYLIST_ACCESSIBILITY_SETTINGS_LIST: + break; case DISPLAYLIST_AI_SERVICE_SETTINGS_LIST: { menu_displaylist_build_info_selective_t build_list[] = { @@ -5988,6 +5990,7 @@ unsigned menu_displaylist_build_list(file_list_t *list, enum menu_displaylist_ct {MENU_ENUM_LABEL_ONSCREEN_DISPLAY_SETTINGS,PARSE_ACTION, true}, {MENU_ENUM_LABEL_USER_INTERFACE_SETTINGS, PARSE_ACTION, true}, {MENU_ENUM_LABEL_AI_SERVICE_SETTINGS, PARSE_ACTION, true}, + {MENU_ENUM_LABEL_ACCESSIBILITY_SETTINGS, PARSE_ACTION, true}, {MENU_ENUM_LABEL_POWER_MANAGEMENT_SETTINGS,PARSE_ACTION, true}, {MENU_ENUM_LABEL_RETRO_ACHIEVEMENTS_SETTINGS,PARSE_ACTION, true}, {MENU_ENUM_LABEL_WIFI_SETTINGS,PARSE_ACTION, true}, @@ -8185,6 +8188,7 @@ bool menu_displaylist_ctl(enum menu_displaylist_ctl_state type, case DISPLAYLIST_CRT_SWITCHRES_SETTINGS_LIST: case DISPLAYLIST_OPTIONS_DISK: case DISPLAYLIST_AI_SERVICE_SETTINGS_LIST: + case DISPLAYLIST_ACCESSIBILITY_SETTINGS_LIST: case DISPLAYLIST_USER_INTERFACE_SETTINGS_LIST: case DISPLAYLIST_ACCOUNTS_TWITCH_LIST: case DISPLAYLIST_RETRO_ACHIEVEMENTS_SETTINGS_LIST: diff --git a/menu/menu_displaylist.h b/menu/menu_displaylist.h index aced47b137..99b84c355b 100644 --- a/menu/menu_displaylist.h +++ b/menu/menu_displaylist.h @@ -153,6 +153,7 @@ enum menu_displaylist_ctl_state DISPLAYLIST_INPUT_HOTKEY_BINDS_LIST, DISPLAYLIST_ONSCREEN_OVERLAY_SETTINGS_LIST, DISPLAYLIST_AI_SERVICE_SETTINGS_LIST, + DISPLAYLIST_ACCESSIBILITY_SETTINGS_LIST, #ifdef HAVE_VIDEO_LAYOUT DISPLAYLIST_ONSCREEN_VIDEO_LAYOUT_SETTINGS_LIST, #endif diff --git a/menu/menu_setting.c b/menu/menu_setting.c index 3a5206ecbe..3eeb3d96b4 100644 --- a/menu/menu_setting.c +++ b/menu/menu_setting.c @@ -7867,6 +7867,14 @@ static bool setting_append_list( &subgroup_info, parent_group); + CONFIG_ACTION( + list, list_info, + MENU_ENUM_LABEL_ACCESSIBILITY_SETTINGS, + MENU_ENUM_LABEL_VALUE_ACCESSIBILITY_SETTINGS, + &group_info, + &subgroup_info, + parent_group); + CONFIG_ACTION( list, list_info, MENU_ENUM_LABEL_POWER_MANAGEMENT_SETTINGS, diff --git a/msg_hash.h b/msg_hash.h index faa32fd2fe..1e6f711f94 100644 --- a/msg_hash.h +++ b/msg_hash.h @@ -1310,6 +1310,7 @@ enum msg_hash_enums MENU_ENUM_LABEL_DEFERRED_REWIND_SETTINGS_LIST, MENU_ENUM_LABEL_DEFERRED_FRAME_TIME_COUNTER_SETTINGS_LIST, MENU_ENUM_LABEL_DEFERRED_AI_SERVICE_SETTINGS_LIST, + MENU_ENUM_LABEL_DEFERRED_ACCESSIBILITY_SETTINGS_LIST, MENU_ENUM_LABEL_DEFERRED_CHEAT_DETAILS_SETTINGS_LIST, MENU_ENUM_LABEL_DEFERRED_CHEAT_SEARCH_SETTINGS_LIST, MENU_ENUM_LABEL_DEFERRED_ONSCREEN_DISPLAY_SETTINGS_LIST, @@ -1759,6 +1760,7 @@ enum msg_hash_enums MENU_LABEL(PLAYLISTS_TAB), MENU_LABEL(MAIN_MENU), MENU_LABEL(INPUT_SETTINGS), + MENU_LABEL(ACCESSIBILITY_SETTINGS), MENU_LABEL(AI_SERVICE_SETTINGS), MENU_LABEL(AI_SERVICE_MODE), MENU_LABEL(AI_SERVICE_TARGET_LANG),