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

Moved custom_options_tree.cfg to a better location

Browse source 
Also fixed its linked_groups not being included in sp_options_configure.cfg
This commit is contained in:
Charles Dang 2016-09-02 10:18:38 +11:00
parent 423fc10437
commit fd53599f77
6 changed files with 17 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
data/gui/window/mp_create_game/custom_options_tree.cfg → data/gui/macros/custom_options_tree.cfg
View file

@ -2,7 +2,14 @@
# Not a dialog, but a common portion of dialog layout used in at least two dialogs
#
#define _GUI_MP_CREATE_OPTIONS_PANEL
#define _GUI_CUSTOM_OPTIONS_TREE_LINKED_GROUPS
[linked_group]
id = "custom_options_labels"
fixed_width = "true"
[/linked_group]
#enddef
#define _GUI_CUSTOM_OPTIONS_TREE
[row]
grow_factor = 0

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

@ -982,8 +982,6 @@
[/row]
#enddef
{./mp_create_game/custom_options_tree.cfg}
[window]
id = "mp_create_game"
description = "MP create game dialog."
@ -995,7 +993,6 @@
#undef _GUI_MP_CREATE_OPTION_SLIDER
#undef _GUI_MP_CREATE_GENERAL_PANEL
#undef _GUI_MP_CREATE_OPTIONS_PANEL
#undef _GUI_MP_CREATE_MAP_SETTINGS
#undef _GUI_MP_CREATE_TIME_LIMIT
#undef _GUI_MP_CREATE_TAB_BAR

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

@ -10,10 +10,7 @@
fixed_width = "true"
[/linked_group]
[linked_group]
id = "custom_options_labels"
fixed_width = "true"
[/linked_group]
{_GUI_CUSTOM_OPTIONS_TREE_LINKED_GROUPS}
[tooltip]
id = "tooltip"
@ -321,7 +318,7 @@
[/layer]
[layer]
{_GUI_MP_CREATE_OPTIONS_PANEL}
{_GUI_CUSTOM_OPTIONS_TREE}
[/layer]
[layer]

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

@ -11,10 +11,7 @@
fixed_width = "true"
[/linked_group]
[linked_group]
id = "custom_options_labels"
fixed_width = "true"
[/linked_group]
{_GUI_CUSTOM_OPTIONS_TREE_LINKED_GROUPS}
[tooltip]
id = "tooltip"
@ -290,7 +287,7 @@
[/layer]
[layer]
{_GUI_MP_CREATE_OPTIONS_PANEL}
{_GUI_CUSTOM_OPTIONS_TREE}
[/layer]
[layer]

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

@ -12,10 +12,7 @@
fixed_height = "true"
[/linked_group]
[linked_group]
id = "custom_options_labels"
fixed_width = "true"
[/linked_group]
{_GUI_CUSTOM_OPTIONS_TREE_LINKED_GROUPS}
[tooltip]
id = "tooltip"
@ -231,7 +228,7 @@
[/layer]
[layer]
{_GUI_MP_CREATE_OPTIONS_PANEL}
{_GUI_CUSTOM_OPTIONS_TREE}
[/layer]
[layer]

8
data/gui/window/sp_options_configure.cfg
View file

@ -3,8 +3,6 @@
### Definition of the window to set custom option values in SP
###
{./mp_create_game/custom_options_tree.cfg}
[window]
id = "sp_options_configure"
description = "SP custom option configre dialog"
@ -17,6 +15,8 @@
maximum_height = 700
{_GUI_CUSTOM_OPTIONS_TREE_LINKED_GROUPS}
[tooltip]
id = "tooltip"
[/tooltip]
@ -71,7 +71,7 @@
{GUI_FORCE_WIDGET_MINIMUM_SIZE 500 0 (
[grid]
{_GUI_MP_CREATE_OPTIONS_PANEL}
{_GUI_CUSTOM_OPTIONS_TREE}
[/grid]
)}
@ -124,5 +124,3 @@
[/resolution]
[/window]
#undef _GUI_MP_CREATE_OPTIONS_PANEL