Add Statistics options hotkeys

2017-09-02 08:14:20 +02:00
parent b86d632c8c
commit c9b4568117
11 changed files with 170 additions and 93 deletions
--- a/mods/cnc/chrome/ingame-observerstats.yaml
+++ b/mods/cnc/chrome/ingame-observerstats.yaml
@@ -1,5 +1,10 @@
 Background@INGAME_OBSERVERSTATS_BG:
 	Logic: ObserverStatsLogic
+		StatisticsBasicKey: StatisticsBasic
+		StatisticsEconomyKey: StatisticsEconomy
+		StatisticsProductionKey: StatisticsProduction
+		StatisticsCombatKey: StatisticsCombat
+		StatisticsGraphKey: StatisticsGraph
 	X: (WINDOW_RIGHT - WIDTH) / 2
 	Y: (WINDOW_BOTTOM - HEIGHT) / 2
 	Width: 1005
@@ -24,6 +29,8 @@ Background@INGAME_OBSERVERSTATS_BG:
 					Width: 185
 					Height: 25
 					Font: Bold
+					Children:
+						LogicKeyListener@STATS_DROPDOWN_KEYHANDLER:
 				Container@BASIC_STATS_HEADERS:
 					X: 0
 					Y: 0
--- a/mods/cnc/chrome/ingame.yaml
+++ b/mods/cnc/chrome/ingame.yaml
@@ -106,7 +106,13 @@ Container@PERF_WIDGETS:

 Container@OBSERVER_WIDGETS:
 	Logic: MenuButtonsChromeLogic
+		StatisticsBasicKey: StatisticsBasic
+		StatisticsEconomyKey: StatisticsEconomy
+		StatisticsProductionKey: StatisticsProduction
+		StatisticsCombatKey: StatisticsCombat
+		StatisticsGraphKey: StatisticsGraph
 	Children:
+		LogicKeyListener@OBSERVER_KEY_LISTENER:
 		MenuButton@OPTIONS_BUTTON:
 			Key: escape
 			X: WINDOW_RIGHT - 260 - WIDTH
@@ -123,7 +129,7 @@ Container@OBSERVER_WIDGETS:
 					ImageCollection: order-icons
 					ImageName: options
 		MenuButton@OBSERVER_STATS_BUTTON:
-			Key: F1
+			Key: StatisticsBasic
 			X: WINDOW_RIGHT - 260 - WIDTH
 			Y: 35
 			Width: 30
--- a/mods/common/chrome/ingame-observer.yaml
+++ b/mods/common/chrome/ingame-observer.yaml
@@ -1,6 +1,12 @@
 Container@OBSERVER_WIDGETS:
 	Logic: MenuButtonsChromeLogic
+		StatisticsBasicKey: StatisticsBasic
+		StatisticsEconomyKey: StatisticsEconomy
+		StatisticsProductionKey: StatisticsProduction
+		StatisticsCombatKey: StatisticsCombat
+		StatisticsGraphKey: StatisticsGraph
 	Children:
+		LogicKeyListener@OBSERVER_KEY_LISTENER:
 		MenuButton@OPTIONS_BUTTON:
 			Width: 160
 			Height: 25
@@ -9,6 +15,7 @@ Container@OBSERVER_WIDGETS:
 			Key: escape
 			DisableWorldSounds: true
 		MenuButton@OBSERVER_STATS_BUTTON:
+			Key: StatisticsBasic
 			MenuContainer: INGAME_OBSERVERSTATS_BG
 			HideIngameUI: False
 			Pause: False
@@ -16,9 +23,8 @@ Container@OBSERVER_WIDGETS:
 			Y: 0
 			Width: 160
 			Height: 25
-			Text: Statistics (F1)
+			Text: Statistics
 			Font: Bold
-			Key: f1
 		Container@GAME_TIMER_BLOCK:
 			Logic: GameTimerLogic
 			X: (WINDOW_RIGHT - WIDTH) / 2
--- a/mods/common/chrome/ingame-observerstats.yaml
+++ b/mods/common/chrome/ingame-observerstats.yaml
@@ -1,5 +1,10 @@
 Background@INGAME_OBSERVERSTATS_BG:
 	Logic: ObserverStatsLogic
+		StatisticsBasicKey: StatisticsBasic
+		StatisticsEconomyKey: StatisticsEconomy
+		StatisticsProductionKey: StatisticsProduction
+		StatisticsCombatKey: StatisticsCombat
+		StatisticsGraphKey: StatisticsGraph
 	X: 25
 	Y: 50
 	Width: 1025
@@ -24,6 +29,8 @@ Background@INGAME_OBSERVERSTATS_BG:
 					Width: 185
 					Height: 25
 					Font: Bold
+					Children:
+						LogicKeyListener@STATS_DROPDOWN_KEYHANDLER:
 				Container@BASIC_STATS_HEADERS:
 					X: 0
 					Y: 0
--- a/mods/ra/chrome/ingame-observer.yaml
+++ b/mods/ra/chrome/ingame-observer.yaml
@@ -31,14 +31,20 @@ Container@OBSERVER_WIDGETS:
 							TooltipTemplate: SIMPLE_TOOLTIP
 				Container@TOP_BUTTONS:
 					Logic: MenuButtonsChromeLogic
+						StatisticsBasicKey: StatisticsBasic
+						StatisticsEconomyKey: StatisticsEconomy
+						StatisticsProductionKey: StatisticsProduction
+						StatisticsCombatKey: StatisticsCombat
+						StatisticsGraphKey: StatisticsGraph
 					X: 9
 					Y: 7
 					Children:
+						LogicKeyListener@OBSERVER_KEY_LISTENER:
 						MenuButton@OBSERVER_STATS_BUTTON:
+							Key: StatisticsBasic
 							MenuContainer: INGAME_OBSERVERSTATS_BG
 							HideIngameUI: false
 							Pause: false
-							Key: F1
 							X: 160
 							Width: 28
 							Height: 28
--- a/mods/ts/chrome/ingame-observer.yaml
+++ b/mods/ts/chrome/ingame-observer.yaml
@@ -1,6 +1,12 @@
 Container@OBSERVER_WIDGETS:
 	Logic: MenuButtonsChromeLogic
+		StatisticsBasicKey: StatisticsBasic
+		StatisticsEconomyKey: StatisticsEconomy
+		StatisticsProductionKey: StatisticsProduction
+		StatisticsCombatKey: StatisticsCombat
+		StatisticsGraphKey: StatisticsGraph
 	Children:
+		LogicKeyListener@OBSERVER_KEY_LISTENER:
 		MenuButton@OPTIONS_BUTTON:
 			Width: 160
 			Height: 25
@@ -9,6 +15,7 @@ Container@OBSERVER_WIDGETS:
 			Key: escape
 			DisableWorldSounds: true
 		MenuButton@OBSERVER_STATS_BUTTON:
+			Key: StatisticsBasic
 			MenuContainer: INGAME_OBSERVERSTATS_BG
 			HideIngameUI: False
 			Pause: False
@@ -16,9 +23,8 @@ Container@OBSERVER_WIDGETS:
 			Y: 0
 			Width: 160
 			Height: 25
-			Text: Statistics (F1)
+			Text: Statistics
 			Font: Bold
-			Key: f1
 		Container@GAME_TIMER_BLOCK:
 			Logic: GameTimerLogic
 			X: (WINDOW_RIGHT - WIDTH) / 2
--- a/mods/ts/chrome/ingame-observerstats.yaml
+++ b/mods/ts/chrome/ingame-observerstats.yaml
@@ -1,5 +1,10 @@
 Background@INGAME_OBSERVERSTATS_BG:
 	Logic: ObserverStatsLogic
+		StatisticsBasicKey: StatisticsBasic
+		StatisticsEconomyKey: StatisticsEconomy
+		StatisticsProductionKey: StatisticsProduction
+		StatisticsCombatKey: StatisticsCombat
+		StatisticsGraphKey: StatisticsGraph
 	X: 25
 	Y: 50
 	Width: 1025
@@ -24,6 +29,8 @@ Background@INGAME_OBSERVERSTATS_BG:
 					Width: 185
 					Height: 25
 					Font: Bold
+					Children:
+						LogicKeyListener@STATS_DROPDOWN_KEYHANDLER:
 				Container@BASIC_STATS_HEADERS:
 					X: 0
 					Y: 0