add a pause/slowdown/play/fastforward button for replays

closes #4633
2014-03-12 11:51:36 +01:00
parent c5ef9cbfb2
commit 0c20e38443
21 changed files with 482 additions and 282 deletions
--- a/mods/d2k/chrome.yaml
+++ b/mods/d2k/chrome.yaml
@@ -258,6 +258,8 @@ music: musicplayer.png
 	play: 56,0,25,25
 	next: 84,0,25,25
 	prev: 112,0,25,25
+	fastforward: 140,0,25,25
+	slowmo: 168,0,25,25

 scrollbar: buttons.png
 	down_arrow: 16,112,16,16
--- a/mods/d2k/chrome/ingame-player.yaml
+++ b/mods/d2k/chrome/ingame-player.yaml
@@ -0,0 +1,104 @@
+Container@PLAYER_WIDGETS:
+	Children:
+		LogicTicker@SIDEBAR_TICKER:
+		Button@INGAME_DIPLOMACY_BUTTON:
+			X:162
+			Y:0
+			Width:160
+			Height:25
+			Text:Diplomacy (F1)
+			Font:Bold
+			Key: f1
+		Button@CHEATS_BUTTON:
+			X:324
+			Y:0
+			Width:160
+			Height:25
+			Text:Cheats (F2)
+			Visible:false
+			Font:Bold
+			Key: f2
+		Button@OBJECTIVES_BUTTON:
+			X:486
+			Y:0
+			Width:160
+			Height:25
+			Text:Objectives (F3)
+			Visible:false
+			Font:Bold
+			Key: f3
+		SlidingContainer@INGAME_RADAR_BIN:
+			X:WINDOW_RIGHT-215
+			Y:0
+			OpenOffset:0,29
+			ClosedOffset:0,-166
+			AnimationLength:15
+			Children:
+				Image@RADAR_BIN_BG:
+					ImageName:radar
+				Radar@RADAR_MINIMAP:
+					WorldInteractionController:INTERACTION_CONTROLLER
+					X:9
+					Width:192
+					Height:192
+				ResourceBar@POWERBAR:
+					X:42
+					Y:205
+					Width:138
+					Height:5
+					TooltipContainer:TOOLTIP_CONTAINER
+					IndicatorImage:power-indicator
+					Orientation:Horizontal
+					Style:Bevelled
+		MoneyBin@INGAME_MONEY_BIN:
+			X:WINDOW_RIGHT - WIDTH
+			Y:0
+			Width:320
+			Height: 32
+			Children:
+				OrderButton@SELL:
+					Logic:OrderButtonsChromeLogic
+					X:3
+					Y:0
+					Width:30
+					Height:30
+					Image:sell
+					Description:Sell
+					LongDesc:Sell buildings, reclaiming a \nproportion of their build cost
+				OrderButton@POWER_DOWN:
+					Logic:OrderButtonsChromeLogic
+					X:39
+					Y:0
+					Width:30
+					Height:30
+					Image:power
+					Description:Powerdown
+					LongDesc:Disable unneeded structures so their \npower can be used elsewhere
+				OrderButton@REPAIR:
+					Logic:OrderButtonsChromeLogic
+					X:75
+					Y:0
+					Width:30
+					Height:30
+					Image:repair
+					Description:Repair
+					LongDesc:Repair damaged buildings
+		SupportPowerBin@INGAME_POWERS_BIN:
+			X:0
+			Y:25
+			IconWidth: 60
+			IconHeight: 48
+			ReadyText: READY
+			HoldText: ON HOLD
+		BuildPalette@INGAME_BUILD_PALETTE:
+			X:WINDOW_RIGHT - 250
+			Y:280
+			Width:238
+			Height:500
+			ReadyText:@ready@
+			HoldText:@on-hold@
+			RequiresText:@requires@
+			IconWidth: 60
+			IconHeight: 48
+			Columns: 3
+			Rows: 4
--- a/mods/d2k/chrome/ingame.yaml
+++ b/mods/d2k/chrome/ingame.yaml
@@ -77,138 +77,3 @@ Container@INGAME_ROOT:
 							Width:200
 							Height:200
 		TooltipContainer@TOOLTIP_CONTAINER:
-
-Container@PLAYER_WIDGETS:
-	Children:
-		LogicTicker@SIDEBAR_TICKER:
-		Button@INGAME_DIPLOMACY_BUTTON:
-			X:162
-			Y:0
-			Width:160
-			Height:25
-			Text:Diplomacy (F1)
-			Font:Bold
-			Key: f1
-		Button@CHEATS_BUTTON:
-			X:324
-			Y:0
-			Width:160
-			Height:25
-			Text:Cheats (F2)
-			Visible:false
-			Font:Bold
-			Key: f2
-		Button@OBJECTIVES_BUTTON:
-			X:486
-			Y:0
-			Width:160
-			Height:25
-			Text:Objectives (F3)
-			Visible:false
-			Font:Bold
-			Key: f3
-		SlidingContainer@INGAME_RADAR_BIN:
-			X:WINDOW_RIGHT-215
-			Y:0
-			OpenOffset:0,29
-			ClosedOffset:0,-166
-			AnimationLength:15
-			Children:
-				Image@RADAR_BIN_BG:
-					ImageName:radar
-				Radar@RADAR_MINIMAP:
-					WorldInteractionController:INTERACTION_CONTROLLER
-					X:9
-					Width:192
-					Height:192
-				ResourceBar@POWERBAR:
-					X:42
-					Y:205
-					Width:138
-					Height:5
-					TooltipContainer:TOOLTIP_CONTAINER
-					IndicatorImage:power-indicator
-					Orientation:Horizontal
-					Style:Bevelled
-		MoneyBin@INGAME_MONEY_BIN:
-			X:WINDOW_RIGHT - WIDTH
-			Y:0
-			Width:320
-			Height: 32
-			Children:
-				OrderButton@SELL:
-					Logic:OrderButtonsChromeLogic
-					X:3
-					Y:0
-					Width:30
-					Height:30
-					Image:sell
-					Description:Sell
-					LongDesc:Sell buildings, reclaiming a \nproportion of their build cost
-				OrderButton@POWER_DOWN:
-					Logic:OrderButtonsChromeLogic
-					X:39
-					Y:0
-					Width:30
-					Height:30
-					Image:power
-					Description:Powerdown
-					LongDesc:Disable unneeded structures so their \npower can be used elsewhere
-				OrderButton@REPAIR:
-					Logic:OrderButtonsChromeLogic
-					X:75
-					Y:0
-					Width:30
-					Height:30
-					Image:repair
-					Description:Repair
-					LongDesc:Repair damaged buildings
-		SupportPowerBin@INGAME_POWERS_BIN:
-			X:0
-			Y:25
-			IconWidth: 60
-			IconHeight: 48
-			ReadyText: READY
-			HoldText: ON HOLD
-		BuildPalette@INGAME_BUILD_PALETTE:
-			X:WINDOW_RIGHT - 250
-			Y:280
-			Width:238
-			Height:500
-			ReadyText:@ready@
-			HoldText:@on-hold@
-			RequiresText:@requires@
-			IconWidth: 60
-			IconHeight: 48
-			Columns: 3
-			Rows: 4
-
-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
-		DropDownButton@SHROUD_SELECTOR:
-			Logic:ObserverShroudSelectorLogic
-			X:WINDOW_RIGHT-250
-			Y:260
-			Width:240
-			Height:25
-			Font:Bold
--- a/mods/d2k/mod.yaml
+++ b/mods/d2k/mod.yaml
@@ -62,7 +62,9 @@ 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/ra/chrome/ingame-observerstats.yaml
+	mods/d2k/chrome/ingame-player.yaml
 	mods/d2k/chrome/mainmenu.yaml
 	mods/ra/chrome/settings.yaml
 	mods/ra/chrome/credits.yaml