From 85f9eb402e4549e15dc89df3f3bd5a02b9a1dddc Mon Sep 17 00:00:00 2001 From: Rob Loach Date: Wed, 27 Dec 2017 17:03:39 -0500 Subject: [PATCH] font-color: Remove XMB from the Font Color naming scheme --- config.def.h | 6 +++--- configuration.c | 6 +++--- configuration.h | 6 +++--- intl/msg_hash_chs.h | 6 +++--- intl/msg_hash_de.h | 6 +++--- intl/msg_hash_eo.h | 6 +++--- intl/msg_hash_es.c | 6 +++--- intl/msg_hash_fr.h | 6 +++--- intl/msg_hash_it.h | 6 +++--- intl/msg_hash_ja.h | 6 +++--- intl/msg_hash_ko.h | 6 +++--- intl/msg_hash_lbl.h | 12 ++++++------ intl/msg_hash_nl.h | 6 +++--- intl/msg_hash_pt_pt.h | 6 +++--- intl/msg_hash_ru.h | 6 +++--- intl/msg_hash_us.h | 6 +++--- menu/drivers/xmb.c | 6 +++--- menu/menu_displaylist.c | 6 +++--- menu/menu_setting.c | 24 ++++++++++++------------ msg_hash.h | 6 +++--- 20 files changed, 72 insertions(+), 72 deletions(-) diff --git a/config.def.h b/config.def.h index 848fc1df96..e05b9c828b 100644 --- a/config.def.h +++ b/config.def.h @@ -273,9 +273,9 @@ static bool menu_show_core_updater = true; #ifdef HAVE_XMB static unsigned xmb_scale_factor = 100; static unsigned xmb_alpha_factor = 75; -static unsigned xmb_font_color_red = 255; -static unsigned xmb_font_color_green = 255; -static unsigned xmb_font_color_blue = 255; +static unsigned menu_font_color_red = 255; +static unsigned menu_font_color_green = 255; +static unsigned menu_font_color_blue = 255; static unsigned xmb_icon_theme = XMB_ICON_THEME_MONOCHROME; static unsigned xmb_theme = XMB_THEME_ELECTRIC_BLUE; #ifdef HAVE_LAKKA diff --git a/configuration.c b/configuration.c index c1356640ab..9f7d219424 100644 --- a/configuration.c +++ b/configuration.c @@ -1412,9 +1412,9 @@ static struct config_uint_setting *populate_settings_uint(settings_t *settings, SETTING_UINT("xmb_scale_factor", &settings->uints.menu_xmb_scale_factor, true, xmb_scale_factor, false); SETTING_UINT("xmb_theme", &settings->uints.menu_xmb_theme, true, xmb_icon_theme, false); SETTING_UINT("xmb_menu_color_theme", &settings->uints.menu_xmb_color_theme, true, xmb_theme, false); - SETTING_UINT("xmb_menu_font_color_red", &settings->uints.menu_xmb_font_color_red, true, xmb_font_color_red, false); - SETTING_UINT("xmb_menu_font_color_green", &settings->uints.menu_xmb_font_color_green, true, xmb_font_color_green, false); - SETTING_UINT("xmb_menu_font_color_blue", &settings->uints.menu_xmb_font_color_blue, true, xmb_font_color_blue, false); + SETTING_UINT("menu_font_color_red", &settings->uints.menu_font_color_red, true, menu_font_color_red, false); + SETTING_UINT("menu_font_color_green", &settings->uints.menu_font_color_green, true, menu_font_color_green, false); + SETTING_UINT("menu_font_color_blue", &settings->uints.menu_font_color_blue, true, menu_font_color_blue, false); #endif SETTING_UINT("materialui_menu_color_theme", &settings->uints.menu_materialui_color_theme, true, MATERIALUI_THEME_BLUE, false); SETTING_UINT("menu_shader_pipeline", &settings->uints.menu_xmb_shader_pipeline, true, menu_shader_pipeline, false); diff --git a/configuration.h b/configuration.h index 88273399d0..9164877ea6 100644 --- a/configuration.h +++ b/configuration.h @@ -352,9 +352,9 @@ typedef struct settings unsigned menu_xmb_theme; unsigned menu_xmb_color_theme; unsigned menu_materialui_color_theme; - unsigned menu_xmb_font_color_red; - unsigned menu_xmb_font_color_green; - unsigned menu_xmb_font_color_blue; + unsigned menu_font_color_red; + unsigned menu_font_color_green; + unsigned menu_font_color_blue; unsigned camera_width; unsigned camera_height; diff --git a/intl/msg_hash_chs.h b/intl/msg_hash_chs.h index c6e732177a..441cc1e49c 100644 --- a/intl/msg_hash_chs.h +++ b/intl/msg_hash_chs.h @@ -1698,11 +1698,11 @@ MSG_HASH(MENU_ENUM_LABEL_VALUE_WIFI_SETTINGS, "Wi-Fi") MSG_HASH(MENU_ENUM_LABEL_VALUE_XMB_ALPHA_FACTOR, "菜单透明度因子") -MSG_HASH(MENU_ENUM_LABEL_VALUE_XMB_FONT_COLOR_RED, +MSG_HASH(MENU_ENUM_LABEL_VALUE_MENU_FONT_COLOR_RED, "Menu Font Red Color") -MSG_HASH(MENU_ENUM_LABEL_VALUE_XMB_FONT_COLOR_GREEN, +MSG_HASH(MENU_ENUM_LABEL_VALUE_MENU_FONT_COLOR_GREEN, "Menu Font Green Color") -MSG_HASH(MENU_ENUM_LABEL_VALUE_XMB_FONT_COLOR_BLUE, +MSG_HASH(MENU_ENUM_LABEL_VALUE_MENU_FONT_COLOR_BLUE, "Menu Font Blue Color") MSG_HASH(MENU_ENUM_LABEL_VALUE_XMB_FONT, "菜单字体") diff --git a/intl/msg_hash_de.h b/intl/msg_hash_de.h index 9f64b3ab82..525b37d13f 100644 --- a/intl/msg_hash_de.h +++ b/intl/msg_hash_de.h @@ -1749,11 +1749,11 @@ MSG_HASH(MENU_ENUM_LABEL_VALUE_WIFI_SETTINGS, "WLAN") MSG_HASH(MENU_ENUM_LABEL_VALUE_XMB_ALPHA_FACTOR, "Menü-Transparenz") -MSG_HASH(MENU_ENUM_LABEL_VALUE_XMB_FONT_COLOR_RED, +MSG_HASH(MENU_ENUM_LABEL_VALUE_MENU_FONT_COLOR_RED, "Menu Font Red Color") -MSG_HASH(MENU_ENUM_LABEL_VALUE_XMB_FONT_COLOR_GREEN, +MSG_HASH(MENU_ENUM_LABEL_VALUE_MENU_FONT_COLOR_GREEN, "Menu Font Green Color") -MSG_HASH(MENU_ENUM_LABEL_VALUE_XMB_FONT_COLOR_BLUE, +MSG_HASH(MENU_ENUM_LABEL_VALUE_MENU_FONT_COLOR_BLUE, "Menu Font Blue Color") MSG_HASH(MENU_ENUM_LABEL_VALUE_XMB_FONT, "Menü-Schriftart") diff --git a/intl/msg_hash_eo.h b/intl/msg_hash_eo.h index 5bb4573b09..1a3d77168f 100644 --- a/intl/msg_hash_eo.h +++ b/intl/msg_hash_eo.h @@ -1594,11 +1594,11 @@ MSG_HASH(MENU_ENUM_LABEL_VALUE_WIFI_SETTINGS, "Wi-Fi") MSG_HASH(MENU_ENUM_LABEL_VALUE_XMB_ALPHA_FACTOR, "Menu Alpha Factor") -MSG_HASH(MENU_ENUM_LABEL_VALUE_XMB_FONT_COLOR_RED, +MSG_HASH(MENU_ENUM_LABEL_VALUE_MENU_FONT_COLOR_RED, "Menu Font Red Color") -MSG_HASH(MENU_ENUM_LABEL_VALUE_XMB_FONT_COLOR_GREEN, +MSG_HASH(MENU_ENUM_LABEL_VALUE_MENU_FONT_COLOR_GREEN, "Menu Font Green Color") -MSG_HASH(MENU_ENUM_LABEL_VALUE_XMB_FONT_COLOR_BLUE, +MSG_HASH(MENU_ENUM_LABEL_VALUE_MENU_FONT_COLOR_BLUE, "Menu Font Blue Color") MSG_HASH(MENU_ENUM_LABEL_VALUE_XMB_FONT, "Menu Font") diff --git a/intl/msg_hash_es.c b/intl/msg_hash_es.c index bbe4d6b1cc..b23b2a3619 100644 --- a/intl/msg_hash_es.c +++ b/intl/msg_hash_es.c @@ -2315,11 +2315,11 @@ const char *msg_hash_to_str_es(enum msg_hash_enums msg) return "Pantalla completa en ventana"; case MENU_ENUM_LABEL_VALUE_XMB_ALPHA_FACTOR: return "Transparencia del XMB"; - case MENU_ENUM_LABEL_VALUE_XMB_FONT_COLOR_RED: + case MENU_ENUM_LABEL_VALUE_MENU_FONT_COLOR_RED: return "Fuente del XMB Red"; - case MENU_ENUM_LABEL_VALUE_XMB_FONT_COLOR_GREEN: + case MENU_ENUM_LABEL_VALUE_MENU_FONT_COLOR_GREEN: return "Fuente del XMB Green"; - case MENU_ENUM_LABEL_VALUE_XMB_FONT_COLOR_BLUE: + case MENU_ENUM_LABEL_VALUE_MENU_FONT_COLOR_BLUE: return "Fuente del XMB Blue"; case MENU_ENUM_LABEL_VALUE_XMB_FONT: return "Fuente del XMB"; diff --git a/intl/msg_hash_fr.h b/intl/msg_hash_fr.h index 22f05ff4cf..06ca7c98eb 100644 --- a/intl/msg_hash_fr.h +++ b/intl/msg_hash_fr.h @@ -1719,11 +1719,11 @@ MSG_HASH(MENU_ENUM_LABEL_VALUE_WIFI_SETTINGS, "Wi-Fi") MSG_HASH(MENU_ENUM_LABEL_VALUE_XMB_ALPHA_FACTOR, "Transparence du fond") -MSG_HASH(MENU_ENUM_LABEL_VALUE_XMB_FONT_COLOR_RED, +MSG_HASH(MENU_ENUM_LABEL_VALUE_MENU_FONT_COLOR_RED, "Menu Font Red Color") -MSG_HASH(MENU_ENUM_LABEL_VALUE_XMB_FONT_COLOR_GREEN, +MSG_HASH(MENU_ENUM_LABEL_VALUE_MENU_FONT_COLOR_GREEN, "Menu Font Green Color") -MSG_HASH(MENU_ENUM_LABEL_VALUE_XMB_FONT_COLOR_BLUE, +MSG_HASH(MENU_ENUM_LABEL_VALUE_MENU_FONT_COLOR_BLUE, "Menu Font Blue Color") MSG_HASH(MENU_ENUM_LABEL_VALUE_XMB_FONT, "Police du menu") diff --git a/intl/msg_hash_it.h b/intl/msg_hash_it.h index e6ce9e2b94..23d87a32ed 100644 --- a/intl/msg_hash_it.h +++ b/intl/msg_hash_it.h @@ -1747,11 +1747,11 @@ MSG_HASH(MENU_ENUM_LABEL_VALUE_WIFI_SETTINGS, "Wi-Fi") MSG_HASH(MENU_ENUM_LABEL_VALUE_XMB_ALPHA_FACTOR, "Menu del fattore Alfa") -MSG_HASH(MENU_ENUM_LABEL_VALUE_XMB_FONT_COLOR_RED, +MSG_HASH(MENU_ENUM_LABEL_VALUE_MENU_FONT_COLOR_RED, "Menu Font Red Color") -MSG_HASH(MENU_ENUM_LABEL_VALUE_XMB_FONT_COLOR_GREEN, +MSG_HASH(MENU_ENUM_LABEL_VALUE_MENU_FONT_COLOR_GREEN, "Menu Font Green Color") -MSG_HASH(MENU_ENUM_LABEL_VALUE_XMB_FONT_COLOR_BLUE, +MSG_HASH(MENU_ENUM_LABEL_VALUE_MENU_FONT_COLOR_BLUE, "Menu Font Blue Color") MSG_HASH(MENU_ENUM_LABEL_VALUE_XMB_FONT, "Font del Menu") diff --git a/intl/msg_hash_ja.h b/intl/msg_hash_ja.h index 47a7e6d636..e5cb7a320f 100644 --- a/intl/msg_hash_ja.h +++ b/intl/msg_hash_ja.h @@ -1773,11 +1773,11 @@ MSG_HASH(MENU_ENUM_LABEL_VALUE_WIFI_SETTINGS, "Wi-Fi") MSG_HASH(MENU_ENUM_LABEL_VALUE_XMB_ALPHA_FACTOR, "メニューの透明性") -MSG_HASH(MENU_ENUM_LABEL_VALUE_XMB_FONT_COLOR_RED, +MSG_HASH(MENU_ENUM_LABEL_VALUE_MENU_FONT_COLOR_RED, "Menu Font Red Color") -MSG_HASH(MENU_ENUM_LABEL_VALUE_XMB_FONT_COLOR_GREEN, +MSG_HASH(MENU_ENUM_LABEL_VALUE_MENU_FONT_COLOR_GREEN, "Menu Font Green Color") -MSG_HASH(MENU_ENUM_LABEL_VALUE_XMB_FONT_COLOR_BLUE, +MSG_HASH(MENU_ENUM_LABEL_VALUE_MENU_FONT_COLOR_BLUE, "Menu Font Blue Color") MSG_HASH(MENU_ENUM_LABEL_VALUE_XMB_FONT, "メニューのフォント") diff --git a/intl/msg_hash_ko.h b/intl/msg_hash_ko.h index aab934caf7..7ee6a92e9b 100644 --- a/intl/msg_hash_ko.h +++ b/intl/msg_hash_ko.h @@ -1695,11 +1695,11 @@ MSG_HASH(MENU_ENUM_LABEL_VALUE_WIFI_SETTINGS, "Wi-Fi") MSG_HASH(MENU_ENUM_LABEL_VALUE_XMB_ALPHA_FACTOR, "메뉴 알파 요소") -MSG_HASH(MENU_ENUM_LABEL_VALUE_XMB_FONT_COLOR_RED, +MSG_HASH(MENU_ENUM_LABEL_VALUE_MENU_FONT_COLOR_RED, "Menu Font Red Color") -MSG_HASH(MENU_ENUM_LABEL_VALUE_XMB_FONT_COLOR_GREEN, +MSG_HASH(MENU_ENUM_LABEL_VALUE_MENU_FONT_COLOR_GREEN, "Menu Font Green Color") -MSG_HASH(MENU_ENUM_LABEL_VALUE_XMB_FONT_COLOR_BLUE, +MSG_HASH(MENU_ENUM_LABEL_VALUE_MENU_FONT_COLOR_BLUE, "Menu Font Blue Color") MSG_HASH(MENU_ENUM_LABEL_VALUE_XMB_FONT, "메뉴 폰트") diff --git a/intl/msg_hash_lbl.h b/intl/msg_hash_lbl.h index 801904c5d5..5b37d7bed5 100644 --- a/intl/msg_hash_lbl.h +++ b/intl/msg_hash_lbl.h @@ -1161,12 +1161,12 @@ MSG_HASH(MENU_ENUM_LABEL_WIFI_SETTINGS, "wifi_settings") MSG_HASH(MENU_ENUM_LABEL_XMB_ALPHA_FACTOR, "xmb_alpha_factor") -MSG_HASH(MENU_ENUM_LABEL_XMB_FONT_COLOR_RED, - "xmb_font_color_red") -MSG_HASH(MENU_ENUM_LABEL_XMB_FONT_COLOR_GREEN, - "xmb_font_color_green") -MSG_HASH(MENU_ENUM_LABEL_XMB_FONT_COLOR_BLUE, - "xmb_font_color_blue") +MSG_HASH(MENU_ENUM_LABEL_MENU_FONT_COLOR_RED, + "menu_font_color_red") +MSG_HASH(MENU_ENUM_LABEL_MENU_FONT_COLOR_GREEN, + "menu_font_color_green") +MSG_HASH(MENU_ENUM_LABEL_MENU_FONT_COLOR_BLUE, + "menu_font_color_blue") MSG_HASH(MENU_ENUM_LABEL_XMB_FONT, "xmb_font") MSG_HASH(MENU_ENUM_LABEL_XMB_MAIN_MENU_ENABLE_SETTINGS, diff --git a/intl/msg_hash_nl.h b/intl/msg_hash_nl.h index fc798fff68..41af437b18 100644 --- a/intl/msg_hash_nl.h +++ b/intl/msg_hash_nl.h @@ -1592,11 +1592,11 @@ MSG_HASH(MENU_ENUM_LABEL_VALUE_WIFI_SETTINGS, "Wi-Fi") MSG_HASH(MENU_ENUM_LABEL_VALUE_XMB_ALPHA_FACTOR, "Menu Alpha Factor") -MSG_HASH(MENU_ENUM_LABEL_VALUE_XMB_FONT_COLOR_RED, +MSG_HASH(MENU_ENUM_LABEL_VALUE_MENU_FONT_COLOR_RED, "Menu Font Red Color") -MSG_HASH(MENU_ENUM_LABEL_VALUE_XMB_FONT_COLOR_GREEN, +MSG_HASH(MENU_ENUM_LABEL_VALUE_MENU_FONT_COLOR_GREEN, "Menu Font Green Color") -MSG_HASH(MENU_ENUM_LABEL_VALUE_XMB_FONT_COLOR_BLUE, +MSG_HASH(MENU_ENUM_LABEL_VALUE_MENU_FONT_COLOR_BLUE, "Menu Font Blue Color") MSG_HASH(MENU_ENUM_LABEL_VALUE_XMB_FONT, "Menu Font") diff --git a/intl/msg_hash_pt_pt.h b/intl/msg_hash_pt_pt.h index dc53f3f949..44ebde5751 100644 --- a/intl/msg_hash_pt_pt.h +++ b/intl/msg_hash_pt_pt.h @@ -1687,11 +1687,11 @@ MSG_HASH(MENU_ENUM_LABEL_VALUE_WIFI_SETTINGS, "Wi-Fi") MSG_HASH(MENU_ENUM_LABEL_VALUE_XMB_ALPHA_FACTOR, "Fator Alfa do Menu") -MSG_HASH(MENU_ENUM_LABEL_VALUE_XMB_FONT_COLOR_RED, +MSG_HASH(MENU_ENUM_LABEL_VALUE_MENU_FONT_COLOR_RED, "Menu Font Red Color") -MSG_HASH(MENU_ENUM_LABEL_VALUE_XMB_FONT_COLOR_GREEN, +MSG_HASH(MENU_ENUM_LABEL_VALUE_MENU_FONT_COLOR_GREEN, "Menu Font Green Color") -MSG_HASH(MENU_ENUM_LABEL_VALUE_XMB_FONT_COLOR_BLUE, +MSG_HASH(MENU_ENUM_LABEL_VALUE_MENU_FONT_COLOR_BLUE, "Menu Font Blue Color") MSG_HASH(MENU_ENUM_LABEL_VALUE_XMB_FONT, "Fonte do Menu") diff --git a/intl/msg_hash_ru.h b/intl/msg_hash_ru.h index e261627d0e..6a6d8c10f2 100644 --- a/intl/msg_hash_ru.h +++ b/intl/msg_hash_ru.h @@ -1728,11 +1728,11 @@ MSG_HASH(MENU_ENUM_LABEL_VALUE_WIFI_SETTINGS, "Wi-Fi") MSG_HASH(MENU_ENUM_LABEL_VALUE_XMB_ALPHA_FACTOR, "Меню Alpha Factor") -MSG_HASH(MENU_ENUM_LABEL_VALUE_XMB_FONT_COLOR_RED, +MSG_HASH(MENU_ENUM_LABEL_VALUE_MENU_FONT_COLOR_RED, "Menu Font Red Color") -MSG_HASH(MENU_ENUM_LABEL_VALUE_XMB_FONT_COLOR_GREEN, +MSG_HASH(MENU_ENUM_LABEL_VALUE_MENU_FONT_COLOR_GREEN, "Menu Font Green Color") -MSG_HASH(MENU_ENUM_LABEL_VALUE_XMB_FONT_COLOR_BLUE, +MSG_HASH(MENU_ENUM_LABEL_VALUE_MENU_FONT_COLOR_BLUE, "Menu Font Blue Color") MSG_HASH(MENU_ENUM_LABEL_VALUE_XMB_FONT, "Шрифт") diff --git a/intl/msg_hash_us.h b/intl/msg_hash_us.h index 4d3f68ca81..7adad162c3 100644 --- a/intl/msg_hash_us.h +++ b/intl/msg_hash_us.h @@ -1761,11 +1761,11 @@ MSG_HASH(MENU_ENUM_LABEL_VALUE_WIFI_SETTINGS, "Wi-Fi") MSG_HASH(MENU_ENUM_LABEL_VALUE_XMB_ALPHA_FACTOR, "Menu Alpha Factor") -MSG_HASH(MENU_ENUM_LABEL_VALUE_XMB_FONT_COLOR_RED, +MSG_HASH(MENU_ENUM_LABEL_VALUE_MENU_FONT_COLOR_RED, "Menu Font Red Color") -MSG_HASH(MENU_ENUM_LABEL_VALUE_XMB_FONT_COLOR_GREEN, +MSG_HASH(MENU_ENUM_LABEL_VALUE_MENU_FONT_COLOR_GREEN, "Menu Font Green Color") -MSG_HASH(MENU_ENUM_LABEL_VALUE_XMB_FONT_COLOR_BLUE, +MSG_HASH(MENU_ENUM_LABEL_VALUE_MENU_FONT_COLOR_BLUE, "Menu Font Blue Color") MSG_HASH(MENU_ENUM_LABEL_VALUE_XMB_FONT, "Menu Font") diff --git a/menu/drivers/xmb.c b/menu/drivers/xmb.c index 4be5d19f44..38db535a0e 100755 --- a/menu/drivers/xmb.c +++ b/menu/drivers/xmb.c @@ -744,9 +744,9 @@ static void xmb_draw_text( settings = config_get_ptr(); color = FONT_COLOR_RGBA( - settings->uints.menu_xmb_font_color_red, - settings->uints.menu_xmb_font_color_green, - settings->uints.menu_xmb_font_color_blue, a8); + settings->uints.menu_font_color_red, + settings->uints.menu_font_color_green, + settings->uints.menu_font_color_blue, a8); menu_display_draw_text(font, str, x, y, width, height, color, text_align, scale_factor, diff --git a/menu/menu_displaylist.c b/menu/menu_displaylist.c index 1ca90828b9..4844e3fd02 100644 --- a/menu/menu_displaylist.c +++ b/menu/menu_displaylist.c @@ -5267,13 +5267,13 @@ bool menu_displaylist_ctl(enum menu_displaylist_ctl_state type, void *data) MENU_ENUM_LABEL_XMB_FONT, PARSE_ONLY_PATH, false); menu_displaylist_parse_settings_enum(menu, info, - MENU_ENUM_LABEL_XMB_FONT_COLOR_RED, + MENU_ENUM_LABEL_MENU_FONT_COLOR_RED, PARSE_ONLY_UINT, false); menu_displaylist_parse_settings_enum(menu, info, - MENU_ENUM_LABEL_XMB_FONT_COLOR_GREEN, + MENU_ENUM_LABEL_MENU_FONT_COLOR_GREEN, PARSE_ONLY_UINT, false); menu_displaylist_parse_settings_enum(menu, info, - MENU_ENUM_LABEL_XMB_FONT_COLOR_BLUE, + MENU_ENUM_LABEL_MENU_FONT_COLOR_BLUE, PARSE_ONLY_UINT, false); menu_displaylist_parse_settings_enum(menu, info, MENU_ENUM_LABEL_XMB_THEME, diff --git a/menu/menu_setting.c b/menu/menu_setting.c index e1fa82e335..77d638aa0c 100644 --- a/menu/menu_setting.c +++ b/menu/menu_setting.c @@ -5537,10 +5537,10 @@ static bool setting_append_list( CONFIG_UINT( list, list_info, - &settings->uints.menu_xmb_font_color_red, - MENU_ENUM_LABEL_XMB_FONT_COLOR_RED, - MENU_ENUM_LABEL_VALUE_XMB_FONT_COLOR_RED, - xmb_font_color_red, + &settings->uints.menu_font_color_red, + MENU_ENUM_LABEL_MENU_FONT_COLOR_RED, + MENU_ENUM_LABEL_VALUE_MENU_FONT_COLOR_RED, + menu_font_color_red, &group_info, &subgroup_info, parent_group, @@ -5551,10 +5551,10 @@ static bool setting_append_list( CONFIG_UINT( list, list_info, - &settings->uints.menu_xmb_font_color_green, - MENU_ENUM_LABEL_XMB_FONT_COLOR_GREEN, - MENU_ENUM_LABEL_VALUE_XMB_FONT_COLOR_GREEN, - xmb_font_color_green, + &settings->uints.menu_font_color_green, + MENU_ENUM_LABEL_MENU_FONT_COLOR_GREEN, + MENU_ENUM_LABEL_VALUE_MENU_FONT_COLOR_GREEN, + menu_font_color_green, &group_info, &subgroup_info, parent_group, @@ -5565,10 +5565,10 @@ static bool setting_append_list( CONFIG_UINT( list, list_info, - &settings->uints.menu_xmb_font_color_blue, - MENU_ENUM_LABEL_XMB_FONT_COLOR_BLUE, - MENU_ENUM_LABEL_VALUE_XMB_FONT_COLOR_BLUE, - xmb_font_color_blue, + &settings->uints.menu_font_color_blue, + MENU_ENUM_LABEL_MENU_FONT_COLOR_BLUE, + MENU_ENUM_LABEL_VALUE_MENU_FONT_COLOR_BLUE, + menu_font_color_blue, &group_info, &subgroup_info, parent_group, diff --git a/msg_hash.h b/msg_hash.h index 01c159e2bd..2710159e6f 100644 --- a/msg_hash.h +++ b/msg_hash.h @@ -740,9 +740,9 @@ enum msg_hash_enums MENU_LABEL(ENTRY_HOVER_COLOR), MENU_LABEL(XMB_ALPHA_FACTOR), MENU_LABEL(XMB_SCALE_FACTOR), - MENU_LABEL(XMB_FONT_COLOR_RED), - MENU_LABEL(XMB_FONT_COLOR_GREEN), - MENU_LABEL(XMB_FONT_COLOR_BLUE), + MENU_LABEL(MENU_FONT_COLOR_RED), + MENU_LABEL(MENU_FONT_COLOR_GREEN), + MENU_LABEL(MENU_FONT_COLOR_BLUE), MENU_LABEL(XMB_FONT), MENU_LABEL(XMB_THEME), MENU_LABEL(XMB_MAIN_MENU_ENABLE_SETTINGS),