Add a safety net to the round controls in the Admin window. (#37836)

some changes.

diff --git a/Content.Client/Administration/UI/Tabs/RoundTab.xaml b/Content.Client/Administration/UI/Tabs/RoundTab.xaml
index 2c8a400ecdbd5a7c54162925566e78eb4a0af26e..36c06cab7648d841e36e763020b039f668e51af5 100644 (file)
--- a/Content.Client/Administration/UI/Tabs/RoundTab.xaml
+++ b/Content.Client/Administration/UI/Tabs/RoundTab.xaml
@@ -1,13 +1,13 @@
 <Control
     xmlns="https://spacestation14.io"
-    xmlns:cc="clr-namespace:Content.Client.Administration.UI.CustomControls"
+    xmlns:controls="clr-namespace:Content.Client.UserInterface.Controls"
     Margin="4"
     MinSize="50 50">
     <GridContainer
         Columns="3">
-        <cc:CommandButton Command="startround" Text="{Loc administration-ui-round-tab-start-round}" />
-        <cc:CommandButton Command="endround" Text="{Loc administration-ui-round-tab-end-round}" />
-        <cc:CommandButton Command="restartround" Text="{Loc administration-ui-round-tab-restart-round}" />
-        <cc:CommandButton Command="restartroundnow" Text="{Loc administration-ui-round-tab-restart-round-now}" />
+        <controls:ConfirmButton Name="StartRound" Text="{Loc administration-ui-round-tab-start-round}" />
+        <controls:ConfirmButton Name="EndRound" Text="{Loc administration-ui-round-tab-end-round}" />
+        <controls:ConfirmButton Name="RestartRound" Text="{Loc administration-ui-round-tab-restart-round}" />
+        <controls:ConfirmButton Name="RestartRoundNow" Text="{Loc administration-ui-round-tab-restart-round-now}" />
     </GridContainer>
 </Control>

diff --git a/Content.Client/Administration/UI/Tabs/RoundTab.xaml.cs b/Content.Client/Administration/UI/Tabs/RoundTab.xaml.cs
index 28073bc91dccee9ddf49e07427abc6d4f631673e..70f12bb393d63924f09d9c715ebd1bde46587e94 100644 (file)
--- a/Content.Client/Administration/UI/Tabs/RoundTab.xaml.cs
+++ b/Content.Client/Administration/UI/Tabs/RoundTab.xaml.cs
@@ -1,10 +1,24 @@
 using Robust.Client.AutoGenerated;
+using Robust.Client.Console;
 using Robust.Client.UserInterface;
+using Robust.Client.UserInterface.XAML;
 
 namespace Content.Client.Administration.UI.Tabs
 {
     [GenerateTypedNameReferences]
     public sealed partial class RoundTab : Control
     {
+        [Dependency] private readonly IClientConsoleHost _console = default!;
+
+        public RoundTab()
+        {
+            RobustXamlLoader.Load(this);
+            IoCManager.InjectDependencies(this);
+
+            StartRound.OnPressed += _ => _console.ExecuteCommand("startround");
+            EndRound.OnPressed += _ => _console.ExecuteCommand("endround");
+            RestartRound.OnPressed += _ => _console.ExecuteCommand("restartround");
+            RestartRoundNow.OnPressed += _ => _console.ExecuteCommand("restartroundnow");
+        }
     }
 }