Converted Recruit dialog to GUI2

data/gui/default/window/unit_recruit.cfg

@@ -0,0 +1,234 @@
+#textdomain wesnoth-lib
+###
+### Definition of the window to recruit units
+###
+
+#define _GUI_RECRUIT_LIST
+	[listbox]
+		id = "recruit_list"
+		definition = "default"
+
+		[list_definition]
+			[row]
+				[column]
+					vertical_grow = "true"
+					horizontal_grow = "true"
+
+					[toggle_panel]
+						definition = "default"
+
+						return_value_id = "ok"
+						[grid]
+							[row]
+								[column]
+									grow_factor = 1
+									horizontal_grow = "true"
+									border = "all"
+									border_size = 5
+									[image]
+										id = "unit_image"
+										definition = "default"
+										linked_group = "image"
+									[/image]
+								[/column]
+
+								[column]
+									grow_factor = 0
+									horizontal_grow = "true"
+
+									[grid]
+										[row]
+											[column]
+												border = "all"
+												border_size = 5
+												horizontal_alignment = "left"
+												[label]
+													id = "unit_type"
+													definition = "default"
+													linked_group = "type"
+												[/label]
+											[/column]
+										[/row]
+
+										[row]
+											[column]
+												horizontal_alignment = "left"
+												[grid]
+													[row]
+														grow_factor = 1
+
+														[column]
+															border = "left,top,bottom"
+															border_size = 5
+															horizontal_alignment = "left"
+															[image]
+																id = "gold_icon"
+																definition = "default"
+
+																label = "themes/gold.png"
+															[/image]
+														[/column]
+
+														[column]
+															border = "all"
+															border_size = 5
+															horizontal_alignment = "left"
+															[label]
+																id = "unit_cost"
+																definition = "default"
+															[/label]
+														[/column]
+													[/row]
+												[/grid]
+											[/column]
+										[/row]
+									[/grid]
+								[/column]
+							[/row]
+						[/grid]
+					[/toggle_panel]
+				[/column]
+			[/row]
+		[/list_definition]
+	[/listbox]
+#enddef
+
+[window]
+	id = "unit_recruit"
+	description = "Unut recruit dialog."
+
+	[resolution]
+		definition = "default"
+		automatic_placement = "true"
+		vertical_placement = "center"
+		horizontal_placement = "center"
+
+		maximum_height = 600
+
+		[linked_group]
+			id = "image"
+			fixed_width = "true"
+		[/linked_group]		
+
+		[linked_group]
+			id = "type"
+			fixed_width = "true"
+		[/linked_group]
+
+		[tooltip]
+			id = "tooltip_large"
+		[/tooltip]
+
+		[helptip]
+			id = "tooltip_large"
+		[/helptip]
+
+		[grid]
+			[row]
+				grow_factor = 0
+
+				[column]
+					grow_factor = 1
+					border = "all"
+					border_size = 5
+					horizontal_alignment = "left"
+
+					[label]
+						definition = "title"
+						label = _ "Recruit Unit"
+					[/label]
+
+				[/column]
+
+			[/row]
+
+			[row]
+				grow_factor = 1
+
+				[column]
+					horizontal_grow = "true"
+					[grid]
+
+						[row]
+							[column]
+								horizontal_grow = "true"
+								vertical_grow = "true"
+								border = "all"
+								border_size = 5
+
+								[unit_preview_pane]
+									definition = "minimal"
+									id = "recruit_details"
+								[/unit_preview_pane]
+
+							[/column]
+
+							[column]
+								horizontal_alignment = "right"
+								border = "all"
+								border_size = 5
+								{_GUI_RECRUIT_LIST}
+							[/column]
+						[/row]
+					[/grid]
+				[/column]
+			[/row]
+
+			[row]
+				grow_factor = 0
+
+				[column]
+					grow_factor = 0
+					horizontal_grow = "true"
+					[grid]
+						[row]
+							grow_factor=0
+
+							[column]
+								grow_factor = 1
+								border = "all"
+								border_size = 5
+								horizontal_alignment = "left"
+								[button]
+									id = "show_help"
+									definition = "default"
+									label = _ "Help"
+								[/button]
+							[/column]
+
+							[column]
+								grow_factor = 0
+								border = "all"
+								border_size = 5
+								horizontal_alignment = "right"
+								[button]
+									id = "ok"
+									definition = "default"
+									label = _ "Recruit"
+								[/button]
+							[/column]
+
+							[column]
+								grow_factor = 0
+								border = "all"
+								border_size = 5
+								horizontal_alignment = "right"
+								[button]
+									id = "cancel"
+									definition = "default"
+									label = _ "Cancel"
+								[/button]
+							[/column]
+						[/row]
+					[/grid]
+				[/column]
+
+			[/row]
+		[/grid]
+
+	[/resolution]
+
+[/window]
+
+#undef _GUI_RECRUIT_LIST
+#undef _GUI_DETAILS_SECTION

projectfiles/CodeBlocks/wesnoth.cbp

@@ -737,6 +737,8 @@
 		<Unit filename="../../src/gui/dialogs/unit_attack.hpp" />
 		<Unit filename="../../src/gui/dialogs/unit_create.cpp" />
 		<Unit filename="../../src/gui/dialogs/unit_create.hpp" />
+		<Unit filename="../../src/gui/dialogs/unit_recruit.cpp" />
+		<Unit filename="../../src/gui/dialogs/unit_recruit.hpp" />
 		<Unit filename="../../src/gui/dialogs/wml_error.cpp" />
 		<Unit filename="../../src/gui/dialogs/wml_error.hpp" />
 		<Unit filename="../../src/gui/dialogs/wml_message.cpp" />

src/CMakeLists.txt

@@ -950,6 +950,7 @@ set(wesnoth-main_SRC
 	gui/dialogs/transient_message.cpp
 	gui/dialogs/unit_attack.cpp
 	gui/dialogs/unit_create.cpp
+	gui/dialogs/unit_recruit.cpp
 	gui/dialogs/wml_error.cpp
 	gui/dialogs/wml_message.cpp
 	halo.cpp

src/SConscript

@@ -468,6 +468,7 @@ wesnoth_sources = Split("""
     gui/dialogs/transient_message.cpp
     gui/dialogs/unit_attack.cpp
     gui/dialogs/unit_create.cpp
+    gui/dialogs/unit_recruit.cpp
     gui/dialogs/wml_error.cpp
     gui/dialogs/wml_message.cpp
     gui/lib/types/point.cpp