Remove global chat integration.

2017-12-13 19:16:41 +00:00
parent 488cec64b8
commit 502c3e2bf5
29 changed files with 20 additions and 1260 deletions
--- a/mods/common/chrome/lobby-globalchat.yaml
+++ b/mods/common/chrome/lobby-globalchat.yaml
@@ -1,142 +0,0 @@
-Container@LOBBY_GLOBALCHAT_PANEL:
-	Logic: GlobalChatLogic
-	Width: PARENT_RIGHT
-	Height: PARENT_BOTTOM
-	Children:
-		Container@GLOBALCHAT_MAIN_PANEL:
-			Width: PARENT_RIGHT
-			Height: PARENT_BOTTOM - 30
-			Children:
-				Background@TOPIC:
-					Width: 582
-					Height: 20
-					Background: dialog2
-					Children:
-						Label@CHANNEL_TOPIC:
-							X: 10
-							Y: 0 - 1
-							Width: PARENT_RIGHT - 20
-							Height: PARENT_BOTTOM
-							Font: TinyBold
-							Align: Center
-				ScrollPanel@HISTORY_PANEL:
-					Y: 20
-					Width: 582
-					Height: PARENT_BOTTOM - 50
-					TopBottomSpacing: 4
-					ItemSpacing: 4
-					Children:
-						Container@CHAT_TEMPLATE:
-							X: 2
-							Width: PARENT_RIGHT - 27
-							Height: 16
-							Children:
-								Label@TIME:
-									X: 3
-									Width: 50
-									Height: 15
-									VAlign: Top
-									Shadow: True
-								Label@NAME:
-									X: 45
-									Width: 50
-									Height: 15
-									VAlign: Top
-									Shadow: True
-								Label@TEXT:
-									X: 55
-									Width: PARENT_RIGHT - 60
-									Height: 15
-									WordWrap: true
-									VAlign: Top
-									Shadow: True
-				TextField@CHAT_TEXTFIELD:
-					X: 205
-					Y: PARENT_BOTTOM - 25
-					Width: 582 - 205
-					Height: 25
-					LeftMargin: 60
-					Children:
-						Label@LABEL_CHATTYPE:
-							Y: 0 - 1
-							Width: 55
-							Height: 25
-							Align: Right
-							Text: Global:
-				ScrollPanel@NICKNAME_PANEL:
-					X: 596
-					Width: PARENT_RIGHT - 596
-					Height: PARENT_BOTTOM - 30
-					Children:
-						Container@NICKNAME_TEMPLATE:
-							Width: PARENT_RIGHT - 25
-							Height: 20
-							Children:
-								Image@INDICATOR:
-									ImageCollection: lobby-bits
-									ImageName: admin
-									X: 4
-									Y: 9
-								Label@NICK:
-									X: 15
-									Width: PARENT_RIGHT - 15
-									Height: 20
-				Button@DISCONNECT_BUTTON:
-					X: 596
-					Y: PARENT_BOTTOM - 25
-					Width: PARENT_RIGHT - 596
-					Height: 25
-					Text: Leave Chat
-					Font: Bold
-		Container@GLOBALCHAT_CONNECT_PANEL:
-			Width: PARENT_RIGHT
-			Height: PARENT_BOTTOM - 30
-			Children:
-				Background:
-					Width: PARENT_RIGHT
-					Height: PARENT_BOTTOM - 30
-					Background: scrollpanel-bg
-					Children:
-						Label@GLOBAL_CHAT_LABEL:
-							Y: PARENT_BOTTOM / 4
-							Width: PARENT_RIGHT
-							Align: Center
-							Text: Global Chat
-							Font: Bold
-						Label@NICKNAME_LABEL:
-							X: 200
-							Y: PARENT_BOTTOM / 4 + 35
-							Text: Nickname:
-						TextField@NICKNAME_TEXTFIELD:
-							X: 270
-							Y: PARENT_BOTTOM / 4 + 25
-							Width: 150
-							Height: 25
-						Checkbox@CONNECT_AUTOMATICALLY_CHECKBOX:
-							X: 270
-							Y: PARENT_BOTTOM / 4 + 75
-							Height: 20
-							Width: 180
-							Font: Regular
-							Text: Connect Automatically
-						Button@CONNECT_BUTTON:
-							X: 430
-							Y: PARENT_BOTTOM / 4 + 25
-							Width: 100
-							Height: 25
-							Text: Connect
-							Font: Bold
-				TextField@FAKE_CHAT:
-					X: 205
-					Y: PARENT_BOTTOM - 25
-					Width: PARENT_RIGHT - 205
-					Height: 25
-					LeftMargin: 60
-					Disabled: true
-					Children:
-						Label@LABEL_CHATTYPE:
-							Y: 0 - 1
-							Width: 55
-							Height: 25
-							Align: Right
-							Text: Global:
--- a/mods/common/chrome/lobby.yaml
+++ b/mods/common/chrome/lobby.yaml
@@ -57,25 +57,11 @@ Background@SERVER_LOBBY:
 			Height: 25
 			Text: Change Map
 			Font: Bold
-		Button@LOBBYCHAT_TAB:
-			X: 20
-			Y: PARENT_BOTTOM - 81
-			Width: 100
-			Height: 31
-			Text: Game
-			Font: Bold
-		Button@GLOBALCHAT_TAB:
-			X: 120
-			Y: PARENT_BOTTOM - 81
-			Width: 100
-			Height: 31
-			Text: Global
-			Font: Bold
 		Container@LOBBYCHAT:
 			X: 20
-			Y: PARENT_BOTTOM - HEIGHT - 50
+			Y: PARENT_BOTTOM - HEIGHT - 20
 			Width: PARENT_RIGHT - 40
-			Height: 229
+			Height: 259
 			Children:
 				ScrollPanel@CHAT_DISPLAY:
 					Width: PARENT_RIGHT
@@ -108,9 +94,8 @@ Background@SERVER_LOBBY:
 									VAlign: Top
 									Shadow: True
 				TextField@CHAT_TEXTFIELD:
-					X: 205
 					Y: PARENT_BOTTOM - HEIGHT
-					Width: PARENT_RIGHT - 205
+					Width: PARENT_RIGHT - 260
 					Height: 25
 					LeftMargin: 50
 					Children:
@@ -120,11 +105,6 @@ Background@SERVER_LOBBY:
 							Height: 25
 							Align: Right
 							Text: Chat:
-		Container@GLOBALCHAT_ROOT:
-			X: 20
-			Y: PARENT_BOTTOM - HEIGHT - 20
-			Width: PARENT_RIGHT - 40
-			Height: 259
 		Button@START_GAME_BUTTON:
 			X: PARENT_RIGHT - WIDTH - 150
 			Y: PARENT_BOTTOM - HEIGHT - 20
--- a/mods/common/chrome/multiplayer-browser.yaml
+++ b/mods/common/chrome/multiplayer-browser.yaml
@@ -35,7 +35,7 @@ Container@MULTIPLAYER_BROWSER_PANEL:
 		ScrollPanel@SERVER_LIST:
 			Y: 30
 			Width: 583
-			Height: 249
+			Height: 279
 			TopBottomSpacing: 2
 			Children:
 				ScrollItem@HEADER_TEMPLATE:
--- a/mods/common/chrome/multiplayer-createserver.yaml
+++ b/mods/common/chrome/multiplayer-createserver.yaml
@@ -13,11 +13,11 @@ Container@MULTIPLAYER_CREATESERVER_PANEL:
 		ScrollPanel:
 			Y: 30
 			Width: 583
-			Height: 249
+			Height: 279
 			Children:
 				Container:
 					X: 185
-					Y: 25
+					Y: 30
 					Children:
 						Label@SERVER_NAME_LABEL:
 							Y: 14
--- a/mods/common/chrome/multiplayer-directconnect.yaml
+++ b/mods/common/chrome/multiplayer-directconnect.yaml
@@ -12,11 +12,11 @@ Container@MULTIPLAYER_DIRECTCONNECT_PANEL:
 		ScrollPanel:
 			Y: 30
 			Width: 583
-			Height: 249
+			Height: 279
 			Children:
 				Container:
 					X: 185
-					Y: 60
+					Y: 85
 					Children:
 						Label@ADDRESS_LABEL:
 							Y: 14
--- a/mods/common/chrome/multiplayer-globalchat.yaml
+++ b/mods/common/chrome/multiplayer-globalchat.yaml
@@ -1,123 +0,0 @@
-Container@GLOBALCHAT_PANEL:
-	Logic: GlobalChatLogic
-	Width: PARENT_RIGHT
-	Height: PARENT_BOTTOM
-	Children:
-		Container@GLOBALCHAT_MAIN_PANEL:
-			Width: PARENT_RIGHT
-			Height: PARENT_BOTTOM
-			Children:
-				Background@TOPIC:
-					Width: 582
-					Height: 20
-					Background: dialog2
-					Children:
-						Label@CHANNEL_TOPIC:
-							X: 10
-							Y: 0 - 1
-							Width: PARENT_RIGHT - 20
-							Height: PARENT_BOTTOM
-							Font: TinyBold
-							Align: Center
-				ScrollPanel@HISTORY_PANEL:
-					Y: 20
-					Width: 582
-					Height: PARENT_BOTTOM - 50
-					TopBottomSpacing: 4
-					ItemSpacing: 4
-					Children:
-						Container@CHAT_TEMPLATE:
-							X: 2
-							Width: PARENT_RIGHT - 27
-							Height: 16
-							Children:
-								Label@TIME:
-									X: 3
-									Width: 50
-									Height: 15
-									VAlign: Top
-									Shadow: True
-								Label@NAME:
-									X: 45
-									Width: 50
-									Height: 15
-									VAlign: Top
-									Shadow: True
-								Label@TEXT:
-									X: 55
-									Width: PARENT_RIGHT - 60
-									Height: 15
-									WordWrap: true
-									VAlign: Top
-									Shadow: True
-				TextField@CHAT_TEXTFIELD:
-					Y: PARENT_BOTTOM - 25
-					Width: 582
-					Height: 25
-					LeftMargin: 60
-					Children:
-						Label@LABEL_CHATTYPE:
-							Y: 0 - 1
-							Width: 55
-							Height: 25
-							Align: Right
-							Text: Global:
-				ScrollPanel@NICKNAME_PANEL:
-					X: PARENT_RIGHT - WIDTH
-					Width: 174
-					Height: PARENT_BOTTOM - 30
-					Children:
-						Container@NICKNAME_TEMPLATE:
-							Height: 20
-							Width: PARENT_RIGHT - 25
-							Children:
-								Image@INDICATOR:
-									ImageCollection: lobby-bits
-									ImageName: admin
-									X: 4
-									Y: 9
-								Label@NICK:
-									X: 15
-									Width: PARENT_RIGHT - 15
-									Height: 20
-				Button@DISCONNECT_BUTTON:
-					X: PARENT_RIGHT - WIDTH
-					Y: PARENT_BOTTOM - 25
-					Width: 174
-					Height: 25
-					Text: Leave Chat
-					Font: Bold
-		Background@GLOBALCHAT_CONNECT_PANEL:
-			Width: PARENT_RIGHT
-			Height: PARENT_BOTTOM
-			Background: scrollpanel-bg
-			Children:
-				Label@GLOBAL_CHAT_LABEL:
-					Y: PARENT_BOTTOM / 4
-					Width: PARENT_RIGHT
-					Align: Center
-					Text: Global Chat
-					Font: Bold
-				Label@NICKNAME_LABEL:
-					X: 200
-					Y: PARENT_BOTTOM / 4 + 35
-					Text: Nickname:
-				TextField@NICKNAME_TEXTFIELD:
-					X: 270
-					Y: PARENT_BOTTOM / 4 + 25
-					Width: 150
-					Height: 25
-				Checkbox@CONNECT_AUTOMATICALLY_CHECKBOX:
-					X: 270
-					Y: PARENT_BOTTOM / 4 + 75
-					Height: 20
-					Width: 180
-					Font: Regular
-					Text: Connect Automatically
-				Button@CONNECT_BUTTON:
-					X: 430
-					Y: PARENT_BOTTOM / 4 + 25
-					Width: 100
-					Height: 25
-					Text: Connect
-					Font: Bold
--- a/mods/common/chrome/multiplayer.yaml
+++ b/mods/common/chrome/multiplayer.yaml
@@ -3,7 +3,7 @@ Background@MULTIPLAYER_PANEL:
 	X: (WINDOW_RIGHT - WIDTH) / 2
 	Y: (WINDOW_BOTTOM - HEIGHT) / 2
 	Width: 808
-	Height: 600
+	Height: 395
 	Children:
 		Label@TITLE:
 			Y: 15
@@ -14,35 +14,35 @@ Background@MULTIPLAYER_PANEL:
 			Font: Bold
 		DropDownButton@FILTERS_DROPDOWNBUTTON:
 			X: 20
-			Y: 321
+			Y: PARENT_BOTTOM - HEIGHT - 20
 			Width: 158
 			Height: 25
 			Text: Filter Games
 			Font: Bold
 		Button@REFRESH_BUTTON:
 			X: 183
-			Y: 321
+			Y: PARENT_BOTTOM - HEIGHT - 20
 			Width: 100
 			Height: 25
 			Text: Refresh
 			Font: Bold
 		Button@BROWSER_TAB:
 			X: 288
-			Y: 315
+			Y: PARENT_BOTTOM - HEIGHT - 20
 			Width: 105
 			Height: 31
 			Text: Browse
 			Font: Bold
 		Button@DIRECTCONNECT_TAB:
 			X: 393
-			Y: 315
+			Y: PARENT_BOTTOM - HEIGHT - 20
 			Width: 105
 			Height: 31
 			Text: Direct IP
 			Font: Bold
 		Button@CREATE_TAB:
 			X: 498
-			Y: 315
+			Y: PARENT_BOTTOM - HEIGHT - 20
 			Width: 105
 			Height: 31
 			Text: Create
@@ -51,18 +51,13 @@ Background@MULTIPLAYER_PANEL:
 			X: 20
 			Y: 37
 			Width: PARENT_RIGHT - 40
-			Height: PARENT_BOTTOM
-		Container@GLOBALCHAT_ROOT:
-			X: 20
-			Y: 351
-			Width: PARENT_RIGHT - 40
-			Height: PARENT_BOTTOM - 401
+			Height: PARENT_BOTTOM - 87
 		TooltipContainer@TOOLTIP_CONTAINER:
 		Button@BACK_BUTTON:
 			Key: escape
 			X: PARENT_RIGHT - WIDTH - 20
 			Y: PARENT_BOTTOM - HEIGHT - 20
-			Width: 120
+			Width: 174
 			Height: 25
 			Text: Back
 			Font: Bold
--- a/mods/common/metrics.yaml
+++ b/mods/common/metrics.yaml
@@ -10,9 +10,6 @@ Metrics:
 	ButtonTextShadow: false
 	CheckboxPressedState: false
 	GameStartedColor: FFA500
-	GlobalChatNotificationColor: FFA500
-	GlobalChatTextColor: FFFFFF
-	GlobalChatPlayerNameColor: 00FF00
 	HotkeyColor: FFFFFF
 	HotkeyColorDisabled: 808080
 	HotkeyFont: Regular