From 555a861695df4b2caf445718ec437c5466f20f62 Mon Sep 17 00:00:00 2001 From: SimpleStation14 Date: Mon, 22 Apr 2024 05:48:12 -0400 Subject: [PATCH] Cherry-picked commit d776c4b392a082dba7539d77cfa20fc904ed4091 from space-wizards/space-station-14/master --- .../UI/AdminRemarks/AdminMessageEui.cs | 18 +- .../AdminMessagePopupMessage.xaml | 6 + .../AdminMessagePopupMessage.xaml.cs | 23 + .../AdminRemarks/AdminMessagePopupWindow.xaml | 42 +- .../AdminMessagePopupWindow.xaml.cs | 44 +- ...0318022005_AdminMessageDismiss.Designer.cs | 1768 +++++++++++++++++ .../20240318022005_AdminMessageDismiss.cs | 40 + .../PostgresServerDbContextModelSnapshot.cs | 9 +- ...0318021959_AdminMessageDismiss.Designer.cs | 1699 ++++++++++++++++ .../20240318021959_AdminMessageDismiss.cs | 40 + .../SqliteServerDbContextModelSnapshot.cs | 9 +- Content.Server.Database/Model.cs | 14 + .../Administration/Notes/AdminMessageEui.cs | 46 +- .../Administration/Notes/AdminNotesManager.cs | 4 +- .../Administration/Notes/AdminNotesSystem.cs | 21 +- .../Notes/IAdminNotesManager.cs | 10 +- Content.Server/Database/DatabaseRecords.cs | 3 +- Content.Server/Database/ServerDbBase.cs | 7 +- Content.Server/Database/ServerDbManager.cs | 14 +- .../Notes/AdminMessageEuiState.cs | 31 +- .../en-US/administration/ui/admin-notes.ftl | 8 +- 21 files changed, 3748 insertions(+), 108 deletions(-) create mode 100644 Content.Client/Administration/UI/AdminRemarks/AdminMessagePopupMessage.xaml create mode 100644 Content.Client/Administration/UI/AdminRemarks/AdminMessagePopupMessage.xaml.cs create mode 100644 Content.Server.Database/Migrations/Postgres/20240318022005_AdminMessageDismiss.Designer.cs create mode 100644 Content.Server.Database/Migrations/Postgres/20240318022005_AdminMessageDismiss.cs create mode 100644 Content.Server.Database/Migrations/Sqlite/20240318021959_AdminMessageDismiss.Designer.cs create mode 100644 Content.Server.Database/Migrations/Sqlite/20240318021959_AdminMessageDismiss.cs diff --git a/Content.Client/Administration/UI/AdminRemarks/AdminMessageEui.cs b/Content.Client/Administration/UI/AdminRemarks/AdminMessageEui.cs index 06eace118d7..502c56a5a69 100644 --- a/Content.Client/Administration/UI/AdminRemarks/AdminMessageEui.cs +++ b/Content.Client/Administration/UI/AdminRemarks/AdminMessageEui.cs @@ -2,6 +2,7 @@ using Content.Shared.Administration.Notes; using Content.Shared.Eui; using JetBrains.Annotations; +using Robust.Client.UserInterface.Controls; using static Content.Shared.Administration.Notes.AdminMessageEuiMsg; namespace Content.Client.Administration.UI.AdminRemarks; @@ -14,9 +15,8 @@ public sealed class AdminMessageEui : BaseEui public AdminMessageEui() { _popup = new AdminMessagePopupWindow(); - _popup.OnAcceptPressed += () => SendMessage(new Accept()); - _popup.OnDismissPressed += () => SendMessage(new Dismiss()); - _popup.OnClose += () => SendMessage(new CloseEuiMessage()); + _popup.OnAcceptPressed += () => SendMessage(new Dismiss(true)); + _popup.OnDismissPressed += () => SendMessage(new Dismiss(false)); } public override void HandleState(EuiStateBase state) @@ -26,13 +26,17 @@ public override void HandleState(EuiStateBase state) return; } - _popup.SetMessage(s.Message); - _popup.SetDetails(s.AdminName, s.AddedOn); - _popup.Timer = s.Time; + _popup.SetState(s); } public override void Opened() { - _popup.OpenCentered(); + _popup.UserInterfaceManager.WindowRoot.AddChild(_popup); + LayoutContainer.SetAnchorPreset(_popup, LayoutContainer.LayoutPreset.Wide); + } + + public override void Closed() + { + _popup.Orphan(); } } diff --git a/Content.Client/Administration/UI/AdminRemarks/AdminMessagePopupMessage.xaml b/Content.Client/Administration/UI/AdminRemarks/AdminMessagePopupMessage.xaml new file mode 100644 index 00000000000..9a60a6f72ab --- /dev/null +++ b/Content.Client/Administration/UI/AdminRemarks/AdminMessagePopupMessage.xaml @@ -0,0 +1,6 @@ + + + + + + diff --git a/Content.Client/Administration/UI/AdminRemarks/AdminMessagePopupMessage.xaml.cs b/Content.Client/Administration/UI/AdminRemarks/AdminMessagePopupMessage.xaml.cs new file mode 100644 index 00000000000..7bb425f618e --- /dev/null +++ b/Content.Client/Administration/UI/AdminRemarks/AdminMessagePopupMessage.xaml.cs @@ -0,0 +1,23 @@ +using Content.Shared.Administration.Notes; +using Robust.Client.AutoGenerated; +using Robust.Client.UserInterface; +using Robust.Client.UserInterface.XAML; +using Robust.Shared.Utility; + +namespace Content.Client.Administration.UI.AdminRemarks; + +[GenerateTypedNameReferences] +public sealed partial class AdminMessagePopupMessage : Control +{ + public AdminMessagePopupMessage(AdminMessageEuiState.Message message) + { + RobustXamlLoader.Load(this); + + Admin.SetMessage(FormattedMessage.FromMarkup(Loc.GetString( + "admin-notes-message-admin", + ("admin", message.AdminName), + ("date", message.AddedOn.ToLocalTime())))); + + Message.SetMessage(message.Text); + } +} diff --git a/Content.Client/Administration/UI/AdminRemarks/AdminMessagePopupWindow.xaml b/Content.Client/Administration/UI/AdminRemarks/AdminMessagePopupWindow.xaml index 311829e8b2b..cc5207bb3a0 100644 --- a/Content.Client/Administration/UI/AdminRemarks/AdminMessagePopupWindow.xaml +++ b/Content.Client/Administration/UI/AdminRemarks/AdminMessagePopupWindow.xaml @@ -1,22 +1,36 @@ - - - - -