diff --git a/Makefile b/Makefile index 29cf95fc3a..bd050a315b 100644 --- a/Makefile +++ b/Makefile @@ -196,6 +196,7 @@ install: $(TARGET) rm -rf $(DESTDIR)$(ASSETS_DIR)/retroarch/assets/xmb/flatui/src; \ rm -rf $(DESTDIR)$(ASSETS_DIR)/retroarch/assets/xmb/monochrome/src; \ rm -rf $(DESTDIR)$(ASSETS_DIR)/retroarch/assets/xmb/retroactive/src; \ + rm -rf $(DESTDIR)$(ASSETS_DIR)/retroarch/assets/xmb/neoactive/src; \ rm -rf $(DESTDIR)$(ASSETS_DIR)/retroarch/assets/xmb/retroactive_marked/src; \ echo "Asset copying done."; \ fi diff --git a/intl/msg_hash_us.c b/intl/msg_hash_us.c index 7554860aa1..c8b18fa21b 100644 --- a/intl/msg_hash_us.c +++ b/intl/msg_hash_us.c @@ -3941,12 +3941,14 @@ const char *msg_hash_to_str_us(enum msg_hash_enums msg) return "Menu Shader Pipeline"; case MENU_ENUM_LABEL_VALUE_XMB_ICON_THEME_MONOCHROME: return "Monochrome"; - case MENU_ENUM_LABEL_VALUE_XMB_ICON_THEME_MONOCHROME_JAGGED: + case MENU_ENUM_LABEL_VALUE_XMB_ICON_THEME_MONOCHROME_JAGGED: return "Monochrome Jagged"; case MENU_ENUM_LABEL_VALUE_XMB_ICON_THEME_FLATUI: return "FlatUI"; case MENU_ENUM_LABEL_VALUE_XMB_ICON_THEME_RETROACTIVE: return "RetroActive"; + case MENU_ENUM_LABEL_VALUE_XMB_ICON_THEME_NEOACTIVE: + return "NeoActive"; case MENU_ENUM_LABEL_VALUE_XMB_ICON_THEME_PIXEL: return "Pixel"; case MENU_ENUM_LABEL_VALUE_XMB_ICON_THEME_CUSTOM: diff --git a/menu/cbs/menu_cbs_get_value.c b/menu/cbs/menu_cbs_get_value.c index 8238c0b580..fef5121e0a 100644 --- a/menu/cbs/menu_cbs_get_value.c +++ b/menu/cbs/menu_cbs_get_value.c @@ -743,10 +743,14 @@ static void menu_action_setting_disp_set_label_xmb_theme( strlcpy(s, msg_hash_to_str(MENU_ENUM_LABEL_VALUE_XMB_ICON_THEME_PIXEL), len); break; - case XMB_ICON_THEME_MONOCHROME_JAGGED: + case XMB_ICON_THEME_NEOACTIVE: + strlcpy(s, + msg_hash_to_str(MENU_ENUM_LABEL_VALUE_XMB_ICON_THEME_NEOACTIVE), len); + break; + case XMB_ICON_THEME_MONOCHROME_JAGGED: strlcpy(s, msg_hash_to_str(MENU_ENUM_LABEL_VALUE_XMB_ICON_THEME_MONOCHROME_JAGGED), len); - break; + break; case XMB_ICON_THEME_CUSTOM: strlcpy(s, msg_hash_to_str(MENU_ENUM_LABEL_VALUE_XMB_ICON_THEME_CUSTOM), len); diff --git a/menu/drivers/xmb.c b/menu/drivers/xmb.c index 17ade5865e..a2cbaa4932 100644 --- a/menu/drivers/xmb.c +++ b/menu/drivers/xmb.c @@ -365,10 +365,12 @@ const char *xmb_theme_ident(void) return "retroactive"; case XMB_ICON_THEME_PIXEL: return "pixel"; + case XMB_ICON_THEME_NEOACTIVE: + return "neoactive"; + case XMB_ICON_THEME_MONOCHROME_JAGGED: + return "monochrome-jagged"; case XMB_ICON_THEME_CUSTOM: return "custom"; - case XMB_ICON_THEME_MONOCHROME_JAGGED: - return "monochrome-jagged"; case XMB_ICON_THEME_MONOCHROME: default: break; diff --git a/menu/menu_display.h b/menu/menu_display.h index 2c6b96778a..7c938a23ab 100644 --- a/menu/menu_display.h +++ b/menu/menu_display.h @@ -64,6 +64,7 @@ enum xmb_icon_theme XMB_ICON_THEME_FLATUI, XMB_ICON_THEME_RETROACTIVE, XMB_ICON_THEME_PIXEL, + XMB_ICON_THEME_NEOACTIVE, XMB_ICON_THEME_MONOCHROME_JAGGED, XMB_ICON_THEME_CUSTOM }; diff --git a/menu/menu_setting.c b/menu/menu_setting.c index 6c60fda1b1..3d1b2b94bc 100644 --- a/menu/menu_setting.c +++ b/menu/menu_setting.c @@ -4878,7 +4878,7 @@ static bool setting_append_list( parent_group, general_write_handler, general_read_handler); - menu_settings_list_current_add_range(list, list_info, 0, 4, 1, true, true); + menu_settings_list_current_add_range(list, list_info, 0, 6, 1, true, true); CONFIG_BOOL( list, list_info, diff --git a/msg_hash.h b/msg_hash.h index 7c072c63a7..3adbc86070 100644 --- a/msg_hash.h +++ b/msg_hash.h @@ -352,6 +352,7 @@ enum msg_hash_enums MENU_ENUM_LABEL_VALUE_XMB_ICON_THEME_FLATUI, MENU_ENUM_LABEL_VALUE_XMB_ICON_THEME_RETROACTIVE, MENU_ENUM_LABEL_VALUE_XMB_ICON_THEME_PIXEL, + MENU_ENUM_LABEL_VALUE_XMB_ICON_THEME_NEOACTIVE, MENU_ENUM_LABEL_VALUE_XMB_ICON_THEME_MONOCHROME_JAGGED, MENU_ENUM_LABEL_VALUE_XMB_ICON_THEME_CUSTOM,