diff --git a/OpenRA.Game/Settings.cs b/OpenRA.Game/Settings.cs index 5bdd73b962..1a38c1f8a7 100644 --- a/OpenRA.Game/Settings.cs +++ b/OpenRA.Game/Settings.cs @@ -239,8 +239,6 @@ namespace OpenRA public Hotkey TogglePixelDoubleKey = new Hotkey(Keycode.PERIOD, Modifiers.None); public Hotkey TogglePlayerStanceColorsKey = new Hotkey(Keycode.COMMA, Modifiers.Ctrl); - public Hotkey DevReloadChromeKey = new Hotkey(Keycode.C, Modifiers.Ctrl | Modifiers.Shift); - public Hotkey HideUserInterfaceKey = new Hotkey(Keycode.H, Modifiers.Ctrl | Modifiers.Shift); public Hotkey TakeScreenshotKey = new Hotkey(Keycode.P, Modifiers.Ctrl); public Hotkey ToggleMuteKey = new Hotkey(Keycode.M, Modifiers.None); diff --git a/OpenRA.Game/Widgets/Widget.cs b/OpenRA.Game/Widgets/Widget.cs index 7a72f3d51c..1c6b082e2f 100644 --- a/OpenRA.Game/Widgets/Widget.cs +++ b/OpenRA.Game/Widgets/Widget.cs @@ -128,23 +128,6 @@ namespace OpenRA.Widgets /// Key input data public static bool HandleKeyPress(KeyInput e) { - if (e.Event == KeyInputEvent.Down) - { - var hk = Hotkey.FromKeyInput(e); - - if (hk == Game.Settings.Keys.DevReloadChromeKey) - { - ChromeProvider.Initialize(Game.ModData); - return true; - } - - if (hk == Game.Settings.Keys.HideUserInterfaceKey) - { - Root.Visible ^= true; - return true; - } - } - if (KeyboardFocusWidget != null) return KeyboardFocusWidget.HandleKeyPressOuter(e); diff --git a/OpenRA.Mods.Common/Widgets/Logic/SettingsLogic.cs b/OpenRA.Mods.Common/Widgets/Logic/SettingsLogic.cs index 00b19ac166..845540f386 100644 --- a/OpenRA.Mods.Common/Widgets/Logic/SettingsLogic.cs +++ b/OpenRA.Mods.Common/Widgets/Logic/SettingsLogic.cs @@ -448,7 +448,8 @@ namespace OpenRA.Mods.Common.Widgets.Logic { "CycleStatusBarsKey", "Cycle status bars display" }, { "TogglePixelDoubleKey", "Toggle pixel doubling" }, { "ToggleMuteKey", "Toggle audio mute" }, - { "TogglePlayerStanceColorsKey", "Toggle player stance colors" } + { "TogglePlayerStanceColorsKey", "Toggle player stance colors" }, + { "TakeScreenshotKey", "Take screenshot" } }; var header = ScrollItemWidget.Setup(hotkeyHeader, returnTrue, doNothing); @@ -589,23 +590,6 @@ namespace OpenRA.Mods.Common.Widgets.Logic BindHotkeyPref(kv, ks, productionTemplate, hotkeyList); } - // Developer - { - var hotkeys = new Dictionary() - { - { "DevReloadChromeKey", "Reload Chrome" }, - { "HideUserInterfaceKey", "Hide UI" }, - { "TakeScreenshotKey", "Take screenshot" } - }; - - var header = ScrollItemWidget.Setup(hotkeyHeader, returnTrue, doNothing); - header.Get("LABEL").GetText = () => "Developer Commands"; - hotkeyList.AddChild(header); - - foreach (var kv in hotkeys) - BindHotkeyPref(kv, ks, developerTemplate, hotkeyList); - } - // Music { var hotkeys = new Dictionary()