Make the mute hotkey global.

OpenRA.Mods.Common/OpenRA.Mods.Common.csproj

@@ -823,6 +823,7 @@
     <Compile Include="UtilityCommands\LintInterfaces.cs" />
     <Compile Include="Widgets\Logic\SingleHotkeyBaseLogic.cs" />
     <Compile Include="Widgets\Logic\ScreenshotHotkeyLogic.cs" />
+    <Compile Include="Widgets\Logic\MuteHotkeyLogic.cs" />
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <Target Name="AfterBuild">

OpenRA.Mods.Common/Widgets/Logic/MuteHotkeyLogic.cs

@@ -0,0 +1,44 @@
+#region Copyright & License Information
+/*
+ * Copyright 2007-2017 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, either version 3 of
+ * the License, or (at your option) any later version. For more
+ * information, see COPYING.
+ */
+#endregion
+
+using System.Collections.Generic;
+using System.Drawing;
+using OpenRA.Mods.Common.Lint;
+using OpenRA.Widgets;
+
+namespace OpenRA.Mods.Common.Widgets.Logic
+{
+	[ChromeLogicArgsHotkeys("MuteAudioKey")]
+	public class MuteHotkeyLogic : SingleHotkeyBaseLogic
+	{
+		[ObjectCreator.UseCtor]
+		public MuteHotkeyLogic(Widget widget, Dictionary<string, MiniYaml> logicArgs)
+			: base(widget, "MuteAudioKey", "GLOBAL_KEYHANDLER", logicArgs) { }
+
+		protected override bool OnHotkeyActivated(KeyInput e)
+		{
+			Game.Settings.Sound.Mute ^= true;
+
+			if (Game.Settings.Sound.Mute)
+			{
+				Game.Sound.MuteAudio();
+				Game.AddChatLine(Color.White, "Battlefield Control", "Audio muted");
+			}
+			else
+			{
+				Game.Sound.UnmuteAudio();
+				Game.AddChatLine(Color.White, "Battlefield Control", "Audio unmuted");
+			}
+
+			return true;
+		}
+	}
+}

OpenRA.Mods.Common/Widgets/WorldInteractionControllerWidget.cs

@@ -292,8 +292,6 @@ namespace OpenRA.Mods.Common.Widgets
 					return CycleStatusBars();
 				else if (key == Game.Settings.Keys.TogglePixelDoubleKey)
 					return TogglePixelDouble();
-				else if (key == Game.Settings.Keys.ToggleMuteKey)
-					return ToggleMute();
 				else if (key == Game.Settings.Keys.TogglePlayerStanceColorsKey)
 					return TogglePlayerStanceColors();
 			}
@@ -364,24 +362,6 @@ namespace OpenRA.Mods.Common.Widgets
 			return true;
 		}
 
-		bool ToggleMute()
-		{
-			Game.Settings.Sound.Mute ^= true;
-
-			if (Game.Settings.Sound.Mute)
-			{
-				Game.Sound.MuteAudio();
-				Game.AddChatLine(Color.White, "Battlefield Control", "Audio muted");
-			}
-			else
-			{
-				Game.Sound.UnmuteAudio();
-				Game.AddChatLine(Color.White, "Battlefield Control", "Audio unmuted");
-			}
-
-			return true;
-		}
-
 		bool TogglePlayerStanceColors()
 		{
 			Game.Settings.Game.UsePlayerStanceColors ^= true;

mods/cnc/chrome/editor.yaml

@@ -192,12 +192,13 @@ Container@EDITOR_ROOT:
 	Logic: LoadMapEditorLogic
 	Children:
 		LogicKeyListener@GLOBAL_KEYHANDLER:
-			Logic: MusicHotkeyLogic, ScreenshotHotkeyLogic
+			Logic: MusicHotkeyLogic, ScreenshotHotkeyLogic, MuteHotkeyLogic
 				StopMusicKey: StopMusic
 				PauseMusicKey: PauseMusic
 				PrevMusicKey: PrevMusic
 				NextMusicKey: NextMusic
 				TakeScreenshotKey: TakeScreenshot
+				MuteAudioKey: ToggleMute
 		Container@WORLD_ROOT:
 		Container@MENU_ROOT:
 		TooltipContainer@TOOLTIP_CONTAINER:

mods/cnc/chrome/ingame.yaml

@@ -2,12 +2,13 @@ Container@INGAME_ROOT:
 	Logic: LoadIngamePlayerOrObserverUILogic
 	Children:
 		LogicKeyListener@GLOBAL_KEYHANDLER:
-			Logic: MusicHotkeyLogic, ScreenshotHotkeyLogic
+			Logic: MusicHotkeyLogic, ScreenshotHotkeyLogic, MuteHotkeyLogic
 				StopMusicKey: StopMusic
 				PauseMusicKey: PauseMusic
 				PrevMusicKey: PrevMusic
 				NextMusicKey: NextMusic
 				TakeScreenshotKey: TakeScreenshot
+				MuteAudioKey: ToggleMute
 		Container@WORLD_ROOT:
 			Logic: LoadIngamePerfLogic
 			Children:

mods/cnc/chrome/mainmenu.yaml

@@ -4,12 +4,13 @@ Container@MENU_BACKGROUND:
 	Logic: MainMenuLogic
 	Children:
 		LogicKeyListener@GLOBAL_KEYHANDLER:
-			Logic: MusicHotkeyLogic, ScreenshotHotkeyLogic
+			Logic: MusicHotkeyLogic, ScreenshotHotkeyLogic, MuteHotkeyLogic
 				StopMusicKey: StopMusic
 				PauseMusicKey: PauseMusic
 				PrevMusicKey: PrevMusic
 				NextMusicKey: NextMusic
 				TakeScreenshotKey: TakeScreenshot
+				MuteAudioKey: ToggleMute
 		Container@SHELLMAP_DECORATIONS:
 			Children:
 				Image@NOD:

mods/common/chrome/editor.yaml

@@ -183,12 +183,13 @@ Container@EDITOR_ROOT:
 	Logic: LoadMapEditorLogic
 	Children:
 		LogicKeyListener@GLOBAL_KEYHANDLER:
-			Logic: MusicHotkeyLogic, ScreenshotHotkeyLogic
+			Logic: MusicHotkeyLogic, ScreenshotHotkeyLogic, MuteHotkeyLogic
 				StopMusicKey: StopMusic
 				PauseMusicKey: PauseMusic
 				PrevMusicKey: PrevMusic
 				NextMusicKey: NextMusic
 				TakeScreenshotKey: TakeScreenshot
+				MuteAudioKey: ToggleMute
 		Container@WORLD_ROOT:
 		Container@MENU_ROOT:
 		TooltipContainer@TOOLTIP_CONTAINER:

mods/common/chrome/ingame.yaml

@@ -2,12 +2,13 @@ Container@INGAME_ROOT:
 	Logic: LoadIngamePlayerOrObserverUILogic
 	Children:
 		LogicKeyListener@GLOBAL_KEYHANDLER:
-			Logic: MusicHotkeyLogic, ScreenshotHotkeyLogic
+			Logic: MusicHotkeyLogic, ScreenshotHotkeyLogic, MuteHotkeyLogic
 				StopMusicKey: StopMusic
 				PauseMusicKey: PauseMusic
 				PrevMusicKey: PrevMusic
 				NextMusicKey: NextMusic
 				TakeScreenshotKey: TakeScreenshot
+				MuteAudioKey: ToggleMute
 		Container@WORLD_ROOT:
 			Logic: LoadIngamePerfLogic
 			Children:

mods/common/chrome/mainmenu.yaml

@@ -2,12 +2,13 @@ Container@MAINMENU:
 	Logic: MainMenuLogic
 	Children:
 		LogicKeyListener@GLOBAL_KEYHANDLER:
-			Logic: MusicHotkeyLogic, ScreenshotHotkeyLogic
+			Logic: MusicHotkeyLogic, ScreenshotHotkeyLogic, MuteHotkeyLogic
 				StopMusicKey: StopMusic
 				PauseMusicKey: PauseMusic
 				PrevMusicKey: PrevMusic
 				NextMusicKey: NextMusic
 				TakeScreenshotKey: TakeScreenshot
+				MuteAudioKey: ToggleMute
 		Background@BORDER:
 			Background: mainmenu-border
 			X: 0 - 15

mods/d2k/chrome/mainmenu.yaml

@@ -2,12 +2,13 @@ Container@MAINMENU:
 	Logic: MainMenuLogic
 	Children:
 		LogicKeyListener@GLOBAL_KEYHANDLER:
-			Logic: MusicHotkeyLogic, ScreenshotHotkeyLogic
+			Logic: MusicHotkeyLogic, ScreenshotHotkeyLogic, MuteHotkeyLogic
 				StopMusicKey: StopMusic
 				PauseMusicKey: PauseMusic
 				PrevMusicKey: PrevMusic
 				NextMusicKey: NextMusic
 				TakeScreenshotKey: TakeScreenshot
+				MuteAudioKey: ToggleMute
 		Label@VERSION_LABEL:
 			X: WINDOW_RIGHT - 10
 			Y: WINDOW_BOTTOM - 20