diff --git a/osu.Game.Rulesets.Mania/ManiaSettingsSubsection.cs b/osu.Game.Rulesets.Mania/ManiaSettingsSubsection.cs
index f89750a96e..36fa336d0c 100644
--- a/osu.Game.Rulesets.Mania/ManiaSettingsSubsection.cs
+++ b/osu.Game.Rulesets.Mania/ManiaSettingsSubsection.cs
@@ -13,7 +13,7 @@ namespace osu.Game.Rulesets.Mania
{
public class ManiaSettingsSubsection : RulesetSettingsSubsection
{
- protected override string Header => "osu!mania";
+ protected override LocalisableString Header => "osu!mania";
public ManiaSettingsSubsection(ManiaRuleset ruleset)
: base(ruleset)
diff --git a/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableManiaHitObject.cs b/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableManiaHitObject.cs
index 3ec68bfb56..5aff4e200b 100644
--- a/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableManiaHitObject.cs
+++ b/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableManiaHitObject.cs
@@ -22,6 +22,10 @@ namespace osu.Game.Rulesets.Mania.Objects.Drawables
protected readonly IBindable<ScrollingDirection> Direction = new Bindable<ScrollingDirection>();
+ // Leaving the default (10s) makes hitobjects not appear, as this offset is used for the initial state transforms.
+ // Calculated as DrawableManiaRuleset.MAX_TIME_RANGE + some additional allowance for velocity < 1.
+ protected override double InitialLifetimeOffset => 30000;
+
[Resolved(canBeNull: true)]
private ManiaPlayfield playfield { get; set; }
diff --git a/osu.Game.Rulesets.Mania/UI/DrawableManiaRuleset.cs b/osu.Game.Rulesets.Mania/UI/DrawableManiaRuleset.cs
index e497646a13..614a7b00c7 100644
--- a/osu.Game.Rulesets.Mania/UI/DrawableManiaRuleset.cs
+++ b/osu.Game.Rulesets.Mania/UI/DrawableManiaRuleset.cs
@@ -33,12 +33,12 @@ namespace osu.Game.Rulesets.Mania.UI
/// <summary>
/// The minimum time range. This occurs at a <see cref="relativeTimeRange"/> of 40.
/// </summary>
- public const double MIN_TIME_RANGE = 340;
+ public const double MIN_TIME_RANGE = 290;
/// <summary>
/// The maximum time range. This occurs at a <see cref="relativeTimeRange"/> of 1.
/// </summary>
- public const double MAX_TIME_RANGE = 13720;
+ public const double MAX_TIME_RANGE = 11485;
protected new ManiaPlayfield Playfield => (ManiaPlayfield)base.Playfield;
@@ -67,7 +67,7 @@ namespace osu.Game.Rulesets.Mania.UI
protected override ScrollVisualisationMethod VisualisationMethod => scrollMethod;
private readonly Bindable<ManiaScrollingDirection> configDirection = new Bindable<ManiaScrollingDirection>();
- private readonly Bindable<double> configTimeRange = new BindableDouble();
+ private readonly BindableDouble configTimeRange = new BindableDouble();
// Stores the current speed adjustment active in gameplay.
private readonly Track speedAdjustmentTrack = new TrackVirtual(0);
@@ -103,6 +103,8 @@ namespace osu.Game.Rulesets.Mania.UI
configDirection.BindValueChanged(direction => Direction.Value = (ScrollingDirection)direction.NewValue, true);
Config.BindWith(ManiaRulesetSetting.ScrollTime, configTimeRange);
+ TimeRange.MinValue = configTimeRange.MinValue;
+ TimeRange.MaxValue = configTimeRange.MaxValue;
}
protected override void AdjustScrollSpeed(int amount)
diff --git a/osu.Game.Rulesets.Osu/Difficulty/OsuPerformanceCalculator.cs b/osu.Game.Rulesets.Osu/Difficulty/OsuPerformanceCalculator.cs
index 749d7d1b41..8a3c426381 100644
--- a/osu.Game.Rulesets.Osu/Difficulty/OsuPerformanceCalculator.cs
+++ b/osu.Game.Rulesets.Osu/Difficulty/OsuPerformanceCalculator.cs
@@ -98,11 +98,13 @@ namespace osu.Game.Rulesets.Osu.Difficulty
double approachRateFactor = 0.0;
if (Attributes.ApproachRate > 10.33)
- approachRateFactor += 0.4 * (Attributes.ApproachRate - 10.33);
+ approachRateFactor = Attributes.ApproachRate - 10.33;
else if (Attributes.ApproachRate < 8.0)
- approachRateFactor += 0.01 * (8.0 - Attributes.ApproachRate);
+ approachRateFactor = 0.025 * (8.0 - Attributes.ApproachRate);
- aimValue *= 1.0 + Math.Min(approachRateFactor, approachRateFactor * (totalHits / 1000.0));
+ double approachRateTotalHitsFactor = 1.0 / (1.0 + Math.Exp(-(0.007 * (totalHits - 400))));
+
+ aimValue *= 1.0 + (0.03 + 0.37 * approachRateTotalHitsFactor) * approachRateFactor;
// We want to give more reward for lower AR when it comes to aim and HD. This nerfs high AR and buffs lower AR.
if (mods.Any(h => h is OsuModHidden))
@@ -145,9 +147,11 @@ namespace osu.Game.Rulesets.Osu.Difficulty
double approachRateFactor = 0.0;
if (Attributes.ApproachRate > 10.33)
- approachRateFactor += 0.4 * (Attributes.ApproachRate - 10.33);
+ approachRateFactor = Attributes.ApproachRate - 10.33;
- speedValue *= 1.0 + Math.Min(approachRateFactor, approachRateFactor * (totalHits / 1000.0));
+ double approachRateTotalHitsFactor = 1.0 / (1.0 + Math.Exp(-(0.007 * (totalHits - 400))));
+
+ speedValue *= 1.0 + (0.03 + 0.37 * approachRateTotalHitsFactor) * approachRateFactor;
if (mods.Any(m => m is OsuModHidden))
speedValue *= 1.0 + 0.04 * (12.0 - Attributes.ApproachRate);
diff --git a/osu.Game.Rulesets.Osu/UI/OsuSettingsSubsection.cs b/osu.Game.Rulesets.Osu/UI/OsuSettingsSubsection.cs
index 705ba3e929..a4c0381d16 100644
--- a/osu.Game.Rulesets.Osu/UI/OsuSettingsSubsection.cs
+++ b/osu.Game.Rulesets.Osu/UI/OsuSettingsSubsection.cs
@@ -3,6 +3,7 @@
using osu.Framework.Allocation;
using osu.Framework.Graphics;
+using osu.Framework.Localisation;
using osu.Game.Overlays.Settings;
using osu.Game.Rulesets.Osu.Configuration;
using osu.Game.Rulesets.UI;
@@ -11,7 +12,7 @@ namespace osu.Game.Rulesets.Osu.UI
{
public class OsuSettingsSubsection : RulesetSettingsSubsection
{
- protected override string Header => "osu!";
+ protected override LocalisableString Header => "osu!";
public OsuSettingsSubsection(Ruleset ruleset)
: base(ruleset)
diff --git a/osu.Game.Tournament.Tests/Screens/TestSceneScheduleScreen.cs b/osu.Game.Tournament.Tests/Screens/TestSceneScheduleScreen.cs
index 0da8d1eb4a..bd1bacd549 100644
--- a/osu.Game.Tournament.Tests/Screens/TestSceneScheduleScreen.cs
+++ b/osu.Game.Tournament.Tests/Screens/TestSceneScheduleScreen.cs
@@ -28,6 +28,12 @@ namespace osu.Game.Tournament.Tests.Screens
setMatchDate(TimeSpan.FromHours(3));
}
+ [Test]
+ public void TestNoCurrentMatch()
+ {
+ AddStep("Set null current match", () => Ladder.CurrentMatch.Value = null);
+ }
+
private void setMatchDate(TimeSpan relativeTime)
// Humanizer cannot handle negative timespans.
=> AddStep($"start time is {relativeTime}", () =>
diff --git a/osu.Game.Tournament.Tests/Screens/TestSceneSeedingScreen.cs b/osu.Game.Tournament.Tests/Screens/TestSceneSeedingScreen.cs
index d414d8e36e..a18e73e38f 100644
--- a/osu.Game.Tournament.Tests/Screens/TestSceneSeedingScreen.cs
+++ b/osu.Game.Tournament.Tests/Screens/TestSceneSeedingScreen.cs
@@ -1,9 +1,13 @@
// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
// See the LICENCE file in the repository root for full licence text.
+using System.Linq;
+using NUnit.Framework;
using osu.Framework.Allocation;
using osu.Framework.Graphics;
+using osu.Framework.Testing;
using osu.Game.Tournament.Models;
+using osu.Game.Tournament.Screens.Ladder.Components;
using osu.Game.Tournament.Screens.TeamIntro;
namespace osu.Game.Tournament.Tests.Screens
@@ -11,16 +15,41 @@ namespace osu.Game.Tournament.Tests.Screens
public class TestSceneSeedingScreen : TournamentTestScene
{
[Cached]
- private readonly LadderInfo ladder = new LadderInfo();
-
- [BackgroundDependencyLoader]
- private void load()
+ private readonly LadderInfo ladder = new LadderInfo
{
- Add(new SeedingScreen
+ Teams =
+ {
+ new TournamentTeam
+ {
+ FullName = { Value = @"Japan" },
+ Acronym = { Value = "JPN" },
+ SeedingResults =
+ {
+ new SeedingResult
+ {
+ // Mod intentionally left blank.
+ Seed = { Value = 4 }
+ },
+ new SeedingResult
+ {
+ Mod = { Value = "DT" },
+ Seed = { Value = 8 }
+ }
+ }
+ }
+ }
+ };
+
+ [Test]
+ public void TestBasic()
+ {
+ AddStep("create seeding screen", () => Add(new SeedingScreen
{
FillMode = FillMode.Fit,
FillAspectRatio = 16 / 9f
- });
+ }));
+
+ AddStep("set team to Japan", () => this.ChildrenOfType<SettingsTeamDropdown>().Single().Current.Value = ladder.Teams.Single());
}
}
}
diff --git a/osu.Game.Tournament/Screens/BeatmapInfoScreen.cs b/osu.Game.Tournament/Screens/BeatmapInfoScreen.cs
index 0a3163ef43..50498304ca 100644
--- a/osu.Game.Tournament/Screens/BeatmapInfoScreen.cs
+++ b/osu.Game.Tournament/Screens/BeatmapInfoScreen.cs
@@ -11,7 +11,7 @@ using osu.Game.Tournament.IPC;
namespace osu.Game.Tournament.Screens
{
- public abstract class BeatmapInfoScreen : TournamentScreen
+ public abstract class BeatmapInfoScreen : TournamentMatchScreen
{
protected readonly SongBar SongBar;
diff --git a/osu.Game.Tournament/Screens/Gameplay/GameplayScreen.cs b/osu.Game.Tournament/Screens/Gameplay/GameplayScreen.cs
index 6e4c6784c8..f61506d7f2 100644
--- a/osu.Game.Tournament/Screens/Gameplay/GameplayScreen.cs
+++ b/osu.Game.Tournament/Screens/Gameplay/GameplayScreen.cs
@@ -24,8 +24,6 @@ namespace osu.Game.Tournament.Screens.Gameplay
{
private readonly BindableBool warmup = new BindableBool();
- private readonly Bindable<TournamentMatch> currentMatch = new Bindable<TournamentMatch>();
-
public readonly Bindable<TourneyState> State = new Bindable<TourneyState>();
private OsuButton warmupButton;
private MatchIPCInfo ipc;
@@ -131,14 +129,6 @@ namespace osu.Game.Tournament.Screens.Gameplay
ladder.ChromaKeyWidth.BindValueChanged(width => chroma.Width = width.NewValue, true);
- currentMatch.BindValueChanged(m =>
- {
- warmup.Value = m.NewValue.Team1Score.Value + m.NewValue.Team2Score.Value == 0;
- scheduledOperation?.Cancel();
- });
-
- currentMatch.BindTo(ladder.CurrentMatch);
-
warmup.BindValueChanged(w =>
{
warmupButton.Alpha = !w.NewValue ? 0.5f : 1;
@@ -146,6 +136,17 @@ namespace osu.Game.Tournament.Screens.Gameplay
}, true);
}
+ protected override void CurrentMatchChanged(ValueChangedEvent<TournamentMatch> match)
+ {
+ base.CurrentMatchChanged(match);
+
+ if (match.NewValue == null)
+ return;
+
+ warmup.Value = match.NewValue.Team1Score.Value + match.NewValue.Team2Score.Value == 0;
+ scheduledOperation?.Cancel();
+ }
+
private ScheduledDelegate scheduledOperation;
private MatchScoreDisplay scoreDisplay;
@@ -161,9 +162,9 @@ namespace osu.Game.Tournament.Screens.Gameplay
if (warmup.Value) return;
if (ipc.Score1.Value > ipc.Score2.Value)
- currentMatch.Value.Team1Score.Value++;
+ CurrentMatch.Value.Team1Score.Value++;
else
- currentMatch.Value.Team2Score.Value++;
+ CurrentMatch.Value.Team2Score.Value++;
}
scheduledOperation?.Cancel();
@@ -198,9 +199,9 @@ namespace osu.Game.Tournament.Screens.Gameplay
// we should automatically proceed after a short delay
if (lastState == TourneyState.Ranking && !warmup.Value)
{
- if (currentMatch.Value?.Completed.Value == true)
+ if (CurrentMatch.Value?.Completed.Value == true)
scheduledOperation = Scheduler.AddDelayed(() => { sceneManager?.SetScreen(typeof(TeamWinScreen)); }, delay_before_progression);
- else if (currentMatch.Value?.Completed.Value == false)
+ else if (CurrentMatch.Value?.Completed.Value == false)
scheduledOperation = Scheduler.AddDelayed(() => { sceneManager?.SetScreen(typeof(MapPoolScreen)); }, delay_before_progression);
}
diff --git a/osu.Game.Tournament/Screens/Ladder/Components/DrawableTournamentMatch.cs b/osu.Game.Tournament/Screens/Ladder/Components/DrawableTournamentMatch.cs
index 1c805bb42e..6937c69dbf 100644
--- a/osu.Game.Tournament/Screens/Ladder/Components/DrawableTournamentMatch.cs
+++ b/osu.Game.Tournament/Screens/Ladder/Components/DrawableTournamentMatch.cs
@@ -303,6 +303,15 @@ namespace osu.Game.Tournament.Screens.Ladder.Components
Match.LosersProgression.Value = null;
ladderInfo.Matches.Remove(Match);
+
+ foreach (var m in ladderInfo.Matches)
+ {
+ if (m.Progression.Value == Match)
+ m.Progression.Value = null;
+
+ if (m.LosersProgression.Value == Match)
+ m.LosersProgression.Value = null;
+ }
}
}
}
diff --git a/osu.Game.Tournament/Screens/MapPool/MapPoolScreen.cs b/osu.Game.Tournament/Screens/MapPool/MapPoolScreen.cs
index 2c4fed8d86..d4292c5492 100644
--- a/osu.Game.Tournament/Screens/MapPool/MapPoolScreen.cs
+++ b/osu.Game.Tournament/Screens/MapPool/MapPoolScreen.cs
@@ -21,12 +21,10 @@ using osuTK.Input;
namespace osu.Game.Tournament.Screens.MapPool
{
- public class MapPoolScreen : TournamentScreen
+ public class MapPoolScreen : TournamentMatchScreen
{
private readonly FillFlowContainer<FillFlowContainer<TournamentBeatmapPanel>> mapFlows;
- private readonly Bindable<TournamentMatch> currentMatch = new Bindable<TournamentMatch>();
-
[Resolved(canBeNull: true)]
private TournamentSceneManager sceneManager { get; set; }
@@ -96,7 +94,7 @@ namespace osu.Game.Tournament.Screens.MapPool
Action = reset
},
new ControlPanel.Spacer(),
- }
+ },
}
};
}
@@ -104,15 +102,12 @@ namespace osu.Game.Tournament.Screens.MapPool
[BackgroundDependencyLoader]
private void load(MatchIPCInfo ipc)
{
- currentMatch.BindValueChanged(matchChanged);
- currentMatch.BindTo(LadderInfo.CurrentMatch);
-
ipc.Beatmap.BindValueChanged(beatmapChanged);
}
private void beatmapChanged(ValueChangedEvent<BeatmapInfo> beatmap)
{
- if (currentMatch.Value == null || currentMatch.Value.PicksBans.Count(p => p.Type == ChoiceType.Ban) < 2)
+ if (CurrentMatch.Value == null || CurrentMatch.Value.PicksBans.Count(p => p.Type == ChoiceType.Ban) < 2)
return;
// if bans have already been placed, beatmap changes result in a selection being made autoamtically
@@ -137,12 +132,12 @@ namespace osu.Game.Tournament.Screens.MapPool
{
const TeamColour roll_winner = TeamColour.Red; //todo: draw from match
- var nextColour = (currentMatch.Value.PicksBans.LastOrDefault()?.Team ?? roll_winner) == TeamColour.Red ? TeamColour.Blue : TeamColour.Red;
+ var nextColour = (CurrentMatch.Value.PicksBans.LastOrDefault()?.Team ?? roll_winner) == TeamColour.Red ? TeamColour.Blue : TeamColour.Red;
- if (pickType == ChoiceType.Ban && currentMatch.Value.PicksBans.Count(p => p.Type == ChoiceType.Ban) >= 2)
+ if (pickType == ChoiceType.Ban && CurrentMatch.Value.PicksBans.Count(p => p.Type == ChoiceType.Ban) >= 2)
setMode(pickColour, ChoiceType.Pick);
else
- setMode(nextColour, currentMatch.Value.PicksBans.Count(p => p.Type == ChoiceType.Ban) >= 2 ? ChoiceType.Pick : ChoiceType.Ban);
+ setMode(nextColour, CurrentMatch.Value.PicksBans.Count(p => p.Type == ChoiceType.Ban) >= 2 ? ChoiceType.Pick : ChoiceType.Ban);
}
protected override bool OnMouseDown(MouseDownEvent e)
@@ -156,11 +151,11 @@ namespace osu.Game.Tournament.Screens.MapPool
addForBeatmap(map.Beatmap.OnlineBeatmapID.Value);
else
{
- var existing = currentMatch.Value.PicksBans.FirstOrDefault(p => p.BeatmapID == map.Beatmap.OnlineBeatmapID);
+ var existing = CurrentMatch.Value.PicksBans.FirstOrDefault(p => p.BeatmapID == map.Beatmap.OnlineBeatmapID);
if (existing != null)
{
- currentMatch.Value.PicksBans.Remove(existing);
+ CurrentMatch.Value.PicksBans.Remove(existing);
setNextMode();
}
}
@@ -173,7 +168,7 @@ namespace osu.Game.Tournament.Screens.MapPool
private void reset()
{
- currentMatch.Value.PicksBans.Clear();
+ CurrentMatch.Value.PicksBans.Clear();
setNextMode();
}
@@ -181,18 +176,18 @@ namespace osu.Game.Tournament.Screens.MapPool
private void addForBeatmap(int beatmapId)
{
- if (currentMatch.Value == null)
+ if (CurrentMatch.Value == null)
return;
- if (currentMatch.Value.Round.Value.Beatmaps.All(b => b.BeatmapInfo.OnlineBeatmapID != beatmapId))
+ if (CurrentMatch.Value.Round.Value.Beatmaps.All(b => b.BeatmapInfo.OnlineBeatmapID != beatmapId))
// don't attempt to add if the beatmap isn't in our pool
return;
- if (currentMatch.Value.PicksBans.Any(p => p.BeatmapID == beatmapId))
+ if (CurrentMatch.Value.PicksBans.Any(p => p.BeatmapID == beatmapId))
// don't attempt to add if already exists.
return;
- currentMatch.Value.PicksBans.Add(new BeatmapChoice
+ CurrentMatch.Value.PicksBans.Add(new BeatmapChoice
{
Team = pickColour,
Type = pickType,
@@ -201,17 +196,22 @@ namespace osu.Game.Tournament.Screens.MapPool
setNextMode();
- if (pickType == ChoiceType.Pick && currentMatch.Value.PicksBans.Any(i => i.Type == ChoiceType.Pick))
+ if (pickType == ChoiceType.Pick && CurrentMatch.Value.PicksBans.Any(i => i.Type == ChoiceType.Pick))
{
scheduledChange?.Cancel();
scheduledChange = Scheduler.AddDelayed(() => { sceneManager?.SetScreen(typeof(GameplayScreen)); }, 10000);
}
}
- private void matchChanged(ValueChangedEvent<TournamentMatch> match)
+ protected override void CurrentMatchChanged(ValueChangedEvent<TournamentMatch> match)
{
+ base.CurrentMatchChanged(match);
+
mapFlows.Clear();
+ if (match.NewValue == null)
+ return;
+
int totalRows = 0;
if (match.NewValue.Round.Value != null)
diff --git a/osu.Game.Tournament/Screens/Schedule/ScheduleScreen.cs b/osu.Game.Tournament/Screens/Schedule/ScheduleScreen.cs
index c1d8c8ddd3..e08be65465 100644
--- a/osu.Game.Tournament/Screens/Schedule/ScheduleScreen.cs
+++ b/osu.Game.Tournament/Screens/Schedule/ScheduleScreen.cs
@@ -96,19 +96,18 @@ namespace osu.Game.Tournament.Screens.Schedule
}
},
};
+ }
+
+ protected override void LoadComplete()
+ {
+ base.LoadComplete();
- currentMatch.BindValueChanged(matchChanged);
currentMatch.BindTo(ladder.CurrentMatch);
+ currentMatch.BindValueChanged(matchChanged, true);
}
private void matchChanged(ValueChangedEvent<TournamentMatch> match)
{
- if (match.NewValue == null)
- {
- mainContainer.Clear();
- return;
- }
-
var upcoming = ladder.Matches.Where(p => !p.Completed.Value && p.Team1.Value != null && p.Team2.Value != null && Math.Abs(p.Date.Value.DayOfYear - DateTimeOffset.UtcNow.DayOfYear) < 4);
var conditionals = ladder
.Matches.Where(p => !p.Completed.Value && (p.Team1.Value == null || p.Team2.Value == null) && Math.Abs(p.Date.Value.DayOfYear - DateTimeOffset.UtcNow.DayOfYear) < 4)
@@ -117,6 +116,8 @@ namespace osu.Game.Tournament.Screens.Schedule
upcoming = upcoming.Concat(conditionals);
upcoming = upcoming.OrderBy(p => p.Date.Value).Take(8);
+ ScheduleContainer comingUpNext;
+
mainContainer.Child = new FillFlowContainer
{
RelativeSizeAxes = Axes.Both,
@@ -153,57 +154,58 @@ namespace osu.Game.Tournament.Screens.Schedule
}
}
},
- new ScheduleContainer("coming up next")
+ comingUpNext = new ScheduleContainer("coming up next")
{
RelativeSizeAxes = Axes.Both,
Height = 0.25f,
- Children = new Drawable[]
- {
- new FillFlowContainer
- {
- AutoSizeAxes = Axes.Both,
- Direction = FillDirection.Horizontal,
- Spacing = new Vector2(30),
- Children = new Drawable[]
- {
- new ScheduleMatch(match.NewValue, false)
- {
- Anchor = Anchor.CentreLeft,
- Origin = Anchor.CentreLeft,
- },
- new TournamentSpriteTextWithBackground(match.NewValue.Round.Value?.Name.Value)
- {
- Anchor = Anchor.CentreLeft,
- Origin = Anchor.CentreLeft,
- Scale = new Vector2(0.5f)
- },
- new TournamentSpriteText
- {
- Anchor = Anchor.CentreLeft,
- Origin = Anchor.CentreLeft,
- Text = match.NewValue.Team1.Value?.FullName + " vs " + match.NewValue.Team2.Value?.FullName,
- Font = OsuFont.Torus.With(size: 24, weight: FontWeight.SemiBold)
- },
- new FillFlowContainer
- {
- AutoSizeAxes = Axes.Both,
- Direction = FillDirection.Horizontal,
- Anchor = Anchor.CentreLeft,
- Origin = Anchor.CentreLeft,
- Children = new Drawable[]
- {
- new ScheduleMatchDate(match.NewValue.Date.Value)
- {
- Font = OsuFont.Torus.With(size: 24, weight: FontWeight.Regular)
- }
- }
- },
- }
- },
- }
}
}
};
+
+ if (match.NewValue != null)
+ {
+ comingUpNext.Child = new FillFlowContainer
+ {
+ AutoSizeAxes = Axes.Both,
+ Direction = FillDirection.Horizontal,
+ Spacing = new Vector2(30),
+ Children = new Drawable[]
+ {
+ new ScheduleMatch(match.NewValue, false)
+ {
+ Anchor = Anchor.CentreLeft,
+ Origin = Anchor.CentreLeft,
+ },
+ new TournamentSpriteTextWithBackground(match.NewValue.Round.Value?.Name.Value)
+ {
+ Anchor = Anchor.CentreLeft,
+ Origin = Anchor.CentreLeft,
+ Scale = new Vector2(0.5f)
+ },
+ new TournamentSpriteText
+ {
+ Anchor = Anchor.CentreLeft,
+ Origin = Anchor.CentreLeft,
+ Text = match.NewValue.Team1.Value?.FullName + " vs " + match.NewValue.Team2.Value?.FullName,
+ Font = OsuFont.Torus.With(size: 24, weight: FontWeight.SemiBold)
+ },
+ new FillFlowContainer
+ {
+ AutoSizeAxes = Axes.Both,
+ Direction = FillDirection.Horizontal,
+ Anchor = Anchor.CentreLeft,
+ Origin = Anchor.CentreLeft,
+ Children = new Drawable[]
+ {
+ new ScheduleMatchDate(match.NewValue.Date.Value)
+ {
+ Font = OsuFont.Torus.With(size: 24, weight: FontWeight.Regular)
+ }
+ }
+ },
+ }
+ };
+ }
}
public class ScheduleMatch : DrawableTournamentMatch
diff --git a/osu.Game.Tournament/Screens/Showcase/ShowcaseScreen.cs b/osu.Game.Tournament/Screens/Showcase/ShowcaseScreen.cs
index 9785b7e647..32d458e191 100644
--- a/osu.Game.Tournament/Screens/Showcase/ShowcaseScreen.cs
+++ b/osu.Game.Tournament/Screens/Showcase/ShowcaseScreen.cs
@@ -2,10 +2,12 @@
// See the LICENCE file in the repository root for full licence text.
using osu.Framework.Allocation;
+using osu.Framework.Bindables;
using osu.Framework.Graphics;
using osu.Framework.Graphics.Containers;
using osu.Game.Tournament.Components;
using osu.Framework.Graphics.Shapes;
+using osu.Game.Tournament.Models;
using osuTK.Graphics;
namespace osu.Game.Tournament.Screens.Showcase
@@ -39,5 +41,11 @@ namespace osu.Game.Tournament.Screens.Showcase
}
});
}
+
+ protected override void CurrentMatchChanged(ValueChangedEvent<TournamentMatch> match)
+ {
+ // showcase screen doesn't care about a match being selected.
+ // base call intentionally omitted to not show match warning.
+ }
}
}
diff --git a/osu.Game.Tournament/Screens/TeamIntro/SeedingScreen.cs b/osu.Game.Tournament/Screens/TeamIntro/SeedingScreen.cs
index 4f66d89b7f..3a0bd232b0 100644
--- a/osu.Game.Tournament/Screens/TeamIntro/SeedingScreen.cs
+++ b/osu.Game.Tournament/Screens/TeamIntro/SeedingScreen.cs
@@ -18,12 +18,10 @@ using osuTK;
namespace osu.Game.Tournament.Screens.TeamIntro
{
- public class SeedingScreen : TournamentScreen, IProvideVideo
+ public class SeedingScreen : TournamentMatchScreen, IProvideVideo
{
private Container mainContainer;
- private readonly Bindable<TournamentMatch> currentMatch = new Bindable<TournamentMatch>();
-
private readonly Bindable<TournamentTeam> currentTeam = new Bindable<TournamentTeam>();
[BackgroundDependencyLoader]
@@ -50,13 +48,13 @@ namespace osu.Game.Tournament.Screens.TeamIntro
{
RelativeSizeAxes = Axes.X,
Text = "Show first team",
- Action = () => currentTeam.Value = currentMatch.Value.Team1.Value,
+ Action = () => currentTeam.Value = CurrentMatch.Value.Team1.Value,
},
new TourneyButton
{
RelativeSizeAxes = Axes.X,
Text = "Show second team",
- Action = () => currentTeam.Value = currentMatch.Value.Team2.Value,
+ Action = () => currentTeam.Value = CurrentMatch.Value.Team2.Value,
},
new SettingsTeamDropdown(LadderInfo.Teams)
{
@@ -67,9 +65,6 @@ namespace osu.Game.Tournament.Screens.TeamIntro
}
};
- currentMatch.BindValueChanged(matchChanged);
- currentMatch.BindTo(LadderInfo.CurrentMatch);
-
currentTeam.BindValueChanged(teamChanged, true);
}
@@ -84,8 +79,15 @@ namespace osu.Game.Tournament.Screens.TeamIntro
showTeam(team.NewValue);
}
- private void matchChanged(ValueChangedEvent<TournamentMatch> match) =>
- currentTeam.Value = currentMatch.Value.Team1.Value;
+ protected override void CurrentMatchChanged(ValueChangedEvent<TournamentMatch> match)
+ {
+ base.CurrentMatchChanged(match);
+
+ if (match.NewValue == null)
+ return;
+
+ currentTeam.Value = match.NewValue.Team1.Value;
+ }
private void showTeam(TournamentTeam team)
{
@@ -179,44 +181,48 @@ namespace osu.Game.Tournament.Screens.TeamIntro
[BackgroundDependencyLoader]
private void load(TextureStore textures)
{
+ FillFlowContainer row;
+
InternalChildren = new Drawable[]
{
- new FillFlowContainer
+ row = new FillFlowContainer
{
AutoSizeAxes = Axes.Both,
Direction = FillDirection.Horizontal,
Spacing = new Vector2(5),
- Children = new Drawable[]
- {
- new Sprite
- {
- Texture = textures.Get($"mods/{mods.ToLower()}"),
- Scale = new Vector2(0.5f)
- },
- new Container
- {
- Size = new Vector2(50, 16),
- CornerRadius = 10,
- Masking = true,
- Children = new Drawable[]
- {
- new Box
- {
- RelativeSizeAxes = Axes.Both,
- Colour = TournamentGame.ELEMENT_BACKGROUND_COLOUR,
- },
- new TournamentSpriteText
- {
- Anchor = Anchor.Centre,
- Origin = Anchor.Centre,
- Text = seeding.ToString("#,0"),
- Colour = TournamentGame.ELEMENT_FOREGROUND_COLOUR
- },
- }
- },
- }
},
};
+
+ if (!string.IsNullOrEmpty(mods))
+ {
+ row.Add(new Sprite
+ {
+ Texture = textures.Get($"mods/{mods.ToLower()}"),
+ Scale = new Vector2(0.5f)
+ });
+ }
+
+ row.Add(new Container
+ {
+ Size = new Vector2(50, 16),
+ CornerRadius = 10,
+ Masking = true,
+ Children = new Drawable[]
+ {
+ new Box
+ {
+ RelativeSizeAxes = Axes.Both,
+ Colour = TournamentGame.ELEMENT_BACKGROUND_COLOUR,
+ },
+ new TournamentSpriteText
+ {
+ Anchor = Anchor.Centre,
+ Origin = Anchor.Centre,
+ Text = seeding.ToString("#,0"),
+ Colour = TournamentGame.ELEMENT_FOREGROUND_COLOUR
+ },
+ }
+ });
}
}
}
diff --git a/osu.Game.Tournament/Screens/TeamIntro/TeamIntroScreen.cs b/osu.Game.Tournament/Screens/TeamIntro/TeamIntroScreen.cs
index 6c2848897b..74957cbca5 100644
--- a/osu.Game.Tournament/Screens/TeamIntro/TeamIntroScreen.cs
+++ b/osu.Game.Tournament/Screens/TeamIntro/TeamIntroScreen.cs
@@ -12,12 +12,10 @@ using osuTK;
namespace osu.Game.Tournament.Screens.TeamIntro
{
- public class TeamIntroScreen : TournamentScreen, IProvideVideo
+ public class TeamIntroScreen : TournamentMatchScreen, IProvideVideo
{
private Container mainContainer;
- private readonly Bindable<TournamentMatch> currentMatch = new Bindable<TournamentMatch>();
-
[BackgroundDependencyLoader]
private void load(Storage storage)
{
@@ -35,18 +33,16 @@ namespace osu.Game.Tournament.Screens.TeamIntro
RelativeSizeAxes = Axes.Both,
}
};
-
- currentMatch.BindValueChanged(matchChanged);
- currentMatch.BindTo(LadderInfo.CurrentMatch);
}
- private void matchChanged(ValueChangedEvent<TournamentMatch> match)
+ protected override void CurrentMatchChanged(ValueChangedEvent<TournamentMatch> match)
{
+ base.CurrentMatchChanged(match);
+
+ mainContainer.Clear();
+
if (match.NewValue == null)
- {
- mainContainer.Clear();
return;
- }
const float y_flag_offset = 292;
diff --git a/osu.Game.Tournament/Screens/TeamWin/TeamWinScreen.cs b/osu.Game.Tournament/Screens/TeamWin/TeamWinScreen.cs
index 7ca262a2e8..ebe2908b74 100644
--- a/osu.Game.Tournament/Screens/TeamWin/TeamWinScreen.cs
+++ b/osu.Game.Tournament/Screens/TeamWin/TeamWinScreen.cs
@@ -13,11 +13,10 @@ using osuTK;
namespace osu.Game.Tournament.Screens.TeamWin
{
- public class TeamWinScreen : TournamentScreen, IProvideVideo
+ public class TeamWinScreen : TournamentMatchScreen, IProvideVideo
{
private Container mainContainer;
- private readonly Bindable<TournamentMatch> currentMatch = new Bindable<TournamentMatch>();
private readonly Bindable<bool> currentCompleted = new Bindable<bool>();
private TourneyVideo blueWinVideo;
@@ -48,17 +47,19 @@ namespace osu.Game.Tournament.Screens.TeamWin
}
};
- currentMatch.BindValueChanged(matchChanged);
- currentMatch.BindTo(ladder.CurrentMatch);
-
currentCompleted.BindValueChanged(_ => update());
}
- private void matchChanged(ValueChangedEvent<TournamentMatch> match)
+ protected override void CurrentMatchChanged(ValueChangedEvent<TournamentMatch> match)
{
- currentCompleted.UnbindBindings();
- currentCompleted.BindTo(match.NewValue.Completed);
+ base.CurrentMatchChanged(match);
+ currentCompleted.UnbindBindings();
+
+ if (match.NewValue == null)
+ return;
+
+ currentCompleted.BindTo(match.NewValue.Completed);
update();
}
@@ -66,7 +67,7 @@ namespace osu.Game.Tournament.Screens.TeamWin
private void update() => Schedule(() =>
{
- var match = currentMatch.Value;
+ var match = CurrentMatch.Value;
if (match.Winner == null)
{
diff --git a/osu.Game.Tournament/Screens/TournamentMatchScreen.cs b/osu.Game.Tournament/Screens/TournamentMatchScreen.cs
new file mode 100644
index 0000000000..5f00036653
--- /dev/null
+++ b/osu.Game.Tournament/Screens/TournamentMatchScreen.cs
@@ -0,0 +1,34 @@
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// See the LICENCE file in the repository root for full licence text.
+
+using osu.Framework.Bindables;
+using osu.Game.Tournament.Models;
+
+namespace osu.Game.Tournament.Screens
+{
+ public abstract class TournamentMatchScreen : TournamentScreen
+ {
+ protected readonly Bindable<TournamentMatch> CurrentMatch = new Bindable<TournamentMatch>();
+ private WarningBox noMatchWarning;
+
+ protected override void LoadComplete()
+ {
+ base.LoadComplete();
+
+ CurrentMatch.BindTo(LadderInfo.CurrentMatch);
+ CurrentMatch.BindValueChanged(CurrentMatchChanged, true);
+ }
+
+ protected virtual void CurrentMatchChanged(ValueChangedEvent<TournamentMatch> match)
+ {
+ if (match.NewValue == null)
+ {
+ AddInternal(noMatchWarning = new WarningBox("Choose a match first from the brackets screen"));
+ return;
+ }
+
+ noMatchWarning?.Expire();
+ noMatchWarning = null;
+ }
+ }
+}
diff --git a/osu.Game.Tournament/TournamentGame.cs b/osu.Game.Tournament/TournamentGame.cs
index 87e23e3404..cd0e601a2f 100644
--- a/osu.Game.Tournament/TournamentGame.cs
+++ b/osu.Game.Tournament/TournamentGame.cs
@@ -97,7 +97,12 @@ namespace osu.Game.Tournament
},
}
},
- heightWarning = new WarningBox("Please make the window wider"),
+ heightWarning = new WarningBox("Please make the window wider")
+ {
+ Anchor = Anchor.BottomCentre,
+ Origin = Anchor.BottomCentre,
+ Margin = new MarginPadding(20),
+ },
new OsuContextMenuContainer
{
RelativeSizeAxes = Axes.Both,
diff --git a/osu.Game/Localisation/BindingSettingsStrings.cs b/osu.Game/Localisation/BindingSettingsStrings.cs
new file mode 100644
index 0000000000..ad4a650a1f
--- /dev/null
+++ b/osu.Game/Localisation/BindingSettingsStrings.cs
@@ -0,0 +1,29 @@
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// See the LICENCE file in the repository root for full licence text.
+
+using osu.Framework.Localisation;
+
+namespace osu.Game.Localisation
+{
+ public static class BindingSettingsStrings
+ {
+ private const string prefix = @"osu.Game.Resources.Localisation.BindingSettings";
+
+ /// <summary>
+ /// "Shortcut and gameplay bindings"
+ /// </summary>
+ public static LocalisableString ShortcutAndGameplayBindings => new TranslatableString(getKey(@"shortcut_and_gameplay_bindings"), @"Shortcut and gameplay bindings");
+
+ /// <summary>
+ /// "Configure"
+ /// </summary>
+ public static LocalisableString Configure => new TranslatableString(getKey(@"configure"), @"Configure");
+
+ /// <summary>
+ /// "change global shortcut keys and gameplay bindings"
+ /// </summary>
+ public static LocalisableString ChangeBindingsButton => new TranslatableString(getKey(@"change_bindings_button"), @"change global shortcut keys and gameplay bindings");
+
+ private static string getKey(string key) => $@"{prefix}:{key}";
+ }
+}
diff --git a/osu.Game/Localisation/CommonStrings.cs b/osu.Game/Localisation/CommonStrings.cs
index 50e01f06fc..bf488d2590 100644
--- a/osu.Game/Localisation/CommonStrings.cs
+++ b/osu.Game/Localisation/CommonStrings.cs
@@ -14,6 +14,21 @@ namespace osu.Game.Localisation
/// </summary>
public static LocalisableString Cancel => new TranslatableString(getKey(@"cancel"), @"Cancel");
- private static string getKey(string key) => $"{prefix}:{key}";
+ /// <summary>
+ /// "Enabled"
+ /// </summary>
+ public static LocalisableString Enabled => new TranslatableString(getKey(@"enabled"), @"Enabled");
+
+ /// <summary>
+ /// "Width"
+ /// </summary>
+ public static LocalisableString Width => new TranslatableString(getKey(@"width"), @"Width");
+
+ /// <summary>
+ /// "Height"
+ /// </summary>
+ public static LocalisableString Height => new TranslatableString(getKey(@"height"), @"Height");
+
+ private static string getKey(string key) => $@"{prefix}:{key}";
}
-}
+}
\ No newline at end of file
diff --git a/osu.Game/Localisation/MouseSettingsStrings.cs b/osu.Game/Localisation/MouseSettingsStrings.cs
new file mode 100644
index 0000000000..9b1f7fe4c5
--- /dev/null
+++ b/osu.Game/Localisation/MouseSettingsStrings.cs
@@ -0,0 +1,59 @@
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// See the LICENCE file in the repository root for full licence text.
+
+using osu.Framework.Localisation;
+
+namespace osu.Game.Localisation
+{
+ public static class MouseSettingsStrings
+ {
+ private const string prefix = @"osu.Game.Resources.Localisation.MouseSettings";
+
+ /// <summary>
+ /// "Mouse"
+ /// </summary>
+ public static LocalisableString Mouse => new TranslatableString(getKey(@"mouse"), @"Mouse");
+
+ /// <summary>
+ /// "Not applicable in full screen mode"
+ /// </summary>
+ public static LocalisableString NotApplicableFullscreen => new TranslatableString(getKey(@"not_applicable_full_screen"), @"Not applicable in full screen mode");
+
+ /// <summary>
+ /// "High precision mouse"
+ /// </summary>
+ public static LocalisableString HighPrecisionMouse => new TranslatableString(getKey(@"high_precision_mouse"), @"High precision mouse");
+
+ /// <summary>
+ /// "Attempts to bypass any operation system mouse acceleration. On windows, this is equivalent to what used to be known as "Raw Input"."
+ /// </summary>
+ public static LocalisableString HighPrecisionMouseTooltip => new TranslatableString(getKey(@"high_precision_mouse_tooltip"), @"Attempts to bypass any operation system mouse acceleration. On windows, this is equivalent to what used to be known as ""Raw Input"".");
+
+ /// <summary>
+ /// "Confine mouse cursor to window"
+ /// </summary>
+ public static LocalisableString ConfineMouseMode => new TranslatableString(getKey(@"confine_mouse_mode"), @"Confine mouse cursor to window");
+
+ /// <summary>
+ /// "Disable mouse wheel during gameplay"
+ /// </summary>
+ public static LocalisableString DisableMouseWheel => new TranslatableString(getKey(@"disable_mouse_wheel"), @"Disable mouse wheel during gameplay");
+
+ /// <summary>
+ /// "Disable mouse buttons during gameplay"
+ /// </summary>
+ public static LocalisableString DisableMouseButtons => new TranslatableString(getKey(@"disable_mouse_buttons"), @"Disable mouse buttons during gameplay");
+
+ /// <summary>
+ /// "Enable high precision mouse to adjust sensitivity"
+ /// </summary>
+ public static LocalisableString EnableHighPrecisionForSensitivityAdjust => new TranslatableString(getKey(@"enable_high_precision_for_sensitivity_adjust"), @"Enable high precision mouse to adjust sensitivity");
+
+ /// <summary>
+ /// "Cursor sensitivity"
+ /// </summary>
+ public static LocalisableString CursorSensitivity => new TranslatableString(getKey(@"cursor_sensitivity"), @"Cursor sensitivity");
+
+ private static string getKey(string key) => $@"{prefix}:{key}";
+ }
+}
diff --git a/osu.Game/Localisation/TabletSettingsStrings.cs b/osu.Game/Localisation/TabletSettingsStrings.cs
new file mode 100644
index 0000000000..5bdca09e4a
--- /dev/null
+++ b/osu.Game/Localisation/TabletSettingsStrings.cs
@@ -0,0 +1,59 @@
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// See the LICENCE file in the repository root for full licence text.
+
+using osu.Framework.Localisation;
+
+namespace osu.Game.Localisation
+{
+ public static class TabletSettingsStrings
+ {
+ private const string prefix = @"osu.Game.Resources.Localisation.TabletSettings";
+
+ /// <summary>
+ /// "Tablet"
+ /// </summary>
+ public static LocalisableString Tablet => new TranslatableString(getKey(@"tablet"), @"Tablet");
+
+ /// <summary>
+ /// "No tablet detected!"
+ /// </summary>
+ public static LocalisableString NoTabletDetected => new TranslatableString(getKey(@"no_tablet_detected"), @"No tablet detected!");
+
+ /// <summary>
+ /// "Reset to full area"
+ /// </summary>
+ public static LocalisableString ResetToFullArea => new TranslatableString(getKey(@"reset_to_full_area"), @"Reset to full area");
+
+ /// <summary>
+ /// "Conform to current game aspect ratio"
+ /// </summary>
+ public static LocalisableString ConformToCurrentGameAspectRatio => new TranslatableString(getKey(@"conform_to_current_game_aspect_ratio"), @"Conform to current game aspect ratio");
+
+ /// <summary>
+ /// "X Offset"
+ /// </summary>
+ public static LocalisableString XOffset => new TranslatableString(getKey(@"x_offset"), @"X Offset");
+
+ /// <summary>
+ /// "Y Offset"
+ /// </summary>
+ public static LocalisableString YOffset => new TranslatableString(getKey(@"y_offset"), @"Y Offset");
+
+ /// <summary>
+ /// "Rotation"
+ /// </summary>
+ public static LocalisableString Rotation => new TranslatableString(getKey(@"rotation"), @"Rotation");
+
+ /// <summary>
+ /// "Aspect Ratio"
+ /// </summary>
+ public static LocalisableString AspectRatio => new TranslatableString(getKey(@"aspect_ratio"), @"Aspect Ratio");
+
+ /// <summary>
+ /// "Lock aspect ratio"
+ /// </summary>
+ public static LocalisableString LockAspectRatio => new TranslatableString(getKey(@"lock_aspect_ratio"), @"Lock aspect ratio");
+
+ private static string getKey(string key) => $@"{prefix}:{key}";
+ }
+}
\ No newline at end of file
diff --git a/osu.Game/Overlays/KeyBinding/GlobalKeyBindingsSection.cs b/osu.Game/Overlays/KeyBinding/GlobalKeyBindingsSection.cs
index c905397e77..6ea4209cce 100644
--- a/osu.Game/Overlays/KeyBinding/GlobalKeyBindingsSection.cs
+++ b/osu.Game/Overlays/KeyBinding/GlobalKeyBindingsSection.cs
@@ -3,6 +3,7 @@
using osu.Framework.Graphics;
using osu.Framework.Graphics.Sprites;
+using osu.Framework.Localisation;
using osu.Game.Input.Bindings;
using osu.Game.Overlays.Settings;
@@ -28,7 +29,7 @@ namespace osu.Game.Overlays.KeyBinding
private class DefaultBindingsSubsection : KeyBindingsSubsection
{
- protected override string Header => string.Empty;
+ protected override LocalisableString Header => string.Empty;
public DefaultBindingsSubsection(GlobalActionContainer manager)
: base(null)
@@ -39,7 +40,7 @@ namespace osu.Game.Overlays.KeyBinding
private class SongSelectKeyBindingSubsection : KeyBindingsSubsection
{
- protected override string Header => "Song Select";
+ protected override LocalisableString Header => "Song Select";
public SongSelectKeyBindingSubsection(GlobalActionContainer manager)
: base(null)
@@ -50,7 +51,7 @@ namespace osu.Game.Overlays.KeyBinding
private class InGameKeyBindingsSubsection : KeyBindingsSubsection
{
- protected override string Header => "In Game";
+ protected override LocalisableString Header => "In Game";
public InGameKeyBindingsSubsection(GlobalActionContainer manager)
: base(null)
@@ -61,7 +62,7 @@ namespace osu.Game.Overlays.KeyBinding
private class AudioControlKeyBindingsSubsection : KeyBindingsSubsection
{
- protected override string Header => "Audio";
+ protected override LocalisableString Header => "Audio";
public AudioControlKeyBindingsSubsection(GlobalActionContainer manager)
: base(null)
@@ -72,7 +73,7 @@ namespace osu.Game.Overlays.KeyBinding
private class EditorKeyBindingsSubsection : KeyBindingsSubsection
{
- protected override string Header => "Editor";
+ protected override LocalisableString Header => "Editor";
public EditorKeyBindingsSubsection(GlobalActionContainer manager)
: base(null)
diff --git a/osu.Game/Overlays/KeyBinding/VariantBindingsSubsection.cs b/osu.Game/Overlays/KeyBinding/VariantBindingsSubsection.cs
index 861d59c8f4..7618a42282 100644
--- a/osu.Game/Overlays/KeyBinding/VariantBindingsSubsection.cs
+++ b/osu.Game/Overlays/KeyBinding/VariantBindingsSubsection.cs
@@ -1,13 +1,14 @@
// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
// See the LICENCE file in the repository root for full licence text.
+using osu.Framework.Localisation;
using osu.Game.Rulesets;
namespace osu.Game.Overlays.KeyBinding
{
public class VariantBindingsSubsection : KeyBindingsSubsection
{
- protected override string Header { get; }
+ protected override LocalisableString Header { get; }
public VariantBindingsSubsection(RulesetInfo ruleset, int variant)
: base(variant)
diff --git a/osu.Game/Overlays/Settings/Sections/Audio/AudioDevicesSettings.cs b/osu.Game/Overlays/Settings/Sections/Audio/AudioDevicesSettings.cs
index b31e7dc45b..d64f176468 100644
--- a/osu.Game/Overlays/Settings/Sections/Audio/AudioDevicesSettings.cs
+++ b/osu.Game/Overlays/Settings/Sections/Audio/AudioDevicesSettings.cs
@@ -13,7 +13,7 @@ namespace osu.Game.Overlays.Settings.Sections.Audio
{
public class AudioDevicesSettings : SettingsSubsection
{
- protected override string Header => "Devices";
+ protected override LocalisableString Header => "Devices";
[Resolved]
private AudioManager audio { get; set; }
diff --git a/osu.Game/Overlays/Settings/Sections/Audio/OffsetSettings.cs b/osu.Game/Overlays/Settings/Sections/Audio/OffsetSettings.cs
index 1ae297f2a9..7f2e377c83 100644
--- a/osu.Game/Overlays/Settings/Sections/Audio/OffsetSettings.cs
+++ b/osu.Game/Overlays/Settings/Sections/Audio/OffsetSettings.cs
@@ -11,7 +11,7 @@ namespace osu.Game.Overlays.Settings.Sections.Audio
{
public class OffsetSettings : SettingsSubsection
{
- protected override string Header => "Offset Adjustment";
+ protected override LocalisableString Header => "Offset Adjustment";
[BackgroundDependencyLoader]
private void load(OsuConfigManager config)
diff --git a/osu.Game/Overlays/Settings/Sections/Audio/VolumeSettings.cs b/osu.Game/Overlays/Settings/Sections/Audio/VolumeSettings.cs
index c172a76ab9..8f88b03471 100644
--- a/osu.Game/Overlays/Settings/Sections/Audio/VolumeSettings.cs
+++ b/osu.Game/Overlays/Settings/Sections/Audio/VolumeSettings.cs
@@ -4,13 +4,14 @@
using osu.Framework.Allocation;
using osu.Framework.Audio;
using osu.Framework.Graphics;
+using osu.Framework.Localisation;
using osu.Game.Configuration;
namespace osu.Game.Overlays.Settings.Sections.Audio
{
public class VolumeSettings : SettingsSubsection
{
- protected override string Header => "Volume";
+ protected override LocalisableString Header => "Volume";
[BackgroundDependencyLoader]
private void load(AudioManager audio, OsuConfigManager config)
diff --git a/osu.Game/Overlays/Settings/Sections/Debug/GeneralSettings.cs b/osu.Game/Overlays/Settings/Sections/Debug/GeneralSettings.cs
index 4a9c9bd8a2..2b868cab85 100644
--- a/osu.Game/Overlays/Settings/Sections/Debug/GeneralSettings.cs
+++ b/osu.Game/Overlays/Settings/Sections/Debug/GeneralSettings.cs
@@ -4,6 +4,7 @@
using osu.Framework.Allocation;
using osu.Framework.Configuration;
using osu.Framework.Graphics;
+using osu.Framework.Localisation;
using osu.Framework.Screens;
using osu.Game.Screens.Import;
@@ -11,7 +12,7 @@ namespace osu.Game.Overlays.Settings.Sections.Debug
{
public class GeneralSettings : SettingsSubsection
{
- protected override string Header => "General";
+ protected override LocalisableString Header => "General";
[BackgroundDependencyLoader(true)]
private void load(FrameworkDebugConfigManager config, FrameworkConfigManager frameworkConfig, OsuGame game)
diff --git a/osu.Game/Overlays/Settings/Sections/Debug/MemorySettings.cs b/osu.Game/Overlays/Settings/Sections/Debug/MemorySettings.cs
index db64c9a8ac..bf7fb351c0 100644
--- a/osu.Game/Overlays/Settings/Sections/Debug/MemorySettings.cs
+++ b/osu.Game/Overlays/Settings/Sections/Debug/MemorySettings.cs
@@ -4,13 +4,14 @@
using osu.Framework.Allocation;
using osu.Framework.Configuration;
using osu.Framework.Graphics;
+using osu.Framework.Localisation;
using osu.Framework.Platform;
namespace osu.Game.Overlays.Settings.Sections.Debug
{
public class MemorySettings : SettingsSubsection
{
- protected override string Header => "Memory";
+ protected override LocalisableString Header => "Memory";
[BackgroundDependencyLoader]
private void load(FrameworkDebugConfigManager config, GameHost host)
diff --git a/osu.Game/Overlays/Settings/Sections/Gameplay/GeneralSettings.cs b/osu.Game/Overlays/Settings/Sections/Gameplay/GeneralSettings.cs
index 0b5ec4f338..353292606f 100644
--- a/osu.Game/Overlays/Settings/Sections/Gameplay/GeneralSettings.cs
+++ b/osu.Game/Overlays/Settings/Sections/Gameplay/GeneralSettings.cs
@@ -4,6 +4,7 @@
using osu.Framework;
using osu.Framework.Allocation;
using osu.Framework.Graphics;
+using osu.Framework.Localisation;
using osu.Game.Configuration;
using osu.Game.Rulesets.Scoring;
@@ -11,7 +12,7 @@ namespace osu.Game.Overlays.Settings.Sections.Gameplay
{
public class GeneralSettings : SettingsSubsection
{
- protected override string Header => "General";
+ protected override LocalisableString Header => "General";
[BackgroundDependencyLoader]
private void load(OsuConfigManager config)
diff --git a/osu.Game/Overlays/Settings/Sections/Gameplay/ModsSettings.cs b/osu.Game/Overlays/Settings/Sections/Gameplay/ModsSettings.cs
index 2b2fb9cef7..ec9ddde2da 100644
--- a/osu.Game/Overlays/Settings/Sections/Gameplay/ModsSettings.cs
+++ b/osu.Game/Overlays/Settings/Sections/Gameplay/ModsSettings.cs
@@ -4,13 +4,14 @@
using System.Collections.Generic;
using System.Linq;
using osu.Framework.Allocation;
+using osu.Framework.Localisation;
using osu.Game.Configuration;
namespace osu.Game.Overlays.Settings.Sections.Gameplay
{
public class ModsSettings : SettingsSubsection
{
- protected override string Header => "Mods";
+ protected override LocalisableString Header => "Mods";
public override IEnumerable<string> FilterTerms => base.FilterTerms.Concat(new[] { "mod" });
diff --git a/osu.Game/Overlays/Settings/Sections/General/LanguageSettings.cs b/osu.Game/Overlays/Settings/Sections/General/LanguageSettings.cs
index dfcdb8e340..c6c752e2fd 100644
--- a/osu.Game/Overlays/Settings/Sections/General/LanguageSettings.cs
+++ b/osu.Game/Overlays/Settings/Sections/General/LanguageSettings.cs
@@ -5,6 +5,7 @@ using osu.Framework.Allocation;
using osu.Framework.Bindables;
using osu.Framework.Configuration;
using osu.Framework.Graphics;
+using osu.Framework.Localisation;
using osu.Game.Extensions;
using osu.Game.Localisation;
@@ -15,7 +16,7 @@ namespace osu.Game.Overlays.Settings.Sections.General
private SettingsDropdown<Language> languageSelection;
private Bindable<string> frameworkLocale;
- protected override string Header => "Language";
+ protected override LocalisableString Header => "Language";
[BackgroundDependencyLoader]
private void load(FrameworkConfigManager frameworkConfig)
diff --git a/osu.Game/Overlays/Settings/Sections/General/UpdateSettings.cs b/osu.Game/Overlays/Settings/Sections/General/UpdateSettings.cs
index c213313559..dd20e1d7ef 100644
--- a/osu.Game/Overlays/Settings/Sections/General/UpdateSettings.cs
+++ b/osu.Game/Overlays/Settings/Sections/General/UpdateSettings.cs
@@ -5,6 +5,7 @@ using System.Threading.Tasks;
using osu.Framework;
using osu.Framework.Allocation;
using osu.Framework.Graphics.Sprites;
+using osu.Framework.Localisation;
using osu.Framework.Platform;
using osu.Framework.Screens;
using osu.Game.Configuration;
@@ -19,7 +20,7 @@ namespace osu.Game.Overlays.Settings.Sections.General
[Resolved(CanBeNull = true)]
private UpdateManager updateManager { get; set; }
- protected override string Header => "Updates";
+ protected override LocalisableString Header => "Updates";
private SettingsButton checkForUpdatesButton;
diff --git a/osu.Game/Overlays/Settings/Sections/Graphics/DetailSettings.cs b/osu.Game/Overlays/Settings/Sections/Graphics/DetailSettings.cs
index 30caa45995..f889cfca0f 100644
--- a/osu.Game/Overlays/Settings/Sections/Graphics/DetailSettings.cs
+++ b/osu.Game/Overlays/Settings/Sections/Graphics/DetailSettings.cs
@@ -3,13 +3,14 @@
using osu.Framework.Allocation;
using osu.Framework.Graphics;
+using osu.Framework.Localisation;
using osu.Game.Configuration;
namespace osu.Game.Overlays.Settings.Sections.Graphics
{
public class DetailSettings : SettingsSubsection
{
- protected override string Header => "Detail Settings";
+ protected override LocalisableString Header => "Detail Settings";
[BackgroundDependencyLoader]
private void load(OsuConfigManager config)
diff --git a/osu.Game/Overlays/Settings/Sections/Graphics/LayoutSettings.cs b/osu.Game/Overlays/Settings/Sections/Graphics/LayoutSettings.cs
index 669753d2cb..91208cb78a 100644
--- a/osu.Game/Overlays/Settings/Sections/Graphics/LayoutSettings.cs
+++ b/osu.Game/Overlays/Settings/Sections/Graphics/LayoutSettings.cs
@@ -22,7 +22,7 @@ namespace osu.Game.Overlays.Settings.Sections.Graphics
{
public class LayoutSettings : SettingsSubsection
{
- protected override string Header => "Layout";
+ protected override LocalisableString Header => "Layout";
private FillFlowContainer<SettingsSlider<float>> scalingSettings;
diff --git a/osu.Game/Overlays/Settings/Sections/Graphics/RendererSettings.cs b/osu.Game/Overlays/Settings/Sections/Graphics/RendererSettings.cs
index 70225ff6b8..2210c7911e 100644
--- a/osu.Game/Overlays/Settings/Sections/Graphics/RendererSettings.cs
+++ b/osu.Game/Overlays/Settings/Sections/Graphics/RendererSettings.cs
@@ -4,6 +4,7 @@
using osu.Framework.Allocation;
using osu.Framework.Configuration;
using osu.Framework.Graphics;
+using osu.Framework.Localisation;
using osu.Framework.Platform;
using osu.Game.Configuration;
@@ -11,7 +12,7 @@ namespace osu.Game.Overlays.Settings.Sections.Graphics
{
public class RendererSettings : SettingsSubsection
{
- protected override string Header => "Renderer";
+ protected override LocalisableString Header => "Renderer";
private SettingsEnumDropdown<FrameSync> frameLimiterDropdown;
diff --git a/osu.Game/Overlays/Settings/Sections/Input/BindingSettings.cs b/osu.Game/Overlays/Settings/Sections/Input/BindingSettings.cs
index 79c73863cf..3227decc46 100644
--- a/osu.Game/Overlays/Settings/Sections/Input/BindingSettings.cs
+++ b/osu.Game/Overlays/Settings/Sections/Input/BindingSettings.cs
@@ -2,12 +2,14 @@
// See the LICENCE file in the repository root for full licence text.
using osu.Framework.Graphics;
+using osu.Framework.Localisation;
+using osu.Game.Localisation;
namespace osu.Game.Overlays.Settings.Sections.Input
{
public class BindingSettings : SettingsSubsection
{
- protected override string Header => "Shortcut and gameplay bindings";
+ protected override LocalisableString Header => BindingSettingsStrings.ShortcutAndGameplayBindings;
public BindingSettings(KeyBindingPanel keyConfig)
{
@@ -15,8 +17,8 @@ namespace osu.Game.Overlays.Settings.Sections.Input
{
new SettingsButton
{
- Text = "Configure",
- TooltipText = "change global shortcut keys and gameplay bindings",
+ Text = BindingSettingsStrings.Configure,
+ TooltipText = BindingSettingsStrings.ChangeBindingsButton,
Action = keyConfig.ToggleVisibility
},
};
diff --git a/osu.Game/Overlays/Settings/Sections/Input/MouseSettings.cs b/osu.Game/Overlays/Settings/Sections/Input/MouseSettings.cs
index e87572e2ca..753096a207 100644
--- a/osu.Game/Overlays/Settings/Sections/Input/MouseSettings.cs
+++ b/osu.Game/Overlays/Settings/Sections/Input/MouseSettings.cs
@@ -10,6 +10,7 @@ using osu.Framework.Localisation;
using osu.Game.Configuration;
using osu.Game.Graphics.UserInterface;
using osu.Game.Input;
+using osu.Game.Localisation;
namespace osu.Game.Overlays.Settings.Sections.Input
{
@@ -17,7 +18,7 @@ namespace osu.Game.Overlays.Settings.Sections.Input
{
private readonly MouseHandler mouseHandler;
- protected override string Header => "Mouse";
+ protected override LocalisableString Header => MouseSettingsStrings.Mouse;
private Bindable<double> handlerSensitivity;
@@ -46,27 +47,29 @@ namespace osu.Game.Overlays.Settings.Sections.Input
{
new SettingsCheckbox
{
- LabelText = "High precision mouse",
- Current = relativeMode
+ LabelText = MouseSettingsStrings.HighPrecisionMouse,
+ TooltipText = MouseSettingsStrings.HighPrecisionMouseTooltip,
+ Current = relativeMode,
+ Keywords = new[] { @"raw", @"input", @"relative", @"cursor" }
},
new SensitivitySetting
{
- LabelText = "Cursor sensitivity",
+ LabelText = MouseSettingsStrings.CursorSensitivity,
Current = localSensitivity
},
confineMouseModeSetting = new SettingsEnumDropdown<OsuConfineMouseMode>
{
- LabelText = "Confine mouse cursor to window",
+ LabelText = MouseSettingsStrings.ConfineMouseMode,
Current = osuConfig.GetBindable<OsuConfineMouseMode>(OsuSetting.ConfineMouseMode)
},
new SettingsCheckbox
{
- LabelText = "Disable mouse wheel during gameplay",
+ LabelText = MouseSettingsStrings.DisableMouseWheel,
Current = osuConfig.GetBindable<bool>(OsuSetting.MouseDisableWheel)
},
new SettingsCheckbox
{
- LabelText = "Disable mouse buttons during gameplay",
+ LabelText = MouseSettingsStrings.DisableMouseButtons,
Current = osuConfig.GetBindable<bool>(OsuSetting.MouseDisableButtons)
},
};
@@ -96,7 +99,7 @@ namespace osu.Game.Overlays.Settings.Sections.Input
if (isFullscreen)
{
confineMouseModeSetting.Current.Disabled = true;
- confineMouseModeSetting.TooltipText = "Not applicable in full screen mode";
+ confineMouseModeSetting.TooltipText = MouseSettingsStrings.NotApplicableFullscreen;
}
else
{
@@ -117,7 +120,7 @@ namespace osu.Game.Overlays.Settings.Sections.Input
private class SensitivitySlider : OsuSliderBar<double>
{
- public override LocalisableString TooltipText => Current.Disabled ? "enable high precision mouse to adjust sensitivity" : $"{base.TooltipText}x";
+ public override LocalisableString TooltipText => Current.Disabled ? MouseSettingsStrings.EnableHighPrecisionForSensitivityAdjust : $"{base.TooltipText}x";
}
}
}
diff --git a/osu.Game/Overlays/Settings/Sections/Input/RotationPresetButtons.cs b/osu.Game/Overlays/Settings/Sections/Input/RotationPresetButtons.cs
index 3e8da9f7d0..26610628d5 100644
--- a/osu.Game/Overlays/Settings/Sections/Input/RotationPresetButtons.cs
+++ b/osu.Game/Overlays/Settings/Sections/Input/RotationPresetButtons.cs
@@ -36,7 +36,7 @@ namespace osu.Game.Overlays.Settings.Sections.Input
RelativeSizeAxes = Axes.X,
Height = height,
Width = 0.25f,
- Text = $"{presetRotation}º",
+ Text = $@"{presetRotation}º",
Action = () => tabletHandler.Rotation.Value = presetRotation,
});
}
diff --git a/osu.Game/Overlays/Settings/Sections/Input/TabletSettings.cs b/osu.Game/Overlays/Settings/Sections/Input/TabletSettings.cs
index d770c18878..c7342c251d 100644
--- a/osu.Game/Overlays/Settings/Sections/Input/TabletSettings.cs
+++ b/osu.Game/Overlays/Settings/Sections/Input/TabletSettings.cs
@@ -6,10 +6,12 @@ using osu.Framework.Bindables;
using osu.Framework.Graphics;
using osu.Framework.Graphics.Containers;
using osu.Framework.Input.Handlers.Tablet;
+using osu.Framework.Localisation;
using osu.Framework.Platform;
using osu.Framework.Threading;
using osu.Game.Graphics.Sprites;
using osuTK;
+using osu.Game.Localisation;
namespace osu.Game.Overlays.Settings.Sections.Input
{
@@ -52,7 +54,7 @@ namespace osu.Game.Overlays.Settings.Sections.Input
private OsuSpriteText noTabletMessage;
- protected override string Header => "Tablet";
+ protected override LocalisableString Header => TabletSettingsStrings.Tablet;
public TabletSettings(ITabletHandler tabletHandler)
{
@@ -66,14 +68,14 @@ namespace osu.Game.Overlays.Settings.Sections.Input
{
new SettingsCheckbox
{
- LabelText = "Enabled",
+ LabelText = CommonStrings.Enabled,
Anchor = Anchor.TopCentre,
Origin = Anchor.TopCentre,
Current = tabletHandler.Enabled
},
noTabletMessage = new OsuSpriteText
{
- Text = "No tablet detected!",
+ Text = TabletSettingsStrings.NoTabletDetected,
Anchor = Anchor.TopCentre,
Origin = Anchor.TopCentre,
Padding = new MarginPadding { Horizontal = SettingsPanel.CONTENT_MARGINS }
@@ -94,7 +96,7 @@ namespace osu.Game.Overlays.Settings.Sections.Input
},
new DangerousSettingsButton
{
- Text = "Reset to full area",
+ Text = TabletSettingsStrings.ResetToFullArea,
Action = () =>
{
aspectLock.Value = false;
@@ -105,7 +107,7 @@ namespace osu.Game.Overlays.Settings.Sections.Input
},
new SettingsButton
{
- Text = "Conform to current game aspect ratio",
+ Text = TabletSettingsStrings.ConformToCurrentGameAspectRatio,
Action = () =>
{
forceAspectRatio((float)host.Window.ClientSize.Width / host.Window.ClientSize.Height);
@@ -114,43 +116,43 @@ namespace osu.Game.Overlays.Settings.Sections.Input
new SettingsSlider<float>
{
TransferValueOnCommit = true,
- LabelText = "X Offset",
+ LabelText = TabletSettingsStrings.XOffset,
Current = offsetX
},
new SettingsSlider<float>
{
TransferValueOnCommit = true,
- LabelText = "Y Offset",
+ LabelText = TabletSettingsStrings.YOffset,
Current = offsetY
},
new SettingsSlider<float>
{
TransferValueOnCommit = true,
- LabelText = "Rotation",
+ LabelText = TabletSettingsStrings.Rotation,
Current = rotation
},
new RotationPresetButtons(tabletHandler),
new SettingsSlider<float>
{
TransferValueOnCommit = true,
- LabelText = "Aspect Ratio",
+ LabelText = TabletSettingsStrings.AspectRatio,
Current = aspectRatio
},
new SettingsCheckbox
{
- LabelText = "Lock aspect ratio",
+ LabelText = TabletSettingsStrings.LockAspectRatio,
Current = aspectLock
},
new SettingsSlider<float>
{
TransferValueOnCommit = true,
- LabelText = "Width",
+ LabelText = CommonStrings.Width,
Current = sizeX
},
new SettingsSlider<float>
{
TransferValueOnCommit = true,
- LabelText = "Height",
+ LabelText = CommonStrings.Height,
Current = sizeY
},
}
diff --git a/osu.Game/Overlays/Settings/Sections/InputSection.cs b/osu.Game/Overlays/Settings/Sections/InputSection.cs
index 6e99891794..366f39388a 100644
--- a/osu.Game/Overlays/Settings/Sections/InputSection.cs
+++ b/osu.Game/Overlays/Settings/Sections/InputSection.cs
@@ -9,6 +9,7 @@ using osu.Framework.Input.Handlers.Joystick;
using osu.Framework.Input.Handlers.Midi;
using osu.Framework.Input.Handlers.Mouse;
using osu.Framework.Input.Handlers.Tablet;
+using osu.Framework.Localisation;
using osu.Framework.Platform;
using osu.Game.Overlays.Settings.Sections.Input;
@@ -100,7 +101,7 @@ namespace osu.Game.Overlays.Settings.Sections
};
}
- protected override string Header => handler.Description;
+ protected override LocalisableString Header => handler.Description;
}
}
}
diff --git a/osu.Game/Overlays/Settings/Sections/Maintenance/GeneralSettings.cs b/osu.Game/Overlays/Settings/Sections/Maintenance/GeneralSettings.cs
index a38ca81e23..b9a408b1f8 100644
--- a/osu.Game/Overlays/Settings/Sections/Maintenance/GeneralSettings.cs
+++ b/osu.Game/Overlays/Settings/Sections/Maintenance/GeneralSettings.cs
@@ -6,6 +6,7 @@ using System.Threading.Tasks;
using JetBrains.Annotations;
using osu.Framework.Allocation;
using osu.Framework.Graphics;
+using osu.Framework.Localisation;
using osu.Game.Beatmaps;
using osu.Game.Collections;
using osu.Game.Database;
@@ -17,7 +18,7 @@ namespace osu.Game.Overlays.Settings.Sections.Maintenance
{
public class GeneralSettings : SettingsSubsection
{
- protected override string Header => "General";
+ protected override LocalisableString Header => "General";
private TriangleButton importBeatmapsButton;
private TriangleButton importScoresButton;
diff --git a/osu.Game/Overlays/Settings/Sections/Online/AlertsAndPrivacySettings.cs b/osu.Game/Overlays/Settings/Sections/Online/AlertsAndPrivacySettings.cs
index b0f6400d4f..3a2de2ee36 100644
--- a/osu.Game/Overlays/Settings/Sections/Online/AlertsAndPrivacySettings.cs
+++ b/osu.Game/Overlays/Settings/Sections/Online/AlertsAndPrivacySettings.cs
@@ -3,13 +3,14 @@
using osu.Framework.Allocation;
using osu.Framework.Graphics;
+using osu.Framework.Localisation;
using osu.Game.Configuration;
namespace osu.Game.Overlays.Settings.Sections.Online
{
public class AlertsAndPrivacySettings : SettingsSubsection
{
- protected override string Header => "Alerts and Privacy";
+ protected override LocalisableString Header => "Alerts and Privacy";
[BackgroundDependencyLoader]
private void load(OsuConfigManager config)
diff --git a/osu.Game/Overlays/Settings/Sections/Online/IntegrationSettings.cs b/osu.Game/Overlays/Settings/Sections/Online/IntegrationSettings.cs
index d2867962c0..f2012f0d9c 100644
--- a/osu.Game/Overlays/Settings/Sections/Online/IntegrationSettings.cs
+++ b/osu.Game/Overlays/Settings/Sections/Online/IntegrationSettings.cs
@@ -3,13 +3,14 @@
using osu.Framework.Allocation;
using osu.Framework.Graphics;
+using osu.Framework.Localisation;
using osu.Game.Configuration;
namespace osu.Game.Overlays.Settings.Sections.Online
{
public class IntegrationSettings : SettingsSubsection
{
- protected override string Header => "Integrations";
+ protected override LocalisableString Header => "Integrations";
[BackgroundDependencyLoader]
private void load(OsuConfigManager config)
diff --git a/osu.Game/Overlays/Settings/Sections/Online/WebSettings.cs b/osu.Game/Overlays/Settings/Sections/Online/WebSettings.cs
index 59bcbe4d89..89e7b096f3 100644
--- a/osu.Game/Overlays/Settings/Sections/Online/WebSettings.cs
+++ b/osu.Game/Overlays/Settings/Sections/Online/WebSettings.cs
@@ -3,13 +3,14 @@
using osu.Framework.Allocation;
using osu.Framework.Graphics;
+using osu.Framework.Localisation;
using osu.Game.Configuration;
namespace osu.Game.Overlays.Settings.Sections.Online
{
public class WebSettings : SettingsSubsection
{
- protected override string Header => "Web";
+ protected override LocalisableString Header => "Web";
[BackgroundDependencyLoader]
private void load(OsuConfigManager config)
diff --git a/osu.Game/Overlays/Settings/Sections/UserInterface/GeneralSettings.cs b/osu.Game/Overlays/Settings/Sections/UserInterface/GeneralSettings.cs
index a6eb008623..4b26645ef3 100644
--- a/osu.Game/Overlays/Settings/Sections/UserInterface/GeneralSettings.cs
+++ b/osu.Game/Overlays/Settings/Sections/UserInterface/GeneralSettings.cs
@@ -11,7 +11,7 @@ namespace osu.Game.Overlays.Settings.Sections.UserInterface
{
public class GeneralSettings : SettingsSubsection
{
- protected override string Header => "General";
+ protected override LocalisableString Header => "General";
[BackgroundDependencyLoader]
private void load(OsuConfigManager config)
diff --git a/osu.Game/Overlays/Settings/Sections/UserInterface/MainMenuSettings.cs b/osu.Game/Overlays/Settings/Sections/UserInterface/MainMenuSettings.cs
index 5f703ed5a4..81bbcbb54a 100644
--- a/osu.Game/Overlays/Settings/Sections/UserInterface/MainMenuSettings.cs
+++ b/osu.Game/Overlays/Settings/Sections/UserInterface/MainMenuSettings.cs
@@ -4,6 +4,7 @@
using osu.Framework.Allocation;
using osu.Framework.Bindables;
using osu.Framework.Graphics;
+using osu.Framework.Localisation;
using osu.Game.Configuration;
using osu.Game.Online.API;
using osu.Game.Users;
@@ -12,7 +13,7 @@ namespace osu.Game.Overlays.Settings.Sections.UserInterface
{
public class MainMenuSettings : SettingsSubsection
{
- protected override string Header => "Main Menu";
+ protected override LocalisableString Header => "Main Menu";
private IBindable<User> user;
diff --git a/osu.Game/Overlays/Settings/Sections/UserInterface/SongSelectSettings.cs b/osu.Game/Overlays/Settings/Sections/UserInterface/SongSelectSettings.cs
index 2470c0a6c5..587155eb0d 100644
--- a/osu.Game/Overlays/Settings/Sections/UserInterface/SongSelectSettings.cs
+++ b/osu.Game/Overlays/Settings/Sections/UserInterface/SongSelectSettings.cs
@@ -16,7 +16,7 @@ namespace osu.Game.Overlays.Settings.Sections.UserInterface
private Bindable<double> minStars;
private Bindable<double> maxStars;
- protected override string Header => "Song Select";
+ protected override LocalisableString Header => "Song Select";
[BackgroundDependencyLoader]
private void load(OsuConfigManager config)
diff --git a/osu.Game/Overlays/Settings/SettingsSubsection.cs b/osu.Game/Overlays/Settings/SettingsSubsection.cs
index 6abf6283b9..df32424b67 100644
--- a/osu.Game/Overlays/Settings/SettingsSubsection.cs
+++ b/osu.Game/Overlays/Settings/SettingsSubsection.cs
@@ -8,6 +8,7 @@ using osu.Game.Graphics.Sprites;
using System.Collections.Generic;
using System.Linq;
using osu.Framework.Allocation;
+using osu.Framework.Localisation;
using osu.Framework.Testing;
using osu.Game.Graphics;
@@ -20,10 +21,10 @@ namespace osu.Game.Overlays.Settings
protected readonly FillFlowContainer FlowContent;
- protected abstract string Header { get; }
+ protected abstract LocalisableString Header { get; }
public IEnumerable<IFilterable> FilterableChildren => Children.OfType<IFilterable>();
- public virtual IEnumerable<string> FilterTerms => new[] { Header };
+ public virtual IEnumerable<string> FilterTerms => new[] { Header.ToString() };
public bool MatchingFilter
{
@@ -54,7 +55,7 @@ namespace osu.Game.Overlays.Settings
{
new OsuSpriteText
{
- Text = Header.ToUpperInvariant(),
+ Text = Header.ToString().ToUpper(), // TODO: Add localisation support after https://github.com/ppy/osu-framework/pull/4603 is merged.
Margin = new MarginPadding { Vertical = 30, Left = SettingsPanel.CONTENT_MARGINS, Right = SettingsPanel.CONTENT_MARGINS },
Font = OsuFont.GetFont(weight: FontWeight.Bold),
},
diff --git a/osu.Game/Overlays/Wiki/Markdown/WikiMarkdownImageBlock.cs b/osu.Game/Overlays/Wiki/Markdown/WikiMarkdownImageBlock.cs
index 1a4f6087c7..501e00bc00 100644
--- a/osu.Game/Overlays/Wiki/Markdown/WikiMarkdownImageBlock.cs
+++ b/osu.Game/Overlays/Wiki/Markdown/WikiMarkdownImageBlock.cs
@@ -14,7 +14,7 @@ namespace osu.Game.Overlays.Wiki.Markdown
public class WikiMarkdownImageBlock : FillFlowContainer
{
[Resolved]
- private IMarkdownTextComponent parentTextComponent { get; set; }
+ private IMarkdownTextFlowComponent parentFlowComponent { get; set; }
private readonly LinkInline linkInline;
@@ -31,16 +31,20 @@ namespace osu.Game.Overlays.Wiki.Markdown
[BackgroundDependencyLoader]
private void load()
{
+ MarkdownTextFlowContainer textFlow;
+
Children = new Drawable[]
{
new BlockMarkdownImage(linkInline),
- parentTextComponent.CreateSpriteText().With(t =>
+ textFlow = parentFlowComponent.CreateTextFlow().With(t =>
{
- t.Text = linkInline.Title;
t.Anchor = Anchor.TopCentre;
t.Origin = Anchor.TopCentre;
+ t.TextAnchor = Anchor.TopCentre;
}),
};
+
+ textFlow.AddText(linkInline.Title);
}
private class BlockMarkdownImage : WikiMarkdownImage
diff --git a/osu.Game/osu.Game.csproj b/osu.Game/osu.Game.csproj
index b2f1d6507f..152ba55e08 100644
--- a/osu.Game/osu.Game.csproj
+++ b/osu.Game/osu.Game.csproj
@@ -31,7 +31,7 @@
<PackageReference Include="Microsoft.Extensions.Configuration.Abstractions" Version="5.0.0" />
<PackageReference Include="Microsoft.NETCore.Targets" Version="3.1.0" />
<PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
- <PackageReference Include="ppy.LocalisationAnalyser" Version="2021.706.0">
+ <PackageReference Include="ppy.LocalisationAnalyser" Version="2021.716.0">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>