Fix delete dialogs having generic "Caution" header text

osu.Game.Tournament/Screens/Editors/Components/DeleteRoundDialog.cs

@@ -2,18 +2,16 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using System;
-using osu.Framework.Graphics.Sprites;
 using osu.Game.Overlays.Dialog;
 using osu.Game.Tournament.Models;
 
 namespace osu.Game.Tournament.Screens.Editors.Components
 {
-    public partial class DeleteRoundDialog : DangerousActionDialog
+    public partial class DeleteRoundDialog : DeletionDialog
     {
         public DeleteRoundDialog(TournamentRound round, Action action)
         {
             HeaderText = round.Name.Value.Length > 0 ? $@"Delete round ""{round.Name.Value}""?" : @"Delete unnamed round?";
-            Icon = FontAwesome.Solid.Trash;
             DangerousAction = action;
         }
     }

osu.Game.Tournament/Screens/Editors/Components/DeleteTeamDialog.cs

@@ -2,20 +2,18 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using System;
-using osu.Framework.Graphics.Sprites;
 using osu.Game.Overlays.Dialog;
 using osu.Game.Tournament.Models;
 
 namespace osu.Game.Tournament.Screens.Editors.Components
 {
-    public partial class DeleteTeamDialog : DangerousActionDialog
+    public partial class DeleteTeamDialog : DeletionDialog
     {
         public DeleteTeamDialog(TournamentTeam team, Action action)
         {
             HeaderText = team.FullName.Value.Length > 0 ? $@"Delete team ""{team.FullName.Value}""?" :
                 team.Acronym.Value.Length > 0 ? $@"Delete team ""{team.Acronym.Value}""?" :
                 @"Delete unnamed team?";
-            Icon = FontAwesome.Solid.Trash;
             DangerousAction = action;
         }
     }

osu.Game/Collections/DeleteCollectionDialog.cs

@@ -8,7 +8,7 @@
 
 namespace osu.Game.Collections
 {
-    public partial class DeleteCollectionDialog : DangerousActionDialog
+    public partial class DeleteCollectionDialog : DeletionDialog
     {
         public DeleteCollectionDialog(Live<BeatmapCollection> collection, Action deleteAction)
         {

osu.Game/Localisation/DialogStrings.cs

@@ -12,7 +12,12 @@ public static class DialogStrings
         /// <summary>
         /// "Caution"
         /// </summary>
-        public static LocalisableString Caution => new TranslatableString(getKey(@"header_text"), @"Caution");
+        public static LocalisableString CautionHeaderText => new TranslatableString(getKey(@"header_text"), @"Caution");
+
+        /// <summary>
+        /// "Are you sure you want to delete the following:"
+        /// </summary>
+        public static LocalisableString DeletionHeaderText => new TranslatableString(getKey(@"deletion_header_text"), @"Are you sure you want to delete the following:");
 
         /// <summary>
         /// "Yes. Go for it."

osu.Game/Online/Chat/ExternalLinkOpener.cs

@@ -46,7 +46,7 @@ public partial class ExternalLinkDialog : PopupDialog
         {
             public ExternalLinkDialog(string url, Action openExternalLinkAction, Action copyExternalLinkAction)
             {
-                HeaderText = DialogStrings.Caution;
+                HeaderText = DialogStrings.CautionHeaderText;
                 BodyText = $"Are you sure you want to open the following link in a web browser?\n\n{url}";
 
                 Icon = FontAwesome.Solid.ExclamationTriangle;

osu.Game/Overlays/Dialog/DangerousActionDialog.cs

@@ -30,9 +30,9 @@ public abstract partial class DangerousActionDialog : PopupDialog
 
         protected DangerousActionDialog()
         {
-            HeaderText = DialogStrings.Caution;
+            HeaderText = DialogStrings.CautionHeaderText;
 
-            Icon = FontAwesome.Regular.TrashAlt;
+            Icon = FontAwesome.Solid.ExclamationTriangle;
 
             Buttons = new PopupDialogButton[]
             {

osu.Game/Overlays/Dialog/DeletionDialog.cs

@@ -0,0 +1,20 @@
+// Copyright (c) ppy Pty Ltd <[email protected]>. Licensed under the MIT Licence.
+// See the LICENCE file in the repository root for full licence text.
+
+using osu.Framework.Graphics.Sprites;
+using osu.Game.Localisation;
+
+namespace osu.Game.Overlays.Dialog
+{
+    /// <summary>
+    /// A dialog which provides confirmation for deletion of something.
+    /// </summary>
+    public abstract partial class DeletionDialog : DangerousActionDialog
+    {
+        protected DeletionDialog()
+        {
+            HeaderText = DialogStrings.DeletionHeaderText;
+            Icon = FontAwesome.Solid.Trash;
+        }
+    }
+}

osu.Game/Overlays/Mods/DeleteModPresetDialog.cs

@@ -7,7 +7,7 @@
 
 namespace osu.Game.Overlays.Mods
 {
-    public partial class DeleteModPresetDialog : DangerousActionDialog
+    public partial class DeleteModPresetDialog : DeletionDialog
     {
         public DeleteModPresetDialog(Live<ModPreset> modPreset)
         {

osu.Game/Overlays/Settings/Sections/Maintenance/MassDeleteConfirmationDialog.cs

@@ -2,6 +2,7 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using System;
+using osu.Framework.Graphics.Sprites;
 using osu.Framework.Localisation;
 using osu.Game.Overlays.Dialog;
 
@@ -12,6 +13,7 @@ public partial class MassDeleteConfirmationDialog : DangerousActionDialog
         public MassDeleteConfirmationDialog(Action deleteAction, LocalisableString deleteContent)
         {
             BodyText = deleteContent;
+            Icon = FontAwesome.Solid.Trash;
             DangerousAction = deleteAction;
         }
     }

osu.Game/Screens/Edit/DeleteDifficultyConfirmationDialog.cs

@@ -7,7 +7,7 @@
 
 namespace osu.Game.Screens.Edit
 {
-    public partial class DeleteDifficultyConfirmationDialog : DangerousActionDialog
+    public partial class DeleteDifficultyConfirmationDialog : DeletionDialog
     {
         public DeleteDifficultyConfirmationDialog(BeatmapInfo beatmapInfo, Action deleteAction)
         {

osu.Game/Screens/Select/BeatmapDeleteDialog.cs

@@ -7,7 +7,7 @@
 
 namespace osu.Game.Screens.Select
 {
-    public partial class BeatmapDeleteDialog : DangerousActionDialog
+    public partial class BeatmapDeleteDialog : DeletionDialog
     {
         private readonly BeatmapSetInfo beatmapSet;
 

osu.Game/Screens/Select/LocalScoreDeleteDialog.cs

@@ -4,11 +4,10 @@
 using osu.Framework.Allocation;
 using osu.Game.Overlays.Dialog;
 using osu.Game.Scoring;
-using osu.Framework.Graphics.Sprites;
 
 namespace osu.Game.Screens.Select
 {
-    public partial class LocalScoreDeleteDialog : DangerousActionDialog
+    public partial class LocalScoreDeleteDialog : DeletionDialog
     {
         private readonly ScoreInfo score;
 
@@ -21,8 +20,6 @@ public LocalScoreDeleteDialog(ScoreInfo score)
         private void load(ScoreManager scoreManager)
         {
             BodyText = $"{score.User} ({score.DisplayAccuracy}, {score.Rank})";
-
-            Icon = FontAwesome.Regular.TrashAlt;
             DangerousAction = () => scoreManager.Delete(score);
         }
     }

osu.Game/Screens/Select/SkinDeleteDialog.cs

@@ -7,7 +7,7 @@
 
 namespace osu.Game.Screens.Select
 {
-    public partial class SkinDeleteDialog : DangerousActionDialog
+    public partial class SkinDeleteDialog : DeletionDialog
     {
         private readonly Skin skin;