Merge pull request #4942 from pchote/more-replays

Overhaul observer shroud selector.
2014-03-22 12:20:40 +01:00
parent 8b207274ee 71357950f7
commit 272e872357
17 changed files with 514 additions and 31 deletions
--- a/mods/cnc/chrome/dialogs.yaml
+++ b/mods/cnc/chrome/dialogs.yaml
@@ -64,6 +64,43 @@ ScrollPanel@TEAM_DROPDOWN_TEMPLATE:
 					Height:25
 					Align:Center

+ScrollPanel@SPECTATOR_DROPDOWN_TEMPLATE:
+	Width:DROPDOWN_WIDTH
+	Background:panel-black
+	Children:
+		ScrollItem@HEADER:
+			Width:PARENT_RIGHT-27
+			Height:13
+			X:2
+			Y:0
+			Visible:false
+			Children:
+				Label@LABEL:
+					Font:TinyBold
+					Width:PARENT_RIGHT
+					Height:10
+					Align:Center
+		ScrollItem@TEMPLATE:
+			Width:PARENT_RIGHT-27
+			Height:25
+			X:2
+			Y:0
+			Visible:false
+			Children:
+				Image@FLAG:
+					X:4
+					Y:4
+					Width:32
+					Height:16
+				Label@LABEL:
+					X:40
+					Width:60
+					Height:25
+				Label@NOFLAG_LABEL:
+					X:5
+					Width:PARENT_RIGHT
+					Height:25
+
 Container@CONFIRM_PROMPT:
 	X:(WINDOW_RIGHT - WIDTH)/2
 	Y:(WINDOW_BOTTOM - 90)/2
--- a/mods/cnc/chrome/ingame.yaml
+++ b/mods/cnc/chrome/ingame.yaml
@@ -158,9 +158,26 @@ Container@OBSERVER_WIDGETS:
 			Width:168
 			Height:25
 			Font:Bold
+			Children:
+				LogicKeyListener@SHROUD_KEYHANDLER:
+				Image@FLAG:
+					X:4
+					Y:4
+					Width:32
+					Height:16
+				Label@LABEL:
+					X:40
+					Width:60
+					Height:25
+				Label@NOFLAG_LABEL:
+					X:5
+					Width:PARENT_RIGHT
+					Height:25

 Container@PLAYER_WIDGETS:
 	Children:
+		LogicKeyListener@CONTROLGROUP_KEYHANDLER:
+			Logic:ControlGroupLogic
 		LogicTicker@SIDEBAR_TICKER:
 		WorldCommand:
 			Width:WINDOW_RIGHT
--- a/mods/d2k/chrome/dropdowns.yaml
+++ b/mods/d2k/chrome/dropdowns.yaml
@@ -0,0 +1,80 @@
+ScrollPanel@LABEL_DROPDOWN_TEMPLATE:
+	Width:DROPDOWN_WIDTH
+	Children:
+		ScrollItem@HEADER:
+			BaseName:scrollheader
+			Width:PARENT_RIGHT-27
+			Height:13
+			X:2
+			Y:0
+			Visible:false
+			Children:
+				Label@LABEL:
+					Font:TinyBold
+					Width:PARENT_RIGHT
+					Height:10
+					Align:Center
+		ScrollItem@TEMPLATE:
+			Width:PARENT_RIGHT-27
+			Height:25
+			X:2
+			Y:0
+			Visible:false
+			Children:
+				Label@LABEL:
+					X:10
+					Width:PARENT_RIGHT-20
+					Height:25
+
+ScrollPanel@TEAM_DROPDOWN_TEMPLATE:
+	Width:DROPDOWN_WIDTH
+	Children:
+		ScrollItem@TEMPLATE:
+			Width:PARENT_RIGHT-27
+			Height:25
+			X:2
+			Y:0
+			Visible:false
+			Children:
+				Label@LABEL:
+					X:0
+					Width:PARENT_RIGHT
+					Height:25
+					Align:Center
+
+ScrollPanel@SPECTATOR_DROPDOWN_TEMPLATE:
+	Width:DROPDOWN_WIDTH
+	Children:
+		ScrollItem@HEADER:
+			BaseName:scrollheader
+			Width:PARENT_RIGHT-27
+			Height:13
+			X:2
+			Y:0
+			Visible:false
+			Children:
+				Label@LABEL:
+					Font:TinyBold
+					Width:PARENT_RIGHT
+					Height:10
+					Align:Center
+		ScrollItem@TEMPLATE:
+			Width:PARENT_RIGHT-27
+			Height:25
+			X:2
+			Y:0
+			Visible:false
+			Children:
+				Image@FLAG:
+					Width:23
+					Height:23
+					X:4
+					Y:2
+				Label@LABEL:
+					X:34
+					Width:60
+					Height:25
+				Label@NOFLAG_LABEL:
+					X:5
+					Width:PARENT_RIGHT
+					Height:25
--- a/mods/d2k/chrome/ingame-observer.yaml
+++ b/mods/d2k/chrome/ingame-observer.yaml
@@ -0,0 +1,114 @@
+Container@OBSERVER_WIDGETS:
+	Children:
+		Button@INGAME_STATS_BUTTON:
+			X:162
+			Y:0
+			Width:160
+			Height:25
+			Text:Statistics (F1)
+			Font:Bold
+			Key:f1
+		Background@RADAR_BG:
+			X:WINDOW_RIGHT-255
+			Y:5
+			Width:250
+			Height:250
+			Children:
+				Radar@INGAME_RADAR:
+					X:10
+					Y:10
+					Width:PARENT_RIGHT-19
+					Height:PARENT_BOTTOM-19
+					WorldInteractionController:INTERACTION_CONTROLLER
+		Background@OBSERVER_CONTROL_BG:
+			X:WINDOW_RIGHT-255
+			Y:260
+			Width:250
+			Height:55
+			Children:
+				DropDownButton@SHROUD_SELECTOR:
+					Logic:ObserverShroudSelectorLogic
+					X:15
+					Y:15
+					Width:220
+					Height:25
+					Font:Bold
+					Children:
+						LogicKeyListener@SHROUD_KEYHANDLER:
+						Image@FLAG:
+							Width:23
+							Height:23
+							X:4
+							Y:2
+						Label@LABEL:
+							X:34
+							Width:60
+							Height:25
+						Label@NOFLAG_LABEL:
+							X:5
+							Width:PARENT_RIGHT
+							Height:25
+				Container@REPLAY_PLAYER:
+					Logic:ReplayControlBarLogic
+					X:PARENT_RIGHT/2 - 80
+					Y:35
+					Width:160
+					Height:35
+					Visible:false
+					Children:
+						Button@BUTTON_PAUSE:
+							X:15
+							Y:15
+							Width:25
+							Height:25
+							IgnoreChildMouseOver:true
+							Children:
+								Image@IMAGE_PAUSE:
+									X:0
+									Y:0
+									Width:25
+									Height:25
+									ImageCollection:music
+									ImageName:pause
+						Button@BUTTON_SLOW:
+							X:50
+							Y:15
+							Width:25
+							Height:25
+							IgnoreChildMouseOver:true
+							Children:
+								Image@IMAGE_SLOW:
+									X:4
+									Y:0
+									Width:25
+									Height:25
+									ImageCollection:music
+									ImageName:slowmo
+						Button@BUTTON_NORMALSPEED:
+							X:85
+							Y:15
+							Width:25
+							Height:25
+							IgnoreChildMouseOver:true
+							Children:
+								Image@IMAGE_PLAY:
+									X:0
+									Y:0
+									Width:25
+									Height:25
+									ImageCollection:music
+									ImageName:play
+						Button@BUTTON_FASTFORWARD:
+							X:120
+							Y:15
+							Width:25
+							Height:25
+							IgnoreChildMouseOver:true
+							Children:
+								Image@IMAGE_FASTFORWARD:
+									X:4
+									Y:0
+									Width:25
+									Height:25
+									ImageCollection:music
+									ImageName:fastforward
--- a/mods/d2k/chrome/ingame-player.yaml
+++ b/mods/d2k/chrome/ingame-player.yaml
@@ -1,5 +1,7 @@
 Container@PLAYER_WIDGETS:
 	Children:
+		LogicKeyListener@CONTROLGROUP_KEYHANDLER:
+			Logic:ControlGroupLogic
 		LogicTicker@SIDEBAR_TICKER:
 		Button@INGAME_DIPLOMACY_BUTTON:
 			X:162
--- a/mods/d2k/mod.yaml
+++ b/mods/d2k/mod.yaml
@@ -62,7 +62,7 @@ ChromeLayout:
 	mods/ra/chrome/ingame-diplomacy.yaml
 	mods/ra/chrome/ingame-fmvplayer.yaml
 	mods/ra/chrome/ingame-menu.yaml
-	mods/ra/chrome/ingame-observer.yaml
+	mods/d2k/chrome/ingame-observer.yaml
 	mods/ra/chrome/ingame-observerstats.yaml
 	mods/d2k/chrome/ingame-player.yaml
 	mods/d2k/chrome/mainmenu.yaml
@@ -79,7 +79,7 @@ ChromeLayout:
 	mods/ra/chrome/connection.yaml
 	mods/ra/chrome/directconnect.yaml
 	mods/ra/chrome/replaybrowser.yaml
-	mods/ra/chrome/dropdowns.yaml
+	mods/d2k/chrome/dropdowns.yaml
 	mods/ra/chrome/modchooser.yaml
 	mods/ra/chrome/cheats.yaml
 	mods/ra/chrome/musicplayer.yaml
--- a/mods/ra/chrome/dropdowns.yaml
+++ b/mods/ra/chrome/dropdowns.yaml
@@ -40,4 +40,41 @@ ScrollPanel@TEAM_DROPDOWN_TEMPLATE:
 					X:0
 					Width:PARENT_RIGHT
 					Height:25
-					Align:Center
+					Align:Center
+
+ScrollPanel@SPECTATOR_DROPDOWN_TEMPLATE:
+	Width:DROPDOWN_WIDTH
+	Children:
+		ScrollItem@HEADER:
+			BaseName:scrollheader
+			Width:PARENT_RIGHT-27
+			Height:13
+			X:2
+			Y:0
+			Visible:false
+			Children:
+				Label@LABEL:
+					Font:TinyBold
+					Width:PARENT_RIGHT
+					Height:10
+					Align:Center
+		ScrollItem@TEMPLATE:
+			Width:PARENT_RIGHT-27
+			Height:25
+			X:2
+			Y:0
+			Visible:false
+			Children:
+				Image@FLAG:
+					X:4
+					Y:4
+					Width:32
+					Height:16
+				Label@LABEL:
+					X:40
+					Width:60
+					Height:25
+				Label@NOFLAG_LABEL:
+					X:5
+					Width:PARENT_RIGHT
+					Height:25
--- a/mods/ra/chrome/ingame-observer.yaml
+++ b/mods/ra/chrome/ingame-observer.yaml
@@ -33,6 +33,21 @@ Container@OBSERVER_WIDGETS:
 					Width:220
 					Height:25
 					Font:Bold
+					Children:
+						LogicKeyListener@SHROUD_KEYHANDLER:
+						Image@FLAG:
+							X:4
+							Y:4
+							Width:32
+							Height:16
+						Label@LABEL:
+							X:40
+							Width:60
+							Height:25
+						Label@NOFLAG_LABEL:
+							X:5
+							Width:PARENT_RIGHT
+							Height:25
 				Container@REPLAY_PLAYER:
 					Logic:ReplayControlBarLogic
 					X:PARENT_RIGHT/2 - 80
--- a/mods/ra/chrome/ingame-player.yaml
+++ b/mods/ra/chrome/ingame-player.yaml
@@ -1,5 +1,7 @@
 Container@PLAYER_WIDGETS:
 	Children:
+		LogicKeyListener@CONTROLGROUP_KEYHANDLER:
+			Logic:ControlGroupLogic
 		LogicTicker@SIDEBAR_TICKER:
 		Button@INGAME_DIPLOMACY_BUTTON:
 			X:162