taddon_list: more layout progress

wesnoth · Mar 11, 2016 · 80bd888 · 80bd888
1 parent 4b2e721
commit 80bd888
Showing 1 changed file with 66 additions and 56 deletions.
diff --git a/data/gui/default/window/addon_list.cfg b/data/gui/default/window/addon_list.cfg
@@ -466,6 +466,7 @@
 					[/row]
 
 					[row]
+						grow_factor = 1
 
 						[column]
 							border = "all"
@@ -486,7 +487,7 @@
 					[/row]
 
 					[row]
-						grow_factor = 1
+						grow_factor = 0
 
 						[column]
 							horizontal_grow = "true"
@@ -682,41 +683,7 @@
 
 					[/row]
 
-					[row]
-						grow_factor = 0
-
-						[column]
-							grow_factor = 1
-							border = "all"
-							border_size = 10
-							horizontal_grow = true
-							vertical_alignment = "bottom"
-
-							[drawing]
-								definition = "default"
-
-								width = (width)
-								height = 1
-
-								[draw]
-
-									[line]
-										x1 = 0
-										y1 = 0
-										x2 = (width - 1)
-										y2 = 0
-
-										color = {GUI__FONT_COLOR_DISABLED__DEFAULT}
-										thickness = 1
-									[/line]
-
-								[/draw]
-
-							[/drawing]
-
-						[/column]
-
-					[/row]
+					{GUI_HORIZONTAL_SPACER_LINE}
 
 					[row]
 
@@ -903,6 +870,64 @@
 
 					[/row]
 
+					[row]
+						[column]
+							[spacer]
+								height = 10
+							[/spacer]
+						[/column]
+					[/row]
+
+					[row]
+						grow_factor = 0
+
+						[column]
+							horizontal_grow = "true"
+							vertical_alignment = "bottom"
+
+							[grid]
+
+								[row]
+									grow_factor = 1
+
+									[column]
+										grow_factor = 1
+										border = "all"
+										border_size = 5
+										horizontal_alignment = "center"
+
+										[button]
+											id = "ok"
+											definition = "large"
+
+											label = "Install"
+										[/button]
+
+									[/column]
+
+									[column]
+										grow_factor = 1
+										border = "all"
+										border_size = 5
+										horizontal_alignment = "center"
+
+										[button]
+											id = "ok"
+											definition = "large"
+
+											label = "Uninstall"
+										[/button]
+
+									[/column]
+
+								[/row]
+
+							[/grid]
+
+						[/column]
+
+					[/row]
+
 				[/grid]
 
 			[/column]
@@ -1152,22 +1177,7 @@
 
 			[/row]
 
-			[row]
-
-				[column]
-					border = "all"
-					border_size = 5
-					horizontal_alignment = "right"
-
-					[button]
-						id = "update_all"
-						definition = "default"
-
-						label = "Update All"
-					[/button]
-				[/column]
-
-			[/row]
+			{GUI_HORIZONTAL_SPACER_LINE}
 
 			[row]
 				grow_factor = 0
@@ -1185,6 +1195,7 @@
 								border = "all"
 								border_size = 5
 								horizontal_alignment = "left"
+								vertical_alignment = "bottom"
 
 								[button]
 									# NOTE: this isn't named "help" because it conflicts with
@@ -1196,20 +1207,19 @@
 								[/button]
 
 							[/column]
-							
+
 							[column]
 								grow_factor = 0
 								border = "all"
 								border_size = 5
 								horizontal_alignment = "right"
 
 								[button]
-									id = "ok"
+									id = "update_all"
 									definition = "default"
 
-									label = "Install"
+									label = "Update All"
 								[/button]
-
 							[/column]
 
 							[column]