From d1bbc05ece639c974816c04f1cf249b39cbd70ec Mon Sep 17 00:00:00 2001 From: Agent X <44549182+AgentXLP@users.noreply.github.com> Date: Wed, 5 Jun 2024 19:33:00 -0400 Subject: [PATCH] Add Odyssey theme to DJUI --- lang/Czech.ini | 1 + lang/Dutch.ini | 1 + lang/English.ini | 1 + lang/French.ini | 1 + lang/German.ini | 1 + lang/Italian.ini | 1 + lang/Polish.ini | 1 + lang/Portuguese.ini | 1 + lang/Russian.ini | 1 + lang/Spanish.ini | 1 + src/pc/djui/djui_theme.c | 46 ++++++++++++++++++++++++++++++++++++++-- src/pc/djui/djui_theme.h | 1 + 12 files changed, 55 insertions(+), 2 deletions(-) diff --git a/lang/Czech.ini b/lang/Czech.ini index 0894bf31..5f63540f 100644 --- a/lang/Czech.ini +++ b/lang/Czech.ini @@ -156,6 +156,7 @@ FONT_ALIASED = "Hladký" LIGHT_THEME = "Světlo" DARK_THEME = "Tmavý" MARIO_THEME = "Mario" +ODYSSEY_THEME = "Odyssey" FILE_SELECT_THEME = "Výběr souboru" [DYNOS] diff --git a/lang/Dutch.ini b/lang/Dutch.ini index 86eda474..d6c916f7 100644 --- a/lang/Dutch.ini +++ b/lang/Dutch.ini @@ -156,6 +156,7 @@ FONT_ALIASED = "Glad" LIGHT_THEME = "Licht" DARK_THEME = "Donker" MARIO_THEME = "Mario" +ODYSSEY_THEME = "Odyssey" FILE_SELECT_THEME = "Bestand selecteren" [DYNOS] diff --git a/lang/English.ini b/lang/English.ini index de97a088..5366cc4a 100644 --- a/lang/English.ini +++ b/lang/English.ini @@ -156,6 +156,7 @@ FONT_ALIASED = "Aliased" LIGHT_THEME = "Light" DARK_THEME = "Dark" MARIO_THEME = "Mario" +ODYSSEY_THEME = "Odyssey" FILE_SELECT_THEME = "File Select" [DYNOS] diff --git a/lang/French.ini b/lang/French.ini index bdade2b8..1bc3c0ef 100644 --- a/lang/French.ini +++ b/lang/French.ini @@ -156,6 +156,7 @@ FONT_ALIASED = "Lisse" LIGHT_THEME = "Clair" DARK_THEME = "Sombre" MARIO_THEME = "Mario" +ODYSSEY_THEME = "Odyssey" FILE_SELECT_THEME = "Sélection de fichier" [DYNOS] diff --git a/lang/German.ini b/lang/German.ini index 29eef449..fbb22036 100644 --- a/lang/German.ini +++ b/lang/German.ini @@ -156,6 +156,7 @@ FONT_ALIASED = "Glatt" LIGHT_THEME = "Litch" DARK_THEME = "Dunkel" MARIO_THEME = "Mario" +ODYSSEY_THEME = "Odyssey" FILE_SELECT_THEME = "Dateiauswahl" [DYNOS] diff --git a/lang/Italian.ini b/lang/Italian.ini index ab2c99ee..98df107a 100644 --- a/lang/Italian.ini +++ b/lang/Italian.ini @@ -154,6 +154,7 @@ FONT_ALIASED = "Liscio" LIGHT_THEME = "Luce" DARK_THEME = "Scuro" MARIO_THEME = "Mario" +ODYSSEY_THEME = "Odyssey" FILE_SELECT_THEME = "Selezione file" [DYNOS] diff --git a/lang/Polish.ini b/lang/Polish.ini index bc501af9..95d81621 100644 --- a/lang/Polish.ini +++ b/lang/Polish.ini @@ -156,6 +156,7 @@ FONT_ALIASED = "Gładki" LIGHT_THEME = "Światło" DARK_THEME = "Ciemny" MARIO_THEME = "Mario" +ODYSSEY_THEME = "Odyssey" FILE_SELECT_THEME = "Wybór Pliku" [DYNOS] diff --git a/lang/Portuguese.ini b/lang/Portuguese.ini index 7d09bcce..0d75288d 100644 --- a/lang/Portuguese.ini +++ b/lang/Portuguese.ini @@ -156,6 +156,7 @@ FONT_ALIASED = "Suave" LIGHT_THEME = "Claro" DARK_THEME = "Escuro" MARIO_THEME = "Mario" +ODYSSEY_THEME = "Odyssey" FILE_SELECT_THEME = "Escolha de arquivo" [DYNOS] diff --git a/lang/Russian.ini b/lang/Russian.ini index a1d4ec54..5f3589bc 100644 --- a/lang/Russian.ini +++ b/lang/Russian.ini @@ -155,6 +155,7 @@ FONT_ALIASED = "Гладкий" LIGHT_THEME = "Свет" DARK_THEME = "Темный" MARIO_THEME = "Mario" +ODYSSEY_THEME = "Одиссеи" FILE_SELECT_THEME = "Выбор файла" [DYNOS] diff --git a/lang/Spanish.ini b/lang/Spanish.ini index 3ec4f40c..17e67ed5 100644 --- a/lang/Spanish.ini +++ b/lang/Spanish.ini @@ -156,6 +156,7 @@ FONT_ALIASED = "Alias" LIGHT_THEME = "Claro" DARK_THEME = "Oscuro" MARIO_THEME = "Mario" +ODYSSEY_THEME = "Odyssey" FILE_SELECT_THEME = "Selección de archivo" [DYNOS] diff --git a/src/pc/djui/djui_theme.c b/src/pc/djui/djui_theme.c index ce3fab13..c21635f3 100644 --- a/src/pc/djui/djui_theme.c +++ b/src/pc/djui/djui_theme.c @@ -160,7 +160,48 @@ static struct DjuiTheme sDjuiThemeMario = { } }, .panels = { - .hudFontHeader = true + .hudFontHeader = false + } +}; + +static struct DjuiTheme sDjuiThemeOdyssey = { + .id = "ODYSSEY_THEME", + .name = "ODYSSEY_THEME", + .interactables = { + .textColor = { + 11, 11, 11, 255 + }, + + .defaultRectColor = { + 255, 255, 255, 255 + }, + .cursorDownRectColor = { + 204, 228, 247, 255 + }, + .hoveredRectColor = { + 229, 241, 251, 255 + }, + + .defaultBorderColor = { + 200, 200, 200, 255 + }, + .cursorDownBorderColor = { + 0, 84, 153, 255 + }, + .hoveredBorderColor = { + 0, 120, 215, 255 + } + }, + .threePanels = { + .rectColor = { + 247, 0, 37, 200 + }, + .borderColor = { + 255, 255, 255, 200 + } + }, + .panels = { + .hudFontHeader = false } }; @@ -168,7 +209,8 @@ struct DjuiTheme* gDjuiThemes[] = { &sDjuiThemeLight, &sDjuiThemeDark, &sDjuiThemeFileSelect, - &sDjuiThemeMario + &sDjuiThemeMario, + &sDjuiThemeOdyssey }; struct DjuiColor djui_theme_shade_color(struct DjuiColor color, f32 mult) { diff --git a/src/pc/djui/djui_theme.h b/src/pc/djui/djui_theme.h index 103d83a6..1cd69553 100644 --- a/src/pc/djui/djui_theme.h +++ b/src/pc/djui/djui_theme.h @@ -9,6 +9,7 @@ enum DjuiThemeType { DJUI_THEME_DARK, DJUI_THEME_FILE_SELECT, DJUI_THEME_MARIO, + DJUI_THEME_ODYSSEY, DJUI_THEME_MAX };