diff --git a/osu.Framework/Graphics/UserInterface/BasicDirectorySelector.cs b/osu.Framework/Graphics/UserInterface/BasicDirectorySelector.cs index d0843a243..33d11129e 100644 --- a/osu.Framework/Graphics/UserInterface/BasicDirectorySelector.cs +++ b/osu.Framework/Graphics/UserInterface/BasicDirectorySelector.cs @@ -5,6 +5,7 @@ using System.IO; using osu.Framework.Graphics.Containers; +using osu.Framework.Localisation; using osuTK; namespace osu.Framework.Graphics.UserInterface @@ -20,7 +21,7 @@ namespace osu.Framework.Graphics.UserInterface Action = ShowHiddenItems.Toggle, }; - protected override DirectorySelectorDirectory CreateDirectoryItem(DirectoryInfo directory, string displayName = null) => new BasicDirectorySelectorDirectory(directory, displayName); + protected override DirectorySelectorDirectory CreateDirectoryItem(DirectoryInfo directory, LocalisableString? displayName = null) => new BasicDirectorySelectorDirectory(directory, displayName); protected override DirectorySelectorDirectory CreateParentDirectoryItem(DirectoryInfo directory) => new BasicDirectorySelectorParentDirectory(directory); diff --git a/osu.Framework/Graphics/UserInterface/BasicDirectorySelectorBreadcrumbDisplay.cs b/osu.Framework/Graphics/UserInterface/BasicDirectorySelectorBreadcrumbDisplay.cs index b98baacbf..ee3a8beaa 100644 --- a/osu.Framework/Graphics/UserInterface/BasicDirectorySelectorBreadcrumbDisplay.cs +++ b/osu.Framework/Graphics/UserInterface/BasicDirectorySelectorBreadcrumbDisplay.cs @@ -6,6 +6,7 @@ using System.IO; using osu.Framework.Allocation; using osu.Framework.Graphics.Sprites; +using osu.Framework.Localisation; using osuTK; namespace osu.Framework.Graphics.UserInterface @@ -20,7 +21,7 @@ namespace osu.Framework.Graphics.UserInterface protected override DirectorySelectorDirectory CreateRootDirectoryItem() => new BreadcrumbDisplayComputer(); - protected override DirectorySelectorDirectory CreateDirectoryItem(DirectoryInfo directory, string displayName = null) => new BreadcrumbDisplayDirectory(directory, displayName); + protected override DirectorySelectorDirectory CreateDirectoryItem(DirectoryInfo directory, LocalisableString? displayName = null) => new BreadcrumbDisplayDirectory(directory, displayName); protected partial class BreadcrumbDisplayComputer : BreadcrumbDisplayDirectory { @@ -36,7 +37,7 @@ namespace osu.Framework.Graphics.UserInterface { protected override IconUsage? Icon => Directory.Name.Contains(Path.DirectorySeparatorChar) ? base.Icon : null; - public BreadcrumbDisplayDirectory(DirectoryInfo directory, string displayName = null) + public BreadcrumbDisplayDirectory(DirectoryInfo directory, LocalisableString? displayName = null) : base(directory, displayName) { } diff --git a/osu.Framework/Graphics/UserInterface/BasicDirectorySelectorDirectory.cs b/osu.Framework/Graphics/UserInterface/BasicDirectorySelectorDirectory.cs index 7ab9c2e53..6ad055db7 100644 --- a/osu.Framework/Graphics/UserInterface/BasicDirectorySelectorDirectory.cs +++ b/osu.Framework/Graphics/UserInterface/BasicDirectorySelectorDirectory.cs @@ -5,6 +5,7 @@ using System.IO; using osu.Framework.Graphics.Sprites; +using osu.Framework.Localisation; namespace osu.Framework.Graphics.UserInterface { @@ -19,7 +20,7 @@ namespace osu.Framework.Graphics.UserInterface Font = FrameworkFont.Regular.With(size: FONT_SIZE) }; - public BasicDirectorySelectorDirectory(DirectoryInfo directory, string displayName = null) + public BasicDirectorySelectorDirectory(DirectoryInfo directory, LocalisableString? displayName = null) : base(directory, displayName) { } diff --git a/osu.Framework/Graphics/UserInterface/BasicFileSelector.cs b/osu.Framework/Graphics/UserInterface/BasicFileSelector.cs index 35622d9f6..4d2cd5073 100644 --- a/osu.Framework/Graphics/UserInterface/BasicFileSelector.cs +++ b/osu.Framework/Graphics/UserInterface/BasicFileSelector.cs @@ -6,6 +6,7 @@ using System.IO; using osu.Framework.Graphics.Containers; using osu.Framework.Graphics.Sprites; +using osu.Framework.Localisation; using osuTK; namespace osu.Framework.Graphics.UserInterface @@ -26,7 +27,7 @@ namespace osu.Framework.Graphics.UserInterface Action = ShowHiddenItems.Toggle, }; - protected override DirectorySelectorDirectory CreateDirectoryItem(DirectoryInfo directory, string displayName = null) => new BasicDirectorySelectorDirectory(directory, displayName); + protected override DirectorySelectorDirectory CreateDirectoryItem(DirectoryInfo directory, LocalisableString? displayName = null) => new BasicDirectorySelectorDirectory(directory, displayName); protected override DirectorySelectorDirectory CreateParentDirectoryItem(DirectoryInfo directory) => new BasicDirectorySelectorParentDirectory(directory); diff --git a/osu.Framework/Graphics/UserInterface/DirectorySelector.cs b/osu.Framework/Graphics/UserInterface/DirectorySelector.cs index 69979ca10..d2ef6bfcc 100644 --- a/osu.Framework/Graphics/UserInterface/DirectorySelector.cs +++ b/osu.Framework/Graphics/UserInterface/DirectorySelector.cs @@ -11,6 +11,7 @@ using osu.Framework.Allocation; using osu.Framework.Bindables; using osu.Framework.Extensions.EnumExtensions; using osu.Framework.Graphics.Containers; +using osu.Framework.Localisation; using osu.Framework.Platform; using osuTK; @@ -42,7 +43,7 @@ namespace osu.Framework.Graphics.UserInterface /// protected virtual Drawable CreateHiddenToggleButton() => Empty(); - protected abstract DirectorySelectorDirectory CreateDirectoryItem(DirectoryInfo directory, string displayName = null); + protected abstract DirectorySelectorDirectory CreateDirectoryItem(DirectoryInfo directory, LocalisableString? displayName = null); /// /// Create the directory item that resolves the parent directory. diff --git a/osu.Framework/Graphics/UserInterface/DirectorySelectorBreadcrumbDisplay.cs b/osu.Framework/Graphics/UserInterface/DirectorySelectorBreadcrumbDisplay.cs index 59f182853..fb8d045ae 100644 --- a/osu.Framework/Graphics/UserInterface/DirectorySelectorBreadcrumbDisplay.cs +++ b/osu.Framework/Graphics/UserInterface/DirectorySelectorBreadcrumbDisplay.cs @@ -10,6 +10,7 @@ using JetBrains.Annotations; using osu.Framework.Allocation; using osu.Framework.Bindables; using osu.Framework.Graphics.Containers; +using osu.Framework.Localisation; using osuTK; namespace osu.Framework.Graphics.UserInterface @@ -25,7 +26,7 @@ namespace osu.Framework.Graphics.UserInterface /// /// Create a directory item in the breadcrumb trail. /// - protected abstract DirectorySelectorDirectory CreateDirectoryItem(DirectoryInfo directory, string displayName = null); + protected abstract DirectorySelectorDirectory CreateDirectoryItem(DirectoryInfo directory, LocalisableString? displayName = null); /// /// Create the root directory item in the breadcrumb trail. diff --git a/osu.Framework/Graphics/UserInterface/DirectorySelectorDirectory.cs b/osu.Framework/Graphics/UserInterface/DirectorySelectorDirectory.cs index 2fd30a135..4fe303ac5 100644 --- a/osu.Framework/Graphics/UserInterface/DirectorySelectorDirectory.cs +++ b/osu.Framework/Graphics/UserInterface/DirectorySelectorDirectory.cs @@ -9,6 +9,7 @@ using osu.Framework.Allocation; using osu.Framework.Bindables; using osu.Framework.Input.Events; using osu.Framework.Extensions.EnumExtensions; +using osu.Framework.Localisation; namespace osu.Framework.Graphics.UserInterface { @@ -20,7 +21,7 @@ namespace osu.Framework.Graphics.UserInterface [Resolved] private Bindable currentDirectory { get; set; } - protected DirectorySelectorDirectory(DirectoryInfo directory, string displayName = null) + protected DirectorySelectorDirectory(DirectoryInfo directory, LocalisableString? displayName = null) : base(displayName) { Directory = directory; diff --git a/osu.Framework/Graphics/UserInterface/DirectorySelectorItem.cs b/osu.Framework/Graphics/UserInterface/DirectorySelectorItem.cs index 53553b6f5..9af9913f4 100644 --- a/osu.Framework/Graphics/UserInterface/DirectorySelectorItem.cs +++ b/osu.Framework/Graphics/UserInterface/DirectorySelectorItem.cs @@ -6,13 +6,14 @@ using osu.Framework.Allocation; using osu.Framework.Graphics.Containers; using osu.Framework.Graphics.Sprites; +using osu.Framework.Localisation; using osuTK; namespace osu.Framework.Graphics.UserInterface { public abstract partial class DirectorySelectorItem : CompositeDrawable { - private readonly string displayName; + private readonly LocalisableString? displayName; /// /// Gets or sets the font size of this 's icon and text. @@ -31,7 +32,7 @@ namespace osu.Framework.Graphics.UserInterface protected FillFlowContainer Flow; - protected DirectorySelectorItem(string displayName = null) + protected DirectorySelectorItem(LocalisableString? displayName = null) { this.displayName = displayName; }