From d0f6d7d2f74ebb9057ad09fa69dd9dac97c7dfcd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fabian=20M=C3=BCller?= Date: Sat, 5 Mar 2011 11:32:25 +0000 Subject: [PATCH] Code cleanups. --- data/gui/default/window/image_message.cfg | 54 ++++++-- data/gui/default/window/recruit.cfg | 144 ++-------------------- 2 files changed, 54 insertions(+), 144 deletions(-) diff --git a/data/gui/default/window/image_message.cfg b/data/gui/default/window/image_message.cfg index 46422b8c9ff..ee5e7dd2846 100644 --- a/data/gui/default/window/image_message.cfg +++ b/data/gui/default/window/image_message.cfg @@ -213,6 +213,7 @@ {IMAGE_MESSAGE image_message} {IMAGE_MESSAGE input_message} +{IMAGE_MESSAGE option_message} #define _GUI_INPUT @@ -259,9 +260,18 @@ #enddef #define _GUI_OPTION_LIST + + [row] + [column] + border = "all" + border_size = 5 + horizontal_grow = "true" + + + [listbox] id = "option_list" - definition = "option_message" + definition = "wml_message" [list_definition] [row] @@ -271,7 +281,7 @@ horizontal_grow = "true" [toggle_panel] - definition = "option_message" + definition = "wml_message" return_value_id = "ok" [grid] @@ -336,6 +346,12 @@ [/list_definition] [/listbox] + # + # #{_GUI_RECRUIT_LIST} + + [/column] + + [/row] #enddef #define _GUI_UNIT_LIST @@ -590,7 +606,7 @@ #enddef -#define IMAGE_MESSAGE_WINDOW ID +#define IMAGE_MESSAGE_WINDOW ID GUI_ELEMENT [window] id = "{ID}_left" description = "Dialog showing a unit portrait on the left side" @@ -655,7 +671,7 @@ fixed_width = "true" [/linked_group] - [linked_group] + [linked_group] id = "usage" fixed_width = "true" [/linked_group] @@ -754,7 +770,24 @@ [/column] - [/row] + [/row] + {GUI_ELEMENT} + #[row] + + # [column] + # border = "all" + ## border_size = 5 + # horizontal_grow = "true" + + # + # #{_GUI_RECRUIT_LIST} + + # [/column] + + #[/row] + + + [row] @@ -981,6 +1014,9 @@ if(gamemap_width - ({__GUI_IMAGE_WIDTH}) > {MAX_TEXT_WIDTH} [/row] + {GUI_ELEMENT} + + # [row] # # [column] @@ -1100,10 +1136,12 @@ if(gamemap_width - (10 + ({__GUI_IMAGE_WIDTH})) > {MAX_TEXT_WIDTH} [/window] #enddef -{IMAGE_MESSAGE_WINDOW image_message} -{IMAGE_MESSAGE_WINDOW input_message} +{IMAGE_MESSAGE_WINDOW image_message ()} +{IMAGE_MESSAGE_WINDOW input_message ({_GUI_INPUT}) } +{IMAGE_MESSAGE_WINDOW option_message ({_GUI_OPTION_LIST}) } -#undef _GUI_INPUT_LIST +#undef _GUI_INPUT +#undef _GUI_OPTION_LIST #undef _GUI_UNIT_LIST #undef __GUI_IMAGE_DISPLAYED_Y diff --git a/data/gui/default/window/recruit.cfg b/data/gui/default/window/recruit.cfg index c33f9f4239c..5c0cd4f88af 100644 --- a/data/gui/default/window/recruit.cfg +++ b/data/gui/default/window/recruit.cfg @@ -1,105 +1,14 @@ #textdomain wesnoth-lib -{gui/default/macros/_initial.cfg} ### -### The recruit dialogs +### The recruit dialog. ### -#[window_definition] -# id = "recruit_message_left" -# description = "bar" -# -# [resolution] - -# [background] - -# [draw] - -# [/draw] - -# [/background] - -# [foreground] - -# [draw] - -# [image] -# x = "{__GUI_IMAGE_DISPLAYED_X X}" -# y = "{__GUI_IMAGE_DISPLAYED_Y}" -# w = "{__GUI_IMAGE_DISPLAYED_WIDTH}" -# h = "{__GUI_IMAGE_DISPLAYED_HEIGHT}" -# name = "(portrait_image)" -# vertical_mirror = "(portrait_mirror)" -# [/image] - -# [/draw] - -# [/foreground] - -# [/resolution] - -#[/window_definition] - - - -#[window_definition] -# id = "recruit_message_right" -# description = "bar" - -# [resolution] - -# [background] - -# [draw] - -# [/draw] - -# [/background] - -# [foreground] - -# [draw] - -# [image] -# x = "(width - {__GUI_IMAGE_DISPLAYED_WIDTH})" -# y = "(height - image_height)" -# w = "{__GUI_IMAGE_DISPLAYED_WIDTH}" -# h = "{__GUI_IMAGE_DISPLAYED_HEIGHT}" -# name = "(portrait_image)" -# vertical_mirror = "(portrait_mirror)" -# [/image] - -# [/draw] - -# [/foreground] - -# [/resolution] - -#[/window_definition] - - - - - - - - - - - - - - - - - - #define _GUI_RECRUIT_WINDOW SIDE [window] id=recruit_message_{SIDE} - description="A fucking description" + description="Recruit Dialog Window" [resolution] - [linked_group] id = "cost" fixed_width = "true" @@ -110,20 +19,15 @@ definition= "default" automatic_placement= "false" - vertical_placement= "center" - horizontal_placement= "right" + #vertical_placement= "center" + #horizontal_placement= "right" maximum_width= 800 maximum_height= 600 - border_size=50 - border=all width=800 height=600 x=743 y=200 - - # definition = "recruit_message_{SIDE}" - [grid] [row] @@ -146,31 +50,8 @@ [grid] [row] [column] - horizontal_grow=yes - #horizontal_alignment=left - #vertical_alignment=bottom - #border_size=5 - #border= "all" - #automatic_placement=true - #width=500 - #height=500 - min_width=500 - min_height=500 - #fixed_width=true - #fixed_height=true [image] - horizontal_grow=yes - # name = "(portrait_image)" - #w = "{__GUI_IMAGE_DISPLAYED_WIDTH}" - #h = "{__GUI_IMAGE_DISPLAYED_HEIGHT}" - #w=500 - #h=500 - min_width=500 - min_height=500 - #width=500 - #height=500 - #fixed_width=true - #fixed_height=true + definition=scaled id=unit_portrait [/image] [/column] @@ -178,8 +59,7 @@ [column] horizontal_alignment=right vertical_alignment=top - - #automatic_placement=true + [grid] [row] [column] @@ -254,16 +134,8 @@ [/row] [/list_definition] [/listbox] - [/column] [/row] - - #[row] - - #[/row] - #[row] - - #[/row] [/grid] [/column] [/row] @@ -308,8 +180,8 @@ [spacer] width=280 height=0 - - + + [/spacer] [/column] [column]