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

Use standard label definitions for scroll labels

Browse source 
These were simply copies of their respective label definitions, so this reduces the WML slightly.
This also renames the 'scroll_label_mono' definition, since there's no reason a label couldn't use it,
and this makes that clearer.
This commit is contained in:
Charles Dang 2016-08-19 17:45:17 +11:00
parent 8aa82bd4c3
commit 369cabc9ae
4 changed files with 6 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
data/gui/widget/label_default.cfg
View file

@ -99,15 +99,13 @@
{_GUI_DEFINITION "default" "default label" () DEFAULT () DEFAULT }
{_GUI_DEFINITION "default_bold" "default label, bold font" () DEFAULT "bold" DEFAULT }
{_GUI_DEFINITION "scroll_label" "scroll label" () DEFAULT () DEFAULT }
{_GUI_DEFINITION "title" "label used for titles" () TITLE () TITLE }
{_GUI_DEFINITION "default_large" "default, large font size" () LARGE () DEFAULT }
{_GUI_DEFINITION "default_small" "default, small font size" () SMALL () DEFAULT }
{_GUI_DEFINITION "default_tiny" "default, small font size" () TINY () DEFAULT }
{_GUI_DEFINITION "gold_small" "small gold label" () SMALL () TITLE }
{_GUI_DEFINITION "scroll_label_mono" "fixed width scroll label" monospace DEFAULT () DEFAULT }
{_GUI_DEFINITION "scroll_label_small" "scroll label, small font size" () SMALL () DEFAULT }
{_GUI_DEFINITION "monospace" "fixed width scroll label" monospace DEFAULT () DEFAULT }
#undef _GUI_DEFINITION
#undef _GUI_RESOLUTION

4
data/gui/widget/scroll_label_default.cfg
View file

@ -113,8 +113,8 @@
[/scroll_label_definition]
#enddef
{_GUI_DEFINITION "default" "The default scroll label." "scroll_label"}
{_GUI_DEFINITION "default_small" "Small font size scroll label" "scroll_label_small"}
{_GUI_DEFINITION "default" "The default scroll label." "default"}
{_GUI_DEFINITION "default_small" "Small font size scroll label" "default_small"}
#undef _GUI_DEFINITION
#undef _GUI_RESOLUTION

4
data/gui/widget/scroll_label_description.cfg
View file

@ -112,7 +112,7 @@
{_GUI_RESOLUTION
({GUI_NORMAL__RESOLUTION})
({GUI_NORMAL__FONT_SIZE__DEFAULT})
("scroll_label")
("default")
()
({GUI__FONT_COLOR_ENABLED__DEFAULT})
({GUI__FONT_COLOR_DISABLED__DEFAULT})
@ -127,7 +127,7 @@
{_GUI_RESOLUTION
({GUI_NORMAL__RESOLUTION})
({GUI_NORMAL__FONT_SIZE__SMALL})
("scroll_label_small")
("default_small")
()
({GUI__FONT_COLOR_ENABLED__DEFAULT})
({GUI__FONT_COLOR_DISABLED__DEFAULT})

2
data/gui/widget/scroll_label_verbatim.cfg
View file

@ -65,7 +65,7 @@
[label]
id = "_label"
definition = "scroll_label_mono"
definition = "monospace"
[/label]
[/column]