From 975cf7de95f03a1d8d22813b64c3436bced0fa8d Mon Sep 17 00:00:00 2001
From: Ivan Savenko <saven.ivan@gmail.com>
Date: Fri, 29 Mar 2024 17:05:41 +0200
Subject: [PATCH] Tweaks to lobby login window to make it more clear to use
---
Mods/vcmi/config/vcmi/english.json | 1 +
Mods/vcmi/config/vcmi/ukrainian.json | 1 +
client/globalLobby/GlobalLobbyLoginWindow.cpp | 22 ++++++++++++++-----
client/globalLobby/GlobalLobbyLoginWindow.h | 1 +
4 files changed, 20 insertions(+), 5 deletions(-)
diff --git a/Mods/vcmi/config/vcmi/english.json b/Mods/vcmi/config/vcmi/english.json
index 24f81ab64..b463ab6d5 100644
--- a/Mods/vcmi/config/vcmi/english.json
+++ b/Mods/vcmi/config/vcmi/english.json
@@ -79,6 +79,7 @@
"vcmi.lobby.login.error" : "Connection error: %s",
"vcmi.lobby.login.create" : "New Account",
"vcmi.lobby.login.login" : "Login",
+ "vcmi.lobby.login.as" : "Login as %s",
"vcmi.lobby.header.rooms" : "Game Rooms - %d",
"vcmi.lobby.header.channels" : "Chat Channels",
"vcmi.lobby.header.chat.global" : "Global Game Chat - %s", // %s -> language name
diff --git a/Mods/vcmi/config/vcmi/ukrainian.json b/Mods/vcmi/config/vcmi/ukrainian.json
index 01a405a72..35c8b588b 100644
--- a/Mods/vcmi/config/vcmi/ukrainian.json
+++ b/Mods/vcmi/config/vcmi/ukrainian.json
@@ -78,6 +78,7 @@
"vcmi.lobby.login.error" : "Помилка з'єднання: %s",
"vcmi.lobby.login.create" : "Створити акаунт",
"vcmi.lobby.login.login" : "Увійти",
+ "vcmi.lobby.login.as" : "Увійти як %s",
"vcmi.lobby.header.rooms" : "Активні кімнати - %d",
"vcmi.lobby.header.channels" : "Канали чату",
"vcmi.lobby.header.chat.global" : "Глобальний ігровий чат - %s", // %s -> language name
diff --git a/client/globalLobby/GlobalLobbyLoginWindow.cpp b/client/globalLobby/GlobalLobbyLoginWindow.cpp
index 02fbcc342..615d83dc2 100644
--- a/client/globalLobby/GlobalLobbyLoginWindow.cpp
+++ b/client/globalLobby/GlobalLobbyLoginWindow.cpp
@@ -36,9 +36,14 @@ GlobalLobbyLoginWindow::GlobalLobbyLoginWindow()
pos.w = 284;
pos.h = 220;
+ MetaString loginAs;
+ loginAs.appendTextID("vcmi.lobby.login.as");
+ loginAs.replaceTextID(CSH->getGlobalLobby().getAccountDisplayName());
+
filledBackground = std::make_shared<FilledTexturePlayerColored>(ImagePath::builtin("DiBoxBck"), Rect(0, 0, pos.w, pos.h));
labelTitle = std::make_shared<CLabel>( pos.w / 2, 20, FONT_BIG, ETextAlignment::CENTER, Colors::YELLOW, CGI->generaltexth->translate("vcmi.lobby.login.title"));
- labelUsername = std::make_shared<CLabel>( 10, 65, FONT_MEDIUM, ETextAlignment::TOPLEFT, Colors::WHITE, CGI->generaltexth->translate("vcmi.lobby.login.username"));
+ labelUsernameTitle = std::make_shared<CLabel>( 10, 65, FONT_MEDIUM, ETextAlignment::TOPLEFT, Colors::WHITE, CGI->generaltexth->translate("vcmi.lobby.login.username"));
+ labelUsername = std::make_shared<CLabel>( 10, 65, FONT_MEDIUM, ETextAlignment::TOPLEFT, Colors::WHITE, loginAs.toString());
backgroundUsername = std::make_shared<TransparentFilledRectangle>(Rect(10, 90, 264, 20), ColorRGBA(0,0,0,128), ColorRGBA(64,64,64,64));
inputUsername = std::make_shared<CTextInput>(Rect(15, 93, 260, 16), FONT_SMALL, nullptr, ETextAlignment::TOPLEFT, true);
buttonLogin = std::make_shared<CButton>(Point(10, 180), AnimationPath::builtin("MuBchck"), CButton::tooltip(), [this](){ onLogin(); });
@@ -56,7 +61,7 @@ GlobalLobbyLoginWindow::GlobalLobbyLoginWindow()
toggleMode->setSelected(settings["lobby"]["roomType"].Integer());
toggleMode->addCallback([this](int index){onLoginModeChanged(index);});
- if (settings["lobby"]["accountID"].String().empty())
+ if (CSH->getGlobalLobby().getAccountID().empty())
{
buttonLogin->block(true);
toggleMode->setSelected(0);
@@ -77,12 +82,19 @@ void GlobalLobbyLoginWindow::onLoginModeChanged(int value)
{
if (value == 0)
{
- inputUsername->setText("");
+ inputUsername->enable();
+ backgroundUsername->enable();
+ labelUsernameTitle->enable();
+ labelUsername->disable();
}
else
{
- inputUsername->setText(settings["lobby"]["displayName"].String());
+ inputUsername->disable();
+ backgroundUsername->disable();
+ labelUsernameTitle->disable();
+ labelUsername->enable();
}
+ redraw();
}
void GlobalLobbyLoginWindow::onClose()
@@ -104,7 +116,7 @@ void GlobalLobbyLoginWindow::onLogin()
void GlobalLobbyLoginWindow::onConnectionSuccess()
{
- std::string accountID = settings["lobby"]["accountID"].String();
+ std::string accountID = CSH->getGlobalLobby().getAccountID();
if(toggleMode->getSelected() == 0)
CSH->getGlobalLobby().sendClientRegister(inputUsername->getText());
diff --git a/client/globalLobby/GlobalLobbyLoginWindow.h b/client/globalLobby/GlobalLobbyLoginWindow.h
index a589ac650..178fa9860 100644
--- a/client/globalLobby/GlobalLobbyLoginWindow.h
+++ b/client/globalLobby/GlobalLobbyLoginWindow.h
@@ -23,6 +23,7 @@ class GlobalLobbyLoginWindow : public CWindowObject
{
std::shared_ptr<FilledTexturePlayerColored> filledBackground;
std::shared_ptr<CLabel> labelTitle;
+ std::shared_ptr<CLabel> labelUsernameTitle;
std::shared_ptr<CLabel> labelUsername;
std::shared_ptr<CTextBox> labelStatus;
std::shared_ptr<TransparentFilledRectangle> backgroundUsername;