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

MP Lobby: cleaned up WML layout

Browse source 
[ci skip]

This mostly focused on formatting and reducing the number of sub-grids in the player tree area.
This commit is contained in:
Charles Dang 2017-11-05 22:22:15 +11:00
parent 744608882b
commit 961c8c05d3
1 changed files with 222 additions and 172 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

394
data/gui/window/lobby_main.cfg
View file

@ -3,7 +3,7 @@
### Definition of the lobby screen
###
#define GAMELISTBOX
#define _GUI_GAME_LIST
[listbox]
id = "game_list"
definition = "default"
@ -199,187 +199,198 @@
[/listbox]
#enddef
#define PLAYERLISTBOX
[grid]
[row]
[column]
horizontal_alignment = "left"
[grid]
[row]
[column]
grow_factor = 0
horizontal_alignment = "left"
border = "all"
border_size = 5
[label]
definition = "default_small"
label = _ "Sort players:"
[/label]
[/column]
[column]
grow_factor = 1
horizontal_alignment = "left"
border = "left,right"
border_size = 5
[toggle_button]
id = "player_list_sort_relation"
definition = "icon"
icon = "lobby/sort-friend-off.png"
tooltip = _ "Friends first, ignored people last"
[/toggle_button]
[/column]
[column]
grow_factor = 1
horizontal_alignment = "left"
border = "left,right"
border_size = 5
[toggle_button]
id = "player_list_sort_name"
definition = "icon"
icon = "lobby/sort-az-off.png"
tooltip = _ "Alphabetically"
[/toggle_button]
[/column]
[/row]
[/grid]
[/column]
[/row]
#define _GUI_PLAYER_TREE_AREA
[row]
grow_factor = 0
[row]
grow_factor = 1
[column]
border = "top"
border_size = 5
horizontal_alignment = "left"
vertical_grow = true
[column]
border = "all"
border_size = 5
vertical_grow = true
horizontal_grow = true
[grid]
[tree_view]
id = "player_tree"
definition = "default"
[row]
horizontal_scrollbar_mode = "never"
vertical_scrollbar_mode = "auto"
[column]
grow_factor = 0
border = "all"
border_size = 5
# TODO: use 25?
#indentation_step_size = 25
indentation_step_size = 0
[label]
definition = "default_small"
label = _ "Sort players:"
[/label]
[/column]
[node]
id = "player_group"
[node_definition]
[column]
grow_factor = 0
border = "left,right"
border_size = 5
[row]
[toggle_button]
id = "player_list_sort_relation"
definition = "icon"
icon = "lobby/sort-friend-off.png"
tooltip = _ "Friends first, ignored people last"
[/toggle_button]
[/column]
[column]
grow_factor = 0
[column]
grow_factor = 0
border = "left,right"
border_size = 5
[toggle_button]
id = "tree_view_node_toggle"
definition = "tree_view_node"
[/toggle_button]
[toggle_button]
id = "player_list_sort_name"
definition = "icon"
icon = "lobby/sort-az-off.png"
tooltip = _ "Alphabetically"
[/toggle_button]
[/column]
[/column]
[/row]
[column]
grow_factor = 1
horizontal_grow = true
border = "top,bottom,right"
border_size = 5
[/grid]
[label]
id = "tree_view_node_label"
definition = "default_small"
label = "group"
[/label]
[/column]
[/column]
[/row]
[column]
grow_factor = 0
horizontal_grow = true
border = "top,bottom,right"
border_size = 5
[row]
grow_factor = 1
[label]
id = "player_count"
definition = "default_small"
label = "group"
[/label]
[column]
border = "all"
border_size = 5
vertical_grow = true
horizontal_grow = true
[/column]
[tree_view]
id = "player_tree"
definition = "default"
[/row]
horizontal_scrollbar_mode = "never"
vertical_scrollbar_mode = "auto"
[/node_definition]
# TODO: use 25?
#indentation_step_size = 25
indentation_step_size = 0
[/node]
[node]
id = "player_group"
[node_definition]
[node]
id = "player"
[node_definition]
[row]
return_value_id = "ok"
[row]
[column]
grow_factor = 0
[column]
horizontal_grow = true
[toggle_button]
id = "tree_view_node_toggle"
definition = "tree_view_node"
[/toggle_button]
[toggle_panel]
id = "tree_view_node_label"
definition = "default"
[/column]
[grid]
[column]
grow_factor = 1
horizontal_grow = true
border = "top,bottom,right"
border_size = 5
[row]
[label]
id = "tree_view_node_label"
definition = "default_small"
label = "group"
[/label]
[column]
border = "all"
border_size = 5
vertical_alignment = "top"
[/column]
[image]
id = "icon"
definition = "default"
[/image]
[column]
grow_factor = 0
horizontal_grow = true
border = "top,bottom,right"
border_size = 5
[/column]
[label]
id = "player_count"
definition = "default_small"
label = "group"
[/label]
[column]
grow_factor = 1
horizontal_grow = true
[/column]
border = "right"
border_size = 8
[/row]
[label]
id = "name"
definition = "default"
[/label]
[/node_definition]
[/column]
[/node]
[/row]
[node]
id = "player"
[node_definition]
[/grid]
return_value_id = "ok"
[row]
[/toggle_panel]
[column]
horizontal_grow = true
[/column]
[toggle_panel]
id = "tree_view_node_label"
definition = "default"
[/row]
[grid]
[/node_definition]
[row]
[/node]
[column]
border = "all"
border_size = 5
vertical_alignment = "top"
[/tree_view]
[image]
id = "icon"
definition = "default"
[/image]
[/column]
[/column]
[/row]
[column]
grow_factor = 1
horizontal_grow = true
[/grid]
border = "right"
border_size = 8
[label]
id = "name"
definition = "default"
[/label]
[/column]
[/row]
[/grid]
[/toggle_panel]
[/column]
[/row]
[/node_definition]
[/node]
[/tree_view]
[/column]
[/row]
#enddef
#define _GUI_FILTER_AREA
@ -390,41 +401,49 @@
horizontal_grow = true
border = "all"
border_size = 5
[text_box]
definition = "filter"
id = "filter_text"
[/text_box]
[/column]
[column]
grow_factor = 1
border = "all"
border_size = 5
[toggle_button]
definition = "default"
id = "filter_with_friends"
label = _ "Friends"
[/toggle_button]
[/column]
[column]
grow_factor = 1
border = "all"
border_size = 5
[toggle_button]
definition = "default"
id = "filter_without_ignored"
label = _ "No ignored"
[/toggle_button]
[/column]
[column]
grow_factor = 1
border = "all"
border_size = 5
[toggle_button]
definition = "default"
id = "filter_vacant_slots"
label = _ "Vacant slots"
[/toggle_button]
[/column]
[column]
grow_factor = 1
border = "all"
@ -466,14 +485,7 @@
[/button]
[/column]
[/row]
[/grid]
[/column]
[/row]
[row]
[column]
horizontal_grow = true
[grid]
[row]
[column]
@ -497,14 +509,7 @@
[/column]
[/row]
[/grid]
[/column]
[/row]
[row]
[column]
horizontal_grow = true
[grid]
[row]
[column]
border = "all"
@ -555,44 +560,49 @@
[/option]
[/menu_button]
[/column]
[/row]
{GUI_HORIZONTAL_SPACER_LINE}
[row]
grow_factor = 1
[column]
border = "top"
border_size = 5
horizontal_grow = true
vertical_grow = true
{PLAYERLISTBOX}
[/column]
[/row]
{_GUI_PLAYER_TREE_AREA}
[/grid]
#enddef
[window]
id = "mp_lobby"
description = "Lobby screen."
#
# Low resolution
#
[resolution]
window_height = 600
definition = "borderless"
{GUI_WINDOW_FULLSCREEN}
[tooltip]
id = "tooltip"
[/tooltip]
[helptip]
id = "tooltip"
[/helptip]
[grid]
[row]
grow_factor = 0
[column]
horizontal_grow = true
[grid]
[row]
grow_factor = 0
[column]
grow_factor = 1
horizontal_alignment = "left"
@ -634,11 +644,14 @@
[row]
grow_factor = 0
[column]
horizontal_grow = true
[grid]
[row]
grow_factor = 0
[column]
grow_factor = 0
border = "all"
@ -650,6 +663,7 @@
label = _ "Preferences"
[/button]
[/column]
[column]
grow_factor = 0
border = "all"
@ -661,6 +675,7 @@
label = _ "Create Game"
[/button]
[/column]
[column]
grow_factor = 0
border = "all"
@ -672,6 +687,7 @@
label = _ "Join"
[/button]
[/column]
[column]
grow_factor = 0
border = "all"
@ -683,6 +699,7 @@
label = _ "Observe"
[/button]
[/column]
[column]
grow_factor = 1
border = "all"
@ -712,50 +729,66 @@
[/grid]
[/column]
[/row]
[row]
grow_factor = 0
[column]
horizontal_grow = true
vertical_grow = true
border = "all"
border_size = 5
{GUI_FORCE_WIDGET_MINIMUM_SIZE 0 "((screen_height * 35) / 100)" (
{GAMELISTBOX}
{_GUI_GAME_LIST}
)}
[/column]
[/row]
[row]
grow_factor = 0
[column]
horizontal_grow = true
{_GUI_FILTER_AREA}
[/column]
[/row]
{GUI_HORIZONTAL_SPACER_LINE}
[row]
grow_factor = 1
[column]
horizontal_grow = true
vertical_grow = true
{GUI_FORCE_WIDGET_SIZE 0 "((screen_height * 20) / 100)" (
[grid]
[row]
grow_factor = 1
[column]
grow_factor = 1
horizontal_grow = true
vertical_grow = true
[chatbox]
id = "chat"
[/chatbox]
[/column]
[column]
grow_factor = 0
border = "top"
border_size = 5
horizontal_grow = true
vertical_grow = true
{PLAYERLISTBOX}
[grid]
{_GUI_PLAYER_TREE_AREA}
[/grid]
[/column]
[/row]
[/grid]
@ -764,12 +797,16 @@
[/row]
[/grid]
[/resolution]
#
# Default resolution
#
[resolution]
window_height = 660
definition = "borderless"
{GUI_WINDOW_FULLSCREEN}
[tooltip]
id = "tooltip"
[/tooltip]
@ -779,30 +816,39 @@
[/helptip]
[grid]
[row]
grow_factor = 0
[column]
grow_factor = 1
horizontal_alignment = "left"
border = "all"
border_size = 5
[label]
definition = "title"
label = _ "Multiplayer Lobby"
[/label]
[/column]
[/row]
[row]
grow_factor = 1
[column]
horizontal_grow = true
vertical_grow = true
[grid]
[row]
[column]
grow_factor = 1
vertical_grow = true
horizontal_grow = true
[grid]
[row]
@ -824,7 +870,7 @@
horizontal_grow = true
vertical_grow = true
{GAMELISTBOX}
{_GUI_GAME_LIST}
[/column]
[/row]
@ -832,9 +878,11 @@
[row]
grow_factor = 0
[column]
horizontal_grow = true
vertical_grow = true
{GUI_FORCE_WIDGET_SIZE 0 "((screen_height * 25 / 100))" (
[chatbox]
id = "chat"
@ -844,7 +892,9 @@
[/row]
[/grid]
[/column]
[column]
grow_factor = 0
vertical_grow = true
{_GUI_CONTROL_AREA}
@ -859,5 +909,5 @@
#undef _GUI_CONTROL_AREA
#undef _GUI_FILTER_AREA
#undef GAMELISTBOX
#undef PLAYERLISTBOX
#undef _GUI_GAME_LIST
#undef _GUI_PLAYER_TREE_AREA