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

GUI2: renamed text size macros

Browse source 
[ci skip]
This commit is contained in:
Charles Dang 2016-12-17 00:39:24 +11:00
parent 0fc5ab92a3
commit 320e85d907
18 changed files with 30 additions and 30 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
data/gui/macros/_initial.cfg
View file

@ -327,26 +327,26 @@
window_height = 0
#enddef
#define GUI_NORMAL__FONT_SIZE__TINY
#define GUI_FONT_SIZE_TINY
13
#enddef
#define GUI_NORMAL__FONT_SIZE__SMALL
#define GUI_FONT_SIZE_SMALL
15
#enddef
#define GUI_NORMAL__FONT_SIZE__DEFAULT
#define GUI_FONT_SIZE_DEFAULT
17
#enddef
#define GUI_NORMAL__FONT_SIZE__LARGE
#define GUI_FONT_SIZE_LARGE
20
#enddef
#define GUI_NORMAL__FONT_SIZE__TITLE
#define GUI_FONT_SIZE_TITLE
22
#enddef
#define GUI_NORMAL__FONT_SIZE__HUGE
#define GUI_FONT_SIZE_HUGE
36
#enddef

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

@ -179,7 +179,7 @@
id = "really_large"
description = "Large button"
{_GUI_RESOLUTION () 40 172 40 13 4 ({GUI_NORMAL__FONT_SIZE__LARGE}) () 255}
{_GUI_RESOLUTION () 40 172 40 13 4 ({GUI_FONT_SIZE_LARGE}) () 255}
[/button_definition]

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

@ -88,7 +88,7 @@
{_GUI_RESOLUTION
({GUI_NORMAL__RESOLUTION})
({FONT_FAMILY})
({GUI_NORMAL__FONT_SIZE__{FONT_SIZE}})
({GUI_FONT_SIZE_{FONT_SIZE}})
({FONT_STYLE})
({GUI__FONT_COLOR_ENABLED__{FONT_COLOR}})
({GUI__FONT_COLOR_DISABLED__{FONT_COLOR}})

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

@ -75,7 +75,7 @@
{_GUI_RESOLUTION
({GUI_NORMAL__RESOLUTION})
({GUI_NORMAL__FONT_SIZE__DEFAULT})
({GUI_FONT_SIZE_DEFAULT})
()
({GUI__FONT_COLOR_ENABLED__DEFAULT})
({GUI__FONT_COLOR_DISABLED__DEFAULT})

6
data/gui/widget/listbox_default.cfg
View file

@ -154,7 +154,7 @@
{_GUI_RESOLUTION
({GUI_NORMAL__RESOLUTION})
({GUI_NORMAL__FONT_SIZE__DEFAULT})
({GUI_FONT_SIZE_DEFAULT})
()
({GUI__FONT_COLOR_ENABLED__DEFAULT})
({GUI__FONT_COLOR_DISABLED__DEFAULT})
@ -168,7 +168,7 @@
{_GUI_RESOLUTION
({GUI_NORMAL__RESOLUTION})
({GUI_NORMAL__FONT_SIZE__DEFAULT})
({GUI_FONT_SIZE_DEFAULT})
()
({GUI__FONT_COLOR_ENABLED__DEFAULT})
({GUI__FONT_COLOR_DISABLED__DEFAULT})
@ -182,7 +182,7 @@
{_GUI_RESOLUTION
({GUI_NORMAL__RESOLUTION})
({GUI_NORMAL__FONT_SIZE__DEFAULT})
({GUI_FONT_SIZE_DEFAULT})
()
({GUI__FONT_COLOR_ENABLED__DEFAULT})
({GUI__FONT_COLOR_DISABLED__DEFAULT})

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

@ -132,7 +132,7 @@
{_GUI_RESOLUTION
({GUI_NORMAL__RESOLUTION})
({GUI_NORMAL__FONT_SIZE__DEFAULT})
({GUI_FONT_SIZE_DEFAULT})
()
({GUI__FONT_COLOR_ENABLED__DEFAULT})
({GUI__FONT_COLOR_DISABLED__DEFAULT})

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

@ -219,7 +219,7 @@
{_GUI_RESOLUTION
({GUI_NORMAL__RESOLUTION})
({GUI_NORMAL__FONT_SIZE__DEFAULT})
({GUI_FONT_SIZE_DEFAULT})
()
({GUI__FONT_COLOR_ENABLED__DEFAULT})
({GUI__FONT_COLOR_DISABLED__DEFAULT})

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

@ -135,7 +135,7 @@
id = "default"
description = "Default button"
{_GUI_RESOLUTION () 40 180 30 13 4 ({GUI_NORMAL__FONT_SIZE__SMALL}) "button_dropdown/button_dropdown" ()}
{_GUI_RESOLUTION () 40 180 30 13 4 ({GUI_FONT_SIZE_SMALL}) "button_dropdown/button_dropdown" ()}
[/menu_button_definition]

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

@ -104,7 +104,7 @@
{_GUI_RESOLUTION
({GUI_NORMAL__RESOLUTION})
({DEFINITION})
({GUI_NORMAL__FONT_SIZE__DEFAULT})
({GUI_FONT_SIZE_DEFAULT})
()
({GUI__FONT_COLOR_ENABLED__DEFAULT})
({GUI__FONT_COLOR_DISABLED__DEFAULT})

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

@ -111,7 +111,7 @@
{_GUI_RESOLUTION
({GUI_NORMAL__RESOLUTION})
({GUI_NORMAL__FONT_SIZE__DEFAULT})
({GUI_FONT_SIZE_DEFAULT})
("default")
()
({GUI__FONT_COLOR_ENABLED__DEFAULT})
@ -126,7 +126,7 @@
{_GUI_RESOLUTION
({GUI_NORMAL__RESOLUTION})
({GUI_NORMAL__FONT_SIZE__SMALL})
({GUI_FONT_SIZE_SMALL})
("default_small")
()
({GUI__FONT_COLOR_ENABLED__DEFAULT})

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

@ -112,7 +112,7 @@
{_GUI_RESOLUTION
({GUI_NORMAL__RESOLUTION})
({GUI_NORMAL__FONT_SIZE__DEFAULT})
({GUI_FONT_SIZE_DEFAULT})
()
({GUI__FONT_COLOR_ENABLED__DEFAULT})
({GUI__FONT_COLOR_DISABLED__DEFAULT})

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

@ -102,7 +102,7 @@
{_GUI_RESOLUTION
({GUI_NORMAL__RESOLUTION})
({GUI_NORMAL__FONT_SIZE__DEFAULT})
({GUI_FONT_SIZE_DEFAULT})
()
({GUI__FONT_COLOR_ENABLED__DEFAULT})
({GUI__FONT_COLOR_DISABLED__DEFAULT})

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

@ -132,7 +132,7 @@
id = "default"
description = "A slider with it's value on the right hand side."
{_GUI_RESOLUTION () 150 250 22 16 50 ({GUI_NORMAL__FONT_SIZE__DEFAULT}) }
{_GUI_RESOLUTION () 150 250 22 16 50 ({GUI_FONT_SIZE_DEFAULT}) }
[/slider_definition]
@ -140,7 +140,7 @@
id = "short"
description = "A slider with it's value on the right hand side."
{_GUI_RESOLUTION () 50 150 22 16 50 ({GUI_NORMAL__FONT_SIZE__SMALL}) }
{_GUI_RESOLUTION () 50 150 22 16 50 ({GUI_FONT_SIZE_SMALL}) }
[/slider_definition]

8
data/gui/widget/text_box_default.cfg
View file

@ -143,7 +143,7 @@
id = "default"
description = "Default text box"
{_GUI_RESOLUTION () 40 250 25 5 10 ({GUI_NORMAL__FONT_SIZE__DEFAULT}) ({_GUI_TEXTBOX_BACKGROUND_ENABLED}) ({_GUI_TEXTBOX_BACKGROUND_DISABLED})}
{_GUI_RESOLUTION () 40 250 25 5 10 ({GUI_FONT_SIZE_DEFAULT}) ({_GUI_TEXTBOX_BACKGROUND_ENABLED}) ({_GUI_TEXTBOX_BACKGROUND_DISABLED})}
[/text_box_definition]
@ -151,7 +151,7 @@
id = "transparent"
description = "Background-less text box, used for WML messages"
{_GUI_RESOLUTION () 40 250 25 5 10 ({GUI_NORMAL__FONT_SIZE__DEFAULT}) () ()}
{_GUI_RESOLUTION () 40 250 25 5 10 ({GUI_FONT_SIZE_DEFAULT}) () ()}
[/text_box_definition]
@ -168,7 +168,7 @@
w = "(text_width)"
h = "(text_height)"
maximum_width = "(text_maximum_width)"
font_size = {GUI_NORMAL__FONT_SIZE__SMALL}
font_size = {GUI_FONT_SIZE_SMALL}
color = {GUI__FONT_COLOR_DISABLED__DEFAULT}
text = "(if(text = '', 'Search', ''))"
[/text]
@ -249,7 +249,7 @@
id = "filter"
description = "Filter text box"
{_GUI_RESOLUTION_FILTER () 40 250 25 5 10 ({GUI_NORMAL__FONT_SIZE__DEFAULT}) ({_GUI_TEXTBOX_BACKGROUND_ENABLED}) ({_GUI_TEXTBOX_BACKGROUND_DISABLED})}
{_GUI_RESOLUTION_FILTER () 40 250 25 5 10 ({GUI_FONT_SIZE_DEFAULT}) ({_GUI_TEXTBOX_BACKGROUND_ENABLED}) ({_GUI_TEXTBOX_BACKGROUND_DISABLED})}
[/text_box_definition]

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

@ -133,7 +133,7 @@
id = "default"
description = "Checkbox."
{_GUI_RESOLUTION () 30 18 25 ({GUI_NORMAL__FONT_SIZE__SMALL}) }
{_GUI_RESOLUTION () 30 18 25 ({GUI_FONT_SIZE_SMALL}) }
[/toggle_button_definition]

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

@ -216,7 +216,7 @@
id = "listbox_header"
description = "Checkbox."
{_GUI_RESOLUTION () 30 20 ({GUI_NORMAL__FONT_SIZE__SMALL}) }
{_GUI_RESOLUTION () 30 20 ({GUI_FONT_SIZE_SMALL}) }
[/toggle_button_definition]

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

@ -132,7 +132,7 @@
id = "radio"
description = "Radio button."
{_GUI_RESOLUTION () 30 18 25 ({GUI_NORMAL__FONT_SIZE__SMALL}) }
{_GUI_RESOLUTION () 30 18 25 ({GUI_FONT_SIZE_SMALL}) }
[/toggle_button_definition]

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

@ -88,7 +88,7 @@
{_GUI_RESOLUTION
({GUI_NORMAL__RESOLUTION})
({GUI_NORMAL__FONT_SIZE__DEFAULT})
({GUI_FONT_SIZE_DEFAULT})
()
({GUI__FONT_COLOR_ENABLED__DEFAULT})
({GUI__FONT_COLOR_DISABLED__DEFAULT})