From d717ccf85e2091b2d88d6e1397ff6e50bb2ff78b Mon Sep 17 00:00:00 2001 From: EVAST9919 Date: Mon, 22 May 2017 09:07:08 +0300 Subject: [PATCH] Settings -> ReplaySettings --- .../Tests/TestCaseReplaySettingsOverlay.cs | 2 +- osu.Game/Screens/Play/HUDOverlay.cs | 2 +- .../{Settings => ReplaySettings}/CollectionSettings.cs | 2 +- .../{Settings => ReplaySettings}/DiscussionSettings.cs | 2 +- .../Play/{Settings => ReplaySettings}/PlaybackSettings.cs | 2 +- .../{Settings => ReplaySettings}/ReplaySettingsOverlay.cs | 2 +- osu.Game/Screens/Play/StandardHUDOverlay.cs | 2 +- osu.Game/osu.Game.csproj | 8 ++++---- 8 files changed, 11 insertions(+), 11 deletions(-) rename osu.Game/Screens/Play/{Settings => ReplaySettings}/CollectionSettings.cs (92%) rename osu.Game/Screens/Play/{Settings => ReplaySettings}/DiscussionSettings.cs (92%) rename osu.Game/Screens/Play/{Settings => ReplaySettings}/PlaybackSettings.cs (91%) rename osu.Game/Screens/Play/{Settings => ReplaySettings}/ReplaySettingsOverlay.cs (93%) diff --git a/osu.Desktop.VisualTests/Tests/TestCaseReplaySettingsOverlay.cs b/osu.Desktop.VisualTests/Tests/TestCaseReplaySettingsOverlay.cs index 2f1af8a241..046e5631b9 100644 --- a/osu.Desktop.VisualTests/Tests/TestCaseReplaySettingsOverlay.cs +++ b/osu.Desktop.VisualTests/Tests/TestCaseReplaySettingsOverlay.cs @@ -5,7 +5,7 @@ using osu.Framework.Graphics; using osu.Framework.Testing; using osu.Game.Graphics.UserInterface; using osu.Game.Overlays.Settings; -using osu.Game.Screens.Play.Settings; +using osu.Game.Screens.Play.ReplaySettings; namespace osu.Desktop.VisualTests.Tests { diff --git a/osu.Game/Screens/Play/HUDOverlay.cs b/osu.Game/Screens/Play/HUDOverlay.cs index 2e7f48b4f5..aa6021d11f 100644 --- a/osu.Game/Screens/Play/HUDOverlay.cs +++ b/osu.Game/Screens/Play/HUDOverlay.cs @@ -14,7 +14,7 @@ using osu.Game.Rulesets.Scoring; using osu.Game.Rulesets.UI; using osu.Game.Screens.Play.HUD; using OpenTK.Input; -using osu.Game.Screens.Play.Settings; +using osu.Game.Screens.Play.ReplaySettings; namespace osu.Game.Screens.Play { diff --git a/osu.Game/Screens/Play/Settings/CollectionSettings.cs b/osu.Game/Screens/Play/ReplaySettings/CollectionSettings.cs similarity index 92% rename from osu.Game/Screens/Play/Settings/CollectionSettings.cs rename to osu.Game/Screens/Play/ReplaySettings/CollectionSettings.cs index 752ed29e77..a3cd33c5f8 100644 --- a/osu.Game/Screens/Play/Settings/CollectionSettings.cs +++ b/osu.Game/Screens/Play/ReplaySettings/CollectionSettings.cs @@ -8,7 +8,7 @@ using osu.Game.Overlays.Music; using System.Collections.Generic; using osu.Game.Graphics.UserInterface; -namespace osu.Game.Screens.Play.Settings +namespace osu.Game.Screens.Play.ReplaySettings { public class CollectionSettings : SettingsDropdownContainer { diff --git a/osu.Game/Screens/Play/Settings/DiscussionSettings.cs b/osu.Game/Screens/Play/ReplaySettings/DiscussionSettings.cs similarity index 92% rename from osu.Game/Screens/Play/Settings/DiscussionSettings.cs rename to osu.Game/Screens/Play/ReplaySettings/DiscussionSettings.cs index ba38ed9bec..0f295f77aa 100644 --- a/osu.Game/Screens/Play/Settings/DiscussionSettings.cs +++ b/osu.Game/Screens/Play/ReplaySettings/DiscussionSettings.cs @@ -7,7 +7,7 @@ using osu.Game.Configuration; using osu.Game.Graphics.UserInterface; using osu.Game.Overlays.Settings; -namespace osu.Game.Screens.Play.Settings +namespace osu.Game.Screens.Play.ReplaySettings { public class DiscussionSettings : SettingsDropdownContainer { diff --git a/osu.Game/Screens/Play/Settings/PlaybackSettings.cs b/osu.Game/Screens/Play/ReplaySettings/PlaybackSettings.cs similarity index 91% rename from osu.Game/Screens/Play/Settings/PlaybackSettings.cs rename to osu.Game/Screens/Play/ReplaySettings/PlaybackSettings.cs index f019eed206..b79e24a63f 100644 --- a/osu.Game/Screens/Play/Settings/PlaybackSettings.cs +++ b/osu.Game/Screens/Play/ReplaySettings/PlaybackSettings.cs @@ -6,7 +6,7 @@ using osu.Game.Configuration; using osu.Game.Overlays.Settings; using osu.Game.Graphics.UserInterface; -namespace osu.Game.Screens.Play.Settings +namespace osu.Game.Screens.Play.ReplaySettings { public class PlaybackSettings : SettingsDropdownContainer { diff --git a/osu.Game/Screens/Play/Settings/ReplaySettingsOverlay.cs b/osu.Game/Screens/Play/ReplaySettings/ReplaySettingsOverlay.cs similarity index 93% rename from osu.Game/Screens/Play/Settings/ReplaySettingsOverlay.cs rename to osu.Game/Screens/Play/ReplaySettings/ReplaySettingsOverlay.cs index fbd6b7f758..e83fd78d2a 100644 --- a/osu.Game/Screens/Play/Settings/ReplaySettingsOverlay.cs +++ b/osu.Game/Screens/Play/ReplaySettings/ReplaySettingsOverlay.cs @@ -7,7 +7,7 @@ using osu.Framework.Graphics; using osu.Framework.Graphics.Containers; using osu.Framework.Input; -namespace osu.Game.Screens.Play.Settings +namespace osu.Game.Screens.Play.ReplaySettings { public class ReplaySettingsOverlay : FillFlowContainer { diff --git a/osu.Game/Screens/Play/StandardHUDOverlay.cs b/osu.Game/Screens/Play/StandardHUDOverlay.cs index 17cf16d7ea..79683123a5 100644 --- a/osu.Game/Screens/Play/StandardHUDOverlay.cs +++ b/osu.Game/Screens/Play/StandardHUDOverlay.cs @@ -8,7 +8,7 @@ using osu.Game.Graphics.UserInterface; using osu.Game.Rulesets.Scoring; using osu.Game.Screens.Play.HUD; using OpenTK; -using osu.Game.Screens.Play.Settings; +using osu.Game.Screens.Play.ReplaySettings; namespace osu.Game.Screens.Play { diff --git a/osu.Game/osu.Game.csproj b/osu.Game/osu.Game.csproj index 3dc7c0dc9f..c1b9ed8da8 100644 --- a/osu.Game/osu.Game.csproj +++ b/osu.Game/osu.Game.csproj @@ -237,11 +237,11 @@ - - + + - - + +