From 8fe296d0f341dc19aa4ae24f26bb8ee67933a5ce Mon Sep 17 00:00:00 2001 From: josteph Date: Fri, 25 May 2018 18:24:34 +0000 Subject: [PATCH] MP Faction Select dialog: Show leader unit details. If the leader hasn't been discovered, the "Unknown Unit" topic will be shown. Fixes #1491 --- data/gui/window/mp_faction_select.cfg | 9 ++++++++ .../dialogs/multiplayer/faction_select.cpp | 22 +++++++++++++++++++ .../dialogs/multiplayer/faction_select.hpp | 2 ++ 3 files changed, 33 insertions(+) diff --git a/data/gui/window/mp_faction_select.cfg b/data/gui/window/mp_faction_select.cfg index eaa9b0e07f98..0ec1084d4f4f 100644 --- a/data/gui/window/mp_faction_select.cfg +++ b/data/gui/window/mp_faction_select.cfg @@ -132,6 +132,15 @@ [/column] + [column] + [button] + id = "type_profile" + definition = "action_about" + + label = _ "Profile" + [/button] + [/column] + [/row] [/grid] diff --git a/src/gui/dialogs/multiplayer/faction_select.cpp b/src/gui/dialogs/multiplayer/faction_select.cpp index 4f9f75100667..f380d53c477c 100644 --- a/src/gui/dialogs/multiplayer/faction_select.cpp +++ b/src/gui/dialogs/multiplayer/faction_select.cpp @@ -26,11 +26,14 @@ #include "gui/widgets/settings.hpp" #include "gui/widgets/image.hpp" #include "gui/widgets/label.hpp" +#include "gui/widgets/button.hpp" #include "gui/widgets/menu_button.hpp" #include "gui/widgets/toggle_button.hpp" #include "gui/widgets/window.hpp" #include "formatter.hpp" +#include "game_config_manager.hpp" #include "gettext.hpp" +#include "help/help.hpp" #include "units/types.hpp" #include "utils/functional.hpp" @@ -78,6 +81,10 @@ void faction_select::pre_show(window& window) connect_signal_notify_modified(find_widget(&window, "leader_menu", false), std::bind(&faction_select::on_leader_select, this, std::ref(window))); + // Leader's profile button + find_widget