From c7199cc16457cae3098fe24e75cbbcd2225ea65a Mon Sep 17 00:00:00 2001
From: Veritius <veritiusgaming@gmail.com>
Date: Thu, 4 Aug 2022 10:39:09 +1000
Subject: [PATCH] Make auto-closing admin announce window optional (#10277)

---
 Content.Client/Administration/UI/AdminAnnounceWindow.xaml    | 5 ++++-
 Content.Client/Administration/UI/AdminMenuWindowEui.cs       | 2 +-
 .../Locale/en-US/administration/ui/admin-announce-window.ftl | 1 +
 3 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/Content.Client/Administration/UI/AdminAnnounceWindow.xaml b/Content.Client/Administration/UI/AdminAnnounceWindow.xaml
index a703a7f5e6..f789bdba5d 100644
--- a/Content.Client/Administration/UI/AdminAnnounceWindow.xaml
+++ b/Content.Client/Administration/UI/AdminAnnounceWindow.xaml
@@ -10,6 +10,9 @@
         </BoxContainer>
         <LineEdit Name="Announcement" Access="Public" PlaceHolder="{Loc admin-announce-announcement-placeholder}"/>
 
-        <Button Name="AnnounceButton" Access="Public" Disabled="True" Text="{Loc admin-announce-button}" HorizontalAlignment="Center"/>
+        <GridContainer Rows="1">
+            <CheckBox Name="KeepWindowOpen" Access="Public" Text="{Loc 'admin-announce-keep-open'}" />
+            <Button Name="AnnounceButton" Access="Public" Disabled="True" Text="{Loc admin-announce-button}" HorizontalAlignment="Center"/>
+        </GridContainer>
     </GridContainer>
 </DefaultWindow>
diff --git a/Content.Client/Administration/UI/AdminMenuWindowEui.cs b/Content.Client/Administration/UI/AdminMenuWindowEui.cs
index 24e78c7a5a..2de0664b17 100644
--- a/Content.Client/Administration/UI/AdminMenuWindowEui.cs
+++ b/Content.Client/Administration/UI/AdminMenuWindowEui.cs
@@ -22,7 +22,7 @@ namespace Content.Client.Administration.UI
                 Announcement = _window.Announcement.Text,
                 Announcer =  _window.Announcer.Text,
                 AnnounceType =  (AdminAnnounceType) (_window.AnnounceMethod.SelectedMetadata ?? AdminAnnounceType.Station),
-                CloseAfter = true,
+                CloseAfter = !_window.KeepWindowOpen.Pressed,
             });
 
         }
diff --git a/Resources/Locale/en-US/administration/ui/admin-announce-window.ftl b/Resources/Locale/en-US/administration/ui/admin-announce-window.ftl
index 4656fbd2d4..88dcb9e37f 100644
--- a/Resources/Locale/en-US/administration/ui/admin-announce-window.ftl
+++ b/Resources/Locale/en-US/administration/ui/admin-announce-window.ftl
@@ -5,3 +5,4 @@ admin-announce-announcer-default = Central Command
 admin-announce-button = Announce
 admin-announce-type-station = Station
 admin-announce-type-server = Server
+admin-announce-keep-open = Keep open