Author: fendrin Date: Sat Mar 5 12:32:25 2011 New Revision: 48745 URL: http://svn.gna.org/viewcvs/wesnoth?rev=48745&view=rev Log: Code cleanups.
Modified:
trunk/data/gui/default/window/image_message.cfg
trunk/data/gui/default/window/recruit.cfg
Modified: trunk/data/gui/default/window/image_message.cfg
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/data/gui/default/window/image_message.cfg?rev=48745&r1=48744&r2=48745&view=diff
==============================================================================
--- trunk/data/gui/default/window/image_message.cfg (original)
+++ trunk/data/gui/default/window/image_message.cfg Sat Mar 5 12:32:25 2011
@@ -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 @@
[/row]
+
{GUI_ELEMENT}
+
+
# [row]
#
#
[column]
@@ -1100,10 +1136,12 @@
[/window]
#enddef
-{IMAGE_MESSAGE_WINDOW image_message}
-{IMAGE_MESSAGE_WINDOW input_message}
-
-#undef _GUI_INPUT_LIST
+{IMAGE_MESSAGE_WINDOW image_message ()}
+{IMAGE_MESSAGE_WINDOW input_message ({_GUI_INPUT}) }
+{IMAGE_MESSAGE_WINDOW option_message ({_GUI_OPTION_LIST}) }
+
+#undef _GUI_INPUT
+#undef _GUI_OPTION_LIST
#undef _GUI_UNIT_LIST
#undef __GUI_IMAGE_DISPLAYED_Y
Modified: trunk/data/gui/default/window/recruit.cfg
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/data/gui/default/window/recruit.cfg?rev=48745&r1=48744&r2=48745&view=diff
==============================================================================
--- trunk/data/gui/default/window/recruit.cfg (original)
+++ trunk/data/gui/default/window/recruit.cfg Sat Mar 5 12:32:25 2011
@@ -1,104 +1,13 @@
#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"
@@ -110,19 +19,14 @@
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]
@@ -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]
+ [/column]
+ [/row]
[/grid]
[/column]
[/row]
@@ -308,8 +180,8 @@
[spacer]
width=280
height=0
-
-
+
+
[/spacer]
[/column]
[column]
_______________________________________________
Wesnoth-commits mailing list
[email protected]
https://mail.gna.org/listinfo/wesnoth-commits
