diff --git a/config.def.h b/config.def.h index 49d47b36c2..bee23ffabe 100644 --- a/config.def.h +++ b/config.def.h @@ -329,6 +329,7 @@ static bool menu_show_core_updater = false; #else static bool menu_show_core_updater = true; #endif +static bool menu_show_legacy_thumbnail_updater = false; static bool menu_show_sublabels = true; static unsigned menu_ticker_type = TICKER_TYPE_BOUNCE; diff --git a/configuration.c b/configuration.c index 4657a53dba..e48e647893 100644 --- a/configuration.c +++ b/configuration.c @@ -1527,6 +1527,7 @@ static struct config_bool_setting *populate_settings_bool(settings_t *settings, SETTING_BOOL("menu_show_shutdown", &settings->bools.menu_show_shutdown, true, menu_show_shutdown, false); SETTING_BOOL("menu_show_online_updater", &settings->bools.menu_show_online_updater, true, menu_show_online_updater, false); SETTING_BOOL("menu_show_core_updater", &settings->bools.menu_show_core_updater, true, menu_show_core_updater, false); + SETTING_BOOL("menu_show_legacy_thumbnail_updater", &settings->bools.menu_show_legacy_thumbnail_updater, true, menu_show_legacy_thumbnail_updater, false); SETTING_BOOL("filter_by_current_core", &settings->bools.filter_by_current_core, false, false /* TODO */, false); SETTING_BOOL("rgui_show_start_screen", &settings->bools.menu_show_start_screen, false, false /* TODO */, false); SETTING_BOOL("menu_navigation_wraparound_enable", &settings->bools.menu_navigation_wraparound_enable, true, true, false); diff --git a/configuration.h b/configuration.h index 49fe5db4f8..a266110aea 100644 --- a/configuration.h +++ b/configuration.h @@ -171,6 +171,7 @@ typedef struct settings bool menu_show_latency; bool menu_show_rewind; bool menu_show_overlays; + bool menu_show_legacy_thumbnail_updater; #ifdef HAVE_VIDEO_LAYOUT bool menu_show_video_layout; #endif diff --git a/intl/msg_hash_lbl.h b/intl/msg_hash_lbl.h index abde58a036..9b3dbed210 100644 --- a/intl/msg_hash_lbl.h +++ b/intl/msg_hash_lbl.h @@ -1527,6 +1527,8 @@ MSG_HASH(MENU_ENUM_LABEL_MENU_SHOW_ONLINE_UPDATER, "menu_show_online_updater") MSG_HASH(MENU_ENUM_LABEL_MENU_SHOW_CORE_UPDATER, "menu_show_core_updater") +MSG_HASH(MENU_ENUM_LABEL_MENU_SHOW_LEGACY_THUMBNAIL_UPDATER, + "menu_show_legacy_thumbnail_updater") MSG_HASH(MENU_ENUM_LABEL_CORE_DELETE, "core_delete") MSG_HASH(MENU_ENUM_LABEL_PLAYLIST_ENTRY_RENAME, diff --git a/intl/msg_hash_us.h b/intl/msg_hash_us.h index 0c674fa76c..fadd119110 100644 --- a/intl/msg_hash_us.h +++ b/intl/msg_hash_us.h @@ -6528,6 +6528,14 @@ MSG_HASH( MENU_ENUM_SUBLABEL_MENU_SHOW_ONLINE_UPDATER, "Show/hide the 'Online Updater' option." ) +MSG_HASH( + MENU_ENUM_LABEL_VALUE_MENU_SHOW_LEGACY_THUMBNAIL_UPDATER, + "Show Legacy Thumbnails Updater" + ) +MSG_HASH( + MENU_ENUM_SUBLABEL_MENU_SHOW_LEGACY_THUMBNAIL_UPDATER, + "Show/hide the ability to download legacy thumbnail packages." + ) MSG_HASH( MENU_ENUM_LABEL_VALUE_MENU_VIEWS_SETTINGS, "Views" diff --git a/menu/cbs/menu_cbs_sublabel.c b/menu/cbs/menu_cbs_sublabel.c index 3b9f89febf..c4a1241e9b 100644 --- a/menu/cbs/menu_cbs_sublabel.c +++ b/menu/cbs/menu_cbs_sublabel.c @@ -485,6 +485,7 @@ default_sublabel_macro(action_bind_sublabel_menu_show_reboot, default_sublabel_macro(action_bind_sublabel_menu_show_shutdown, MENU_ENUM_SUBLABEL_MENU_SHOW_SHUTDOWN) default_sublabel_macro(action_bind_sublabel_menu_show_online_updater, MENU_ENUM_SUBLABEL_MENU_SHOW_ONLINE_UPDATER) default_sublabel_macro(action_bind_sublabel_menu_show_core_updater, MENU_ENUM_SUBLABEL_MENU_SHOW_CORE_UPDATER) +default_sublabel_macro(action_bind_sublabel_menu_show_legacy_thumbnail_updater, MENU_ENUM_SUBLABEL_MENU_SHOW_LEGACY_THUMBNAIL_UPDATER) default_sublabel_macro(action_bind_sublabel_menu_music_tab, MENU_ENUM_SUBLABEL_CONTENT_SHOW_MUSIC) default_sublabel_macro(action_bind_sublabel_menu_video_tab, MENU_ENUM_SUBLABEL_CONTENT_SHOW_VIDEO) default_sublabel_macro(action_bind_sublabel_menu_netplay_tab, MENU_ENUM_SUBLABEL_CONTENT_SHOW_NETPLAY) @@ -1411,6 +1412,9 @@ int menu_cbs_init_bind_sublabel(menu_file_list_cbs_t *cbs, case MENU_ENUM_LABEL_MENU_SHOW_CORE_UPDATER: BIND_ACTION_SUBLABEL(cbs, action_bind_sublabel_menu_show_core_updater); break; + case MENU_ENUM_LABEL_MENU_SHOW_LEGACY_THUMBNAIL_UPDATER: + BIND_ACTION_SUBLABEL(cbs, action_bind_sublabel_menu_show_legacy_thumbnail_updater); + break; case MENU_ENUM_LABEL_CONTENT_SHOW_NETPLAY: BIND_ACTION_SUBLABEL(cbs, action_bind_sublabel_menu_netplay_tab); break; diff --git a/menu/menu_displaylist.c b/menu/menu_displaylist.c index 281f372dc8..417ec1d5ad 100644 --- a/menu/menu_displaylist.c +++ b/menu/menu_displaylist.c @@ -3798,6 +3798,7 @@ unsigned menu_displaylist_build_list(file_list_t *list, enum menu_displaylist_ct {MENU_ENUM_LABEL_MENU_SHOW_LOAD_CONTENT, PARSE_ONLY_BOOL }, {MENU_ENUM_LABEL_MENU_SHOW_ONLINE_UPDATER, PARSE_ONLY_BOOL }, {MENU_ENUM_LABEL_MENU_SHOW_CORE_UPDATER, PARSE_ONLY_BOOL }, + {MENU_ENUM_LABEL_MENU_SHOW_LEGACY_THUMBNAIL_UPDATER, PARSE_ONLY_BOOL }, {MENU_ENUM_LABEL_MENU_SHOW_INFORMATION, PARSE_ONLY_BOOL }, {MENU_ENUM_LABEL_MENU_SHOW_CONFIGURATIONS, PARSE_ONLY_BOOL }, {MENU_ENUM_LABEL_MENU_SHOW_HELP, PARSE_ONLY_BOOL }, @@ -6380,12 +6381,17 @@ bool menu_displaylist_ctl(enum menu_displaylist_ctl_state type, MENU_ENUM_LABEL_UPDATE_LAKKA, MENU_SETTING_ACTION, 0, 0)) count++; - if (menu_entries_append_enum(info->list, - msg_hash_to_str(MENU_ENUM_LABEL_VALUE_THUMBNAILS_UPDATER_LIST), - msg_hash_to_str(MENU_ENUM_LABEL_THUMBNAILS_UPDATER_LIST), - MENU_ENUM_LABEL_THUMBNAILS_UPDATER_LIST, - MENU_SETTING_ACTION, 0, 0)) - count++; + + if (settings->bools.menu_show_legacy_thumbnail_updater) + { + if (menu_entries_append_enum(info->list, + msg_hash_to_str(MENU_ENUM_LABEL_VALUE_THUMBNAILS_UPDATER_LIST), + msg_hash_to_str(MENU_ENUM_LABEL_THUMBNAILS_UPDATER_LIST), + MENU_ENUM_LABEL_THUMBNAILS_UPDATER_LIST, + MENU_SETTING_ACTION, 0, 0)) + count++; + } + if (menu_entries_append_enum(info->list, msg_hash_to_str(MENU_ENUM_LABEL_VALUE_PL_THUMBNAILS_UPDATER_LIST), msg_hash_to_str(MENU_ENUM_LABEL_PL_THUMBNAILS_UPDATER_LIST), @@ -6411,13 +6417,15 @@ bool menu_displaylist_ctl(enum menu_displaylist_ctl_state type, count++; } #endif - - if (menu_entries_append_enum(info->list, - msg_hash_to_str(MENU_ENUM_LABEL_VALUE_THUMBNAILS_UPDATER_LIST), - msg_hash_to_str(MENU_ENUM_LABEL_THUMBNAILS_UPDATER_LIST), - MENU_ENUM_LABEL_THUMBNAILS_UPDATER_LIST, - MENU_SETTING_ACTION, 0, 0)) - count++; + if (settings->bools.menu_show_legacy_thumbnail_updater) + { + if (menu_entries_append_enum(info->list, + msg_hash_to_str(MENU_ENUM_LABEL_VALUE_THUMBNAILS_UPDATER_LIST), + msg_hash_to_str(MENU_ENUM_LABEL_THUMBNAILS_UPDATER_LIST), + MENU_ENUM_LABEL_THUMBNAILS_UPDATER_LIST, + MENU_SETTING_ACTION, 0, 0)) + count++; + } if (menu_entries_append_enum(info->list, msg_hash_to_str(MENU_ENUM_LABEL_VALUE_PL_THUMBNAILS_UPDATER_LIST), diff --git a/menu/menu_setting.c b/menu/menu_setting.c index 9298e67320..bf5c1f2d79 100644 --- a/menu/menu_setting.c +++ b/menu/menu_setting.c @@ -12558,6 +12558,20 @@ static bool setting_append_list( general_read_handler, SD_FLAG_NONE); #endif + CONFIG_BOOL( + list, list_info, + &settings->bools.menu_show_legacy_thumbnail_updater, + MENU_ENUM_LABEL_MENU_SHOW_LEGACY_THUMBNAIL_UPDATER, + MENU_ENUM_LABEL_VALUE_MENU_SHOW_LEGACY_THUMBNAIL_UPDATER, + menu_show_legacy_thumbnail_updater, + 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); #endif CONFIG_BOOL( diff --git a/msg_hash.h b/msg_hash.h index 39925c6af2..fd082d4517 100644 --- a/msg_hash.h +++ b/msg_hash.h @@ -874,6 +874,7 @@ enum msg_hash_enums MENU_LABEL(MENU_SHOW_SHUTDOWN), MENU_LABEL(MENU_SHOW_ONLINE_UPDATER), MENU_LABEL(MENU_SHOW_CORE_UPDATER), + MENU_LABEL(MENU_SHOW_LEGACY_THUMBNAIL_UPDATER), MENU_LABEL(MENU_ENABLE_KIOSK_MODE), MENU_LABEL(MENU_DISABLE_KIOSK_MODE), MENU_LABEL(MENU_KIOSK_MODE_PASSWORD),