merge cnc and ra lobby, fixes #1267, #1224, #106, others

2011-11-06 11:50:58 +13:00
parent 4576eaadd6
commit 772734d032
44 changed files with 759 additions and 1432 deletions
--- a/mods/cnc/chrome/connection.yaml
+++ b/mods/cnc/chrome/connection.yaml
@@ -1,6 +1,6 @@
 Container@CONNECTING_PANEL:
 	Id:CONNECTING_PANEL
-	Logic:CncConnectionLogic
+	Logic:ConnectionLogic
 	X:(WINDOW_RIGHT - WIDTH)/2
 	Y:(WINDOW_BOTTOM - 90)/2
 	Width:370
@@ -37,7 +37,7 @@ Container@CONNECTING_PANEL:

 Container@CONNECTIONFAILED_PANEL:
 	Id:CONNECTIONFAILED_PANEL
-	Logic:CncConnectionFailedLogic
+	Logic:ConnectionFailedLogic
 	X:(WINDOW_RIGHT - WIDTH)/2
 	Y:(WINDOW_BOTTOM - 90)/2
 	Width:370
@@ -77,4 +77,4 @@ Container@CONNECTIONFAILED_PANEL:
 			Y:89
 			Width:140
 			Height:35
-			Text:Abort
+			Text:Abort
--- a/mods/cnc/chrome/createserver.yaml
+++ b/mods/cnc/chrome/createserver.yaml
@@ -1,9 +1,6 @@
-# TODO: Hook up the description field
-# TODO: Hook up the password field
-# TODO: Have the advertise checkbox en/disable the external port textfield
 Container@CREATESERVER_PANEL:
 	Id:CREATESERVER_PANEL
-	Logic:CncServerCreationLogic
+	Logic:ServerCreationLogic
 	X:(WINDOW_RIGHT - WIDTH)/2
 	Y:(WINDOW_BOTTOM - 260)/2
 	Width:604
@@ -57,34 +54,6 @@ Container@CREATESERVER_PANEL:
 					MaxLength:50
 					Height:25
 					Text:My OpenRA Server
-				Label@SERVER_DESC_LABEL:
-					X:15
-					Y:49
-					Width:90
-					Height:25
-					Align:Right
-					Text:Description:
-				TextField@SERVER_DESC:
-					Id:SERVER_DESC
-					X:110
-					Y:50
-					Width:275
-					MaxLength:50
-					Height:25
-				Label@SERVER_PASSWORD_LABEL:
-					X:15
-					Y:84
-					Width:90
-					Height:25
-					Align:Right
-					Text:Password:
-				TextField@SERVER_PASSWORD:
-					Id:SERVER_PASSWORD
-					X:110
-					Y:85
-					Width:275
-					MaxLength:50
-					Height:25
 				Label@LISTEN_PORT_LABEL:
 					X:15
 					Y:119
@@ -151,4 +120,4 @@ Container@CREATESERVER_PANEL:
 			Y:259
 			Width:140
 			Height:35
-			Text:Create
+			Text:Create
--- a/mods/cnc/chrome/directconnect.yaml
+++ b/mods/cnc/chrome/directconnect.yaml
@@ -1,6 +1,6 @@
 Container@DIRECTCONNECT_PANEL:
 	Id:DIRECTCONNECT_PANEL
-	Logic:CncDirectConnectLogic
+	Logic:DirectConnectLogic
 	X:(WINDOW_RIGHT - WIDTH)/2
 	Y:(WINDOW_BOTTOM - 90)/2
 	Width:370
--- a/mods/cnc/chrome/lobby.yaml
+++ b/mods/cnc/chrome/lobby.yaml
@@ -1,6 +1,6 @@
 Container@SERVER_LOBBY:
 	Id:SERVER_LOBBY
-	Logic:CncLobbyLogic
+	Logic:LobbyLogic
 	X:(WINDOW_RIGHT - WIDTH)/2
 	Y:(WINDOW_BOTTOM - 500)/2
 	Width:740
--- a/mods/cnc/chrome/modchooser.yaml
+++ b/mods/cnc/chrome/modchooser.yaml
@@ -1,6 +1,6 @@
 Container@MODS_PANEL:
 	Id:MODS_PANEL
-	Logic:CncModBrowserLogic
+	Logic:ModBrowserLogic
 	X:(WINDOW_RIGHT - WIDTH)/2
 	Y:(WINDOW_BOTTOM - 500)/2
 	Width:740
@@ -93,4 +93,4 @@ Container@MODS_PANEL:
 			Y:499
 			Width:140
 			Height:35
-			Text:Load Mod
+			Text:Load Mod
--- a/mods/cnc/chrome/replaybrowser.yaml
+++ b/mods/cnc/chrome/replaybrowser.yaml
@@ -1,6 +1,6 @@
 Container@REPLAYBROWSER_PANEL:
 	Id:REPLAYBROWSER_PANEL
-	Logic:CncReplayBrowserLogic
+	Logic:ReplayBrowserLogic
 	X:(WINDOW_RIGHT - WIDTH)/2
 	Y:(WINDOW_BOTTOM - 300)/2
 	Width:520
@@ -111,4 +111,4 @@ Container@REPLAYBROWSER_PANEL:
 					Y:299
 					Width:140
 					Height:35
-					Text:Watch
+					Text:Watch
--- a/mods/cnc/chrome/serverbrowser.yaml
+++ b/mods/cnc/chrome/serverbrowser.yaml
@@ -1,6 +1,6 @@
 Container@SERVERBROWSER_PANEL:
 	Id:SERVERBROWSER_PANEL
-	Logic:CncServerBrowserLogic
+	Logic:ServerBrowserLogic
 	X:(WINDOW_RIGHT - WIDTH)/2
 	Y:(WINDOW_BOTTOM - 500)/2
 	Width:740
--- a/mods/ra/chrome/create-server.yaml
+++ b/mods/ra/chrome/create-server.yaml
@@ -1,6 +1,6 @@
 Background@CREATESERVER_BG:
 	Id:CREATESERVER_BG
-	Logic:CreateServerMenuLogic
+	Logic:ServerCreationLogic
 	X:(WINDOW_RIGHT - WIDTH)/2
 	Y:(WINDOW_BOTTOM - HEIGHT)/2
 	Width:400
@@ -15,16 +15,16 @@ Background@CREATESERVER_BG:
 			Text:Create Server
 			Align:Center
 			Font:Bold
-		Label@GAME_TITLE_LABEL:
-			Id:GAME_TITLE_LABEL
+		Label@SERVER_NAME_LABEL:
+			Id:SERVER_NAME_LABEL
 			X:50
 			Y:59
 			Width:95
 			Height:25
 			Align: Right
 			Text:Game Title:
-		TextField@GAME_TITLE:
-			Id:GAME_TITLE
+		TextField@SERVER_NAME:
+			Id:SERVER_NAME
 			X:150
 			Y:60
 			Width:210
@@ -62,15 +62,15 @@ Background@CREATESERVER_BG:
 			Width:50
 			MaxLength:5
 			Height:25
-		Checkbox@CHECKBOX_ONLINE:
-			Id:CHECKBOX_ONLINE
+		Checkbox@ADVERTISE_CHECKBOX:
+			Id:ADVERTISE_CHECKBOX
 			X:165
 			Y:130
 			Width:300
 			Height:20
 			Text:Advertise game Online
-		Button@BUTTON_START:
-			Id:BUTTON_START
+		Button@CREATE_BUTTON:
+			Id:CREATE_BUTTON
 			X:130
 			Y:PARENT_BOTTOM - 45
 			Width:120
@@ -78,8 +78,8 @@ Background@CREATESERVER_BG:
 			Text:Create
 			Font:Bold
 			Key:return
-		Button@BUTTON_CANCEL:
-			Id:BUTTON_CANCEL
+		Button@BACK_BUTTON:
+			Id:BACK_BUTTON
 			X:260
 			Y:PARENT_BOTTOM - 45
 			Width:120
--- a/mods/ra/chrome/lobby.yaml
+++ b/mods/ra/chrome/lobby.yaml
@@ -6,8 +6,8 @@ Background@SERVER_LOBBY:
 	Width:800
 	Height:600
 	Children:
-		Label@LOBBY_TITLE:
-			Id:LOBBY_TITLE
+		Label@TITLE:
+			Id:TITLE
 			X:0
 			Y:17
 			Align:Center
@@ -22,8 +22,8 @@ Background@SERVER_LOBBY:
 			Height:252
 			Background:dialog3
 			Children:
-				MapPreview@LOBBY_MAP_PREVIEW:
-					Id:LOBBY_MAP_PREVIEW
+				MapPreview@MAP_PREVIEW:
+					Id:MAP_PREVIEW
 					X:4
 					Y:4
 					Width:244
@@ -36,8 +36,8 @@ Background@SERVER_LOBBY:
 			Width:504
 			Height:235
 			Children:
-				Container@TEMPLATE_LOCAL:
-					Id:TEMPLATE_LOCAL
+				Container@TEMPLATE_EDITABLE_PLAYER:
+					Id:TEMPLATE_EDITABLE_PLAYER
 					X:5
 					Y:0
 					Width:475
@@ -99,14 +99,25 @@ Background@SERVER_LOBBY:
 							Height:25
 							X:390
 							Y:0
-						Checkbox@STATUS:
-							Id:STATUS
+						Checkbox@STATUS_CHECKBOX:
+							Id:STATUS_CHECKBOX
 							X:448
 							Y:2
 							Width:20
 							Height:20
-				Container@TEMPLATE_REMOTE:
-					Id:TEMPLATE_REMOTE
+							Visible:false
+						Image@STATUS_IMAGE:
+							Id:STATUS_IMAGE
+							Visible:false
+							X:450
+							Y:4
+							Width:20
+							Height:20
+							ImageCollection:checkbox-bits
+							ImageName:checked
+							Visible:false
+				Container@TEMPLATE_NONEDITABLE_PLAYER:
+					Id:TEMPLATE_NONEDITABLE_PLAYER
 					X:5
 					Y:0
 					Width:475
@@ -162,12 +173,16 @@ Background@SERVER_LOBBY:
 							Align:Center
 							X:390
 							Y:0
-						Checkbox@STATUS:
-							Id:STATUS
-							X:448
-							Y:2
+						Image@STATUS_IMAGE:
+							Id:STATUS_IMAGE
+							Visible:false
+							X:450
+							Y:4
 							Width:20
 							Height:20
+							ImageCollection:checkbox-bits
+							ImageName:checked
+
 				Container@TEMPLATE_EMPTY:
 					Id:TEMPLATE_EMPTY
 					X:5
@@ -183,28 +198,14 @@ Background@SERVER_LOBBY:
 							Height:25
 							X:5
 							Y:0-1
-						Button@JOIN:
-							Id:JOIN
-							Text:Play in this slot
-							Width:278
-							Height:25
-							X:160
-							Y:0
-				Container@TEMPLATE_EMPTY_HOST:
-					Id:TEMPLATE_EMPTY_HOST
-					X:5
-					Y:0
-					Width:400
-					Height:25
-					Visible:false
-					Children:
-						DropDownButton@NAME:
-							Id:NAME
+						DropDownButton@NAME_HOST:
+							Id:NAME_HOST
 							Text:Name
 							Width:150
 							Height:25
 							X:0
 							Y:0
+							Visible:false
 						Button@JOIN:
 							Id:JOIN
 							Text:Play in this slot
@@ -212,8 +213,8 @@ Background@SERVER_LOBBY:
 							Height:25
 							X:160
 							Y:0
-				Container@TEMPLATE_LOCAL_SPECTATOR:
-					Id:TEMPLATE_LOCAL_SPECTATOR
+				Container@TEMPLATE_EDITABLE_SPECTATOR:
+					Id:TEMPLATE_EDITABLE_SPECTATOR
 					X:5
 					Y:0
 					Width:475
@@ -247,14 +248,24 @@ Background@SERVER_LOBBY:
 							Y:0
 							Align:Center
 							Font:Bold
-						Checkbox@STATUS:
-							Id:STATUS
+						Checkbox@STATUS_CHECKBOX:
+							Id:STATUS_CHECKBOX
 							X:448
 							Y:2
 							Width:20
 							Height:20
-				Container@TEMPLATE_REMOTE_SPECTATOR:
-					Id:TEMPLATE_REMOTE_SPECTATOR
+						Image@STATUS_IMAGE:
+							Id:STATUS_IMAGE
+							Visible:false
+							X:450
+							Y:4
+							Width:20
+							Height:20
+							ImageCollection:checkbox-bits
+							ImageName:checked
+
+				Container@TEMPLATE_NONEDITABLE_SPECTATOR:
+					Id:TEMPLATE_NONEDITABLE_SPECTATOR
 					X:5
 					Y:0
 					Width:475
@@ -290,12 +301,15 @@ Background@SERVER_LOBBY:
 							Y:0
 							Align:Center
 							Font:Bold
-						Checkbox@STATUS:
-							Id:STATUS
-							X:448
-							Y:2
+						Image@STATUS_IMAGE:
+							Id:STATUS_IMAGE
+							Visible:false
+							X:450
+							Y:4
 							Width:20
 							Height:20
+							ImageCollection:checkbox-bits
+							ImageName:checked
 				Container@TEMPLATE_NEW_SPECTATOR:
 					Id:TEMPLATE_NEW_SPECTATOR
 					X:5
@@ -369,13 +383,40 @@ Background@SERVER_LOBBY:
 			Height:25
 			Text:Change Map
 			Font:Bold
-		ChatDisplay@CHAT_DISPLAY:
+		ScrollPanel@CHAT_DISPLAY:
 			Id:CHAT_DISPLAY
 			X:20
-			Notification: rabeep1.aud
-			Height:230
 			Y:PARENT_BOTTOM - 289
 			Width:PARENT_RIGHT - 200
+			Height:230
+			ItemSpacing:1
+			Children:
+				Container@CHAT_TEMPLATE:
+					Id:CHAT_TEMPLATE
+					Width:PARENT_RIGHT-27
+					Height:16
+					X:2
+					Y:0
+					Children:
+						Label@TIME:
+							Id:TIME
+							X:3
+							Width:50
+							Height:15
+							VAlign:Top
+						Label@NAME:
+							Id:NAME
+							X:45
+							Width:50
+							Height:15
+							VAlign:Top
+						Label@TEXT:
+							Id:TEXT
+							X:55
+							Width:PARENT_RIGHT - 60
+							Height:15
+							WordWrap:true
+							VAlign:Top
 		Label@LABEL_CHATTYPE:
 			Id:LABEL_CHATTYPE
 			Width:65
--- a/mods/ra/chrome/mainmenu.yaml
+++ b/mods/ra/chrome/mainmenu.yaml
@@ -3,7 +3,7 @@ Background@MAINMENU_BG:
 	X:(WINDOW_RIGHT - WIDTH)/2
 	Y:(WINDOW_BOTTOM - HEIGHT)/2
 	Width:250
-	Height:330
+	Height:420
 	Visible:true
 	Logic:MainMenuButtonsLogic
 	Children:
@@ -32,18 +32,34 @@ Background@MAINMENU_BG:
 			Height:25
 			Text:Create Game
 			Font:Bold
-		Button@MAINMENU_BUTTON_SETTINGS:
-			Id:MAINMENU_BUTTON_SETTINGS
+		Button@MAINMENU_BUTTON_DIRECTCONNECT:
+			Id:MAINMENU_BUTTON_DIRECTCONNECT
 			X:45
 			Y:150
 			Width:160
 			Height:25
+			Text:Direct Connect
+			Font:Bold
+		Button@MAINMENU_BUTTON_SETTINGS:
+			Id:MAINMENU_BUTTON_SETTINGS
+			X:45
+			Y:190
+			Width:160
+			Height:25
 			Text:Settings
 			Font:Bold
+		Button@MAINMENU_BUTTON_MODS:
+			Id:MAINMENU_BUTTON_MODS
+			X:45
+			Y:230
+			Width:160
+			Height:25
+			Text:Mods
+			Font:Bold
 		Button@MAINMENU_BUTTON_MUSIC:
 			Id:MAINMENU_BUTTON_MUSIC
 			X:45
-			Y:190
+			Y:270
 			Width:160
 			Height:25
 			Text:Music
@@ -51,7 +67,7 @@ Background@MAINMENU_BG:
 		Button@MAINMENU_BUTTON_REPLAY_VIEWER:
 			Id:MAINMENU_BUTTON_REPLAY_VIEWER
 			X:45
-			Y:230
+			Y:310
 			Width:160
 			Height:25
 			Text:Replay Viewer
@@ -59,42 +75,11 @@ Background@MAINMENU_BG:
 		Button@MAINMENU_BUTTON_QUIT:
 			Id:MAINMENU_BUTTON_QUIT
 			X:45
-			Y:270
+			Y:350
 			Width:160
 			Height:25
 			Text:Quit
 			Font:Bold
-Background@QUICKMODSWITCHER:
-	Id:QUICKMODSWITCHER
-	Background: dialog4
-	X:(WINDOW_RIGHT - PARENT_LEFT - WIDTH - 10)
-	Y:10 - PARENT_TOP
-	Width:205
-	Height:65
-	Children:
-		Label@TITLE:
-			X:8
-			Y:3
-			Width:PARENT_RIGHT
-			Height:25
-			Text:Mod:
-			Align:Left
-			Font:Bold
-		DropDownButton@SWITCHER:
-			Id:SWITCHER
-			Text:Team
-			Width:150
-			Height:25
-			X:50
-			Y:5
-		Label@VERSION:
-			Id:VERSION
-			X:50
-			Y:30
-			Width:150
-			Height:25
-			Align:Center
-			Font:Bold
 Background@PERF_BG:
 	ClickThrough:true
 	Id:PERF_BG
--- a/mods/ra/chrome/modchooser.yaml
+++ b/mods/ra/chrome/modchooser.yaml
@@ -0,0 +1,92 @@
+Background@MODS_PANEL:
+	Logic:ModBrowserLogic
+	Id:MODS_PANEL
+	Width:740
+	Height:500
+	X:(WINDOW_RIGHT - WIDTH)/2
+	Y:(WINDOW_BOTTOM - HEIGHT)/2
+	Children:
+		Label@TITLE:
+			Text:Select Mod
+			Width:PARENT_RIGHT
+			Y:20
+			Font:Bold
+			Align:Center
+		ScrollPanel@MOD_LIST:
+			Id:MOD_LIST
+			X:15
+			Y:70
+			Width:710
+			Height:PARENT_BOTTOM - 125
+			Children:
+				ScrollItem@MOD_TEMPLATE:
+					Id:MOD_TEMPLATE
+					Width:PARENT_RIGHT-27
+					Height:25
+					X:2
+					Y:0
+					Visible:false
+					Children:
+						Label@TITLE:
+							X:10
+							Id:TITLE
+							Width:200
+							Height:25
+						Label@AUTHOR:
+							Id:AUTHOR
+							X:PARENT_RIGHT-300
+							Align:Center
+							Width:50
+							Height:25
+						Label@VERSION:
+							Id:VERSION
+							Width:140
+							X:PARENT_RIGHT-150
+							Align:Center
+							Height:25
+		Container@MOD_LABELS:
+			Width:710-25
+			Height:25
+			X:15
+			Y:45
+			Children:
+				Label@TITLE:
+					Width:125
+					Height:25
+					X:0
+					Y:0
+					Text:Title
+					Align:Center
+					Font:Bold
+				Label@AUTHOR:
+					X:PARENT_RIGHT-300
+					Align:Center
+					Width:50
+					Height:25
+					Text:Author
+					Font:Bold
+				Label@VERSION:
+					Width:140
+					X:PARENT_RIGHT-150
+					Align:Center
+					Height:25
+					Text:Version
+					Font:Bold
+		Button@BACK_BUTTON:
+			Id:BACK_BUTTON
+			Key:escape
+			X:PARENT_RIGHT-180
+			Y:PARENT_BOTTOM-45
+			Width:160
+			Height:25
+			Font:Bold
+			Text:Cancel
+		Button@LOAD_BUTTON:
+			Id:LOAD_BUTTON
+			Key:return
+			X:PARENT_RIGHT-360
+			Y:PARENT_BOTTOM-45
+			Width:160
+			Height:25
+			Font:Bold
+			Text:Load Mod
--- a/mods/ra/chrome/replaybrowser.yaml
+++ b/mods/ra/chrome/replaybrowser.yaml
@@ -81,6 +81,22 @@ Background@REPLAYBROWSER_BG:
 					Align:Left
 					Width:70
 					Height:20
+				Label@PLAYERS_LABEL:
+					Id:PLAYERS_LABEL
+					X:PARENT_RIGHT - 200 - WIDTH
+					Y:290
+					Align:Right
+					Width:70
+					Height:20
+					Text:Players:
+					Font:Bold
+				Label@PLAYERS:
+					Id:PLAYERS
+					X:PARENT_RIGHT - 195
+					Y:290
+					Align:Left
+					Width:70
+					Height:20
 		Button@WATCH_BUTTON:
 			Id:WATCH_BUTTON
 			X:PARENT_RIGHT - 140 - 130
--- a/mods/ra/chrome/serverbrowser.yaml
+++ b/mods/ra/chrome/serverbrowser.yaml
@@ -34,8 +34,19 @@ Background@JOINSERVER_BG:
 							Id:TITLE
 							Width:200
 							Height:25
-		Label@JOINSERVER_PROGRESS_TITLE:
-			Id:JOINSERVER_PROGRESS_TITLE
+						Label@MAP:
+							Id:MAP
+							X:210
+							Width:100
+							Height:25
+						Label@PLAYERS:
+							Id:PLAYERS
+							Visible:False
+						Label@IP:
+							Id:IP
+							Visible:False
+		Label@PROGRESS_LABEL:
+			Id:PROGRESS_LABEL
 			X:150
 			Y:PARENT_BOTTOM / 2 - HEIGHT
 			Width:150
@@ -121,17 +132,9 @@ Background@JOINSERVER_BG:
 					VAlign:Top
 					Width:70
 					Height:20
-		Button@DIRECTCONNECT_BUTTON:
-			Id:DIRECTCONNECT_BUTTON
-			X:20
-			Y:PARENT_BOTTOM - 45
-			Width:120
-			Height:25
-			Text:Direct Connect
-			Font:Bold
 		Button@REFRESH_BUTTON:
 			Id:REFRESH_BUTTON
-			X:160
+			X:20
 			Y:PARENT_BOTTOM - 45
 			Width:120
 			Height:25
@@ -146,8 +149,8 @@ Background@JOINSERVER_BG:
 			Text:Join
 			Font:Bold
 			Key:return
-		Button@CANCEL_BUTTON:
-			Id:CANCEL_BUTTON
+		Button@BACK_BUTTON:
+			Id:BACK_BUTTON
 			X:PARENT_RIGHT - 140
 			Y:PARENT_BOTTOM - 45
 			Width:120
@@ -180,13 +183,20 @@ Background@DIRECTCONNECT_BG:
 			Height:25
 			Align:Right
 			Text:Server Address:
-		TextField@SERVER_ADDRESS:
-			Id:SERVER_ADDRESS
+		TextField@IP:
+			Id:IP
 			X:150
 			Y:60
-			Width:200
+			Width:160
 			MaxLength:50
 			Height:25
+		TextField@PORT:
+			Id:PORT
+			X:315
+			Y:60
+			Width:55
+			MaxLength:5
+			Height:25
 		Button@JOIN_BUTTON:
 			Id:JOIN_BUTTON
 			X:130
@@ -196,8 +206,8 @@ Background@DIRECTCONNECT_BG:
 			Text:Join
 			Font:Bold
 			Key:return
-		Button@CANCEL_BUTTON:
-			Id:CANCEL_BUTTON
+		Button@BACK_BUTTON:
+			Id:BACK_BUTTON
 			X:260
 			Y:PARENT_BOTTOM - 45
 			Width:120
@@ -205,8 +215,8 @@ Background@DIRECTCONNECT_BG:
 			Text:Cancel
 			Font:Bold
 			Key:escape
-Background@CONNECTION_FAILED_BG:
-	Id:CONNECTION_FAILED_BG
+Background@CONNECTIONFAILED_PANEL:
+	Id:CONNECTIONFAILED_PANEL
 	Logic:ConnectionFailedLogic
 	X:(WINDOW_RIGHT - WIDTH)/2
 	Y:(WINDOW_BOTTOM - HEIGHT)/2
@@ -222,16 +232,16 @@ Background@CONNECTION_FAILED_BG:
 			Text:Connection Failed
 			Align:Center
 			Font:Bold
-		Label@CONNECTION_FAILED_DESC:
-			Id:CONNECTION_FAILED_DESC
+		Label@CONNECTING_DESC:
+			Id:CONNECTING_DESC
 			X:0
 			Y:60
 			Width:PARENT_RIGHT
 			Height:25
 			Text:Could not connect to AAA.BBB.CCC.DDD:EEEE
 			Align:Center
-		Button@CONNECTION_BUTTON_RETRY:
-			Id:CONNECTION_BUTTON_RETRY
+		Button@RETRY_BUTTON:
+			Id:RETRY_BUTTON
 			X:PARENT_RIGHT - 360
 			Y:PARENT_BOTTOM - 45
 			Width:160
@@ -239,8 +249,8 @@ Background@CONNECTION_FAILED_BG:
 			Text:Retry
 			Font:Bold
 			Key:return
-		Button@CONNECTION_BUTTON_CANCEL:
-			Id:CONNECTION_BUTTON_CANCEL
+		Button@ABORT_BUTTON:
+			Id:ABORT_BUTTON
 			X:PARENT_RIGHT - 180
 			Y:PARENT_BOTTOM - 45
 			Width:160
@@ -248,9 +258,9 @@ Background@CONNECTION_FAILED_BG:
 			Text:Cancel
 			Font:Bold
 			Key:escape
-Background@CONNECTING_BG:
-	Id:CONNECTING_BG
-	Logic:ConnectionDialogsLogic
+Background@CONNECTING_PANEL:
+	Id:CONNECTING_PANEL
+	Logic:ConnectionLogic
 	X:(WINDOW_RIGHT - WIDTH)/2
 	Y:(WINDOW_BOTTOM - HEIGHT)/2
 	Width:450
@@ -273,8 +283,8 @@ Background@CONNECTING_BG:
 			Height:25
 			Text:Connecting to AAA.BBB.CCC.DDD:EEEE...
 			Align:Center
-		Button@CONNECTION_BUTTON_ABORT:
-			Id:CONNECTION_BUTTON_ABORT
+		Button@ABORT_BUTTON:
+			Id:ABORT_BUTTON
 			X:PARENT_RIGHT - 180
 			Y:PARENT_BOTTOM - 45
 			Width:160
--- a/mods/ra/mod.yaml
+++ b/mods/ra/mod.yaml
@@ -62,6 +62,7 @@ ChromeLayout:
 	mods/ra/chrome/serverbrowser.yaml
 	mods/ra/chrome/replaybrowser.yaml
 	mods/ra/chrome/dropdowns.yaml
+	mods/ra/chrome/modchooser.yaml
 Weapons:
 	mods/ra/weapons.yaml