Explicitly associate setup sections with titles

osu.Game/Screens/Edit/Setup/DifficultySection.cs

@@ -5,8 +5,8 @@ using System.Linq;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
 using osu.Framework.Graphics;
+using osu.Framework.Localisation;
 using osu.Game.Beatmaps;
-using osu.Game.Graphics.Sprites;
 using osu.Game.Graphics.UserInterfaceV2;
 
 namespace osu.Game.Screens.Edit.Setup
@@ -18,15 +18,13 @@ namespace osu.Game.Screens.Edit.Setup
         private LabelledSliderBar<float> approachRateSlider;
         private LabelledSliderBar<float> overallDifficultySlider;
 
+        public override LocalisableString Title => "Difficulty";
+
         [BackgroundDependencyLoader]
         private void load()
         {
             Children = new Drawable[]
             {
-                new OsuSpriteText
-                {
-                    Text = "Difficulty settings"
-                },
                 circleSizeSlider = new LabelledSliderBar<float>
                 {
                     Label = "Object Size",

osu.Game/Screens/Edit/Setup/MetadataSection.cs

@@ -5,7 +5,7 @@ using System.Linq;
 using osu.Framework.Allocation;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.UserInterface;
-using osu.Game.Graphics.Sprites;
+using osu.Framework.Localisation;
 using osu.Game.Graphics.UserInterfaceV2;
 
 namespace osu.Game.Screens.Edit.Setup
@@ -17,15 +17,13 @@ namespace osu.Game.Screens.Edit.Setup
         private LabelledTextBox creatorTextBox;
         private LabelledTextBox difficultyTextBox;
 
+        public override LocalisableString Title => "Metadata";
+
         [BackgroundDependencyLoader]
         private void load()
         {
             Children = new Drawable[]
             {
-                new OsuSpriteText
-                {
-                    Text = "Beatmap metadata"
-                },
                 artistTextBox = new LabelledTextBox
                 {
                     Label = "Artist",

osu.Game/Screens/Edit/Setup/ResourcesSection.cs

@@ -11,12 +11,12 @@ using osu.Framework.Bindables;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Shapes;
+using osu.Framework.Localisation;
 using osu.Game.Beatmaps;
 using osu.Game.Beatmaps.Drawables;
 using osu.Game.Database;
 using osu.Game.Graphics;
 using osu.Game.Graphics.Containers;
-using osu.Game.Graphics.Sprites;
 using osu.Game.Graphics.UserInterfaceV2;
 using osu.Game.Overlays;
 
@@ -27,6 +27,8 @@ namespace osu.Game.Screens.Edit.Setup
         private LabelledTextBox audioTrackTextBox;
         private Container backgroundSpriteContainer;
 
+        public override LocalisableString Title => "Resources";
+
         public IEnumerable<string> HandledExtensions => ImageExtensions.Concat(AudioExtensions);
 
         public static string[] ImageExtensions { get; } = { ".jpg", ".jpeg", ".png" };
@@ -66,10 +68,6 @@ namespace osu.Game.Screens.Edit.Setup
                     Masking = true,
                     CornerRadius = 10,
                 },
-                new OsuSpriteText
-                {
-                    Text = "Resources"
-                },
                 audioTrackTextBox = new FileChooserLabelledTextBox
                 {
                     Label = "Audio Track",

osu.Game/Screens/Edit/Setup/SetupSection.cs

@@ -4,12 +4,14 @@
 using osu.Framework.Allocation;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
+using osu.Framework.Localisation;
 using osu.Game.Graphics;
+using osu.Game.Graphics.Sprites;
 using osuTK;
 
 namespace osu.Game.Screens.Edit.Setup
 {
-    internal class SetupSection : Container
+    internal abstract class SetupSection : Container
     {
         private readonly FillFlowContainer flow;
 
@@ -21,23 +23,40 @@ namespace osu.Game.Screens.Edit.Setup
 
         protected override Container<Drawable> Content => flow;
 
-        public SetupSection()
+        public abstract LocalisableString Title { get; }
+
+        protected SetupSection()
         {
             RelativeSizeAxes = Axes.X;
             AutoSizeAxes = Axes.Y;
 
-            Padding = new MarginPadding(10);
+            Padding = new MarginPadding
+            {
+                Vertical = 10,
+                Horizontal = 90
+            };
 
-            InternalChild = flow = new FillFlowContainer
+            InternalChild = new FillFlowContainer
             {
                 RelativeSizeAxes = Axes.X,
                 AutoSizeAxes = Axes.Y,
                 Spacing = new Vector2(20),
-                Padding = new MarginPadding
-                {
-                    Horizontal = 90
-                },
                 Direction = FillDirection.Vertical,
+                Children = new Drawable[]
+                {
+                    new OsuSpriteText
+                    {
+                        Font = OsuFont.GetFont(weight: FontWeight.Bold),
+                        Text = Title
+                    },
+                    flow = new FillFlowContainer
+                    {
+                        RelativeSizeAxes = Axes.X,
+                        AutoSizeAxes = Axes.Y,
+                        Spacing = new Vector2(20),
+                        Direction = FillDirection.Vertical,
+                    }
+                }
             };
         }
     }