upstream/wesnoth
1
0
Fork 0
mirror of https://github.com/wesnoth/wesnoth synced 2025-05-18 20:02:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

Enable the wml markup in the [message] dialogs.

Browse Source 
The code is a bit of a hack and needs to be polished post 1.6.
This commit is contained in:
Mark de Wever 2009-02-01 11:37:52 +00:00
parent 7b4d53c442
commit c9d5df386e
2 changed files with 34 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
src/gui/dialogs/wml_message.cpp
View File

@ -49,6 +49,12 @@ void twml_message_::set_option_list(
set_auto_close(false); set_auto_close(false);
} }
/**
* @todo This function enables the wml markup for all items, but the interface
* is a bit hacky. Especially the fiddling in the internals of the listbox is
* ugly. There needs to be a clean interface to set whether a widget has a
* markup and what kind of markup. These fixes will be post 1.6.
*/
void twml_message_::pre_show(CVideo& video, twindow& window) void twml_message_::pre_show(CVideo& video, twindow& window)
{ {
// Inherited. // Inherited.
@ -57,6 +63,17 @@ void twml_message_::pre_show(CVideo& video, twindow& window)
window.canvas(1).set_variable("portrait_image", variant(portrait_)); window.canvas(1).set_variable("portrait_image", variant(portrait_));
window.canvas(1).set_variable("portrait_mirror", variant(mirror_)); window.canvas(1).set_variable("portrait_mirror", variant(mirror_));
// Set the markup
tlabel* title =
dynamic_cast<tlabel*>(window.find_widget("title", false));
assert(title);
title->set_markup_mode(tcontrol::WML_MARKUP);
tcontrol* label =
dynamic_cast<tcontrol*>(window.find_widget("label", false));
assert(label);
label->set_markup_mode(tcontrol::WML_MARKUP);
// Find the input box related fields. // Find the input box related fields.
tlabel* caption = dynamic_cast<tlabel*>( tlabel* caption = dynamic_cast<tlabel*>(
window.find_widget("input_caption", false)); window.find_widget("input_caption", false));
@ -68,6 +85,7 @@ void twml_message_::pre_show(CVideo& video, twindow& window)
if(has_input()) { if(has_input()) {
caption->set_label(input_caption_); caption->set_label(input_caption_);
caption->set_markup_mode(tcontrol::WML_MARKUP);
input->set_value(*input_text_); input->set_value(*input_text_);
input->set_maximum_length(input_maximum_lenght_); input->set_maximum_length(input_maximum_lenght_);
window.keyboard_capture(input); window.keyboard_capture(input);
@ -137,6 +155,20 @@ void twml_message_::pre_show(CVideo& video, twindow& window)
data["label"]["label"] = label; data["label"]["label"] = label;
data["description"]["label"] = description; data["description"]["label"] = description;
options->add_row(data); options->add_row(data);
// Set the markup flag.
assert(options->generator_);
tgrid& grid = options->generator_->get_item(i);
tcontrol* control = dynamic_cast<tcontrol*>(
grid.find_widget("label", false));
assert(control);
control->set_markup_mode(tcontrol::WML_MARKUP);
control = dynamic_cast<tcontrol*>(
grid.find_widget("description", false));
assert(control);
control->set_markup_mode(tcontrol::WML_MARKUP);
} }
// Avoid negetive and 0 since item 0 is already selected. // Avoid negetive and 0 since item 0 is already selected.

2
src/gui/widgets/listbox.hpp
View File

@ -28,6 +28,8 @@ class tlistbox
friend struct tbuilder_listbox; friend struct tbuilder_listbox;
friend class tdebug_layout_graph; friend class tdebug_layout_graph;
/** @todo Remove this item, part of the markup hack. */
friend class twml_message_;
public: public:
/** /**
* Constructor. * Constructor.