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

gui2/twml_error: Display the pp/parser output in a monospace font

Browse source
This commit is contained in:
Ignacio R. Morelle 2015-05-30 20:18:16 -03:00
parent 20602f12b9
commit 34e79d3e33
3 changed files with 154 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
data/gui/default/widget/label_default.cfg
View file

@ -6,7 +6,7 @@
### - default, the one for general usage.
### - title, for titles in dialogs.
#define _GUI_RESOLUTION RESOLUTION FONT_SIZE FONT_STYLE FONT_COLOR_ENABLED FONT_COLOR_DISABLED Y_POSITION
#define _GUI_RESOLUTION RESOLUTION FONT_FAMILY FONT_SIZE FONT_STYLE FONT_COLOR_ENABLED FONT_COLOR_DISABLED Y_POSITION
[resolution]
{RESOLUTION}
@ -20,6 +20,7 @@
max_width = 0
max_height = 0
text_font_family = {FONT_FAMILY}
text_font_size = {FONT_SIZE}
text_font_style = {FONT_STYLE}
@ -36,6 +37,7 @@
w = "(width)"
h = "(text_height)"
maximum_width = "(width)"
font_family = {FONT_FAMILY}
font_size = {FONT_SIZE}
font_style = {FONT_STYLE}
color = {FONT_COLOR_ENABLED}
@ -59,6 +61,7 @@
w = "(width)"
h = "(text_height)"
maximum_width = "(width)"
font_family = {FONT_FAMILY}
font_size = {FONT_SIZE}
font_style = {FONT_STYLE}
color = {FONT_COLOR_DISABLED}
@ -75,13 +78,14 @@
[/resolution]
#enddef
#define _GUI_DEFINITION ID DESCRIPTION FONT_SIZE FONT_STYLE FONT_COLOR Y_POSITION
#define _GUI_DEFINITION ID DESCRIPTION FONT_FAMILY FONT_SIZE FONT_STYLE FONT_COLOR Y_POSITION
[label_definition]
id = {ID}
description = {DESCRIPTION}
{_GUI_RESOLUTION
({GUI_TINY__RESOLUTION})
({FONT_FAMILY})
({GUI_TINY__FONT_SIZE__{FONT_SIZE}})
({FONT_STYLE})
({GUI__FONT_COLOR_ENABLED__{FONT_COLOR}})
@ -92,6 +96,7 @@
{_GUI_RESOLUTION
({GUI_NORMAL__RESOLUTION})
({FONT_FAMILY})
({GUI_NORMAL__FONT_SIZE__{FONT_SIZE}})
({FONT_STYLE})
({GUI__FONT_COLOR_ENABLED__{FONT_COLOR}})
@ -102,14 +107,16 @@
[/label_definition]
#enddef
{_GUI_DEFINITION "default" "default label" DEFAULT () DEFAULT ({GUI__TEXT_VERTICALLY_CENTRED})}
{_GUI_DEFINITION "default_bold" "default label, bold font" DEFAULT "bold" DEFAULT ({GUI__TEXT_VERTICALLY_CENTRED})}
{_GUI_DEFINITION "scroll_label" "scroll label" DEFAULT () DEFAULT 0}
{_GUI_DEFINITION "title" "label used for titles" TITLE "bold" TITLE ({GUI__TEXT_VERTICALLY_CENTRED})}
{_GUI_DEFINITION "default_large" "default, large font size" LARGE () DEFAULT ({GUI__TEXT_VERTICALLY_CENTRED})}
{_GUI_DEFINITION "default_small" "default, small font size" SMALL () DEFAULT ({GUI__TEXT_VERTICALLY_CENTRED})}
{_GUI_DEFINITION "default_tiny" "default, small font size" TINY () DEFAULT ({GUI__TEXT_VERTICALLY_CENTRED})}
{_GUI_DEFINITION "gold_small" "small gold label" SMALL () TITLE ({GUI__TEXT_VERTICALLY_CENTRED})}
{_GUI_DEFINITION "default" "default label" () DEFAULT () DEFAULT ({GUI__TEXT_VERTICALLY_CENTRED})}
{_GUI_DEFINITION "default_bold" "default label, bold font" () DEFAULT "bold" DEFAULT ({GUI__TEXT_VERTICALLY_CENTRED})}
{_GUI_DEFINITION "scroll_label" "scroll label" () DEFAULT () DEFAULT 0}
{_GUI_DEFINITION "title" "label used for titles" () TITLE "bold" TITLE ({GUI__TEXT_VERTICALLY_CENTRED})}
{_GUI_DEFINITION "default_large" "default, large font size" () LARGE () DEFAULT ({GUI__TEXT_VERTICALLY_CENTRED})}
{_GUI_DEFINITION "default_small" "default, small font size" () SMALL () DEFAULT ({GUI__TEXT_VERTICALLY_CENTRED})}
{_GUI_DEFINITION "default_tiny" "default, small font size" () TINY () DEFAULT ({GUI__TEXT_VERTICALLY_CENTRED})}
{_GUI_DEFINITION "gold_small" "small gold label" () SMALL () TITLE ({GUI__TEXT_VERTICALLY_CENTRED})}
{_GUI_DEFINITION "scroll_label_mono" "fixed width scroll label" monospace DEFAULT () DEFAULT 0}
#undef _GUI_DEFINITION
#undef _GUI_RESOLUTION

136
data/gui/default/widget/scroll_label_verbatim.cfg Normal file
View file

@ -0,0 +1,136 @@
#textdomain wesnoth-lib
#define _GUI_BASE_NAME
"translucent54" #enddef
#define _GUI_RESOLUTION RESOLUTION FONT_SIZE FONT_STYLE FONT_COLOR_ENABLED FONT_COLOR_DISABLED
[resolution]
{RESOLUTION}
min_width = 0
min_height = 0
default_width = 0
default_height = 0
max_width = 0
max_height = 0
text_font_size = {FONT_SIZE}
text_font_style = {FONT_STYLE}
text_font_family = monospace
[state_enabled]
[draw]
[image]
x = 0
y = 0
w = "(width)"
h = "(height)"
name = "dialogs/" + {_GUI_BASE_NAME} + "-background.png"
[/image]
[/draw]
[/state_enabled]
[state_disabled]
[draw]
[/draw]
[/state_disabled]
[grid]
[row]
grow_factor = 1
[column]
grow_factor = 1
horizontal_grow = "true" # needed ?
vertical_grow = "true" # needed ?
[grid]
id = "_content_grid"
[row]
[column]
horizontal_grow = "true"
vertical_grow = "true"
border = "all"
border_size = 5
[label]
id = "_label"
definition = "scroll_label_mono"
[/label]
[/column]
[/row]
[/grid]
[/column]
[column]
{GUI__VERTICAL_SCROLLBAR_GRID}
[/column]
[/row]
[row]
[column]
{GUI__HORIZONTAL_SCROLLBAR_GRID}
[/column]
[column]
[spacer]
[/spacer]
[/column]
[/row]
[/grid]
[/resolution]
#enddef
[scroll_label_definition]
id = "verbatim"
description = "A scroll label type used for verbatim text using a fixed-width font."
{_GUI_RESOLUTION
({GUI_TINY__RESOLUTION})
({GUI_TINY__FONT_SIZE__DEFAULT})
()
({GUI__FONT_COLOR_ENABLED__DEFAULT})
({GUI__FONT_COLOR_DISABLED__DEFAULT})
}
{_GUI_RESOLUTION
({GUI_NORMAL__RESOLUTION})
({GUI_NORMAL__FONT_SIZE__DEFAULT})
()
({GUI__FONT_COLOR_ENABLED__DEFAULT})
({GUI__FONT_COLOR_DISABLED__DEFAULT})
}
[/scroll_label_definition]
#undef _GUI_RESOLUTION
#undef _GUI_BASE_NAME

2
data/gui/default/window/wml_error.cfg
View file

@ -143,7 +143,7 @@
[scroll_label]
id = "details"
definition = "description"
definition = "verbatim"
[/scroll_label]
[/column]