sim1222/osukey
1
1
Fork 0
mirror of https://github.com/osukey/osukey.git synced 2025-05-09 15:47:38 +09:00
Code Issues Packages Projects Releases Wiki Activity

Rename to "clone" instead of "duplicate"

Browse Source
This commit is contained in:
Dean Herbert 2022-10-25 11:43:23 +09:00
parent 1e579e06f8
commit 4d4f6e25ba
5 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
osu.Game.Tests/Visual/Editing/TestSceneEditorClipboard.cs
View File

@ -163,9 +163,9 @@ namespace osu.Game.Tests.Visual.Editing
AddStep("select added object", () => EditorBeatmap.SelectedHitObjects.Add(addedObject)); AddStep("select added object", () => EditorBeatmap.SelectedHitObjects.Add(addedObject));
AddAssert("is one object", () => EditorBeatmap.HitObjects.Count == 1); AddAssert("is one object", () => EditorBeatmap.HitObjects.Count == 1);
AddStep("clone", () => Editor.Duplicate()); AddStep("clone", () => Editor.Clone());
AddAssert("is two objects", () => EditorBeatmap.HitObjects.Count == 2); AddAssert("is two objects", () => EditorBeatmap.HitObjects.Count == 2);
AddStep("clone", () => Editor.Duplicate()); AddStep("clone", () => Editor.Clone());
AddAssert("is three objects", () => EditorBeatmap.HitObjects.Count == 3); AddAssert("is three objects", () => EditorBeatmap.HitObjects.Count == 3);
} }
@ -203,7 +203,7 @@ namespace osu.Game.Tests.Visual.Editing
AddStep("deselect all objects", () => EditorBeatmap.SelectedHitObjects.Clear()); AddStep("deselect all objects", () => EditorBeatmap.SelectedHitObjects.Clear());
AddAssert("is one object", () => EditorBeatmap.HitObjects.Count == 1); AddAssert("is one object", () => EditorBeatmap.HitObjects.Count == 1);
AddStep("clone", () => Editor.Duplicate()); AddStep("clone", () => Editor.Clone());
AddAssert("still one object", () => EditorBeatmap.HitObjects.Count == 1); AddAssert("still one object", () => EditorBeatmap.HitObjects.Count == 1);
} }
} }

6
osu.Game/Input/Bindings/GlobalActionContainer.cs
View File

@ -90,7 +90,7 @@ namespace osu.Game.Input.Bindings
new KeyBinding(new[] { InputKey.F3 }, GlobalAction.EditorTimingMode), new KeyBinding(new[] { InputKey.F3 }, GlobalAction.EditorTimingMode),
new KeyBinding(new[] { InputKey.F4 }, GlobalAction.EditorSetupMode), new KeyBinding(new[] { InputKey.F4 }, GlobalAction.EditorSetupMode),
new KeyBinding(new[] { InputKey.Control, InputKey.Shift, InputKey.A }, GlobalAction.EditorVerifyMode), new KeyBinding(new[] { InputKey.Control, InputKey.Shift, InputKey.A }, GlobalAction.EditorVerifyMode),
new KeyBinding(new[] { InputKey.Control, InputKey.D }, GlobalAction.EditorDuplicateSelection), new KeyBinding(new[] { InputKey.Control, InputKey.D }, GlobalAction.EditorCloneSelection),
new KeyBinding(new[] { InputKey.J }, GlobalAction.EditorNudgeLeft), new KeyBinding(new[] { InputKey.J }, GlobalAction.EditorNudgeLeft),
new KeyBinding(new[] { InputKey.K }, GlobalAction.EditorNudgeRight), new KeyBinding(new[] { InputKey.K }, GlobalAction.EditorNudgeRight),
new KeyBinding(new[] { InputKey.G }, GlobalAction.EditorCycleGridDisplayMode), new KeyBinding(new[] { InputKey.G }, GlobalAction.EditorCycleGridDisplayMode),
@ -348,7 +348,7 @@ namespace osu.Game.Input.Bindings
[LocalisableDescription(typeof(GlobalActionKeyBindingStrings), nameof(GlobalActionKeyBindingStrings.ToggleProfile))] [LocalisableDescription(typeof(GlobalActionKeyBindingStrings), nameof(GlobalActionKeyBindingStrings.ToggleProfile))]
ToggleProfile, ToggleProfile,
[LocalisableDescription(typeof(GlobalActionKeyBindingStrings), nameof(GlobalActionKeyBindingStrings.EditorDuplicateSelection))] [LocalisableDescription(typeof(GlobalActionKeyBindingStrings), nameof(GlobalActionKeyBindingStrings.EditorCloneSelection))]
EditorDuplicateSelection EditorCloneSelection
} }
} }

4
osu.Game/Localisation/GlobalActionKeyBindingStrings.cs
View File

@ -185,9 +185,9 @@ namespace osu.Game.Localisation
public static LocalisableString EditorTapForBPM => new TranslatableString(getKey(@"editor_tap_for_bpm"), @"Tap for BPM"); public static LocalisableString EditorTapForBPM => new TranslatableString(getKey(@"editor_tap_for_bpm"), @"Tap for BPM");
/// <summary> /// <summary>
/// "Duplicate selection" /// "Clone selection"
/// </summary> /// </summary>
public static LocalisableString EditorDuplicateSelection => new TranslatableString(getKey(@"editor_duplicate_selection"), @"Duplicate selection"); public static LocalisableString EditorCloneSelection => new TranslatableString(getKey(@"editor_clone_selection"), @"Clone selection");
/// <summary> /// <summary>
/// "Cycle grid display mode" /// "Cycle grid display mode"

8
osu.Game/Screens/Edit/Editor.cs
View File

@ -304,7 +304,7 @@ namespace osu.Game.Screens.Edit
cutMenuItem = new EditorMenuItem("Cut", MenuItemType.Standard, Cut), cutMenuItem = new EditorMenuItem("Cut", MenuItemType.Standard, Cut),
copyMenuItem = new EditorMenuItem("Copy", MenuItemType.Standard, Copy), copyMenuItem = new EditorMenuItem("Copy", MenuItemType.Standard, Copy),
pasteMenuItem = new EditorMenuItem("Paste", MenuItemType.Standard, Paste), pasteMenuItem = new EditorMenuItem("Paste", MenuItemType.Standard, Paste),
duplicateMenuItem = new EditorMenuItem("Duplicate", MenuItemType.Standard, Duplicate), duplicateMenuItem = new EditorMenuItem("Clone", MenuItemType.Standard, Clone),
} }
}, },
new MenuItem("View") new MenuItem("View")
@ -576,8 +576,8 @@ namespace osu.Game.Screens.Edit
this.Exit(); this.Exit();
return true; return true;
case GlobalAction.EditorDuplicateSelection: case GlobalAction.EditorCloneSelection:
Duplicate(); Clone();
return true; return true;
case GlobalAction.EditorComposeMode: case GlobalAction.EditorComposeMode:
@ -775,7 +775,7 @@ namespace osu.Game.Screens.Edit
protected void Copy() => currentScreen?.Copy(); protected void Copy() => currentScreen?.Copy();
protected void Duplicate() protected void Clone()
{ {
// Avoid attempting to clone if copying is not available (as it may result in pasting something unexpected). // Avoid attempting to clone if copying is not available (as it may result in pasting something unexpected).
if (!canCopy.Value) if (!canCopy.Value)

2
osu.Game/Tests/Visual/EditorTestScene.cs
View File

@ -110,7 +110,7 @@ namespace osu.Game.Tests.Visual
public new void Paste() => base.Paste(); public new void Paste() => base.Paste();
public new void Duplicate() => base.Duplicate(); public new void Clone() => base.Clone();
public new void SwitchToDifficulty(BeatmapInfo beatmapInfo) => base.SwitchToDifficulty(beatmapInfo); public new void SwitchToDifficulty(BeatmapInfo beatmapInfo) => base.SwitchToDifficulty(beatmapInfo);