From 6f19290aebed3d341b49c1928665933682879394 Mon Sep 17 00:00:00 2001
From: Paul Chote <paul@chote.net>
Date: Fri, 1 Aug 2014 21:28:13 +1200
Subject: [PATCH] Add queue hotkeys to RA, and make TD consistent with C&C3.
 Fixes #6031.

---
 mods/cnc/chrome/ingame.yaml       | 10 +++++-----
 mods/ra/chrome/ingame-player.yaml |  8 +++++++-
 2 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/mods/cnc/chrome/ingame.yaml b/mods/cnc/chrome/ingame.yaml
index c835bf36d4..4f84bf4600 100644
--- a/mods/cnc/chrome/ingame.yaml
+++ b/mods/cnc/chrome/ingame.yaml
@@ -328,7 +328,7 @@ Container@PLAYER_WIDGETS:
 						ProductionTypeButton@BUILDING:
 							Width: 30
 							Height: 30
-							Key: q
+							Key: e
 							TooltipText: Buildings
 							TooltipContainer: TOOLTIP_CONTAINER
 							ProductionGroup: Building
@@ -341,7 +341,7 @@ Container@PLAYER_WIDGETS:
 							X: 35
 							Width: 30
 							Height: 30
-							Key: w
+							Key: r
 							TooltipText: Defence
 							TooltipContainer: TOOLTIP_CONTAINER
 							ProductionGroup: Defence
@@ -354,7 +354,7 @@ Container@PLAYER_WIDGETS:
 							X: 70
 							Width: 30
 							Height: 30
-							Key: e
+							Key: t
 							TooltipText: Infantry
 							TooltipContainer: TOOLTIP_CONTAINER
 							ProductionGroup: Infantry
@@ -367,7 +367,7 @@ Container@PLAYER_WIDGETS:
 							X: 105
 							Width: 30
 							Height: 30
-							Key: r
+							Key: y
 							TooltipText: Vehicles
 							TooltipContainer: TOOLTIP_CONTAINER
 							ProductionGroup: Vehicle
@@ -380,7 +380,7 @@ Container@PLAYER_WIDGETS:
 							X: 140
 							Width: 30
 							Height: 30
-							Key: t
+							Key: u
 							TooltipText: Aircraft
 							TooltipContainer: TOOLTIP_CONTAINER
 							ProductionGroup: Aircraft
diff --git a/mods/ra/chrome/ingame-player.yaml b/mods/ra/chrome/ingame-player.yaml
index cd6471154f..4a50439973 100644
--- a/mods/ra/chrome/ingame-player.yaml
+++ b/mods/ra/chrome/ingame-player.yaml
@@ -255,6 +255,7 @@ Container@PLAYER_WIDGETS:
 					Children:
 						ProductionTypeButton@BUILDING:
 							Logic: AddRaceSuffixLogic
+							Key: e
 							Width: 28
 							Height: 28
 							VisualHeight: 0
@@ -269,6 +270,7 @@ Container@PLAYER_WIDGETS:
 									ImageCollection: production-icons
 						ProductionTypeButton@DEFENSE:
 							Logic: AddRaceSuffixLogic
+							Key: r
 							Y: 31
 							Width: 28
 							Height: 28
@@ -284,6 +286,7 @@ Container@PLAYER_WIDGETS:
 									ImageCollection: production-icons
 						ProductionTypeButton@INFANTRY:
 							Logic: AddRaceSuffixLogic
+							Key: t
 							Y: 62
 							Width: 28
 							Height: 28
@@ -299,6 +302,7 @@ Container@PLAYER_WIDGETS:
 									ImageCollection: production-icons
 						ProductionTypeButton@VEHICLE:
 							Logic: AddRaceSuffixLogic
+							Key: y
 							Y: 93
 							Width: 28
 							Height: 28
@@ -314,6 +318,7 @@ Container@PLAYER_WIDGETS:
 									ImageCollection: production-icons
 						ProductionTypeButton@AIRCRAFT:
 							Logic: AddRaceSuffixLogic
+							Key: u
 							Y: 124
 							Width: 28
 							Height: 28
@@ -327,8 +332,9 @@ Container@PLAYER_WIDGETS:
 									X: 6
 									Y: 6
 									ImageCollection: production-icons
-						ProductionTypeButton@AIRCRAFT:
+						ProductionTypeButton@NAVAL:
 							Logic: AddRaceSuffixLogic
+							Key: i
 							Y: 155
 							Width: 28
 							Height: 28