Add Font Text Color settings

This commit is contained in:
Rob Loach 2017-03-12 10:33:06 -04:00
parent c549f7e8d7
commit 157fbeccb5
No known key found for this signature in database
GPG Key ID: 627C60834A74A21A
21 changed files with 232 additions and 82 deletions

View File

@ -608,6 +608,9 @@ static bool default_block_config_read = true;
#ifdef HAVE_XMB
static unsigned xmb_scale_factor = 100;
static unsigned xmb_alpha_factor = 75;
static unsigned xmb_font_color_red = 0;
static unsigned xmb_font_color_green = 0;
static unsigned xmb_font_color_blue = 0;
static unsigned xmb_icon_theme = XMB_ICON_THEME_MONOCHROME;
static unsigned xmb_theme = XMB_THEME_ELECTRIC_BLUE;
#ifdef HAVE_LAKKA

View File

@ -948,6 +948,9 @@ static struct config_int_setting *populate_settings_int(settings_t *settings, in
#ifdef HAVE_XMB
SETTING_INT("xmb_alpha_factor", &settings->menu.xmb.alpha_factor, true, xmb_alpha_factor, false);
SETTING_INT("xmb_scale_factor", &settings->menu.xmb.scale_factor, true, xmb_scale_factor, false);
SETTING_INT("xmb_font_color_red", &settings->menu.xmb.font_color_red, true, xmb_font_color_red, false);
SETTING_INT("xmb_font_color_green", &settings->menu.xmb.font_color_green, true, xmb_font_color_green, false);
SETTING_INT("xmb_font_color_blue", &settings->menu.xmb.font_color_blue, true, xmb_font_color_blue, false);
SETTING_INT("xmb_theme", &settings->menu.xmb.theme, true, xmb_icon_theme, false);
SETTING_INT("xmb_menu_color_theme", &settings->menu.xmb.menu_color_theme, true, xmb_theme, false);
#endif
@ -1086,6 +1089,9 @@ static void config_set_defaults(void)
def_menu, sizeof(settings->menu.driver));
#ifdef HAVE_XMB
*settings->menu.xmb.font = '\0';
settings->menu.xmb.font_color_red = 0;
settings->menu.xmb.font_color_blue = 0;
settings->menu.xmb.font_color_green = 0;
#endif
#ifdef HAVE_MATERIALUI

View File

@ -189,6 +189,9 @@ typedef struct settings
{
unsigned shader_pipeline;
char font[PATH_MAX_LENGTH];
int font_color_red;
int font_color_green;
int font_color_blue;
unsigned scale_factor;
unsigned alpha_factor;
unsigned theme;

View File

@ -1,4 +1,4 @@
MSG_HASH(
MSG_HASH(
MSG_COMPILER,
"编译器"
)
@ -1656,6 +1656,12 @@ 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,
"Menu Font Red Color")
MSG_HASH(MENU_ENUM_LABEL_VALUE_XMB_FONT_COLOR_GREEN,
"Menu Font Green Color")
MSG_HASH(MENU_ENUM_LABEL_VALUE_XMB_FONT_COLOR_BLUE,
"Menu Font Blue Color")
MSG_HASH(MENU_ENUM_LABEL_VALUE_XMB_FONT,
"菜单字体")
MSG_HASH(MENU_ENUM_LABEL_VALUE_XMB_ICON_THEME_CUSTOM,

View File

@ -1649,6 +1649,12 @@ 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,
"Menu Font Red Color")
MSG_HASH(MENU_ENUM_LABEL_VALUE_XMB_FONT_COLOR_GREEN,
"Menu Font Green Color")
MSG_HASH(MENU_ENUM_LABEL_VALUE_XMB_FONT_COLOR_BLUE,
"Menu Font Blue Color")
MSG_HASH(MENU_ENUM_LABEL_VALUE_XMB_FONT,
"Menü-Schriftart")
MSG_HASH(MENU_ENUM_LABEL_VALUE_XMB_ICON_THEME_CUSTOM,

View File

@ -1550,6 +1550,12 @@ 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,
"Menu Font Red Color")
MSG_HASH(MENU_ENUM_LABEL_VALUE_XMB_FONT_COLOR_GREEN,
"Menu Font Green Color")
MSG_HASH(MENU_ENUM_LABEL_VALUE_XMB_FONT_COLOR_BLUE,
"Menu Font Blue Color")
MSG_HASH(MENU_ENUM_LABEL_VALUE_XMB_FONT,
"Menu Font")
MSG_HASH(MENU_ENUM_LABEL_VALUE_XMB_ICON_THEME_CUSTOM,

View File

@ -2310,6 +2310,12 @@ 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:
return "Fuente del XMB Red";
case MENU_ENUM_LABEL_VALUE_XMB_FONT_COLOR_GREEN:
return "Fuente del XMB Green";
case MENU_ENUM_LABEL_VALUE_XMB_FONT_COLOR_BLUE:
return "Fuente del XMB Blue";
case MENU_ENUM_LABEL_VALUE_XMB_FONT:
return "Fuente del XMB";
case MENU_ENUM_LABEL_VALUE_XMB_SCALE_FACTOR:

View File

@ -1518,6 +1518,12 @@ MSG_HASH(MENU_ENUM_LABEL_VALUE_WIFI_SETTINGS,
"Wi-Fi")
MSG_HASH(MENU_ENUM_LABEL_VALUE_XMB_ALPHA_FACTOR,
"XMB : Transparence")
MSG_HASH(MENU_ENUM_LABEL_VALUE_XMB_FONT_COLOR_RED,
"Menu Font Red Color")
MSG_HASH(MENU_ENUM_LABEL_VALUE_XMB_FONT_COLOR_GREEN,
"Menu Font Green Color")
MSG_HASH(MENU_ENUM_LABEL_VALUE_XMB_FONT_COLOR_BLUE,
"Menu Font Blue Color")
MSG_HASH(MENU_ENUM_LABEL_VALUE_XMB_FONT,
"XMB : Police")
MSG_HASH(MENU_ENUM_LABEL_VALUE_XMB_ICON_THEME_CUSTOM,

View File

@ -1530,6 +1530,12 @@ MSG_HASH(MENU_ENUM_LABEL_VALUE_WIFI_SETTINGS,
"Wi-Fi")
MSG_HASH(MENU_ENUM_LABEL_VALUE_XMB_ALPHA_FACTOR,
"Fattore alpha del menù")
MSG_HASH(MENU_ENUM_LABEL_VALUE_XMB_FONT_COLOR_RED,
"Menu Font Red Color")
MSG_HASH(MENU_ENUM_LABEL_VALUE_XMB_FONT_COLOR_GREEN,
"Menu Font Green Color")
MSG_HASH(MENU_ENUM_LABEL_VALUE_XMB_FONT_COLOR_BLUE,
"Menu Font Blue Color")
MSG_HASH(MENU_ENUM_LABEL_VALUE_XMB_FONT,
"Carattere del menù")
MSG_HASH(MENU_ENUM_LABEL_VALUE_XMB_ICON_THEME_CUSTOM,

View File

@ -1,4 +1,4 @@
#if defined(_MSC_VER) && !defined(_XBOX)
#if defined(_MSC_VER) && !defined(_XBOX)
/* https://support.microsoft.com/en-us/kb/980263 */
#pragma execution_character_set("utf-8")
#endif
@ -1661,6 +1661,12 @@ 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,
"Menu Font Red Color")
MSG_HASH(MENU_ENUM_LABEL_VALUE_XMB_FONT_COLOR_GREEN,
"Menu Font Green Color")
MSG_HASH(MENU_ENUM_LABEL_VALUE_XMB_FONT_COLOR_BLUE,
"Menu Font Blue Color")
MSG_HASH(MENU_ENUM_LABEL_VALUE_XMB_FONT,
"メニューのフォント")
MSG_HASH(MENU_ENUM_LABEL_VALUE_XMB_ICON_THEME_CUSTOM,

View File

@ -1,4 +1,4 @@
MSG_HASH(
MSG_HASH(
MSG_COMPILER,
"컴파일러"
)
@ -1653,6 +1653,12 @@ 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,
"Menu Font Red Color")
MSG_HASH(MENU_ENUM_LABEL_VALUE_XMB_FONT_COLOR_GREEN,
"Menu Font Green Color")
MSG_HASH(MENU_ENUM_LABEL_VALUE_XMB_FONT_COLOR_BLUE,
"Menu Font Blue Color")
MSG_HASH(MENU_ENUM_LABEL_VALUE_XMB_FONT,
"메뉴 폰트")
MSG_HASH(MENU_ENUM_LABEL_VALUE_XMB_ICON_THEME_CUSTOM,

View File

@ -1095,6 +1095,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_XMB_FONT,
"xmb_font")
MSG_HASH(MENU_ENUM_LABEL_XMB_MENU_COLOR_THEME,

View File

@ -1550,6 +1550,12 @@ 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,
"Menu Font Red Color")
MSG_HASH(MENU_ENUM_LABEL_VALUE_XMB_FONT_COLOR_GREEN,
"Menu Font Green Color")
MSG_HASH(MENU_ENUM_LABEL_VALUE_XMB_FONT_COLOR_BLUE,
"Menu Font Blue Color")
MSG_HASH(MENU_ENUM_LABEL_VALUE_XMB_FONT,
"Menu Font")
MSG_HASH(MENU_ENUM_LABEL_VALUE_XMB_ICON_THEME_CUSTOM,

View File

@ -1647,6 +1647,12 @@ 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,
"Menu Font Red Color")
MSG_HASH(MENU_ENUM_LABEL_VALUE_XMB_FONT_COLOR_GREEN,
"Menu Font Green Color")
MSG_HASH(MENU_ENUM_LABEL_VALUE_XMB_FONT_COLOR_BLUE,
"Menu Font Blue Color")
MSG_HASH(MENU_ENUM_LABEL_VALUE_XMB_FONT,
"Fonte do Menu")
MSG_HASH(MENU_ENUM_LABEL_VALUE_XMB_ICON_THEME_CUSTOM,

View File

@ -1,4 +1,4 @@
#if defined(_MSC_VER) && !defined(_XBOX)
#if defined(_MSC_VER) && !defined(_XBOX)
/* https://support.microsoft.com/en-us/kb/980263 */
#pragma execution_character_set("utf-8")
#endif
@ -1551,6 +1551,12 @@ 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,
"Menu Font Red Color")
MSG_HASH(MENU_ENUM_LABEL_VALUE_XMB_FONT_COLOR_GREEN,
"Menu Font Green Color")
MSG_HASH(MENU_ENUM_LABEL_VALUE_XMB_FONT_COLOR_BLUE,
"Menu Font Blue Color")
MSG_HASH(MENU_ENUM_LABEL_VALUE_XMB_FONT,
"Menu Font")
MSG_HASH(MENU_ENUM_LABEL_VALUE_XMB_ICON_THEME_CUSTOM,

View File

@ -1653,6 +1653,12 @@ 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,
"Menu Font Red Color")
MSG_HASH(MENU_ENUM_LABEL_VALUE_XMB_FONT_COLOR_GREEN,
"Menu Font Green Color")
MSG_HASH(MENU_ENUM_LABEL_VALUE_XMB_FONT_COLOR_BLUE,
"Menu Font Blue Color")
MSG_HASH(MENU_ENUM_LABEL_VALUE_XMB_FONT,
"Menu Font")
MSG_HASH(MENU_ENUM_LABEL_VALUE_XMB_ICON_THEME_CUSTOM,

View File

@ -1,4 +1,4 @@
/* RetroArch - A frontend for libretro.
/* RetroArch - A frontend for libretro.
* Copyright (C) 2011-2017 - Daniel De Matteis
* Copyright (C) 2016-2017 - Brad Parker
*
@ -3188,6 +3188,12 @@ const char *msg_hash_to_str_vn(enum msg_hash_enums msg)
return "Wi-Fi";
case MENU_ENUM_LABEL_VALUE_XMB_ALPHA_FACTOR:
return "Menu Alpha Factor";
case MENU_ENUM_LABEL_VALUE_XMB_FONT_COLOR_RED:
return "Menu Font Red Color";
case MENU_ENUM_LABEL_VALUE_XMB_FONT_COLOR_GREEN:
return "Menu Font Green Color";
case MENU_ENUM_LABEL_VALUE_XMB_FONT_COLOR_BLUE:
return "Menu Font Blue Color";
case MENU_ENUM_LABEL_VALUE_XMB_FONT:
return "Menu Font";
case MENU_ENUM_LABEL_VALUE_XMB_ICON_THEME_CUSTOM:

View File

@ -4637,6 +4637,15 @@ bool menu_displaylist_ctl(enum menu_displaylist_ctl_state type, void *data)
menu_displaylist_parse_settings_enum(menu, info,
MENU_ENUM_LABEL_XMB_SCALE_FACTOR,
PARSE_ONLY_UINT, false);
menu_displaylist_parse_settings_enum(menu, info,
MENU_ENUM_LABEL_XMB_FONT_COLOR_RED,
PARSE_ONLY_PATH, false);
menu_displaylist_parse_settings_enum(menu, info,
MENU_ENUM_LABEL_XMB_FONT_COLOR_GREEN,
PARSE_ONLY_PATH, false);
menu_displaylist_parse_settings_enum(menu, info,
MENU_ENUM_LABEL_XMB_FONT_COLOR_BLUE,
PARSE_ONLY_PATH, false);
menu_displaylist_parse_settings_enum(menu, info,
MENU_ENUM_LABEL_XMB_FONT,
PARSE_ONLY_PATH, false);

View File

@ -5003,6 +5003,48 @@ static bool setting_append_list(
general_read_handler);
settings_data_list_current_add_flags(list, list_info, SD_FLAG_LAKKA_ADVANCED);
CONFIG_UINT(
list, list_info,
&settings->menu.xmb.font_color_red,
MENU_ENUM_LABEL_XMB_FONT_COLOR_RED,
MENU_ENUM_LABEL_VALUE_XMB_FONT_COLOR_RED,
xmb_scale_factor,
&group_info,
&subgroup_info,
parent_group,
general_write_handler,
general_read_handler);
menu_settings_list_current_add_range(list, list_info, 0, 255, 1, true, true);
settings_data_list_current_add_flags(list, list_info, SD_FLAG_LAKKA_ADVANCED);
CONFIG_UINT(
list, list_info,
&settings->menu.xmb.font_color_green,
MENU_ENUM_LABEL_XMB_FONT_COLOR_GREEN,
MENU_ENUM_LABEL_VALUE_XMB_FONT_COLOR_GREEN,
xmb_scale_factor,
&group_info,
&subgroup_info,
parent_group,
general_write_handler,
general_read_handler);
menu_settings_list_current_add_range(list, list_info, 0, 255, 1, true, true);
settings_data_list_current_add_flags(list, list_info, SD_FLAG_LAKKA_ADVANCED);
CONFIG_UINT(
list, list_info,
&settings->menu.xmb.font_color_blue,
MENU_ENUM_LABEL_XMB_FONT_COLOR_BLUE,
MENU_ENUM_LABEL_VALUE_XMB_FONT_COLOR_BLUE,
xmb_scale_factor,
&group_info,
&subgroup_info,
parent_group,
general_write_handler,
general_read_handler);
menu_settings_list_current_add_range(list, list_info, 0, 255, 1, true, true);
settings_data_list_current_add_flags(list, list_info, SD_FLAG_LAKKA_ADVANCED);
CONFIG_UINT(
list, list_info,
&settings->menu.xmb.theme,

View File

@ -653,6 +653,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(XMB_FONT),
MENU_LABEL(XMB_THEME),
MENU_LABEL(XMB_MENU_COLOR_THEME),