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

Rename the label field to message.

Browse source
This commit is contained in:
Mark de Wever 2009-08-09 08:36:43 +00:00
parent fe5d7d84c4
commit 8626347798
2 changed files with 11 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
data/gui/default/window/wml_message.cfg
View file

@ -359,8 +359,8 @@
border = "all"
border_size = 5
[scroll_label] # NOTE maybe change the code to use message instead of label as id
id = "label"
[scroll_label]
id = "message"
definition = "wml_message"
[/scroll_label]
@ -420,7 +420,6 @@
{_GUI_INPUT_LIST}
[/column]
[/row]
@ -566,8 +565,8 @@ if(gamemap_width - ({__GUI_IMAGE_WIDTH}) > 675
border = "all"
border_size = 5
[scroll_label] # NOTE maybe change the code to use message instead of label as id
id = "label"
[scroll_label]
id = "message"
definition = "default"
[/scroll_label]

14
src/gui/dialogs/wml_message.cpp
View file

@ -64,14 +64,14 @@ void twml_message_::pre_show(CVideo& /*video*/, twindow& window)
title->set_label(title_);
title->set_markup_mode(tcontrol::WML_MARKUP);
tcontrol* label =
dynamic_cast<tcontrol*>(window.find_widget("label", false));
assert(label);
label->set_label(message_);
label->set_markup_mode(tcontrol::PANGO_MARKUP);
// The label might not always be a scroll_label but the capturing
tcontrol* message =
dynamic_cast<tcontrol*>(window.find_widget("message", false));
assert(message);
message->set_label(message_);
message->set_markup_mode(tcontrol::PANGO_MARKUP);
// The message label might not always be a scroll_label but the capturing
// shouldn't hurt.
window.keyboard_capture(label);
window.keyboard_capture(message);
// Find the input box related fields.
tlabel* caption = dynamic_cast<tlabel*>(