Merge pull request #3655 from Mailaender/diplomacy

Diplomacy Panel Renovation
2013-08-22 13:38:18 -07:00
parent b41718876c 52d9a7a31b
commit 7d8d5dc30d
11 changed files with 154 additions and 162 deletions
--- a/mods/d2k/chrome/ingame.yaml
+++ b/mods/d2k/chrome/ingame.yaml
@@ -162,30 +162,6 @@ Container@PLAYER_WIDGETS:
 			IconHeight: 48
 			Columns: 3
 			Rows: 4
-		Background@DIPLOMACY_BG:
-			Logic:DiplomacyLogic
-			X:(WINDOW_RIGHT - WIDTH)/2
-			Y:(WINDOW_BOTTOM - HEIGHT)/2
-			Width:450
-			Height:400
-			Visible:false
-			Children:
-				Label@LABEL_TITLE:
-					X:(PARENT_RIGHT - WIDTH)/2
-					Y:20
-					Width:250
-					Height:25
-					Text:Diplomacy
-					Align:Center
-					Font:Bold
-				Button@CLOSE_DIPLOMACY:
-					X:(PARENT_RIGHT - WIDTH)/2
-					Y:350
-					Width:160
-					Height:25
-					Text:Close
-					Font:Bold
-					Key:escape

 Container@OBSERVER_WIDGETS:
 	Children:
--- a/mods/d2k/mod.yaml
+++ b/mods/d2k/mod.yaml
@@ -51,6 +51,7 @@ ChromeLayout:
 	mods/d2k/chrome/gameinit.yaml
 	mods/d2k/chrome/ingame.yaml
 	mods/ra/chrome/ingame-chat.yaml
+	mods/ra/chrome/ingame-diplomacy.yaml
 	mods/ra/chrome/ingame-fmvplayer.yaml
 	mods/ra/chrome/ingame-menu.yaml
 	mods/ra/chrome/ingame-observerstats.yaml
--- a/mods/ra/chrome/ingame-diplomacy.yaml
+++ b/mods/ra/chrome/ingame-diplomacy.yaml
@@ -0,0 +1,83 @@
+Background@DIPLOMACY:
+	Logic:DiplomacyLogic
+	X:25
+	Y:50
+	Width:490
+	Height:300
+	Visible:false
+	Children:
+		Label@LABEL_TITLE:
+			X:(PARENT_RIGHT - WIDTH)/2
+			Y:17
+			Width:250
+			Height:20
+			Text:Diplomacy
+			Align:Center
+			Font:Bold
+		Container@DIPLOMACY_HEADERS:
+			X:20
+			Y:40
+			Width:PARENT_RIGHT-40
+			Height:PARENT_BOTTOM
+			Children:
+				Label@PLAYER_HEADER:
+					X:20
+					Width:160
+					Height:25
+					Font:Bold
+					Text:Player
+				Label@THEIR_STANCE_HEADER:
+					X:210
+					Width:80
+					Height:25
+					Font:Bold
+					Text:Their Stance
+					Align:Center
+				Label@MY_STANCE_HEADER:
+					X:307
+					Width:100
+					Height:25
+					Font:Bold
+					Text:My Stance
+					Align:Center
+		ScrollPanel@DIPLOMACY_PANEL:
+			X:20
+			Y:67
+			Width:PARENT_RIGHT-40
+			Height:PARENT_BOTTOM-87
+			ItemSpacing:5
+			Children:
+				ScrollItem@TEAM_TEMPLATE:
+					Width:PARENT_RIGHT
+					Height:25
+					Children:
+						Label@TEAM:
+							X:10
+							Width:PARENT_RIGHT
+							Height:PARENT_BOTTOM
+							Font:Bold
+				ScrollItem@PLAYER_TEMPLATE:
+					Width:PARENT_RIGHT-35
+					Height:25
+					Children:
+						Image@FLAG:
+							X:20
+							Y:5
+							Width:35
+							Height:PARENT_BOTTOM-5
+							ImageName:random
+							ImageCollection:flags
+						Label@PLAYER:
+							X:55
+							Width:160
+							Height:PARENT_BOTTOM
+							Font:Bold
+						Label@THEIR_STANCE:
+							X:210
+							Width:80
+							Height:PARENT_BOTTOM
+							Align:Center
+						DropDownButton@MY_STANCE:
+							X:307
+							Width:100
+							Height:PARENT_BOTTOM
--- a/mods/ra/chrome/ingame.yaml
+++ b/mods/ra/chrome/ingame.yaml
@@ -158,30 +158,6 @@ Container@PLAYER_WIDGETS:
 			ReadyText: READY
 			HoldText: ON HOLD
 			RequiresText: Requires
-		Background@DIPLOMACY_BG:
-			Logic:DiplomacyLogic
-			X:(WINDOW_RIGHT - WIDTH)/2
-			Y:(WINDOW_BOTTOM - HEIGHT)/2
-			Width:450
-			Height:400
-			Visible:false
-			Children:
-				Label@LABEL_TITLE:
-					X:(PARENT_RIGHT - WIDTH)/2
-					Y:20
-					Width:250
-					Height:25
-					Text:Diplomacy
-					Align:Center
-					Font:Bold
-				Button@CLOSE_DIPLOMACY:
-					X:(PARENT_RIGHT - WIDTH)/2
-					Y:350
-					Width:160
-					Height:25
-					Text:Close
-					Font:Bold
-					Key:escape

 Container@OBSERVER_WIDGETS:
 	Children:
--- a/mods/ra/chrome/lobby-dialogs.yaml
+++ b/mods/ra/chrome/lobby-dialogs.yaml
@@ -81,27 +81,27 @@ Background@LOBBY_OPTIONS_BIN:
 					Height:20
 					Text:Fog of War
 				Checkbox@CRATES_CHECKBOX:
-					X:155
+					X:125
 					Width:230
 					Height:20
 					Text:Crates Appear
 				Checkbox@ALLYBUILDRADIUS_CHECKBOX:
-					X:155
+					X:125
 					Y:40
 					Width:230
 					Height:20
 					Text:Build off Ally ConYards
 				Checkbox@ALLOWCHEATS_CHECKBOX:
-					X:350
+					X:320
 					Width:230
 					Height:20
 					Text:Debug Menu
 				Checkbox@FRAGILEALLIANCES_CHECKBOX:
-					X:350
+					X:320
 					Y:40
 					Width:220
 					Height:20
-					Text:Team Changes
+					Text:Diplomacy Changes
 				Label@STARTINGCASH_DESC:
 					Y:87
 					Width:80
--- a/mods/ra/mod.yaml
+++ b/mods/ra/mod.yaml
@@ -62,6 +62,7 @@ ChromeLayout:
 	mods/ra/chrome/gameinit.yaml
 	mods/ra/chrome/ingame.yaml
 	mods/ra/chrome/ingame-chat.yaml
+	mods/ra/chrome/ingame-diplomacy.yaml
 	mods/ra/chrome/ingame-fmvplayer.yaml
 	mods/ra/chrome/ingame-menu.yaml
 	mods/ra/chrome/ingame-objectives.yaml
--- a/mods/ts/mod.yaml
+++ b/mods/ts/mod.yaml
@@ -92,6 +92,7 @@ ChromeLayout:
 	mods/ra/chrome/gameinit.yaml
 	mods/ra/chrome/ingame.yaml
 	mods/ra/chrome/ingame-chat.yaml
+	mods/ra/chrome/ingame-diplomacy.yaml
 	mods/ra/chrome/ingame-fmvplayer.yaml
 	mods/ra/chrome/ingame-menu.yaml
 	mods/ra/chrome/ingame-objectives.yaml