From 369cabc9ae4396f4bbf1d5e79efda55cdf19fd88 Mon Sep 17 00:00:00 2001 From: Charles Dang Date: Fri, 19 Aug 2016 17:45:17 +1100 Subject: [PATCH] Use standard label definitions for scroll labels 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. --- data/gui/widget/label_default.cfg | 4 +--- data/gui/widget/scroll_label_default.cfg | 4 ++-- data/gui/widget/scroll_label_description.cfg | 4 ++-- data/gui/widget/scroll_label_verbatim.cfg | 2 +- 4 files changed, 6 insertions(+), 8 deletions(-) diff --git a/data/gui/widget/label_default.cfg b/data/gui/widget/label_default.cfg index dae047d9c1c..02274e50615 100644 --- a/data/gui/widget/label_default.cfg +++ b/data/gui/widget/label_default.cfg @@ -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 diff --git a/data/gui/widget/scroll_label_default.cfg b/data/gui/widget/scroll_label_default.cfg index 43e057d898e..efdaca0dde2 100644 --- a/data/gui/widget/scroll_label_default.cfg +++ b/data/gui/widget/scroll_label_default.cfg @@ -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 diff --git a/data/gui/widget/scroll_label_description.cfg b/data/gui/widget/scroll_label_description.cfg index 312894ec6ec..410587f7e3e 100644 --- a/data/gui/widget/scroll_label_description.cfg +++ b/data/gui/widget/scroll_label_description.cfg @@ -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}) diff --git a/data/gui/widget/scroll_label_verbatim.cfg b/data/gui/widget/scroll_label_verbatim.cfg index d4d0121a534..c16923aeeb8 100644 --- a/data/gui/widget/scroll_label_verbatim.cfg +++ b/data/gui/widget/scroll_label_verbatim.cfg @@ -65,7 +65,7 @@ [label] id = "_label" - definition = "scroll_label_mono" + definition = "monospace" [/label] [/column]