From 157fbeccb585bf874c32ca9734caacd8319fecb3 Mon Sep 17 00:00:00 2001 From: Rob Loach Date: Sun, 12 Mar 2017 10:33:06 -0400 Subject: [PATCH 1/7] Add Font Text Color settings --- config.def.h | 3 + configuration.c | 70 +++++++++++++----------- configuration.h | 3 + intl/msg_hash_chs.h | 8 ++- 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 | 8 ++- intl/msg_hash_ko.h | 8 ++- intl/msg_hash_lbl.h | 6 ++ intl/msg_hash_nl.h | 6 ++ intl/msg_hash_pt.h | 6 ++ intl/msg_hash_ru.h | 8 ++- intl/msg_hash_us.h | 6 ++ intl/msg_hash_vn.c | 8 ++- menu/drivers/xmb.c | 2 +- menu/menu_displaylist.c | 21 +++++-- menu/menu_setting.c | 118 +++++++++++++++++++++++++++------------- msg_hash.h | 3 + 21 files changed, 232 insertions(+), 82 deletions(-) diff --git a/config.def.h b/config.def.h index 26bf0dc0fa..0e22bf0832 100644 --- a/config.def.h +++ b/config.def.h @@ -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 diff --git a/configuration.c b/configuration.c index ade27f3b7a..1da32a7833 100644 --- a/configuration.c +++ b/configuration.c @@ -52,7 +52,7 @@ /* All config related settings go here. */ struct config_bool_setting -{ +{ const char *ident; bool *ptr; bool def_enable; @@ -61,7 +61,7 @@ struct config_bool_setting }; struct config_int_setting -{ +{ const char *ident; unsigned *ptr; bool def_enable; @@ -70,7 +70,7 @@ struct config_int_setting }; struct config_float_setting -{ +{ const char *ident; float *ptr; bool def_enable; @@ -79,7 +79,7 @@ struct config_float_setting }; struct config_array_setting -{ +{ const char *ident; char *ptr; bool def_enable; @@ -88,7 +88,7 @@ struct config_array_setting }; struct config_path_setting -{ +{ const char *ident; char *ptr; bool def_enable; @@ -109,7 +109,7 @@ struct config_path_setting tmp[count].def = default_setting; \ tmp[count].handle = handle_setting; \ count++; \ -} +} #define SETTING_BOOL(key, configval, default_enable, default_setting, handle_setting) \ GENERAL_SETTING(key, configval, default_enable, default_setting, struct config_bool_setting, handle_setting) @@ -631,7 +631,7 @@ static struct config_path_setting *populate_settings_path(settings_t *settings, SETTING_PATH("cheat_database_path", settings->path.cheat_database, false, NULL, true); #ifdef HAVE_MENU - SETTING_PATH("menu_wallpaper", + SETTING_PATH("menu_wallpaper", settings->path.menu_wallpaper, false, NULL, true); #endif SETTING_PATH("content_history_path", @@ -650,7 +650,7 @@ static struct config_path_setting *populate_settings_path(settings_t *settings, settings->path.font, false, NULL, true); SETTING_PATH("cursor_directory", settings->directory.cursor, false, NULL, true); - SETTING_PATH("content_history_dir", + SETTING_PATH("content_history_dir", settings->directory.content_history, false, NULL, true); SETTING_PATH("screenshot_directory", settings->directory.screenshot, true, NULL, true); @@ -680,7 +680,7 @@ static struct config_path_setting *populate_settings_path(settings_t *settings, settings->directory.autoconfig, false, NULL, true); SETTING_PATH("audio_filter_dir", settings->directory.audio_filter, true, NULL, true); - SETTING_PATH("savefile_directory", + SETTING_PATH("savefile_directory", dir_get_ptr(RARCH_DIR_SAVEFILE), true, NULL, false); SETTING_PATH("savestate_directory", dir_get_ptr(RARCH_DIR_SAVESTATE), true, NULL, false); @@ -695,11 +695,11 @@ static struct config_path_setting *populate_settings_path(settings_t *settings, settings->directory.overlay, true, NULL, true); #endif #ifndef HAVE_DYNAMIC - SETTING_PATH("libretro_path", + SETTING_PATH("libretro_path", path_get_ptr(RARCH_PATH_CORE), false, NULL, false); #endif SETTING_PATH( - "screenshot_directory", + "screenshot_directory", settings->directory.screenshot, true, NULL, false); if (global) @@ -818,13 +818,13 @@ static struct config_bool_setting *populate_settings_bool(settings_t *settings, SETTING_BOOL("xmb_show_netplay", &settings->menu.xmb.show_netplay, true, xmb_show_netplay, false); #endif SETTING_BOOL("xmb_show_history", &settings->menu.xmb.show_history, true, xmb_show_history, false); -#ifdef HAVE_LIBRETRODB +#ifdef HAVE_LIBRETRODB SETTING_BOOL("xmb_show_add", &settings->menu.xmb.show_add, true, xmb_show_add, false); #endif #endif SETTING_BOOL("rgui_show_start_screen", &settings->menu_show_start_screen, false, false /* TODO */, false); SETTING_BOOL("menu_navigation_wraparound_enable", &settings->menu.navigation.wraparound.enable, true, true, false); - SETTING_BOOL("menu_navigation_browser_filter_supported_extensions_enable", + SETTING_BOOL("menu_navigation_browser_filter_supported_extensions_enable", &settings->menu.navigation.browser.filter.supported_extensions_enable, true, true, false); SETTING_BOOL("menu_show_advanced_settings", &settings->menu.show_advanced_settings, true, show_advanced_settings, false); #endif @@ -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 @@ -1085,7 +1088,10 @@ static void config_set_defaults(void) strlcpy(settings->menu.driver, def_menu, sizeof(settings->menu.driver)); #ifdef HAVE_XMB - *settings->menu.xmb.font = '\0'; + *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 @@ -1504,7 +1510,7 @@ static config_file_t *open_default_config_file(void) RARCH_WARN("Created new config file in: \"%s\".\n", conf_path); } #elif !defined(RARCH_CONSOLE) - bool has_application_data = + bool has_application_data = fill_pathname_application_data(application_data, sizeof(application_data)); @@ -1685,7 +1691,7 @@ static bool check_shader_compatibility(enum file_path_enum enum_idx) return true; } - if (string_is_equal("gl", settings->video.driver) || + if (string_is_equal("gl", settings->video.driver) || string_is_equal("d3d", settings->video.driver)) { if (enum_idx == FILE_PATH_SLANGP_EXTENSION) @@ -1755,7 +1761,7 @@ static void config_get_hex_base(config_file_t *conf, * Loads a config file and reads all the values into memory. * */ -static bool config_load_file(const char *path, bool set_defaults, +static bool config_load_file(const char *path, bool set_defaults, settings_t *settings) { unsigned i; @@ -2268,10 +2274,10 @@ end: * This function only has an effect if a game-specific or core-specific * configuration file exists at respective locations. * - * core-specific: $CONFIG_DIR/$CORE_NAME/$CORE_NAME.cfg + * core-specific: $CONFIG_DIR/$CORE_NAME/$CORE_NAME.cfg * fallback: $CURRENT_CFG_LOCATION/$CORE_NAME/$CORE_NAME.cfg * - * game-specific: $CONFIG_DIR/$CORE_NAME/$ROM_NAME.cfg + * game-specific: $CONFIG_DIR/$CORE_NAME/$ROM_NAME.cfg * fallback: $CURRENT_CFG_LOCATION/$CORE_NAME/$GAME_NAME.cfg * * Returns: false if there was an error or no action was performed. @@ -2368,7 +2374,7 @@ bool config_load_override(void) /* Re-load the configuration with any overrides that might have been found */ buf[0] = '\0'; - /* Store the libretro_path we're using since it will be + /* Store the libretro_path we're using since it will be * overwritten by the override when reloading. */ strlcpy(buf, path_get(RARCH_PATH_CORE), sizeof(buf)); @@ -2824,7 +2830,7 @@ static void save_keybinds_user(config_file_t *conf, unsigned user) */ void config_load(void) { - /* Flush out some states that could have been + /* Flush out some states that could have been * set by core environment variables */ core_unset_input_descriptors(); @@ -3182,7 +3188,7 @@ bool config_save_overrides(int override_type) fill_pathname_application_special(config_directory, sizeof(config_directory), APPLICATION_SPECIAL_DIRECTORY_CONFIG); - fill_pathname_join(override_directory, config_directory, core_name, + fill_pathname_join(override_directory, config_directory, core_name, sizeof(override_directory)); if(!path_file_exists(override_directory)) @@ -3235,9 +3241,9 @@ bool config_save_overrides(int override_type) { if ((*bool_settings[i].ptr) != (*bool_overrides[i].ptr)) { - RARCH_LOG(" original: %s=%d\n", + RARCH_LOG(" original: %s=%d\n", bool_settings[i].ident, (*bool_settings[i].ptr)); - RARCH_LOG(" override: %s=%d\n", + RARCH_LOG(" override: %s=%d\n", bool_overrides[i].ident, (*bool_overrides[i].ptr)); config_set_bool(conf, bool_overrides[i].ident, (*bool_overrides[i].ptr)); @@ -3247,9 +3253,9 @@ bool config_save_overrides(int override_type) { if ((*int_settings[i].ptr) != (*int_overrides[i].ptr)) { - RARCH_LOG(" original: %s=%d\n", + RARCH_LOG(" original: %s=%d\n", int_settings[i].ident, (*int_settings[i].ptr)); - RARCH_LOG(" override: %s=%d\n", + RARCH_LOG(" override: %s=%d\n", int_overrides[i].ident, (*int_overrides[i].ptr)); config_set_int(conf, int_overrides[i].ident, (*int_overrides[i].ptr)); @@ -3259,9 +3265,9 @@ bool config_save_overrides(int override_type) { if ((*float_settings[i].ptr) != (*float_overrides[i].ptr)) { - RARCH_LOG(" original: %s=%f\n", + RARCH_LOG(" original: %s=%f\n", float_settings[i].ident, *float_settings[i].ptr); - RARCH_LOG(" override: %s=%f\n", + RARCH_LOG(" override: %s=%f\n", float_overrides[i].ident, *float_overrides[i].ptr); config_set_float(conf, float_overrides[i].ident, *float_overrides[i].ptr); @@ -3272,9 +3278,9 @@ bool config_save_overrides(int override_type) { if (!string_is_equal(array_settings[i].ptr, array_overrides[i].ptr)) { - RARCH_LOG(" original: %s=%s\n", + RARCH_LOG(" original: %s=%s\n", array_settings[i].ident, array_settings[i].ptr); - RARCH_LOG(" override: %s=%s\n", + RARCH_LOG(" override: %s=%s\n", array_overrides[i].ident, array_overrides[i].ptr); config_set_string(conf, array_overrides[i].ident, array_overrides[i].ptr); @@ -3285,9 +3291,9 @@ bool config_save_overrides(int override_type) { if (!string_is_equal(path_settings[i].ptr, path_overrides[i].ptr)) { - RARCH_LOG(" original: %s=%s\n", + RARCH_LOG(" original: %s=%s\n", path_settings[i].ident, path_settings[i].ptr); - RARCH_LOG(" override: %s=%s\n", + RARCH_LOG(" override: %s=%s\n", path_overrides[i].ident, path_overrides[i].ptr); config_set_path(conf, path_overrides[i].ident, path_overrides[i].ptr); diff --git a/configuration.h b/configuration.h index 9b1c827b33..47b72414e5 100644 --- a/configuration.h +++ b/configuration.h @@ -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; diff --git a/intl/msg_hash_chs.h b/intl/msg_hash_chs.h index 2247b51f46..4034850c68 100644 --- a/intl/msg_hash_chs.h +++ b/intl/msg_hash_chs.h @@ -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, diff --git a/intl/msg_hash_de.h b/intl/msg_hash_de.h index 3a0614e528..2e181e483e 100644 --- a/intl/msg_hash_de.h +++ b/intl/msg_hash_de.h @@ -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, diff --git a/intl/msg_hash_eo.h b/intl/msg_hash_eo.h index aede2dfc0d..5eeb225a48 100644 --- a/intl/msg_hash_eo.h +++ b/intl/msg_hash_eo.h @@ -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, diff --git a/intl/msg_hash_es.c b/intl/msg_hash_es.c index 5f2c0ed82e..6e2fbdaf7e 100644 --- a/intl/msg_hash_es.c +++ b/intl/msg_hash_es.c @@ -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: diff --git a/intl/msg_hash_fr.h b/intl/msg_hash_fr.h index 25c2bb4686..86bbee4106 100644 --- a/intl/msg_hash_fr.h +++ b/intl/msg_hash_fr.h @@ -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, diff --git a/intl/msg_hash_it.h b/intl/msg_hash_it.h index 76a68124e8..ea4188108e 100644 --- a/intl/msg_hash_it.h +++ b/intl/msg_hash_it.h @@ -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, diff --git a/intl/msg_hash_ja.h b/intl/msg_hash_ja.h index 672d162bef..24a9a0ba5f 100644 --- a/intl/msg_hash_ja.h +++ b/intl/msg_hash_ja.h @@ -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, diff --git a/intl/msg_hash_ko.h b/intl/msg_hash_ko.h index 79c19ce9d1..b48776df5e 100644 --- a/intl/msg_hash_ko.h +++ b/intl/msg_hash_ko.h @@ -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, diff --git a/intl/msg_hash_lbl.h b/intl/msg_hash_lbl.h index 663db375f5..0e469f1049 100644 --- a/intl/msg_hash_lbl.h +++ b/intl/msg_hash_lbl.h @@ -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, diff --git a/intl/msg_hash_nl.h b/intl/msg_hash_nl.h index 6ce92a9aa5..6eaee8ea7e 100644 --- a/intl/msg_hash_nl.h +++ b/intl/msg_hash_nl.h @@ -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, diff --git a/intl/msg_hash_pt.h b/intl/msg_hash_pt.h index 816c2a19d6..0c98626c8f 100644 --- a/intl/msg_hash_pt.h +++ b/intl/msg_hash_pt.h @@ -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, diff --git a/intl/msg_hash_ru.h b/intl/msg_hash_ru.h index 480252759d..7e73e64fce 100644 --- a/intl/msg_hash_ru.h +++ b/intl/msg_hash_ru.h @@ -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, diff --git a/intl/msg_hash_us.h b/intl/msg_hash_us.h index a44a6d0b70..747fcb8894 100644 --- a/intl/msg_hash_us.h +++ b/intl/msg_hash_us.h @@ -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, diff --git a/intl/msg_hash_vn.c b/intl/msg_hash_vn.c index 833bc627cb..bbe117548a 100644 --- a/intl/msg_hash_vn.c +++ b/intl/msg_hash_vn.c @@ -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: diff --git a/menu/drivers/xmb.c b/menu/drivers/xmb.c index 796fb62c48..546bfcdb21 100644 --- a/menu/drivers/xmb.c +++ b/menu/drivers/xmb.c @@ -843,7 +843,7 @@ static void xmb_render_messagebox_internal( { const char *msg = list->elems[i].data; int len = (int)utf8len(msg); - + if (len > longest) { longest = len; diff --git a/menu/menu_displaylist.c b/menu/menu_displaylist.c index ca6f4e258a..660099d25e 100644 --- a/menu/menu_displaylist.c +++ b/menu/menu_displaylist.c @@ -196,7 +196,7 @@ static void print_buf_lines(file_list_t *list, char *buf, sizeof(core_path)); if ( - path_file_exists(core_path) + path_file_exists(core_path) && core_info_get_display_name( core_path, display_name, sizeof(display_name))) menu_entries_set_alt_at_offset(list, j, display_name); @@ -2813,8 +2813,8 @@ static int menu_displaylist_parse_horizontal_content_actions( msg_hash_to_str(MENU_ENUM_LABEL_VALUE_RUN), msg_hash_to_str(MENU_ENUM_LABEL_RUN), MENU_ENUM_LABEL_RUN, FILE_TYPE_PLAYLIST_ENTRY, 0, idx); - - if (settings->playlist_entry_remove) + + if (settings->playlist_entry_remove) menu_entries_append_enum(info->list, msg_hash_to_str(MENU_ENUM_LABEL_VALUE_DELETE_ENTRY), msg_hash_to_str(MENU_ENUM_LABEL_DELETE_ENTRY), @@ -2995,7 +2995,7 @@ static int menu_displaylist_parse_netplay_room_list( msg_hash_to_str(MENU_ENUM_LABEL_NETPLAY_REFRESH_ROOMS), MENU_ENUM_LABEL_NETPLAY_REFRESH_ROOMS, MENU_SETTING_ACTION, 0, 0); - + if (netplay_room_count > 0) { unsigned i; @@ -3686,7 +3686,7 @@ static bool menu_displaylist_push_list_process(menu_displaylist_info_t *info) MENU_SETTING_ACTION, 0, 0); } #endif - + if (info->push_builtin_cores) { #if defined(HAVE_VIDEO_PROCESSOR) @@ -4378,7 +4378,7 @@ bool menu_displaylist_ctl(enum menu_displaylist_ctl_state type, void *data) PARSE_ONLY_UINT, false); ret = menu_displaylist_parse_settings_enum(menu, info, MENU_ENUM_LABEL_PLAYLIST_ENTRY_REMOVE, - PARSE_ONLY_BOOL, false); + PARSE_ONLY_BOOL, false); menu_displaylist_parse_playlist_associations(info); info->need_push = true; @@ -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); diff --git a/menu/menu_setting.c b/menu/menu_setting.c index ff1ee8a1cf..d6b6ed7391 100644 --- a/menu/menu_setting.c +++ b/menu/menu_setting.c @@ -140,10 +140,10 @@ static void setting_get_string_representation_uint_custom_viewport_width(void *d rarch_setting_t *setting = (rarch_setting_t*)data; if (!setting) return; - + av_info = video_viewport_get_system_av_info(); geom = (struct retro_game_geometry*)&av_info->geometry; - + if (*setting->value.target.unsigned_integer%geom->base_width == 0) snprintf(s, len, "%u (%ux)", *setting->value.target.unsigned_integer, @@ -161,10 +161,10 @@ static void setting_get_string_representation_uint_custom_viewport_height(void * rarch_setting_t *setting = (rarch_setting_t*)data; if (!setting) return; - + av_info = video_viewport_get_system_av_info(); geom = (struct retro_game_geometry*)&av_info->geometry; - + if (*setting->value.target.unsigned_integer%geom->base_height == 0) snprintf(s, len, "%u (%ux)", *setting->value.target.unsigned_integer, @@ -743,7 +743,7 @@ int menu_action_handle_setting(rarch_setting_t *setting, return -1; } -static rarch_setting_t *menu_setting_find_internal(rarch_setting_t *setting, +static rarch_setting_t *menu_setting_find_internal(rarch_setting_t *setting, const char *label) { uint32_t needle = msg_hash_calculate(label); @@ -773,7 +773,7 @@ static rarch_setting_t *menu_setting_find_internal(rarch_setting_t *setting, return NULL; } -static rarch_setting_t *menu_setting_find_internal_enum(rarch_setting_t *setting, +static rarch_setting_t *menu_setting_find_internal_enum(rarch_setting_t *setting, enum msg_hash_enums enum_idx) { rarch_setting_t **list = &setting; @@ -1032,10 +1032,10 @@ static int setting_action_start_libretro_device_type(void *data) devices[types++] = RETRO_DEVICE_NONE; devices[types++] = RETRO_DEVICE_JOYPAD; - if (runloop_ctl(RUNLOOP_CTL_SYSTEM_INFO_GET, &system) + if (runloop_ctl(RUNLOOP_CTL_SYSTEM_INFO_GET, &system) && system) { - /* Only push RETRO_DEVICE_ANALOG as default if we use an + /* Only push RETRO_DEVICE_ANALOG as default if we use an * older core which doesn't use SET_CONTROLLER_INFO. */ if (!system->ports.size) devices[types++] = RETRO_DEVICE_ANALOG; @@ -1139,7 +1139,7 @@ static int setting_action_left_libretro_device_type( if (system) { - /* Only push RETRO_DEVICE_ANALOG as default if we use an + /* Only push RETRO_DEVICE_ANALOG as default if we use an * older core which doesn't use SET_CONTROLLER_INFO. */ if (!system->ports.size) devices[types++] = RETRO_DEVICE_ANALOG; @@ -1203,10 +1203,10 @@ static int setting_action_right_libretro_device_type( devices[types++] = RETRO_DEVICE_NONE; devices[types++] = RETRO_DEVICE_JOYPAD; - if (runloop_ctl(RUNLOOP_CTL_SYSTEM_INFO_GET, &system) + if (runloop_ctl(RUNLOOP_CTL_SYSTEM_INFO_GET, &system) && system) { - /* Only push RETRO_DEVICE_ANALOG as default if we use an + /* Only push RETRO_DEVICE_ANALOG as default if we use an * older core which doesn't use SET_CONTROLLER_INFO. */ if (!system->ports.size) devices[types++] = RETRO_DEVICE_ANALOG; @@ -1348,7 +1348,7 @@ static int setting_action_ok_bind_defaults(void *data, bool wraparound) target = (struct retro_keybind*) &settings->input.binds[setting->index_offset][0]; - def_binds = (setting->index_offset) ? + def_binds = (setting->index_offset) ? retro_keybinds_rest : retro_keybinds_1; if (!target) @@ -1465,7 +1465,7 @@ static void get_string_representation_bind_device(void * data, char *s, * Get associated label of a setting. **/ void menu_setting_get_label(void *data, char *s, - size_t len, unsigned *w, unsigned type, + size_t len, unsigned *w, unsigned type, const char *menu_label, const char *label, unsigned idx) { rarch_setting_t *setting = NULL; @@ -1595,7 +1595,7 @@ void general_write_handler(void *data) file_list_t *menu_stack = menu_entries_get_menu_stack_ptr(0); info.list = menu_stack; - info.type = 0; + info.type = 0; info.directory_ptr = 0; strlcpy(info.label, msg_hash_to_str(MENU_ENUM_LABEL_HELP), sizeof(info.label)); @@ -1650,14 +1650,14 @@ void general_write_handler(void *data) break; case MENU_ENUM_LABEL_LOG_VERBOSITY: { - if (setting - && setting->value.target.boolean + if (setting + && setting->value.target.boolean && *setting->value.target.boolean) verbosity_enable(); else verbosity_disable(); - if (setting + if (setting && setting->value.target.boolean && *setting->value.target.boolean) retroarch_override_setting_set(RARCH_OVERRIDE_SETTING_VERBOSITY, NULL); @@ -1698,7 +1698,7 @@ void general_write_handler(void *data) { #if defined(__CELLOS_LV2__) && (CELL_SDK_VERSION > 0x340000) cellSysutilEnableBgmPlayback(); -#endif +#endif } else { @@ -1974,7 +1974,7 @@ static bool setting_append_list_input_player_options( (*list)[list_info->index - 1].action_right = &setting_action_right_libretro_device_type; (*list)[list_info->index - 1].action_select = &setting_action_right_libretro_device_type; (*list)[list_info->index - 1].action_start = &setting_action_start_libretro_device_type; - (*list)[list_info->index - 1].get_string_representation = + (*list)[list_info->index - 1].get_string_representation = &setting_get_string_representation_uint_libretro_device; menu_settings_list_current_add_enum_idx(list, list_info, (enum msg_hash_enums)(MENU_ENUM_LABEL_INPUT_LIBRETRO_DEVICE + user)); @@ -1995,7 +1995,7 @@ static bool setting_append_list_input_player_options( (*list)[list_info->index - 1].action_right = &setting_action_right_analog_dpad_mode; (*list)[list_info->index - 1].action_select = &setting_action_right_analog_dpad_mode; (*list)[list_info->index - 1].action_start = &setting_action_start_analog_dpad_mode; - (*list)[list_info->index - 1].get_string_representation = + (*list)[list_info->index - 1].get_string_representation = &setting_get_string_representation_uint_analog_dpad_mode; menu_settings_list_current_add_enum_idx(list, list_info, (enum msg_hash_enums)(MENU_ENUM_LABEL_INPUT_PLAYER_ANALOG_DPAD_MODE + user)); @@ -2073,7 +2073,7 @@ static bool setting_append_list_input_player_options( ) { if (system->input_desc_btn[user][i]) - strlcat(label, + strlcat(label, system->input_desc_btn[user][i], sizeof(label)); else @@ -2912,7 +2912,7 @@ static bool setting_append_list( general_write_handler, general_read_handler); menu_settings_list_current_add_range(list, list_info, 0, 3, 1.0, true, true); - (*list)[list_info->index - 1].get_string_representation = + (*list)[list_info->index - 1].get_string_representation = &setting_get_string_representation_uint_libretro_log_level; settings_data_list_current_add_flags(list, list_info, SD_FLAG_ADVANCED); @@ -3027,7 +3027,7 @@ static bool setting_append_list( menu_settings_list_current_add_cmd(list, list_info, CMD_EVENT_AUTOSAVE_INIT); menu_settings_list_current_add_range(list, list_info, 0, 0, 10, true, false); settings_data_list_current_add_flags(list, list_info, SD_FLAG_CMD_APPLY_AUTO); - (*list)[list_info->index - 1].get_string_representation = + (*list)[list_info->index - 1].get_string_representation = &setting_get_string_representation_uint_autosave_interval; #endif @@ -3152,7 +3152,7 @@ static bool setting_append_list( general_read_handler); menu_settings_list_current_add_cmd(list, list_info, CMD_EVENT_REINIT); menu_settings_list_current_add_range(list, list_info, 0, 1, 1, true, false); - (*list)[list_info->index - 1].get_string_representation = + (*list)[list_info->index - 1].get_string_representation = &setting_get_string_representation_uint_video_monitor_index; if (video_driver_has_windowed()) @@ -3222,7 +3222,7 @@ static bool setting_append_list( (*list)[list_info->index - 1].action_start = &setting_action_start_video_refresh_rate_auto; (*list)[list_info->index - 1].action_ok = &setting_action_ok_video_refresh_rate_auto; (*list)[list_info->index - 1].action_select = &setting_action_ok_video_refresh_rate_auto; - (*list)[list_info->index - 1].get_string_representation = + (*list)[list_info->index - 1].get_string_representation = &setting_get_string_representation_st_float_video_refresh_rate_auto; settings_data_list_current_add_flags(list, list_info, SD_FLAG_LAKKA_ADVANCED); @@ -3272,7 +3272,7 @@ static bool setting_append_list( true, true); settings_data_list_current_add_flags(list, list_info, SD_FLAG_CMD_APPLY_AUTO); - (*list)[list_info->index - 1].get_string_representation = + (*list)[list_info->index - 1].get_string_representation = &setting_get_string_representation_uint_aspect_ratio_index; CONFIG_INT( @@ -3482,7 +3482,7 @@ static bool setting_append_list( general_write_handler, general_read_handler); menu_settings_list_current_add_range(list, list_info, 0, 3, 1, true, true); - (*list)[list_info->index - 1].get_string_representation = + (*list)[list_info->index - 1].get_string_representation = &setting_get_string_representation_uint_video_rotation; settings_data_list_current_add_flags(list, list_info, SD_FLAG_ADVANCED); @@ -3796,7 +3796,7 @@ static bool setting_append_list( &settings->audio.latency, MENU_ENUM_LABEL_AUDIO_LATENCY, MENU_ENUM_LABEL_VALUE_AUDIO_LATENCY, - g_defaults.settings.out_latency ? + g_defaults.settings.out_latency ? g_defaults.settings.out_latency : out_latency, &group_info, &subgroup_info, @@ -4416,7 +4416,7 @@ static bool setting_append_list( &retro_keybinds_1[i], &group_info, &subgroup_info, parent_group); (*list)[list_info->index - 1].bind_type = i + MENU_SETTINGS_BIND_BEGIN; - menu_settings_list_current_add_enum_idx(list, list_info, + menu_settings_list_current_add_enum_idx(list, list_info, (enum msg_hash_enums)(MENU_ENUM_LABEL_INPUT_HOTKEY_BIND_BEGIN + i)); } @@ -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, @@ -5173,7 +5215,7 @@ static bool setting_append_list( general_read_handler, SD_FLAG_NONE); settings_data_list_current_add_flags(list, list_info, SD_FLAG_LAKKA_ADVANCED); -#endif +#endif } #endif @@ -5513,7 +5555,7 @@ static bool setting_append_list( menu_settings_list_current_add_range(list, list_info, 0, 0, 1.0, true, false); END_SUB_GROUP(list, list_info, parent_group); - + START_SUB_GROUP(list, list_info, "Playlist", &group_info, &subgroup_info, parent_group); CONFIG_BOOL( @@ -5530,9 +5572,9 @@ static bool setting_append_list( general_write_handler, general_read_handler, SD_FLAG_NONE); - + END_SUB_GROUP(list, list_info, parent_group); - + END_GROUP(list, list_info, parent_group); break; case SETTINGS_LIST_CHEEVOS: @@ -5609,7 +5651,7 @@ static bool setting_append_list( sizeof(settings->network.buildbot_url), MENU_ENUM_LABEL_CORE_UPDATER_BUILDBOT_URL, MENU_ENUM_LABEL_VALUE_CORE_UPDATER_BUILDBOT_URL, - buildbot_server_url, + buildbot_server_url, &group_info, &subgroup_info, parent_group, @@ -5623,7 +5665,7 @@ static bool setting_append_list( sizeof(settings->network.buildbot_assets_url), MENU_ENUM_LABEL_BUILDBOT_ASSETS_URL, MENU_ENUM_LABEL_VALUE_BUILDBOT_ASSETS_URL, - buildbot_assets_server_url, + buildbot_assets_server_url, &group_info, &subgroup_info, parent_group, @@ -6138,7 +6180,7 @@ static bool setting_append_list( true, true); menu_settings_list_current_add_cmd(list, list_info, CMD_EVENT_MENU_REFRESH); - (*list)[list_info->index - 1].get_string_representation = + (*list)[list_info->index - 1].get_string_representation = &setting_get_string_representation_uint_user_language; #endif @@ -6203,7 +6245,7 @@ static bool setting_append_list( parent_group, general_write_handler, general_read_handler); - (*list)[list_info->index - 1].get_string_representation = + (*list)[list_info->index - 1].get_string_representation = &setting_get_string_representation_cheevos_password; settings_data_list_current_add_flags(list, list_info, SD_FLAG_ALLOW_INPUT); #endif @@ -6680,7 +6722,7 @@ static rarch_setting_t *menu_setting_new_internal(rarch_setting_info_t *list_inf { unsigned i; rarch_setting_t* resized_list = NULL; - enum settings_list_type list_types[] = + enum settings_list_type list_types[] = { SETTINGS_LIST_MAIN_MENU, SETTINGS_LIST_DRIVERS, diff --git a/msg_hash.h b/msg_hash.h index 6e3c44c3a4..aa899c92cf 100644 --- a/msg_hash.h +++ b/msg_hash.h @@ -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), From be936e9bcf0d90c1197e11d0b6c5a41b8735bffd Mon Sep 17 00:00:00 2001 From: Rob Loach Date: Tue, 14 Mar 2017 06:09:46 -0400 Subject: [PATCH 2/7] Fix type of font colors --- configuration.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/configuration.h b/configuration.h index 47b72414e5..35166310da 100644 --- a/configuration.h +++ b/configuration.h @@ -189,9 +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 font_color_red; + unsigned font_color_green; + unsigned font_color_blue; unsigned scale_factor; unsigned alpha_factor; unsigned theme; From f51994d7e30bca7aa785a153564c00b6b47e2d91 Mon Sep 17 00:00:00 2001 From: Rob Loach Date: Wed, 27 Dec 2017 16:30:01 -0500 Subject: [PATCH 3/7] font-color: Fix parsing setting --- menu/menu_displaylist.c | 6 +++--- menu/menu_setting.c | 1 - 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/menu/menu_displaylist.c b/menu/menu_displaylist.c index 5e75220a75..1ca90828b9 100644 --- a/menu/menu_displaylist.c +++ b/menu/menu_displaylist.c @@ -5268,13 +5268,13 @@ bool menu_displaylist_ctl(enum menu_displaylist_ctl_state type, void *data) PARSE_ONLY_PATH, false); menu_displaylist_parse_settings_enum(menu, info, MENU_ENUM_LABEL_XMB_FONT_COLOR_RED, - PARSE_ONLY_PATH, false); + PARSE_ONLY_UINT, false); menu_displaylist_parse_settings_enum(menu, info, MENU_ENUM_LABEL_XMB_FONT_COLOR_GREEN, - PARSE_ONLY_PATH, false); + PARSE_ONLY_UINT, false); menu_displaylist_parse_settings_enum(menu, info, MENU_ENUM_LABEL_XMB_FONT_COLOR_BLUE, - PARSE_ONLY_PATH, false); + PARSE_ONLY_UINT, false); menu_displaylist_parse_settings_enum(menu, info, MENU_ENUM_LABEL_XMB_THEME, PARSE_ONLY_UINT, false); diff --git a/menu/menu_setting.c b/menu/menu_setting.c index 1c8c8c6c55..28b3111fd2 100644 --- a/menu/menu_setting.c +++ b/menu/menu_setting.c @@ -5577,7 +5577,6 @@ static bool setting_append_list( 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->uints.menu_xmb_theme, From f96b28571519a15b5e3033f2e3661fbca57b6f44 Mon Sep 17 00:00:00 2001 From: Rob Loach Date: Wed, 27 Dec 2017 16:38:36 -0500 Subject: [PATCH 4/7] font-color: Use the settings for the color --- menu/drivers/xmb.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/menu/drivers/xmb.c b/menu/drivers/xmb.c index 9cd62b6fe5..4be5d19f44 100755 --- a/menu/drivers/xmb.c +++ b/menu/drivers/xmb.c @@ -731,6 +731,7 @@ static void xmb_draw_text( { uint32_t color; uint8_t a8; + settings_t *settings; if (alpha > xmb->alpha) alpha = xmb->alpha; @@ -741,7 +742,11 @@ static void xmb_draw_text( if (a8 == 0) return; - color = FONT_COLOR_RGBA(xmb_font_color_red, xmb_font_color_green, xmb_font_color_blue, a8); + 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); menu_display_draw_text(font, str, x, y, width, height, color, text_align, scale_factor, From db33df2268d98b21d1d338677db26f692e89e6f1 Mon Sep 17 00:00:00 2001 From: Rob Loach Date: Wed, 27 Dec 2017 16:45:27 -0500 Subject: [PATCH 5/7] font-color: Only display on Advanced Settings --- menu/menu_setting.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/menu/menu_setting.c b/menu/menu_setting.c index 28b3111fd2..e1fa82e335 100644 --- a/menu/menu_setting.c +++ b/menu/menu_setting.c @@ -5547,7 +5547,7 @@ static bool setting_append_list( 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); + settings_data_list_current_add_flags(list, list_info, SD_FLAG_ADVANCED); CONFIG_UINT( list, list_info, @@ -5561,7 +5561,7 @@ static bool setting_append_list( 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); + settings_data_list_current_add_flags(list, list_info, SD_FLAG_ADVANCED); CONFIG_UINT( list, list_info, @@ -5575,7 +5575,7 @@ static bool setting_append_list( 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); + settings_data_list_current_add_flags(list, list_info, SD_FLAG_ADVANCED); CONFIG_UINT( list, list_info, From 9efc0d2a78e354d445b77a8413c871928fc00b6a Mon Sep 17 00:00:00 2001 From: Rob Loach Date: Wed, 27 Dec 2017 16:51:05 -0500 Subject: [PATCH 6/7] font-color: Remove reference to config.def.h --- menu/drivers/xmb.c | 1 - 1 file changed, 1 deletion(-) diff --git a/menu/drivers/xmb.c b/menu/drivers/xmb.c index 4be5d19f44..41e1453abc 100755 --- a/menu/drivers/xmb.c +++ b/menu/drivers/xmb.c @@ -31,7 +31,6 @@ #include #include #include -#include #ifdef HAVE_CONFIG_H #include "../../config.h" From 85f9eb402e4549e15dc89df3f3bd5a02b9a1dddc Mon Sep 17 00:00:00 2001 From: Rob Loach Date: Wed, 27 Dec 2017 17:03:39 -0500 Subject: [PATCH 7/7] 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),