diff --git a/intl/msg_hash_ar.h b/intl/msg_hash_ar.h index 7d979775c4..34aca43bdc 100644 --- a/intl/msg_hash_ar.h +++ b/intl/msg_hash_ar.h @@ -6269,10 +6269,6 @@ MSG_HASH( MENU_ENUM_LABEL_VALUE_OZONE_COLOR_THEME_SOLARIZED_DARK, "الظلام المشمس" ) -MSG_HASH( - MENU_ENUM_LABEL_VALUE_OZONE_COLOR_THEME_SOLARIZED_LIGHT, - "النور المشمس" - ) MSG_HASH( MENU_ENUM_LABEL_VALUE_LEFT_THUMBNAILS_OZONE, "الصورة المصغرة الثانية" diff --git a/intl/msg_hash_chs.h b/intl/msg_hash_chs.h index 4f30e1d7c3..e6b7980098 100644 --- a/intl/msg_hash_chs.h +++ b/intl/msg_hash_chs.h @@ -8397,10 +8397,6 @@ MSG_HASH( MENU_ENUM_LABEL_VALUE_OZONE_COLOR_THEME_SOLARIZED_DARK, "暗色曝光" ) -MSG_HASH( - MENU_ENUM_LABEL_VALUE_OZONE_COLOR_THEME_SOLARIZED_LIGHT, - "亮色曝光" - ) MSG_HASH( MENU_ENUM_LABEL_VALUE_LEFT_THUMBNAILS_OZONE, "第二缩略图" diff --git a/intl/msg_hash_de.h b/intl/msg_hash_de.h index 783ec76054..794aed5b2c 100644 --- a/intl/msg_hash_de.h +++ b/intl/msg_hash_de.h @@ -8309,10 +8309,6 @@ MSG_HASH( MENU_ENUM_LABEL_VALUE_OZONE_COLOR_THEME_SOLARIZED_DARK, "Solarized dunkel" ) -MSG_HASH( - MENU_ENUM_LABEL_VALUE_OZONE_COLOR_THEME_SOLARIZED_LIGHT, - "Solarized hell" - ) MSG_HASH( MENU_ENUM_LABEL_VALUE_LEFT_THUMBNAILS_OZONE, "Zweites Vorschaubild" diff --git a/intl/msg_hash_es.h b/intl/msg_hash_es.h index 6321f3f51a..863a9b329b 100644 --- a/intl/msg_hash_es.h +++ b/intl/msg_hash_es.h @@ -8533,10 +8533,6 @@ MSG_HASH( MENU_ENUM_LABEL_VALUE_OZONE_COLOR_THEME_SOLARIZED_DARK, "Solarizado (oscuro)" ) -MSG_HASH( - MENU_ENUM_LABEL_VALUE_OZONE_COLOR_THEME_SOLARIZED_LIGHT, - "Solarizado (claro)" - ) MSG_HASH( MENU_ENUM_LABEL_VALUE_LEFT_THUMBNAILS_OZONE, "Segunda miniatura" diff --git a/intl/msg_hash_fi.h b/intl/msg_hash_fi.h index 7fd9a41a1b..0ba00a65e6 100644 --- a/intl/msg_hash_fi.h +++ b/intl/msg_hash_fi.h @@ -8517,11 +8517,6 @@ MSG_HASH( MENU_ENUM_LABEL_VALUE_OZONE_COLOR_THEME_SOLARIZED_DARK, "Solarized, tumma" ) -MSG_HASH( - MENU_ENUM_LABEL_VALUE_OZONE_COLOR_THEME_SOLARIZED_LIGHT, - "Solarized, vaalea" - ) - MSG_HASH( MENU_ENUM_LABEL_VALUE_LEFT_THUMBNAILS_OZONE, "Toinen esikatselukuva" diff --git a/intl/msg_hash_fr.h b/intl/msg_hash_fr.h index b5cddbfafd..066791949b 100644 --- a/intl/msg_hash_fr.h +++ b/intl/msg_hash_fr.h @@ -8541,11 +8541,6 @@ MSG_HASH( MENU_ENUM_LABEL_VALUE_OZONE_COLOR_THEME_SOLARIZED_DARK, "Solarisé sombre" ) -MSG_HASH( - MENU_ENUM_LABEL_VALUE_OZONE_COLOR_THEME_SOLARIZED_LIGHT, - "Solarisé clair" - ) - MSG_HASH( MENU_ENUM_LABEL_VALUE_LEFT_THUMBNAILS_OZONE, "Miniature secondaire" diff --git a/intl/msg_hash_it.h b/intl/msg_hash_it.h index 45354a7803..32c5ff3161 100644 --- a/intl/msg_hash_it.h +++ b/intl/msg_hash_it.h @@ -8469,10 +8469,6 @@ MSG_HASH( MENU_ENUM_LABEL_VALUE_OZONE_COLOR_THEME_SOLARIZED_DARK, "Scuro Solarizzato" ) -MSG_HASH( - MENU_ENUM_LABEL_VALUE_OZONE_COLOR_THEME_SOLARIZED_LIGHT, - "Chiaro Solarizzato" - ) MSG_HASH( MENU_ENUM_LABEL_VALUE_LEFT_THUMBNAILS_OZONE, "Seconda Copertina" diff --git a/intl/msg_hash_ko.h b/intl/msg_hash_ko.h index 4584ed6158..afe8681a63 100644 --- a/intl/msg_hash_ko.h +++ b/intl/msg_hash_ko.h @@ -8613,10 +8613,6 @@ MSG_HASH( MENU_ENUM_LABEL_VALUE_OZONE_COLOR_THEME_SOLARIZED_DARK, "솔라라이즈 다크" ) -MSG_HASH( - MENU_ENUM_LABEL_VALUE_OZONE_COLOR_THEME_SOLARIZED_LIGHT, - "솔라라이즈 라이트" - ) MSG_HASH( MENU_ENUM_LABEL_VALUE_LEFT_THUMBNAILS_OZONE, "두 번째 미리보기" diff --git a/intl/msg_hash_pl.h b/intl/msg_hash_pl.h index 69cbc53cee..8918cedcec 100644 --- a/intl/msg_hash_pl.h +++ b/intl/msg_hash_pl.h @@ -8485,10 +8485,6 @@ MSG_HASH( MENU_ENUM_LABEL_VALUE_OZONE_COLOR_THEME_SOLARIZED_DARK, "Solarized ciemny" ) -MSG_HASH( - MENU_ENUM_LABEL_VALUE_OZONE_COLOR_THEME_SOLARIZED_LIGHT, - "Solarized jasny" - ) MSG_HASH( MENU_ENUM_LABEL_VALUE_LEFT_THUMBNAILS_OZONE, "Druga miniatura" diff --git a/intl/msg_hash_pt_br.h b/intl/msg_hash_pt_br.h index d89c21fc33..0441277343 100644 --- a/intl/msg_hash_pt_br.h +++ b/intl/msg_hash_pt_br.h @@ -8493,10 +8493,6 @@ MSG_HASH( MENU_ENUM_LABEL_VALUE_OZONE_COLOR_THEME_SOLARIZED_DARK, "Escuro solarizado" ) -MSG_HASH( - MENU_ENUM_LABEL_VALUE_OZONE_COLOR_THEME_SOLARIZED_LIGHT, - "Solarizado (claro)" - ) MSG_HASH( MENU_ENUM_LABEL_VALUE_LEFT_THUMBNAILS_OZONE, "Segunda miniatura" diff --git a/intl/msg_hash_ru.h b/intl/msg_hash_ru.h index c2d3520f6f..35e4daa8c7 100644 --- a/intl/msg_hash_ru.h +++ b/intl/msg_hash_ru.h @@ -8625,10 +8625,6 @@ MSG_HASH( MENU_ENUM_LABEL_VALUE_OZONE_COLOR_THEME_SOLARIZED_DARK, "Solarized тёмная" ) -MSG_HASH( - MENU_ENUM_LABEL_VALUE_OZONE_COLOR_THEME_SOLARIZED_LIGHT, - "Solarized светлая" - ) MSG_HASH( MENU_ENUM_LABEL_VALUE_LEFT_THUMBNAILS_OZONE, "Дополнительный эскиз" diff --git a/intl/msg_hash_tr.h b/intl/msg_hash_tr.h index 304744aa6c..4d7b6459e8 100644 --- a/intl/msg_hash_tr.h +++ b/intl/msg_hash_tr.h @@ -8621,10 +8621,6 @@ MSG_HASH( MENU_ENUM_LABEL_VALUE_OZONE_COLOR_THEME_SOLARIZED_DARK, "Solarize Koyu" ) -MSG_HASH( - MENU_ENUM_LABEL_VALUE_OZONE_COLOR_THEME_SOLARIZED_LIGHT, - "Solarize Açık" - ) MSG_HASH( MENU_ENUM_LABEL_VALUE_LEFT_THUMBNAILS_OZONE, "İkinci Küçük Resim" diff --git a/intl/msg_hash_uk.h b/intl/msg_hash_uk.h index 68836e49d6..dd992581de 100644 --- a/intl/msg_hash_uk.h +++ b/intl/msg_hash_uk.h @@ -5133,10 +5133,6 @@ MSG_HASH( MENU_ENUM_LABEL_VALUE_OZONE_COLOR_THEME_SOLARIZED_DARK, "Салорайзед темна" ) -MSG_HASH( - MENU_ENUM_LABEL_VALUE_OZONE_COLOR_THEME_SOLARIZED_LIGHT, - "Салорайзед світла" - ) MSG_HASH( MENU_ENUM_LABEL_VALUE_LEFT_THUMBNAILS_OZONE, "Додаткова мініатюра" diff --git a/intl/msg_hash_us.h b/intl/msg_hash_us.h index 48bb0c2948..b582ec0dbd 100644 --- a/intl/msg_hash_us.h +++ b/intl/msg_hash_us.h @@ -9225,10 +9225,6 @@ MSG_HASH( MENU_ENUM_LABEL_VALUE_OZONE_COLOR_THEME_SOLARIZED_DARK, "Solarized Dark" ) -MSG_HASH( - MENU_ENUM_LABEL_VALUE_OZONE_COLOR_THEME_SOLARIZED_LIGHT, - "Solarized Light" - ) MSG_HASH( MENU_ENUM_LABEL_VALUE_LEFT_THUMBNAILS_OZONE, "Second Thumbnail" diff --git a/menu/drivers/ozone.c b/menu/drivers/ozone.c index c2a738c2b7..2742cf3246 100644 --- a/menu/drivers/ozone.c +++ b/menu/drivers/ozone.c @@ -962,31 +962,6 @@ static float ozone_sidebar_gradient_bottom_solarized_dark[16] = { 0.0000000, 0.1294118, 0.1725490, 1.0f, }; -static float ozone_background_libretro_running_solarized_light[16] = { - 1.0000000, 1.0000000, 0.9294118, 0.85f, - 1.0000000, 1.0000000, 0.9294118, 0.85f, - 1.0000000, 1.0000000, 0.9294118, 1.0f, - 1.0000000, 1.0000000, 0.9294118, 1.0f, -}; -static float ozone_sidebar_background_solarized_light[16] = { - 1.0000000, 1.0000000, 0.9294118, 1.0f, - 1.0000000, 1.0000000, 0.9294118, 1.0f, - 1.0000000, 1.0000000, 0.9294118, 1.0f, - 1.0000000, 1.0000000, 0.9294118, 1.0f, -}; - -static float ozone_sidebar_gradient_top_solarized_light[16] = { - 1.0000000, 1.0000000, 0.9294118, 1.0f, - 1.0000000, 1.0000000, 0.9294118, 1.0f, - 1.0000000, 1.0000000, 0.9294118, 1.0f, - 1.0000000, 1.0000000, 0.9294118, 1.0f, -}; -static float ozone_sidebar_gradient_bottom_solarized_light[16] = { - 1.0000000, 1.0000000, 0.9294118, 1.0f, - 1.0000000, 1.0000000, 0.9294118, 1.0f, - 1.0000000, 1.0000000, 0.9294118, 1.0f, - 1.0000000, 1.0000000, 0.9294118, 1.0f, -}; static float ozone_border_0_light[16] = COLOR_HEX_TO_FLOAT(0x50EFD9, 1.00); static float ozone_border_1_light[16] = COLOR_HEX_TO_FLOAT(0x0DB6D5, 1.00); @@ -1014,9 +989,6 @@ static float ozone_border_1_dracula[16] = COLOR_HEX_TO_FLOAT(0x9B61CC, 1.0f); static float ozone_border_0_solarized_dark[16] = COLOR_HEX_TO_FLOAT(0x67ECE2, 1.0f); static float ozone_border_1_solarized_dark[16] = COLOR_HEX_TO_FLOAT(0x2AA198, 1.0f); -static float ozone_border_0_solarized_light[16] = COLOR_HEX_TO_FLOAT(0x8F120F, 1.0f); -static float ozone_border_1_solarized_light[16] = COLOR_HEX_TO_FLOAT(0xDC322F, 1.0f); - ozone_theme_t ozone_theme_light = { COLOR_HEX_TO_FLOAT(0xEBEBEB, 1.00), /* background */ ozone_background_libretro_running_light, /* background_libretro_running */ @@ -1310,7 +1282,7 @@ ozone_theme_t ozone_theme_solarized_dark = { /* Float colors for quads and icons */ COLOR_HEX_TO_FLOAT(0x839496, 1.0f), /* header_footer_separator */ - COLOR_HEX_TO_FLOAT(0x93A1A1, 1.0f), /* text */ + COLOR_HEX_TO_FLOAT(0x839496, 1.0f), /* text */ COLOR_HEX_TO_FLOAT(0x073642, 1.0f), /* selection */ COLOR_HEX_TO_FLOAT(0x2AA198, 1.0f), /* selection_border */ COLOR_HEX_TO_FLOAT(0x073642, 1.0f), /* entries_border */ @@ -1319,9 +1291,9 @@ ozone_theme_t ozone_theme_solarized_dark = { COLOR_HEX_TO_FLOAT(0x002B36, 1.0f), /* message_background */ /* RGBA colors for text */ - 0x93A1A1FF, /* text_rgba */ + 0x839496FF, /* text_rgba */ 0x2AA198FF, /* text_selected_rgba */ - 0x657B83FF, /* text_sublabel_rgba */ + 0x586E75FF, /* text_sublabel_rgba */ /* Screensaver 'tint' (RGB24) */ 0x073642, /* screensaver_tint */ @@ -1338,43 +1310,7 @@ ozone_theme_t ozone_theme_solarized_dark = { {0}, /* textures */ "solarized_dark" /* name */ -}; -ozone_theme_t ozone_theme_solarized_light = { - /* Background color */ - COLOR_HEX_TO_FLOAT(0xFDF6E3, 1.0f), /* background */ - ozone_background_libretro_running_solarized_light, /* background_libretro_running */ - - /* Float colors for quads and icons */ - COLOR_HEX_TO_FLOAT(0x657B83, 1.0f), /* header_footer_separator */ - COLOR_HEX_TO_FLOAT(0x586E75, 1.0f), /* text */ - COLOR_HEX_TO_FLOAT(0xEEE8D5, 1.0f), /* selection */ - COLOR_HEX_TO_FLOAT(0xDC322F, 1.0f), /* selection_border */ - COLOR_HEX_TO_FLOAT(0xEEE8D5, 1.0f), /* entries_border */ - COLOR_HEX_TO_FLOAT(0xCB4B16, 1.0f), /* entries_icon */ - COLOR_HEX_TO_FLOAT(0x586E75, 1.0f), /* text_selected */ - COLOR_HEX_TO_FLOAT(0xFDF6E3, 1.0f), /* message_background */ - - /* RGBA colors for text */ - 0x586E75FF, /* text_rgba */ - 0xDC322FFF, /* text_selected_rgba */ - 0x839496FF, /* text_sublabel_rgba */ - - /* Screensaver 'tint' (RGB24) */ - 0xEEE8D5, /* screensaver_tint */ - - /* Sidebar color */ - ozone_sidebar_background_solarized_light, /* sidebar_background */ - ozone_sidebar_gradient_top_solarized_light, /* sidebar_top_gradient */ - ozone_sidebar_gradient_bottom_solarized_light, /* sidebar_bottom_gradient */ - - /* Fancy cursor colors */ - ozone_border_0_solarized_light, /* cursor_border_0 */ - ozone_border_1_solarized_light, /* cursor_border_1 */ - - {0}, /* textures */ - - "solarized_light" /* name */ }; ozone_theme_t *ozone_themes[] = { @@ -1386,8 +1322,7 @@ ozone_theme_t *ozone_themes[] = { &ozone_theme_hacking_the_kernel, &ozone_theme_twilight_zone, &ozone_theme_dracula, - &ozone_theme_solarized_dark, - &ozone_theme_solarized_light + &ozone_theme_solarized_dark }; @@ -1517,9 +1452,6 @@ static void ozone_set_color_theme(ozone_handle_t *ozone, unsigned color_theme) case OZONE_COLOR_THEME_SOLARIZED_DARK: theme = &ozone_theme_solarized_dark; break; - case OZONE_COLOR_THEME_SOLARIZED_LIGHT: - theme = &ozone_theme_solarized_light; - break; default: break; } diff --git a/menu/menu_defines.h b/menu/menu_defines.h index 59cee2dce8..58c09e0179 100644 --- a/menu/menu_defines.h +++ b/menu/menu_defines.h @@ -366,7 +366,6 @@ enum ozone_color_theme OZONE_COLOR_THEME_TWILIGHT_ZONE, OZONE_COLOR_THEME_DRACULA, OZONE_COLOR_THEME_SOLARIZED_DARK, - OZONE_COLOR_THEME_SOLARIZED_LIGHT, OZONE_COLOR_THEME_LAST }; diff --git a/menu/menu_setting.c b/menu/menu_setting.c index 434c3b87d2..a0d9667bfb 100644 --- a/menu/menu_setting.c +++ b/menu/menu_setting.c @@ -4758,11 +4758,6 @@ static void setting_get_string_representation_uint_ozone_menu_color_theme( msg_hash_to_str( MENU_ENUM_LABEL_VALUE_OZONE_COLOR_THEME_SOLARIZED_DARK), len); break; - case OZONE_COLOR_THEME_SOLARIZED_LIGHT: - strlcpy(s, - msg_hash_to_str( - MENU_ENUM_LABEL_VALUE_OZONE_COLOR_THEME_SOLARIZED_LIGHT), len); - break; case OZONE_COLOR_THEME_BASIC_WHITE: default: strlcpy(s, diff --git a/msg_hash.h b/msg_hash.h index 89e1acea3a..8be47d9b05 100644 --- a/msg_hash.h +++ b/msg_hash.h @@ -603,7 +603,6 @@ enum msg_hash_enums MENU_ENUM_LABEL_VALUE_OZONE_COLOR_THEME_TWILIGHT_ZONE, MENU_ENUM_LABEL_VALUE_OZONE_COLOR_THEME_DRACULA, MENU_ENUM_LABEL_VALUE_OZONE_COLOR_THEME_SOLARIZED_DARK, - MENU_ENUM_LABEL_VALUE_OZONE_COLOR_THEME_SOLARIZED_LIGHT, MENU_ENUM_LABEL_VALUE_XMB_ICON_THEME_MONOCHROME, MENU_ENUM_LABEL_VALUE_XMB_ICON_THEME_MONOCHROME_INVERTED,