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

Display side's name in MP Connect.

Browse source 
Name is being take from "name" attribute in [side][/side].

As a result of this, other columns have been reordered and renamed to make the
dialog more intuitive.
This commit is contained in:
Andrius Silinskas 2013-12-13 09:48:55 +00:00
parent e76a18d0f2
commit 66921f48f4
2 changed files with 24 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

33
src/multiplayer_connect.cpp
View file

@ -70,6 +70,7 @@ connect::side::side(connect& parent, side_engine_ptr engine) :
std::vector<std::string>(), parent.combo_control_group_)),
combo_ai_algorithm_(parent.disp(), std::vector<std::string>()),
combo_faction_(parent.disp(), std::vector<std::string>()),
label_leader_name_(parent.video(), engine_->cfg()["name"], font::SIZE_SMALL),
combo_leader_(parent.disp(), std::vector<std::string>()),
combo_gender_(parent.disp(), std::vector<std::string>()),
combo_team_(parent.disp(), engine_->player_teams()),
@ -130,6 +131,7 @@ connect::side::side(const side& a) :
combo_controller_(a.combo_controller_),
combo_ai_algorithm_(a.combo_ai_algorithm_),
combo_faction_(a.combo_faction_),
label_leader_name_(a.label_leader_name_),
combo_leader_(a.combo_leader_),
combo_gender_(a.combo_gender_),
combo_team_(a.combo_team_),
@ -262,13 +264,18 @@ void connect::side::add_widgets_to_scrollpane(gui::scrollpane& pane, int pos)
35 + pos + (combo_leader_.height() -
label_original_controller_.height()) / 2);
pane.add_widget(&combo_ai_algorithm_, 20, 35 + pos);
pane.add_widget(&combo_faction_, 135, 5 + pos);
pane.add_widget(&combo_leader_, 135, 35 + pos);
pane.add_widget(&label_leader_name_, 135 +
(combo_faction_.width() - label_leader_name_.width()) / 2,
35 + pos + (combo_leader_.height() -
label_leader_name_.height()) / 2);
pane.add_widget(&combo_leader_, 250, 5 + pos);
pane.add_widget(&combo_gender_, 250, 35 + pos);
pane.add_widget(&combo_team_, 250, 5 + pos);
pane.add_widget(&combo_color_, 365, 5 + pos);
pane.add_widget(&combo_team_, 365, 5 + pos);
pane.add_widget(&combo_color_, 365, 35 + pos);
pane.add_widget(&slider_gold_, 475, 5 + pos);
pane.add_widget(&label_gold_, 475, 35 + pos);
pane.add_widget(&label_gold_, 475 + 5, 35 + pos);
pane.add_widget(&slider_income_, 475 + slider_gold_.width(), 5 + pos);
pane.add_widget(&label_income_, 475 + slider_gold_.width(), 35 + pos);
}
@ -355,11 +362,11 @@ connect::connect(game_display& disp, const std::string& game_name,
waiting_label_(video(), "", font::SIZE_SMALL, font::LOBBY_COLOR),
type_title_label_(video(), _("Player/Type"), font::SIZE_SMALL,
font::LOBBY_COLOR),
faction_title_label_(video(), _("Faction"), font::SIZE_SMALL,
faction_name_title_label_(video(), _("Faction/Name"), font::SIZE_SMALL,
font::LOBBY_COLOR),
team_title_label_(video(), _("Team/Gender"), font::SIZE_SMALL,
leader_gender_title_label_(video(), _("Leader/Gender"), font::SIZE_SMALL,
font::LOBBY_COLOR),
color_title_label_(video(), _("Color"), font::SIZE_SMALL,
team_color_title_label_(video(), _("Team/Color"), font::SIZE_SMALL,
font::LOBBY_COLOR),
gold_title_label_(video(), _("Gold"), font::SIZE_SMALL,
font::LOBBY_COLOR),
@ -469,9 +476,9 @@ void connect::hide_children(bool hide)
waiting_label_.hide(hide);
scroll_pane_.hide(hide); // Scroll pane contents are automatically hidden.
faction_title_label_.hide(hide);
team_title_label_.hide(hide);
color_title_label_.hide(hide);
faction_name_title_label_.hide(hide);
leader_gender_title_label_.hide(hide);
team_color_title_label_.hide(hide);
if (!params().saved_game) {
gold_title_label_.hide(hide);
@ -506,9 +513,9 @@ void connect::layout_children(const SDL_Rect& rect)
left_button->height());
type_title_label_.set_location(left + 30, top + 35);
faction_title_label_.set_location((left + 145), top + 35);
team_title_label_.set_location((left + 260), top + 35);
color_title_label_.set_location((left + 375), top + 35);
faction_name_title_label_.set_location((left + 145), top + 35);
leader_gender_title_label_.set_location((left + 260), top + 35);
team_color_title_label_.set_location((left + 375), top + 35);
gold_title_label_.set_location((left + 493), top + 35);
income_title_label_.set_location((left + 560), top + 35);

7
src/multiplayer_connect.hpp
View file

@ -81,6 +81,7 @@ public:
gui::combo_drag_ptr combo_controller_;
gui::combo combo_ai_algorithm_;
gui::combo combo_faction_;
gui::label label_leader_name_;
gui::combo combo_leader_;
gui::combo combo_gender_;
gui::combo combo_team_;
@ -134,9 +135,9 @@ private:
gui::label waiting_label_;
gui::label type_title_label_;
gui::label faction_title_label_;
gui::label team_title_label_;
gui::label color_title_label_;
gui::label faction_name_title_label_;
gui::label leader_gender_title_label_;
gui::label team_color_title_label_;
gui::label gold_title_label_;
gui::label income_title_label_;
gui::scrollpane scroll_pane_;