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

Unit Preview Pane: display race name next to icon instead of in tooltip

Browse source
This commit is contained in:
Charles Dang 2016-10-07 22:24:21 +11:00
parent 4600614f6d
commit 628c0ac784
3 changed files with 34 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
data/gui/widget/unit_preview_pane.cfg
View file

@ -2,7 +2,7 @@
#define _GUI_UNIT_PREVIEW_PANE_FULL
[grid]
[row]
grow_factor = 0
@ -18,7 +18,7 @@
[/image]
[/column]
[/row]
[row]
@ -70,25 +70,38 @@
horizontal_alignment = "left"
[image]
id = "type_race"
id = "type_alignment"
[/image]
[/column]
[column]
grow_factor = 0
border = "left,right,bottom"
border = "right,bottom"
border_size = 5
horizontal_alignment = "left"
[image]
id = "type_alignment"
id = "type_race"
[/image]
[/column]
[column]
grow_factor = 1
border = "right,bottom"
border_size = 5
horizontal_grow = "true"
[label]
id = "type_race_label"
definition = "default_small"
[/label]
[/column]
[column]
grow_factor = 0
border = "left,bottom"
border_size = 5
horizontal_alignment = "right"

19
src/gui/widgets/unit_preview_pane.cpp
View file

@ -62,13 +62,14 @@ REGISTER_WIDGET(unit_preview_pane)
void tunit_preview_pane::finalize_setup()
{
// Icons
icon_type_ = find_widget<timage>(this, "type_image" , false, false);
icon_race_ = find_widget<timage>(this, "type_race" , false, false);
icon_type_ = find_widget<timage>(this, "type_image", false, false);
icon_race_ = find_widget<timage>(this, "type_race", false, false);
icon_alignment_ = find_widget<timage>(this, "type_alignment", false, false);
// Labels
label_name_ = find_widget<tlabel>(this, "type_name" , false, false);
label_level_ = find_widget<tlabel>(this, "type_level" , false, false);
label_name_ = find_widget<tlabel>(this, "type_name", false, false);
label_level_ = find_widget<tlabel>(this, "type_level", false, false);
label_race_ = find_widget<tlabel>(this, "type_race_label", false, false);
label_details_ = find_widget<tcontrol>(this, "type_details", false, false);
label_details_minimal_ = find_widget<tcontrol>(this, "type_details_minimal", false, false);
@ -171,9 +172,12 @@ void tunit_preview_pane::set_displayed_type(const unit_type& type)
label_level_->set_use_markup(true);
}
if(label_race_) {
label_race_ ->set_label(type.race()->name(type.genders().front()));
}
if(icon_race_) {
icon_race_->set_label("icons/unit-groups/race_" + type.race_id() + "_30.png");
icon_race_->set_tooltip(type.race()->name(type.genders().front()));
}
if(icon_alignment_) {
@ -295,9 +299,12 @@ void tunit_preview_pane::set_displayed_unit(const unit& u)
label_level_->set_use_markup(true);
}
if(label_race_) {
label_race_->set_label(u.race()->name(u.gender()));
}
if(icon_race_) {
icon_race_->set_label("icons/unit-groups/race_" + u.race()->id() + "_30.png");
icon_race_->set_tooltip(u.race()->name(u.gender()));
}
if(icon_alignment_) {

2
src/gui/widgets/unit_preview_pane.hpp
View file

@ -50,6 +50,7 @@ public:
, icon_alignment_(nullptr)
, label_name_(nullptr)
, label_level_(nullptr)
, label_race_(nullptr)
, label_details_(nullptr)
, label_details_minimal_(nullptr)
, tree_details_(nullptr)
@ -96,6 +97,7 @@ private:
tlabel* label_name_;
tlabel* label_level_;
tlabel* label_race_;
tcontrol* label_details_;
tcontrol* label_details_minimal_;