diff --git a/osu.Game/Input/RealmKeyBindingStore.cs b/osu.Game/Input/RealmKeyBindingStore.cs index 677a7baf62..046969579c 100644 --- a/osu.Game/Input/RealmKeyBindingStore.cs +++ b/osu.Game/Input/RealmKeyBindingStore.cs @@ -17,12 +17,12 @@ namespace osu.Game.Input public class RealmKeyBindingStore { private readonly RealmContextFactory realmFactory; - private readonly ReadableKeyCombinationProvider readableKeyCombinationProvider; + private readonly ReadableKeyCombinationProvider keyCombinationProvider; - public RealmKeyBindingStore(RealmContextFactory realmFactory, ReadableKeyCombinationProvider readableKeyCombinationProvider) + public RealmKeyBindingStore(RealmContextFactory realmFactory, ReadableKeyCombinationProvider keyCombinationProvider) { this.realmFactory = realmFactory; - this.readableKeyCombinationProvider = readableKeyCombinationProvider; + this.keyCombinationProvider = keyCombinationProvider; } /// @@ -38,7 +38,7 @@ namespace osu.Game.Input { foreach (var action in context.All().Where(b => b.RulesetID == null && (GlobalAction)b.ActionInt == globalAction)) { - string str = readableKeyCombinationProvider.GetReadableString(action.KeyCombination); + string str = keyCombinationProvider.GetReadableString(action.KeyCombination); // even if found, the readable string may be empty for an unbound action. if (str.Length > 0) diff --git a/osu.Game/OsuGameBase.cs b/osu.Game/OsuGameBase.cs index 0dc511c361..10166daf00 100644 --- a/osu.Game/OsuGameBase.cs +++ b/osu.Game/OsuGameBase.cs @@ -170,7 +170,7 @@ namespace osu.Game } [BackgroundDependencyLoader] - private void load(ReadableKeyCombinationProvider readableKeyCombinationProvider) + private void load(ReadableKeyCombinationProvider keyCombinationProvider) { try { @@ -309,7 +309,7 @@ namespace osu.Game base.Content.Add(CreateScalingContainer().WithChildren(mainContent)); - KeyBindingStore = new RealmKeyBindingStore(realmFactory, readableKeyCombinationProvider); + KeyBindingStore = new RealmKeyBindingStore(realmFactory, keyCombinationProvider); KeyBindingStore.Register(globalBindings, RulesetStore.AvailableRulesets); dependencies.Cache(globalBindings); diff --git a/osu.Game/Overlays/Settings/Sections/Input/KeyBindingRow.cs b/osu.Game/Overlays/Settings/Sections/Input/KeyBindingRow.cs index 758f93692e..f9856f30ce 100644 --- a/osu.Game/Overlays/Settings/Sections/Input/KeyBindingRow.cs +++ b/osu.Game/Overlays/Settings/Sections/Input/KeyBindingRow.cs @@ -59,7 +59,7 @@ namespace osu.Game.Overlays.Settings.Sections.Input public bool FilteringActive { get; set; } [Resolved] - private ReadableKeyCombinationProvider readableKeyCombinationProvider { get; set; } + private ReadableKeyCombinationProvider keyCombinationProvider { get; set; } private OsuSpriteText text; private FillFlowContainer cancelAndClearButtons; @@ -67,7 +67,7 @@ namespace osu.Game.Overlays.Settings.Sections.Input private Bindable isDefault { get; } = new BindableBool(true); - public IEnumerable FilterTerms => bindings.Select(b => readableKeyCombinationProvider.GetReadableString(b.KeyCombination)).Prepend(text.Text.ToString()); + public IEnumerable FilterTerms => bindings.Select(b => keyCombinationProvider.GetReadableString(b.KeyCombination)).Prepend(text.Text.ToString()); public KeyBindingRow(object action, List bindings) { @@ -427,7 +427,7 @@ namespace osu.Game.Overlays.Settings.Sections.Input private OverlayColourProvider colourProvider { get; set; } [Resolved] - private ReadableKeyCombinationProvider readableKeyCombinationProvider { get; set; } + private ReadableKeyCombinationProvider keyCombinationProvider { get; set; } private bool isBinding; @@ -486,7 +486,7 @@ namespace osu.Game.Overlays.Settings.Sections.Input { base.LoadComplete(); - readableKeyCombinationProvider.KeymapChanged += updateKeyCombinationText; + keyCombinationProvider.KeymapChanged += updateKeyCombinationText; updateKeyCombinationText(); } @@ -524,7 +524,7 @@ namespace osu.Game.Overlays.Settings.Sections.Input private void updateKeyCombinationText() { - Text.Text = readableKeyCombinationProvider.GetReadableString(KeyBinding.KeyCombination); + Text.Text = keyCombinationProvider.GetReadableString(KeyBinding.KeyCombination); } public void UpdateKeyCombination(KeyCombination newCombination) @@ -540,7 +540,7 @@ namespace osu.Game.Overlays.Settings.Sections.Input { base.Dispose(isDisposing); - readableKeyCombinationProvider.KeymapChanged -= updateKeyCombinationText; + keyCombinationProvider.KeymapChanged -= updateKeyCombinationText; } } } diff --git a/osu.Game/Overlays/Toolbar/ToolbarButton.cs b/osu.Game/Overlays/Toolbar/ToolbarButton.cs index 0886bb8f8c..b2252a5575 100644 --- a/osu.Game/Overlays/Toolbar/ToolbarButton.cs +++ b/osu.Game/Overlays/Toolbar/ToolbarButton.cs @@ -41,7 +41,7 @@ namespace osu.Game.Overlays.Toolbar private TextureStore textures { get; set; } [Resolved] - private ReadableKeyCombinationProvider readableKeyCombinationProvider { get; set; } + private ReadableKeyCombinationProvider keyCombinationProvider { get; set; } public void SetIcon(string texture) => SetIcon(new Sprite @@ -211,7 +211,7 @@ namespace osu.Game.Overlays.Toolbar if (realmKeyBinding != null) { - string keyBindingString = readableKeyCombinationProvider.GetReadableString(realmKeyBinding.KeyCombination); + string keyBindingString = keyCombinationProvider.GetReadableString(realmKeyBinding.KeyCombination); if (!string.IsNullOrEmpty(keyBindingString)) keyBindingTooltip.Text = $" ({keyBindingString})";