Resolved naming conflict.

This commit is contained in:
Fabian Müller 2011-02-12 22:35:15 +00:00
parent cf921d70f9
commit a3caa30a09

View file

@ -139,8 +139,9 @@
)#enddef
#define IMAGE_MESSAGE ID
[window_definition]
id = "wml_message_left"
id = "{ID}_left"
description = "bar"
[resolution]
@ -175,7 +176,7 @@
[/window_definition]
[window_definition]
id = "wml_message_right"
id = "{ID}_right"
description = "bar"
[resolution]
@ -208,11 +209,59 @@
[/resolution]
[/window_definition]
#enddef
#define _GUI_INPUT_LIST
{IMAGE_MESSAGE image_message}
{IMAGE_MESSAGE input_message}
#define _GUI_INPUT
[row]
[column]
grow_factor = 1
horizontal_grow = "true"
[grid]
[row]
[column]
border = "all"
border_size = 5
[label]
id = "input_caption"
definition = "default"
[/label]
[/column]
[column]
grow_factor = 1
horizontal_grow = "true"
border = "all"
border_size = 5
[text_box]
id = "input"
definition = "default"
[/text_box]
[/column]
[/row]
[/grid]
[/column]
[/row]
#enddef
#define _GUI_OPTION_LIST
[listbox]
id = "input_list"
definition = "wml_message"
id = "option_list"
definition = "option_message"
[list_definition]
[row]
@ -222,7 +271,7 @@
horizontal_grow = "true"
[toggle_panel]
definition = "wml_message"
definition = "option_message"
return_value_id = "ok"
[grid]
@ -292,7 +341,7 @@
#define _GUI_UNIT_LIST
[listbox]
id = "unit_list"
definition = "wml_message"
definition = "unit_message"
[list_definition]
[row]
@ -302,7 +351,7 @@
horizontal_grow = "true"
[toggle_panel]
definition = "wml_message"
definition = "unit_message"
return_value_id = "ok"
[grid]
@ -447,7 +496,7 @@
#define _GUI_RECRUIT_LIST
[listbox]
id = "recruit_list"
definition = "wml_message"
definition = "recruit_message"
[list_definition]
[row]
@ -457,7 +506,7 @@
horizontal_grow = "true"
[toggle_panel]
definition = "wml_message"
definition = "recruit_message"
return_value_id = "ok"
[grid]
@ -541,16 +590,16 @@
#enddef
#define IMAGE_MESSAGE_WINDOW ID
[window]
id = "wml_message_left"
id = "{ID}_left"
description = "Dialog showing a unit portrait on the left side"
[resolution]
window_width = 0
window_height = 0
definition = "wml_message_left"
definition = "{ID}_left"
automatic_placement = "false"
@ -679,81 +728,13 @@
[scroll_label]
id = "message"
definition = "wml_message"
definition = "{ID}"
[/scroll_label]
[/column]
[/row]
[row]
[column]
grow_factor = 1
horizontal_grow = "true"
[grid]
[row]
[column]
border = "all"
border_size = 5
[label]
id = "input_caption"
definition = "default"
[/label]
[/column]
[column]
grow_factor = 1
horizontal_grow = "true"
border = "all"
border_size = 5
[text_box]
id = "input"
definition = "default"
[/text_box]
[/column]
[/row]
[/grid]
[/column]
[/row]
[row]
[column]
border = "all"
border_size = 5
horizontal_grow = "true"
{_GUI_INPUT_LIST}
[/column]
[/row]
[row]
[column]
border = "all"
border_size = 5
horizontal_grow = "true"
{_GUI_UNIT_LIST}
[/column]
[/row]
[row]
[column]
@ -775,33 +756,33 @@
[row]
[column]
border = "all"
border_size = 5
horizontal_alignment = "center"
# [column]
# border = "all"
# border_size = 5
# horizontal_alignment = "center"
#
# [button]
# # This button will be shown or hidden depending on the
# # whether or not a sellection may be avoided
# id = "help"
# definition = "transparent"
# label = _ "Help"
# [/button]
# [/column]
# [column]
# border = "all"
# border_size = 5
# horizontal_alignment = "center"
[button]
# [button]
# This button will be shown or hidden depending on the
# whether or not a sellection may be avoided
id = "help"
definition = "transparent"
label = _ "Help"
[/button]
[/column]
[column]
border = "all"
border_size = 5
horizontal_alignment = "center"
[button]
# This button will be shown or hidden depending on the
# whether or not a sellection may be avoided
id = "profile"
definition = "transparent"
label = _ "Profile"
[/button]
[/column]
# id = "profile"
# definition = "transparent"
#
# label = _ "Profile"
# [/button]
# [/column]
[column]
border = "all"
@ -819,21 +800,21 @@
[/button]
[/column]
[column]
border = "all"
border_size = 5
horizontal_alignment = "center"
[button]
# This button will be shown or hidden depending on the
# whether or not a scrollbar is needed to show the
# text.
id = "cancel"
definition = "transparent"
label = _ "Cancel"
[/button]
[/column]
# [column]
# border = "all"
# border_size = 5
# horizontal_alignment = "center"
#
# [button]
# # This button will be shown or hidden depending on the
# # whether or not a scrollbar is needed to show the
# # text.
# id = "cancel"
# definition = "transparent"
#
# label = _ "Cancel"
# [/button]
# [/column]
[/row]
[/grid]
[/column]
@ -879,14 +860,14 @@ if(gamemap_width - ({__GUI_IMAGE_WIDTH}) > {MAX_TEXT_WIDTH}
[/window]
[window]
id = "wml_message_right"
id = "{ID}_right"
description = "Dialog showing a unit portrait on the right side"
[resolution]
window_width = 0
window_height = 0
definition = "wml_message_right"
definition = "{ID}_right"
automatic_placement = "false"
@ -983,74 +964,32 @@ if(gamemap_width - ({__GUI_IMAGE_WIDTH}) > {MAX_TEXT_WIDTH}
[/row]
[row]
[column]
grow_factor = 1
horizontal_grow = "true"
[grid]
[row]
[column]
border = "all"
border_size = 5
[label]
id = "input_caption"
definition = "default"
[/label]
[/column]
[column]
grow_factor = 1
horizontal_grow = "true"
border = "all"
border_size = 5
[text_box]
id = "input"
definition = "default"
[/text_box]
[/column]
[/row]
[/grid]
[/column]
[/row]
[row]
[column]
border = "all"
border_size = 5
horizontal_grow = "true"
{_GUI_INPUT_LIST}
[/column]
[/row]
# [row]
#
# [column]
# border = "all"
# border_size = 5
# horizontal_grow = "true"
#
# {_GUI_OPTION_LIST}
#
# [/column]
#
# [/row]
[row]
[column]
border = "all"
border_size = 5
horizontal_grow = "true"
{_GUI_UNIT_LIST}
[/column]
[/row]
# [row]
#
# [column]
# border = "all"
# border_size = 5
# horizontal_grow = "true"
#
# {_GUI_UNIT_LIST}
#
# [/column]
#
# [/row]
[row]
@ -1071,26 +1010,26 @@ if(gamemap_width - ({__GUI_IMAGE_WIDTH}) > {MAX_TEXT_WIDTH}
[/column]
[/row]
[row]
[column]
border = "all"
border_size = 5
horizontal_alignment = "center"
[button]
# This button will be shown or hidden depending on the
# whether or not a scrollbar is needed to show the
# text.
id = "canel"
definition = "transparent"
label = _ "Cancel"
[/button]
[/column]
[/row]
# [row]
# [column]
# border = "all"
# border_size = 5
# horizontal_alignment = "center"
#
# [button]
# # This button will be shown or hidden depending on the
# # whether or not a scrollbar is needed to show the
# # text.
# id = "canel"
# definition = "transparent"
#
# label = _ "Cancel"
# [/button]
#
# [/column]
#
#
# [/row]
[/grid]
@ -1143,6 +1082,10 @@ if(gamemap_width - (10 + ({__GUI_IMAGE_WIDTH})) > {MAX_TEXT_WIDTH}
[/resolution]
[/window]
#enddef
{IMAGE_MESSAGE_WINDOW image_message}
{IMAGE_MESSAGE_WINDOW input_message}
#undef _GUI_INPUT_LIST
#undef _GUI_UNIT_LIST