1
0
mirror of https://github.com/ppy/osu.git synced 2025-01-28 04:02:57 +08:00

Fix namespaces and class names

This commit is contained in:
Dean Herbert 2017-06-05 16:47:42 +09:00
parent c3c56820fa
commit af6f8bbd89
11 changed files with 20 additions and 20 deletions

View File

@ -4,6 +4,7 @@
using osu.Framework.Graphics; using osu.Framework.Graphics;
using osu.Framework.Testing; using osu.Framework.Testing;
using osu.Game.Graphics.UserInterface; using osu.Game.Graphics.UserInterface;
using osu.Game.Screens.Play;
using osu.Game.Screens.Play.ReplaySettings; using osu.Game.Screens.Play.ReplaySettings;
namespace osu.Desktop.VisualTests.Tests namespace osu.Desktop.VisualTests.Tests
@ -32,7 +33,7 @@ namespace osu.Desktop.VisualTests.Tests
Text = @"Button", Text = @"Button",
})); }));
AddStep(@"Add checkbox", () => container.Add(new ReplaySettingsCheckbox AddStep(@"Add checkbox", () => container.Add(new ReplayCheckbox
{ {
LabelText = "Checkbox", LabelText = "Checkbox",
})); }));
@ -46,7 +47,7 @@ namespace osu.Desktop.VisualTests.Tests
})); }));
} }
private class ExampleContainer : ReplaySettingsGroup private class ExampleContainer : ReplayGroup
{ {
protected override string Title => @"example"; protected override string Title => @"example";
} }

View File

@ -14,7 +14,6 @@ using osu.Game.Rulesets.Scoring;
using osu.Game.Rulesets.UI; using osu.Game.Rulesets.UI;
using osu.Game.Screens.Play.HUD; using osu.Game.Screens.Play.HUD;
using OpenTK.Input; using OpenTK.Input;
using osu.Game.Screens.Play.ReplaySettings;
namespace osu.Game.Screens.Play namespace osu.Game.Screens.Play
{ {

View File

@ -9,7 +9,7 @@ using System.Collections.Generic;
namespace osu.Game.Screens.Play.ReplaySettings namespace osu.Game.Screens.Play.ReplaySettings
{ {
public class CollectionSettings : ReplaySettingsGroup public class CollectionSettings : ReplayGroup
{ {
protected override string Title => @"collections"; protected override string Title => @"collections";

View File

@ -8,7 +8,7 @@ using osu.Game.Graphics.UserInterface;
namespace osu.Game.Screens.Play.ReplaySettings namespace osu.Game.Screens.Play.ReplaySettings
{ {
public class DiscussionSettings : ReplaySettingsGroup public class DiscussionSettings : ReplayGroup
{ {
protected override string Title => @"discussions"; protected override string Title => @"discussions";
@ -17,7 +17,7 @@ namespace osu.Game.Screens.Play.ReplaySettings
{ {
Children = new Drawable[] Children = new Drawable[]
{ {
new ReplaySettingsCheckbox new ReplayCheckbox
{ {
LabelText = "Show floating comments", LabelText = "Show floating comments",
Bindable = config.GetBindable<bool>(OsuSetting.FloatingComments) Bindable = config.GetBindable<bool>(OsuSetting.FloatingComments)

View File

@ -7,7 +7,7 @@ using osu.Framework.Graphics;
namespace osu.Game.Screens.Play.ReplaySettings namespace osu.Game.Screens.Play.ReplaySettings
{ {
public class PlaybackSettings : ReplaySettingsGroup public class PlaybackSettings : ReplayGroup
{ {
protected override string Title => @"playback"; protected override string Title => @"playback";
@ -16,7 +16,7 @@ namespace osu.Game.Screens.Play.ReplaySettings
{ {
Children = new Drawable[] Children = new Drawable[]
{ {
new ReplaySettingsSliderBar<double>() new ReplaySliderBar<double>()
{ {
LabelText = "Playback speed", LabelText = "Playback speed",
Bindable = config.GetBindable<double>(OsuSetting.PlaybackSpeed) Bindable = config.GetBindable<double>(OsuSetting.PlaybackSpeed)

View File

@ -7,7 +7,7 @@ using osu.Game.Graphics.UserInterface;
namespace osu.Game.Screens.Play.ReplaySettings namespace osu.Game.Screens.Play.ReplaySettings
{ {
public class ReplaySettingsCheckbox : OsuCheckbox public class ReplayCheckbox : OsuCheckbox
{ {
[BackgroundDependencyLoader] [BackgroundDependencyLoader]
private void load(OsuColour colours) private void load(OsuColour colours)

View File

@ -13,7 +13,7 @@ using osu.Game.Graphics.UserInterface;
namespace osu.Game.Screens.Play.ReplaySettings namespace osu.Game.Screens.Play.ReplaySettings
{ {
public abstract class ReplaySettingsGroup : Container public abstract class ReplayGroup : Container
{ {
/// <summary> /// <summary>
/// The title to be displayed in the header of this group. /// The title to be displayed in the header of this group.
@ -33,7 +33,7 @@ namespace osu.Game.Screens.Play.ReplaySettings
private Color4 buttonActiveColour; private Color4 buttonActiveColour;
protected ReplaySettingsGroup() protected ReplayGroup()
{ {
AutoSizeAxes = Axes.Y; AutoSizeAxes = Axes.Y;
Width = container_width; Width = container_width;

View File

@ -10,7 +10,7 @@ using osu.Game.Overlays.Settings;
namespace osu.Game.Screens.Play.ReplaySettings namespace osu.Game.Screens.Play.ReplaySettings
{ {
public class ReplaySettingsSliderBar<T> : SettingsSlider<T> public class ReplaySliderBar<T> : SettingsSlider<T>
where T : struct, IEquatable<T> where T : struct, IEquatable<T>
{ {
protected override Drawable CreateControl() => new Sliderbar() protected override Drawable CreateControl() => new Sliderbar()

View File

@ -1,11 +1,12 @@
// Copyright (c) 2007-2017 ppy Pty Ltd <contact@ppy.sh>. // Copyright (c) 2007-2017 ppy Pty Ltd <contact@ppy.sh>.
// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE // Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
using OpenTK;
using osu.Framework.Graphics; using osu.Framework.Graphics;
using osu.Framework.Graphics.Containers; using osu.Framework.Graphics.Containers;
using osu.Game.Screens.Play.ReplaySettings;
using OpenTK;
namespace osu.Game.Screens.Play.ReplaySettings namespace osu.Game.Screens.Play
{ {
public class ReplaySettingsOverlay : FillFlowContainer public class ReplaySettingsOverlay : FillFlowContainer
{ {

View File

@ -8,7 +8,6 @@ using osu.Game.Graphics.UserInterface;
using osu.Game.Rulesets.Scoring; using osu.Game.Rulesets.Scoring;
using osu.Game.Screens.Play.HUD; using osu.Game.Screens.Play.HUD;
using OpenTK; using OpenTK;
using osu.Game.Screens.Play.ReplaySettings;
namespace osu.Game.Screens.Play namespace osu.Game.Screens.Play
{ {

View File

@ -244,11 +244,11 @@
<Compile Include="Screens\Play\HotkeyRetryOverlay.cs" /> <Compile Include="Screens\Play\HotkeyRetryOverlay.cs" />
<Compile Include="Screens\Play\ReplaySettings\CollectionSettings.cs" /> <Compile Include="Screens\Play\ReplaySettings\CollectionSettings.cs" />
<Compile Include="Screens\Play\ReplaySettings\DiscussionSettings.cs" /> <Compile Include="Screens\Play\ReplaySettings\DiscussionSettings.cs" />
<Compile Include="Screens\Play\ReplaySettings\ReplaySettingsGroup.cs" /> <Compile Include="Screens\Play\ReplaySettings\ReplayGroup.cs" />
<Compile Include="Screens\Play\ReplaySettings\ReplaySettingsOverlay.cs" /> <Compile Include="Screens\Play\ReplaySettingsOverlay.cs" />
<Compile Include="Screens\Play\ReplaySettings\ReplaySettingsSliderBar.cs" /> <Compile Include="Screens\Play\ReplaySettings\ReplaySliderBar.cs" />
<Compile Include="Screens\Play\ReplaySettings\PlaybackSettings.cs" /> <Compile Include="Screens\Play\ReplaySettings\PlaybackSettings.cs" />
<Compile Include="Screens\Play\ReplaySettings\ReplaySettingsCheckbox.cs" /> <Compile Include="Screens\Play\ReplaySettings\ReplayCheckbox.cs" />
<Compile Include="Screens\Play\PauseContainer.cs" /> <Compile Include="Screens\Play\PauseContainer.cs" />
<Compile Include="Screens\Play\SongProgressInfo.cs" /> <Compile Include="Screens\Play\SongProgressInfo.cs" />
<Compile Include="Screens\Play\HUD\ModDisplay.cs" /> <Compile Include="Screens\Play\HUD\ModDisplay.cs" />