diff --git a/config.def.h b/config.def.h index ffd719affe..0e59f0930e 100644 --- a/config.def.h +++ b/config.def.h @@ -335,8 +335,46 @@ #define DEFAULT_OZONE_TRUNCATE_PLAYLIST_NAME true #endif +#define DEFAULT_SETTINGS_SHOW_DRIVERS true + +#define DEFAULT_SETTINGS_SHOW_VIDEO true + +#define DEFAULT_SETTINGS_SHOW_AUDIO true + #define DEFAULT_SETTINGS_SHOW_INPUT true +#define DEFAULT_SETTINGS_SHOW_LATENCY true + +#define DEFAULT_SETTINGS_SHOW_CORE true + +#define DEFAULT_SETTINGS_SHOW_CONFIGURATION true + +#define DEFAULT_SETTINGS_SHOW_SAVING true + +#define DEFAULT_SETTINGS_SHOW_LOGGING true + +#define DEFAULT_SETTINGS_SHOW_FRAME_THROTTLE true + +#define DEFAULT_SETTINGS_SHOW_RECORDING true + +#define DEFAULT_SETTINGS_SHOW_ONSCREEN_DISPLAY true + +#define DEFAULT_SETTINGS_SHOW_USER_INTERFACE true + +#define DEFAULT_SETTINGS_SHOW_AI_SERVICE true + +#define DEFAULT_SETTINGS_SHOW_POWER_MANAGEMENT true + +#define DEFAULT_SETTINGS_SHOW_ACHIEVEMENTS true + +#define DEFAULT_SETTINGS_SHOW_NETWORK true + +#define DEFAULT_SETTINGS_SHOW_PLAYLISTS true + +#define DEFAULT_SETTINGS_SHOW_USER true + +#define DEFAULT_SETTINGS_SHOW_DIRECTORY true + #define DEFAULT_QUICK_MENU_SHOW_RESUME_CONTENT true #define DEFAULT_QUICK_MENU_SHOW_RESTART_CONTENT true diff --git a/configuration.c b/configuration.c index b4506db0a9..d484fc1e19 100644 --- a/configuration.c +++ b/configuration.c @@ -1454,7 +1454,26 @@ static struct config_bool_setting *populate_settings_bool(settings_t *settings, SETTING_BOOL("menu_show_sublabels", &settings->bools.menu_show_sublabels, true, menu_show_sublabels, false); SETTING_BOOL("menu_dynamic_wallpaper_enable", &settings->bools.menu_dynamic_wallpaper_enable, true, false, false); SETTING_BOOL("menu_ticker_smooth", &settings->bools.menu_ticker_smooth, true, DEFAULT_MENU_TICKER_SMOOTH, false); + SETTING_BOOL("settings_show_drivers", &settings->bools.settings_show_drivers, true, DEFAULT_SETTINGS_SHOW_DRIVERS, false); + SETTING_BOOL("settings_show_video", &settings->bools.settings_show_video, true, DEFAULT_SETTINGS_SHOW_VIDEO, false); + SETTING_BOOL("settings_show_audio", &settings->bools.settings_show_audio, true, DEFAULT_SETTINGS_SHOW_AUDIO, false); SETTING_BOOL("settings_show_input", &settings->bools.settings_show_input, true, DEFAULT_SETTINGS_SHOW_INPUT, false); + SETTING_BOOL("settings_show_latency", &settings->bools.settings_show_latency, true, DEFAULT_SETTINGS_SHOW_LATENCY, false); + SETTING_BOOL("settings_show_core", &settings->bools.settings_show_core, true, DEFAULT_SETTINGS_SHOW_CORE, false); + SETTING_BOOL("settings_show_configuration", &settings->bools.settings_show_configuration, true, DEFAULT_SETTINGS_SHOW_CONFIGURATION, false); + SETTING_BOOL("settings_show_saving", &settings->bools.settings_show_saving, true, DEFAULT_SETTINGS_SHOW_SAVING, false); + SETTING_BOOL("settings_show_logging", &settings->bools.settings_show_logging, true, DEFAULT_SETTINGS_SHOW_LOGGING, false); + SETTING_BOOL("settings_show_frame_throttle", &settings->bools.settings_show_frame_throttle, true, DEFAULT_SETTINGS_SHOW_FRAME_THROTTLE, false); + SETTING_BOOL("settings_show_recording", &settings->bools.settings_show_recording, true, DEFAULT_SETTINGS_SHOW_RECORDING, false); + SETTING_BOOL("settings_show_onscreen_display", &settings->bools.settings_show_onscreen_display, true, DEFAULT_SETTINGS_SHOW_ONSCREEN_DISPLAY, false); + SETTING_BOOL("settings_show_user_interface", &settings->bools.settings_show_user_interface, true, DEFAULT_SETTINGS_SHOW_USER_INTERFACE, false); + SETTING_BOOL("settings_show_ai_service", &settings->bools.settings_show_ai_service, true, DEFAULT_SETTINGS_SHOW_AI_SERVICE, false); + SETTING_BOOL("settings_show_power_management", &settings->bools.settings_show_power_management, true, DEFAULT_SETTINGS_SHOW_POWER_MANAGEMENT, false); + SETTING_BOOL("settings_show_achievements", &settings->bools.settings_show_achievements, true, DEFAULT_SETTINGS_SHOW_ACHIEVEMENTS, false); + SETTING_BOOL("settings_show_network", &settings->bools.settings_show_network, true, DEFAULT_SETTINGS_SHOW_NETWORK, false); + SETTING_BOOL("settings_show_playlists", &settings->bools.settings_show_playlists, true, DEFAULT_SETTINGS_SHOW_PLAYLISTS, false); + SETTING_BOOL("settings_show_user", &settings->bools.settings_show_user, true, DEFAULT_SETTINGS_SHOW_USER, false); + SETTING_BOOL("settings_show_directory", &settings->bools.settings_show_directory, true, DEFAULT_SETTINGS_SHOW_DIRECTORY, false); SETTING_BOOL("quick_menu_show_resume_content", &settings->bools.quick_menu_show_resume_content, true, DEFAULT_QUICK_MENU_SHOW_RESUME_CONTENT, false); SETTING_BOOL("quick_menu_show_restart_content", &settings->bools.quick_menu_show_restart_content, true, DEFAULT_QUICK_MENU_SHOW_RESTART_CONTENT, false); SETTING_BOOL("quick_menu_show_close_content", &settings->bools.quick_menu_show_close_content, true, DEFAULT_QUICK_MENU_SHOW_CLOSE_CONTENT, false); diff --git a/configuration.h b/configuration.h index 1cdb6e9000..6394f2fd52 100644 --- a/configuration.h +++ b/configuration.h @@ -204,7 +204,26 @@ typedef struct settings bool menu_preferred_system_color_theme_set; bool menu_unified_controls; bool menu_ticker_smooth; + bool settings_show_drivers; + bool settings_show_video; + bool settings_show_audio; bool settings_show_input; + bool settings_show_latency; + bool settings_show_core; + bool settings_show_configuration; + bool settings_show_saving; + bool settings_show_logging; + bool settings_show_frame_throttle; + bool settings_show_recording; + bool settings_show_onscreen_display; + bool settings_show_user_interface; + bool settings_show_ai_service; + bool settings_show_power_management; + bool settings_show_achievements; + bool settings_show_network; + bool settings_show_playlists; + bool settings_show_user; + bool settings_show_directory; bool quick_menu_show_resume_content; bool quick_menu_show_restart_content; bool quick_menu_show_close_content; diff --git a/intl/msg_hash_lbl.h b/intl/msg_hash_lbl.h index e0bcf87e66..171f079f88 100644 --- a/intl/msg_hash_lbl.h +++ b/intl/msg_hash_lbl.h @@ -2005,3 +2005,41 @@ MSG_HASH(MENU_ENUM_LABEL_AI_SERVICE_TARGET_LANG, "ai_service_target_lang") MSG_HASH(MENU_ENUM_LABEL_AI_SERVICE_SOURCE_LANG, "ai_service_source_lang") +MSG_HASH(MENU_ENUM_LABEL_SETTINGS_SHOW_DRIVERS, + "settings_show_drivers") +MSG_HASH(MENU_ENUM_LABEL_SETTINGS_SHOW_VIDEO, + "settings_show_video") +MSG_HASH(MENU_ENUM_LABEL_SETTINGS_SHOW_AUDIO, + "settings_show_audio") +MSG_HASH(MENU_ENUM_LABEL_SETTINGS_SHOW_LATENCY, + "settings_show_latency") +MSG_HASH(MENU_ENUM_LABEL_SETTINGS_SHOW_CORE, + "settings_show_core") +MSG_HASH(MENU_ENUM_LABEL_SETTINGS_SHOW_CONFIGURATION, + "settings_show_configuration") +MSG_HASH(MENU_ENUM_LABEL_SETTINGS_SHOW_SAVING, + "settings_show_saving") +MSG_HASH(MENU_ENUM_LABEL_SETTINGS_SHOW_LOGGING, + "settings_show_logging") +MSG_HASH(MENU_ENUM_LABEL_SETTINGS_SHOW_FRAME_THROTTLE, + "settings_show_frame_throttle") +MSG_HASH(MENU_ENUM_LABEL_SETTINGS_SHOW_RECORDING, + "settings_show_recording") +MSG_HASH(MENU_ENUM_LABEL_SETTINGS_SHOW_ONSCREEN_DISPLAY, + "settings_show_onscreen_display") +MSG_HASH(MENU_ENUM_LABEL_SETTINGS_SHOW_USER_INTERFACE, + "settings_show_user_interface") +MSG_HASH(MENU_ENUM_LABEL_SETTINGS_SHOW_AI_SERVICE, + "settings_show_ai_service") +MSG_HASH(MENU_ENUM_LABEL_SETTINGS_SHOW_POWER_MANAGEMENT, + "settings_show_power_management") +MSG_HASH(MENU_ENUM_LABEL_SETTINGS_SHOW_ACHIEVEMENTS, + "settings_show_achievements") +MSG_HASH(MENU_ENUM_LABEL_SETTINGS_SHOW_NETWORK, + "settings_show_network") +MSG_HASH(MENU_ENUM_LABEL_SETTINGS_SHOW_PLAYLISTS, + "settings_show_playlists") +MSG_HASH(MENU_ENUM_LABEL_SETTINGS_SHOW_USER, + "settings_show_user") +MSG_HASH(MENU_ENUM_LABEL_SETTINGS_SHOW_DIRECTORY, + "settings_show_directory") diff --git a/intl/msg_hash_us.h b/intl/msg_hash_us.h index 48f71fdf06..c519d8d62b 100644 --- a/intl/msg_hash_us.h +++ b/intl/msg_hash_us.h @@ -9343,3 +9343,155 @@ MSG_HASH( MENU_ENUM_LABEL_VALUE_LANG_YIDDISH, "Yiddish" ) +MSG_HASH( + MENU_ENUM_LABEL_VALUE_SETTINGS_SHOW_DRIVERS, + "Show Drivers" + ) +MSG_HASH( + MENU_ENUM_SUBLABEL_SETTINGS_SHOW_DRIVERS, + "Show or hide 'Driver Settings' on the Settings screen." + ) +MSG_HASH( + MENU_ENUM_LABEL_VALUE_SETTINGS_SHOW_VIDEO, + "Show Video" + ) +MSG_HASH( + MENU_ENUM_SUBLABEL_SETTINGS_SHOW_VIDEO, + "Show or hide 'Video Settings' on the Settings screen." + ) +MSG_HASH( + MENU_ENUM_LABEL_VALUE_SETTINGS_SHOW_AUDIO, + "Show Audio" + ) +MSG_HASH( + MENU_ENUM_SUBLABEL_SETTINGS_SHOW_AUDIO, + "Show or hide 'Audio Settings' on the Settings screen." + ) +MSG_HASH( + MENU_ENUM_LABEL_VALUE_SETTINGS_SHOW_LATENCY, + "Show Latency" + ) +MSG_HASH( + MENU_ENUM_SUBLABEL_SETTINGS_SHOW_LATENCY, + "Show or hide 'Latency Settings' on the Settings screen." + ) +MSG_HASH( + MENU_ENUM_LABEL_VALUE_SETTINGS_SHOW_CORE, + "Show Core" + ) +MSG_HASH( + MENU_ENUM_SUBLABEL_SETTINGS_SHOW_CORE, + "Show or hide 'Core Settings' on the Settings screen." + ) +MSG_HASH( + MENU_ENUM_LABEL_VALUE_SETTINGS_SHOW_CONFIGURATION, + "Show Configuration" + ) +MSG_HASH( + MENU_ENUM_SUBLABEL_SETTINGS_SHOW_CONFIGURATION, + "Show or hide 'Configuration Settings' on the Settings screen." + ) +MSG_HASH( + MENU_ENUM_LABEL_VALUE_SETTINGS_SHOW_SAVING, + "Show Saving" + ) +MSG_HASH( + MENU_ENUM_SUBLABEL_SETTINGS_SHOW_SAVING, + "Show or hide 'Saving Settings' on the Settings screen." + ) +MSG_HASH( + MENU_ENUM_LABEL_VALUE_SETTINGS_SHOW_LOGGING, + "Show Logging" + ) +MSG_HASH( + MENU_ENUM_SUBLABEL_SETTINGS_SHOW_LOGGING, + "Show or hide 'Logging Settings' on the Settings screen." + ) +MSG_HASH( + MENU_ENUM_LABEL_VALUE_SETTINGS_SHOW_FRAME_THROTTLE, + "Show Frame Throttle" + ) +MSG_HASH( + MENU_ENUM_SUBLABEL_SETTINGS_SHOW_FRAME_THROTTLE, + "Show or hide 'Frame Throttle Settings' on the Settings screen." + ) +MSG_HASH( + MENU_ENUM_LABEL_VALUE_SETTINGS_SHOW_RECORDING, + "Show Recording" + ) +MSG_HASH( + MENU_ENUM_SUBLABEL_SETTINGS_SHOW_RECORDING, + "Show or hide 'Recording Settings' on the Settings screen." + ) +MSG_HASH( + MENU_ENUM_LABEL_VALUE_SETTINGS_SHOW_ONSCREEN_DISPLAY, + "Show Onscreen Display" + ) +MSG_HASH( + MENU_ENUM_SUBLABEL_SETTINGS_SHOW_ONSCREEN_DISPLAY, + "Show or hide 'Onscreen Display Settings' on the Settings screen." + ) +MSG_HASH( + MENU_ENUM_LABEL_VALUE_SETTINGS_SHOW_USER_INTERFACE, + "Show User Interface" + ) +MSG_HASH( + MENU_ENUM_SUBLABEL_SETTINGS_SHOW_USER_INTERFACE, + "Show or hide 'User Interface Settings' on the Settings screen." + ) +MSG_HASH( + MENU_ENUM_LABEL_VALUE_SETTINGS_SHOW_AI_SERVICE, + "Show AI Service" + ) +MSG_HASH( + MENU_ENUM_SUBLABEL_SETTINGS_SHOW_AI_SERVICE, + "Show or hide 'AI Service Settings' on the Settings screen." + ) +MSG_HASH( + MENU_ENUM_LABEL_VALUE_SETTINGS_SHOW_POWER_MANAGEMENT, + "Show Power Management" + ) +MSG_HASH( + MENU_ENUM_SUBLABEL_SETTINGS_SHOW_POWER_MANAGEMENT, + "Show or hide 'Power Management Settings' on the Settings screen." + ) +MSG_HASH( + MENU_ENUM_LABEL_VALUE_SETTINGS_SHOW_ACHIEVEMENTS, + "Show Achievements" + ) +MSG_HASH( + MENU_ENUM_SUBLABEL_SETTINGS_SHOW_ACHIEVEMENTS, + "Show or hide 'Achievements Settings' on the Settings screen." + ) +MSG_HASH( + MENU_ENUM_LABEL_VALUE_SETTINGS_SHOW_NETWORK, + "Show Network" + ) +MSG_HASH( + MENU_ENUM_SUBLABEL_SETTINGS_SHOW_NETWORK, + "Show or hide 'Network Settings' on the Settings screen." + ) +MSG_HASH( + MENU_ENUM_LABEL_VALUE_SETTINGS_SHOW_PLAYLISTS, + "Show Playlists" + ) +MSG_HASH( + MENU_ENUM_SUBLABEL_SETTINGS_SHOW_PLAYLISTS, + "Show or hide 'Playlists Settings' on the Settings screen." + ) +MSG_HASH( + MENU_ENUM_LABEL_VALUE_SETTINGS_SHOW_USER, + "Show User" + ) +MSG_HASH( + MENU_ENUM_SUBLABEL_SETTINGS_SHOW_USER, + "Show or hide 'User Settings' on the Settings screen." + ) +MSG_HASH( + MENU_ENUM_LABEL_VALUE_SETTINGS_SHOW_DIRECTORY, + "Show Directory" + ) +MSG_HASH( + MENU_ENUM_SUBLABEL_SETTINGS_SHOW_DIRECTORY, + "Show or hide 'Directory Settings' on the Settings screen." + ) diff --git a/menu/cbs/menu_cbs_sublabel.c b/menu/cbs/menu_cbs_sublabel.c index 56fd5845d2..0dc33b827e 100644 --- a/menu/cbs/menu_cbs_sublabel.c +++ b/menu/cbs/menu_cbs_sublabel.c @@ -476,11 +476,29 @@ default_sublabel_macro(action_bind_sublabel_menu_framebuffer_opacity, default_sublabel_macro(action_bind_sublabel_menu_horizontal_animation, MENU_ENUM_SUBLABEL_MENU_HORIZONTAL_ANIMATION) default_sublabel_macro(action_bind_sublabel_menu_ribbon_enable, MENU_ENUM_SUBLABEL_XMB_RIBBON_ENABLE) default_sublabel_macro(action_bind_sublabel_menu_font, MENU_ENUM_SUBLABEL_XMB_FONT) -default_sublabel_macro(action_bind_sublabel_settings_show_input, MENU_ENUM_SUBLABEL_SETTINGS_SHOW_INPUT) +default_sublabel_macro(action_bind_sublabel_settings_show_drivers, MENU_ENUM_SUBLABEL_SETTINGS_SHOW_DRIVERS) +default_sublabel_macro(action_bind_sublabel_settings_show_video, MENU_ENUM_SUBLABEL_SETTINGS_SHOW_VIDEO) +default_sublabel_macro(action_bind_sublabel_settings_show_audio, MENU_ENUM_SUBLABEL_SETTINGS_SHOW_AUDIO) +default_sublabel_macro(action_bind_sublabel_settings_show_input, MENU_ENUM_SUBLABEL_SETTINGS_SHOW_INPUT) +default_sublabel_macro(action_bind_sublabel_settings_show_latency, MENU_ENUM_SUBLABEL_SETTINGS_SHOW_LATENCY) +default_sublabel_macro(action_bind_sublabel_settings_show_core, MENU_ENUM_SUBLABEL_SETTINGS_SHOW_CORE) +default_sublabel_macro(action_bind_sublabel_settings_show_configuration, MENU_ENUM_SUBLABEL_SETTINGS_SHOW_CONFIGURATION) +default_sublabel_macro(action_bind_sublabel_settings_show_saving, MENU_ENUM_SUBLABEL_SETTINGS_SHOW_SAVING) +default_sublabel_macro(action_bind_sublabel_settings_show_frame_throttle, MENU_ENUM_SUBLABEL_SETTINGS_SHOW_FRAME_THROTTLE) +default_sublabel_macro(action_bind_sublabel_settings_show_recording, MENU_ENUM_SUBLABEL_SETTINGS_SHOW_RECORDING) +default_sublabel_macro(action_bind_sublabel_settings_show_onscreen_display, MENU_ENUM_SUBLABEL_SETTINGS_SHOW_ONSCREEN_DISPLAY) +default_sublabel_macro(action_bind_sublabel_settings_show_user_interface, MENU_ENUM_SUBLABEL_SETTINGS_SHOW_USER_INTERFACE) +default_sublabel_macro(action_bind_sublabel_settings_show_ai_service, MENU_ENUM_SUBLABEL_SETTINGS_SHOW_AI_SERVICE) +default_sublabel_macro(action_bind_sublabel_settings_show_power_management, MENU_ENUM_SUBLABEL_SETTINGS_SHOW_POWER_MANAGEMENT) +default_sublabel_macro(action_bind_sublabel_settings_show_achievements, MENU_ENUM_SUBLABEL_SETTINGS_SHOW_ACHIEVEMENTS) +default_sublabel_macro(action_bind_sublabel_settings_show_network, MENU_ENUM_SUBLABEL_SETTINGS_SHOW_NETWORK) +default_sublabel_macro(action_bind_sublabel_settings_show_playlists, MENU_ENUM_SUBLABEL_SETTINGS_SHOW_PLAYLISTS) +default_sublabel_macro(action_bind_sublabel_settings_show_user, MENU_ENUM_SUBLABEL_SETTINGS_SHOW_USER) +default_sublabel_macro(action_bind_sublabel_settings_show_directory, MENU_ENUM_SUBLABEL_SETTINGS_SHOW_DIRECTORY) default_sublabel_macro(action_bind_sublabel_quick_menu_show_take_screenshot, MENU_ENUM_SUBLABEL_QUICK_MENU_SHOW_TAKE_SCREENSHOT) -default_sublabel_macro(action_bind_sublabel_quick_menu_show_resume_content, MENU_ENUM_SUBLABEL_QUICK_MENU_SHOW_RESUME_CONTENT) +default_sublabel_macro(action_bind_sublabel_quick_menu_show_resume_content, MENU_ENUM_SUBLABEL_QUICK_MENU_SHOW_RESUME_CONTENT) default_sublabel_macro(action_bind_sublabel_quick_menu_show_restart_content, MENU_ENUM_SUBLABEL_QUICK_MENU_SHOW_RESTART_CONTENT) -default_sublabel_macro(action_bind_sublabel_quick_menu_show_close_content, MENU_ENUM_SUBLABEL_QUICK_MENU_SHOW_CLOSE_CONTENT) +default_sublabel_macro(action_bind_sublabel_quick_menu_show_close_content, MENU_ENUM_SUBLABEL_QUICK_MENU_SHOW_CLOSE_CONTENT) default_sublabel_macro(action_bind_sublabel_quick_menu_show_save_load_state, MENU_ENUM_SUBLABEL_QUICK_MENU_SHOW_SAVE_LOAD_STATE) default_sublabel_macro(action_bind_sublabel_quick_menu_show_undo_save_load_state, MENU_ENUM_SUBLABEL_QUICK_MENU_SHOW_UNDO_SAVE_LOAD_STATE) default_sublabel_macro(action_bind_sublabel_quick_menu_show_add_to_favorites, MENU_ENUM_SUBLABEL_QUICK_MENU_SHOW_ADD_TO_FAVORITES) @@ -1392,9 +1410,63 @@ int menu_cbs_init_bind_sublabel(menu_file_list_cbs_t *cbs, case MENU_ENUM_LABEL_GOTO_FAVORITES: BIND_ACTION_SUBLABEL(cbs, action_bind_sublabel_goto_favorites); break; + case MENU_ENUM_LABEL_SETTINGS_SHOW_DRIVERS: + BIND_ACTION_SUBLABEL(cbs, action_bind_sublabel_settings_show_drivers); + break; + case MENU_ENUM_LABEL_SETTINGS_SHOW_VIDEO: + BIND_ACTION_SUBLABEL(cbs, action_bind_sublabel_settings_show_video); + break; + case MENU_ENUM_LABEL_SETTINGS_SHOW_AUDIO: + BIND_ACTION_SUBLABEL(cbs, action_bind_sublabel_settings_show_audio); + break; case MENU_ENUM_LABEL_SETTINGS_SHOW_INPUT: BIND_ACTION_SUBLABEL(cbs, action_bind_sublabel_settings_show_input); break; + case MENU_ENUM_LABEL_SETTINGS_SHOW_LATENCY: + BIND_ACTION_SUBLABEL(cbs, action_bind_sublabel_settings_show_latency); + break; + case MENU_ENUM_LABEL_SETTINGS_SHOW_CORE: + BIND_ACTION_SUBLABEL(cbs, action_bind_sublabel_settings_show_core); + break; + case MENU_ENUM_LABEL_SETTINGS_SHOW_CONFIGURATION: + BIND_ACTION_SUBLABEL(cbs, action_bind_sublabel_settings_show_configuration); + break; + case MENU_ENUM_LABEL_SETTINGS_SHOW_SAVING: + BIND_ACTION_SUBLABEL(cbs, action_bind_sublabel_settings_show_saving); + break; + case MENU_ENUM_LABEL_SETTINGS_SHOW_FRAME_THROTTLE: + BIND_ACTION_SUBLABEL(cbs, action_bind_sublabel_settings_show_frame_throttle); + break; + case MENU_ENUM_LABEL_SETTINGS_SHOW_RECORDING: + BIND_ACTION_SUBLABEL(cbs, action_bind_sublabel_settings_show_recording); + break; + case MENU_ENUM_LABEL_SETTINGS_SHOW_ONSCREEN_DISPLAY: + BIND_ACTION_SUBLABEL(cbs, action_bind_sublabel_settings_show_onscreen_display); + break; + case MENU_ENUM_LABEL_SETTINGS_SHOW_USER_INTERFACE: + BIND_ACTION_SUBLABEL(cbs, action_bind_sublabel_settings_show_user_interface); + break; + case MENU_ENUM_LABEL_SETTINGS_SHOW_AI_SERVICE: + BIND_ACTION_SUBLABEL(cbs, action_bind_sublabel_settings_show_ai_service); + break; + case MENU_ENUM_LABEL_SETTINGS_SHOW_POWER_MANAGEMENT: + BIND_ACTION_SUBLABEL(cbs, action_bind_sublabel_settings_show_power_management); + break; + case MENU_ENUM_LABEL_SETTINGS_SHOW_ACHIEVEMENTS: + BIND_ACTION_SUBLABEL(cbs, action_bind_sublabel_settings_show_achievements); + break; + case MENU_ENUM_LABEL_SETTINGS_SHOW_NETWORK: + BIND_ACTION_SUBLABEL(cbs, action_bind_sublabel_settings_show_network); + break; + case MENU_ENUM_LABEL_SETTINGS_SHOW_PLAYLISTS: + BIND_ACTION_SUBLABEL(cbs, action_bind_sublabel_settings_show_playlists); + break; + case MENU_ENUM_LABEL_SETTINGS_SHOW_USER: + BIND_ACTION_SUBLABEL(cbs, action_bind_sublabel_settings_show_user); + break; + case MENU_ENUM_LABEL_SETTINGS_SHOW_DIRECTORY: + BIND_ACTION_SUBLABEL(cbs, action_bind_sublabel_settings_show_directory); + break; case MENU_ENUM_LABEL_QUICK_MENU_SHOW_RESUME_CONTENT: BIND_ACTION_SUBLABEL(cbs, action_bind_sublabel_quick_menu_show_resume_content); break; diff --git a/menu/menu_displaylist.c b/menu/menu_displaylist.c index badb404073..7c492bcd7a 100644 --- a/menu/menu_displaylist.c +++ b/menu/menu_displaylist.c @@ -4831,13 +4831,74 @@ unsigned menu_displaylist_build_list(file_list_t *list, enum menu_displaylist_ct switch (build_list[i].enum_idx) { case MENU_ENUM_LABEL_AI_SERVICE_SETTINGS: -#ifndef HAVE_TRANSLATE +#ifdef HAVE_TRANSLATE + build_list[i].checked = settings->bools.settings_show_ai_service; +#else build_list[i].checked = false; #endif break; + case MENU_ENUM_LABEL_DRIVER_SETTINGS: + build_list[i].checked = settings->bools.settings_show_drivers; + break; + case MENU_ENUM_LABEL_VIDEO_SETTINGS: + build_list[i].checked = settings->bools.settings_show_video; + break; + case MENU_ENUM_LABEL_AUDIO_SETTINGS: + build_list[i].checked = settings->bools.settings_show_audio; + break; case MENU_ENUM_LABEL_INPUT_SETTINGS: build_list[i].checked = settings->bools.settings_show_input; break; + case MENU_ENUM_LABEL_LATENCY_SETTINGS: + build_list[i].checked = settings->bools.settings_show_latency; + break; + case MENU_ENUM_LABEL_CORE_SETTINGS: + build_list[i].checked = settings->bools.settings_show_core; + break; + case MENU_ENUM_LABEL_CONFIGURATION_SETTINGS: + build_list[i].checked = settings->bools.settings_show_configuration; + break; + case MENU_ENUM_LABEL_SAVING_SETTINGS: + build_list[i].checked = settings->bools.settings_show_saving; + break; + case MENU_ENUM_LABEL_LOGGING_SETTINGS: + build_list[i].checked = settings->bools.settings_show_logging; + break; + case MENU_ENUM_LABEL_FRAME_THROTTLE_SETTINGS: + build_list[i].checked = settings->bools.settings_show_frame_throttle; + break; + case MENU_ENUM_LABEL_RECORDING_SETTINGS: + build_list[i].checked = settings->bools.settings_show_recording; + break; + case MENU_ENUM_LABEL_ONSCREEN_DISPLAY_SETTINGS: + build_list[i].checked = settings->bools.settings_show_onscreen_display; + break; + case MENU_ENUM_LABEL_USER_INTERFACE_SETTINGS: + build_list[i].checked = settings->bools.settings_show_user_interface; + break; + case MENU_ENUM_LABEL_POWER_MANAGEMENT_SETTINGS: + build_list[i].checked = settings->bools.settings_show_power_management; + break; + case MENU_ENUM_LABEL_RETRO_ACHIEVEMENTS_SETTINGS: + build_list[i].checked = settings->bools.settings_show_achievements; + break; + case MENU_ENUM_LABEL_NETWORK_SETTINGS: + build_list[i].checked = settings->bools.settings_show_network; + break; + case MENU_ENUM_LABEL_PLAYLIST_SETTINGS: + build_list[i].checked = settings->bools.settings_show_playlists; + break; + case MENU_ENUM_LABEL_USER_SETTINGS: + build_list[i].checked = settings->bools.settings_show_user; + break; + case MENU_ENUM_LABEL_DIRECTORY_SETTINGS: + build_list[i].checked = settings->bools.settings_show_directory; + break; + /* MISSING: + * MENU_ENUM_LABEL_WIFI_SETTINGS + * MENU_ENUM_LABEL_NETPLAY_LAN_SCAN_SETTINGS + * MENU_ENUM_LABEL_LAKKA_SERVICES + */ default: break; } @@ -4944,7 +5005,26 @@ unsigned menu_displaylist_build_list(file_list_t *list, enum menu_displaylist_ct case DISPLAYLIST_SETTINGS_VIEWS_SETTINGS_LIST: { menu_displaylist_build_info_t build_list[] = { - {MENU_ENUM_LABEL_SETTINGS_SHOW_INPUT, PARSE_ONLY_BOOL}, + {MENU_ENUM_LABEL_SETTINGS_SHOW_DRIVERS, PARSE_ONLY_BOOL}, + {MENU_ENUM_LABEL_SETTINGS_SHOW_VIDEO, PARSE_ONLY_BOOL}, + {MENU_ENUM_LABEL_SETTINGS_SHOW_AUDIO, PARSE_ONLY_BOOL}, + {MENU_ENUM_LABEL_SETTINGS_SHOW_INPUT, PARSE_ONLY_BOOL}, + {MENU_ENUM_LABEL_SETTINGS_SHOW_LATENCY, PARSE_ONLY_BOOL}, + {MENU_ENUM_LABEL_SETTINGS_SHOW_CORE, PARSE_ONLY_BOOL}, + {MENU_ENUM_LABEL_SETTINGS_SHOW_CONFIGURATION, PARSE_ONLY_BOOL}, + {MENU_ENUM_LABEL_SETTINGS_SHOW_SAVING, PARSE_ONLY_BOOL}, + {MENU_ENUM_LABEL_SETTINGS_SHOW_LOGGING, PARSE_ONLY_BOOL}, + {MENU_ENUM_LABEL_SETTINGS_SHOW_FRAME_THROTTLE, PARSE_ONLY_BOOL}, + {MENU_ENUM_LABEL_SETTINGS_SHOW_RECORDING, PARSE_ONLY_BOOL}, + {MENU_ENUM_LABEL_SETTINGS_SHOW_ONSCREEN_DISPLAY, PARSE_ONLY_BOOL}, + {MENU_ENUM_LABEL_SETTINGS_SHOW_USER_INTERFACE, PARSE_ONLY_BOOL}, + {MENU_ENUM_LABEL_SETTINGS_SHOW_AI_SERVICE, PARSE_ONLY_BOOL}, + {MENU_ENUM_LABEL_SETTINGS_SHOW_POWER_MANAGEMENT, PARSE_ONLY_BOOL}, + {MENU_ENUM_LABEL_SETTINGS_SHOW_ACHIEVEMENTS, PARSE_ONLY_BOOL}, + {MENU_ENUM_LABEL_SETTINGS_SHOW_NETWORK, PARSE_ONLY_BOOL}, + {MENU_ENUM_LABEL_SETTINGS_SHOW_PLAYLISTS, PARSE_ONLY_BOOL}, + {MENU_ENUM_LABEL_SETTINGS_SHOW_USER, PARSE_ONLY_BOOL}, + {MENU_ENUM_LABEL_SETTINGS_SHOW_DIRECTORY, PARSE_ONLY_BOOL}, }; for (i = 0; i < ARRAY_SIZE(build_list); i++) diff --git a/menu/menu_setting.c b/menu/menu_setting.c index 497357de8b..6ab88d6863 100644 --- a/menu/menu_setting.c +++ b/menu/menu_setting.c @@ -13294,6 +13294,51 @@ static bool setting_append_list( SD_FLAG_NONE); #endif + CONFIG_BOOL( + list, list_info, + &settings->bools.settings_show_drivers, + MENU_ENUM_LABEL_SETTINGS_SHOW_DRIVERS, + MENU_ENUM_LABEL_VALUE_SETTINGS_SHOW_DRIVERS, + DEFAULT_SETTINGS_SHOW_DRIVERS, + MENU_ENUM_LABEL_VALUE_OFF, + MENU_ENUM_LABEL_VALUE_ON, + &group_info, + &subgroup_info, + parent_group, + general_write_handler, + general_read_handler, + SD_FLAG_NONE); + + CONFIG_BOOL( + list, list_info, + &settings->bools.settings_show_video, + MENU_ENUM_LABEL_SETTINGS_SHOW_VIDEO, + MENU_ENUM_LABEL_VALUE_SETTINGS_SHOW_VIDEO, + DEFAULT_SETTINGS_SHOW_VIDEO, + MENU_ENUM_LABEL_VALUE_OFF, + MENU_ENUM_LABEL_VALUE_ON, + &group_info, + &subgroup_info, + parent_group, + general_write_handler, + general_read_handler, + SD_FLAG_NONE); + + CONFIG_BOOL( + list, list_info, + &settings->bools.settings_show_audio, + MENU_ENUM_LABEL_SETTINGS_SHOW_AUDIO, + MENU_ENUM_LABEL_VALUE_SETTINGS_SHOW_AUDIO, + DEFAULT_SETTINGS_SHOW_AUDIO, + MENU_ENUM_LABEL_VALUE_OFF, + MENU_ENUM_LABEL_VALUE_ON, + &group_info, + &subgroup_info, + parent_group, + general_write_handler, + general_read_handler, + SD_FLAG_NONE); + CONFIG_BOOL( list, list_info, &settings->bools.settings_show_input, @@ -13309,6 +13354,246 @@ static bool setting_append_list( general_read_handler, SD_FLAG_NONE); + CONFIG_BOOL( + list, list_info, + &settings->bools.settings_show_latency, + MENU_ENUM_LABEL_SETTINGS_SHOW_LATENCY, + MENU_ENUM_LABEL_VALUE_SETTINGS_SHOW_LATENCY, + DEFAULT_SETTINGS_SHOW_LATENCY, + MENU_ENUM_LABEL_VALUE_OFF, + MENU_ENUM_LABEL_VALUE_ON, + &group_info, + &subgroup_info, + parent_group, + general_write_handler, + general_read_handler, + SD_FLAG_NONE); + + CONFIG_BOOL( + list, list_info, + &settings->bools.settings_show_core, + MENU_ENUM_LABEL_SETTINGS_SHOW_CORE, + MENU_ENUM_LABEL_VALUE_SETTINGS_SHOW_CORE, + DEFAULT_SETTINGS_SHOW_CORE, + MENU_ENUM_LABEL_VALUE_OFF, + MENU_ENUM_LABEL_VALUE_ON, + &group_info, + &subgroup_info, + parent_group, + general_write_handler, + general_read_handler, + SD_FLAG_NONE); + + CONFIG_BOOL( + list, list_info, + &settings->bools.settings_show_configuration, + MENU_ENUM_LABEL_SETTINGS_SHOW_CONFIGURATION, + MENU_ENUM_LABEL_VALUE_SETTINGS_SHOW_CONFIGURATION, + DEFAULT_SETTINGS_SHOW_CONFIGURATION, + MENU_ENUM_LABEL_VALUE_OFF, + MENU_ENUM_LABEL_VALUE_ON, + &group_info, + &subgroup_info, + parent_group, + general_write_handler, + general_read_handler, + SD_FLAG_NONE); + + CONFIG_BOOL( + list, list_info, + &settings->bools.settings_show_saving, + MENU_ENUM_LABEL_SETTINGS_SHOW_SAVING, + MENU_ENUM_LABEL_VALUE_SETTINGS_SHOW_SAVING, + DEFAULT_SETTINGS_SHOW_SAVING, + MENU_ENUM_LABEL_VALUE_OFF, + MENU_ENUM_LABEL_VALUE_ON, + &group_info, + &subgroup_info, + parent_group, + general_write_handler, + general_read_handler, + SD_FLAG_NONE); + + CONFIG_BOOL( + list, list_info, + &settings->bools.settings_show_logging, + MENU_ENUM_LABEL_SETTINGS_SHOW_LOGGING, + MENU_ENUM_LABEL_VALUE_SETTINGS_SHOW_LOGGING, + DEFAULT_SETTINGS_SHOW_LOGGING, + MENU_ENUM_LABEL_VALUE_OFF, + MENU_ENUM_LABEL_VALUE_ON, + &group_info, + &subgroup_info, + parent_group, + general_write_handler, + general_read_handler, + SD_FLAG_NONE); + + CONFIG_BOOL( + list, list_info, + &settings->bools.settings_show_frame_throttle, + MENU_ENUM_LABEL_SETTINGS_SHOW_FRAME_THROTTLE, + MENU_ENUM_LABEL_VALUE_SETTINGS_SHOW_FRAME_THROTTLE, + DEFAULT_SETTINGS_SHOW_FRAME_THROTTLE, + MENU_ENUM_LABEL_VALUE_OFF, + MENU_ENUM_LABEL_VALUE_ON, + &group_info, + &subgroup_info, + parent_group, + general_write_handler, + general_read_handler, + SD_FLAG_NONE); + + CONFIG_BOOL( + list, list_info, + &settings->bools.settings_show_recording, + MENU_ENUM_LABEL_SETTINGS_SHOW_RECORDING, + MENU_ENUM_LABEL_VALUE_SETTINGS_SHOW_RECORDING, + DEFAULT_SETTINGS_SHOW_RECORDING, + MENU_ENUM_LABEL_VALUE_OFF, + MENU_ENUM_LABEL_VALUE_ON, + &group_info, + &subgroup_info, + parent_group, + general_write_handler, + general_read_handler, + SD_FLAG_NONE); + + CONFIG_BOOL( + list, list_info, + &settings->bools.settings_show_onscreen_display, + MENU_ENUM_LABEL_SETTINGS_SHOW_ONSCREEN_DISPLAY, + MENU_ENUM_LABEL_VALUE_SETTINGS_SHOW_ONSCREEN_DISPLAY, + DEFAULT_SETTINGS_SHOW_ONSCREEN_DISPLAY, + MENU_ENUM_LABEL_VALUE_OFF, + MENU_ENUM_LABEL_VALUE_ON, + &group_info, + &subgroup_info, + parent_group, + general_write_handler, + general_read_handler, + SD_FLAG_NONE); + + CONFIG_BOOL( + list, list_info, + &settings->bools.settings_show_user_interface, + MENU_ENUM_LABEL_SETTINGS_SHOW_USER_INTERFACE, + MENU_ENUM_LABEL_VALUE_SETTINGS_SHOW_USER_INTERFACE, + DEFAULT_SETTINGS_SHOW_USER_INTERFACE, + MENU_ENUM_LABEL_VALUE_OFF, + MENU_ENUM_LABEL_VALUE_ON, + &group_info, + &subgroup_info, + parent_group, + general_write_handler, + general_read_handler, + SD_FLAG_NONE); + + CONFIG_BOOL( + list, list_info, + &settings->bools.settings_show_ai_service, + MENU_ENUM_LABEL_SETTINGS_SHOW_AI_SERVICE, + MENU_ENUM_LABEL_VALUE_SETTINGS_SHOW_AI_SERVICE, + DEFAULT_SETTINGS_SHOW_AI_SERVICE, + MENU_ENUM_LABEL_VALUE_OFF, + MENU_ENUM_LABEL_VALUE_ON, + &group_info, + &subgroup_info, + parent_group, + general_write_handler, + general_read_handler, + SD_FLAG_NONE); + + CONFIG_BOOL( + list, list_info, + &settings->bools.settings_show_power_management, + MENU_ENUM_LABEL_SETTINGS_SHOW_POWER_MANAGEMENT, + MENU_ENUM_LABEL_VALUE_SETTINGS_SHOW_POWER_MANAGEMENT, + DEFAULT_SETTINGS_SHOW_POWER_MANAGEMENT, + MENU_ENUM_LABEL_VALUE_OFF, + MENU_ENUM_LABEL_VALUE_ON, + &group_info, + &subgroup_info, + parent_group, + general_write_handler, + general_read_handler, + SD_FLAG_NONE); + + CONFIG_BOOL( + list, list_info, + &settings->bools.settings_show_achievements, + MENU_ENUM_LABEL_SETTINGS_SHOW_ACHIEVEMENTS, + MENU_ENUM_LABEL_VALUE_SETTINGS_SHOW_ACHIEVEMENTS, + DEFAULT_SETTINGS_SHOW_ACHIEVEMENTS, + MENU_ENUM_LABEL_VALUE_OFF, + MENU_ENUM_LABEL_VALUE_ON, + &group_info, + &subgroup_info, + parent_group, + general_write_handler, + general_read_handler, + SD_FLAG_NONE); + + CONFIG_BOOL( + list, list_info, + &settings->bools.settings_show_network, + MENU_ENUM_LABEL_SETTINGS_SHOW_NETWORK, + MENU_ENUM_LABEL_VALUE_SETTINGS_SHOW_NETWORK, + DEFAULT_SETTINGS_SHOW_NETWORK, + MENU_ENUM_LABEL_VALUE_OFF, + MENU_ENUM_LABEL_VALUE_ON, + &group_info, + &subgroup_info, + parent_group, + general_write_handler, + general_read_handler, + SD_FLAG_NONE); + + CONFIG_BOOL( + list, list_info, + &settings->bools.settings_show_playlists, + MENU_ENUM_LABEL_SETTINGS_SHOW_PLAYLISTS, + MENU_ENUM_LABEL_VALUE_SETTINGS_SHOW_PLAYLISTS, + DEFAULT_SETTINGS_SHOW_PLAYLISTS, + MENU_ENUM_LABEL_VALUE_OFF, + MENU_ENUM_LABEL_VALUE_ON, + &group_info, + &subgroup_info, + parent_group, + general_write_handler, + general_read_handler, + SD_FLAG_NONE); + + CONFIG_BOOL( + list, list_info, + &settings->bools.settings_show_user, + MENU_ENUM_LABEL_SETTINGS_SHOW_USER, + MENU_ENUM_LABEL_VALUE_SETTINGS_SHOW_USER, + DEFAULT_SETTINGS_SHOW_USER, + MENU_ENUM_LABEL_VALUE_OFF, + MENU_ENUM_LABEL_VALUE_ON, + &group_info, + &subgroup_info, + parent_group, + general_write_handler, + general_read_handler, + SD_FLAG_NONE); + + CONFIG_BOOL( + list, list_info, + &settings->bools.settings_show_directory, + MENU_ENUM_LABEL_SETTINGS_SHOW_DIRECTORY, + MENU_ENUM_LABEL_VALUE_SETTINGS_SHOW_DIRECTORY, + DEFAULT_SETTINGS_SHOW_DIRECTORY, + MENU_ENUM_LABEL_VALUE_OFF, + MENU_ENUM_LABEL_VALUE_ON, + &group_info, + &subgroup_info, + parent_group, + general_write_handler, + general_read_handler, + SD_FLAG_NONE); + CONFIG_BOOL( list, list_info, &settings->bools.quick_menu_show_take_screenshot, diff --git a/msg_hash.h b/msg_hash.h index 4e46b19225..b17bc3ce00 100644 --- a/msg_hash.h +++ b/msg_hash.h @@ -960,7 +960,26 @@ enum msg_hash_enums MENU_LABEL(OZONE_TRUNCATE_PLAYLIST_NAME), MENU_LABEL(MATERIALUI_MENU_COLOR_THEME), MENU_LABEL(QUICK_MENU_OVERRIDE_OPTIONS), + MENU_LABEL(SETTINGS_SHOW_DRIVERS), + MENU_LABEL(SETTINGS_SHOW_VIDEO), + MENU_LABEL(SETTINGS_SHOW_AUDIO), MENU_LABEL(SETTINGS_SHOW_INPUT), + MENU_LABEL(SETTINGS_SHOW_LATENCY), + MENU_LABEL(SETTINGS_SHOW_CORE), + MENU_LABEL(SETTINGS_SHOW_CONFIGURATION), + MENU_LABEL(SETTINGS_SHOW_SAVING), + MENU_LABEL(SETTINGS_SHOW_LOGGING), + MENU_LABEL(SETTINGS_SHOW_FRAME_THROTTLE), + MENU_LABEL(SETTINGS_SHOW_RECORDING), + MENU_LABEL(SETTINGS_SHOW_ONSCREEN_DISPLAY), + MENU_LABEL(SETTINGS_SHOW_USER_INTERFACE), + MENU_LABEL(SETTINGS_SHOW_AI_SERVICE), + MENU_LABEL(SETTINGS_SHOW_POWER_MANAGEMENT), + MENU_LABEL(SETTINGS_SHOW_ACHIEVEMENTS), + MENU_LABEL(SETTINGS_SHOW_NETWORK), + MENU_LABEL(SETTINGS_SHOW_PLAYLISTS), + MENU_LABEL(SETTINGS_SHOW_USER), + MENU_LABEL(SETTINGS_SHOW_DIRECTORY), MENU_LABEL(QUICK_MENU_SHOW_RESUME_CONTENT), MENU_LABEL(QUICK_MENU_SHOW_RESTART_CONTENT), MENU_LABEL(QUICK_MENU_SHOW_CLOSE_CONTENT),