upstream/wesnoth
1
0
Fork 0
mirror of https://github.com/wesnoth/wesnoth synced 2025-05-04 22:43:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Made the id for a tooltip and helptip mandatory.

Browse Source 
The change was already planned for 1.9.7.
This commit is contained in:
Mark de Wever 2012-05-19 08:46:12 +00:00
parent 8814152e92
commit b734f7bf0e
2 changed files with 3 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
changelog
View File

@ -165,6 +165,7 @@ Version 1.11.0-svn:
* Added: A character limit width constrain for a text
* Stop showing a unit's potential moves before moving in a move & attack,
rather than after (more consistent with regular movement)
* Changed: Made the id for a tooltip and helptip mandatory.
* Whiteboard:
* Fixed bug #19626: segfaults on window resize
* Fixed bug #19369: Using planning mode can cause losing ability to move my units

12
src/gui/auxiliary/window_builder.cpp
View File

@ -272,8 +272,8 @@ twindow_builder::tresolution::tresolution(const config& cfg) :
click_dismiss(cfg["click_dismiss"].to_bool()),
definition(cfg["definition"]),
linked_groups(),
tooltip(cfg.child_or_empty("tooltip")), /** @todo will be mandatory soon. */
helptip(cfg.child_or_empty("helptip")), /** @todo will be mandatory soon. */
tooltip(cfg.child_or_empty("tooltip")),
helptip(cfg.child_or_empty("helptip")),
grid(0)
{
/*WIKI
@ -423,14 +423,6 @@ twindow_builder::tresolution::tresolution(const config& cfg) :
twindow_builder::tresolution::ttip::ttip(const config& cfg)
: id(cfg["id"])
{
/** @todo Remove for 1.9.7. */
if(id.empty()) {
lg::wml_error << "Window builder: parsing resolution tip with empty "
<< "'id' field. Will become mandatory in 1.9.7.\n";
id = "tooltip_large";
return;
}
VALIDATE(!id.empty()
, missing_mandatory_wml_key("[window][resolution][tip]", "id"));
}