tpreferences: cleaned up some unnecessary grid nesting

wesnoth · Feb 23, 2016 · 1a6bfca · 1a6bfca
1 parent 43e3f8e
commit 1a6bfca
Show file tree

Hide file tree

Showing 4 changed files with 38 additions and 66 deletions.
diff --git a/data/gui/default/window/preferences/01_general.cfg b/data/gui/default/window/preferences/01_general.cfg
@@ -235,35 +235,28 @@
 #enddef
 
 [layer]
+
 	[row]
 		[column]
-			horizontal_grow = true
-			vertical_grow = true
-
+			horizontal_grow = "true"
+			vertical_alignment = "top"
 			[grid]
-				[row]
-					[column]
-						horizontal_grow = "true"
-						vertical_alignment = "top"
-						[grid]
-							{_GUI_PREFERENCES_GENERAL_GRID_1}
-						[/grid]
-					[/column]
-				[/row]
+				{_GUI_PREFERENCES_GENERAL_GRID_1}
+			[/grid]
+		[/column]
+	[/row]
 
-				[row]
-					[column]
-						horizontal_alignment = "left"
-						vertical_alignment = "bottom"
+	[row]
+		[column]
+			horizontal_alignment = "left"
+			vertical_alignment = "bottom"
 
-						[grid]
-							{_GUI_PREFERENCES_GENERAL_GRID_2}
-						[/grid]
-					[/column]
-				[/row]
+			[grid]
+				{_GUI_PREFERENCES_GENERAL_GRID_2}
 			[/grid]
 		[/column]
 	[/row]
+
 [/layer]
 
 #undef _GUI_PREFERENCES_GENERAL_GRID_1

diff --git a/data/gui/default/window/preferences/02_display.cfg b/data/gui/default/window/preferences/02_display.cfg
@@ -279,36 +279,29 @@
 #enddef
 
 [layer]
+
 	[row]
 		[column]
-			horizontal_grow = true
-			vertical_grow = true
+			horizontal_grow = "true"
+			vertical_alignment = "top"
 
 			[grid]
-				[row]
-					[column]
-						horizontal_grow = "true"
-						vertical_alignment = "top"
-
-						[grid]
-							{_GUI_PREFERENCES_DISPLAY_GRID_1}
-						[/grid]
-					[/column]
-				[/row]
+				{_GUI_PREFERENCES_DISPLAY_GRID_1}
+			[/grid]
+		[/column]
+	[/row]
 
-				[row]
-					[column]
-						horizontal_alignment = "left"
-						vertical_alignment = "bottom"
+	[row]
+		[column]
+			horizontal_alignment = "left"
+			vertical_alignment = "bottom"
 
-						[grid]
-							{_GUI_PREFERENCES_DISPLAY_GRID_2}
-						[/grid]
-					[/column]
-				[/row]
+			[grid]
+				{_GUI_PREFERENCES_DISPLAY_GRID_2}
 			[/grid]
 		[/column]
 	[/row]
+
 [/layer]
 
 #undef _GUI_PREFERENCES_DISPLAY_GRID_1

diff --git a/data/gui/default/window/preferences/03_sound.cfg b/data/gui/default/window/preferences/03_sound.cfg
@@ -106,25 +106,18 @@
 #enddef
 
 [layer]
+
 	[row]
 		[column]
-			horizontal_grow = true
-			vertical_grow = true
+			horizontal_grow = "true"
+			vertical_alignment = "top"
 
 			[grid]
-				[row]
-					[column]
-						horizontal_grow = "true"
-						vertical_alignment = "top"
-
-						[grid]
-							{_GUI_PREFERENCES_SOUND_GRID}
-						[/grid]
-					[/column]
-				[/row]
+				{_GUI_PREFERENCES_SOUND_GRID}
 			[/grid]
 		[/column]
 	[/row]
+
 [/layer]
 
 #undef _GUI_PREFERENCES_SOUND_GRID

diff --git a/data/gui/default/window/preferences/05_advanced.cfg b/data/gui/default/window/preferences/05_advanced.cfg
@@ -134,25 +134,18 @@
 #enddef
 
 [layer]
+
 	[row]
 		[column]
-			horizontal_grow = true
-			vertical_grow = true
+			horizontal_grow = "true"
+			vertical_alignment = "top"
 
 			[grid]
-				[row]
-					[column]
-						horizontal_grow = "true"
-						vertical_alignment = "top"
-
-						[grid]
-							{_GUI_ADVANCED_GRID}
-						[/grid]
-					[/column]
-				[/row]
+				{_GUI_ADVANCED_GRID}
 			[/grid]
 		[/column]
 	[/row]
+
 [/layer]
 
 #undef _GUI_ADVANCED_GRID