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

GUI2/Stacked Widget: removed [stack] wrapper around [layer] and use the latter directly

Browse source 
All dialog WML changes in this commit consist of removing [stack] tags and reducing subsequent subtag indent
by one layer.
This commit is contained in:
Charles Dang 2016-10-10 18:52:55 +11:00
parent 25eb58abb6
commit 1f1855300d
15 changed files with 626 additions and 683 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -196,10 +196,9 @@
[stacked_widget]
definition = "default"
[stack]
{GUI__WIDGET_FORCE_SIZE_LAYER {WIDTH} {HEIGHT}}
{GUI__LAYER_GRID {WIDGET}}
[/stack]
{GUI__WIDGET_FORCE_SIZE_LAYER {WIDTH} {HEIGHT}}
{GUI__LAYER_GRID {WIDGET}}
[/stacked_widget]
#enddef
@ -214,10 +213,9 @@
[stacked_widget]
definition = "default"
[stack]
{GUI__WIDGET_BORDER_LAYER {MARGIN} {THICKNESS} {COLOR}}
{GUI__LAYER_GRID {WIDGET}}
[/stack]
{GUI__WIDGET_BORDER_LAYER {MARGIN} {THICKNESS} {COLOR}}
{GUI__LAYER_GRID {WIDGET}}
[/stacked_widget]
#enddef
@ -226,11 +224,10 @@
[stacked_widget]
definition = "default"
[stack]
{GUI__WIDGET_FORCE_SIZE_LAYER {WIDTH} {HEIGHT}}
{GUI__WIDGET_BORDER_LAYER {MARGIN} {THICKNESS} {COLOR}}
{GUI__LAYER_GRID {WIDGET}}
[/stack]
{GUI__WIDGET_FORCE_SIZE_LAYER {WIDTH} {HEIGHT}}
{GUI__WIDGET_BORDER_LAYER {MARGIN} {THICKNESS} {COLOR}}
{GUI__LAYER_GRID {WIDGET}}
[/stacked_widget]
#enddef

9
data/gui/schema.cfg
View file

@ -1953,15 +1953,10 @@
max="-1"
super="generic/widget_instance"
[tag]
name="stack"
name="layer"
min="0"
max="-1"
[tag]
name="layer"
min="0"
max="-1"
super="gui/window/resolution/grid"
[/tag]
super="gui/window/resolution/grid"
[/tag]
[/tag]
[tag]

102
data/gui/window/addon_description.cfg
View file

@ -384,78 +384,74 @@
[stacked_widget]
[stack]
[layer]
[layer]
[row]
[row]
[column]
border = "all"
border_size = 5
horizontal_alignment = "left"
[column]
border = "all"
border_size = 5
horizontal_alignment = "left"
[label]
id = "url_none"
label = _ "url^None"
[/label]
[label]
id = "url_none"
label = _ "url^None"
[/label]
[/column]
[/column]
[/row]
[/row]
[/layer]
[/layer]
[layer]
[layer]
[row]
[row]
[column]
grow_factor = 1
border = "all"
border_size = 5
horizontal_grow = "true"
[column]
grow_factor = 1
border = "all"
border_size = 5
horizontal_grow = "true"
[text_box]
id = "url"
definition = "default"
[/text_box]
[text_box]
id = "url"
definition = "default"
[/text_box]
[/column]
[/column]
[column]
border = "all"
border_size = 5
horizontal_alignment = "right"
[column]
border = "all"
border_size = 5
horizontal_alignment = "right"
[button]
id = "url_copy"
definition = "action_copy"
label = _ "url^Copy"
tooltip = _ "Copy this URL to clipboard"
[/button]
[button]
id = "url_copy"
definition = "action_copy"
label = _ "url^Copy"
tooltip = _ "Copy this URL to clipboard"
[/button]
[/column]
[/column]
[column]
border = "all"
border_size = 5
horizontal_alignment = "right"
[column]
border = "all"
border_size = 5
horizontal_alignment = "right"
[button]
id = "url_go"
definition = "action_go"
label = _ "url^Go"
tooltip = _ "Visit this URL with a web browser"
[/button]
[button]
id = "url_go"
definition = "action_go"
label = _ "url^Go"
tooltip = _ "Visit this URL with a web browser"
[/button]
[/column]
[/column]
[/row]
[/row]
[/layer]
[/stack]
[/layer]
[/stacked_widget]

162
data/gui/window/addon_list.cfg
View file

@ -326,53 +326,49 @@
id = "install_update_stack"
definition = "default"
[stack]
[layer]
[layer]
[row]
[row]
[column]
grow_factor = 1
horizontal_grow = "true"
[column]
grow_factor = 1
horizontal_grow = "true"
border = "all"
border_size = 5
border = "all"
border_size = 5
[button]
id = "single_install"
definition = "install"
[/button]
[button]
id = "single_install"
definition = "install"
[/button]
[/column]
[/column]
[/row]
[/row]
[/layer]
[/layer]
[layer]
[layer]
[row]
[row]
[column]
grow_factor = 1
horizontal_grow = "true"
[column]
grow_factor = 1
horizontal_grow = "true"
border = "all"
border_size = 5
border = "all"
border_size = 5
[button]
id = "single_update"
definition = "update"
[/button]
[button]
id = "single_update"
definition = "update"
[/button]
[/column]
[/column]
[/row]
[/row]
[/layer]
[/stack]
[/layer]
[/stacked_widget]
@ -879,78 +875,74 @@
[stacked_widget]
id = "feedback_stack"
[stack]
[layer]
[layer]
[row]
[row]
[column]
border = "all"
border_size = 5
horizontal_alignment = "left"
[column]
border = "all"
border_size = 5
horizontal_alignment = "left"
[label]
id = "url_none"
label = _ "url^None"
[/label]
[label]
id = "url_none"
label = _ "url^None"
[/label]
[/column]
[/column]
[/row]
[/row]
[/layer]
[/layer]
[layer]
[layer]
[row]
[row]
[column]
grow_factor = 1
border = "all"
border_size = 5
horizontal_grow = "true"
[column]
grow_factor = 1
border = "all"
border_size = 5
horizontal_grow = "true"
[text_box]
id = "url"
definition = "default"
[/text_box]
[text_box]
id = "url"
definition = "default"
[/text_box]
[/column]
[/column]
[column]
border = "all"
border_size = 5
horizontal_alignment = "right"
[column]
border = "all"
border_size = 5
horizontal_alignment = "right"
[button]
id = "url_copy"
definition = "action_copy"
label = _ "url^Copy"
tooltip = _ "Copy this URL to clipboard"
[/button]
[button]
id = "url_copy"
definition = "action_copy"
label = _ "url^Copy"
tooltip = _ "Copy this URL to clipboard"
[/button]
[/column]
[/column]
[column]
border = "all"
border_size = 5
horizontal_alignment = "right"
[column]
border = "all"
border_size = 5
horizontal_alignment = "right"
[button]
id = "url_go"
definition = "action_go"
label = _ "url^Go"
tooltip = _ "Visit this URL with a web browser"
[/button]
[button]
id = "url_go"
definition = "action_go"
label = _ "url^Go"
tooltip = _ "Visit this URL with a web browser"
[/button]
[/column]
[/column]
[/row]
[/row]
[/layer]
[/stack]
[/layer]
[/stacked_widget]

128
data/gui/window/campaign_dialog.cfg
View file

@ -105,57 +105,53 @@
definition = "default"
linked_group = "icon_area"
[stack]
[layer]
[layer]
[row]
[row]
[column]
grow_factor = 1
horizontal_grow = "true"
[column]
grow_factor = 1
horizontal_grow = "true"
border = "left"
border_size = 3
border = "left"
border_size = 3
[image]
id = "victory"
definition = "default"
[image]
id = "victory"
definition = "default"
label = "misc/laurel.png"
[/image]
label = "misc/laurel.png"
[/image]
[/column]
[/column]
[/row]
[/row]
[/layer]
[/layer]
[layer]
[layer]
[row]
[row]
[column]
grow_factor = 1
horizontal_grow = "true"
[column]
grow_factor = 1
horizontal_grow = "true"
border = "left"
border_size = 3
border = "left"
border_size = 3
[image]
id = "icon"
definition = "default"
[image]
id = "icon"
definition = "default"
label = "misc/laurel.png"
[/image]
label = "misc/laurel.png"
[/image]
[/column]
[/column]
[/row]
[/row]
[/layer]
[/stack]
[/layer]
[/stacked_widget]
@ -301,57 +297,53 @@
definition = "default"
linked_group = "icon_area"
[stack]
[layer]
[layer]
[row]
[row]
[column]
grow_factor = 1
horizontal_grow = "true"
[column]
grow_factor = 1
horizontal_grow = "true"
border = "left"
border_size = 3
border = "left"
border_size = 3
[image]
id = "victory"
definition = "default"
[image]
id = "victory"
definition = "default"
label = "misc/blank-hex.png"
[/image]
label = "misc/blank-hex.png"
[/image]
[/column]
[/column]
[/row]
[/row]
[/layer]
[/layer]
[layer]
[layer]
[row]
[row]
[column]
grow_factor = 1
horizontal_grow = "true"
[column]
grow_factor = 1
horizontal_grow = "true"
border = "left"
border_size = 3
border = "left"
border_size = 3
[image]
id = "icon"
definition = "default"
[image]
id = "icon"
definition = "default"
label = "misc/laurel.png"
[/image]
label = "misc/laurel.png"
[/image]
[/column]
[/column]
[/row]
[/row]
[/layer]
[/stack]
[/layer]
[/stacked_widget]

62
data/gui/window/campaign_difficulty.cfg
View file

@ -124,52 +124,48 @@
definition = "default"
linked_group = "icon"
[stack]
[layer]
[layer]
[row]
[row]
[column]
grow_factor = 1
horizontal_grow = "true"
border = "left"
border_size = 3
[column]
grow_factor = 1
horizontal_grow = "true"
border = "left"
border_size = 3
[image]
id = "victory"
definition = "default"
label = "misc/laurel.png"
[/image]
[image]
id = "victory"
definition = "default"
label = "misc/laurel.png"
[/image]
[/column]
[/column]
[/row]
[/row]
[/layer]
[/layer]
[layer]
[layer]
[row]
[row]
[column]
grow_factor = 1
horizontal_grow = "true"
border = "left"
border_size = 3
[column]
grow_factor = 1
horizontal_grow = "true"
border = "left"
border_size = 3
[image]
id = "icon"
definition = "default"
[/image]
[image]
id = "icon"
definition = "default"
[/image]
[/column]
[/column]
[/row]
[/row]
[/layer]
[/stack]
[/layer]
[/stacked_widget]

44
data/gui/window/game_stats.cfg
View file

@ -721,33 +721,29 @@ Village"
id = "pager"
definition = "default"
[stack]
[layer]
[row]
[column]
border = "all"
border_size = 5
horizontal_grow = "true"
[layer]
[row]
[column]
border = "all"
border_size = 5
horizontal_grow = "true"
{_GUI_GAME_STATUS_LIST}
[/column]
[/row]
[/layer]
{_GUI_GAME_STATUS_LIST}
[/column]
[/row]
[/layer]
[layer]
[row]
[column]
border = "all"
border_size = 5
horizontal_grow = "true"
[layer]
[row]
[column]
border = "all"
border_size = 5
horizontal_grow = "true"
{_GUI_SCENARIO_SETTINGS_PAGE}
[/column]
[/row]
[/layer]
[/stack]
{_GUI_SCENARIO_SETTINGS_PAGE}
[/column]
[/row]
[/layer]
[/stacked_widget]

22
data/gui/window/game_version.cfg
View file

@ -573,19 +573,19 @@
[stacked_widget]
id = tabs_container
[stack]
[layer]
{_GUI_VERINFO_TAB_PAGE_GAME_PATHS}
[/layer]
[layer]
{_GUI_VERINFO_TAB_PAGE_BUILD_INFO}
[/layer]
[layer]
{_GUI_VERINFO_TAB_PAGE_GAME_PATHS}
[/layer]
[layer]
{_GUI_VERINFO_TAB_PAGE_BUILD_INFO}
[/layer]
[layer]
{_GUI_VERINFO_TAB_PAGE_GAME_FEATURES}
[/layer]
[layer]
{_GUI_VERINFO_TAB_PAGE_GAME_FEATURES}
[/layer]
[/stack]
[/stacked_widget]
[/column]

60
data/gui/window/mp_create_game.cfg
View file

@ -590,49 +590,45 @@
id = "minimap_stack"
definition = "default"
[stack]
[layer]
[layer]
[row]
[row]
[column]
horizontal_grow = "true"
vertical_grow = "true"
border = "all"
border_size = 5
[column]
horizontal_grow = "true"
vertical_grow = "true"
border = "all"
border_size = 5
[minimap]
id = "minimap"
definition = "no_size"
[/minimap]
[/column]
[minimap]
id = "minimap"
definition = "no_size"
[/minimap]
[/column]
[/row]
[/row]
[/layer]
[/layer]
[layer]
[layer]
[row]
[row]
[column]
horizontal_grow = "true"
vertical_grow = "true"
border = "all"
border_size = 5
[column]
horizontal_grow = "true"
vertical_grow = "true"
border = "all"
border_size = 5
[image]
id = "campaign_image"
definition = "default"
[/image]
[/column]
[image]
id = "campaign_image"
definition = "default"
[/image]
[/column]
[/row]
[/row]
[/layer]
[/stack]
[/layer]
[/stacked_widget]

64
data/gui/window/mp_create_game/default_resolution.cfg
View file

@ -351,53 +351,49 @@
id = "pager"
definition = "default"
[stack]
[layer]
{_GUI_MP_CREATE_GENERAL_PANEL}
[/layer]
[layer]
{_GUI_MP_CREATE_GENERAL_PANEL}
[/layer]
[layer]
{_GUI_CUSTOM_OPTIONS_TREE}
[/layer]
[layer]
{_GUI_CUSTOM_OPTIONS_TREE}
[/layer]
[layer]
[layer]
[row]
[row]
[column]
horizontal_grow = "true"
vertical_grow = "true"
border = "all"
border_size = 5
[column]
horizontal_grow = "true"
vertical_grow = "true"
border = "all"
border_size = 5
[scrollbar_panel]
[scrollbar_panel]
[definition]
{_GUI_MP_CREATE_MAP_SETTINGS}
[definition]
{_GUI_MP_CREATE_MAP_SETTINGS}
[row]
grow_factor = 1
[row]
grow_factor = 1
[column]
[spacer]
height = 20
[/spacer]
[/column]
[/row]
[column]
[spacer]
height = 20
[/spacer]
[/column]
[/row]
{_GUI_MP_CREATE_TIME_LIMIT}
[/definition]
{_GUI_MP_CREATE_TIME_LIMIT}
[/definition]
[/scrollbar_panel]
[/scrollbar_panel]
[/column]
[/column]
[/row]
[/row]
[/layer]
[/stack]
[/layer]
[/stacked_widget]

40
data/gui/window/mp_create_game/small_resolution.cfg
View file

@ -286,33 +286,29 @@
id = "pager"
definition = "default"
[stack]
[layer]
{_GUI_MP_CREATE_GENERAL_PANEL}
[/layer]
[layer]
{_GUI_MP_CREATE_GENERAL_PANEL}
[/layer]
[layer]
{_GUI_CUSTOM_OPTIONS_TREE}
[/layer]
[layer]
{_GUI_CUSTOM_OPTIONS_TREE}
[/layer]
[layer]
{_GUI_MP_CREATE_MAP_SETTINGS}
[layer]
{_GUI_MP_CREATE_MAP_SETTINGS}
[row]
grow_factor = 1
[row]
grow_factor = 1
[column]
[spacer]
height = 20
[/spacer]
[/column]
[/row]
[column]
[spacer]
height = 20
[/spacer]
[/column]
[/row]
{_GUI_MP_CREATE_TIME_LIMIT}
[/layer]
[/stack]
{_GUI_MP_CREATE_TIME_LIMIT}
[/layer]
[/stacked_widget]

394
data/gui/window/mp_create_game/tiny_resolution.cfg
View file

@ -66,229 +66,227 @@
id = "pager"
definition = "default"
[stack]
[layer]
[row]
[column]
horizontal_grow = "true"
vertical_grow = "true"
[grid]
[row]
grow_factor = 0
[column]
horizontal_grow = "true"
[grid]
{_GUI_MP_CREATE_MAIN_OPTIONS}
[/grid]
[/column]
[/row]
[layer]
[row]
[column]
horizontal_grow = "true"
vertical_grow = "true"
[grid]
[row]
grow_factor = 0
[column]
horizontal_grow = "true"
[grid]
{_GUI_MP_CREATE_MAIN_OPTIONS}
[/grid]
[/column]
[/row]
[row]
grow_factor = 0
[column]
border = "all"
border_size = 5
horizontal_grow = "true"
[label]
definition = "default"
id = "game_title"
[/label]
[/column]
[/row]
[row]
grow_factor = 0
[column]
border = "all"
border_size = 5
horizontal_grow = "true"
[label]
definition = "default"
id = "game_title"
[/label]
[/column]
[/row]
[row]
grow_factor = 0
[column]
horizontal_grow = "true"
[grid]
[row]
{_GUI_MP_CREATE_MINIMAP_STACK}
[row]
grow_factor = 0
[column]
horizontal_grow = "true"
[grid]
[row]
{_GUI_MP_CREATE_MINIMAP_STACK}
{_GUI_MP_CREATE_MAP_OPTIONS}
[/row]
[/grid]
[/column]
[/row]
{_GUI_MP_CREATE_MAP_OPTIONS}
[/row]
[/grid]
[/column]
[/row]
[row]
grow_factor = 1
[column]
horizontal_grow = "true"
vertical_grow = "true"
[grid]
[row]
[column]
vertical_alignment = "top"
[grid]
[row]
[column]
grow_factor = 0
[row]
grow_factor = 1
[column]
horizontal_grow = "true"
vertical_grow = "true"
[grid]
[row]
[column]
vertical_alignment = "top"
[grid]
[row]
[column]
grow_factor = 0
border = "all"
border_size = 5
horizontal_alignment = "left"
[label]
definition = "default_small"
border = "all"
border_size = 5
horizontal_alignment = "left"
[label]
definition = "default_small"
label = _ "Players:"
[/label]
[/column]
label = _ "Players:"
[/label]
[/column]
[column]
grow_factor = 1
[column]
grow_factor = 1
border = "all"
border_size = 5
horizontal_grow = "true"
[label]
id = "map_num_players"
definition = "default_small"
[/label]
[/column]
[/row]
border = "all"
border_size = 5
horizontal_grow = "true"
[label]
id = "map_num_players"
definition = "default_small"
[/label]
[/column]
[/row]
[row]
[column]
grow_factor = 0
[row]
[column]
grow_factor = 0
border = "all"
border_size = 5
horizontal_alignment = "left"
[label]
definition = "default_small"
border = "all"
border_size = 5
horizontal_alignment = "left"
[label]
definition = "default_small"
label = _ "Map size:"
[/label]
[/column]
label = _ "Map size:"
[/label]
[/column]
[column]
grow_factor = 1
[column]
grow_factor = 1
border = "all"
border_size = 5
horizontal_grow = "true"
[label]
id = "map_size"
definition = "default_small"
[/label]
[/column]
[/row]
[/grid]
[/column]
border = "all"
border_size = 5
horizontal_grow = "true"
[label]
id = "map_size"
definition = "default_small"
[/label]
[/column]
[/row]
[/grid]
[/column]
[column]
grow_factor = 1
vertical_grow = "true"
horizontal_grow = "true"
border = "all"
border_size = 5
[column]
grow_factor = 1
vertical_grow = "true"
horizontal_grow = "true"
border = "all"
border_size = 5
[scroll_label]
id = "description"
definition = "default_small"
[scroll_label]
id = "description"
definition = "default_small"
horizontal_scrollbar_mode = "never"
vertical_scrollbar_mode = "auto"
[/scroll_label]
[/column]
[/row]
[/grid]
[/column]
[/row]
horizontal_scrollbar_mode = "never"
vertical_scrollbar_mode = "auto"
[/scroll_label]
[/column]
[/row]
[/grid]
[/column]
[/row]
[row]
grow_factor = 0
[column]
[grid]
{_GUI_MP_CREATE_GENERAL_PANEL}
[/grid]
[/column]
[/row]
[/grid]
[/column]
[row]
grow_factor = 0
[column]
[grid]
{_GUI_MP_CREATE_GENERAL_PANEL}
[/grid]
[/column]
[/row]
[/grid]
[/column]
[column]
grow_factor = 0
vertical_grow = "true"
[grid]
[row]
grow_factor = 0
[column]
grow_factor = 0
vertical_grow = "true"
horizontal_grow = "true"
{_GUI_MP_CREATE_GAME_LIST}
[/column]
[/row]
[/grid]
[/column]
[/row]
[/layer]
[layer]
{_GUI_CUSTOM_OPTIONS_TREE}
[/layer]
[layer]
[row]
[column]
grow_factor = 0
[column]
horizontal_grow = "true"
[grid]
[row]
{_GUI_MP_CREATE_SHUFFLE_TOGGLE}
vertical_grow = "true"
[grid]
[row]
grow_factor = 0
{_GUI_MP_CREATE_OBSERVER_TOGGLE}
[/row]
[/grid]
[/column]
[column]
grow_factor = 0
vertical_grow = "true"
horizontal_grow = "true"
[column]
horizontal_grow = "true"
[grid]
[row]
{_GUI_MP_CREATE_REGISTERED_TOGGLE}
{_GUI_MP_CREATE_GAME_LIST}
[/column]
[/row]
[/grid]
[/column]
[/row]
[/layer]
{_GUI_MP_CREATE_SYNC_TOGGLE}
[/row]
[/grid]
[/column]
[/row]
[layer]
{_GUI_CUSTOM_OPTIONS_TREE}
[/layer]
[row]
grow_factor = 0
[column]
horizontal_grow = "true"
vertical_grow = true
[grid]
{_GUI_MP_CREATE_MAP_SETTINGS}
[/grid]
[/column]
[layer]
[row]
grow_factor = 0
[column]
horizontal_grow = "true"
[grid]
[row]
{_GUI_MP_CREATE_SHUFFLE_TOGGLE}
[column]
horizontal_grow = "true"
vertical_grow = true
[grid]
{_GUI_MP_CREATE_TIME_LIMIT}
[/grid]
[/column]
[/row]
{_GUI_MP_CREATE_OBSERVER_TOGGLE}
[/row]
[/grid]
[/column]
# This ensures the above rows don't expand
# to fill the available space.
[row]
grow_factor = 1
[column]
[spacer][/spacer]
[/column]
[column]
[spacer][/spacer]
[/column]
[/row]
[/layer]
[/stack]
[column]
horizontal_grow = "true"
[grid]
[row]
{_GUI_MP_CREATE_REGISTERED_TOGGLE}
{_GUI_MP_CREATE_SYNC_TOGGLE}
[/row]
[/grid]
[/column]
[/row]
[row]
grow_factor = 0
[column]
horizontal_grow = "true"
vertical_grow = true
[grid]
{_GUI_MP_CREATE_MAP_SETTINGS}
[/grid]
[/column]
[column]
horizontal_grow = "true"
vertical_grow = true
[grid]
{_GUI_MP_CREATE_TIME_LIMIT}
[/grid]
[/column]
[/row]
# This ensures the above rows don't expand
# to fill the available space.
[row]
grow_factor = 1
[column]
[spacer][/spacer]
[/column]
[column]
[spacer][/spacer]
[/column]
[/row]
[/layer]
[/stacked_widget]
[/column]
[/row]

11
data/gui/window/preferences.cfg
View file

@ -66,9 +66,8 @@
id = "tab_pager"
definition = "default"
[stack]
{_CONTENTS}
[/stack]
{_CONTENTS}
[/stacked_widget]
#enddef
@ -402,9 +401,9 @@
[stacked_widget]
id = "pager"
definition = "default"
[stack]
{./preferences}
[/stack]
{./preferences}
[/stacked_widget]
[/column]

182
data/gui/window/title_screen.cfg
View file

@ -295,153 +295,149 @@ where
[stacked_widget]
[stack]
[layer]
[layer]
[row]
grow_factor = 0
[row]
grow_factor = 0
{_GUI_V_SPACER 30}
{_GUI_V_SPACER 30}
[/row]
[/row]
[row]
grow_factor = 1
[row]
grow_factor = 1
[column]
vertical_alignment = "top"
[column]
vertical_alignment = "top"
[image]
id = "logo-bg"
definition = "default"
[/image]
[image]
id = "logo-bg"
definition = "default"
[/image]
[/column]
[/column]
[/row]
[/row]
[/layer]
[/layer]
[layer]
[layer]
[row]
grow_factor = 0
[row]
grow_factor = 0
{_GUI_V_SPACER 30}
{_GUI_V_SPACER 30}
[/row]
[/row]
[row]
grow_factor = 1
[row]
grow_factor = 1
[column]
vertical_alignment = "top"
[column]
vertical_alignment = "top"
[image]
id = "logo"
definition = "default"
[/image]
[image]
id = "logo"
definition = "default"
[/image]
[/column]
[/column]
[/row]
[/row]
[/layer]
[/layer]
[layer]
[layer]
[row]
[row]
[column]
horizontal_alignment = "left"
vertical_alignment = "bottom"
[column]
horizontal_alignment = "left"
vertical_alignment = "bottom"
[grid]
[grid]
[row]
[row]
[column]
grow_factor = 0
horizontal_alignment = "left"
[spacer]
# Should be as large as the about button on the
# foreground layer.
width = 25
height = 25
[/spacer]
[/column]
[column]
grow_factor = 0
horizontal_alignment = "left"
[spacer]
# Should be as large as the about button on the
# foreground layer.
width = 25
height = 25
[/spacer]
[/column]
{GUI_FILLER}
{GUI_FILLER}
[/row]
[/row]
[/grid]
[/grid]
[/column]
[/column]
[/row]
[/row]
[/layer]
[/layer]
[layer]
[layer]
[row]
grow_factor = 5
[row]
grow_factor = 5
{GUI_FILLER}
{GUI_FILLER}
{GUI_FILLER}
{GUI_FILLER}
{GUI_FILLER}
{GUI_FILLER}
{_GUI_V_SPACER 20}
{_GUI_V_SPACER 20}
{GUI_FILLER}
{GUI_FILLER}
[/row]
[/row]
[row]
[row]
{_GUI_H_SPACER 17 1}
{_GUI_H_SPACER 17 1}
[column]
vertical_alignment = "bottom"
horizontal_alignment = "left"
{_GUI_TIP_SECTION}
[/column]
[column]
vertical_alignment = "bottom"
horizontal_alignment = "left"
{_GUI_TIP_SECTION}
[/column]
{_GUI_H_SPACER 0 3}
{_GUI_H_SPACER 0 3}
[column]
horizontal_alignment = "right"
vertical_alignment = "bottom"
{_GUI_MENU_SECTION}
[/column]
[column]
horizontal_alignment = "right"
vertical_alignment = "bottom"
{_GUI_MENU_SECTION}
[/column]
{_GUI_H_SPACER 17 1}
{_GUI_H_SPACER 17 1}
[/row]
[/row]
[row]
grow_factor = 1
[row]
grow_factor = 1
{GUI_FILLER}
{GUI_FILLER}
{GUI_FILLER}
{GUI_FILLER}
{GUI_FILLER}
{GUI_FILLER}
#{_GUI_V_SPACER 22}
{GUI_FILLER}
#{_GUI_V_SPACER 22}
{GUI_FILLER}
{GUI_FILLER}
{GUI_FILLER}
[/row]
[/row]
[/layer]
[/stack]
[/layer]
[/stacked_widget]

6
src/gui/widgets/stacked_widget.cpp
View file

@ -218,7 +218,6 @@ tstacked_widget_definition::tresolution::tresolution(const config& cfg)
* @begin{tag}{name="stacked_widget"}{min="0"}{max="-1"}{super="generic/widget_instance"}
* @begin{table}{config}
* @end{table}
* @begin{tag}{name="stack"}{min=0}{max=-1}
* @begin{tag}{name="layer"}{min=0}{max=-1}{super="gui/window/resolution/grid"}
* @end{tag}{name="layer"}
* @end{tag}{name="stack"}
@ -232,9 +231,8 @@ namespace implementation
tbuilder_stacked_widget::tbuilder_stacked_widget(const config& cfg)
: tbuilder_control(cfg), stack()
{
const config& s = cfg.child("stack");
VALIDATE(s, _("No stack defined."));
for(const auto & layer : s.child_range("layer"))
VALIDATE(cfg.has_child("layer"), _("No stack defined."));
for(const auto & layer : cfg.child_range("layer"))
{
stack.push_back(std::make_shared<tbuilder_grid>(layer));
}