diff --git a/OpenRA.Mods.Cnc/OpenRA.Mods.Cnc.csproj b/OpenRA.Mods.Cnc/OpenRA.Mods.Cnc.csproj index 6c0b3d50bc..ec7117f3eb 100644 --- a/OpenRA.Mods.Cnc/OpenRA.Mods.Cnc.csproj +++ b/OpenRA.Mods.Cnc/OpenRA.Mods.Cnc.csproj @@ -87,7 +87,6 @@ - diff --git a/OpenRA.Mods.Cnc/Widgets/CncWidgetUtils.cs b/OpenRA.Mods.Cnc/Widgets/CncWidgetUtils.cs deleted file mode 100644 index f95e3585cf..0000000000 --- a/OpenRA.Mods.Cnc/Widgets/CncWidgetUtils.cs +++ /dev/null @@ -1,37 +0,0 @@ -#region Copyright & License Information -/* - * Copyright 2007-2011 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.Widgets; - -namespace OpenRA.Mods.Cnc.Widgets -{ - public static class CncWidgetUtils - { - public static void PromptConfirmAction(string title, string text, Action onConfirm, Action onCancel) - { - var prompt = Ui.OpenWindow("CONFIRM_PROMPT"); - prompt.Get("PROMPT_TITLE").GetText = () => title; - prompt.Get("PROMPT_TEXT").GetText = () => text; - - prompt.Get("CONFIRM_BUTTON").OnClick = () => - { - Ui.CloseWindow(); - onConfirm(); - }; - - prompt.Get("CANCEL_BUTTON").OnClick = () => - { - Ui.CloseWindow(); - onCancel(); - }; - } - } -} diff --git a/OpenRA.Mods.Cnc/Widgets/Logic/CncIngameMenuLogic.cs b/OpenRA.Mods.Cnc/Widgets/Logic/CncIngameMenuLogic.cs index 40f11efcac..fc687b188b 100644 --- a/OpenRA.Mods.Cnc/Widgets/Logic/CncIngameMenuLogic.cs +++ b/OpenRA.Mods.Cnc/Widgets/Logic/CncIngameMenuLogic.cs @@ -12,6 +12,7 @@ using System; using System.Linq; using OpenRA.Graphics; using OpenRA.Mods.RA; +using OpenRA.Mods.RA.Widgets; using OpenRA.Traits; using OpenRA.Widgets; @@ -53,13 +54,13 @@ namespace OpenRA.Mods.Cnc.Widgets.Logic Action doNothing = () => { }; menu.Get("QUIT_BUTTON").OnClick = () => - CncWidgetUtils.PromptConfirmAction("Abort Mission", "Leave this game and return to the menu?", onQuit, doNothing); + ConfirmationDialogs.PromptConfirmAction("Abort Mission", "Leave this game and return to the menu?", onQuit, doNothing); Action onSurrender = () => world.IssueOrder(new Order("Surrender", world.LocalPlayer.PlayerActor, false)); var surrenderButton = menu.Get("SURRENDER_BUTTON"); surrenderButton.IsDisabled = () => (world.LocalPlayer == null || world.LocalPlayer.WinState != WinState.Undefined); surrenderButton.OnClick = () => - CncWidgetUtils.PromptConfirmAction("Surrender", "Are you sure you want to surrender?", onSurrender, doNothing); + ConfirmationDialogs.PromptConfirmAction("Surrender", "Are you sure you want to surrender?", onSurrender, doNothing); menu.Get("MUSIC_BUTTON").OnClick = () => {