Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add FlatUX Theme, Remove Retired Themes #16441

Merged
merged 4 commits into from
Apr 18, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 4 additions & 8 deletions intl/msg_hash_ar.h
Original file line number Diff line number Diff line change
Expand Up @@ -6373,6 +6373,10 @@ MSG_HASH(
MENU_ENUM_LABEL_VALUE_XMB_ICON_THEME_FLATUI,
"واجهة مستخدم مسطحة"
)
MSG_HASH(
MENU_ENUM_LABEL_VALUE_XMB_ICON_THEME_FLATUX,
"تجربة مستخدم مسطحة"
)
MSG_HASH(
MENU_ENUM_LABEL_VALUE_XMB_ICON_THEME_MONOCHROME,
"أحادي اللون"
Expand All @@ -6385,18 +6389,10 @@ MSG_HASH(
MENU_ENUM_LABEL_VALUE_XMB_ICON_THEME_SYSTEMATIC,
"منهجي"
)
MSG_HASH(
MENU_ENUM_LABEL_VALUE_XMB_ICON_THEME_NEOACTIVE,
"نشط جديد"
)
MSG_HASH(
MENU_ENUM_LABEL_VALUE_XMB_ICON_THEME_PIXEL,
"بكسل"
)
MSG_HASH(
MENU_ENUM_LABEL_VALUE_XMB_ICON_THEME_RETROACTIVE,
"مفعل retro"
)
MSG_HASH(
MENU_ENUM_LABEL_VALUE_XMB_ICON_THEME_RETROSYSTEM,
"نظام retro"
Expand Down
12 changes: 4 additions & 8 deletions intl/msg_hash_cht.h
Original file line number Diff line number Diff line change
Expand Up @@ -10609,6 +10609,10 @@ MSG_HASH(
MENU_ENUM_LABEL_VALUE_XMB_ICON_THEME_FLATUI,
"平面 (FlatUI)"
)
MSG_HASH(
MENU_ENUM_LABEL_VALUE_XMB_ICON_THEME_FLATUX,
"平面 (FlatUX)"
)
MSG_HASH(
MENU_ENUM_LABEL_VALUE_XMB_ICON_THEME_MONOCHROME,
"單色白 (Monochrome)"
Expand All @@ -10621,18 +10625,10 @@ MSG_HASH(
MENU_ENUM_LABEL_VALUE_XMB_ICON_THEME_SYSTEMATIC,
"主機化 (Systematic)"
)
MSG_HASH(
MENU_ENUM_LABEL_VALUE_XMB_ICON_THEME_NEOACTIVE,
"單色圓滑 (NeoActive)"
)
MSG_HASH(
MENU_ENUM_LABEL_VALUE_XMB_ICON_THEME_PIXEL,
"像素圖 (Pixel)"
)
MSG_HASH(
MENU_ENUM_LABEL_VALUE_XMB_ICON_THEME_RETROACTIVE,
"復古圓滑 (RetroActive)"
)
MSG_HASH(
MENU_ENUM_LABEL_VALUE_XMB_ICON_THEME_RETROSYSTEM,
"復古系統 (Retrosystem)"
Expand Down
8 changes: 0 additions & 8 deletions intl/msg_hash_cs.h
Original file line number Diff line number Diff line change
Expand Up @@ -10985,14 +10985,6 @@ MSG_HASH(
MENU_ENUM_LABEL_VALUE_XMB_ICON_THEME_SYSTEMATIC,
"Systematické"
)
MSG_HASH(
MENU_ENUM_LABEL_VALUE_XMB_ICON_THEME_NEOACTIVE,
"Neo Aktivní"
)
MSG_HASH(
MENU_ENUM_LABEL_VALUE_XMB_ICON_THEME_RETROACTIVE,
"Retroaktivní"
)
MSG_HASH(
MENU_ENUM_LABEL_VALUE_XMB_ICON_THEME_RETROSYSTEM,
"Retrosystém"
Expand Down
12 changes: 4 additions & 8 deletions intl/msg_hash_fr.h
Original file line number Diff line number Diff line change
Expand Up @@ -11269,6 +11269,10 @@ MSG_HASH(
MENU_ENUM_LABEL_VALUE_XMB_ICON_THEME_FLATUI,
"Minimaliste"
)
MSG_HASH(
MENU_ENUM_LABEL_VALUE_XMB_ICON_THEME_FLATUX,
"Minimaliste UX"
)
MSG_HASH(
MENU_ENUM_LABEL_VALUE_XMB_ICON_THEME_MONOCHROME_INVERTED,
"Monochrome inversé"
Expand All @@ -11277,14 +11281,6 @@ MSG_HASH(
MENU_ENUM_LABEL_VALUE_XMB_ICON_THEME_SYSTEMATIC,
"Systématique"
)
MSG_HASH(
MENU_ENUM_LABEL_VALUE_XMB_ICON_THEME_NEOACTIVE,
"NéoActif"
)
MSG_HASH(
MENU_ENUM_LABEL_VALUE_XMB_ICON_THEME_RETROACTIVE,
"RétroActif"
)
MSG_HASH(
MENU_ENUM_LABEL_VALUE_XMB_ICON_THEME_RETROSYSTEM,
"Rétrosystème"
Expand Down
12 changes: 4 additions & 8 deletions intl/msg_hash_it.h
Original file line number Diff line number Diff line change
Expand Up @@ -11149,6 +11149,10 @@ MSG_HASH(
MENU_ENUM_LABEL_VALUE_XMB_ICON_THEME_FLATUI,
"Minimalista"
)
MSG_HASH(
MENU_ENUM_LABEL_VALUE_XMB_ICON_THEME_FLATUX,
"Minimalista UX"
)
MSG_HASH(
MENU_ENUM_LABEL_VALUE_XMB_ICON_THEME_MONOCHROME,
"Monocromatico"
Expand All @@ -11161,14 +11165,6 @@ MSG_HASH(
MENU_ENUM_LABEL_VALUE_XMB_ICON_THEME_SYSTEMATIC,
"Sistematico"
)
MSG_HASH(
MENU_ENUM_LABEL_VALUE_XMB_ICON_THEME_NEOACTIVE,
"NeoAttivo"
)
MSG_HASH(
MENU_ENUM_LABEL_VALUE_XMB_ICON_THEME_RETROACTIVE,
"RetroAttivo"
)
MSG_HASH(
MENU_ENUM_LABEL_VALUE_XMB_ICON_THEME_AUTOMATIC,
"Automatico"
Expand Down
12 changes: 4 additions & 8 deletions intl/msg_hash_ko.h
Original file line number Diff line number Diff line change
Expand Up @@ -11333,6 +11333,10 @@ MSG_HASH(
MENU_ENUM_LABEL_VALUE_XMB_ICON_THEME_FLATUI,
"플랫UI"
)
MSG_HASH(
MENU_ENUM_LABEL_VALUE_XMB_ICON_THEME_FLATUX,
"플랫UX"
)
MSG_HASH(
MENU_ENUM_LABEL_VALUE_XMB_ICON_THEME_MONOCHROME,
"흑백"
Expand All @@ -11345,18 +11349,10 @@ MSG_HASH(
MENU_ENUM_LABEL_VALUE_XMB_ICON_THEME_SYSTEMATIC,
"체계적"
)
MSG_HASH(
MENU_ENUM_LABEL_VALUE_XMB_ICON_THEME_NEOACTIVE,
"미래"
)
MSG_HASH(
MENU_ENUM_LABEL_VALUE_XMB_ICON_THEME_PIXEL,
"픽셀"
)
MSG_HASH(
MENU_ENUM_LABEL_VALUE_XMB_ICON_THEME_RETROACTIVE,
"레트로풍"
)
MSG_HASH(
MENU_ENUM_LABEL_VALUE_XMB_ICON_THEME_RETROSYSTEM,
"레트로시스템"
Expand Down
12 changes: 4 additions & 8 deletions intl/msg_hash_pt_pt.h
Original file line number Diff line number Diff line change
Expand Up @@ -4109,6 +4109,10 @@ MSG_HASH(
MENU_ENUM_LABEL_VALUE_XMB_ICON_THEME_FLATUI,
"Cores planas"
)
MSG_HASH(
MENU_ENUM_LABEL_VALUE_XMB_ICON_THEME_FLATUX,
"Cores planas UX"
)
MSG_HASH(
MENU_ENUM_LABEL_VALUE_XMB_ICON_THEME_MONOCHROME,
"Monocromático"
Expand All @@ -4121,14 +4125,6 @@ MSG_HASH(
MENU_ENUM_LABEL_VALUE_XMB_ICON_THEME_SYSTEMATIC,
"Sistemático"
)
MSG_HASH(
MENU_ENUM_LABEL_VALUE_XMB_ICON_THEME_NEOACTIVE,
"Ativo e moderno"
)
MSG_HASH(
MENU_ENUM_LABEL_VALUE_XMB_ICON_THEME_RETROACTIVE,
"Retroativo"
)
MSG_HASH(
MENU_ENUM_LABEL_VALUE_XMB_ICON_THEME_RETROSYSTEM,
"Sistema retro"
Expand Down
12 changes: 4 additions & 8 deletions intl/msg_hash_tr.h
Original file line number Diff line number Diff line change
Expand Up @@ -11345,6 +11345,10 @@ MSG_HASH(
MENU_ENUM_LABEL_VALUE_XMB_ICON_THEME_FLATUI,
"Düz Arayüz"
)
MSG_HASH(
MENU_ENUM_LABEL_VALUE_XMB_ICON_THEME_FLATUX,
"Daire Deneyimi"
)
MSG_HASH(
MENU_ENUM_LABEL_VALUE_XMB_ICON_THEME_MONOCHROME,
"Tek Renk"
Expand All @@ -11357,18 +11361,10 @@ MSG_HASH(
MENU_ENUM_LABEL_VALUE_XMB_ICON_THEME_SYSTEMATIC,
"Sistematik"
)
MSG_HASH(
MENU_ENUM_LABEL_VALUE_XMB_ICON_THEME_NEOACTIVE,
"NeoAktif"
)
MSG_HASH(
MENU_ENUM_LABEL_VALUE_XMB_ICON_THEME_PIXEL,
"Piksel"
)
MSG_HASH(
MENU_ENUM_LABEL_VALUE_XMB_ICON_THEME_RETROACTIVE,
"RetroAktif"
)
MSG_HASH(
MENU_ENUM_LABEL_VALUE_XMB_ICON_THEME_RETROSYSTEM,
"Retrosistem"
Expand Down
16 changes: 4 additions & 12 deletions intl/msg_hash_uk.h
Original file line number Diff line number Diff line change
Expand Up @@ -6029,6 +6029,10 @@ MSG_HASH(
MENU_ENUM_LABEL_VALUE_XMB_ICON_THEME_FLATUI,
"Плоскі"
)
MSG_HASH(
MENU_ENUM_LABEL_VALUE_XMB_ICON_THEME_FLATUX,
"Плоский UX"
)
MSG_HASH(
MENU_ENUM_LABEL_VALUE_XMB_ICON_THEME_MONOCHROME,
"Монотонні"
Expand All @@ -6037,22 +6041,10 @@ MSG_HASH(
MENU_ENUM_LABEL_VALUE_XMB_ICON_THEME_MONOCHROME_INVERTED,
"Монотонні обернені"
)
MSG_HASH(
MENU_ENUM_LABEL_VALUE_XMB_ICON_THEME_SYSTEMATIC,
"Систематичний"
)
MSG_HASH(
MENU_ENUM_LABEL_VALUE_XMB_ICON_THEME_NEOACTIVE,
"НеоАктивні"
)
MSG_HASH(
MENU_ENUM_LABEL_VALUE_XMB_ICON_THEME_PIXEL,
"Піксель"
)
MSG_HASH(
MENU_ENUM_LABEL_VALUE_XMB_ICON_THEME_RETROACTIVE,
"Ретроактивний"
)
MSG_HASH(
MENU_ENUM_LABEL_VALUE_XMB_ICON_THEME_RETROSYSTEM,
"Ретросистема"
Expand Down
12 changes: 4 additions & 8 deletions intl/msg_hash_us.h
Original file line number Diff line number Diff line change
Expand Up @@ -11997,6 +11997,10 @@ MSG_HASH(
MENU_ENUM_LABEL_VALUE_XMB_ICON_THEME_FLATUI,
"FlatUI"
)
MSG_HASH(
MENU_ENUM_LABEL_VALUE_XMB_ICON_THEME_FLATUX,
"FlatUX"
)
MSG_HASH(
MENU_ENUM_LABEL_VALUE_XMB_ICON_THEME_MONOCHROME,
"Monochrome"
Expand All @@ -12009,18 +12013,10 @@ MSG_HASH(
MENU_ENUM_LABEL_VALUE_XMB_ICON_THEME_SYSTEMATIC,
"Systematic"
)
MSG_HASH(
MENU_ENUM_LABEL_VALUE_XMB_ICON_THEME_NEOACTIVE,
"NeoActive"
)
MSG_HASH(
MENU_ENUM_LABEL_VALUE_XMB_ICON_THEME_PIXEL,
"Pixel"
)
MSG_HASH(
MENU_ENUM_LABEL_VALUE_XMB_ICON_THEME_RETROACTIVE,
"RetroActive"
)
MSG_HASH(
MENU_ENUM_LABEL_VALUE_XMB_ICON_THEME_RETROSYSTEM,
"Retrosystem"
Expand Down
6 changes: 2 additions & 4 deletions menu/drivers/xmb.c
Original file line number Diff line number Diff line change
Expand Up @@ -542,14 +542,12 @@ const char* xmb_theme_ident(void)
{
case XMB_ICON_THEME_FLATUI:
return "flatui";
case XMB_ICON_THEME_RETROACTIVE:
return "retroactive";
case XMB_ICON_THEME_FLATUX:
return "flatux";
case XMB_ICON_THEME_RETROSYSTEM:
return "retrosystem";
case XMB_ICON_THEME_PIXEL:
return "pixel";
case XMB_ICON_THEME_NEOACTIVE:
return "neoactive";
case XMB_ICON_THEME_SYSTEMATIC:
return "systematic";
case XMB_ICON_THEME_DOTART:
Expand Down
3 changes: 1 addition & 2 deletions menu/menu_defines.h
Original file line number Diff line number Diff line change
Expand Up @@ -323,9 +323,8 @@ enum xmb_icon_theme
{
XMB_ICON_THEME_MONOCHROME = 0,
XMB_ICON_THEME_FLATUI,
XMB_ICON_THEME_RETROACTIVE,
XMB_ICON_THEME_FLATUX,
XMB_ICON_THEME_PIXEL,
XMB_ICON_THEME_NEOACTIVE,
XMB_ICON_THEME_SYSTEMATIC,
XMB_ICON_THEME_DOTART,
XMB_ICON_THEME_CUSTOM,
Expand Down
8 changes: 2 additions & 6 deletions menu/menu_setting.c
Original file line number Diff line number Diff line change
Expand Up @@ -4184,9 +4184,9 @@ static void setting_get_string_representation_uint_xmb_icon_theme(
strlcpy(s,
msg_hash_to_str(MENU_ENUM_LABEL_VALUE_XMB_ICON_THEME_FLATUI), len);
break;
case XMB_ICON_THEME_RETROACTIVE:
case XMB_ICON_THEME_FLATUX:
strlcpy(s,
msg_hash_to_str(MENU_ENUM_LABEL_VALUE_XMB_ICON_THEME_RETROACTIVE), len);
msg_hash_to_str(MENU_ENUM_LABEL_VALUE_XMB_ICON_THEME_FLATUX), len);
break;
case XMB_ICON_THEME_RETROSYSTEM:
strlcpy(s,
Expand All @@ -4196,10 +4196,6 @@ static void setting_get_string_representation_uint_xmb_icon_theme(
strlcpy(s,
msg_hash_to_str(MENU_ENUM_LABEL_VALUE_XMB_ICON_THEME_PIXEL), len);
break;
case XMB_ICON_THEME_NEOACTIVE:
strlcpy(s,
msg_hash_to_str(MENU_ENUM_LABEL_VALUE_XMB_ICON_THEME_NEOACTIVE), len);
break;
case XMB_ICON_THEME_SYSTEMATIC:
strlcpy(s,
msg_hash_to_str(MENU_ENUM_LABEL_VALUE_XMB_ICON_THEME_SYSTEMATIC), len);
Expand Down
3 changes: 1 addition & 2 deletions msg_hash.h
Original file line number Diff line number Diff line change
Expand Up @@ -731,10 +731,9 @@ enum msg_hash_enums
MENU_ENUM_LABEL_VALUE_XMB_ICON_THEME_MONOCHROME,
MENU_ENUM_LABEL_VALUE_XMB_ICON_THEME_MONOCHROME_INVERTED,
MENU_ENUM_LABEL_VALUE_XMB_ICON_THEME_FLATUI,
MENU_ENUM_LABEL_VALUE_XMB_ICON_THEME_RETROACTIVE,
MENU_ENUM_LABEL_VALUE_XMB_ICON_THEME_FLATUX,
MENU_ENUM_LABEL_VALUE_XMB_ICON_THEME_RETROSYSTEM,
MENU_ENUM_LABEL_VALUE_XMB_ICON_THEME_PIXEL,
MENU_ENUM_LABEL_VALUE_XMB_ICON_THEME_NEOACTIVE,
MENU_ENUM_LABEL_VALUE_XMB_ICON_THEME_SYSTEMATIC,
MENU_ENUM_LABEL_VALUE_XMB_ICON_THEME_DOTART,
MENU_ENUM_LABEL_VALUE_XMB_ICON_THEME_CUSTOM,
Expand Down
Loading