diff --git a/intl/msg_hash_us.h b/intl/msg_hash_us.h index ac461f0fbd..861dec2e47 100644 --- a/intl/msg_hash_us.h +++ b/intl/msg_hash_us.h @@ -795,7 +795,7 @@ MSG_HASH( ) MSG_HASH( MENU_ENUM_LABEL_VALUE_DOWNLOAD_CORE, - "Download Core..." + "Download a Core" ) MSG_HASH( MENU_ENUM_LABEL_VALUE_DOWNLOAD_CORE_CONTENT, @@ -4918,6 +4918,10 @@ MSG_HASH( MENU_ENUM_SUBLABEL_CORE_LIST, "Select which core to use." ) +MSG_HASH( + MENU_ENUM_SUBLABEL_DOWNLOAD_CORE, + "Install a core from the online updater." + ) MSG_HASH( MENU_ENUM_SUBLABEL_SIDELOAD_CORE_LIST, "Install or restore a core from the downloads directory." diff --git a/menu/cbs/menu_cbs_sublabel.c b/menu/cbs/menu_cbs_sublabel.c index 0f3a27756c..7b4c258f89 100644 --- a/menu/cbs/menu_cbs_sublabel.c +++ b/menu/cbs/menu_cbs_sublabel.c @@ -188,6 +188,7 @@ default_sublabel_macro(action_bind_sublabel_cheevos_username, MENU_ default_sublabel_macro(action_bind_sublabel_cheevos_password, MENU_ENUM_SUBLABEL_CHEEVOS_PASSWORD) default_sublabel_macro(action_bind_sublabel_video_post_filter_record, MENU_ENUM_SUBLABEL_VIDEO_POST_FILTER_RECORD) default_sublabel_macro(action_bind_sublabel_core_list, MENU_ENUM_SUBLABEL_CORE_LIST) +default_sublabel_macro(action_bind_sublabel_download_core, MENU_ENUM_SUBLABEL_DOWNLOAD_CORE) default_sublabel_macro(action_bind_sublabel_sideload_core_list, MENU_ENUM_SUBLABEL_SIDELOAD_CORE_LIST) default_sublabel_macro(action_bind_sublabel_content_list, MENU_ENUM_SUBLABEL_LOAD_CONTENT_LIST) default_sublabel_macro(action_bind_sublabel_content_special, MENU_ENUM_SUBLABEL_LOAD_CONTENT_SPECIAL) @@ -1677,6 +1678,9 @@ int menu_cbs_init_bind_sublabel(menu_file_list_cbs_t *cbs, case MENU_ENUM_LABEL_SIDELOAD_CORE_LIST: BIND_ACTION_SUBLABEL(cbs, action_bind_sublabel_sideload_core_list); break; + case MENU_ENUM_LABEL_CORE_UPDATER_LIST: + BIND_ACTION_SUBLABEL(cbs, action_bind_sublabel_download_core); + break; case MENU_ENUM_LABEL_VIDEO_POST_FILTER_RECORD: BIND_ACTION_SUBLABEL(cbs, action_bind_sublabel_video_post_filter_record); break; diff --git a/menu/menu_displaylist.c b/menu/menu_displaylist.c index 7af71278aa..c0a821f16d 100644 --- a/menu/menu_displaylist.c +++ b/menu/menu_displaylist.c @@ -3648,7 +3648,8 @@ static unsigned menu_displaylist_parse_cores( return items_found; } - info->download_core = true; + if (string_is_equal(info->label, msg_hash_to_str(MENU_ENUM_LABEL_CORE_LIST))) + info->download_core = true; dir_list_sort(str_list, true); @@ -4151,6 +4152,7 @@ bool menu_displaylist_process(menu_displaylist_info_t *info) #if defined(HAVE_NETWORKING) if (settings->bools.menu_show_core_updater && !settings->bools.kiosk_mode_enable) + { if (info->download_core) { menu_entries_append_enum(info->list, @@ -4158,7 +4160,14 @@ bool menu_displaylist_process(menu_displaylist_info_t *info) msg_hash_to_str(MENU_ENUM_LABEL_CORE_UPDATER_LIST), MENU_ENUM_LABEL_CORE_UPDATER_LIST, MENU_SETTING_ACTION, 0, 0); + + menu_entries_append_enum(info->list, + msg_hash_to_str(MENU_ENUM_LABEL_VALUE_SIDELOAD_CORE_LIST), + msg_hash_to_str(MENU_ENUM_LABEL_SIDELOAD_CORE_LIST), + MENU_ENUM_LABEL_SIDELOAD_CORE_LIST, + MENU_SETTING_ACTION, 0, 0); } + } #endif if (info->push_builtin_cores) @@ -8070,7 +8079,8 @@ bool menu_displaylist_ctl(enum menu_displaylist_ctl_state type, menu_displaylist info->need_refresh = true; info->need_push = true; - info->push_builtin_cores = true; + if (string_is_equal(info->label, msg_hash_to_str(MENU_ENUM_LABEL_CORE_LIST))) + info->push_builtin_cores = true; break; case DISPLAYLIST_DEFAULT: menu_entries_ctl(MENU_ENTRIES_CTL_CLEAR, info->list); diff --git a/menu/menu_setting.c b/menu/menu_setting.c index d9979a31eb..e4f28259b9 100644 --- a/menu/menu_setting.c +++ b/menu/menu_setting.c @@ -3570,17 +3570,6 @@ static bool setting_append_list( } } -#ifdef HAVE_DYNAMIC - if (settings->bools.menu_show_advanced_settings) - CONFIG_ACTION( - list, list_info, - MENU_ENUM_LABEL_SIDELOAD_CORE_LIST, - MENU_ENUM_LABEL_VALUE_SIDELOAD_CORE_LIST, - &group_info, - &subgroup_info, - parent_group); -#endif - CONFIG_ACTION( list, list_info, MENU_ENUM_LABEL_LOAD_CONTENT_LIST, diff --git a/msg_hash.h b/msg_hash.h index 28dfa76e8e..643bca75db 100644 --- a/msg_hash.h +++ b/msg_hash.h @@ -783,8 +783,6 @@ enum msg_hash_enums MENU_LABEL(VIDEO_REFRESH_RATE_AUTO), MENU_LABEL(VIDEO_REFRESH_RATE_POLLED), - MENU_ENUM_LABEL_VALUE_DOWNLOAD_CORE, - MENU_LABEL(PARENT_DIRECTORY), MENU_ENUM_LABEL_CONTENT_ACTIONS, @@ -1575,6 +1573,7 @@ enum msg_hash_enums MENU_LABEL(SUBSYSTEM_ADD), MENU_LABEL(SUBSYSTEM_LOAD), MENU_LABEL(CORE_LIST), + MENU_LABEL(DOWNLOAD_CORE), MENU_LABEL(SIDELOAD_CORE_LIST), MENU_LABEL(SIDELOAD_CORE_ERROR), MENU_LABEL(SIDELOAD_CORE_SUCCESS),