0ct0pu5/wesnoth
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

gui/addon_manager: Show server identification after the address

Browse source 
This enables the client to show the [server_id] info (for 1.16+
campaignd instances that provide the relevant fields) in the UI so
the user can more easily know which instance they are connected to
in case they do not handle that information directly themselves (e.g.
when entering a port number of their own).

The server info shown in the bottom left is changed from "<encryption
status> <server address>" to add "— <server id> (<server version>)"
right after it, with the server version in parentheses being included
only if debug mode is enabled to avoid redundancy or confusing values
(such as "wesnoth.org — 1.18 (1.17.19+dev)").
This commit is contained in:
Iris Morelle 2024-02-29 20:20:26 -03:00 • committed by Charles Dang
parent 597a64701c
commit 17bd58dd79
2 changed files with 15 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
changelog_entries/addon_server_id_ui.md Normal file
View file

@ -0,0 +1,3 @@
### Add-ons client
* The add-ons server identifier (e.g. 1.18) is now displayed on the bottom left after the
server address. If debug mode is enabled the server software version is also shown.

13
src/gui/dialogs/addon/manager.cpp
View file

@ -325,7 +325,18 @@ void addon_manager::pre_show(window& window)
if(addr_visible) {
auto addr_box = dynamic_cast<styled_widget*>(addr_visible->find("server_addr", false));
if(addr_box) {
addr_box->set_label(client_.addr());
if(!client_.server_id().empty()) {
auto full_id = formatter()
<< client_.addr() << ' '
<< font::unicode_em_dash << ' '
<< client_.server_id();
if(game_config::debug && !client_.server_version().empty()) {
full_id << " (" << client_.server_version() << ')';
}
addr_box->set_label(full_id.str());
} else {
addr_box->set_label(client_.addr());
}
}
}