etc/sm64coopdx
0
0
Fork 0
mirror of https://github.com/coop-deluxe/sm64coopdx.git synced 2024-11-22 12:05:11 +00:00
Code Issues Projects Releases Packages Wiki Activity

Minor UI/language improvements (#88)

Browse source 
* Revised Polish translation (given the UI constraints)

* Added explicit DJUI Menu Panel alignment parameter

Previous version was prone to name clashing and could break the UI with some translations and some mod names.
This commit is contained in:
Radek Krzyśków 2024-07-01 16:44:35 +02:00 committed by GitHub
parent 75ce4e1d1d
commit b487527339
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
33 changed files with 57 additions and 64 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
lang/Polish.ini
View file

@ -164,7 +164,7 @@ DYNOS = "DYNOS"
LOCAL_PLAYER_MODEL_ONLY = "Tylko lokalny model gracza" LOCAL_PLAYER_MODEL_ONLY = "Tylko lokalny model gracza"
[HOST_MESSAGE] [HOST_MESSAGE]
INFO_TITLE = "INFORMACJE" INFO_TITLE = "INFORMACJA"
WARN_DISCORD = "Zaproś znajomych do gry, klikając PPM w ich nazwę na Discordzie, a potem klikając\n'\\#d0d0ff\\Zaproś do gry\\#c8c8c8\\'.\n\nMożesz zapraszać na kanałach serwerów klikając w \\#d0d0ff\\plusik\\#c8c8c8\\ obok paska czatu.\n\n \\#ffa0a0\\Należy\\#c8c8c8\\ mieć włączoną Aktywność w grze w\nUstawieniach użytkownika Discorda.\n\nTryb offline \\#ffa0a0\\uniemożliwi\\#c8c8c8\\ wysyłanie zaproszeń." WARN_DISCORD = "Zaproś znajomych do gry, klikając PPM w ich nazwę na Discordzie, a potem klikając\n'\\#d0d0ff\\Zaproś do gry\\#c8c8c8\\'.\n\nMożesz zapraszać na kanałach serwerów klikając w \\#d0d0ff\\plusik\\#c8c8c8\\ obok paska czatu.\n\n \\#ffa0a0\\Należy\\#c8c8c8\\ mieć włączoną Aktywność w grze w\nUstawieniach użytkownika Discorda.\n\nTryb offline \\#ffa0a0\\uniemożliwi\\#c8c8c8\\ wysyłanie zaproszeń."
WARN_DISCORD2 = "\\#ffa0a0\\Błąd:\\#c8c8c8\\ Nie wykryto Discorda.\n\n\\#a0a0a0\\Spróbuj zamknąć grę,\nzrestartować Discorda\ni uruchomić grę ponownie." WARN_DISCORD2 = "\\#ffa0a0\\Błąd:\\#c8c8c8\\ Nie wykryto Discorda.\n\n\\#a0a0a0\\Spróbuj zamknąć grę,\nzrestartować Discorda\ni uruchomić grę ponownie."
WARN_SOCKET = "Połączenie bezpośrednie \\#ffa0a0\\wymaga\\#c8c8c8\\ konfiguracji przekierowania portów w routerze.\n\nPrzekieruj port '\\#d0d0ff\\%d\\#c8c8c8\\' dla UDP." WARN_SOCKET = "Połączenie bezpośrednie \\#ffa0a0\\wymaga\\#c8c8c8\\ konfiguracji przekierowania portów w routerze.\n\nPrzekieruj port '\\#d0d0ff\\%d\\#c8c8c8\\' dla UDP."
@ -238,12 +238,12 @@ PRIVATE_LOBBIES = "Lobby Prywatne"
DIRECT = "Połączenie Bezpośrednie" DIRECT = "Połączenie Bezpośrednie"
[RULES] [RULES]
RULES_TITLE = "RULES" RULES_TITLE = "ZASADY"
RULE_1 = "1. Musisz mieć ukończone 13 lat." RULE_1 = "1. Musisz mieć ukończone 13 lat."
RULE_2 = "2. Zakaz używania mowy nienawiści, obelg lub jakiegokolwiek obraźliwego języka." RULE_2 = "2. Zakaz używania mowy nienawiści, obelg lub jakiegokolwiek obraźliwego języka."
RULE_3 = "3. Nie używaj żadnych zmodyfikowanych konstrukcji." RULE_3 = "3. Nie korzystaj z nieoficjalnych/zhakowanych wersji gry."
RULE_4 = "4. Nie hostuj niewydanych modów bez zgody ich autora." RULE_4 = "4. Nie hostuj niewydanych modów bez zgody ich autora."
RULE_5 = "5. Jakakolwiek forma treści NSFW nie będzie tolerowana." RULE_5 = "5. Jakakolwiek forma treści niecenzuralnych nie będzie tolerowana."
SUBJECT_TO_CHANGE = "Zasady te mogą ulec zmianie w przyszłych aktualizacjach." SUBJECT_TO_CHANGE = "Zasady te mogą ulec zmianie w przyszłych aktualizacjach."
NOTICE = "Łącząc się z CoopNet, zgadzasz się przestrzegać tych zasad podczas gry w lobby publicznym." NOTICE = "Łącząc się z CoopNet, zgadzasz się przestrzegać tych zasad podczas gry w lobby publicznym."
RULES = "Zasady" RULES = "Zasady"
@ -275,23 +275,23 @@ DEBUG_ERRORS = "Błędy z Debugowania"
MISC_TITLE = "POZOSTAŁE OPCJE" MISC_TITLE = "POZOSTAŁE OPCJE"
PAUSE_IN_SINGLEPLAYER = "Pauza w Trybie Pojedynczego Gracza" PAUSE_IN_SINGLEPLAYER = "Pauza w Trybie Pojedynczego Gracza"
DISABLE_POPUPS = "Wyłącz Dymki Powiadomień" DISABLE_POPUPS = "Wyłącz Dymki Powiadomień"
USE_STANDARD_KEY_BINDINGS_CHAT = "Klasyczne sterowanie czatem" USE_STANDARD_KEY_BINDINGS_CHAT = "Klasyczna Historia Czatu"
MENU_OPTIONS = "Opcje Menu" MENU_OPTIONS = "Opcje Menu"
INFORMATION = "Informacje" INFORMATION = "Informacja"
DEBUG = "Debugowanie" DEBUG = "Debugowanie"
LANGUAGE = "Język" LANGUAGE = "Język"
COOP_COMPATIBILITY = "Włącz kompatybilność z sm64ex-coop" COOP_COMPATIBILITY = "Włącz kompatybilność z sm64ex-coop"
R_BUTTON = "Przycisk R - Opcje" R_BUTTON = "Przycisk R - Opcje"
[INFORMATION] [INFORMATION]
INFORMATION_TITLE = "INFORMACJE" INFORMATION_TITLE = "INFORMACJA"
CHANGELOG = "Rejestr Zmian" CHANGELOG = "Rejestr Zmian"
[CONSOLE] [CONSOLE]
CONSOLE = "KONSOLA" CONSOLE = "KONSOLA"
[MODLIST] [MODLIST]
MODS = "MODYFIKACJE" MODS = "MODY"
[OPTIONS] [OPTIONS]
OPTIONS = "OPCJE" OPTIONS = "OPCJE"
@ -368,8 +368,8 @@ MUTE_FOCUS_LOSS = "Wycisz dźwięk, gdy okno traci fokus"
LANGUAGE = "JĘZYK" LANGUAGE = "JĘZYK"
[LOBBIES] [LOBBIES]
PUBLIC_LOBBIES = "LOBBY PUBLICZNE" PUBLIC_LOBBIES = "GRY PUBLICZNE"
PRIVATE_LOBBIES = "LOBBY PRYWATNE" PRIVATE_LOBBIES = "GRY PRYWATNE"
REFRESH = "Odśwież" REFRESH = "Odśwież"
REFRESHING = "Odświeżanie..." REFRESHING = "Odświeżanie..."
ENTER_PASSWORD = "Wprowadź hasło do prywatnego lobby:" ENTER_PASSWORD = "Wprowadź hasło do prywatnego lobby:"

2
src/pc/djui/djui_panel_camera.c
View file

@ -12,7 +12,7 @@ static void djui_panel_camera_value_changed(UNUSED struct DjuiBase* caller) {
} }
void djui_panel_camera_create(struct DjuiBase* caller) { void djui_panel_camera_create(struct DjuiBase* caller) {
struct DjuiThreePanel* panel = djui_panel_menu_create(DLANG(CAMERA, CAMERA)); struct DjuiThreePanel* panel = djui_panel_menu_create(DLANG(CAMERA, CAMERA), false);
struct DjuiBase* body = djui_three_panel_get_body(panel); struct DjuiBase* body = djui_three_panel_get_body(panel);
{ {
djui_checkbox_create(body, DLANG(CAMERA, FREE_CAMERA), &configEnableCamera, djui_panel_camera_value_changed); djui_checkbox_create(body, DLANG(CAMERA, FREE_CAMERA), &configEnableCamera, djui_panel_camera_value_changed);

2
src/pc/djui/djui_panel_confirm.c
View file

@ -4,7 +4,7 @@
#include "pc/utils/misc.h" #include "pc/utils/misc.h"
void djui_panel_confirm_create(struct DjuiBase* caller, char* title, char* message, void (*on_yes_click)(struct DjuiBase*)) { void djui_panel_confirm_create(struct DjuiBase* caller, char* title, char* message, void (*on_yes_click)(struct DjuiBase*)) {
struct DjuiThreePanel* panel = djui_panel_menu_create(title); struct DjuiThreePanel* panel = djui_panel_menu_create(title, false);
struct DjuiBase* body = djui_three_panel_get_body(panel); struct DjuiBase* body = djui_three_panel_get_body(panel);
{ {
struct DjuiText* text = djui_text_create(body, message); struct DjuiText* text = djui_text_create(body, message);

2
src/pc/djui/djui_panel_controls.c
View file

@ -13,7 +13,7 @@ void djui_panel_controls_value_change(UNUSED struct DjuiBase* caller) {
} }
void djui_panel_controls_create(struct DjuiBase* caller) { void djui_panel_controls_create(struct DjuiBase* caller) {
struct DjuiThreePanel* panel = djui_panel_menu_create(DLANG(CONTROLS, CONTROLS)); struct DjuiThreePanel* panel = djui_panel_menu_create(DLANG(CONTROLS, CONTROLS), false);
struct DjuiBase* body = djui_three_panel_get_body(panel); struct DjuiBase* body = djui_three_panel_get_body(panel);
{ {
djui_button_create(body, DLANG(CONTROLS, N64_BINDS), DJUI_BUTTON_STYLE_NORMAL, djui_panel_controls_n64_create); djui_button_create(body, DLANG(CONTROLS, N64_BINDS), DJUI_BUTTON_STYLE_NORMAL, djui_panel_controls_n64_create);

2
src/pc/djui/djui_panel_controls_extra.c
View file

@ -6,7 +6,7 @@
void djui_panel_controls_extra_create(struct DjuiBase* caller) { void djui_panel_controls_extra_create(struct DjuiBase* caller) {
f32 bindBodyHeight = 28 * 12 + 1 * 10; f32 bindBodyHeight = 28 * 12 + 1 * 10;
struct DjuiThreePanel* panel = djui_panel_menu_create(DLANG(CONTROLS, CONTROLS)); struct DjuiThreePanel* panel = djui_panel_menu_create(DLANG(CONTROLS, CONTROLS), false);
struct DjuiBase* body = djui_three_panel_get_body(panel); struct DjuiBase* body = djui_three_panel_get_body(panel);
{ {
struct DjuiFlowLayout* bindBody = djui_flow_layout_create(body); struct DjuiFlowLayout* bindBody = djui_flow_layout_create(body);

2
src/pc/djui/djui_panel_controls_n64.c
View file

@ -6,7 +6,7 @@
void djui_panel_controls_n64_create(struct DjuiBase* caller) { void djui_panel_controls_n64_create(struct DjuiBase* caller) {
f32 bindBodyHeight = 28 * 14 + 1 * 13; f32 bindBodyHeight = 28 * 14 + 1 * 13;
struct DjuiThreePanel* panel = djui_panel_menu_create(DLANG(CONTROLS, CONTROLS)); struct DjuiThreePanel* panel = djui_panel_menu_create(DLANG(CONTROLS, CONTROLS), false);
struct DjuiBase* body = djui_three_panel_get_body(panel); struct DjuiBase* body = djui_three_panel_get_body(panel);
{ {
struct DjuiFlowLayout* bindBody = djui_flow_layout_create(body); struct DjuiFlowLayout* bindBody = djui_flow_layout_create(body);

2
src/pc/djui/djui_panel_display.c
View file

@ -52,7 +52,7 @@ static void djui_panel_display_msaa_change(UNUSED struct DjuiBase* caller) {
} }
void djui_panel_display_create(struct DjuiBase* caller) { void djui_panel_display_create(struct DjuiBase* caller) {
struct DjuiThreePanel* panel = djui_panel_menu_create(DLANG(DISPLAY, DISPLAY)); struct DjuiThreePanel* panel = djui_panel_menu_create(DLANG(DISPLAY, DISPLAY), false);
struct DjuiBase* body = djui_three_panel_get_body(panel); struct DjuiBase* body = djui_three_panel_get_body(panel);
struct DjuiSelectionbox* msaa = NULL; struct DjuiSelectionbox* msaa = NULL;

2
src/pc/djui/djui_panel_dynos.c
View file

@ -38,7 +38,7 @@ static void djui_panel_dynos_destroy(UNUSED struct DjuiBase* caller) {
void djui_panel_dynos_create(struct DjuiBase* caller) { void djui_panel_dynos_create(struct DjuiBase* caller) {
gDjuiInPlayerMenu = true; gDjuiInPlayerMenu = true;
int packCount = dynos_pack_get_count(); int packCount = dynos_pack_get_count();
struct DjuiThreePanel* panel = djui_panel_menu_create(DLANG(DYNOS, DYNOS)); struct DjuiThreePanel* panel = djui_panel_menu_create(DLANG(DYNOS, DYNOS), true);
struct DjuiBase* body = djui_three_panel_get_body(panel); struct DjuiBase* body = djui_three_panel_get_body(panel);
{ {

6
src/pc/djui/djui_panel_host.c
View file

@ -99,9 +99,9 @@ static void djui_panel_host_do_host(struct DjuiBase* caller) {
void djui_panel_host_create(struct DjuiBase* caller) { void djui_panel_host_create(struct DjuiBase* caller) {
struct DjuiBase* defaultBase = NULL; struct DjuiBase* defaultBase = NULL;
struct DjuiThreePanel* panel = djui_panel_menu_create((gNetworkType == NT_SERVER) struct DjuiThreePanel* panel = djui_panel_menu_create(
? DLANG(HOST, SERVER_TITLE) (gNetworkType == NT_SERVER) ? DLANG(HOST, SERVER_TITLE) : DLANG(HOST, HOST_TITLE),
: DLANG(HOST, HOST_TITLE)); false);
struct DjuiBase* body = djui_three_panel_get_body(panel); struct DjuiBase* body = djui_three_panel_get_body(panel);
{ {
char* nChoices[] = { DLANG(HOST, DIRECT_CONNECTION), DLANG(HOST, COOPNET) }; char* nChoices[] = { DLANG(HOST, DIRECT_CONNECTION), DLANG(HOST, COOPNET) };

2
src/pc/djui/djui_panel_host_message.c
View file

@ -57,7 +57,7 @@ void djui_panel_host_message_create(struct DjuiBase* caller) {
f32 textHeight = 32 * 0.8125f * warningLines + 8; f32 textHeight = 32 * 0.8125f * warningLines + 8;
struct DjuiThreePanel* panel = djui_panel_menu_create(DLANG(HOST_MESSAGE, INFO_TITLE)); struct DjuiThreePanel* panel = djui_panel_menu_create(DLANG(HOST_MESSAGE, INFO_TITLE), false);
struct DjuiBase* body = djui_three_panel_get_body(panel); struct DjuiBase* body = djui_three_panel_get_body(panel);
{ {
struct DjuiText* text1 = djui_text_create(body, warningMessage); struct DjuiText* text1 = djui_text_create(body, warningMessage);

7
src/pc/djui/djui_panel_host_mods.c
View file

@ -124,10 +124,9 @@ void djui_panel_host_mods_create(struct DjuiBase* caller) {
mods_update_selectable(); mods_update_selectable();
djui_panel_host_mods_description_create(); djui_panel_host_mods_description_create();
struct DjuiThreePanel* panel = djui_panel_menu_create(isRomHacks struct DjuiThreePanel* panel = djui_panel_menu_create(
? DLANG(HOST_MODS, ROMHACKS) isRomHacks ? DLANG(HOST_MODS, ROMHACKS) : DLANG(HOST_MODS, MODS),
: DLANG(HOST_MODS, MODS) true);
);
struct DjuiBase* body = djui_three_panel_get_body(panel); struct DjuiBase* body = djui_three_panel_get_body(panel);
{ {

4
src/pc/djui/djui_panel_host_save.c
View file

@ -31,7 +31,7 @@ static bool djui_panel_edit_back(UNUSED struct DjuiBase* caller) {
} }
static void djui_panel_edit_create(struct DjuiBase* caller) { static void djui_panel_edit_create(struct DjuiBase* caller) {
struct DjuiThreePanel* panel = djui_panel_menu_create(DLANG(HOST_SAVE, EDIT_TITLE)); struct DjuiThreePanel* panel = djui_panel_menu_create(DLANG(HOST_SAVE, EDIT_TITLE), false);
struct DjuiBase* body = djui_three_panel_get_body(panel); struct DjuiBase* body = djui_three_panel_get_body(panel);
{ {
struct DjuiRect* rect1 = djui_rect_container_create(body, 32); struct DjuiRect* rect1 = djui_rect_container_create(body, 32);
@ -96,7 +96,7 @@ static void djui_panel_host_save_edit(struct DjuiBase* caller) {
void djui_panel_host_save_create(struct DjuiBase* caller) { void djui_panel_host_save_create(struct DjuiBase* caller) {
sSaveButtonCaller = caller; sSaveButtonCaller = caller;
struct DjuiThreePanel* panel = djui_panel_menu_create(DLANG(HOST_SAVE, SAVE_TITLE)); struct DjuiThreePanel* panel = djui_panel_menu_create(DLANG(HOST_SAVE, SAVE_TITLE), false);
struct DjuiBase* body = djui_three_panel_get_body(panel); struct DjuiBase* body = djui_three_panel_get_body(panel);
{ {
for (int i = 0; i < NUM_SAVE_FILES; i++) { for (int i = 0; i < NUM_SAVE_FILES; i++) {

2
src/pc/djui/djui_panel_host_settings.c
View file

@ -43,7 +43,7 @@ static void djui_panel_host_player_text_change(struct DjuiBase* caller) {
} }
void djui_panel_host_settings_create(struct DjuiBase* caller) { void djui_panel_host_settings_create(struct DjuiBase* caller) {
struct DjuiThreePanel* panel = djui_panel_menu_create(DLANG(HOST_SETTINGS, SETTINGS)); struct DjuiThreePanel* panel = djui_panel_menu_create(DLANG(HOST_SETTINGS, SETTINGS), false);
struct DjuiBase* body = djui_three_panel_get_body(panel); struct DjuiBase* body = djui_three_panel_get_body(panel);
{ {
char* iChoices[3] = { DLANG(HOST_SETTINGS, NONSOLID), DLANG(HOST_SETTINGS, SOLID), DLANG(HOST_SETTINGS, FRIENDLY_FIRE) }; char* iChoices[3] = { DLANG(HOST_SETTINGS, NONSOLID), DLANG(HOST_SETTINGS, SOLID), DLANG(HOST_SETTINGS, FRIENDLY_FIRE) };

2
src/pc/djui/djui_panel_info.c
View file

@ -6,7 +6,7 @@
static char sInfo[512]; static char sInfo[512];
void djui_panel_info_create(struct DjuiBase *caller) { void djui_panel_info_create(struct DjuiBase *caller) {
struct DjuiThreePanel *panel = djui_panel_menu_create(DLANG(INFORMATION, INFORMATION_TITLE)); struct DjuiThreePanel *panel = djui_panel_menu_create(DLANG(INFORMATION, INFORMATION_TITLE), false);
struct DjuiBase *body = djui_three_panel_get_body(panel); struct DjuiBase *body = djui_three_panel_get_body(panel);
{ {
snprintf(sInfo, 512, "\ snprintf(sInfo, 512, "\

2
src/pc/djui/djui_panel_join.c
View file

@ -21,7 +21,7 @@ void djui_panel_join_create(struct DjuiBase* caller) {
#ifndef COOPNET #ifndef COOPNET
djui_panel_join_direct_create(caller); djui_panel_join_direct_create(caller);
#else #else
struct DjuiThreePanel* panel = djui_panel_menu_create(DLANG(JOIN, JOIN_TITLE)); struct DjuiThreePanel* panel = djui_panel_menu_create(DLANG(JOIN, JOIN_TITLE), false);
struct DjuiBase* body = djui_three_panel_get_body(panel); struct DjuiBase* body = djui_three_panel_get_body(panel);
{ {
djui_button_create(body, DLANG(JOIN, PUBLIC_LOBBIES), DJUI_BUTTON_STYLE_NORMAL, djui_panel_join_public_lobbies); djui_button_create(body, DLANG(JOIN, PUBLIC_LOBBIES), DJUI_BUTTON_STYLE_NORMAL, djui_panel_join_public_lobbies);

2
src/pc/djui/djui_panel_join_direct.c
View file

@ -155,7 +155,7 @@ void djui_panel_join_direct_do_join(struct DjuiBase* caller) {
void djui_panel_join_direct_create(struct DjuiBase* caller) { void djui_panel_join_direct_create(struct DjuiBase* caller) {
struct DjuiBase* defaultBase = NULL; struct DjuiBase* defaultBase = NULL;
struct DjuiThreePanel* panel = djui_panel_menu_create(DLANG(JOIN, JOIN_TITLE)); struct DjuiThreePanel* panel = djui_panel_menu_create(DLANG(JOIN, JOIN_TITLE), false);
struct DjuiBase* body = djui_three_panel_get_body(panel); struct DjuiBase* body = djui_three_panel_get_body(panel);
{ {
struct DjuiText* text1 = djui_text_create(body, DLANG(JOIN, JOIN_SOCKET)); struct DjuiText* text1 = djui_text_create(body, DLANG(JOIN, JOIN_SOCKET));

4
src/pc/djui/djui_panel_join_lobbies.c
View file

@ -152,7 +152,9 @@ void djui_panel_join_lobbies_create(struct DjuiBase* caller, const char* passwor
djui_panel_join_lobby_description_create(); djui_panel_join_lobby_description_create();
struct DjuiBase* defaultBase = NULL; struct DjuiBase* defaultBase = NULL;
struct DjuiThreePanel* panel = djui_panel_menu_create(private ? DLANG(LOBBIES, PRIVATE_LOBBIES) : DLANG(LOBBIES, PUBLIC_LOBBIES)); struct DjuiThreePanel* panel = djui_panel_menu_create(
private ? DLANG(LOBBIES, PRIVATE_LOBBIES) : DLANG(LOBBIES, PUBLIC_LOBBIES),
true);
struct DjuiBase* body = djui_three_panel_get_body(panel); struct DjuiBase* body = djui_three_panel_get_body(panel);
{ {
sLobbyPaginated = djui_paginated_create(body, 10); sLobbyPaginated = djui_paginated_create(body, 10);

2
src/pc/djui/djui_panel_join_message.c
View file

@ -54,7 +54,7 @@ void djui_panel_join_message_create(struct DjuiBase* caller) {
// don't recreate panel if it's already visible // don't recreate panel if it's already visible
if (gDjuiPanelJoinMessageVisible) { return; } if (gDjuiPanelJoinMessageVisible) { return; }
struct DjuiThreePanel* panel = djui_panel_menu_create(DLANG(JOIN_MESSAGE, JOINING)); struct DjuiThreePanel* panel = djui_panel_menu_create(DLANG(JOIN_MESSAGE, JOINING), true);
struct DjuiBase* body = djui_three_panel_get_body(panel); struct DjuiBase* body = djui_three_panel_get_body(panel);
{ {
snprintf(gDownloadEstimate, 32, " "); snprintf(gDownloadEstimate, 32, " ");

2
src/pc/djui/djui_panel_join_private.c
View file

@ -17,7 +17,7 @@ static void djui_panel_join_private_lobbies(struct DjuiBase* caller) {
void djui_panel_join_private_create(struct DjuiBase* caller) { void djui_panel_join_private_create(struct DjuiBase* caller) {
struct DjuiBase* defaultBase = NULL; struct DjuiBase* defaultBase = NULL;
struct DjuiThreePanel* panel = djui_panel_menu_create(DLANG(LOBBIES, PRIVATE_LOBBIES)); struct DjuiThreePanel* panel = djui_panel_menu_create(DLANG(LOBBIES, PRIVATE_LOBBIES), true);
struct DjuiBase* body = djui_three_panel_get_body(panel); struct DjuiBase* body = djui_three_panel_get_body(panel);
{ {
struct DjuiText* text1 = djui_text_create(body, DLANG(LOBBIES, ENTER_PASSWORD)); struct DjuiText* text1 = djui_text_create(body, DLANG(LOBBIES, ENTER_PASSWORD));

2
src/pc/djui/djui_panel_language.c
View file

@ -75,7 +75,7 @@ static void djui_panel_language_destroy(UNUSED struct DjuiBase* caller) {
} }
void djui_panel_language_create(struct DjuiBase* caller) { void djui_panel_language_create(struct DjuiBase* caller) {
struct DjuiThreePanel* panel = djui_panel_menu_create(DLANG(LANGUAGE, LANGUAGE)); struct DjuiThreePanel* panel = djui_panel_menu_create(DLANG(LANGUAGE, LANGUAGE), false);
struct DjuiBase* body = djui_three_panel_get_body(panel); struct DjuiBase* body = djui_three_panel_get_body(panel);
sLanguageChanged = false; sLanguageChanged = false;

2
src/pc/djui/djui_panel_main.c
View file

@ -25,7 +25,7 @@ static void djui_panel_main_quit(struct DjuiBase* caller) {
} }
void djui_panel_main_create(struct DjuiBase* caller) { void djui_panel_main_create(struct DjuiBase* caller) {
struct DjuiThreePanel* panel = djui_panel_menu_create(""); struct DjuiThreePanel* panel = djui_panel_menu_create("", false);
{ {
struct DjuiBase* body = djui_three_panel_get_body(panel); struct DjuiBase* body = djui_three_panel_get_body(panel);
{ {

12
src/pc/djui/djui_panel_menu.c
View file

@ -46,19 +46,11 @@ void djui_panel_menu_back(UNUSED struct DjuiBase* base) {
djui_panel_back(); djui_panel_back();
} }
struct DjuiThreePanel* djui_panel_menu_create(char* headerText) { struct DjuiThreePanel* djui_panel_menu_create(char* headerText, bool forcedLeftSide) {
struct DjuiThreePanel* panel = djui_three_panel_create(&gDjuiRoot->base, 64, 0, 0); struct DjuiThreePanel* panel = djui_three_panel_create(&gDjuiRoot->base, 64, 0, 0);
struct DjuiTheme* theme = gDjuiThemes[configDjuiTheme]; struct DjuiTheme* theme = gDjuiThemes[configDjuiTheme];
struct DjuiThreePanelTheme three = theme->threePanels; struct DjuiThreePanelTheme three = theme->threePanels;
bool center = configDjuiThemeCenter && bool center = !forcedLeftSide && configDjuiThemeCenter;
strcmp(headerText, DLANG(HOST_MODS, MODS)) &&
strcmp(headerText, DLANG(HOST_MODS, ROMHACKS)) &&
strcmp(headerText, DLANG(LOBBIES, PUBLIC_LOBBIES)) &&
strcmp(headerText, DLANG(LOBBIES, PRIVATE_LOBBIES)) &&
strcmp(headerText, DLANG(JOIN_MESSAGE, JOINING)) &&
strcmp(headerText, DLANG(PLAYER, PLAYER_TITLE)) &&
strcmp(headerText, DLANG(PLAYER, PALETTE)) &&
strcmp(headerText, DLANG(DYNOS, DYNOS));
f32 widthMultiplier = center ? DJUI_THEME_CENTERED_WIDTH : 1.0f; f32 widthMultiplier = center ? DJUI_THEME_CENTERED_WIDTH : 1.0f;
f32 heightMultiplier = center ? DJUI_THEME_CENTERED_HEIGHT : 1.0f; f32 heightMultiplier = center ? DJUI_THEME_CENTERED_HEIGHT : 1.0f;

2
src/pc/djui/djui_panel_menu.h
View file

@ -2,4 +2,4 @@
#include "djui.h" #include "djui.h"
void djui_panel_menu_back(struct DjuiBase* base); void djui_panel_menu_back(struct DjuiBase* base);
struct DjuiThreePanel* djui_panel_menu_create(char* headerText); struct DjuiThreePanel* djui_panel_menu_create(char* headerText, bool forcedLeftSide);

2
src/pc/djui/djui_panel_menu_options.c
View file

@ -50,7 +50,7 @@ static void djui_panel_menu_options_djui_setting_change(UNUSED struct DjuiBase*
} }
void djui_panel_main_menu_create(struct DjuiBase* caller) { void djui_panel_main_menu_create(struct DjuiBase* caller) {
struct DjuiThreePanel* panel = djui_panel_menu_create(DLANG(MENU_OPTIONS, MENU_TITLE)); struct DjuiThreePanel* panel = djui_panel_menu_create(DLANG(MENU_OPTIONS, MENU_TITLE), false);
struct DjuiBase* body = djui_three_panel_get_body(panel); struct DjuiBase* body = djui_three_panel_get_body(panel);
{ {

4
src/pc/djui/djui_panel_misc.c
View file

@ -23,7 +23,7 @@ static void djui_panel_compatibility_checkbox_on_value_change(UNUSED struct Djui
#ifdef DEVELOPMENT #ifdef DEVELOPMENT
void djui_panel_options_debug_create(struct DjuiBase* caller) { void djui_panel_options_debug_create(struct DjuiBase* caller) {
struct DjuiThreePanel* panel = djui_panel_menu_create(DLANG(MISC, DEBUG_TITLE)); struct DjuiThreePanel* panel = djui_panel_menu_create(DLANG(MISC, DEBUG_TITLE), false);
struct DjuiBase* body = djui_three_panel_get_body(panel); struct DjuiBase* body = djui_three_panel_get_body(panel);
{ {
@ -59,7 +59,7 @@ static void djui_panel_options_open_user_folder(UNUSED struct DjuiBase* caller)
} }
void djui_panel_misc_create(struct DjuiBase* caller) { void djui_panel_misc_create(struct DjuiBase* caller) {
struct DjuiThreePanel* panel = djui_panel_menu_create(DLANG(MISC, MISC_TITLE)); struct DjuiThreePanel* panel = djui_panel_menu_create(DLANG(MISC, MISC_TITLE), false);
struct DjuiBase* body = djui_three_panel_get_body(panel); struct DjuiBase* body = djui_three_panel_get_body(panel);
djui_themes_init(); djui_themes_init();

4
src/pc/djui/djui_panel_mod_menu.c
View file

@ -96,7 +96,7 @@ void djui_panel_mod_menu_mod_create(struct DjuiBase* caller) {
} }
if (mod == NULL) { return; } if (mod == NULL) { return; }
struct DjuiThreePanel* panel = djui_panel_menu_create(to_uppercase(mod->name)); struct DjuiThreePanel* panel = djui_panel_menu_create(to_uppercase(mod->name), false);
struct DjuiBase* body = djui_three_panel_get_body(panel); struct DjuiBase* body = djui_three_panel_get_body(panel);
{ {
struct DjuiPaginated* paginated = djui_paginated_create(body, 8); struct DjuiPaginated* paginated = djui_paginated_create(body, 8);
@ -115,7 +115,7 @@ void djui_panel_mod_menu_mod_create(struct DjuiBase* caller) {
} }
void djui_panel_mod_menu_create(struct DjuiBase* caller) { void djui_panel_mod_menu_create(struct DjuiBase* caller) {
struct DjuiThreePanel* panel = djui_panel_menu_create(DLANG(PAUSE, MOD_MENU_TITLE)); struct DjuiThreePanel* panel = djui_panel_menu_create(DLANG(PAUSE, MOD_MENU_TITLE), false);
struct DjuiBase* body = djui_three_panel_get_body(panel); struct DjuiBase* body = djui_three_panel_get_body(panel);
{ {
struct DjuiPaginated* paginated = djui_paginated_create(body, 8); struct DjuiPaginated* paginated = djui_paginated_create(body, 8);

2
src/pc/djui/djui_panel_modlist.c
View file

@ -22,7 +22,7 @@ void djui_panel_modlist_create(UNUSED struct DjuiBase* caller) {
if (gActiveMods.entryCount == 0) { return; } if (gActiveMods.entryCount == 0) { return; }
f32 bodyHeight = (gActiveMods.entryCount * 32) + (gActiveMods.entryCount - 1) * 4; f32 bodyHeight = (gActiveMods.entryCount * 32) + (gActiveMods.entryCount - 1) * 4;
struct DjuiThreePanel* panel = djui_panel_menu_create(DLANG(MODLIST, MODS)); struct DjuiThreePanel* panel = djui_panel_menu_create(DLANG(MODLIST, MODS), false);
djui_three_panel_set_body_size(panel, bodyHeight); djui_three_panel_set_body_size(panel, bodyHeight);
gDjuiModList = panel; gDjuiModList = panel;

2
src/pc/djui/djui_panel_options.c
View file

@ -18,7 +18,7 @@ static void djui_panel_options_back(struct DjuiBase* caller) {
} }
void djui_panel_options_create(struct DjuiBase* caller) { void djui_panel_options_create(struct DjuiBase* caller) {
struct DjuiThreePanel* panel = djui_panel_menu_create(DLANG(OPTIONS, OPTIONS)); struct DjuiThreePanel* panel = djui_panel_menu_create(DLANG(OPTIONS, OPTIONS), false);
struct DjuiBase* body = djui_three_panel_get_body(panel); struct DjuiBase* body = djui_three_panel_get_body(panel);
{ {
if (gDjuiInMainMenu) { if (gDjuiInMainMenu) {

2
src/pc/djui/djui_panel_pause.c
View file

@ -55,7 +55,7 @@ void djui_panel_pause_create(struct DjuiBase* caller) {
if (gDjuiChatBoxFocus) { djui_chat_box_toggle(); } if (gDjuiChatBoxFocus) { djui_chat_box_toggle(); }
struct DjuiBase* defaultBase = NULL; struct DjuiBase* defaultBase = NULL;
struct DjuiThreePanel* panel = djui_panel_menu_create(DLANG(PAUSE, PAUSE_TITLE)); struct DjuiThreePanel* panel = djui_panel_menu_create(DLANG(PAUSE, PAUSE_TITLE), false);
struct DjuiBase* body = djui_three_panel_get_body(panel); struct DjuiBase* body = djui_three_panel_get_body(panel);
{ {
struct DjuiRect* rect1 = djui_rect_container_create(body, 64); struct DjuiRect* rect1 = djui_rect_container_create(body, 64);

4
src/pc/djui/djui_panel_player.c
View file

@ -221,7 +221,7 @@ static void djui_panel_player_edit_palette_create(struct DjuiBase* caller) {
char* sPartStrings[PLAYER_PART_MAX] = { DLANG(PLAYER, OVERALLS), DLANG(PLAYER, SHIRT), DLANG(PLAYER, GLOVES), DLANG(PLAYER, SHOES), DLANG(PLAYER, HAIR), DLANG(PLAYER, SKIN), DLANG(PLAYER, CAP), DLANG(PLAYER, EMBLEM) }; char* sPartStrings[PLAYER_PART_MAX] = { DLANG(PLAYER, OVERALLS), DLANG(PLAYER, SHIRT), DLANG(PLAYER, GLOVES), DLANG(PLAYER, SHOES), DLANG(PLAYER, HAIR), DLANG(PLAYER, SKIN), DLANG(PLAYER, CAP), DLANG(PLAYER, EMBLEM) };
struct DjuiThreePanel* panel = djui_panel_menu_create(DLANG(PLAYER, PALETTE)); struct DjuiThreePanel* panel = djui_panel_menu_create(DLANG(PLAYER, PALETTE), true);
// A bit of a gross hack to send out palette changes and update the palette preset selection box on unpause AND // A bit of a gross hack to send out palette changes and update the palette preset selection box on unpause AND
// pressing the Back button // pressing the Back button
@ -395,7 +395,7 @@ void djui_panel_player_create(struct DjuiBase* caller) {
djui_panel_player_update_camera_cutscene(); djui_panel_player_update_camera_cutscene();
gDjuiInPlayerMenu = true; gDjuiInPlayerMenu = true;
struct DjuiThreePanel* panel = djui_panel_menu_create(DLANG(PLAYER, PLAYER_TITLE)); struct DjuiThreePanel* panel = djui_panel_menu_create(DLANG(PLAYER, PLAYER_TITLE), true);
struct DjuiBase* body = djui_three_panel_get_body(panel); struct DjuiBase* body = djui_three_panel_get_body(panel);
{ {
struct DjuiRect* rect1 = djui_rect_container_create(body, 32); struct DjuiRect* rect1 = djui_rect_container_create(body, 32);

2
src/pc/djui/djui_panel_playerlist.c
View file

@ -82,7 +82,7 @@ void djui_panel_playerlist_on_render_pre(UNUSED struct DjuiBase* base, UNUSED bo
void djui_panel_playerlist_create(UNUSED struct DjuiBase* caller) { void djui_panel_playerlist_create(UNUSED struct DjuiBase* caller) {
f32 bodyHeight = (sPlayerListSize * 32) + (sPlayerListSize - 1) * 4; f32 bodyHeight = (sPlayerListSize * 32) + (sPlayerListSize - 1) * 4;
struct DjuiThreePanel* panel = djui_panel_menu_create(DLANG(PLAYER_LIST, PLAYERS)); struct DjuiThreePanel* panel = djui_panel_menu_create(DLANG(PLAYER_LIST, PLAYERS), false);
djui_three_panel_set_body_size(panel, bodyHeight); djui_three_panel_set_body_size(panel, bodyHeight);
gDjuiPlayerList = panel; gDjuiPlayerList = panel;
panel->base.on_render_pre = djui_panel_playerlist_on_render_pre; panel->base.on_render_pre = djui_panel_playerlist_on_render_pre;

2
src/pc/djui/djui_panel_rules.c
View file

@ -19,7 +19,7 @@ static void djui_panel_rules_accept(struct DjuiBase* caller) {
} }
void djui_panel_rules_create(struct DjuiBase* caller) { void djui_panel_rules_create(struct DjuiBase* caller) {
struct DjuiThreePanel* panel = djui_panel_menu_create(DLANG(RULES, RULES_TITLE)); struct DjuiThreePanel* panel = djui_panel_menu_create(DLANG(RULES, RULES_TITLE), false);
struct DjuiBase* body = djui_three_panel_get_body(panel); struct DjuiBase* body = djui_three_panel_get_body(panel);
{ {
snprintf(sRules, 512, "%s\n\ snprintf(sRules, 512, "%s\n\

2
src/pc/djui/djui_panel_sound.c
View file

@ -10,7 +10,7 @@ static void djui_panel_sound_value_change(UNUSED struct DjuiBase* caller) {
} }
void djui_panel_sound_create(struct DjuiBase* caller) { void djui_panel_sound_create(struct DjuiBase* caller) {
struct DjuiThreePanel* panel = djui_panel_menu_create(DLANG(SOUND, SOUND)); struct DjuiThreePanel* panel = djui_panel_menu_create(DLANG(SOUND, SOUND), false);
struct DjuiBase* body = djui_three_panel_get_body(panel); struct DjuiBase* body = djui_three_panel_get_body(panel);
{ {
djui_slider_create(body, DLANG(SOUND, MASTER_VOLUME), &configMasterVolume, 0, 127, djui_panel_sound_value_change); djui_slider_create(body, DLANG(SOUND, MASTER_VOLUME), &configMasterVolume, 0, 127, djui_panel_sound_value_change);