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

MP Faction Select dialog: Show leader unit details.

Browse source 
If the leader hasn't been discovered, the "Unknown Unit" topic will be shown.

Fixes #1491

(cherry-picked from commit a8f83f6e68)
This commit is contained in:
josteph 2018-05-25 18:24:34 +00:00 • committed by Jyrki Vesterinen
parent 2b2dd321c9
commit 9f2cbad96f
3 changed files with 33 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
data/gui/window/mp_faction_select.cfg
View file

@ -132,6 +132,15 @@
[/column]
[column]
[button]
id = "type_profile"
definition = "action_about"
label = _ "Profile"
[/button]
[/column]
[/row]
[/grid]

22
src/gui/dialogs/multiplayer/faction_select.cpp
View file

@ -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<menu_button>(&window, "leader_menu", false),
std::bind(&faction_select::on_leader_select, this, std::ref(window)));
// Leader's profile button
find_widget<button>(&window, "type_profile", false).connect_click_handler(
std::bind(&faction_select::profile_button_callback, this, std::ref(window)));
//
// Set up faction list
//
@ -195,6 +202,21 @@ void faction_select::on_leader_select(window& window)
});
update_leader_image(window);
// Disable the profile button if leader_type is dash or "Random"
button& profile_button = find_widget<button>(&window, "type_profile", false);
const std::string& leader_type = find_widget<menu_button>(&window, "leader_menu", false).get_value_string();
profile_button.set_active(unit_types.find(leader_type) != nullptr);
}
void faction_select::profile_button_callback(window& window)
{
const std::string& leader_type = find_widget<menu_button>(&window, "leader_menu", false).get_value_string();
const unit_type* ut = unit_types.find(leader_type);
if(ut != nullptr) {
help::help_manager help_manager(&game_config_manager::get()->game_config());
help::show_unit_description(*ut);
}
}
void faction_select::on_gender_select(window& window)

2
src/gui/dialogs/multiplayer/faction_select.hpp
View file

@ -57,6 +57,8 @@ private:
void on_leader_select(window& window);
void profile_button_callback(window& window);
void on_gender_select(window& window);
void update_leader_image(window& window);