h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2025-01-14 19:22:56 +08:00
Code Issues Releases Wiki Activity

CI fixes

Browse Source
This commit is contained in:
Dean Herbert 2017-09-07 23:06:35 +09:00
parent b135dc1f18
commit b9bec6a983
4 changed files with 30 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
osu.Desktop.Tests/Visual/TestCaseEditorMenuBar.cs
View File

@ -27,22 +27,22 @@ namespace osu.Desktop.Tests.Visual
new EditorMenuItem("Open Difficulty..."), new EditorMenuItem("Open Difficulty..."),
new EditorMenuItem("Save"), new EditorMenuItem("Save"),
new EditorMenuItem("Create a new Difficulty..."), new EditorMenuItem("Create a new Difficulty..."),
new EditorMenuSpacer(), new EditorMenuItemSpacer(),
new EditorMenuItem("Revert to Saved"), new EditorMenuItem("Revert to Saved"),
new EditorMenuItem("Revert to Saved (Full)"), new EditorMenuItem("Revert to Saved (Full)"),
new EditorMenuSpacer(), new EditorMenuItemSpacer(),
new EditorMenuItem("Test Beatmap"), new EditorMenuItem("Test Beatmap"),
new EditorMenuItem("Open AiMod"), new EditorMenuItem("Open AiMod"),
new EditorMenuSpacer(), new EditorMenuItemSpacer(),
new EditorMenuItem("Upload Beatmap..."), new EditorMenuItem("Upload Beatmap..."),
new EditorMenuItem("Export Package"), new EditorMenuItem("Export Package"),
new EditorMenuItem("Export Map Package"), new EditorMenuItem("Export Map Package"),
new EditorMenuItem("Import from..."), new EditorMenuItem("Import from..."),
new EditorMenuSpacer(), new EditorMenuItemSpacer(),
new EditorMenuItem("Open Song Folder"), new EditorMenuItem("Open Song Folder"),
new EditorMenuItem("Open .osu in Notepad"), new EditorMenuItem("Open .osu in Notepad"),
new EditorMenuItem("Open .osb in Notepad"), new EditorMenuItem("Open .osb in Notepad"),
new EditorMenuSpacer(), new EditorMenuItemSpacer(),
new EditorMenuItem("Exit"), new EditorMenuItem("Exit"),
} }
}, },
@ -52,20 +52,20 @@ namespace osu.Desktop.Tests.Visual
{ {
new EditorMenuItem("Time Signature"), new EditorMenuItem("Time Signature"),
new EditorMenuItem("Metronome Clicks"), new EditorMenuItem("Metronome Clicks"),
new EditorMenuSpacer(), new EditorMenuItemSpacer(),
new EditorMenuItem("Add Timing Section"), new EditorMenuItem("Add Timing Section"),
new EditorMenuItem("Add Inheriting Section"), new EditorMenuItem("Add Inheriting Section"),
new EditorMenuItem("Reset Current Section"), new EditorMenuItem("Reset Current Section"),
new EditorMenuItem("Delete Timing Section"), new EditorMenuItem("Delete Timing Section"),
new EditorMenuItem("Resnap Current Section"), new EditorMenuItem("Resnap Current Section"),
new EditorMenuSpacer(), new EditorMenuItemSpacer(),
new EditorMenuItem("Timing Setup"), new EditorMenuItem("Timing Setup"),
new EditorMenuSpacer(), new EditorMenuItemSpacer(),
new EditorMenuItem("Resnap All Notes", MenuItemType.Destructive), new EditorMenuItem("Resnap All Notes", MenuItemType.Destructive),
new EditorMenuItem("Move all notes in time...", MenuItemType.Destructive), new EditorMenuItem("Move all notes in time...", MenuItemType.Destructive),
new EditorMenuItem("Recalculate Slider Lengths", MenuItemType.Destructive), new EditorMenuItem("Recalculate Slider Lengths", MenuItemType.Destructive),
new EditorMenuItem("Delete All Timing Sections", MenuItemType.Destructive), new EditorMenuItem("Delete All Timing Sections", MenuItemType.Destructive),
new EditorMenuSpacer(), new EditorMenuItemSpacer(),
new EditorMenuItem("Set Current Position as Preview Point"), new EditorMenuItem("Set Current Position as Preview Point"),
} }
}, },

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

@ -52,22 +52,22 @@ namespace osu.Game.Screens.Edit
new EditorMenuItem("Open difficulty..."), new EditorMenuItem("Open difficulty..."),
new EditorMenuItem("Save"), new EditorMenuItem("Save"),
new EditorMenuItem("Create new difficulty..."), new EditorMenuItem("Create new difficulty..."),
new EditorMenuSpacer(), new EditorMenuItemSpacer(),
new EditorMenuItem("Revert to saved"), new EditorMenuItem("Revert to saved"),
new EditorMenuItem("Revert to saved (full"), new EditorMenuItem("Revert to saved (full"),
new EditorMenuSpacer(), new EditorMenuItemSpacer(),
new EditorMenuItem("Test beatmap"), new EditorMenuItem("Test beatmap"),
new EditorMenuItem("Open AiMod"), new EditorMenuItem("Open AiMod"),
new EditorMenuSpacer(), new EditorMenuItemSpacer(),
new EditorMenuItem("Upload Beatmap..."), new EditorMenuItem("Upload Beatmap..."),
new EditorMenuItem("Export package"), new EditorMenuItem("Export package"),
new EditorMenuItem("Export map package"), new EditorMenuItem("Export map package"),
new EditorMenuItem("Import from..."), new EditorMenuItem("Import from..."),
new EditorMenuSpacer(), new EditorMenuItemSpacer(),
new EditorMenuItem("Open song folder"), new EditorMenuItem("Open song folder"),
new EditorMenuItem("Open .osu in Notepad"), new EditorMenuItem("Open .osu in Notepad"),
new EditorMenuItem("Open .osb in Notepad"), new EditorMenuItem("Open .osb in Notepad"),
new EditorMenuSpacer(), new EditorMenuItemSpacer(),
new EditorMenuItem("Exit", MenuItemType.Standard, Exit) new EditorMenuItem("Exit", MenuItemType.Standard, Exit)
} }
}, },
@ -77,15 +77,15 @@ namespace osu.Game.Screens.Edit
{ {
new EditorMenuItem("Undo"), new EditorMenuItem("Undo"),
new EditorMenuItem("Redo"), new EditorMenuItem("Redo"),
new EditorMenuSpacer(), new EditorMenuItemSpacer(),
new EditorMenuItem("Cut"), new EditorMenuItem("Cut"),
new EditorMenuItem("Copy"), new EditorMenuItem("Copy"),
new EditorMenuItem("Paste"), new EditorMenuItem("Paste"),
new EditorMenuItem("Delete"), new EditorMenuItem("Delete"),
new EditorMenuSpacer(), new EditorMenuItemSpacer(),
new EditorMenuItem("Select all"), new EditorMenuItem("Select all"),
new EditorMenuItem("Clone"), new EditorMenuItem("Clone"),
new EditorMenuSpacer(), new EditorMenuItemSpacer(),
new EditorMenuItem("Reverse selection"), new EditorMenuItem("Reverse selection"),
new EditorMenuItem("Flip horizontally"), new EditorMenuItem("Flip horizontally"),
new EditorMenuItem("Flip vertically"), new EditorMenuItem("Flip vertically"),
@ -93,12 +93,12 @@ namespace osu.Game.Screens.Edit
new EditorMenuItem("Rotate 90deg anticlockwise"), new EditorMenuItem("Rotate 90deg anticlockwise"),
new EditorMenuItem("Rotate by..."), new EditorMenuItem("Rotate by..."),
new EditorMenuItem("Scale by..."), new EditorMenuItem("Scale by..."),
new EditorMenuSpacer(), new EditorMenuItemSpacer(),
new EditorMenuItem("Reset selected objects' samples"), new EditorMenuItem("Reset selected objects' samples"),
new EditorMenuItem("Reset all samples", MenuItemType.Destructive), new EditorMenuItem("Reset all samples", MenuItemType.Destructive),
new EditorMenuItem("Reset combo colours", MenuItemType.Destructive), new EditorMenuItem("Reset combo colours", MenuItemType.Destructive),
new EditorMenuItem("Reset breaks", MenuItemType.Destructive), new EditorMenuItem("Reset breaks", MenuItemType.Destructive),
new EditorMenuSpacer(), new EditorMenuItemSpacer(),
new EditorMenuItem("Nudge backward"), new EditorMenuItem("Nudge backward"),
new EditorMenuItem("Nudge forward") new EditorMenuItem("Nudge forward")
} }
@ -110,10 +110,10 @@ namespace osu.Game.Screens.Edit
new EditorMenuItem("Compose"), new EditorMenuItem("Compose"),
new EditorMenuItem("Design"), new EditorMenuItem("Design"),
new EditorMenuItem("Timing"), new EditorMenuItem("Timing"),
new EditorMenuSpacer(), new EditorMenuItemSpacer(),
new EditorMenuItem("Song setup..."), new EditorMenuItem("Song setup..."),
new EditorMenuItem("Timing setup..."), new EditorMenuItem("Timing setup..."),
new EditorMenuSpacer(), new EditorMenuItemSpacer(),
new EditorMenuItem("Volume"), new EditorMenuItem("Volume"),
new EditorMenuItem("Grid level"), new EditorMenuItem("Grid level"),
new EditorMenuItem("Show video"), new EditorMenuItem("Show video"),
@ -131,7 +131,7 @@ namespace osu.Game.Screens.Edit
new EditorMenuItem("Snap divisor"), new EditorMenuItem("Snap divisor"),
new EditorMenuItem("Audio rate"), new EditorMenuItem("Audio rate"),
new EditorMenuItem("Grid snapping"), new EditorMenuItem("Grid snapping"),
new EditorMenuSpacer(), new EditorMenuItemSpacer(),
new EditorMenuItem("Create polygon cricles..."), new EditorMenuItem("Create polygon cricles..."),
new EditorMenuItem("Convert slider to stream"), new EditorMenuItem("Convert slider to stream"),
new EditorMenuItem("Enable live mapping mode"), new EditorMenuItem("Enable live mapping mode"),
@ -151,20 +151,20 @@ namespace osu.Game.Screens.Edit
{ {
new EditorMenuItem("Time signature"), new EditorMenuItem("Time signature"),
new EditorMenuItem("Metronome clicks"), new EditorMenuItem("Metronome clicks"),
new EditorMenuSpacer(), new EditorMenuItemSpacer(),
new EditorMenuItem("Add timing section"), new EditorMenuItem("Add timing section"),
new EditorMenuItem("Add inheriting section"), new EditorMenuItem("Add inheriting section"),
new EditorMenuItem("Reset current section"), new EditorMenuItem("Reset current section"),
new EditorMenuItem("Delete timing section"), new EditorMenuItem("Delete timing section"),
new EditorMenuItem("Resnap current section"), new EditorMenuItem("Resnap current section"),
new EditorMenuSpacer(), new EditorMenuItemSpacer(),
new EditorMenuItem("Timing setup..."), new EditorMenuItem("Timing setup..."),
new EditorMenuSpacer(), new EditorMenuItemSpacer(),
new EditorMenuItem("Resnap all notes", MenuItemType.Destructive), new EditorMenuItem("Resnap all notes", MenuItemType.Destructive),
new EditorMenuItem("Move all notes in time...", MenuItemType.Destructive), new EditorMenuItem("Move all notes in time...", MenuItemType.Destructive),
new EditorMenuItem("Recalculate slider lengths", MenuItemType.Destructive), new EditorMenuItem("Recalculate slider lengths", MenuItemType.Destructive),
new EditorMenuItem("Delete all timing sections", MenuItemType.Destructive), new EditorMenuItem("Delete all timing sections", MenuItemType.Destructive),
new EditorMenuSpacer(), new EditorMenuItemSpacer(),
new EditorMenuItem("Set current position as preview point") new EditorMenuItem("Set current position as preview point")
} }
}, },

4
osu.Game/Screens/Edit/Menus/EditorMenuBar.cs
View File

@ -105,14 +105,14 @@ namespace osu.Game.Screens.Edit.Menus
protected override bool OnHover(InputState state) protected override bool OnHover(InputState state)
{ {
if (Item is EditorMenuSpacer) if (Item is EditorMenuItemSpacer)
return true; return true;
return base.OnHover(state); return base.OnHover(state);
} }
protected override bool OnClick(InputState state) protected override bool OnClick(InputState state)
{ {
if (Item is EditorMenuSpacer) if (Item is EditorMenuItemSpacer)
return true; return true;
return base.OnClick(state); return base.OnClick(state);
} }

4
osu.Game/Screens/Edit/Menus/EditorMenuItemSpacer.cs
View File

@ -3,9 +3,9 @@
namespace osu.Game.Screens.Edit.Menus namespace osu.Game.Screens.Edit.Menus
{ {
public class EditorMenuSpacer : EditorMenuItem public class EditorMenuItemSpacer : EditorMenuItem
{ {
public EditorMenuSpacer() public EditorMenuItemSpacer()
: base(" ") : base(" ")
{ {
} }