mirror of
https://github.com/ppy/osu.git
synced 2025-03-15 19:07:45 +08:00
Globalise beatmap selection key bindings as "group" selection
This commit is contained in:
parent
d52a1a5d23
commit
9416346c94
@ -59,6 +59,9 @@ namespace osu.Game.Input.Bindings
|
||||
new KeyBinding(InputKey.Up, GlobalAction.SelectPrevious),
|
||||
new KeyBinding(InputKey.Down, GlobalAction.SelectNext),
|
||||
|
||||
new KeyBinding(InputKey.Left, GlobalAction.SelectPreviousGroup),
|
||||
new KeyBinding(InputKey.Right, GlobalAction.SelectNextGroup),
|
||||
|
||||
new KeyBinding(InputKey.Space, GlobalAction.Select),
|
||||
new KeyBinding(InputKey.Enter, GlobalAction.Select),
|
||||
new KeyBinding(InputKey.KeypadEnter, GlobalAction.Select),
|
||||
@ -100,8 +103,6 @@ namespace osu.Game.Input.Bindings
|
||||
|
||||
public IEnumerable<KeyBinding> SongSelectKeyBindings => new[]
|
||||
{
|
||||
new KeyBinding(InputKey.Left, GlobalAction.SelectPreviousBeatmap),
|
||||
new KeyBinding(InputKey.Right, GlobalAction.SelectNextBeatmap),
|
||||
new KeyBinding(InputKey.F1, GlobalAction.ToggleModSelection),
|
||||
new KeyBinding(InputKey.F2, GlobalAction.SelectNextRandom),
|
||||
new KeyBinding(new[] { InputKey.Shift, InputKey.F2 }, GlobalAction.SelectPreviousRandom),
|
||||
@ -304,10 +305,10 @@ namespace osu.Game.Input.Bindings
|
||||
[LocalisableDescription(typeof(GlobalActionKeyBindingStrings), nameof(GlobalActionKeyBindingStrings.EditorFlipVertically))]
|
||||
EditorFlipVertically,
|
||||
|
||||
[LocalisableDescription(typeof(GlobalActionKeyBindingStrings), nameof(GlobalActionKeyBindingStrings.SelectPreviousBeatmap))]
|
||||
SelectPreviousBeatmap,
|
||||
[LocalisableDescription(typeof(GlobalActionKeyBindingStrings), nameof(GlobalActionKeyBindingStrings.SelectPreviousGroup))]
|
||||
SelectPreviousGroup,
|
||||
|
||||
[LocalisableDescription(typeof(GlobalActionKeyBindingStrings), nameof(GlobalActionKeyBindingStrings.SelectNextBeatmap))]
|
||||
SelectNextBeatmap,
|
||||
[LocalisableDescription(typeof(GlobalActionKeyBindingStrings), nameof(GlobalActionKeyBindingStrings.SelectNextGroup))]
|
||||
SelectNextGroup,
|
||||
}
|
||||
}
|
||||
|
@ -129,6 +129,16 @@ namespace osu.Game.Localisation
|
||||
/// </summary>
|
||||
public static LocalisableString SelectNext => new TranslatableString(getKey(@"select_next"), @"Next selection");
|
||||
|
||||
/// <summary>
|
||||
/// "Previous group selection"
|
||||
/// </summary>
|
||||
public static LocalisableString SelectPreviousGroup => new TranslatableString(getKey(@"select_previous_group"), @"Previous group selection");
|
||||
|
||||
/// <summary>
|
||||
/// "Next group selection"
|
||||
/// </summary>
|
||||
public static LocalisableString SelectNextGroup => new TranslatableString(getKey(@"select_next_group"), @"Next group selection");
|
||||
|
||||
/// <summary>
|
||||
/// "Home"
|
||||
/// </summary>
|
||||
@ -194,16 +204,6 @@ namespace osu.Game.Localisation
|
||||
/// </summary>
|
||||
public static LocalisableString ToggleInGameInterface => new TranslatableString(getKey(@"toggle_in_game_interface"), @"Toggle in-game interface");
|
||||
|
||||
/// <summary>
|
||||
/// "Previous beatmap selection"
|
||||
/// </summary>
|
||||
public static LocalisableString SelectPreviousBeatmap => new TranslatableString(getKey(@"select_previous_beatmap"), @"Previous beatmap selection");
|
||||
|
||||
/// <summary>
|
||||
/// "Next beatmap selection"
|
||||
/// </summary>
|
||||
public static LocalisableString SelectNextBeatmap => new TranslatableString(getKey(@"select_next_beatmap"), @"Next beatmap selection");
|
||||
|
||||
/// <summary>
|
||||
/// "Toggle Mod Select"
|
||||
/// </summary>
|
||||
|
@ -372,12 +372,12 @@ namespace osu.Game.Overlays.Volume
|
||||
|
||||
switch (e.Action)
|
||||
{
|
||||
case GlobalAction.SelectPrevious:
|
||||
case GlobalAction.SelectPreviousGroup:
|
||||
State = SelectionState.Selected;
|
||||
adjust(1, false);
|
||||
return true;
|
||||
|
||||
case GlobalAction.SelectNext:
|
||||
case GlobalAction.SelectNextGroup:
|
||||
State = SelectionState.Selected;
|
||||
adjust(-1, false);
|
||||
return true;
|
||||
|
@ -611,13 +611,13 @@ namespace osu.Game.Screens.Select
|
||||
switch (e.Action)
|
||||
{
|
||||
case GlobalAction.SelectNext:
|
||||
case GlobalAction.SelectNextBeatmap:
|
||||
SelectNext(1, e.Action == GlobalAction.SelectNextBeatmap);
|
||||
case GlobalAction.SelectNextGroup:
|
||||
SelectNext(1, e.Action == GlobalAction.SelectNextGroup);
|
||||
return true;
|
||||
|
||||
case GlobalAction.SelectPrevious:
|
||||
case GlobalAction.SelectPreviousBeatmap:
|
||||
SelectNext(-1, e.Action == GlobalAction.SelectPreviousBeatmap);
|
||||
case GlobalAction.SelectPreviousGroup:
|
||||
SelectNext(-1, e.Action == GlobalAction.SelectPreviousGroup);
|
||||
return true;
|
||||
}
|
||||
|
||||
|
Loading…
x
Reference in New Issue
Block a user