From 7a4b9c5571dc86d592aedbc2ac1606bb9ced23e2 Mon Sep 17 00:00:00 2001 From: DrabWeb Date: Thu, 2 Mar 2017 21:20:30 -0400 Subject: [PATCH] osu.Game.Overlays.BeatmapOptions -> osu.Game.Screens.Select.Options --- .../Select/Options}/BeatmapOptionsButton.cs | 2 +- .../BeatmapOptionsClearLocalScoresButton.cs | 2 +- .../Select/Options}/BeatmapOptionsDeleteButton.cs | 2 +- .../Select/Options}/BeatmapOptionsEditButton.cs | 2 +- .../Select/Options}/BeatmapOptionsOverlay.cs | 2 +- .../BeatmapOptionsRemoveFromUnplayedButton.cs | 2 +- osu.Game/Screens/Select/PlaySongSelect.cs | 2 +- osu.Game/osu.Game.csproj | 14 +++++++------- 8 files changed, 14 insertions(+), 14 deletions(-) rename osu.Game/{Overlays/BeatmapOptions => Screens/Select/Options}/BeatmapOptionsButton.cs (96%) rename osu.Game/{Overlays/BeatmapOptions => Screens/Select/Options}/BeatmapOptionsClearLocalScoresButton.cs (90%) rename osu.Game/{Overlays/BeatmapOptions => Screens/Select/Options}/BeatmapOptionsDeleteButton.cs (90%) rename osu.Game/{Overlays/BeatmapOptions => Screens/Select/Options}/BeatmapOptionsEditButton.cs (90%) rename osu.Game/{Overlays/BeatmapOptions => Screens/Select/Options}/BeatmapOptionsOverlay.cs (96%) rename osu.Game/{Overlays/BeatmapOptions => Screens/Select/Options}/BeatmapOptionsRemoveFromUnplayedButton.cs (90%) diff --git a/osu.Game/Overlays/BeatmapOptions/BeatmapOptionsButton.cs b/osu.Game/Screens/Select/Options/BeatmapOptionsButton.cs similarity index 96% rename from osu.Game/Overlays/BeatmapOptions/BeatmapOptionsButton.cs rename to osu.Game/Screens/Select/Options/BeatmapOptionsButton.cs index fd81b9bbfb..2d9de75358 100644 --- a/osu.Game/Overlays/BeatmapOptions/BeatmapOptionsButton.cs +++ b/osu.Game/Screens/Select/Options/BeatmapOptionsButton.cs @@ -12,7 +12,7 @@ using osu.Framework.Input; using osu.Game.Graphics; using osu.Game.Graphics.Sprites; -namespace osu.Game.Overlays.BeatmapOptions +namespace osu.Game.Screens.Select.Options { public class BeatmapOptionsButton : ClickableContainer { diff --git a/osu.Game/Overlays/BeatmapOptions/BeatmapOptionsClearLocalScoresButton.cs b/osu.Game/Screens/Select/Options/BeatmapOptionsClearLocalScoresButton.cs similarity index 90% rename from osu.Game/Overlays/BeatmapOptions/BeatmapOptionsClearLocalScoresButton.cs rename to osu.Game/Screens/Select/Options/BeatmapOptionsClearLocalScoresButton.cs index 9058d6c34f..66a6dac358 100644 --- a/osu.Game/Overlays/BeatmapOptions/BeatmapOptionsClearLocalScoresButton.cs +++ b/osu.Game/Screens/Select/Options/BeatmapOptionsClearLocalScoresButton.cs @@ -4,7 +4,7 @@ using osu.Framework.Allocation; using osu.Game.Graphics; -namespace osu.Game.Overlays.BeatmapOptions +namespace osu.Game.Screens.Select.Options { public class BeatmapOptionsClearLocalScoresButton : BeatmapOptionsButton { diff --git a/osu.Game/Overlays/BeatmapOptions/BeatmapOptionsDeleteButton.cs b/osu.Game/Screens/Select/Options/BeatmapOptionsDeleteButton.cs similarity index 90% rename from osu.Game/Overlays/BeatmapOptions/BeatmapOptionsDeleteButton.cs rename to osu.Game/Screens/Select/Options/BeatmapOptionsDeleteButton.cs index 4572839a6b..563cf41a87 100644 --- a/osu.Game/Overlays/BeatmapOptions/BeatmapOptionsDeleteButton.cs +++ b/osu.Game/Screens/Select/Options/BeatmapOptionsDeleteButton.cs @@ -4,7 +4,7 @@ using osu.Framework.Allocation; using osu.Game.Graphics; -namespace osu.Game.Overlays.BeatmapOptions +namespace osu.Game.Screens.Select.Options { public class BeatmapOptionsDeleteButton : BeatmapOptionsButton { diff --git a/osu.Game/Overlays/BeatmapOptions/BeatmapOptionsEditButton.cs b/osu.Game/Screens/Select/Options/BeatmapOptionsEditButton.cs similarity index 90% rename from osu.Game/Overlays/BeatmapOptions/BeatmapOptionsEditButton.cs rename to osu.Game/Screens/Select/Options/BeatmapOptionsEditButton.cs index 8dc1ab6e2e..f88c0df168 100644 --- a/osu.Game/Overlays/BeatmapOptions/BeatmapOptionsEditButton.cs +++ b/osu.Game/Screens/Select/Options/BeatmapOptionsEditButton.cs @@ -4,7 +4,7 @@ using osu.Framework.Allocation; using osu.Game.Graphics; -namespace osu.Game.Overlays.BeatmapOptions +namespace osu.Game.Screens.Select.Options { public class BeatmapOptionsEditButton : BeatmapOptionsButton { diff --git a/osu.Game/Overlays/BeatmapOptions/BeatmapOptionsOverlay.cs b/osu.Game/Screens/Select/Options/BeatmapOptionsOverlay.cs similarity index 96% rename from osu.Game/Overlays/BeatmapOptions/BeatmapOptionsOverlay.cs rename to osu.Game/Screens/Select/Options/BeatmapOptionsOverlay.cs index bebb2ce93b..1596f8733c 100644 --- a/osu.Game/Overlays/BeatmapOptions/BeatmapOptionsOverlay.cs +++ b/osu.Game/Screens/Select/Options/BeatmapOptionsOverlay.cs @@ -11,7 +11,7 @@ using osu.Framework.Graphics.Sprites; using osu.Framework.Graphics.Transforms; using osu.Game.Graphics; -namespace osu.Game.Overlays.BeatmapOptions +namespace osu.Game.Screens.Select.Options { public class BeatmapOptionsOverlay : FocusedOverlayContainer { diff --git a/osu.Game/Overlays/BeatmapOptions/BeatmapOptionsRemoveFromUnplayedButton.cs b/osu.Game/Screens/Select/Options/BeatmapOptionsRemoveFromUnplayedButton.cs similarity index 90% rename from osu.Game/Overlays/BeatmapOptions/BeatmapOptionsRemoveFromUnplayedButton.cs rename to osu.Game/Screens/Select/Options/BeatmapOptionsRemoveFromUnplayedButton.cs index df5bde60c4..eeab78ef02 100644 --- a/osu.Game/Overlays/BeatmapOptions/BeatmapOptionsRemoveFromUnplayedButton.cs +++ b/osu.Game/Screens/Select/Options/BeatmapOptionsRemoveFromUnplayedButton.cs @@ -4,7 +4,7 @@ using osu.Framework.Allocation; using osu.Game.Graphics; -namespace osu.Game.Overlays.BeatmapOptions +namespace osu.Game.Screens.Select.Options { public class BeatmapOptionsRemoveFromUnplayedButton : BeatmapOptionsButton { diff --git a/osu.Game/Screens/Select/PlaySongSelect.cs b/osu.Game/Screens/Select/PlaySongSelect.cs index c67d7c9662..04dfcec419 100644 --- a/osu.Game/Screens/Select/PlaySongSelect.cs +++ b/osu.Game/Screens/Select/PlaySongSelect.cs @@ -28,7 +28,7 @@ using OpenTK.Input; using System.Collections.Generic; using osu.Framework.Threading; using osu.Game.Overlays; -using osu.Game.Overlays.BeatmapOptions; +using osu.Game.Screens.Select.Options; namespace osu.Game.Screens.Select { diff --git a/osu.Game/osu.Game.csproj b/osu.Game/osu.Game.csproj index 215457f9d4..f4ef69f0b1 100644 --- a/osu.Game/osu.Game.csproj +++ b/osu.Game/osu.Game.csproj @@ -287,12 +287,12 @@ - - - - - - + + + + + + @@ -315,7 +315,7 @@ - +