mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-03-02 19:13:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

font-color: Remove XMB from the Font Color naming scheme

Browse Source
This commit is contained in:
Rob Loach 2017-12-27 17:03:39 -05:00
parent db33df2268
commit 85f9eb402e
No known key found for this signature in database
GPG Key ID: 627C60834A74A21A
20 changed files with 72 additions and 72 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
config.def.h
View File

@ -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

6
configuration.c
View File

@ -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);

6
configuration.h
View File

@ -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;

6
intl/msg_hash_chs.h
View File

@ -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,
"菜单字体")

6
intl/msg_hash_de.h
View File

@ -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")

6
intl/msg_hash_eo.h
View File

@ -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")

6
intl/msg_hash_es.c
View File

@ -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";

6
intl/msg_hash_fr.h
View File

@ -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")

6
intl/msg_hash_it.h
View File

@ -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")

6
intl/msg_hash_ja.h
View File

@ -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,
"メニューのフォント")

6
intl/msg_hash_ko.h
View File

@ -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,
"메뉴 폰트")

12
intl/msg_hash_lbl.h
View File

@ -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,

6
intl/msg_hash_nl.h
View File

@ -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")

6
intl/msg_hash_pt_pt.h
View File

@ -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")

6
intl/msg_hash_ru.h
View File

@ -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,
"Шрифт")

6
intl/msg_hash_us.h
View File

@ -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")

6
menu/drivers/xmb.c
View File

@ -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,

6
menu/menu_displaylist.c
View File

@ -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,

24
menu/menu_setting.c
View File

@ -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,

6
msg_hash.h
View File

@ -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),