separate connection and direct connect dialog from serverbrowser

2013-10-05 10:15:09 +02:00
parent b618fc7cc2
commit 3af1e47744
6 changed files with 146 additions and 118 deletions
--- 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