Merge pull request OpenRA#5550 from pavlos256/reload-chrome

Add developer shortcut to reload chrome files

Author: pchote

OpenRA.Game/Graphics/ChromeProvider.cs

@@ -27,14 +27,22 @@ struct Collection
 		static Dictionary<string, Sheet> cachedSheets;
 		static Dictionary<string, Dictionary<string, Sprite>> cachedSprites;
 
+		static string[] storedChromeFiles;
+
 		public static void Initialize(params string[] chromeFiles)
 		{
 			collections = new Dictionary<string, Collection>();
 			cachedSheets = new Dictionary<string, Sheet>();
 			cachedSprites = new Dictionary<string, Dictionary<string, Sprite>>();
 
 			if (chromeFiles.Length == 0)
-				return;
+			{
+				chromeFiles = storedChromeFiles;
+				if (chromeFiles == null || chromeFiles.Length == 0)
+					return;
+			}
+			else
+				storedChromeFiles = chromeFiles;
 
 			var chrome = chromeFiles.Select(s => MiniYaml.FromFile(s)).Aggregate(MiniYaml.MergeLiberal);
 

OpenRA.Game/OpenRA.Game.csproj

@@ -250,6 +250,7 @@
     <Compile Include="GameRules\RulesetCache.cs" />
     <Compile Include="Support\MersenneTwister.cs" />
     <Compile Include="GameInformation.cs" />
+    <Compile Include="Widgets\RootWidget.cs" />
   </ItemGroup>
   <ItemGroup>
     <Compile Include="FileSystem\D2kSoundResources.cs" />

OpenRA.Game/Settings.cs

@@ -176,6 +176,8 @@ public class KeySettings
 		public Hotkey ObserverWorldView = new Hotkey(Keycode.EQUALS, Modifiers.None);
 
 		public Hotkey TogglePixelDoubleKey = new Hotkey(Keycode.PERIOD, Modifiers.None);
+
+		public Hotkey DevReloadChromeKey = new Hotkey(Keycode.C, Modifiers.Ctrl | Modifiers.Shift);
 	}
 
 	public class IrcSettings

OpenRA.Game/Widgets/RootWidget.cs

@@ -0,0 +1,39 @@
+#region Copyright & License Information
+/*
+ * Copyright 2007-2014 The OpenRA Developers (see AUTHORS)
+ * This file is part of OpenRA, which is free software. It is made
+ * available to you under the terms of the GNU General Public License
+ * as published by the Free Software Foundation. For more information,
+ * see COPYING.
+ */
+#endregion
+
+using System;
+using OpenRA.Graphics;
+
+namespace OpenRA.Widgets
+{
+	public class RootWidget : ContainerWidget
+	{
+		public RootWidget()
+		{
+			IgnoreMouseOver = true;
+		}
+
+		public override bool HandleKeyPress(KeyInput e)
+		{
+			if (e.Event == KeyInputEvent.Down)
+			{
+				var hk = Hotkey.FromKeyInput(e);
+
+				if (hk == Game.Settings.Keys.DevReloadChromeKey)
+				{
+					ChromeProvider.Initialize();
+					return true;
+				}
+			}
+
+			return base.HandleKeyPress(e);
+		}
+	}
+}

OpenRA.Game/Widgets/Widget.cs

@@ -19,7 +19,7 @@ namespace OpenRA.Widgets
 {
 	public static class Ui
 	{
-		public static Widget Root = new ContainerWidget();
+		public static Widget Root = new RootWidget();
 
 		public static int LastTickTime = Environment.TickCount;
 

OpenRA.Mods.RA/Widgets/Logic/SettingsLogic.cs

@@ -244,46 +244,6 @@ Action ResetAudioPanel(Widget panel)
 
 		Action InitInputPanel(Widget panel)
 		{
-			// TODO: Extract these to a yaml file
-			var specialHotkeys = new Dictionary<string, string>()
-			{
-				{ "CycleBaseKey", "Jump to base" },
-				{ "ToLastEventKey", "Jump to last radar event" },
-				{ "ToSelectionKey", "Jump to selection" },
-				{ "SelectAllUnitsKey", "Select all units on screen" },
-				{ "SelectUnitsByTypeKey", "Select units by type" },
-
-				{ "PlaceBeaconKey", "Place beacon" },
-
-				{ "PauseKey", "Pause / Unpause" },
-				{ "SellKey", "Sell mode" },
-				{ "PowerDownKey", "Power-down mode" },
-				{ "RepairKey", "Repair mode" },
-
-				{ "NextProductionTabKey", "Next production tab" },
-				{ "PreviousProductionTabKey", "Previous production tab" },
-				{ "CycleProductionBuildingsKey", "Cycle production facilities" },
-
-				{ "ToggleStatusBarsKey", "Toggle status bars" },
-				{ "TogglePixelDoubleKey", "Toggle pixel doubling" },
-			};
-
-			var unitHotkeys = new Dictionary<string, string>()
-			{
-				{ "AttackMoveKey", "Attack Move" },
-				{ "StopKey", "Stop" },
-				{ "ScatterKey", "Scatter" },
-				{ "StanceCycleKey", "Cycle Stance" },
-				{ "DeployKey", "Deploy" },
-				{ "GuardKey", "Guard" }
-			};
-
-			var observerHotkeys = new Dictionary<string, string>()
-			{
-				{ "ObserverCombinedView", "All Players" },
-				{ "ObserverWorldView", "Disable Shroud" }
-			};
-
 			var gs = Game.Settings.Game;
 			var ks = Game.Settings.Keys;
 
@@ -304,26 +264,89 @@ Action InitInputPanel(Widget panel)
 			var unitTemplate = hotkeyList.Get("UNIT_TEMPLATE");
 			hotkeyList.RemoveChildren();
 
-			var globalHeader = ScrollItemWidget.Setup(hotkeyHeader, () => true, () => {});
-			globalHeader.Get<LabelWidget>("LABEL").GetText = () => "Global Commands";
-			hotkeyList.AddChild(globalHeader);
+			// Game
+			{
+				var hotkeys = new Dictionary<string, string>()
+				{
+					{ "CycleBaseKey", "Jump to base" },
+					{ "ToLastEventKey", "Jump to last radar event" },
+					{ "ToSelectionKey", "Jump to selection" },
+					{ "SelectAllUnitsKey", "Select all units on screen" },
+					{ "SelectUnitsByTypeKey", "Select units by type" },
+
+					{ "PlaceBeaconKey", "Place beacon" },
+
+					{ "PauseKey", "Pause / Unpause" },
+					{ "SellKey", "Sell mode" },
+					{ "PowerDownKey", "Power-down mode" },
+					{ "RepairKey", "Repair mode" },
+
+					{ "NextProductionTabKey", "Next production tab" },
+					{ "PreviousProductionTabKey", "Previous production tab" },
+					{ "CycleProductionBuildingsKey", "Cycle production facilities" },
+
+					{ "ToggleStatusBarsKey", "Toggle status bars" },
+					{ "TogglePixelDoubleKey", "Toggle pixel doubling" },
+				};
+
+				var header = ScrollItemWidget.Setup(hotkeyHeader, () => true, () => {});
+				header.Get<LabelWidget>("LABEL").GetText = () => "Game Commands";
+				hotkeyList.AddChild(header);
+
+				foreach (var kv in hotkeys)
+					BindHotkeyPref(kv, ks, globalTemplate, hotkeyList);
+			}
 
-			foreach (var kv in specialHotkeys)
-				BindHotkeyPref(kv, ks, globalTemplate, hotkeyList);
+			// Observer
+			{
+				var hotkeys = new Dictionary<string, string>()
+				{
+					{ "ObserverCombinedView", "All Players" },
+					{ "ObserverWorldView", "Disable Shroud" }
+				};
 
-			var observerHeader = ScrollItemWidget.Setup(hotkeyHeader, () => true, () => {});
-			observerHeader.Get<LabelWidget>("LABEL").GetText = () => "Observer Commands";
-			hotkeyList.AddChild(observerHeader);
+				var header = ScrollItemWidget.Setup(hotkeyHeader, () => true, () => {});
+				header.Get<LabelWidget>("LABEL").GetText = () => "Observer Commands";
+				hotkeyList.AddChild(header);
 
-			foreach (var kv in observerHotkeys)
-				BindHotkeyPref(kv, ks, globalTemplate, hotkeyList);
+				foreach (var kv in hotkeys)
+					BindHotkeyPref(kv, ks, globalTemplate, hotkeyList);
+			}
+
+			// Unit
+			{
+				var hotkeys = new Dictionary<string, string>()
+				{
+					{ "AttackMoveKey", "Attack Move" },
+					{ "StopKey", "Stop" },
+					{ "ScatterKey", "Scatter" },
+					{ "StanceCycleKey", "Cycle Stance" },
+					{ "DeployKey", "Deploy" },
+					{ "GuardKey", "Guard" }
+				};
+
+				var header = ScrollItemWidget.Setup(hotkeyHeader, () => true, () => {});
+				header.Get<LabelWidget>("LABEL").GetText = () => "Unit Commands";
+				hotkeyList.AddChild(header);
+
+				foreach (var kv in hotkeys)
+					BindHotkeyPref(kv, ks, unitTemplate, hotkeyList);
+			}
+
+			// Developer
+			{
+				var hotkeys = new Dictionary<string, string>()
+				{
+					{ "DevReloadChromeKey", "Reload Chrome" }
+				};
 
-			var unitHeader = ScrollItemWidget.Setup(hotkeyHeader, () => true, () => {});
-			unitHeader.Get<LabelWidget>("LABEL").GetText = () => "Unit Commands";
-			hotkeyList.AddChild(unitHeader);
+				var header = ScrollItemWidget.Setup(hotkeyHeader, () => true, () => {});
+				header.Get<LabelWidget>("LABEL").GetText = () => "Developer commands";
+				hotkeyList.AddChild(header);
 
-			foreach (var kv in unitHotkeys)
-				BindHotkeyPref(kv, ks, unitTemplate, hotkeyList);
+				foreach (var kv in hotkeys)
+					BindHotkeyPref(kv, ks, globalTemplate, hotkeyList);
+			}
 
 			return () =>
 			{