diff --git a/intl/msg_hash_us.h b/intl/msg_hash_us.h index 21d983119a..0faca002b7 100644 --- a/intl/msg_hash_us.h +++ b/intl/msg_hash_us.h @@ -341,6 +341,10 @@ MSG_HASH( MENU_ENUM_LABEL_VALUE_DOWNLOAD_CORE_CONTENT, "Content Downloader" ) +MSG_HASH( + MENU_ENUM_SUBLABEL_DOWNLOAD_CORE_CONTENT, + "Download free content for the selected core." + ) MSG_HASH( MENU_ENUM_LABEL_VALUE_DOWNLOAD_CORE_SYSTEM_FILES, "Core System Files Downloader" diff --git a/menu/cbs/menu_cbs_sublabel.c b/menu/cbs/menu_cbs_sublabel.c index e6b18c970a..276528d73d 100644 --- a/menu/cbs/menu_cbs_sublabel.c +++ b/menu/cbs/menu_cbs_sublabel.c @@ -1155,7 +1155,7 @@ DEFAULT_SUBLABEL_MACRO(action_bind_sublabel_menu_rgui_thumbnail_downscaler, DEFAULT_SUBLABEL_MACRO(action_bind_sublabel_menu_rgui_thumbnail_delay, MENU_ENUM_SUBLABEL_MENU_RGUI_THUMBNAIL_DELAY) DEFAULT_SUBLABEL_MACRO(action_bind_sublabel_content_runtime_log, MENU_ENUM_SUBLABEL_CONTENT_RUNTIME_LOG) DEFAULT_SUBLABEL_MACRO(action_bind_sublabel_content_runtime_log_aggregate, MENU_ENUM_SUBLABEL_CONTENT_RUNTIME_LOG_AGGREGATE) -DEFAULT_SUBLABEL_MACRO(action_bind_sublabel_scan_without_core_match, MENU_ENUM_SUBLABEL_SCAN_WITHOUT_CORE_MATCH) +DEFAULT_SUBLABEL_MACRO(action_bind_sublabel_scan_without_core_match, MENU_ENUM_SUBLABEL_SCAN_WITHOUT_CORE_MATCH) DEFAULT_SUBLABEL_MACRO(action_bind_sublabel_playlist_sublabel_runtime_type, MENU_ENUM_SUBLABEL_PLAYLIST_SUBLABEL_RUNTIME_TYPE) DEFAULT_SUBLABEL_MACRO(action_bind_sublabel_playlist_sublabel_last_played_style, MENU_ENUM_SUBLABEL_PLAYLIST_SUBLABEL_LAST_PLAYED_STYLE) DEFAULT_SUBLABEL_MACRO(action_bind_sublabel_menu_rgui_internal_upscale_level, MENU_ENUM_SUBLABEL_MENU_RGUI_INTERNAL_UPSCALE_LEVEL) @@ -1175,6 +1175,7 @@ DEFAULT_SUBLABEL_MACRO(action_bind_sublabel_menu_rgui_switch_icons, DEFAULT_SUBLABEL_MACRO(action_bind_sublabel_thumbnails_updater_list, MENU_ENUM_SUBLABEL_THUMBNAILS_UPDATER_LIST) DEFAULT_SUBLABEL_MACRO(action_bind_sublabel_pl_thumbnails_updater_list, MENU_ENUM_SUBLABEL_PL_THUMBNAILS_UPDATER_LIST) DEFAULT_SUBLABEL_MACRO(action_bind_sublabel_download_core_system_files, MENU_ENUM_SUBLABEL_DOWNLOAD_CORE_SYSTEM_FILES) +DEFAULT_SUBLABEL_MACRO(action_bind_sublabel_download_core_content, MENU_ENUM_SUBLABEL_DOWNLOAD_CORE_CONTENT) DEFAULT_SUBLABEL_MACRO(action_bind_sublabel_help_send_debug_info, MENU_ENUM_SUBLABEL_HELP_SEND_DEBUG_INFO) DEFAULT_SUBLABEL_MACRO(action_bind_sublabel_rdb_entry_detail, MENU_ENUM_SUBLABEL_RDB_ENTRY_DETAIL) DEFAULT_SUBLABEL_MACRO(action_bind_sublabel_manual_content_scan_list, MENU_ENUM_SUBLABEL_MANUAL_CONTENT_SCAN_LIST) @@ -4923,6 +4924,9 @@ int menu_cbs_init_bind_sublabel(menu_file_list_cbs_t *cbs, case MENU_ENUM_LABEL_DOWNLOAD_CORE_SYSTEM_FILES: BIND_ACTION_SUBLABEL(cbs, action_bind_sublabel_download_core_system_files); break; + case MENU_ENUM_LABEL_DOWNLOAD_CORE_CONTENT_DIRS: + BIND_ACTION_SUBLABEL(cbs, action_bind_sublabel_download_core_content); + break; case MENU_ENUM_LABEL_HELP_SEND_DEBUG_INFO: BIND_ACTION_SUBLABEL(cbs, action_bind_sublabel_help_send_debug_info); break; diff --git a/menu/drivers/materialui.c b/menu/drivers/materialui.c index 246780cd11..e7d4aaef42 100644 --- a/menu/drivers/materialui.c +++ b/menu/drivers/materialui.c @@ -10416,7 +10416,8 @@ static void materialui_list_insert( } else if ( string_is_equal(label, msg_hash_to_str(MENU_ENUM_LABEL_GOTO_IMAGES)) || - string_is_equal(label, msg_hash_to_str(MENU_ENUM_LABEL_DOWNLOAD_PL_ENTRY_THUMBNAILS)) + string_is_equal(label, msg_hash_to_str(MENU_ENUM_LABEL_DOWNLOAD_PL_ENTRY_THUMBNAILS)) || + string_is_equal(label, msg_hash_to_str(MENU_ENUM_LABEL_PL_THUMBNAILS_UPDATER_LIST)) ) { node->icon_texture_index = MUI_TEXTURE_IMAGE; @@ -10566,8 +10567,9 @@ static void materialui_list_insert( string_is_equal(label, msg_hash_to_str(MENU_ENUM_LABEL_SAVE_STATE)) || string_is_equal(label, msg_hash_to_str(MENU_ENUM_LABEL_SAVE_CURRENT_CONFIG_OVERRIDE_CORE)) || string_is_equal(label, msg_hash_to_str(MENU_ENUM_LABEL_SAVE_CURRENT_CONFIG_OVERRIDE_CONTENT_DIR)) || + string_is_equal(label, msg_hash_to_str(MENU_ENUM_LABEL_SAVE_CURRENT_CONFIG_OVERRIDE_GAME)) || string_is_equal(label, msg_hash_to_str(MENU_ENUM_LABEL_QUICK_MENU_OVERRIDE_OPTIONS)) || - string_is_equal(label, msg_hash_to_str(MENU_ENUM_LABEL_SAVE_CURRENT_CONFIG_OVERRIDE_GAME)) + string_is_equal(label, msg_hash_to_str(MENU_ENUM_LABEL_NETWORK_ON_DEMAND_THUMBNAILS)) ) { node->icon_texture_index = MUI_TEXTURE_SAVE_STATE; diff --git a/menu/drivers/ozone.c b/menu/drivers/ozone.c index 9f0c2da71b..80e6617c2a 100644 --- a/menu/drivers/ozone.c +++ b/menu/drivers/ozone.c @@ -1733,6 +1733,7 @@ static uintptr_t ozone_entries_icon_get_texture(ozone_handle_t *ozone, case MENU_ENUM_LABEL_REMAP_FILE_SAVE_CORE: case MENU_ENUM_LABEL_REMAP_FILE_SAVE_CONTENT_DIR: case MENU_ENUM_LABEL_REMAP_FILE_SAVE_GAME: + case MENU_ENUM_LABEL_NETWORK_ON_DEMAND_THUMBNAILS: return ozone->icons_textures[OZONE_ENTRIES_ICONS_TEXTURE_SAVESTATE]; case MENU_ENUM_LABEL_LOAD_STATE: case MENU_ENUM_LABEL_CORE_RESTORE_BACKUP_LIST: @@ -1753,6 +1754,7 @@ static uintptr_t ozone_entries_icon_get_texture(ozone_handle_t *ozone, return ozone->icons_textures[OZONE_ENTRIES_ICONS_TEXTURE_RESUME]; case MENU_ENUM_LABEL_FAVORITES: case MENU_ENUM_LABEL_DOWNLOADED_FILE_DETECT_CORE_LIST: + case MENU_ENUM_LABEL_DOWNLOAD_CORE_CONTENT_DIRS: return ozone->icons_textures[OZONE_ENTRIES_ICONS_TEXTURE_FOLDER]; case MENU_ENUM_LABEL_FILE_DETECT_CORE_LIST_PUSH_DIR: return ozone->icons_textures[OZONE_ENTRIES_ICONS_TEXTURE_RDB]; @@ -1797,6 +1799,7 @@ static uintptr_t ozone_entries_icon_get_texture(ozone_handle_t *ozone, case MENU_ENUM_LABEL_LOAD_CONTENT_LIST: case MENU_ENUM_LABEL_SUBSYSTEM_SETTINGS: case MENU_ENUM_LABEL_SCAN_FILE: + case MENU_ENUM_LABEL_DOWNLOAD_CORE_SYSTEM_FILES: return ozone->icons_textures[OZONE_ENTRIES_ICONS_TEXTURE_FILE]; case MENU_ENUM_LABEL_ONLINE_UPDATER: case MENU_ENUM_LABEL_UPDATER_SETTINGS: diff --git a/menu/drivers/xmb.c b/menu/drivers/xmb.c index e0f2073136..c61720324c 100644 --- a/menu/drivers/xmb.c +++ b/menu/drivers/xmb.c @@ -2755,6 +2755,7 @@ static uintptr_t xmb_icon_get_id(xmb_handle_t *xmb, case MENU_ENUM_LABEL_REMAP_FILE_SAVE_CORE: case MENU_ENUM_LABEL_REMAP_FILE_SAVE_CONTENT_DIR: case MENU_ENUM_LABEL_REMAP_FILE_SAVE_GAME: + case MENU_ENUM_LABEL_NETWORK_ON_DEMAND_THUMBNAILS: return xmb->textures.list[XMB_TEXTURE_SAVESTATE]; case MENU_ENUM_LABEL_LOAD_STATE: case MENU_ENUM_LABEL_CONFIGURATIONS: @@ -2795,6 +2796,7 @@ static uintptr_t xmb_icon_get_id(xmb_handle_t *xmb, case MENU_ENUM_LABEL_VIDEO_SHADER_PRESET_SAVE_PARENT: case MENU_ENUM_LABEL_FAVORITES: /* "Start Directory" */ case MENU_ENUM_LABEL_DOWNLOADED_FILE_DETECT_CORE_LIST: + case MENU_ENUM_LABEL_DOWNLOAD_CORE_CONTENT_DIRS: return xmb->textures.list[XMB_TEXTURE_FOLDER]; case MENU_ENUM_LABEL_ADD_CONTENT_LIST: return xmb->textures.list[XMB_TEXTURE_ADD]; @@ -2847,6 +2849,7 @@ static uintptr_t xmb_icon_get_id(xmb_handle_t *xmb, case MENU_ENUM_LABEL_LOAD_CONTENT_LIST: case MENU_ENUM_LABEL_SUBSYSTEM_SETTINGS: case MENU_ENUM_LABEL_SCAN_FILE: + case MENU_ENUM_LABEL_DOWNLOAD_CORE_SYSTEM_FILES: return xmb->textures.list[XMB_TEXTURE_FILE]; case MENU_ENUM_LABEL_ONLINE_UPDATER: case MENU_ENUM_LABEL_UPDATER_SETTINGS: diff --git a/menu/menu_displaylist.c b/menu/menu_displaylist.c index d7c4b4f83f..2091f87de0 100644 --- a/menu/menu_displaylist.c +++ b/menu/menu_displaylist.c @@ -13312,6 +13312,20 @@ bool menu_displaylist_ctl(enum menu_displaylist_ctl_state type, count++; #endif + if (menu_entries_append(info->list, + msg_hash_to_str(MENU_ENUM_LABEL_VALUE_DOWNLOAD_CORE_CONTENT), + msg_hash_to_str(MENU_ENUM_LABEL_DOWNLOAD_CORE_CONTENT_DIRS), + MENU_ENUM_LABEL_DOWNLOAD_CORE_CONTENT_DIRS, + MENU_SETTING_ACTION, 0, 0, NULL)) + count++; + +#ifdef HAVE_NETWORKING + if (MENU_DISPLAYLIST_PARSE_SETTINGS_ENUM(info->list, + MENU_ENUM_LABEL_NETWORK_ON_DEMAND_THUMBNAILS, + PARSE_ONLY_BOOL, false) != -1) + count++; +#endif + if (settings->bools.menu_show_legacy_thumbnail_updater) { if (menu_entries_append(info->list, @@ -13329,13 +13343,6 @@ bool menu_displaylist_ctl(enum menu_displaylist_ctl_state type, MENU_SETTING_ACTION, 0, 0, NULL)) count++; - if (menu_entries_append(info->list, - msg_hash_to_str(MENU_ENUM_LABEL_VALUE_DOWNLOAD_CORE_CONTENT), - msg_hash_to_str(MENU_ENUM_LABEL_DOWNLOAD_CORE_CONTENT_DIRS), - MENU_ENUM_LABEL_DOWNLOAD_CORE_CONTENT_DIRS, - MENU_SETTING_ACTION, 0, 0, NULL)) - count++; - #ifdef HAVE_COMPRESSION if (settings->bools.menu_show_core_updater) { @@ -13421,13 +13428,6 @@ bool menu_displaylist_ctl(enum menu_displaylist_ctl_state type, #endif #endif #endif -#endif - -#ifdef HAVE_NETWORKING - if (MENU_DISPLAYLIST_PARSE_SETTINGS_ENUM(info->list, - MENU_ENUM_LABEL_NETWORK_ON_DEMAND_THUMBNAILS, - PARSE_ONLY_BOOL, false) != -1) - count++; #endif }