Merge pull request #3649 from Mailaender/passwords

Completed support for password protected games
2013-10-09 22:13:20 -07:00
parent e4666f3af3 f5d26bebb7
commit 1cca6f8fe5
23 changed files with 381 additions and 208 deletions
--- a/mods/cnc/chrome/connection.yaml
+++ b/mods/cnc/chrome/connection.yaml
@@ -37,8 +37,9 @@ Container@CONNECTIONFAILED_PANEL:
 	X:(WINDOW_RIGHT - WIDTH)/2
 	Y:(WINDOW_BOTTOM - 90)/2
 	Width:370
-	Height:125
+	Height:129
 	Children:
+		LogicTicker@CONNECTION_FAILED_TICKER:
 		Label@TITLE:
 			Width:PARENT_RIGHT
 			Y:0-25
@@ -46,28 +47,48 @@ Container@CONNECTIONFAILED_PANEL:
 			Contrast:true
 			Align:Center
 			Text:Connection Failed
-		Background@bg:
+		Background@CONNECTION_BACKGROUND:
 			Width:370
-			Height:90
+			Height:85
 			Background:panel-black
 			Children:
 				Label@CONNECTING_DESC:
-					Y:(PARENT_BOTTOM-HEIGHT)/2
+					Y:15
 					Width:PARENT_RIGHT
 					Height:25
 					Text:Failed to connect
 					Font:Bold
 					Align:Center
+				Label@CONNECTION_ERROR:
+					Y:40
+					Width:PARENT_RIGHT
+					Height:25
+					Align:Center
+					Font:Bold
+				Label@PASSWORD_LABEL:
+					X:40
+					Y:79
+					Width:95
+					Height:25
+					Align:Right
+					Text:Password:
+					Font:Bold
+				PasswordField@PASSWORD:
+					X:140
+					Y:80
+					Width:155
+					MaxLength:20
+					Height:25
 		Button@RETRY_BUTTON:
 			Key:return
-			Y:89
+			Y:84
 			Width:140
 			Height:35
 			Text:Retry
 		Button@ABORT_BUTTON:
 			Key:escape
 			X:230
-			Y:89
+			Y:84
 			Width:140
 			Height:35
 			Text:Abort
--- a/mods/cnc/chrome/createserver.yaml
+++ b/mods/cnc/chrome/createserver.yaml
@@ -2,37 +2,37 @@ Container@CREATESERVER_PANEL:
 	Logic:ServerCreationLogic
 	X:(WINDOW_RIGHT - WIDTH)/2
 	Y:(WINDOW_BOTTOM - 260)/2
-	Width:604
-	Height:295
+	Width:521
+	Height:250
 	Children:
 		Label@TITLE:
 			Text:Create Server
-			Width:604
+			Width:PARENT_RIGHT
 			Y:0-25
 			Font:BigBold
 			Contrast:true
 			Align:Center
 		Background@bg:
-			Width:604
-			Height:260
+			Width:PARENT_RIGHT
+			Height:215
 			Background:panel-black
 			Children:
 				Background@MAP_BG:
 					X:PARENT_RIGHT-WIDTH-15
 					Y:15
-					Width:194
-					Height:194
+					Width:162
+					Height:162
 					Background:panel-gray
 					Children:
 						MapPreview@MAP_PREVIEW:
 							X:1
 							Y:1
-							Width:192
-							Height:192
+							Width:160
+							Height:160
 				Label@MAP_NAME:
 					X:PARENT_RIGHT-WIDTH-15
-					Y:220
-					Width:194
+					Y:PARENT_BOTTOM - 33
+					Width:162
 					Height:25
 					Align:Center
 					Font:Bold
@@ -46,67 +46,87 @@ Container@CREATESERVER_PANEL:
 				TextField@SERVER_NAME:
 					X:110
 					Y:15
-					Width:275
+					Width:215
 					MaxLength:50
 					Height:25
 					Text:My OpenRA Server
+				Label@PASSWORD_LABEL:
+					X:10
+					Y:49
+					Width:95
+					Height:25
+					Align:Right
+					Text:Password:
+				PasswordField@PASSWORD:
+					X:110
+					Y:50
+					Width:145
+					MaxLength:20
+					Height:25
+				Label@AFTER_PASSWORD_LABEL:
+					X:265
+					Y:49
+					Width:95
+					Height:25
+					Align:Left
+					Text:(optional)
 				Label@LISTEN_PORT_LABEL:
 					X:15
-					Y:119
+					Y:84
 					Width:90
 					Height:25
 					Align: Right
 					Text:Port:
 				TextField@LISTEN_PORT:
 					X:110
-					Y:120
+					Y:85
+					Width:50
+					MaxLength:5
+					Height:25
+					Text:1234
+				Label@EXTERNAL_PORT_LABEL:
+					X:180
+					Y:84
+					Width:90
+					Height:25
+					Align:Right
+					Text:External Port:
+				TextField@EXTERNAL_PORT:
+					X:275
+					Y:85
 					Width:50
 					MaxLength:5
 					Height:25
 					Text:1234
 				Checkbox@ADVERTISE_CHECKBOX:
 					X:110
-					Y:155
+					Y:135
 					Width:150
 					Height:20
 					Text:Advertise Online
 				Checkbox@UPNP_CHECKBOX:
 					X:110
-					Y:180
+					Y:165
 					Width:300
 					Height:20
 					Text:Automatic port forwarding
-				Label@EXTERNAL_PORT_LABEL:
-					X:15
-					Y:219
-					Width:90
-					Height:25
-					Align:Right
-					Text:External Port:
-				TextField@EXTERNAL_PORT:
-					X:110
-					Y:220
-					Width:50
-					MaxLength:5
-					Height:25
-					Text:1234
 		Button@BACK_BUTTON:
 			Key:escape
 			X:0
-			Y:259
+			Y:214
 			Width:140
 			Height:35
 			Text:Back
 		Button@MAP_BUTTON:
-			X:314
-			Y:259
+			X:231
+			Y:214
 			Width:140
 			Height:35
 			Text:Choose Map
 		Button@CREATE_BUTTON:
 			Key:return
-			X:464
-			Y:259
+			X:381
+			Y:214
 			Width:140
 			Height:35
 			Text:Create
--- a/mods/cnc/chrome/directconnect.yaml
+++ b/mods/cnc/chrome/directconnect.yaml
@@ -3,7 +3,7 @@ Container@DIRECTCONNECT_PANEL:
 	X:(WINDOW_RIGHT - WIDTH)/2
 	Y:(WINDOW_BOTTOM - 90)/2
 	Width:370
-	Height:125
+	Height:130
 	Children:
 		Label@TITLE:
 			Width:PARENT_RIGHT
@@ -14,7 +14,7 @@ Container@DIRECTCONNECT_PANEL:
 			Text:Connect to Server
 		Background@bg:
 			Width:370
-			Height:90
+			Height:95
 			Background:panel-black
 			Children:
 				Label@ADDRESS_LABEL:
@@ -44,14 +44,14 @@ Container@DIRECTCONNECT_PANEL:
 		Button@BACK_BUTTON:
 			Key:escape
 			X:0
-			Y:89
+			Y:94
 			Width:140
 			Height:35
 			Text:Back
 		Button@JOIN_BUTTON:
 			Key:return
 			X:230
-			Y:89
+			Y:94
 			Width:140
 			Height:35
 			Text:Join
--- a/mods/d2k/mod.yaml
+++ b/mods/d2k/mod.yaml
@@ -64,6 +64,8 @@ ChromeLayout:
 	mods/ra/chrome/map-chooser.yaml
 	mods/ra/chrome/create-server.yaml
 	mods/ra/chrome/serverbrowser.yaml
+	mods/ra/chrome/connection.yaml
+	mods/ra/chrome/directconnect.yaml
 	mods/ra/chrome/replaybrowser.yaml
 	mods/ra/chrome/dropdowns.yaml
 	mods/ra/chrome/modchooser.yaml
--- a/mods/ra/chrome/connection.yaml
+++ b/mods/ra/chrome/connection.yaml
@@ -0,0 +1,90 @@
+Background@CONNECTIONFAILED_PANEL:
+	Logic:ConnectionFailedLogic
+	X:(WINDOW_RIGHT - WIDTH)/2
+	Y:(WINDOW_BOTTOM - HEIGHT)/2
+	Width:450
+	Height:160
+	Children:
+		LogicTicker@CONNECTION_FAILED_TICKER:
+		Label@CONNECTION_FAILED_TITLE:
+			X:0
+			Y:20
+			Width:450
+			Height:25
+			Text:Connection Failed
+			Align:Center
+			Font:Bold
+		Label@CONNECTING_DESC:
+			X:0
+			Y:45
+			Width:PARENT_RIGHT
+			Height:25
+			Text:Could not connect to AAA.BBB.CCC.DDD:EEEE
+			Align:Center
+		Label@CONNECTION_ERROR:
+			X:0
+			Y:75
+			Width:PARENT_RIGHT
+			Height:25
+			Text:ServerError
+			Align:Center
+			Font:Bold
+		Label@PASSWORD_LABEL:
+			X:PARENT_RIGHT - 360
+			Y:110
+			Width:95
+			Height:25
+			Text:Password:
+			Font:Bold
+		PasswordField@PASSWORD:
+			X:PARENT_RIGHT - 285
+			Y:111
+			Width:190
+			MaxLength:20
+			Height:25
+		Button@RETRY_BUTTON:
+			X:PARENT_RIGHT - 360
+			Y:PARENT_BOTTOM - 45
+			Width:160
+			Height:25
+			Text:Retry
+			Font:Bold
+			Key:return
+		Button@ABORT_BUTTON:
+			X:PARENT_RIGHT - 180
+			Y:PARENT_BOTTOM - 45
+			Width:160
+			Height:25
+			Text:Cancel
+			Font:Bold
+			Key:escape
+Background@CONNECTING_PANEL:
+	Logic:ConnectionLogic
+	X:(WINDOW_RIGHT - WIDTH)/2
+	Y:(WINDOW_BOTTOM - HEIGHT)/2
+	Width:450
+	Height:150
+	Children:
+		Label@CONNECTING_TITLE:
+			X:0
+			Y:20
+			Width:450
+			Height:25
+			Text:Connecting
+			Align:Center
+			Font:Bold
+		Label@CONNECTING_DESC:
+			X:0
+			Y:60
+			Width:PARENT_RIGHT
+			Height:25
+			Text:Connecting to AAA.BBB.CCC.DDD:EEEE...
+			Align:Center
+		Button@ABORT_BUTTON:
+			X:PARENT_RIGHT - 180
+			Y:PARENT_BOTTOM - 45
+			Width:160
+			Height:25
+			Text:Abort
+			Font:Bold
+			Key:escape
--- a/mods/ra/chrome/create-server.yaml
+++ b/mods/ra/chrome/create-server.yaml
@@ -3,7 +3,7 @@ Background@CREATESERVER_BG:
 	X:(WINDOW_RIGHT - WIDTH)/2
 	Y:(WINDOW_BOTTOM - HEIGHT)/2
 	Width:400
-	Height:240
+	Height:300
 	Children:
 		Label@LABEL_TITLE:
 			X:0
@@ -27,45 +27,65 @@ Background@CREATESERVER_BG:
 			MaxLength:50
 			Height:25
 			Text:OpenRA Game
-		Label@EXTERNAL_PORT_LABEL:
+		Label@PASSWORD_LABEL:
 			X:50
 			Y:94
 			Width:95
 			Height:25
+			Align:Right
+			Text:Password:
+		PasswordField@PASSWORD:
+			X:150
+			Y:95
+			Width:145
+			MaxLength:20
+			Height:25
+		Label@AFTER_PASSWORD_LABEL:
+			X:300
+			Y:94
+			Width:95
+			Height:25
+			Align:Left
+			Text:(optional)
+		Label@EXTERNAL_PORT_LABEL:
+			X:50
+			Y:129
+			Width:95
+			Height:25
 			Align: Right
 			Text:External Port:
 		TextField@EXTERNAL_PORT:
 			X:150
-			Y:95
+			Y:130
 			Width:50
 			MaxLength:5
 			Height:25
 			Text:OpenRA Game
 		Label@LISTEN_PORT_LABEL:
 			X:210
-			Y:94
+			Y:129
 			Width:95
 			Height:25
 			Align: Right
 			Text:Listen Port:
 		TextField@LISTEN_PORT:
 			X:310
-			Y:95
+			Y:130
 			Width:50
 			MaxLength:5
 			Height:25
-		Checkbox@ADVERTISE_CHECKBOX:
-			X:165
-			Y:130
-			Width:300
-			Height:20
-			Text:Advertise game Online
 		Checkbox@UPNP_CHECKBOX:
-			X:165
+			X:150
 			Y:165
 			Width:300
 			Height:20
 			Text:Automatic port forwarding
+		Checkbox@ADVERTISE_CHECKBOX:
+			X:150
+			Y:200
+			Width:300
+			Height:20
+			Text:Advertise game Online
 		Button@CREATE_BUTTON:
 			X:130
 			Y:PARENT_BOTTOM - 45
--- a/mods/ra/chrome/directconnect.yaml
+++ b/mods/ra/chrome/directconnect.yaml
@@ -0,0 +1,50 @@
+Background@DIRECTCONNECT_BG:
+	Logic:DirectConnectLogic
+	X:(WINDOW_RIGHT - WIDTH)/2
+	Y:(WINDOW_BOTTOM - HEIGHT)/2
+	Width:400
+	Height:150
+	Children:
+		Label@DIRECTCONNECT_LABEL_TITLE:
+			X:0
+			Y:20
+			Width:400
+			Height:25
+			Text:Direct Connect
+			Align:Center
+			Font:Bold
+		Label@ADDRESS_LABEL:
+			X:50
+			Y:59
+			Width:95
+			Height:25
+			Align:Right
+			Text:Server Address:
+		TextField@IP:
+			X:150
+			Y:60
+			Width:160
+			MaxLength:50
+			Height:25
+		TextField@PORT:
+			X:315
+			Y:60
+			Width:55
+			MaxLength:5
+			Height:25
+		Button@JOIN_BUTTON:
+			X:130
+			Y:PARENT_BOTTOM - 45
+			Width:120
+			Height:25
+			Text:Join
+			Font:Bold
+			Key:return
+		Button@BACK_BUTTON:
+			X:260
+			Y:PARENT_BOTTOM - 45
+			Width:120
+			Height:25
+			Text:Cancel
+			Font:Bold
+			Key:escape 
--- a/mods/ra/chrome/serverbrowser.yaml
+++ b/mods/ra/chrome/serverbrowser.yaml
@@ -134,121 +134,3 @@ Background@JOINSERVER_BG:
 		Container@IRC_ROOT:
 			X:20
 			Y:430
-Background@DIRECTCONNECT_BG:
-	Logic:DirectConnectLogic
-	X:(WINDOW_RIGHT - WIDTH)/2
-	Y:(WINDOW_BOTTOM - HEIGHT)/2
-	Width:400
-	Height:155
-	Children:
-		Label@DIRECTCONNECT_LABEL_TITLE:
-			X:0
-			Y:20
-			Width:400
-			Height:25
-			Text:Direct Connect
-			Align:Center
-			Font:Bold
-		Label@ADDRESS_LABEL:
-			X:50
-			Y:59
-			Width:95
-			Height:25
-			Align:Right
-			Text:Server Address:
-		TextField@IP:
-			X:150
-			Y:60
-			Width:160
-			MaxLength:50
-			Height:25
-		TextField@PORT:
-			X:315
-			Y:60
-			Width:55
-			MaxLength:5
-			Height:25
-		Button@JOIN_BUTTON:
-			X:130
-			Y:PARENT_BOTTOM - 45
-			Width:120
-			Height:25
-			Text:Join
-			Font:Bold
-			Key:return
-		Button@BACK_BUTTON:
-			X:260
-			Y:PARENT_BOTTOM - 45
-			Width:120
-			Height:25
-			Text:Cancel
-			Font:Bold
-			Key:escape
-Background@CONNECTIONFAILED_PANEL:
-	Logic:ConnectionFailedLogic
-	X:(WINDOW_RIGHT - WIDTH)/2
-	Y:(WINDOW_BOTTOM - HEIGHT)/2
-	Width:450
-	Height:150
-	Children:
-		Label@CONNECTION_FAILED_TITLE:
-			X:0
-			Y:20
-			Width:450
-			Height:25
-			Text:Connection Failed
-			Align:Center
-			Font:Bold
-		Label@CONNECTING_DESC:
-			X:0
-			Y:60
-			Width:PARENT_RIGHT
-			Height:25
-			Text:Could not connect to AAA.BBB.CCC.DDD:EEEE
-			Align:Center
-		Button@RETRY_BUTTON:
-			X:PARENT_RIGHT - 360
-			Y:PARENT_BOTTOM - 45
-			Width:160
-			Height:25
-			Text:Retry
-			Font:Bold
-			Key:return
-		Button@ABORT_BUTTON:
-			X:PARENT_RIGHT - 180
-			Y:PARENT_BOTTOM - 45
-			Width:160
-			Height:25
-			Text:Cancel
-			Font:Bold
-			Key:escape
-Background@CONNECTING_PANEL:
-	Logic:ConnectionLogic
-	X:(WINDOW_RIGHT - WIDTH)/2
-	Y:(WINDOW_BOTTOM - HEIGHT)/2
-	Width:450
-	Height:150
-	Children:
-		Label@CONNECTING_TITLE:
-			X:0
-			Y:20
-			Width:450
-			Height:25
-			Text:Connecting
-			Align:Center
-			Font:Bold
-		Label@CONNECTING_DESC:
-			X:0
-			Y:60
-			Width:PARENT_RIGHT
-			Height:25
-			Text:Connecting to AAA.BBB.CCC.DDD:EEEE...
-			Align:Center
-		Button@ABORT_BUTTON:
-			X:PARENT_RIGHT - 180
-			Y:PARENT_BOTTOM - 45
-			Width:160
-			Height:25
-			Text:Abort
-			Font:Bold
-			Key:escape
--- a/mods/ra/mod.yaml
+++ b/mods/ra/mod.yaml
@@ -77,6 +77,8 @@ ChromeLayout:
 	mods/ra/chrome/map-chooser.yaml
 	mods/ra/chrome/create-server.yaml
 	mods/ra/chrome/serverbrowser.yaml
+	mods/ra/chrome/connection.yaml
+	mods/ra/chrome/directconnect.yaml
 	mods/ra/chrome/replaybrowser.yaml
 	mods/ra/chrome/dropdowns.yaml
 	mods/ra/chrome/modchooser.yaml
--- a/mods/ts/mod.yaml
+++ b/mods/ts/mod.yaml
@@ -107,6 +107,8 @@ ChromeLayout:
 	mods/ra/chrome/map-chooser.yaml
 	mods/ra/chrome/create-server.yaml
 	mods/ra/chrome/serverbrowser.yaml
+	mods/ra/chrome/connection.yaml
+	mods/ra/chrome/directconnect.yaml
 	mods/ra/chrome/replaybrowser.yaml
 	mods/ra/chrome/dropdowns.yaml
 	mods/ra/chrome/modchooser.yaml