Merge branch 'master-ru' into 'master-ru'

Upstream sync (Some locale fixes)

See merge request Workbench-Team/space-station-14!126

Content.Client/Administration/UI/Notes/AdminNotesControl.xaml.cs

@@ -87,12 +87,64 @@ private bool NoteClicked(AdminNotesLine line)
         };
 
         _popup.OnDeletePressed += (noteId, noteType) => NoteDeleted?.Invoke(noteId, noteType);
+        _popup.OnPopupHide += OnPopupHide;
+
         var box = UIBox2.FromDimensions(UserInterfaceManager.MousePositionScaled.Position, Vector2.One);
         _popup.Open(box);
 
         return true;
     }
 
+    private void OnPopupHide()
+    {
+        if (_popup == null ||
+            !Inputs.TryGetValue((_popup.NoteId, _popup.NoteType), out var input))
+        {
+            return;
+        }
+
+        UpdateNoteLineAlpha(input);
+    }
+
+    private void NoteMouseEntered(GUIMouseHoverEventArgs args)
+    {
+        if (args.SourceControl is not AdminNotesLine line)
+            return;
+
+        line.Modulate = line.Modulate.WithAlpha(1f);
+    }
+
+    private void NoteMouseExited(GUIMouseHoverEventArgs args)
+    {
+        if (args.SourceControl is not AdminNotesLine line)
+            return;
+
+        if (_popup?.NoteId == line.Note.Id && _popup.Visible)
+            return;
+
+        UpdateNoteLineAlpha(line);
+    }
+
+    private void UpdateNoteLineAlpha(AdminNotesLine input)
+    {
+        var timeDiff = DateTime.UtcNow - input.Note.CreatedAt;
+        float alpha;
+        if (_noteFreshDays == 0 || timeDiff.TotalDays <= _noteFreshDays)
+        {
+            alpha = 1f;
+        }
+        else if (_noteStaleDays == 0 || timeDiff.TotalDays > _noteStaleDays)
+        {
+            alpha = 0f;
+        }
+        else
+        {
+            alpha = (float) (1 - Math.Clamp((timeDiff.TotalDays - _noteFreshDays) / (_noteStaleDays - _noteFreshDays), 0, 1));
+        }
+
+        input.Modulate = input.Modulate.WithAlpha(alpha);
+    }
+
     public void SetNotes(Dictionary<(int, NoteType), SharedAdminNote> notes)
     {
         foreach (var (key, input) in Inputs)
@@ -119,25 +171,17 @@ public void SetNotes(Dictionary<(int, NoteType), SharedAdminNote> notes)
 
             input = new AdminNotesLine(_sprites, note);
             input.OnClicked += NoteClicked;
+            input.OnMouseEntered += NoteMouseEntered;
+            input.OnMouseExited += NoteMouseExited;
 
-            var timeDiff = DateTime.UtcNow - note.CreatedAt;
-            float alpha;
-            if (_noteFreshDays == 0 || timeDiff.TotalDays <= _noteFreshDays)
-            {
-                alpha = 1f;
-            }
-            else if (_noteStaleDays == 0 || timeDiff.TotalDays > _noteStaleDays)
+            UpdateNoteLineAlpha(input);
+
+            if (input.Modulate.A == 0)
             {
-                alpha = 0f;
                 input.Visible = false;
                 showMoreButtonVisible = true;
             }
-            else
-            {
-                alpha = (float) (1 - Math.Clamp((timeDiff.TotalDays - _noteFreshDays) / (_noteStaleDays - _noteFreshDays), 0, 1));
-            }
 
-            input.Modulate = input.Modulate.WithAlpha(alpha);
             Notes.AddChild(input);
             Inputs[(note.Id, note.NoteType)] = input;
             ShowMoreButton.Visible = showMoreButtonVisible;

Content.Client/Administration/UI/Notes/AdminNotesLine.xaml.cs

@@ -1,11 +1,8 @@
 using System.Text;
-using Content.Client.Resources;
 using Content.Shared.Administration.Notes;
 using Content.Shared.Database;
 using Robust.Client.AutoGenerated;
 using Robust.Client.GameObjects;
-using Robust.Client.Graphics;
-using Robust.Client.ResourceManagement;
 using Robust.Client.UserInterface;
 using Robust.Client.UserInterface.Controls;
 using Robust.Client.UserInterface.XAML;
@@ -56,7 +53,7 @@ public AdminNotesLine(SpriteSystem sprites, SharedAdminNote note)
     private void Refresh()
     {
         string? iconPath;
-        if(Note.NoteSeverity is not null)
+        if (Note.NoteSeverity is not null && !NoteTypeIcons.ContainsKey(Note.NoteType))
             SeverityIcons.TryGetValue(Note.NoteSeverity.Value, out iconPath);
         else
             NoteTypeIcons.TryGetValue(Note.NoteType, out iconPath);

Content.Client/Administration/UI/Notes/AdminNotesLinePopup.xaml.cs

@@ -53,8 +53,8 @@ public AdminNotesLinePopup(SharedAdminNote note, string playerName, bool showDel
         DeleteButton.OnPressed += DeletePressed;
     }
 
-    private int NoteId { get; }
-    private NoteType NoteType { get; }
+    public int NoteId { get; }
+    public NoteType NoteType { get; }
     private TimeSpan? DeleteResetOn { get; set; }
 
     private void EditPressed(ButtonEventArgs args)

Content.Client/Administration/UI/Notes/NoteEdit.xaml.cs

@@ -239,7 +239,7 @@ private void UpdateSubmitButton()
             return;
         }
 
-        SubmitButton.Disabled = NoteSeverity == null;
+        SubmitButton.Disabled = (NoteType != NoteType.Watchlist && NoteType != NoteType.Message) && NoteSeverity == null;
     }
 
     private void ResetSubmitButton()

Content.Client/Chemistry/UI/ReagentDispenserWindow.xaml

@@ -1,8 +1,8 @@
 <DefaultWindow xmlns="https://spacestation14.io"
             xmlns:gfx="clr-namespace:Robust.Client.Graphics;assembly=Robust.Client"
             Title="{Loc 'reagent-dispenser-bound-user-interface-title'}"
-            SetSize="590 450"
-            MinSize="590 450">
+            SetSize="620 450"
+            MinSize="620 450">
     <BoxContainer Orientation="Vertical">
         <BoxContainer Orientation="Horizontal">
             <Label Text="{Loc 'reagent-dispenser-window-amount-to-dispense-label'}"/>

Content.Client/SprayPainter/SprayPainterSystem.cs

@@ -0,0 +1,53 @@
+using Content.Shared.SprayPainter;
+using Robust.Client.Graphics;
+using Robust.Client.ResourceManagement;
+using Robust.Shared.Serialization.TypeSerializers.Implementations;
+using Robust.Shared.Utility;
+using System.Linq;
+
+namespace Content.Client.SprayPainter;
+
+public sealed class SprayPainterSystem : SharedSprayPainterSystem
+{
+    [Dependency] private readonly IResourceCache _resourceCache = default!;
+
+    public List<SprayPainterEntry> Entries { get; private set; } = new();
+
+    public override void Initialize()
+    {
+        base.Initialize();
+
+        foreach (string style in Styles)
+        {
+            string? iconPath = Groups
+              .FindAll(x => x.StylePaths.ContainsKey(style))?
+              .MaxBy(x => x.IconPriority)?.StylePaths[style];
+            if (iconPath == null)
+            {
+                Entries.Add(new SprayPainterEntry(style, null));
+                continue;
+            }
+
+            RSIResource doorRsi = _resourceCache.GetResource<RSIResource>(SpriteSpecifierSerializer.TextureRoot / new ResPath(iconPath));
+            if (!doorRsi.RSI.TryGetState("closed", out var icon))
+            {
+                Entries.Add(new SprayPainterEntry(style, null));
+                continue;
+            }
+
+            Entries.Add(new SprayPainterEntry(style, icon.Frame0));
+        }
+    }
+}
+
+public sealed class SprayPainterEntry
+{
+    public string Name;
+    public Texture? Icon;
+
+    public SprayPainterEntry(string name, Texture? icon)
+    {
+        Name = name;
+        Icon = icon;
+    }
+}