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

Strip trailing spaces

Browse source
This commit is contained in:
Mark de Wever 2010-07-31 07:11:31 +00:00
parent 72bbd5e443
commit 6c1a5b7a2f
52 changed files with 325 additions and 325 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
data/gui/default.cfg
View file

@ -11,7 +11,7 @@
popup_show_delay = 200
popup_show_time = 5000
help_show_time = 0
double_click_time = 500
repeat_button_repeat_time = 350

24
data/gui/default/macros/_initial.cfg
View file

@ -19,7 +19,7 @@
###############################################################################
# Centers the text horizontally.
#
#
# If the text is too wide it returns the left side.
# Rounding happens to the left side.
#define GUI__TEXT_HORIZONTALLY_CENTRED
@ -27,7 +27,7 @@
#enddef
# Centers the text vertically.
#
#
# If the text is too high it returns the top side.
# Rounding happens to the bottom side.
#define GUI__TEXT_VERTICALLY_CENTRED
@ -45,7 +45,7 @@
colour = {FONT_COLOUR}
text = "(text)"
[/text]
#enddef
#enddef
# This white colour is used for most texts.
#define GUI__FONT_COLOUR_ENABLED__DEFAULT
@ -57,7 +57,7 @@
"128, 128, 128, 255"
#enddef
# This gold colour is used for the
# This gold colour is used for the
# - title labels
# - button captions
# - checkbox captions
@ -83,23 +83,23 @@
# Draws the background for a selected cell in a listbox. For now there's one
# version for both tiny and normal gui.
#define GUI__LISTBOX_SELECTED_CELL
# corners are 10x10
[image]
x = 0
y = 0
y = 0
name = "misc/selection2-border-topleft.png"
[/image]
[image]
x = "(width - 10)"
y = 0
y = 0
name = "misc/selection2-border-topright.png"
[/image]
[image]
x = 0
y = "(height - 10)"
y = "(height - 10)"
name = "misc/selection2-border-botleft.png"
[/image]
@ -113,7 +113,7 @@
# the height of the lines is 3 pixels.
[image]
x = 10
y = 0
y = 0
w = "(width - 20)"
name = "misc/selection2-border-top.png"
[/image]
@ -127,14 +127,14 @@
[image]
x = 0
y = 10
y = 10
h= "(height - 20)"
name = "misc/selection2-border-left.png"
[/image]
[image]
x = "(width - 3)"
y = 10
y = 10
h = "(height - 20)"
name = "misc/selection2-border-right.png"
[/image]
@ -159,7 +159,7 @@
#
# eg instead of
# [label]
# # Note Foo has trailing spaces to force extra width.
# # Note Foo has trailing spaces to force extra width.
# label = "
# Foo
# "

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

@ -122,4 +122,4 @@
[/button_definition]
#undef _GUI_RESOLUTION
#undef _GUI_RESOLUTION

2
data/gui/default/widget/horizontal_scrollbar_default.cfg
View file

@ -95,7 +95,7 @@ if(positioner_length - {POSITIONER_LEFT} - {POSITIONER_RIGHT} < 0
[state_pressed]
{_GUI_STATE ({GROOVE_LEFT}) ({GROOVE_RIGHT}) ({POSITIONER_LEFT}) ({POSITIONER_RIGHT}) "-pressed.png" ({IMAGE_MIDDLE}) }
[/state_pressed]
[state_focussed]
{_GUI_STATE ({GROOVE_LEFT}) ({GROOVE_RIGHT}) ({POSITIONER_LEFT}) ({POSITIONER_RIGHT}) "-active.png" ({IMAGE_MIDDLE}) }
[/state_focussed]

2
data/gui/default/widget/image_default.cfg
View file

@ -25,7 +25,7 @@
[image]
name = "(text)"
[/image]
[/draw]
[/state_enabled]

24
data/gui/default/widget/label_alignment.cfg
View file

@ -1,7 +1,7 @@
#textdomain wesnoth-lib
###
### Definition of a label.
###
###
### Defines the following labels
### - alignment, the one for general usage, which lets pango handle the alignment
@ -41,7 +41,7 @@
[/text]
[/draw]
[/state_enabled]
[state_disabled]
@ -63,7 +63,7 @@
[/text]
[/draw]
[/state_disabled]
[/resolution]
@ -74,7 +74,7 @@
id = {ID}
description = {DESCRIPTION}
{_GUI_RESOLUTION
{_GUI_RESOLUTION
({GUI_TINY__RESOLUTION})
({GUI_TINY__FONT_SIZE__{FONT_SIZE}})
({FONT_STYLE})
@ -83,13 +83,13 @@
({Y_POSITION})
}
{_GUI_RESOLUTION
({GUI_NORMAL__RESOLUTION})
({GUI_NORMAL__FONT_SIZE__{FONT_SIZE}})
({FONT_STYLE})
({GUI__FONT_COLOUR_ENABLED__{FONT_COLOUR}})
({GUI__FONT_COLOUR_DISABLED__{FONT_COLOUR}})
{_GUI_RESOLUTION
({GUI_NORMAL__RESOLUTION})
({GUI_NORMAL__FONT_SIZE__{FONT_SIZE}})
({FONT_STYLE})
({GUI__FONT_COLOUR_ENABLED__{FONT_COLOUR}})
({GUI__FONT_COLOUR_DISABLED__{FONT_COLOUR}})
({Y_POSITION})
}
@ -104,4 +104,4 @@
#{_GUI_DEFINITION "default_tiny" "default, small font size" TINY () DEFAULT ({GUI__TEXT_VERTICALLY_CENTRED})}
#undef _GUI_DEFINITION
#undef _GUI_RESOLUTION
#undef _GUI_RESOLUTION

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

@ -1,7 +1,7 @@
#textdomain wesnoth-lib
###
### Definition of a label.
###
###
### Defines the following labels
### - default, the one for general usage.
### - title, for titles in dialogs.
@ -41,7 +41,7 @@
[/text]
[/draw]
[/state_enabled]
[state_disabled]
@ -62,7 +62,7 @@
[/text]
[/draw]
[/state_disabled]
[/resolution]
@ -73,7 +73,7 @@
id = {ID}
description = {DESCRIPTION}
{_GUI_RESOLUTION
{_GUI_RESOLUTION
({GUI_TINY__RESOLUTION})
({GUI_TINY__FONT_SIZE__{FONT_SIZE}})
({FONT_STYLE})
@ -82,13 +82,13 @@
({Y_POSITION})
}
{_GUI_RESOLUTION
({GUI_NORMAL__RESOLUTION})
({GUI_NORMAL__FONT_SIZE__{FONT_SIZE}})
({FONT_STYLE})
({GUI__FONT_COLOUR_ENABLED__{FONT_COLOUR}})
({GUI__FONT_COLOUR_DISABLED__{FONT_COLOUR}})
{_GUI_RESOLUTION
({GUI_NORMAL__RESOLUTION})
({GUI_NORMAL__FONT_SIZE__{FONT_SIZE}})
({FONT_STYLE})
({GUI__FONT_COLOUR_ENABLED__{FONT_COLOUR}})
({GUI__FONT_COLOUR_DISABLED__{FONT_COLOUR}})
({Y_POSITION})
}
@ -102,4 +102,4 @@
{_GUI_DEFINITION "default_tiny" "default, small font size" TINY () DEFAULT ({GUI__TEXT_VERTICALLY_CENTRED})}
#undef _GUI_DEFINITION
#undef _GUI_RESOLUTION
#undef _GUI_RESOLUTION

22
data/gui/default/widget/label_title_screen_revision.cfg
View file

@ -1,7 +1,7 @@
#textdomain wesnoth-lib
###
### Definition of a label.
###
###
### Defines the following revision label for the title screen.
#define _GUI_RESOLUTION RESOLUTION FONT_SIZE FONT_COLOUR_ENABLED FONT_COLOUR_DISABLED Y_POSITION
@ -47,7 +47,7 @@
[/text]
[/draw]
[/state_enabled]
[state_disabled]
@ -77,7 +77,7 @@
[/text]
[/draw]
[/state_disabled]
[/resolution]
@ -88,7 +88,7 @@
id = {ID}
description = {DESCRIPTION}
{_GUI_RESOLUTION
{_GUI_RESOLUTION
({GUI_TINY__RESOLUTION})
({GUI_TINY__FONT_SIZE__{FONT_SIZE}})
({GUI__FONT_COLOUR_ENABLED__{FONT_COLOUR}})
@ -96,12 +96,12 @@
({Y_POSITION})
}
{_GUI_RESOLUTION
({GUI_NORMAL__RESOLUTION})
({GUI_NORMAL__FONT_SIZE__{FONT_SIZE}})
({GUI__FONT_COLOUR_ENABLED__{FONT_COLOUR}})
({GUI__FONT_COLOUR_DISABLED__{FONT_COLOUR}})
{_GUI_RESOLUTION
({GUI_NORMAL__RESOLUTION})
({GUI_NORMAL__FONT_SIZE__{FONT_SIZE}})
({GUI__FONT_COLOUR_ENABLED__{FONT_COLOUR}})
({GUI__FONT_COLOUR_DISABLED__{FONT_COLOUR}})
({Y_POSITION})
}
@ -111,4 +111,4 @@
{_GUI_DEFINITION "title_creen_revision" "label used for the revision number in the title screen" SMALL DEFAULT ({GUI__TEXT_VERTICALLY_CENTRED})}
#undef _GUI_DEFINITION
#undef _GUI_RESOLUTION
#undef _GUI_RESOLUTION

36
data/gui/default/widget/listbox_default.cfg
View file

@ -28,7 +28,7 @@
[draw]
[/draw]
[/state_enabled]
[state_disabled]
@ -134,7 +134,7 @@
id = "default"
description = "Default listbox."
{_GUI_RESOLUTION
{_GUI_RESOLUTION
({GUI_TINY__RESOLUTION})
({GUI_TINY__FONT_SIZE__DEFAULT})
()
@ -142,13 +142,13 @@
({GUI__FONT_COLOUR_DISABLED__DEFAULT})
}
{_GUI_RESOLUTION
({GUI_NORMAL__RESOLUTION})
({GUI_NORMAL__FONT_SIZE__DEFAULT})
()
({GUI__FONT_COLOUR_ENABLED__DEFAULT})
({GUI__FONT_COLOUR_DISABLED__DEFAULT})
{_GUI_RESOLUTION
({GUI_NORMAL__RESOLUTION})
({GUI_NORMAL__FONT_SIZE__DEFAULT})
()
({GUI__FONT_COLOUR_ENABLED__DEFAULT})
({GUI__FONT_COLOUR_DISABLED__DEFAULT})
}
[/listbox_definition]
@ -157,7 +157,7 @@
id = "default"
description = "Default horizontal listbox."
{_GUI_RESOLUTION
{_GUI_RESOLUTION
({GUI_TINY__RESOLUTION})
({GUI_TINY__FONT_SIZE__DEFAULT})
()
@ -165,16 +165,16 @@
({GUI__FONT_COLOUR_DISABLED__DEFAULT})
}
{_GUI_RESOLUTION
({GUI_NORMAL__RESOLUTION})
({GUI_NORMAL__FONT_SIZE__DEFAULT})
()
({GUI__FONT_COLOUR_ENABLED__DEFAULT})
({GUI__FONT_COLOUR_DISABLED__DEFAULT})
{_GUI_RESOLUTION
({GUI_NORMAL__RESOLUTION})
({GUI_NORMAL__FONT_SIZE__DEFAULT})
()
({GUI__FONT_COLOUR_ENABLED__DEFAULT})
({GUI__FONT_COLOUR_DISABLED__DEFAULT})
}
[/horizontal_listbox_definition]
#undef _GUI_RESOLUTION
#undef _GUI_RESOLUTION

20
data/gui/default/widget/listbox_wml_message.cfg
View file

@ -24,7 +24,7 @@
[draw]
[/draw]
[/state_enabled]
[state_disabled]
@ -130,7 +130,7 @@
id = "wml_message"
description = "Listbox for wml_message."
{_GUI_RESOLUTION
{_GUI_RESOLUTION
({GUI_TINY__RESOLUTION})
({GUI_TINY__FONT_SIZE__DEFAULT})
()
@ -138,16 +138,16 @@
({GUI__FONT_COLOUR_DISABLED__DEFAULT})
}
{_GUI_RESOLUTION
({GUI_NORMAL__RESOLUTION})
({GUI_NORMAL__FONT_SIZE__DEFAULT})
()
({GUI__FONT_COLOUR_ENABLED__DEFAULT})
({GUI__FONT_COLOUR_DISABLED__DEFAULT})
{_GUI_RESOLUTION
({GUI_NORMAL__RESOLUTION})
({GUI_NORMAL__FONT_SIZE__DEFAULT})
()
({GUI__FONT_COLOUR_ENABLED__DEFAULT})
({GUI__FONT_COLOUR_DISABLED__DEFAULT})
}
[/listbox_definition]
#undef _GUI_RESOLUTION
#undef _GUI_RESOLUTION

2
data/gui/default/widget/minimap_default.cfg
View file

@ -46,4 +46,4 @@
[/minimap_definition]
#undef _GUI_RESOLUTION
#undef _GUI_RESOLUTION

2
data/gui/default/widget/multi_page_default.cfg
View file

@ -24,7 +24,7 @@
[column]
horizontal_grow = "true"
vertical_grow = "true"
vertical_grow = "true"
[grid]
id = "_content_grid"

22
data/gui/default/widget/scroll_label_default.cfg
View file

@ -1,7 +1,7 @@
#textdomain wesnoth-lib
###
### Definition of a scroll label.
###
###
#define _GUI_RESOLUTION RESOLUTION FONT_SIZE FONT_STYLE FONT_COLOUR_ENABLED FONT_COLOUR_DISABLED
[resolution]
@ -24,7 +24,7 @@
[draw]
[/draw]
[/state_enabled]
[state_disabled]
@ -100,7 +100,7 @@
id = "default"
description = "The default scroll label."
{_GUI_RESOLUTION
{_GUI_RESOLUTION
({GUI_TINY__RESOLUTION})
({GUI_TINY__FONT_SIZE__DEFAULT})
()
@ -108,16 +108,16 @@
({GUI__FONT_COLOUR_DISABLED__DEFAULT})
}
{_GUI_RESOLUTION
({GUI_NORMAL__RESOLUTION})
({GUI_NORMAL__FONT_SIZE__DEFAULT})
()
({GUI__FONT_COLOUR_ENABLED__DEFAULT})
({GUI__FONT_COLOUR_DISABLED__DEFAULT})
{_GUI_RESOLUTION
({GUI_NORMAL__RESOLUTION})
({GUI_NORMAL__FONT_SIZE__DEFAULT})
()
({GUI__FONT_COLOUR_ENABLED__DEFAULT})
({GUI__FONT_COLOUR_DISABLED__DEFAULT})
}
[/scroll_label_definition]
#undef _GUI_RESOLUTION
#undef _GUI_RESOLUTION

22
data/gui/default/widget/scroll_label_wml_message.cfg
View file

@ -1,7 +1,7 @@
#textdomain wesnoth-lib
###
### Definition of a scroll label for the wml_message.
###
###
#define _GUI_RESOLUTION RESOLUTION FONT_SIZE FONT_STYLE FONT_COLOUR_ENABLED FONT_COLOUR_DISABLED
[resolution]
@ -24,7 +24,7 @@
[draw]
[/draw]
[/state_enabled]
[state_disabled]
@ -100,7 +100,7 @@
id = "wml_message"
description = "The scroll label for the wml_message."
{_GUI_RESOLUTION
{_GUI_RESOLUTION
({GUI_TINY__RESOLUTION})
({GUI_TINY__FONT_SIZE__DEFAULT})
()
@ -108,16 +108,16 @@
({GUI__FONT_COLOUR_DISABLED__DEFAULT})
}
{_GUI_RESOLUTION
({GUI_NORMAL__RESOLUTION})
({GUI_NORMAL__FONT_SIZE__DEFAULT})
()
({GUI__FONT_COLOUR_ENABLED__DEFAULT})
({GUI__FONT_COLOUR_DISABLED__DEFAULT})
{_GUI_RESOLUTION
({GUI_NORMAL__RESOLUTION})
({GUI_NORMAL__FONT_SIZE__DEFAULT})
()
({GUI__FONT_COLOUR_ENABLED__DEFAULT})
({GUI__FONT_COLOUR_DISABLED__DEFAULT})
}
[/scroll_label_definition]
#undef _GUI_RESOLUTION
#undef _GUI_RESOLUTION

20
data/gui/default/widget/slider_default.cfg
View file

@ -48,7 +48,7 @@
[/draw]
#enddef
#define _GUI_RESOLUTION RESOLUTION MIN_WIDTH DEFAULT_WIDTH HEIGHT POSITIONER_LENGTH RIGHT_OFFSET TEXT_OFFSET TEXT_WIDTH FONT_SIZE
#define _GUI_RESOLUTION RESOLUTION MIN_WIDTH DEFAULT_WIDTH HEIGHT POSITIONER_LENGTH RIGHT_OFFSET TEXT_OFFSET TEXT_WIDTH FONT_SIZE
[resolution]
@ -72,7 +72,7 @@
text_font_size = {FONT_SIZE}
[state_enabled]
{_GUI_STATE
{_GUI_STATE
()
({GUI__FONT_COLOUR_ENABLED__DEFAULT})
({GUI__FONT_COLOUR_ENABLED__DEFAULT})
@ -84,8 +84,8 @@
[/state_enabled]
[state_disabled]
{_GUI_STATE
"-disabled"
{_GUI_STATE
"-disabled"
({GUI__FONT_COLOUR_DISABLED__DEFAULT})
({GUI__FONT_COLOUR_DISABLED__DEFAULT})
({RIGHT_OFFSET})
@ -96,8 +96,8 @@
[/state_disabled]
[state_pressed]
{_GUI_STATE
"-selected"
{_GUI_STATE
"-selected"
({GUI__FONT_COLOUR_ENABLED__DEFAULT})
({GUI__FONT_COLOUR_ENABLED__DEFAULT})
({RIGHT_OFFSET})
@ -106,10 +106,10 @@
({FONT_SIZE})
}
[/state_pressed]
[state_focussed]
{_GUI_STATE
"-active"
{_GUI_STATE
"-active"
({GUI__FONT_COLOUR_ENABLED__DEFAULT})
({GUI__FONT_COLOUR_ENABLED__DEFAULT})
({RIGHT_OFFSET})
@ -133,5 +133,5 @@
[/slider_definition]
#undef _GUI_STATE
#undef _GUI_RESOLUTION
#undef _GUI_RESOLUTION

2
data/gui/default/widget/stacked_widget_default.cfg
View file

@ -24,7 +24,7 @@
[column]
horizontal_grow = "true"
vertical_grow = "true"
vertical_grow = "true"
[grid]
id = "_content_grid"

6
data/gui/default/widget/text_box_default.cfg
View file

@ -62,7 +62,7 @@
[/line]
#enddef
#define _GUI_RESOLUTION RESOLUTION MIN_WIDTH DEFAULT_WIDTH HEIGHT X_OFFSET EXTRA_WIDTH FONT_SIZE
#define _GUI_RESOLUTION RESOLUTION MIN_WIDTH DEFAULT_WIDTH HEIGHT X_OFFSET EXTRA_WIDTH FONT_SIZE
[resolution]
{RESOLUTION}
@ -90,7 +90,7 @@
{_GUI_DRAW_TEXT ({FONT_SIZE}) ({GUI__FONT_COLOUR_ENABLED__DEFAULT}) }
[/draw]
[/state_enabled]
[state_disabled]
@ -102,7 +102,7 @@
{_GUI_DRAW_TEXT ({FONT_SIZE}) ({GUI__FONT_COLOUR_DISABLED__DEFAULT}) }
[/draw]
[/state_disabled]
[state_focussed]

4
data/gui/default/widget/toggle_button_default.cfg
View file

@ -16,7 +16,7 @@
[/text]
#enddef
#define _GUI_RESOLUTION RESOLUTION WIDTH HEIGHT EXTRA_WIDTH FONT_SIZE
#define _GUI_RESOLUTION RESOLUTION WIDTH HEIGHT EXTRA_WIDTH FONT_SIZE
[resolution]
{RESOLUTION}
@ -122,7 +122,7 @@
[/state_focussed_selected]
[/resolution]
#enddef
#enddef
[toggle_button_definition]

2
data/gui/default/widget/toggle_button_icon.cfg
View file

@ -106,7 +106,7 @@
description = "This toggle button is meant to be used in the resize grid of the editor and only has an icon."
{_GUI_RESOLUTION ({GUI_TINY__RESOLUTION}) 13 }
{_GUI_RESOLUTION ({GUI_NORMAL__RESOLUTION}) 27 }
{_GUI_RESOLUTION ({GUI_NORMAL__RESOLUTION}) 27 }
[/toggle_button_definition]

4
data/gui/default/widget/toggle_button_listbox_text.cfg
View file

@ -1,7 +1,7 @@
#textdomain wesnoth-lib
###
### Definition of the listbox text toggle button.
### It's meant as line of text in a listbox note this
### It's meant as line of text in a listbox note this
### version doesn't support icons.
###
@ -29,7 +29,7 @@
#enddef
#define _GUI_RESOLUTION RESOLUTION MIN_WIDTH DEFAULT_WIDTH HEIGHT EXTRA_WIDTH FONT_SIZE
#define _GUI_RESOLUTION RESOLUTION MIN_WIDTH DEFAULT_WIDTH HEIGHT EXTRA_WIDTH FONT_SIZE
[resolution]
{RESOLUTION}

2
data/gui/default/widget/toggle_button_listbox_text_with_icon.cfg
View file

@ -1,7 +1,7 @@
#textdomain wesnoth-lib
###
### Definition of the listbox text toggle button.
### It's meant as line of text in a listbox note this
### It's meant as line of text in a listbox note this
### version supports icons with size 72 x 72.
###

2
data/gui/default/widget/toggle_button_tree_view_node.cfg
View file

@ -10,7 +10,7 @@
[resolution]
{GUI_NORMAL__RESOLUTION}
{GUI_NORMAL__RESOLUTION}
min_width = 25
min_height = 19

14
data/gui/default/widget/toggle_panel_wml_message.cfg
View file

@ -4,23 +4,23 @@
###
#define _GUI__LISTBOX_SELECTED_CELL LINE_OFFSET_SIDE LINE_OFFSET_TOTAL LINE_HEIGHT BACKGROUND_OFFSET
# corners are 10x10
[image]
x = 0
y = 0
y = 0
name = "misc/selection2_transparent-border-topleft.png"
[/image]
[image]
x = "(width - {LINE_OFFSET_SIDE})"
y = 0
y = 0
name = "misc/selection2_transparent-border-topright.png"
[/image]
[image]
x = 0
y = "(height - {LINE_OFFSET_SIDE})"
y = "(height - {LINE_OFFSET_SIDE})"
name = "misc/selection2_transparent-border-botleft.png"
[/image]
@ -34,7 +34,7 @@
# the height of the lines is 3 pixels.
[image]
x = {LINE_OFFSET_SIDE}
y = 0
y = 0
w = "(if(width < {LINE_OFFSET_TOTAL}, 0, width - {LINE_OFFSET_TOTAL}))"
name = "misc/selection2_transparent-border-top.png"
[/image]
@ -48,14 +48,14 @@
[image]
x = 0
y = {LINE_OFFSET_SIDE}
y = {LINE_OFFSET_SIDE}
h = "(if(height < {LINE_OFFSET_TOTAL}, 0, height - {LINE_OFFSET_TOTAL}))"
name = "misc/selection2_transparent-border-left.png"
[/image]
[image]
x = "(width - {LINE_HEIGHT})"
y = {LINE_OFFSET_SIDE}
y = {LINE_OFFSET_SIDE}
h = "(if(height < {LINE_OFFSET_TOTAL}, 0, height - {LINE_OFFSET_TOTAL}))"
name = "misc/selection2_transparent-border-right.png"
[/image]

6
data/gui/default/widget/tooltip_default.cfg
View file

@ -22,7 +22,7 @@
[state_enabled]
[draw]
[rectangle]
x = 0
y = 0
@ -43,7 +43,7 @@
[/text]
[/draw]
[/state_enabled]
[/resolution]
@ -59,4 +59,4 @@
[/tooltip_definition]
#undef _GUI_RESOLUTION
#undef _GUI_RESOLUTION

20
data/gui/default/widget/tree_view_default.cfg
View file

@ -24,7 +24,7 @@
[draw]
[/draw]
[/state_enabled]
[state_disabled]
@ -86,7 +86,7 @@
id = "default"
description = "Default tree view."
{_GUI_RESOLUTION
{_GUI_RESOLUTION
({GUI_TINY__RESOLUTION})
({GUI_TINY__FONT_SIZE__DEFAULT})
()
@ -94,16 +94,16 @@
({GUI__FONT_COLOUR_DISABLED__DEFAULT})
}
{_GUI_RESOLUTION
({GUI_NORMAL__RESOLUTION})
({GUI_NORMAL__FONT_SIZE__DEFAULT})
()
({GUI__FONT_COLOUR_ENABLED__DEFAULT})
({GUI__FONT_COLOUR_DISABLED__DEFAULT})
{_GUI_RESOLUTION
({GUI_NORMAL__RESOLUTION})
({GUI_NORMAL__FONT_SIZE__DEFAULT})
()
({GUI__FONT_COLOUR_ENABLED__DEFAULT})
({GUI__FONT_COLOUR_DISABLED__DEFAULT})
}
[/tree_view_definition]
#undef _GUI_RESOLUTION
#undef _GUI_RESOLUTION

2
data/gui/default/widget/vertical_scrollbar_default.cfg
View file

@ -94,7 +94,7 @@ if(positioner_length - {POSITIONER_TOP} - {POSITIONER_BOTTOM} < 0
[state_pressed]
{_GUI_STATE ({GROOVE_TOP}) ({GROOVE_BOTTOM}) ({POSITIONER_TOP}) ({POSITIONER_BOTTOM}) "-pressed.png" ({IMAGE_MIDDLE}) }
[/state_pressed]
[state_focussed]
{_GUI_STATE ({GROOVE_TOP}) ({GROOVE_BOTTOM}) ({POSITIONER_TOP}) ({POSITIONER_BOTTOM}) "-active.png" ({IMAGE_MIDDLE}) }
[/state_focussed]

4
data/gui/default/widget/window_default.cfg
View file

@ -153,7 +153,7 @@
[window_definition]
id = {ID}
description = {DESCRIPTION}
description = {DESCRIPTION}
{_GUI_RESOLUTION ({GUI_TINY__RESOLUTION}) ({BASE_NAME}) ({PRE_COMMIT}) 5 6 2 4 6 }
{_GUI_RESOLUTION () ({BASE_NAME}) ({PRE_COMMIT}) 10 13 5 9 14 }
@ -176,7 +176,7 @@
{_GUI_WINDOW "titlescreen" "The items in the titlescreen" "translucent54" ()}
# No idea what this style does, just leave it disabled for now.
#{_GUI_WINDOW "menu2" "menu2" "menu2"}
#{_GUI_WINDOW "menu2" "menu2" "menu2"}
#undef _BLUR
#undef _GUI_WINDOW

8
data/gui/default/window/addon_connect.cfg
View file

@ -16,7 +16,7 @@
horizontal_placement = "center"
[grid]
[row]
grow_factor = 0
@ -54,7 +54,7 @@
[/column]
[/row]
[row]
grow_factor = 1
@ -114,7 +114,7 @@
[column]
grow_factor = 1
horizontal_grow = "true"
horizontal_grow = "true"
[grid]
@ -184,7 +184,7 @@
[row]
grow_factor = 0
[column]
[spacer]

12
data/gui/default/window/addon_list.cfg
View file

@ -40,7 +40,7 @@
[/linked_group]
[grid]
[row]
grow_factor = 0
@ -79,7 +79,7 @@
[/column]
[/row]
[row]
grow_factor = 1
@ -110,9 +110,9 @@
label = "Name"
[/label]
[/column]
[column]
grow_factor = 1
horizontal_grow = "true"
@ -299,13 +299,13 @@
[column]
grow_factor = 1
horizontal_grow = "true"
horizontal_grow = "true"
[grid]
[row]
grow_factor = 0
[column]
[spacer]

8
data/gui/default/window/campaign_dialog.cfg
View file

@ -33,7 +33,7 @@
[/linked_group]
[grid]
[row]
grow_factor = 0
@ -98,7 +98,7 @@
[column]
grow_factor = 1
horizontal_grow = "true"
horizontal_grow = "true"
border = "all"
border_size = 5
@ -310,7 +310,7 @@
[column]
grow_factor = 1
horizontal_grow = "true"
horizontal_grow = "true"
border = "all"
border_size = 5
@ -399,7 +399,7 @@
[column]
grow_factor = 1
horizontal_grow = "true"
horizontal_grow = "true"
[grid]

14
data/gui/default/window/editor_generate_map.cfg
View file

@ -24,7 +24,7 @@
automatic_placement = "true"
vertical_placement = "center"
horizontal_placement = "center"
[grid]
[row]
grow_factor = 0
@ -38,12 +38,12 @@
label = _ "Generate Random Map"
[/label]
[/column]
[/row]
[/row]
[row]
grow_factor = 0
[column]
grow_factor = 1
horizontal_grow = "true"
horizontal_grow = "true"
[grid]
[row]
grow_factor = 0
@ -56,7 +56,7 @@
id = "current_generator"
definition = "default"
[/label]
[/column]
[/column]
[column]
border = "all"
border_size = 5
@ -71,12 +71,12 @@
[/row]
[/grid]
[/column]
[/row]
[/row]
[row]
grow_factor = 0
[column]
grow_factor = 1
horizontal_grow = "true"
horizontal_grow = "true"
[grid]
[row]
grow_factor = 0
@ -114,7 +114,7 @@
[/row]
[/grid]
[/column]
[/row]
[/row]
[/grid]
[/resolution]
[/window]

10
data/gui/default/window/editor_new_map.cfg
View file

@ -13,7 +13,7 @@
automatic_placement = "true"
vertical_placement = "center"
horizontal_placement = "center"
[grid]
[row]
grow_factor = 0
@ -27,7 +27,7 @@
label = _ "New Map"
[/label]
[/column]
[/row]
[/row]
[row]
grow_factor = 0
[column]
@ -45,7 +45,7 @@
definition = "default"
label = _ "Width:"
[/label]
[/column]
[/column]
[column]
grow_factor = 1
border = "all"
@ -72,7 +72,7 @@
definition = "default"
label = _ "Height:"
[/label]
[/column]
[/column]
[column]
grow_factor = 1
border = "all"
@ -114,7 +114,7 @@
[/row]
[/grid]
[/column]
[/row]
[/row]
[/grid]
[/resolution]
[/window]

18
data/gui/default/window/editor_resize_map.cfg
View file

@ -13,7 +13,7 @@
automatic_placement = "true"
vertical_placement = "center"
horizontal_placement = "center"
[grid]
[row]
grow_factor = 0
@ -27,7 +27,7 @@
label = _ "Resize Map"
[/label]
[/column]
[/row]
[/row]
[row]
grow_factor = 0
[column]
@ -45,7 +45,7 @@
definition = "default"
label = _ "New width:"
[/label]
[/column]
[/column]
[column]
grow_factor = 1
border = "all"
@ -69,7 +69,7 @@
definition = "default"
label = _ "Old width:"
[/label]
[/column]
[/column]
[column]
grow_factor = 0
border = "all"
@ -80,7 +80,7 @@
definition = "default"
label = "-1"
[/label]
[/column]
[/column]
[/row]
[row]
grow_factor = 1
@ -93,7 +93,7 @@
definition = "default"
label = _ "New height:"
[/label]
[/column]
[/column]
[column]
grow_factor = 1
border = "all"
@ -117,7 +117,7 @@
definition = "default"
label = _ "Old height:"
[/label]
[/column]
[/column]
[column]
grow_factor = 0
border = "all"
@ -128,7 +128,7 @@
definition = "default"
label = "-1"
[/label]
[/column]
[/column]
[/row]
[/grid]
[/column]
@ -276,7 +276,7 @@
[/row]
[/grid]
[/column]
[/row]
[/row]
[/grid]
[/resolution]
[/window]

26
data/gui/default/window/editor_settings.cfg
View file

@ -24,7 +24,7 @@
automatic_placement = "true"
vertical_placement = "center"
horizontal_placement = "center"
[grid]
[row]
grow_factor = 0
@ -38,7 +38,7 @@
label = _ "Editor Settings"
[/label]
[/column]
[/row]
[/row]
[row]
[column]
[label]
@ -51,7 +51,7 @@
grow_factor = 0
[column]
grow_factor = 1
horizontal_grow = "true"
horizontal_grow = "true"
[grid]
[row]
grow_factor = 0
@ -64,7 +64,7 @@
id = "current_tod"
definition = "default"
[/label]
[/column]
[/column]
[column]
border = "all"
border_size = 5
@ -96,7 +96,7 @@
[/row]
[/grid]
[/column]
[/row]
[/row]
[row]
grow_factor = 0
[column]
@ -105,7 +105,7 @@
definition = "default"
[/label]
[/column]
[/row]
[/row]
[row]
[column]
[grid]
@ -119,7 +119,7 @@
definition = "default"
label = _ "Red:"
[/label]
[/column]
[/column]
[column]
grow_factor = 1
border = "all"
@ -145,7 +145,7 @@
definition = "default"
label = _ "Green:"
[/label]
[/column]
[/column]
[column]
grow_factor = 1
border = "all"
@ -171,7 +171,7 @@
definition = "default"
label = _ "Blue:"
[/label]
[/column]
[/column]
[column]
grow_factor = 1
border = "all"
@ -194,7 +194,7 @@
grow_factor = 0
[column]
grow_factor = 1
horizontal_grow = "true"
horizontal_grow = "true"
[grid]
[row]
grow_factor = 0
@ -211,12 +211,12 @@
[/row]
[/grid]
[/column]
[/row]
[/row]
[row]
grow_factor = 0
[column]
grow_factor = 1
horizontal_grow = "true"
horizontal_grow = "true"
[grid]
[row]
grow_factor = 0
@ -253,7 +253,7 @@
[/row]
[/grid]
[/column]
[/row]
[/row]
[/grid]
[/resolution]
[/window]

10
data/gui/default/window/game_delete.cfg
View file

@ -15,7 +15,7 @@
horizontal_placement = "center"
[grid]
[row]
grow_factor = 0
@ -71,7 +71,7 @@
label = _ "Don't ask me again!"
[/toggle_button]
[/column]
[/row]
@ -91,7 +91,7 @@
label = " "
[/label]
[/column]
[/row]
@ -101,13 +101,13 @@
[column]
grow_factor = 1
horizontal_grow = "true"
horizontal_grow = "true"
[grid]
[row]
grow_factor = 0
[column]
[spacer]

118
data/gui/default/window/game_load.cfg
View file

@ -25,7 +25,7 @@
[/linked_group]
[grid]
[row]
grow_factor = 0
@ -69,60 +69,60 @@
[grid]
id = "preview_pane"
[row]
grow_factor = 1
[column]
[grid]
[row]
grow_factor = 1
[column]
grow_factor = 1
horizontal_alignment = "left"
[image]
id = "imgLeader"
definition = "default"
[/image]
[/column]
[column]
[column]
grow_factor = 1
border = "all"
border_size = 5
horizontal_alignment = "right"
[minimap]
id = "minimap"
definition = "default"
[/minimap]
[/column]
[/row]
[/grid]
[/column]
[/row]
[row]
[column]
grow_factor = 1
border = "all"
border_size = 5
horizontal_alignment = "left"
[label]
id = "lblScenario"
definition = "default"
@ -131,19 +131,19 @@
[/label]
[/column]
[/row]
[row]
[column]
grow_factor = 1
border = "all"
border_size = 5
horizontal_alignment = "left"
[label]
id = "lblSummary"
definition = "default_small"
@ -152,11 +152,11 @@
[/label]
[/column]
[/row]
[/grid]
[/column]
[column]
@ -167,13 +167,13 @@
horizontal_grow = "true"
[grid]
[row]
[column]
horizontal_alignment = "left"
border = "bottom"
border_size = 10
[label]
id = "lblChoose"
definition = "default"
@ -182,17 +182,17 @@
[/label]
[/column]
[/row]
[row]
[column]
horizontal_alignment = "left"
[grid]
[row]
[column]
border = "right"
border_size = 10
@ -206,7 +206,7 @@
[/label]
[/column]
[column]
border = "bottom"
border_size = 10
@ -220,18 +220,18 @@
[/column]
[/row]
[/grid]
[/column]
[/row]
[row]
[column]
grow_factor = 1
horizontal_grow = "true"
horizontal_grow = "true"
border = "bottom"
border_size = 10
@ -254,9 +254,9 @@
label = _ "Name"
[/label]
[/column]
[column]
grow_factor = 1
horizontal_grow = "true"
@ -270,17 +270,17 @@
[/label]
[/column]
[/row]
[/header]
[list_definition]
[row]
[column]
[toggle_panel]
definition = "default"
@ -318,15 +318,15 @@
[/label]
[/column]
[/row]
[/grid]
[/toggle_panel]
[/column]
[/row]
[/list_definition]
@ -341,7 +341,7 @@
[column]
horizontal_alignment = "left"
border = "bottom"
border_size = 10
@ -381,7 +381,7 @@
horizontal_alignment = "left"
border = "bottom"
border_size = 10
[toggle_button]
id = "cancel_orders"
definition = "default"
@ -392,13 +392,13 @@
[/column]
[/row]
[/grid]
[/column]
[/row]
[/grid]
[/column]
@ -410,7 +410,7 @@
[column]
grow_factor = 1
horizontal_grow = "true"
horizontal_grow = "true"
[grid]

6
data/gui/default/window/game_save.cfg
View file

@ -15,7 +15,7 @@
horizontal_placement = "center"
[grid]
[row]
grow_factor = 0
@ -92,13 +92,13 @@
[column]
grow_factor = 1
horizontal_grow = "true"
horizontal_grow = "true"
[grid]
[row]
grow_factor = 0
[column]
[spacer]

6
data/gui/default/window/game_save_message.cfg
View file

@ -15,7 +15,7 @@
horizontal_placement = "center"
[grid]
[row]
grow_factor = 0
@ -112,13 +112,13 @@
[column]
grow_factor = 1
horizontal_grow = "true"
horizontal_grow = "true"
[grid]
[row]
grow_factor = 0
[column]
[spacer]

10
data/gui/default/window/game_save_oos.cfg
View file

@ -15,7 +15,7 @@
horizontal_placement = "center"
[grid]
[row]
grow_factor = 0
@ -112,13 +112,13 @@
[column]
grow_factor = 1
horizontal_grow = "true"
horizontal_grow = "true"
[grid]
[row]
grow_factor = 0
[column]
grow_factor = 1
@ -126,7 +126,7 @@
border = "all"
border_size = 5
horizontal_alignment = "left"
[toggle_button]
id = "ignore_all"
definition = "default"
@ -165,7 +165,7 @@
[row]
grow_factor = 0
[column]
[spacer]

6
data/gui/default/window/game_save_overwrite.cfg
View file

@ -15,7 +15,7 @@
horizontal_placement = "center"
[grid]
[row]
grow_factor = 0
@ -61,13 +61,13 @@
[column]
grow_factor = 1
horizontal_grow = "true"
horizontal_grow = "true"
[grid]
[row]
grow_factor = 0
[column]
[spacer]

4
data/gui/default/window/language_selection.cfg
View file

@ -15,7 +15,7 @@
horizontal_placement = "center"
[grid]
[row]
grow_factor = 0
@ -99,7 +99,7 @@
[column]
grow_factor = 1
horizontal_grow = "true"
horizontal_grow = "true"
[grid]

4
data/gui/default/window/message.cfg
View file

@ -18,7 +18,7 @@
[column]
[grid]
[grid]
[row]
@ -89,7 +89,7 @@
[column]
[grid]
[grid]
[row]

8
data/gui/default/window/mp_cmd_wrapper.cfg
View file

@ -15,7 +15,7 @@
horizontal_placement = "center"
[grid]
[row]
grow_factor = 0
@ -142,7 +142,7 @@
[column]
grow_factor = 1
horizontal_grow = "true"
horizontal_grow = "true"
[grid]
@ -346,7 +346,7 @@
[column]
grow_factor = 1
horizontal_grow = "true"
horizontal_grow = "true"
[grid]
@ -427,7 +427,7 @@
[column]
grow_factor = 1
horizontal_grow = "true"
horizontal_grow = "true"
[grid]

8
data/gui/default/window/mp_connect.cfg
View file

@ -15,7 +15,7 @@
horizontal_placement = "center"
[grid]
[row]
grow_factor = 0
@ -53,7 +53,7 @@
[/column]
[/row]
[row]
grow_factor = 1
@ -112,7 +112,7 @@
[column]
grow_factor = 1
horizontal_grow = "true"
horizontal_grow = "true"
[grid]
@ -154,7 +154,7 @@
[row]
grow_factor = 0
[column]
[spacer]

8
data/gui/default/window/mp_create_game.cfg
View file

@ -16,7 +16,7 @@
horizontal_placement = "center"
[grid]
# Title
[row]
grow_factor = 0
@ -98,13 +98,13 @@
[row]
grow_factor = 1
# minimap
[column]
grow_factor = 0
[grid]
[row]
grow_factor = 0
@ -430,7 +430,7 @@
minimum_value = 30
maximum_value = 200
step_size = 10
step_size = 10
[/slider]
[/column]

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

@ -15,7 +15,7 @@
horizontal_placement = "center"
[grid]
[row]
grow_factor = 0

6
data/gui/default/window/mp_method_selection.cfg
View file

@ -15,7 +15,7 @@
horizontal_placement = "center"
[grid]
[row]
grow_factor = 0
@ -97,7 +97,7 @@ The Battle for Wesnoth forum can be found at http://www.wesnoth.org/forum/"
[column]
grow_factor = 1
horizontal_grow = "true"
horizontal_grow = "true"
vertical_grow = "true"
border = "all"
@ -185,7 +185,7 @@ The Battle for Wesnoth forum can be found at http://www.wesnoth.org/forum/"
[column]
grow_factor = 1
horizontal_grow = "true"
horizontal_grow = "true"
[grid]

12
data/gui/default/window/mp_server_list.cfg
View file

@ -25,7 +25,7 @@
[/linked_group]
[grid]
[row]
grow_factor = 0
@ -64,7 +64,7 @@
[/column]
[/row]
[row]
grow_factor = 1
@ -95,9 +95,9 @@
label = _ "Name"
[/label]
[/column]
[column]
grow_factor = 1
horizontal_grow = "true"
@ -188,13 +188,13 @@
[column]
grow_factor = 1
horizontal_grow = "true"
horizontal_grow = "true"
[grid]
[row]
grow_factor = 0
[column]
[spacer]

18
data/gui/default/window/title_screen.cfg
View file

@ -9,11 +9,11 @@
description = "The window definition for the title screen."
[resolution]
[background]
[draw]
[image]
x = 0
y = 0
@ -52,7 +52,7 @@
[/spacer]
[/column]
#enddef
#enddef
#define _GUI_V_SPACER
[column]
@ -64,7 +64,7 @@
[/spacer]
[/column]
#enddef
#enddef
#define _GUI_TIP_SECTION
[panel]
@ -131,7 +131,7 @@
[row]
[column]
horizontal_grow = "true"
horizontal_grow = "true"
[grid]
@ -211,7 +211,7 @@
label = {CAPTION}
tooltip = {TOOLTIP}
[/button]
[/column]
[/row]
@ -252,7 +252,7 @@
height = "(screen_height)"
[grid]
[row]
{_GUI_V_SPACER}
@ -298,7 +298,7 @@
[column]
vertical_alignment = "bottom"
{_GUI_TIP_SECTION}
{_GUI_TIP_SECTION}
[/column]
[column]
@ -312,7 +312,7 @@
border_size = 5
horizontal_alignment = "right"
vertical_alignment = "bottom"
[button]
id = "upload_statistics"
definition = "upload_statistics"

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

@ -12,7 +12,7 @@
click_dismiss = "true"
[grid]
[grid]
[row]

4
data/gui/default/window/unit_attack.cfg
View file

@ -212,7 +212,7 @@
[/row]
[/grid]
[/grid]
#enddef
[window]
@ -258,7 +258,7 @@
[/column]
[/row]
[row]
[column]

28
data/gui/default/window/wml_message.cfg
View file

@ -1,7 +1,7 @@
#textdomain wesnoth-lib
###
### The in game portrait dialogs.
### Due to the excessive amount of dialogs it's not possible to split off the
### Due to the excessive amount of dialogs it's not possible to split off the
### window definitions. So this unit is a bit larger as wanted.
###
@ -69,7 +69,7 @@
#undef __GUI_IMAGE_WIDTH
# This is the version without debug info
#define __GUI_IMAGE_WIDTH
({___GUI_IMAGE_WIDTH})#enddef
({___GUI_IMAGE_WIDTH})#enddef
# This is the macro for the image width which is can be used as string
@ -89,8 +89,8 @@
# image real size
#define __GUI_IMAGE_DISPLAYED_WIDTH
(
if((image_original_width < 300) and (image_original_height < 300),
image_original_width,
if((image_original_width < 300) and (image_original_height < 300),
image_original_width,
((image_original_width * {__GUI_IMAGE_WIDTH}) / 500))
)#enddef
@ -98,8 +98,8 @@
# image real size
#define __GUI_IMAGE_DISPLAYED_HEIGHT
(
if((image_original_width < 300) and (image_original_height < 300),
image_original_height,
if((image_original_width < 300) and (image_original_height < 300),
image_original_height,
((image_original_height * {__GUI_IMAGE_WIDTH}) / 500))
)#enddef
@ -295,7 +295,7 @@
height = "(screen_height - 30)"
click_dismiss = "true"
[linked_group]
id = "icon"
fixed_width = "true"
@ -321,7 +321,7 @@
[panel]
definition = "wml_message"
[grid]
[row]
@ -352,7 +352,7 @@
[grid]
[row]
[column]
border = "all"
border_size = 5
@ -403,7 +403,7 @@
id = "input_caption"
definition = "default"
[/label]
[/column]
[column]
@ -519,7 +519,7 @@ if(gamemap_width - ({__GUI_IMAGE_WIDTH}) > 675
height = "(screen_height - 30)"
click_dismiss = "true"
[linked_group]
id = "icon"
fixed_width = "true"
@ -545,7 +545,7 @@ if(gamemap_width - ({__GUI_IMAGE_WIDTH}) > 675
[panel]
definition = "wml_message"
[grid]
[row]
@ -573,7 +573,7 @@ if(gamemap_width - ({__GUI_IMAGE_WIDTH}) > 675
[grid]
[row]
[column]
border = "all"
border_size = 5
@ -624,7 +624,7 @@ if(gamemap_width - ({__GUI_IMAGE_WIDTH}) > 675
id = "input_caption"
definition = "default"
[/label]
[/column]
[column]