diff --git a/osu.Game.Rulesets.Karaoke.Tests/Screens/Edit/Beatmap/Lyrics/States/BaseLyricCaretStateTest.cs b/osu.Game.Rulesets.Karaoke.Tests/Screens/Edit/Beatmap/Lyrics/States/BaseLyricCaretStateTest.cs index 0a7070cd8..6f33e2650 100644 --- a/osu.Game.Rulesets.Karaoke.Tests/Screens/Edit/Beatmap/Lyrics/States/BaseLyricCaretStateTest.cs +++ b/osu.Game.Rulesets.Karaoke.Tests/Screens/Edit/Beatmap/Lyrics/States/BaseLyricCaretStateTest.cs @@ -222,7 +222,7 @@ private void updateModeWithEditStep() LyricEditorMode.EditLanguage => throw new NotSupportedException(), LyricEditorMode.EditRuby => throw new NotSupportedException(), LyricEditorMode.EditTimeTag => throw new NotSupportedException(), - LyricEditorMode.EditRomaji => throw new NotSupportedException(), + LyricEditorMode.EditRomanisation => throw new NotSupportedException(), LyricEditorMode.EditNote => throw new NotSupportedException(), LyricEditorMode.EditSinger => throw new NotSupportedException(), _ => throw new ArgumentOutOfRangeException(nameof(mode), mode, null), diff --git a/osu.Game.Rulesets.Karaoke.Tests/Screens/Edit/Beatmap/TestSceneLyricEditorScreen.cs b/osu.Game.Rulesets.Karaoke.Tests/Screens/Edit/Beatmap/TestSceneLyricEditorScreen.cs index 1bd05907f..c62f28f05 100644 --- a/osu.Game.Rulesets.Karaoke.Tests/Screens/Edit/Beatmap/TestSceneLyricEditorScreen.cs +++ b/osu.Game.Rulesets.Karaoke.Tests/Screens/Edit/Beatmap/TestSceneLyricEditorScreen.cs @@ -89,8 +89,8 @@ public void TestEditTimeTagMode() [Test] public void TestEditRomajiMode() { - switchToMode(LyricEditorMode.EditRomaji); - clickEditStepButtons(); + switchToMode(LyricEditorMode.EditRomanisation); + clickEditStepButtons(); } [Test] diff --git a/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Components/Menus/LyricEditorModeMenu.cs b/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Components/Menus/LyricEditorModeMenu.cs index 957f1fb19..8de2e536b 100644 --- a/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Components/Menus/LyricEditorModeMenu.cs +++ b/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Components/Menus/LyricEditorModeMenu.cs @@ -23,7 +23,7 @@ public LyricEditorModeMenuItem(string text, Bindable config) LyricEditorMode.EditLanguage, LyricEditorMode.EditRuby, LyricEditorMode.EditTimeTag, - LyricEditorMode.EditRomaji, + LyricEditorMode.EditRomanisation, LyricEditorMode.EditNote, LyricEditorMode.EditSinger, }; diff --git a/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Lyrics/Components/Lyrics/Blueprints/RubyBlueprintContainer.cs b/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Lyrics/Components/Lyrics/Blueprints/RubyBlueprintContainer.cs index 800f4fa44..3b11154c0 100644 --- a/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Lyrics/Components/Lyrics/Blueprints/RubyBlueprintContainer.cs +++ b/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Lyrics/Components/Lyrics/Blueprints/RubyBlueprintContainer.cs @@ -48,7 +48,7 @@ protected override void OnSelectionChanged() { base.OnSelectionChanged(); - // only select one ruby / romaji tag can let user drag to change start and end index. + // only select one ruby tag can let user drag to change start and end index. SelectionBox.CanScaleX = SelectedItems.Count == 1; // should clear delta size before change start/end index. @@ -97,7 +97,7 @@ public override bool HandleScale(Vector2 scale, Anchor anchor) { deltaScaleSize += scale.X; - // this feature only works if only select one ruby / romaji tag. + // this feature only works if only select one ruby tag. var selectedRubyTag = SelectedItems.FirstOrDefault(); if (selectedRubyTag == null) return false; diff --git a/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Lyrics/Components/Lyrics/InteractableLyric.cs b/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Lyrics/Components/Lyrics/InteractableLyric.cs index d9a6fd147..bd34b501c 100644 --- a/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Lyrics/Components/Lyrics/InteractableLyric.cs +++ b/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Lyrics/Components/Lyrics/InteractableLyric.cs @@ -102,7 +102,7 @@ private void triggerWritableVersionChanged() LyricEditorMode.EditLanguage => HitObjectWritableUtils.GetLyricPropertyLockedBy(lyric, nameof(Objects.Lyric.Language)), LyricEditorMode.EditRuby => HitObjectWritableUtils.GetLyricPropertyLockedBy(lyric, nameof(Objects.Lyric.RubyTags)), LyricEditorMode.EditTimeTag => HitObjectWritableUtils.GetLyricPropertyLockedBy(lyric, nameof(Objects.Lyric.TimeTags)), - LyricEditorMode.EditRomaji => HitObjectWritableUtils.GetLyricPropertyLockedBy(lyric, nameof(Objects.Lyric.RomajiTags)), + LyricEditorMode.EditRomanisation => HitObjectWritableUtils.GetLyricPropertyLockedBy(lyric, nameof(Objects.Lyric.RomajiTags)), LyricEditorMode.EditNote => HitObjectWritableUtils.GetCreateOrRemoveNoteLockedBy(lyric), LyricEditorMode.EditSinger => HitObjectWritableUtils.GetLyricPropertyLockedBy(lyric, nameof(Objects.Lyric.SingerIds)), _ => throw new ArgumentOutOfRangeException(nameof(mode), mode, null), diff --git a/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Lyrics/Compose/SpecialActionToolbar.cs b/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Lyrics/Compose/SpecialActionToolbar.cs index 4620856c3..9f91dc3ca 100644 --- a/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Lyrics/Compose/SpecialActionToolbar.cs +++ b/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Lyrics/Compose/SpecialActionToolbar.cs @@ -115,7 +115,7 @@ private static IEnumerable createItemForEditMode(EditorModeWithEditSte LyricEditorMode.EditLanguage => Array.Empty(), LyricEditorMode.EditRuby => Array.Empty(), LyricEditorMode.EditTimeTag => createItemsForTimeTagEditStep(editorModeWithEditStep.GetEditStep()), - LyricEditorMode.EditRomaji => Array.Empty(), + LyricEditorMode.EditRomanisation => Array.Empty(), LyricEditorMode.EditNote => createItemsForNoteEditStep(editorModeWithEditStep.GetEditStep()), LyricEditorMode.EditSinger => Array.Empty(), _ => throw new ArgumentOutOfRangeException(), diff --git a/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Lyrics/IssueNavigator.cs b/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Lyrics/IssueNavigator.cs index 364b286c0..9435b6f27 100644 --- a/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Lyrics/IssueNavigator.cs +++ b/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Lyrics/IssueNavigator.cs @@ -30,7 +30,7 @@ public partial class IssueNavigator : Component, IIssueNavigator private IEditTimeTagModeState editTimeTagModeState { get; set; } = null!; [Resolved] - private IEditRomajiModeState editRomajiModeState { get; set; } = null!; + private IEditRomanisationModeState editRomanisationModeState { get; set; } = null!; [Resolved] private IEditNoteModeState noteModeState { get; set; } = null!; @@ -88,8 +88,8 @@ public void Navigate(Issue issue) case CheckLyricTimeTagOnly: return LyricEditorMode.EditTimeTag; - case CheckLyricTimeTagRomaji: - return LyricEditorMode.EditRomaji; + case CheckLyricRomanisation: + return LyricEditorMode.EditRomanisation; case CheckNoteReferenceLyric: case CheckNoteText: @@ -121,7 +121,7 @@ public void Navigate(Issue issue) object[] availableEditModes = { editRubyModeState, - editRomajiModeState, + editRomanisationModeState, editTimeTagModeState, noteModeState, }; diff --git a/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Lyrics/LyricEditor.cs b/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Lyrics/LyricEditor.cs index d923b4f7f..936f06651 100644 --- a/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Lyrics/LyricEditor.cs +++ b/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Lyrics/LyricEditor.cs @@ -56,8 +56,8 @@ public partial class LyricEditor : Container, ILyricEditorState, IKeyBindingHand [Cached(typeof(IEditTimeTagModeState))] private readonly EditTimeTagModeState editTimeTagModeState; - [Cached(typeof(IEditRomajiModeState))] - private readonly EditRomajiModeState editRomajiModeState; + [Cached(typeof(IEditRomanisationModeState))] + private readonly EditRomanisationModeState editRomanisationModeState; [Cached(typeof(IEditNoteModeState))] private readonly EditNoteModeState editNoteModeState; @@ -104,7 +104,7 @@ public LyricEditor() AddInternal(editLanguageModeState = new EditLanguageModeState()); AddInternal(editRubyModeState = new EditRubyModeState()); AddInternal(editTimeTagModeState = new EditTimeTagModeState()); - AddInternal(editRomajiModeState = new EditRomajiModeState()); + AddInternal(editRomanisationModeState = new EditRomanisationModeState()); AddInternal(editNoteModeState = new EditNoteModeState()); // Separated feature. @@ -159,7 +159,7 @@ public LyricEditor() initialEditStepChanged(); initialEditStepChanged(); initialEditStepChanged(); - initialEditStepChanged(); + initialEditStepChanged(); initialEditStepChanged(); initialEditStepChanged(); @@ -208,7 +208,7 @@ private void updateModeWithEditStep() LyricEditorMode.EditLanguage => editLanguageModeState.BindableEditStep.Value, LyricEditorMode.EditRuby => editRubyModeState.BindableEditStep.Value, LyricEditorMode.EditTimeTag => editTimeTagModeState.BindableEditStep.Value, - LyricEditorMode.EditRomaji => editRomajiModeState.BindableEditStep.Value, + LyricEditorMode.EditRomanisation => editRomanisationModeState.BindableEditStep.Value, LyricEditorMode.EditNote => editNoteModeState.BindableEditStep.Value, LyricEditorMode.EditSinger => null, _ => throw new ArgumentOutOfRangeException(nameof(mode), mode, null), @@ -259,7 +259,7 @@ private void initializeSettingsArea() LyricEditorMode.EditLanguage => new LanguageSettings(), LyricEditorMode.EditRuby => new RubyTagSettings(), LyricEditorMode.EditTimeTag => new TimeTagSettings(), - LyricEditorMode.EditRomaji => new RomajiTagSettings(), + LyricEditorMode.EditRomanisation => new RomanisationSettings(), LyricEditorMode.EditNote => new NoteSettings(), LyricEditorMode.EditSinger => new SingerSettings(), _ => null, @@ -294,7 +294,7 @@ static LyricEditorLayout getSupportedLayout(LyricEditorMode mode) => LyricEditorMode.EditLanguage => LyricEditorLayout.Preview | LyricEditorLayout.Detail, LyricEditorMode.EditRuby => LyricEditorLayout.Preview | LyricEditorLayout.Detail, LyricEditorMode.EditTimeTag => LyricEditorLayout.Detail, - LyricEditorMode.EditRomaji => LyricEditorLayout.Preview | LyricEditorLayout.Detail, + LyricEditorMode.EditRomanisation => LyricEditorLayout.Preview | LyricEditorLayout.Detail, LyricEditorMode.EditNote => LyricEditorLayout.Detail, LyricEditorMode.EditSinger => LyricEditorLayout.Preview, _ => throw new ArgumentOutOfRangeException(nameof(mode), mode, null), diff --git a/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Lyrics/LyricEditorClipboard.cs b/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Lyrics/LyricEditorClipboard.cs index 437ad7417..1f08089a9 100644 --- a/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Lyrics/LyricEditorClipboard.cs +++ b/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Lyrics/LyricEditorClipboard.cs @@ -65,7 +65,7 @@ public partial class LyricEditorClipboard : Component, ILyricEditorClipboard private readonly IBindable bindableMode = new Bindable(); // we should save the serialized lyric object into here instead of save into the clipboard for some reason: - // 1. It's hard to know which ruby/romaji or time-tag being copied. + // 1. It's hard to know which ruby/romanisation or time-tag being copied. // 2. Maybe user did not want to copy the full json content? private string clipboardContent = string.Empty; @@ -192,7 +192,7 @@ private bool performCut() lyricTimeTagsChangeHandler.RemoveRange(timeTags); return true; - case LyricEditorMode.EditRomaji: + case LyricEditorMode.EditRomanisation: return false; case LyricEditorMode.EditNote: @@ -265,7 +265,7 @@ private bool performCopy(Lyric lyric) copyObjectToClipboard(timeTags); return true; - case LyricEditorMode.EditRomaji: + case LyricEditorMode.EditRomanisation: return false; case LyricEditorMode.EditNote: @@ -351,7 +351,7 @@ private bool performPaste(Lyric lyric) lyricTimeTagsChangeHandler.AddRange(pasteTimeTags); return true; - case LyricEditorMode.EditRomaji: + case LyricEditorMode.EditRomanisation: return false; case LyricEditorMode.EditNote: diff --git a/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Lyrics/LyricEditorColourProvider.cs b/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Lyrics/LyricEditorColourProvider.cs index 323e50f6b..2447ea5d6 100644 --- a/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Lyrics/LyricEditorColourProvider.cs +++ b/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Lyrics/LyricEditorColourProvider.cs @@ -53,7 +53,7 @@ private static float getBaseHue(LyricEditorMode mode) return 333 / 360f; // pink case LyricEditorMode.EditTimeTag: - case LyricEditorMode.EditRomaji: + case LyricEditorMode.EditRomanisation: return 45 / 360f; // orange case LyricEditorMode.EditNote: diff --git a/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Lyrics/LyricEditorMode.cs b/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Lyrics/LyricEditorMode.cs index bb170e184..bd573dc9a 100644 --- a/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Lyrics/LyricEditorMode.cs +++ b/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Lyrics/LyricEditorMode.cs @@ -45,10 +45,10 @@ public enum LyricEditorMode EditTimeTag, /// - /// Able to edit the romaji from the time-tag. + /// Able to edit the romanisation from the time-tag. /// - [Description("Edit romaji")] - EditRomaji, + [Description("Edit Romanisation")] + EditRomanisation, /// /// Enable to create/delete notes. diff --git a/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Lyrics/LyricEditorVerifier.cs b/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Lyrics/LyricEditorVerifier.cs index fb0de91d7..5c119bd68 100644 --- a/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Lyrics/LyricEditorVerifier.cs +++ b/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Lyrics/LyricEditorVerifier.cs @@ -36,7 +36,7 @@ protected override IEnumerable CreateChecks(LyricEditorMode type) => LyricEditorMode.EditLanguage => new ICheck[] { new CheckLyricLanguage() }, LyricEditorMode.EditRuby => new ICheck[] { new CheckLyricRubyTag() }, LyricEditorMode.EditTimeTag => new ICheck[] { new CheckLyricTimeTagOnly() }, - LyricEditorMode.EditRomaji => new ICheck[] { new CheckLyricTimeTagRomaji() }, + LyricEditorMode.EditRomanisation => new ICheck[] { new CheckLyricRomanisation() }, LyricEditorMode.EditNote => new ICheck[] { new CheckNoteReferenceLyric(), new CheckNoteText(), new CheckNoteTime() }, LyricEditorMode.EditSinger => Array.Empty(), _ => throw new ArgumentOutOfRangeException(nameof(type), type, null), @@ -196,7 +196,7 @@ protected override IEnumerable Check(Lyric lyric) } } -public class CheckLyricTimeTagRomaji : CheckLyricTimeTag +public class CheckLyricRomanisation : CheckLyricTimeTag { protected override IEnumerable Check(Lyric lyric) { diff --git a/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Lyrics/LyricList/Rows/Info/InfoControl.cs b/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Lyrics/LyricList/Rows/Info/InfoControl.cs index 3dbc2f934..2d9d8a859 100644 --- a/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Lyrics/LyricList/Rows/Info/InfoControl.cs +++ b/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Lyrics/LyricList/Rows/Info/InfoControl.cs @@ -190,7 +190,7 @@ private void initializeBadge(EditorModeWithEditStep editorMode) case LyricEditorMode.EditTimeTag: return createTimeTagModeSubInfo(editorMode.GetEditStep(), Lyric); - case LyricEditorMode.EditRomaji: + case LyricEditorMode.EditRomanisation: return new LanguageInfo(Lyric); case LyricEditorMode.EditNote: diff --git a/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Lyrics/Settings/LabelledObjectFieldSwitchButton.cs b/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Lyrics/Settings/LabelledObjectFieldSwitchButton.cs index 443be7010..4d681cfd2 100644 --- a/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Lyrics/Settings/LabelledObjectFieldSwitchButton.cs +++ b/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Lyrics/Settings/LabelledObjectFieldSwitchButton.cs @@ -29,7 +29,7 @@ protected LabelledObjectFieldSwitchButton(T item) // apply current value from the field in the item. Current.Value = GetFieldValue(item); - // should change preview text box if selected ruby/romaji changed. + // should change preview text box if selected boolean property changed. Component.OnCommit += (sender, edited) => { if (!edited) diff --git a/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Lyrics/Settings/LabelledObjectFieldTextBox.cs b/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Lyrics/Settings/LabelledObjectFieldTextBox.cs index ef305f9a0..b39a44224 100644 --- a/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Lyrics/Settings/LabelledObjectFieldTextBox.cs +++ b/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Lyrics/Settings/LabelledObjectFieldTextBox.cs @@ -30,7 +30,7 @@ protected LabelledObjectFieldTextBox(T item) // apply current value from the field in the item. Current.Value = GetFieldValue(item); - // should change preview text box if selected ruby/romaji changed. + // should change preview text box if selected string property changed. OnCommit += (sender, newText) => { if (!newText) diff --git a/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Lyrics/Settings/Romaji/RomajiAutoGenerateSection.cs b/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Lyrics/Settings/Romanisation/RomanisationAutoGenerateSection.cs similarity index 85% rename from osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Lyrics/Settings/Romaji/RomajiAutoGenerateSection.cs rename to osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Lyrics/Settings/Romanisation/RomanisationAutoGenerateSection.cs index e7d4e393b..8566ea578 100644 --- a/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Lyrics/Settings/Romaji/RomajiAutoGenerateSection.cs +++ b/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Lyrics/Settings/Romanisation/RomanisationAutoGenerateSection.cs @@ -8,19 +8,19 @@ using osu.Game.Rulesets.Karaoke.Screens.Edit.Beatmaps.Lyrics.Settings.Components.Markdown; using osu.Game.Rulesets.Karaoke.Screens.Edit.Components.Markdown; -namespace osu.Game.Rulesets.Karaoke.Screens.Edit.Beatmaps.Lyrics.Settings.Romaji; +namespace osu.Game.Rulesets.Karaoke.Screens.Edit.Beatmaps.Lyrics.Settings.Romanisation; -public partial class RomajiAutoGenerateSection : AutoGenerateSection +public partial class RomanisationAutoGenerateSection : AutoGenerateSection { protected override AutoGenerateSubsection CreateAutoGenerateSubsection() - => new RomajiTagAutoGenerateSubsection(); + => new RomanisationAutoGenerateSubsection(); - private partial class RomajiTagAutoGenerateSubsection : LyricEditorAutoGenerateSubsection + private partial class RomanisationAutoGenerateSubsection : LyricEditorAutoGenerateSubsection { private const string language_mode = "LANGUAGE_MODE"; private const string time_tag_mode = "TIME_TAG_MODE"; - public RomajiTagAutoGenerateSubsection() + public RomanisationAutoGenerateSubsection() : base(AutoGenerateType.AutoGenerateTimeTagRomaji) { } @@ -51,9 +51,9 @@ protected override DescriptionFormat CreateInvalidDescriptionFormat() }; protected override ConfigButton CreateConfigButton() - => new RomajiTagAutoGenerateConfigButton(); + => new RomanisationAutoGenerateConfigButton(); - protected partial class RomajiTagAutoGenerateConfigButton : MultiConfigButton + protected partial class RomanisationAutoGenerateConfigButton : MultiConfigButton { protected override IEnumerable AvailableSettings => new[] { diff --git a/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Lyrics/Settings/Romaji/RomajiEditPropertyMode.cs b/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Lyrics/Settings/Romanisation/RomanisationEditPropertyMode.cs similarity index 79% rename from osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Lyrics/Settings/Romaji/RomajiEditPropertyMode.cs rename to osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Lyrics/Settings/Romanisation/RomanisationEditPropertyMode.cs index 4a3147823..231262285 100644 --- a/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Lyrics/Settings/Romaji/RomajiEditPropertyMode.cs +++ b/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Lyrics/Settings/Romanisation/RomanisationEditPropertyMode.cs @@ -1,9 +1,9 @@ // Copyright (c) andy840119 . Licensed under the GPL Licence. // See the LICENCE file in the repository root for full licence text. -namespace osu.Game.Rulesets.Karaoke.Screens.Edit.Beatmaps.Lyrics.Settings.Romaji; +namespace osu.Game.Rulesets.Karaoke.Screens.Edit.Beatmaps.Lyrics.Settings.Romanisation; -public enum RomajiEditPropertyMode +public enum RomanisationEditPropertyMode { Text, diff --git a/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Lyrics/Settings/Romaji/RomajiEditPropertyModeSection.cs b/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Lyrics/Settings/Romanisation/RomanisationEditPropertyModeSection.cs similarity index 60% rename from osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Lyrics/Settings/Romaji/RomajiEditPropertyModeSection.cs rename to osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Lyrics/Settings/Romanisation/RomanisationEditPropertyModeSection.cs index 7047074a1..382202a66 100644 --- a/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Lyrics/Settings/Romaji/RomajiEditPropertyModeSection.cs +++ b/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Lyrics/Settings/Romanisation/RomanisationEditPropertyModeSection.cs @@ -7,22 +7,22 @@ using osu.Game.Graphics.UserInterfaceV2; using osu.Game.Rulesets.Karaoke.Screens.Edit.Beatmaps.Lyrics.States.Modes; -namespace osu.Game.Rulesets.Karaoke.Screens.Edit.Beatmaps.Lyrics.Settings.Romaji; +namespace osu.Game.Rulesets.Karaoke.Screens.Edit.Beatmaps.Lyrics.Settings.Romanisation; -public partial class RomajiEditPropertyModeSection : EditorSection +public partial class RomanisationEditPropertyModeSection : EditorSection { protected override LocalisableString Title => "Edit property"; [BackgroundDependencyLoader] - private void load(IEditRomajiModeState editRomajiModeState) + private void load(IEditRomanisationModeState editRomanisationModeState) { Children = new Drawable[] { - new LabelledEnumDropdown + new LabelledEnumDropdown { Label = "Edit property", - Description = "Batch edit text or other romaji-related properties from time-tag", - Current = editRomajiModeState.BindableRomajiEditPropertyMode, + Description = "Batch edit text or other romanisation-related properties from time-tag", + Current = editRomanisationModeState.BindableRomanisationEditPropertyMode, }, }; } diff --git a/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Lyrics/Settings/Romaji/RomajiEditSection.cs b/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Lyrics/Settings/Romanisation/RomanisationEditSection.cs similarity index 63% rename from osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Lyrics/Settings/Romaji/RomajiEditSection.cs rename to osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Lyrics/Settings/Romanisation/RomanisationEditSection.cs index c3a4e0969..114e82e50 100644 --- a/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Lyrics/Settings/Romaji/RomajiEditSection.cs +++ b/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Lyrics/Settings/Romanisation/RomanisationEditSection.cs @@ -12,66 +12,66 @@ using osu.Game.Rulesets.Karaoke.Objects; using osu.Game.Rulesets.Karaoke.Screens.Edit.Beatmaps.Lyrics.States.Modes; -namespace osu.Game.Rulesets.Karaoke.Screens.Edit.Beatmaps.Lyrics.Settings.Romaji; +namespace osu.Game.Rulesets.Karaoke.Screens.Edit.Beatmaps.Lyrics.Settings.Romanisation; -public partial class RomajiEditSection : LyricPropertiesSection +public partial class RomanisationEditSection : LyricPropertiesSection { - protected override LocalisableString Title => "Romaji"; + protected override LocalisableString Title => "Romanisation"; - protected override LyricPropertiesEditor CreateLyricPropertiesEditor() => new RomajiTagsEditor(); + protected override LyricPropertiesEditor CreateLyricPropertiesEditor() => new RomanisationTagsEditor(); protected override LockLyricPropertyBy? IsWriteLyricPropertyLocked(Lyric lyric) - => HitObjectWritableUtils.GetLyricPropertyLockedBy(lyric, nameof(Lyric.RomajiTags)); + => HitObjectWritableUtils.GetLyricPropertyLockedBy(lyric, nameof(Lyric.TimeTags)); protected override LocalisableString GetWriteLyricPropertyLockedDescription(LockLyricPropertyBy lockLyricPropertyBy) => lockLyricPropertyBy switch { - LockLyricPropertyBy.ReferenceLyricConfig => "Romaji is sync to another romaji.", - LockLyricPropertyBy.LockState => "Romaji is locked.", + LockLyricPropertyBy.ReferenceLyricConfig => "Romanisation is sync to another romanisation.", + LockLyricPropertyBy.LockState => "Romanisation is locked.", _ => throw new ArgumentOutOfRangeException(nameof(lockLyricPropertyBy), lockLyricPropertyBy, null), }; protected override LocalisableString GetWriteLyricPropertyLockedTooltip(LockLyricPropertyBy lockLyricPropertyBy) => lockLyricPropertyBy switch { - LockLyricPropertyBy.ReferenceLyricConfig => "Cannot edit the romaji because it's sync to another lyric's text.", - LockLyricPropertyBy.LockState => "The lyric is locked, so cannot edit the romaji.", + LockLyricPropertyBy.ReferenceLyricConfig => "Cannot edit the romanisation because it's sync to another lyric's text.", + LockLyricPropertyBy.LockState => "The lyric is locked, so cannot edit the romanisation.", _ => throw new ArgumentOutOfRangeException(nameof(lockLyricPropertyBy), lockLyricPropertyBy, null), }; - private partial class RomajiTagsEditor : LyricPropertiesEditor + private partial class RomanisationTagsEditor : LyricPropertiesEditor { - private readonly Bindable bindableRomajiEditPropertyMode = new(); + private readonly Bindable bindableRomanisationEditPropertyMode = new(); - public RomajiTagsEditor() + public RomanisationTagsEditor() { - bindableRomajiEditPropertyMode.BindValueChanged(e => + bindableRomanisationEditPropertyMode.BindValueChanged(e => { RedrewContent(); }); } [BackgroundDependencyLoader] - private void load(IEditRomajiModeState editRomajiModeState) + private void load(IEditRomanisationModeState editRomanisationModeState) { - bindableRomajiEditPropertyMode.BindTo(editRomajiModeState.BindableRomajiEditPropertyMode); + bindableRomanisationEditPropertyMode.BindTo(editRomanisationModeState.BindableRomanisationEditPropertyMode); } protected override Drawable CreateDrawable(TimeTag item) { int index = Items.IndexOf(item); - return bindableRomajiEditPropertyMode.Value switch + return bindableRomanisationEditPropertyMode.Value switch { - RomajiEditPropertyMode.Text => new LabelledRomajiTextTextBox(item) + RomanisationEditPropertyMode.Text => new LabelledRomanisedSyllableTextBox(item) { Label = $"#{index + 1}", TabbableContentContainer = this, }, - RomajiEditPropertyMode.Initial => new LabelledInitialSwitchButton(item) + RomanisationEditPropertyMode.Initial => new LabelledFirstSyllableSwitchButton(item) { Label = item.RomanisedSyllable ?? string.Empty, }, - _ => throw new ArgumentOutOfRangeException(nameof(bindableRomajiEditPropertyMode.Value)), + _ => throw new ArgumentOutOfRangeException(nameof(bindableRomanisationEditPropertyMode.Value)), }; } @@ -81,21 +81,21 @@ protected override IBindableList GetItems(Lyric lyric) => lyric.TimeTagsBindable; } - private partial class LabelledRomajiTextTextBox : LabelledObjectFieldTextBox + private partial class LabelledRomanisedSyllableTextBox : LabelledObjectFieldTextBox { [Resolved] private ILyricTimeTagsChangeHandler lyricTimeTagsChangeHandler { get; set; } = null!; [Resolved] - private IEditRomajiModeState editRomajiModeState { get; set; } = null!; + private IEditRomanisationModeState editRomanisationModeState { get; set; } = null!; - public LabelledRomajiTextTextBox(TimeTag item) + public LabelledRomanisedSyllableTextBox(TimeTag item) : base(item) { } protected override void TriggerSelect(TimeTag item) - => editRomajiModeState.Select(item); + => editRomanisationModeState.Select(item); protected override string GetFieldValue(TimeTag timeTag) => timeTag.RomanisedSyllable ?? string.Empty; @@ -106,16 +106,16 @@ protected override void ApplyValue(TimeTag timeTag, string value) [BackgroundDependencyLoader] private void load() { - SelectedItems.BindTo(editRomajiModeState.SelectedItems); + SelectedItems.BindTo(editRomanisationModeState.SelectedItems); } } - private partial class LabelledInitialSwitchButton : LabelledObjectFieldSwitchButton + private partial class LabelledFirstSyllableSwitchButton : LabelledObjectFieldSwitchButton { [Resolved] private ILyricTimeTagsChangeHandler lyricTimeTagsChangeHandler { get; set; } = null!; - public LabelledInitialSwitchButton(TimeTag item) + public LabelledFirstSyllableSwitchButton(TimeTag item) : base(item) { } @@ -127,9 +127,9 @@ protected override void ApplyValue(TimeTag timeTag, bool value) => lyricTimeTagsChangeHandler.SetTimeTagFirstSyllable(timeTag, value); [BackgroundDependencyLoader] - private void load(IEditRomajiModeState editRomajiModeState) + private void load(IEditRomanisationModeState editRomanisationModeState) { - SelectedItems.BindTo(editRomajiModeState.SelectedItems); + SelectedItems.BindTo(editRomanisationModeState.SelectedItems); } } } diff --git a/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Lyrics/Settings/Romaji/RomajiEditStepSection.cs b/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Lyrics/Settings/Romanisation/RomanisationEditStepSection.cs similarity index 65% rename from osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Lyrics/Settings/Romaji/RomajiEditStepSection.cs rename to osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Lyrics/Settings/Romanisation/RomanisationEditStepSection.cs index 00e31d866..e5221e66b 100644 --- a/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Lyrics/Settings/Romaji/RomajiEditStepSection.cs +++ b/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Lyrics/Settings/Romanisation/RomanisationEditStepSection.cs @@ -10,50 +10,50 @@ using osu.Game.Rulesets.Karaoke.Screens.Edit.Components.Markdown; using osuTK.Graphics; -namespace osu.Game.Rulesets.Karaoke.Screens.Edit.Beatmaps.Lyrics.Settings.Romaji; +namespace osu.Game.Rulesets.Karaoke.Screens.Edit.Beatmaps.Lyrics.Settings.Romanisation; -public partial class RomajiEditStepSection : LyricEditorEditStepSection +public partial class RomanisationEditStepSection : LyricEditorEditStepSection { protected override OverlayColourScheme CreateColourScheme() => OverlayColourScheme.Orange; - protected override Selection CreateSelection(RomajiTagEditStep step) => + protected override Selection CreateSelection(RomanisationTagEditStep step) => step switch { - RomajiTagEditStep.Generate => new Selection(), - RomajiTagEditStep.Edit => new Selection(), - RomajiTagEditStep.Verify => new RomajiTagVerifySelection(), + RomanisationTagEditStep.Generate => new Selection(), + RomanisationTagEditStep.Edit => new Selection(), + RomanisationTagEditStep.Verify => new RomanisationVerifySelection(), _ => throw new ArgumentOutOfRangeException(nameof(step), step, null), }; - protected override LocalisableString GetSelectionText(RomajiTagEditStep step) => + protected override LocalisableString GetSelectionText(RomanisationTagEditStep step) => step switch { - RomajiTagEditStep.Generate => "Generate", - RomajiTagEditStep.Edit => "Edit", - RomajiTagEditStep.Verify => "Verify", + RomanisationTagEditStep.Generate => "Generate", + RomanisationTagEditStep.Edit => "Edit", + RomanisationTagEditStep.Verify => "Verify", _ => throw new ArgumentOutOfRangeException(nameof(step), step, null), }; - protected override Color4 GetSelectionColour(OsuColour colours, RomajiTagEditStep step, bool active) => + protected override Color4 GetSelectionColour(OsuColour colours, RomanisationTagEditStep step, bool active) => step switch { - RomajiTagEditStep.Generate => active ? colours.Blue : colours.BlueDarker, - RomajiTagEditStep.Edit => active ? colours.Red : colours.RedDarker, - RomajiTagEditStep.Verify => active ? colours.Yellow : colours.YellowDarker, + RomanisationTagEditStep.Generate => active ? colours.Blue : colours.BlueDarker, + RomanisationTagEditStep.Edit => active ? colours.Red : colours.RedDarker, + RomanisationTagEditStep.Verify => active ? colours.Yellow : colours.YellowDarker, _ => throw new ArgumentOutOfRangeException(nameof(step), step, null), }; - protected override DescriptionFormat GetSelectionDescription(RomajiTagEditStep step) => + protected override DescriptionFormat GetSelectionDescription(RomanisationTagEditStep step) => step switch { - RomajiTagEditStep.Generate => "Auto-generate romajies in the lyric.", - RomajiTagEditStep.Edit => new DescriptionFormat + RomanisationTagEditStep.Generate => "Auto-generate romanisation in the lyric.", + RomanisationTagEditStep.Edit => new DescriptionFormat { Text = "Create / delete and edit lyric rubies in here.\n" + $"Click [{DescriptionFormat.LINK_KEY_ACTION}](directions) to select the target lyric.\n" - + "Press `Tab` to switch between the romaji tags.\n" - + $"Than, press [{DescriptionFormat.LINK_KEY_ACTION}](adjust_text_tag_index) or button to adjust romaji index after hover to edit index area.", + + "Press `Tab` to switch between the romanised syllable tags.\n" + + $"Than, press [{DescriptionFormat.LINK_KEY_ACTION}](adjust_text_tag_index) or button to adjust romanised syllable index after hover to edit index area.", Actions = new Dictionary { { @@ -82,12 +82,12 @@ protected override DescriptionFormat GetSelectionDescription(RomajiTagEditStep s }, }, }, - RomajiTagEditStep.Verify => "Check invalid romajies in here.", + RomanisationTagEditStep.Verify => "Check invalid romanisation in here.", _ => throw new ArgumentOutOfRangeException(nameof(step), step, null), }; - private partial class RomajiTagVerifySelection : LyricEditorVerifySelection + private partial class RomanisationVerifySelection : LyricEditorVerifySelection { - protected override LyricEditorMode EditMode => LyricEditorMode.EditRomaji; + protected override LyricEditorMode EditMode => LyricEditorMode.EditRomanisation; } } diff --git a/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Lyrics/Settings/Romaji/RomajiIssueSection.cs b/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Lyrics/Settings/Romanisation/RomanisationIssueSection.cs similarity index 87% rename from osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Lyrics/Settings/Romaji/RomajiIssueSection.cs rename to osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Lyrics/Settings/Romanisation/RomanisationIssueSection.cs index c86fe8191..836980855 100644 --- a/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Lyrics/Settings/Romaji/RomajiIssueSection.cs +++ b/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Lyrics/Settings/Romanisation/RomanisationIssueSection.cs @@ -13,15 +13,15 @@ using osu.Game.Rulesets.Karaoke.Screens.Edit.Components.Issues; using osuTK; -namespace osu.Game.Rulesets.Karaoke.Screens.Edit.Beatmaps.Lyrics.Settings.Romaji; +namespace osu.Game.Rulesets.Karaoke.Screens.Edit.Beatmaps.Lyrics.Settings.Romanisation; -public partial class RomajiIssueSection : LyricEditorIssueSection +public partial class RomanisationIssueSection : LyricEditorIssueSection { - protected override LyricEditorMode EditMode => LyricEditorMode.EditRomaji; + protected override LyricEditorMode EditMode => LyricEditorMode.EditRomanisation; - protected override LyricsIssueTable CreateLyricsIssueTable() => new RomajiIssueTable(); + protected override LyricsIssueTable CreateLyricsIssueTable() => new RomanisationIssueTable(); - private partial class RomajiIssueTable : LyricsIssueTable + private partial class RomanisationIssueTable : LyricsIssueTable { protected override TableColumn[] CreateHeaders() => new[] { @@ -67,10 +67,10 @@ protected override Drawable[] CreateContent(Issue issue) private Tuple getInvalidByIssue(Issue issue) { - if (issue is not LyricTimeTagIssue romajiTagIssue) + if (issue is not LyricTimeTagIssue timeTagIssue) throw new InvalidCastException(); - return new Tuple(romajiTagIssue.Lyric, romajiTagIssue.TimeTag); + return new Tuple(timeTagIssue.Lyric, timeTagIssue.TimeTag); } } } diff --git a/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Lyrics/Settings/RomajiTagSettings.cs b/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Lyrics/Settings/RomanisationSettings.cs similarity index 53% rename from osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Lyrics/Settings/RomajiTagSettings.cs rename to osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Lyrics/Settings/RomanisationSettings.cs index 8553b4454..e9ee841aa 100644 --- a/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Lyrics/Settings/RomajiTagSettings.cs +++ b/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Lyrics/Settings/RomanisationSettings.cs @@ -5,17 +5,17 @@ using System.Collections.Generic; using osu.Framework.Allocation; using osu.Framework.Graphics; -using osu.Game.Rulesets.Karaoke.Screens.Edit.Beatmaps.Lyrics.Settings.Romaji; +using osu.Game.Rulesets.Karaoke.Screens.Edit.Beatmaps.Lyrics.Settings.Romanisation; using osu.Game.Rulesets.Karaoke.Screens.Edit.Beatmaps.Lyrics.States.Modes; namespace osu.Game.Rulesets.Karaoke.Screens.Edit.Beatmaps.Lyrics.Settings; -public partial class RomajiTagSettings : TextTagSettings +public partial class RomanisationSettings : TextTagSettings { [BackgroundDependencyLoader] - private void load(IEditRomajiModeState romajiModeState) + private void load(IEditRomanisationModeState romanisationModeState) { - BindableEditStep.BindTo(romajiModeState.BindableEditStep); + BindableEditStep.BindTo(romanisationModeState.BindableEditStep); BindableEditStep.BindValueChanged(e => { ReloadSections(); @@ -24,21 +24,21 @@ private void load(IEditRomajiModeState romajiModeState) protected override IReadOnlyList CreateSections() => BindableEditStep.Value switch { - RomajiTagEditStep.Generate => new Drawable[] + RomanisationTagEditStep.Generate => new Drawable[] { - new RomajiEditStepSection(), - new RomajiAutoGenerateSection(), + new RomanisationEditStepSection(), + new RomanisationAutoGenerateSection(), }, - RomajiTagEditStep.Edit => new Drawable[] + RomanisationTagEditStep.Edit => new Drawable[] { - new RomajiEditStepSection(), - new RomajiEditPropertyModeSection(), - new RomajiEditSection(), + new RomanisationEditStepSection(), + new RomanisationEditPropertyModeSection(), + new RomanisationEditSection(), }, - RomajiTagEditStep.Verify => new Drawable[] + RomanisationTagEditStep.Verify => new Drawable[] { - new RomajiEditStepSection(), - new RomajiIssueSection(), + new RomanisationEditStepSection(), + new RomanisationIssueSection(), }, _ => throw new ArgumentOutOfRangeException(), }; diff --git a/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Lyrics/States/LyricCaretState.cs b/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Lyrics/States/LyricCaretState.cs index a32ce9193..56cb0ee73 100644 --- a/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Lyrics/States/LyricCaretState.cs +++ b/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Lyrics/States/LyricCaretState.cs @@ -144,7 +144,7 @@ private void refreshAlgorithmAndCaretPosition() LyricEditorMode.EditLanguage => new ClickingCaretPositionAlgorithm(lyrics), LyricEditorMode.EditRuby => getRubyTagModeAlgorithm(), LyricEditorMode.EditTimeTag => getTimeTagModeAlgorithm(editorModeWithEditStep.GetEditStep()), - LyricEditorMode.EditRomaji => new NavigateCaretPositionAlgorithm(lyrics), + LyricEditorMode.EditRomanisation => new NavigateCaretPositionAlgorithm(lyrics), LyricEditorMode.EditNote => new NavigateCaretPositionAlgorithm(lyrics), LyricEditorMode.EditSinger => new NavigateCaretPositionAlgorithm(lyrics), _ => throw new InvalidOperationException(nameof(mode)), diff --git a/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Lyrics/States/Modes/EditRomajiModeState.cs b/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Lyrics/States/Modes/EditRomanisationModeState.cs similarity index 60% rename from osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Lyrics/States/Modes/EditRomajiModeState.cs rename to osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Lyrics/States/Modes/EditRomanisationModeState.cs index d22c44a51..b263f1389 100644 --- a/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Lyrics/States/Modes/EditRomajiModeState.cs +++ b/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Lyrics/States/Modes/EditRomanisationModeState.cs @@ -5,26 +5,26 @@ using osu.Framework.Bindables; using osu.Game.Rulesets.Karaoke.Edit.Utils; using osu.Game.Rulesets.Karaoke.Objects; -using osu.Game.Rulesets.Karaoke.Screens.Edit.Beatmaps.Lyrics.Settings.Romaji; +using osu.Game.Rulesets.Karaoke.Screens.Edit.Beatmaps.Lyrics.Settings.Romanisation; namespace osu.Game.Rulesets.Karaoke.Screens.Edit.Beatmaps.Lyrics.States.Modes; -public partial class EditRomajiModeState : ModeStateWithBlueprintContainer, IEditRomajiModeState +public partial class EditRomanisationModeState : ModeStateWithBlueprintContainer, IEditRomanisationModeState { - private readonly Bindable bindableEditMode = new(); + private readonly Bindable bindableEditMode = new(); - public IBindable BindableEditStep => bindableEditMode; + public IBindable BindableEditStep => bindableEditMode; - public void ChangeEditStep(RomajiTagEditStep step) + public void ChangeEditStep(RomanisationTagEditStep step) => bindableEditMode.Value = step; - public Bindable BindableRomajiEditPropertyMode { get; } = new(); + public Bindable BindableRomanisationEditPropertyMode { get; } = new(); protected override bool IsWriteLyricPropertyLocked(Lyric lyric) => HitObjectWritableUtils.IsWriteLyricPropertyLocked(lyric, nameof(Lyric.TimeTags)); protected override bool SelectFirstProperty(Lyric lyric) - => BindableEditStep.Value == RomajiTagEditStep.Edit; + => BindableEditStep.Value == RomanisationTagEditStep.Edit; protected override IEnumerable SelectableProperties(Lyric lyric) => lyric.TimeTags; diff --git a/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Lyrics/States/Modes/IEditRomajiModeState.cs b/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Lyrics/States/Modes/IEditRomanisationModeState.cs similarity index 62% rename from osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Lyrics/States/Modes/IEditRomajiModeState.cs rename to osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Lyrics/States/Modes/IEditRomanisationModeState.cs index 7ec22895b..63e635a3b 100644 --- a/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Lyrics/States/Modes/IEditRomajiModeState.cs +++ b/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Lyrics/States/Modes/IEditRomanisationModeState.cs @@ -3,11 +3,11 @@ using osu.Framework.Bindables; using osu.Game.Rulesets.Karaoke.Objects; -using osu.Game.Rulesets.Karaoke.Screens.Edit.Beatmaps.Lyrics.Settings.Romaji; +using osu.Game.Rulesets.Karaoke.Screens.Edit.Beatmaps.Lyrics.Settings.Romanisation; namespace osu.Game.Rulesets.Karaoke.Screens.Edit.Beatmaps.Lyrics.States.Modes; -public interface IEditRomajiModeState : IHasEditStep, IHasBlueprintSelection +public interface IEditRomanisationModeState : IHasEditStep, IHasBlueprintSelection { - Bindable BindableRomajiEditPropertyMode { get; } + Bindable BindableRomanisationEditPropertyMode { get; } } diff --git a/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Lyrics/States/Modes/RomajiTagEditStep.cs b/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Lyrics/States/Modes/RomanisationTagEditStep.cs similarity index 88% rename from osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Lyrics/States/Modes/RomajiTagEditStep.cs rename to osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Lyrics/States/Modes/RomanisationTagEditStep.cs index 502fa872b..beda2cb59 100644 --- a/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Lyrics/States/Modes/RomajiTagEditStep.cs +++ b/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Lyrics/States/Modes/RomanisationTagEditStep.cs @@ -3,7 +3,7 @@ namespace osu.Game.Rulesets.Karaoke.Screens.Edit.Beatmaps.Lyrics.States.Modes; -public enum RomajiTagEditStep +public enum RomanisationTagEditStep { Generate, diff --git a/osu.Game.Rulesets.Karaoke/Screens/Edit/Import/Lyrics/GenerateRuby/GenerateRubyStepScreen.cs b/osu.Game.Rulesets.Karaoke/Screens/Edit/Import/Lyrics/GenerateRuby/GenerateRubyStepScreen.cs index c7122fb22..e1add196b 100644 --- a/osu.Game.Rulesets.Karaoke/Screens/Edit/Import/Lyrics/GenerateRuby/GenerateRubyStepScreen.cs +++ b/osu.Game.Rulesets.Karaoke/Screens/Edit/Import/Lyrics/GenerateRuby/GenerateRubyStepScreen.cs @@ -33,7 +33,7 @@ protected override TopNavigation CreateNavigation() protected override Drawable CreateContent() => base.CreateContent().With(_ => { - SwitchLyricEditorMode(LyricEditorMode.EditRomaji); + SwitchLyricEditorMode(LyricEditorMode.EditRomanisation); }); protected override void LoadComplete() diff --git a/osu.Game.Rulesets.Karaoke/Screens/Edit/Import/Lyrics/GenerateTimeTag/GenerateTimeTagStepScreen.cs b/osu.Game.Rulesets.Karaoke/Screens/Edit/Import/Lyrics/GenerateTimeTag/GenerateTimeTagStepScreen.cs index 539c65085..9201b43ca 100644 --- a/osu.Game.Rulesets.Karaoke/Screens/Edit/Import/Lyrics/GenerateTimeTag/GenerateTimeTagStepScreen.cs +++ b/osu.Game.Rulesets.Karaoke/Screens/Edit/Import/Lyrics/GenerateTimeTag/GenerateTimeTagStepScreen.cs @@ -51,7 +51,7 @@ protected override void LoadComplete() // or even create new step for it. if (lyricPropertyAutoGenerateChangeHandler.CanGenerate(AutoGenerateType.AutoGenerateTimeTagRomaji)) { - AskForAutoGenerateRomaji(); + AskForAutoGenerateRomanisation(); } else { @@ -88,9 +88,9 @@ internal void AskForAutoGenerateTimeTag() } } - internal void AskForAutoGenerateRomaji() + internal void AskForAutoGenerateRomanisation() { - SwitchLyricEditorMode(LyricEditorMode.EditRomaji); + SwitchLyricEditorMode(LyricEditorMode.EditRomanisation); DialogOverlay.Push(new UseAutoGenerateRomajiPopupDialog(ok => { diff --git a/osu.Game.Rulesets.Karaoke/Screens/Edit/Import/Lyrics/LyricImporterStepScreenWithLyricEditor.cs b/osu.Game.Rulesets.Karaoke/Screens/Edit/Import/Lyrics/LyricImporterStepScreenWithLyricEditor.cs index 7278ec92b..4aef9ccf5 100644 --- a/osu.Game.Rulesets.Karaoke/Screens/Edit/Import/Lyrics/LyricImporterStepScreenWithLyricEditor.cs +++ b/osu.Game.Rulesets.Karaoke/Screens/Edit/Import/Lyrics/LyricImporterStepScreenWithLyricEditor.cs @@ -65,7 +65,7 @@ public void PrepareAutoGenerate() // for some mode, we need to switch to generate section. SwitchEditStep(LanguageEditStep.Generate); SwitchEditStep(RubyTagEditStep.Generate); - SwitchEditStep(RomajiTagEditStep.Generate); + SwitchEditStep(RomanisationTagEditStep.Generate); } protected override IReadOnlyDependencyContainer CreateChildDependencies(IReadOnlyDependencyContainer parent)