From b97b7d47e64e455e6b27f60b49a7b8efca5c8e61 Mon Sep 17 00:00:00 2001 From: Agent X <44549182+Agent-11@users.noreply.github.com> Date: Sat, 2 Mar 2024 16:45:35 -0500 Subject: [PATCH] Make changelog accessible through Info --- lang/Czech.ini | 2 +- lang/Dutch.ini | 2 +- lang/English.ini | 2 +- lang/French.ini | 2 +- lang/German.ini | 2 +- lang/Italian.ini | 2 +- lang/Polish.ini | 2 +- lang/Portuguese.ini | 4 ++++ lang/Russian.ini | 2 +- lang/Spanish.ini | 2 +- src/pc/djui/djui_panel_changelog.c | 2 +- src/pc/djui/djui_panel_info.c | 11 +++++++---- src/pc/djui/djui_panel_misc.c | 2 -- 13 files changed, 21 insertions(+), 16 deletions(-) diff --git a/lang/Czech.ini b/lang/Czech.ini index 0e32ec03..00407234 100644 --- a/lang/Czech.ini +++ b/lang/Czech.ini @@ -255,7 +255,6 @@ PAUSE_IN_SINGLEPLAYER = "Pauza v hře s jedním hráčem" DISABLE_POPUPS = "Vypnout vyskakovací okna" MENU_OPTIONS = "Nastavení hlavního menu" INFORMATION = "Informace" -CHANGELOG = "Záznam změn" DEBUG = "Debug" LANGUAGE = "Jazyk" COOP_COMPATIBILITY = "Povolit kompatibilitu sm64ex-coop" @@ -263,6 +262,7 @@ R_BUTTON = "Tlačítko R - Možnosti" [INFORMATION] INFORMATION_TITLE = "INFORMACE" +CHANGELOG = "Záznam změn" [CONSOLE] CONSOLE = "ŘÍDICÍ PANEL" diff --git a/lang/Dutch.ini b/lang/Dutch.ini index 469d96a0..18db8e16 100644 --- a/lang/Dutch.ini +++ b/lang/Dutch.ini @@ -255,7 +255,6 @@ PAUSE_IN_SINGLEPLAYER = "Pauzeer in een speler" DISABLE_POPUPS = "Popups uitzetten" MENU_OPTIONS = "Menu Instellingen" INFORMATION = "Informatie" -CHANGELOG = "Wijzigingenlogboek" DEBUG = "Debug" LANGUAGE = "Taal" COOP_COMPATIBILITY = "Schakel sm64ex-coop compatibiliteit in" @@ -263,6 +262,7 @@ R_BUTTON = "R-knop - Opties" [INFORMATION] INFORMATION_TITLE = "INFORMATIE" +CHANGELOG = "Wijzigingenlogboek" [CONSOLE] CONSOLE = "LOGBOEK" diff --git a/lang/English.ini b/lang/English.ini index 29ce7bd5..df935bf5 100644 --- a/lang/English.ini +++ b/lang/English.ini @@ -255,7 +255,6 @@ PAUSE_IN_SINGLEPLAYER = "Pause In Singleplayer" DISABLE_POPUPS = "Disable Popups" MENU_OPTIONS = "Menu Options" INFORMATION = "Info" -CHANGELOG = "Changelog" DEBUG = "Debug" LANGUAGE = "Language" COOP_COMPATIBILITY = "Enable sm64ex-coop Compatibility" @@ -263,6 +262,7 @@ R_BUTTON = "R Button - Options" [INFORMATION] INFORMATION_TITLE = "INFO" +CHANGELOG = "Changelog" [CONSOLE] CONSOLE = "CONSOLE" diff --git a/lang/French.ini b/lang/French.ini index 9e30ec14..d2d090e8 100644 --- a/lang/French.ini +++ b/lang/French.ini @@ -255,7 +255,6 @@ PAUSE_IN_SINGLEPLAYER = "Pause en Solo" DISABLE_POPUPS = "Désactiver les Pop-ups" MENU_OPTIONS = "Options du menu" INFORMATION = "Information" -CHANGELOG = "Journal des modifications" DEBUG = "Débogage" LANGUAGE = "Langue" COOP_COMPATIBILITY = "Activer la compatibilité sm64ex-coop" @@ -263,6 +262,7 @@ R_BUTTON = "Bouton R - Options" [INFORMATION] INFORMATION_TITLE = "INFORMATION" +CHANGELOG = "Journal des modifications" [CONSOLE] CONSOLE = "CONSOLE" diff --git a/lang/German.ini b/lang/German.ini index c767964b..8f691ff7 100644 --- a/lang/German.ini +++ b/lang/German.ini @@ -255,7 +255,6 @@ PAUSE_IN_SINGLEPLAYER = "Pause im Einzelspieler" DISABLE_POPUPS = "Pop-ups deaktivieren" MENU_OPTIONS = "Menüoptionen" INFORMATION = "Information" -CHANGELOG = "Änderungsprotokoll" DEBUG = "Debug" LANGUAGE = "Sprache" COOP_COMPATIBILITY = "Aktiviere sm64ex-coop-Kompatibilität" @@ -263,6 +262,7 @@ R_BUTTON = "R-Taste - Optionen" [INFORMATION] INFORMATION_TITLE = "INFORMATION" +CHANGELOG = "Änderungsprotokoll" [CONSOLE] CONSOLE = "KONSOLE" diff --git a/lang/Italian.ini b/lang/Italian.ini index 31b17c6c..a513ced3 100644 --- a/lang/Italian.ini +++ b/lang/Italian.ini @@ -253,7 +253,6 @@ PAUSE_IN_SINGLEPLAYER = "Metti in pausa in giocatore singolo" DISABLE_POPUPS = "Disabilita Popups" MENU_OPTIONS = "Opzioni Menù" INFORMATION = "Informazione" -CHANGELOG = "Registro delle modifiche" DEBUG = "Debug" LANGUAGE = "Lingua" COOP_COMPATIBILITY = "Abilita la compatibilità sm64ex-coop" @@ -261,6 +260,7 @@ R_BUTTON = "Pulsante R - Opzioni" [INFORMATION] INFORMATION_TITLE = "INFORMAZIONE" +CHANGELOG = "Registro delle modifiche" [CONSOLE] CONSOLE = "CONSOLE" diff --git a/lang/Polish.ini b/lang/Polish.ini index 8ee7ad52..77e79320 100644 --- a/lang/Polish.ini +++ b/lang/Polish.ini @@ -255,7 +255,6 @@ PAUSE_IN_SINGLEPLAYER = "Pauza w Trybie Pojedynczego Gracza" DISABLE_POPUPS = "Wylacz Popupy" MENU_OPTIONS = "Opcje Menu" INFORMATION = "Info" -CHANGELOG = "Rejestr zmian" DEBUG = "Debugowanie" LANGUAGE = "Jezyk" COOP_COMPATIBILITY = "Włącz kompatybilność sm64ex-coop" @@ -263,6 +262,7 @@ R_BUTTON = "Przycisk R - Opcje" [INFORMATION] INFORMATION_TITLE = "INFO" +CHANGELOG = "Rejestr zmian" [CONSOLE] CONSOLE = "KONSOLA" diff --git a/lang/Portuguese.ini b/lang/Portuguese.ini index 635a4738..f99adc74 100644 --- a/lang/Portuguese.ini +++ b/lang/Portuguese.ini @@ -262,6 +262,7 @@ R_BUTTON = "Botão R - Opções" [INFORMATION] INFORMATION_TITLE = "INFORMAÇÃO" +CHANGELOG = "Registo de alterações" [CONSOLE] CONSOLE = "CONSOLE" @@ -389,3 +390,6 @@ REFRESHING = "Recarregando..." ENTER_PASSWORD = "Coloque a senha da partida privada:" SEARCH = "Pesquisar" NONE_FOUND = "Nenhuma partida foi encontrada." + +[CHANGELOG] +CHANGELOG_TITLE = "ALTERAÇÕES" \ No newline at end of file diff --git a/lang/Russian.ini b/lang/Russian.ini index 0dab0f23..3fccb5ee 100644 --- a/lang/Russian.ini +++ b/lang/Russian.ini @@ -254,7 +254,6 @@ PAUSE_IN_SINGLEPLAYER = "Пауза в одиночной игре" DISABLE_POPUPS = "Отключить всплывающие окна" MENU_OPTIONS = "Параметры меню" INFORMATION = "Информация" -CHANGELOG = "Журнал изменений" DEBUG = "Отладка" LANGUAGE = "Язык" COOP_COMPATIBILITY = "Включить совместимость sm64ex-coop" @@ -262,6 +261,7 @@ R_BUTTON = "Кнопка R - Опции" [INFORMATION] INFORMATION_TITLE = "INFORMATION" +CHANGELOG = "Журнал изменений" [CONSOLE] CONSOLE = "Пульт" diff --git a/lang/Spanish.ini b/lang/Spanish.ini index 4fcae9da..25ba8c96 100644 --- a/lang/Spanish.ini +++ b/lang/Spanish.ini @@ -255,7 +255,6 @@ PAUSE_IN_SINGLEPLAYER = "Pausa en modo de un jugador" DISABLE_POPUPS = "Deshabilitar mensajes emergentes" MENU_OPTIONS = "Opciones del menú" INFORMATION = "Información" -CHANGELOG = "Registro de cambios" DEBUG = "Depuración" LANGUAGE = "Idioma" COOP_COMPATIBILITY = "Habilitar la compatibilidad de sm64ex-coop" @@ -263,6 +262,7 @@ R_BUTTON = "Botón R - Opciones" [INFORMATION] INFORMATION_TITLE = "INFORMACIÓN" +CHANGELOG = "Registro de cambios" [CONSOLE] CONSOLE = "CONSOLA" diff --git a/src/pc/djui/djui_panel_changelog.c b/src/pc/djui/djui_panel_changelog.c index fcf2de24..8bb1cb51 100644 --- a/src/pc/djui/djui_panel_changelog.c +++ b/src/pc/djui/djui_panel_changelog.c @@ -48,7 +48,7 @@ Removed Sex in Minecraft (Agent X)" djui_paginated_calculate_height(paginated); - djui_button_create(body, "OK", DJUI_BUTTON_STYLE_BACK, djui_panel_menu_back); + djui_button_create(body, DLANG(MENU, BACK), DJUI_BUTTON_STYLE_BACK, djui_panel_menu_back); } djui_panel_add(caller, panel, NULL); diff --git a/src/pc/djui/djui_panel_info.c b/src/pc/djui/djui_panel_info.c index 1478e407..cd73b236 100644 --- a/src/pc/djui/djui_panel_info.c +++ b/src/pc/djui/djui_panel_info.c @@ -1,6 +1,7 @@ #include "djui.h" #include "djui_panel.h" #include "djui_panel_menu.h" +#include "djui_panel_changelog.h" #include "pc/lua/utils/smlua_misc_utils.h" static char sInfo[1024]; @@ -22,7 +23,6 @@ Agent X: Creator\n\ AngelicMiracles: Co-Creator\n\ eros71: Tester & Developer\n\ FluffaMario: Model Designer\n\ -\n\ Contributors:\n\ mike_dobukai: Logo\n\ Pup64HCP: Website\n\ @@ -32,12 +32,15 @@ Mr. Porkchop: New aliased font" struct DjuiText* text = djui_text_create(body, sInfo); djui_base_set_location(&text->base, 0, 0); - djui_base_set_size(&text->base, (DJUI_DEFAULT_PANEL_WIDTH * (configDjuiThemeCenter ? DJUI_THEME_CENTERED_WIDTH : 1)) - 64, 497); + djui_base_set_size(&text->base, (DJUI_DEFAULT_PANEL_WIDTH * (configDjuiThemeCenter ? DJUI_THEME_CENTERED_WIDTH : 1)) - 64, 480); djui_base_set_color(&text->base, 220, 220, 220, 255); djui_text_set_drop_shadow(text, 64, 64, 64, 100); djui_text_set_alignment(text, DJUI_HALIGN_CENTER, DJUI_VALIGN_TOP); - - djui_button_create(body, DLANG(MENU, BACK), DJUI_BUTTON_STYLE_BACK, djui_panel_menu_back); + struct DjuiRect* rect1 = djui_rect_container_create(body, 64); + { + djui_button_left_create(&rect1->base, DLANG(MENU, BACK), DJUI_BUTTON_STYLE_BACK, djui_panel_menu_back); + djui_button_right_create(&rect1->base, DLANG(INFORMATION, CHANGELOG), DJUI_BUTTON_STYLE_NORMAL, djui_panel_changelog_create); + } } djui_panel_add(caller, panel, NULL); diff --git a/src/pc/djui/djui_panel_misc.c b/src/pc/djui/djui_panel_misc.c index efcbce44..0f236b82 100644 --- a/src/pc/djui/djui_panel_misc.c +++ b/src/pc/djui/djui_panel_misc.c @@ -5,7 +5,6 @@ #include "djui_panel_options.h" #include "djui_panel_language.h" #include "djui_panel_info.h" -#include "djui_panel_changelog.h" #include "pc/utils/misc.h" #include "pc/configfile.h" #include "game/hardcoded.h" @@ -57,7 +56,6 @@ void djui_panel_misc_create(struct DjuiBase* caller) { djui_button_create(body, DLANG(MISC, LANGUAGE), DJUI_BUTTON_STYLE_NORMAL, djui_panel_language_create); djui_button_create(body, DLANG(MISC, MENU_OPTIONS), DJUI_BUTTON_STYLE_NORMAL, djui_panel_main_menu_create); djui_button_create(body, DLANG(MISC, INFORMATION), DJUI_BUTTON_STYLE_NORMAL, djui_panel_info_create); - djui_button_create(body, DLANG(MISC, CHANGELOG), DJUI_BUTTON_STYLE_NORMAL, djui_panel_changelog_create); #ifdef DEVELOPMENT djui_button_create(body, DLANG(MISC, DEBUG), DJUI_BUTTON_STYLE_NORMAL, djui_panel_options_debug_create); #endif