gui2/tpreferences: More WIP with some initial layouts

data/gui/default/window/preferences.cfg

@@ -81,6 +81,7 @@
 		horizontal_placement = "center"
 
 		maximum_width = 800
+		maximum_height = 600
 
 		[linked_group]
 			id = "page_icon"
@@ -114,7 +115,7 @@
 					[label]
 						id =  "title"
 						definition = "title"
-						label = _ "Preferences"
+						label = _ "Preferences Mk. II"
 					[/label]
 				[/column]
 
@@ -165,6 +166,16 @@
 														linked_group = "page_label"
 													[/label]
 												[/column]
+												[column]
+													#
+													# Some icons aren't actually 72px tall, so enforce some
+													# consistency with an invisible spacer.
+													#
+													[spacer]
+														width = 0
+														height = 72
+													[/spacer]
+												[/column]
 											[/row]
 										[/grid]
 									[/toggle_panel]
@@ -178,18 +189,12 @@
 					grow_factor = 1
 					horizontal_grow = "true"
 					vertical_grow = "true"
-					border = "all"
-					border_size = 5
 
 					[stacked_widget]
 						id = "pager"
 						definition = "default"
 						[stack]
-							{_GUI_PREFS_PAGE (1)}
-							{_GUI_PREFS_PAGE (2)}
-							{_GUI_PREFS_PAGE (3)}
-							{_GUI_PREFS_PAGE (4)}
-							{_GUI_PREFS_PAGE (5)}
+							{./preferences}
 						[/stack]
 					[/stacked_widget]
 
@@ -202,6 +207,7 @@
 				{GUI_FILLER}
 
 				[column]
+					horizontal_alignment = "right"
 
 					[grid]
 

data/gui/default/window/preferences/01_general.cfg

@@ -0,0 +1,310 @@
+#textdomain wesnoth-lib
+###
+### Preferences dialog, General page
+###
+
+#define _GUI_PREFERENCES_MAIN_COMPOSITE_SLIDER _LABEL_ID _LABEL_TEXT _SLIDER_ID _SLIDER_ATTRIBUTES
+	[grid]
+		[row]
+			[column]
+				border = "all"
+				border_size = 5
+				horizontal_alignment = "left"
+
+				[label]
+					id = {_LABEL_ID}
+					definition = "default_small"
+					label = {_LABEL_TEXT}
+				[/label]
+			[/column]
+		[/row]
+		[row]
+			[column]
+				border = "all"
+				border_size = 5
+				horizontal_grow = true
+
+				[slider]
+					id = {_SLIDER_ID}
+					definition = "minimal"
+					{_SLIDER_ATTRIBUTES}
+				[/slider]
+			[/column]
+		[/row]
+	[/grid]
+#enddef
+
+#define _GUI_PREFERENCES_MAIN_GRID_1
+	[row]
+		[column]
+			horizontal_grow = true
+
+			[grid]
+				[row]
+					[column]
+						border = "all"
+						border_size = 5
+
+						[label]
+							label = _ "Scroll speed:"
+						[/label]
+					[/column]
+
+					[column]
+						horizontal_grow = true
+						border = "all"
+						border_size = 5
+
+						[slider]
+							id = "scroll_speed"
+							definition = "minimal"
+							minimum_value = 1
+							maximum_value = 100
+							step_size = 1
+							tooltip = _ "Change the speed of scrolling around the map"
+						[/slider]
+					[/column]
+				[/row]
+			[/grid]
+		[/column]
+	[/row]
+
+	[row]
+		[column]
+			horizontal_grow = true
+
+			[grid]
+				[row]
+					[column]
+						border = "top,left,right"
+						border_size = 5
+						horizontal_alignment = "left"
+
+						[toggle_button]
+							id = "turbo_toggle"
+							label = _ "Accelerated speed"
+							tooltip = _ "Make units move and fight faster"
+						[/toggle_button]
+					[/column]
+
+					[column]
+						border = "top,left,right"
+						border_size = 5
+						horizontal_alignment = "left"
+
+						[toggle_button]
+							id = "skip_ai_moves"
+							label = _ "Skip AI moves"
+							tooltip = _ "Do not animate AI units moving"
+						[/toggle_button]
+					[/column]
+				[/row]
+			[/grid]
+		[/column]
+	[/row]
+
+	[row]
+		[column]
+			horizontal_grow = true
+			{_GUI_PREFERENCES_CHECKBOX_ALIGN_BORDER}
+			{_GUI_PREFERENCES_MAIN_COMPOSITE_SLIDER
+				turbo_value ( _ "Speed: $value")
+				turbo_slider (
+					minimum_value,maximum_value=0,11
+					step_size=1
+					tooltip= _ "Units move and fight speed"
+				)
+			}
+		[/column]
+	[/row]
+
+	{_GUI_PREFERENCES_SPACER_ROW}
+
+	[row]
+		[column]
+			border = "top,left,right"
+			border_size = 5
+			horizontal_alignment = "left"
+
+			[toggle_button]
+				id = "disable_auto_moves"
+				label = _ "Disable automatic moves"
+				tooltip = _ "Do not allow automatic movements at the beginning of a turn"
+			[/toggle_button]
+		[/column]
+	[/row]
+
+	[row]
+		[column]
+			border = "top,left,right"
+			border_size = 5
+			horizontal_alignment = "left"
+
+			[toggle_button]
+				id = "show_turn_dialog"
+				label = _ "Turn dialog"
+				tooltip = _ "Display a dialog at the beginning of your turn"
+			[/toggle_button]
+		[/column]
+	[/row]
+
+	[row]
+		[column]
+			border = "top,left,right"
+			border_size = 5
+			horizontal_alignment = "left"
+
+			[toggle_button]
+				id = "whiteboard_on_start"
+				label = _ "Enable planning mode on start"
+				tooltip = _ "Activates Planning Mode on game start"
+			[/toggle_button]
+		[/column]
+	[/row]
+
+	[row]
+		[column]
+			border = "top,left,right"
+			border_size = 5
+			horizontal_alignment = "left"
+
+			[toggle_button]
+				id = "whiteboard_hide_allies"
+				label = _ "Hide allies’ plans by default"
+				tooltip = _ "Hide allies’ Planning Mode plans in multiplayer games"
+			[/toggle_button]
+		[/column]
+	[/row]
+
+	[row]
+		[column]
+			border = "top,left,right"
+			border_size = 5
+			horizontal_alignment = "left"
+
+			[toggle_button]
+				id = "interrupt_move_when_ally_sighted"
+				label = _ "Interrupt move when an ally is sighted"
+				tooltip = _ "Sighting an allied unit interrupts your unit’s movement"
+			[/toggle_button]
+		[/column]
+	[/row]
+
+	{_GUI_PREFERENCES_SPACER_ROW}
+
+	[row]
+		[column]
+			border = "top,left,right"
+			border_size = 5
+			horizontal_alignment = "left"
+
+			[toggle_button]
+				id = "save_replays"
+				label = _ "Save replays at the end of scenarios"
+				tooltip = _ "Save replays of games on victory in all modes and defeat in multiplayer"
+			[/toggle_button]
+		[/column]
+	[/row]
+
+	[row]
+		[column]
+			border = "top,left,right"
+			border_size = 5
+			horizontal_alignment = "left"
+
+			[toggle_button]
+				id = "delete_saves"
+				label = _ "Delete auto-saves at the end of scenarios"
+				tooltip = _ "Delete previous auto-saves on victory in all modes and defeat in multiplayer"
+			[/toggle_button]
+		[/column]
+	[/row]
+
+	[row]
+		[column]
+			horizontal_grow = true
+			{_GUI_PREFERENCES_CHECKBOX_ALIGN_BORDER}
+			{_GUI_PREFERENCES_MAIN_COMPOSITE_SLIDER
+				max_saves_value ( _ "Maximum auto-saves: $value")
+				max_saves_slider (
+					minimum_value,maximum_value=0,61
+					step_size=1
+					tooltip= _ "Set maximum number of automatic saves to be retained"
+				)
+			}
+		[/column]
+	[/row]
+#enddef
+
+#define _GUI_PREFERENCES_MAIN_GRID_2
+	[row]
+		[column]
+			border = "all"
+			border_size = 5
+			horizontal_alignment = "left"
+
+			[button]
+				id = hotkeys
+				label = _ "Hotkeys"
+			[/button]
+		[/column]
+
+		[column]
+			border = "all"
+			border_size = 5
+			horizontal_alignment = "left"
+
+			[button]
+				id = paths
+				label = _ "Paths"
+			[/button]
+		[/column]
+
+		[column]
+			border = "all"
+			border_size = 5
+			horizontal_alignment = "left"
+
+			[button]
+				id = cachemg
+				label = _ "Cache"
+			[/button]
+		[/column]
+	[/row]
+#enddef
+
+[layer]
+	[row]
+		[column]
+			horizontal_grow = true
+			vertical_grow = true
+
+			[grid]
+				[row]
+					[column]
+						horizontal_alignment = "left"
+						vertical_alignment = "top"
+
+						[grid]
+							{_GUI_PREFERENCES_MAIN_GRID_1}
+						[/grid]
+					[/column]
+				[/row]
+
+				[row]
+					[column]
+						horizontal_alignment = "left"
+						vertical_alignment = "bottom"
+
+						[grid]
+							{_GUI_PREFERENCES_MAIN_GRID_2}
+						[/grid]
+					[/column]
+				[/row]
+			[/grid]
+		[/column]
+	[/row]
+[/layer]
+
+#undef _GUI_PREFERENCES_MAIN_GRID_1
+#undef _GUI_PREFERENCES_MAIN_GRID_2