MP Method Selection: use a proper toggle panel for list

wesnoth · Aug 29, 2016 · 6da41bf · 6da41bf
1 parent 6ae79ea
commit 6da41bf
Showing 1 changed file with 89 additions and 16 deletions.
diff --git a/data/gui/window/mp_method_selection.cfg b/data/gui/window/mp_method_selection.cfg
@@ -14,6 +14,11 @@
 		vertical_placement = "center"
 		horizontal_placement = "center"
 
+		[linked_group]
+			id = "icon"
+			fixed_width = "true"
+		[/linked_group]
+
 		[tooltip]
 			id = "tooltip"
 		[/tooltip]
@@ -120,18 +125,50 @@ The Battle for Wesnoth forum can be found at http://forums.wesnoth.org/"
 
 							[row]
 
-								 [column]
-									grow_factor = 1
-								 	horizontal_grow = "true"
-
-									[toggle_button]
-										definition = "listbox_text_with_icon"
+								[column]
+									horizontal_grow = "true"
 
+				 					[toggle_panel]
+										definition = "default"
 										return_value_id = "ok"
-									[/toggle_button]
 
-								[/column]
+										[grid]
+
+											[row]
+
+												[column]
+													grow_factor = 0
+													horizontal_grow = "true"
+
+													border = "all"
+													border_size = 5
+
+													[image]
+														id = "image"
+														definition = "default"
+														linked_group = "icon"
+													[/image]
+												[/column]
+
+												[column]
+													grow_factor = 1
+													border = "all"
+													border_size = 5
+													horizontal_grow = "true"
+
+													[label]
+														id = "name"
+														definition = "default"
+													[/label]
+												[/column]
+
+											[/row]
+
+										[/grid]
+
+									[/toggle_panel]
 
+								[/column]
 
 							[/row]
 
@@ -142,39 +179,75 @@ The Battle for Wesnoth forum can be found at http://forums.wesnoth.org/"
 							[row]
 
 								[column]
-									label = _ "Join Official Server"
 									tooltip = _ "Log on to the official Wesnoth multiplayer server"
-									icon = "icons/icon-server.png"
+
+									[widget]
+										id = "image"
+										label = "icons/icon-server.png"
+									[/widget]
+
+									[widget]
+										id = "name"
+										label = _ "Join Official Server"
+									[/widget]
+
 								[/column]
 
 							[/row]
 
 							[row]
 
 								[column]
-									label = _ "Connect to Server"
 									tooltip = _ "Join a different server"
-									icon = "icons/icon-serverother.png"
+
+									[widget]
+										id = "image"
+										label = "icons/icon-serverother.png"
+									[/widget]
+
+									[widget]
+										id = "name"
+										label = _ "Connect to Server"
+									[/widget]
+
 								[/column]
 
 							[/row]
 
 							[row]
 
 								[column]
-									label = _ "Host Networked Game"
 									tooltip = _ "Host a game using dedicated server ‘wesnothd’"
-									icon = "icons/icon-hostgame.png"
+
+									[widget]
+										id = "image"
+										label = "icons/icon-hostgame.png"
+									[/widget]
+
+									[widget]
+										id = "name"
+										label = _ "Host Networked Game"
+									[/widget]
+
 								[/column]
 
 							[/row]
 
 							[row]
 
 								[column]
-									label = _ "Local Game"
 									tooltip = _ "Play a multiplayer game with the AI or humans sharing the same machine"
-									icon = "icons/icon-hotseat.png"
+
+									[widget]
+										id = "image"
+										label = "icons/icon-hotseat.png"
+									[/widget]
+
+									[widget]
+										id = "name"
+										label = _ "Local Game"
+									[/widget]
+
 								[/column]
 
 							[/row]