Rearrange options namespaces

This commit is contained in:
Drew DeVault 2016-11-07 21:24:41 -05:00
parent b2bbdfa284
commit 1ce6a7285a
31 changed files with 93 additions and 80 deletions

View File

@ -1,7 +1,7 @@
using System;
using osu.Framework.Graphics.Sprites;
namespace osu.Game.Overlays.Options
namespace osu.Game.Overlays.Options.Audio
{
public class AudioDevicesOptions : OptionsSubsection
{

View File

@ -2,14 +2,14 @@
using osu.Framework.Graphics;
using osu.Game.Graphics;
namespace osu.Game.Overlays.Options
namespace osu.Game.Overlays.Options.Audio
{
public class AudioOptions : OptionsSection
public class AudioSection : OptionsSection
{
protected override string Header => "Audio";
public override FontAwesome Icon => FontAwesome.fa_headphones;
public AudioOptions()
public AudioSection()
{
Children = new Drawable[]
{

View File

@ -3,7 +3,7 @@ using osu.Framework.Graphics;
using osu.Framework.Graphics.Sprites;
using osu.Game.Graphics.UserInterface;
namespace osu.Game.Overlays.Options
namespace osu.Game.Overlays.Options.Audio
{
public class OffsetAdjustmentOptions : OptionsSubsection
{

View File

@ -3,7 +3,7 @@ using osu.Framework.Graphics;
using osu.Framework.Graphics.Sprites;
using osu.Framework.Graphics.UserInterface;
namespace osu.Game.Overlays.Options
namespace osu.Game.Overlays.Options.Audio
{
public class VolumeOptions : OptionsSubsection
{

View File

@ -6,12 +6,12 @@ using osu.Game.Graphics;
namespace osu.Game.Overlays.Options
{
public class EditorOptions : OptionsSection
public class EditorSection : OptionsSection
{
protected override string Header => "Editor";
public override FontAwesome Icon => FontAwesome.fa_pencil;
public EditorOptions()
public EditorSection()
{
content.Spacing = new Vector2(0, 5);
Children = new Drawable[]

View File

@ -2,14 +2,14 @@
using osu.Framework.Graphics;
using osu.Game.Graphics;
namespace osu.Game.Overlays.Options
namespace osu.Game.Overlays.Options.Gameplay
{
public class GameplayOptions : OptionsSection
public class GameplaySection : OptionsSection
{
protected override string Header => "Gameplay";
public override FontAwesome Icon => FontAwesome.fa_circle_o;
public GameplayOptions()
public GameplaySection()
{
Children = new Drawable[]
{

View File

@ -3,7 +3,7 @@ using osu.Framework.Graphics;
using osu.Framework.Graphics.Sprites;
using osu.Framework.Graphics.UserInterface;
namespace osu.Game.Overlays.Options
namespace osu.Game.Overlays.Options.Gameplay
{
public class GeneralGameplayOptions : OptionsSubsection
{

View File

@ -2,7 +2,7 @@
using osu.Framework.Graphics;
using osu.Framework.Graphics.Sprites;
namespace osu.Game.Overlays.Options
namespace osu.Game.Overlays.Options.Gameplay
{
public class SongSelectGameplayOptions : OptionsSubsection
{

View File

@ -7,14 +7,14 @@ using osu.Framework.Platform;
using osu.Game.Graphics;
using osu.Game.Online.API;
namespace osu.Game.Overlays.Options
namespace osu.Game.Overlays.Options.General
{
public class GeneralOptions : OptionsSection
public class GeneralSection : OptionsSection
{
protected override string Header => "General";
public override FontAwesome Icon => FontAwesome.fa_gear;
public GeneralOptions()
public GeneralSection()
{
Children = new Drawable[]
{

View File

@ -3,7 +3,7 @@ using osu.Framework.Graphics;
using osu.Framework.Graphics.Sprites;
using osu.Framework.Graphics.UserInterface;
namespace osu.Game.Overlays.Options
namespace osu.Game.Overlays.Options.General
{
public class LanguageOptions : OptionsSubsection
{

View File

@ -9,7 +9,7 @@ using osu.Framework.Graphics.UserInterface;
using osu.Game.Graphics.UserInterface;
using osu.Game.Online.API;
namespace osu.Game.Overlays.Options
namespace osu.Game.Overlays.Options.General
{
public class LoginOptions : OptionsSubsection
{

View File

@ -7,7 +7,7 @@ using osu.Framework.Graphics.UserInterface;
using osu.Framework.Platform;
using osu.Game.Graphics.UserInterface;
namespace osu.Game.Overlays.Options
namespace osu.Game.Overlays.Options.General
{
public class UpdateOptions : OptionsSubsection
{

View File

@ -3,7 +3,7 @@ using osu.Framework.Graphics;
using osu.Framework.Graphics.Sprites;
using osu.Framework.Graphics.UserInterface;
namespace osu.Game.Overlays.Options
namespace osu.Game.Overlays.Options.Graphics
{
public class DetailOptions : OptionsSubsection
{

View File

@ -2,14 +2,14 @@
using osu.Framework.Graphics;
using osu.Game.Graphics;
namespace osu.Game.Overlays.Options
namespace osu.Game.Overlays.Options.Graphics
{
public class GraphicsOptions : OptionsSection
public class GraphicsSection : OptionsSection
{
protected override string Header => "Graphics";
public override FontAwesome Icon => FontAwesome.fa_laptop;
public GraphicsOptions()
public GraphicsSection()
{
Children = new Drawable[]
{

View File

@ -3,7 +3,7 @@ using osu.Framework.Graphics;
using osu.Framework.Graphics.Sprites;
using osu.Framework.Graphics.UserInterface;
namespace osu.Game.Overlays.Options
namespace osu.Game.Overlays.Options.Graphics
{
public class LayoutOptions : OptionsSubsection
{

View File

@ -1,7 +1,7 @@
using System;
using osu.Framework.Graphics.UserInterface;
namespace osu.Game.Overlays.Options
namespace osu.Game.Overlays.Options.Graphics
{
public class MainMenuOptions : OptionsSubsection
{

View File

@ -3,7 +3,7 @@ using osu.Framework.Graphics;
using osu.Framework.Graphics.Sprites;
using osu.Framework.Graphics.UserInterface;
namespace osu.Game.Overlays.Options
namespace osu.Game.Overlays.Options.Graphics
{
public class RendererOptions : OptionsSubsection
{

View File

@ -1,7 +1,7 @@
using System;
using osu.Framework.Graphics.UserInterface;
namespace osu.Game.Overlays.Options
namespace osu.Game.Overlays.Options.Graphics
{
public class SongSelectGraphicsOptions : OptionsSubsection
{

View File

@ -2,14 +2,14 @@
using osu.Framework.Graphics;
using osu.Game.Graphics;
namespace osu.Game.Overlays.Options
namespace osu.Game.Overlays.Options.Input
{
public class InputOptions : OptionsSection
public class InputSection : OptionsSection
{
protected override string Header => "Input";
public override FontAwesome Icon => FontAwesome.fa_keyboard_o;
public InputOptions()
public InputSection()
{
Children = new Drawable[]
{

View File

@ -2,7 +2,7 @@
using osu.Framework.Graphics;
using osu.Game.Graphics.UserInterface;
namespace osu.Game.Overlays.Options
namespace osu.Game.Overlays.Options.Input
{
public class KeyboardOptions : OptionsSubsection
{

View File

@ -3,7 +3,7 @@ using osu.Framework.Graphics;
using osu.Framework.Graphics.Sprites;
using osu.Framework.Graphics.UserInterface;
namespace osu.Game.Overlays.Options
namespace osu.Game.Overlays.Options.Input
{
public class MouseOptions : OptionsSubsection
{

View File

@ -2,7 +2,7 @@
using osu.Framework.Graphics;
using osu.Framework.Graphics.UserInterface;
namespace osu.Game.Overlays.Options
namespace osu.Game.Overlays.Options.Input
{
public class OtherInputOptions : OptionsSubsection
{

View File

@ -7,12 +7,12 @@ using osu.Game.Graphics.UserInterface;
namespace osu.Game.Overlays.Options
{
public class MaintenanceOptions : OptionsSection
public class MaintenanceSection : OptionsSection
{
protected override string Header => "Maintenance";
public override FontAwesome Icon => FontAwesome.fa_wrench;
public MaintenanceOptions()
public MaintenanceSection()
{
content.Spacing = new Vector2(0, 5);
Children = new Drawable[]

View File

@ -2,7 +2,7 @@
using osu.Framework.Graphics;
using osu.Framework.Graphics.UserInterface;
namespace osu.Game.Overlays.Options
namespace osu.Game.Overlays.Options.Online
{
public class AlertsPrivacyOptions : OptionsSubsection
{

View File

@ -3,7 +3,7 @@ using osu.Framework.Graphics;
using osu.Framework.Graphics.Sprites;
using osu.Framework.Graphics.UserInterface;
namespace osu.Game.Overlays.Options
namespace osu.Game.Overlays.Options.Online
{
public class InGameChatOptions : OptionsSubsection
{

View File

@ -2,7 +2,7 @@
using osu.Framework.Graphics;
using osu.Framework.Graphics.UserInterface;
namespace osu.Game.Overlays.Options
namespace osu.Game.Overlays.Options.Online
{
public class OnlineIntegrationOptions : OptionsSubsection
{

View File

@ -2,14 +2,14 @@
using osu.Framework.Graphics;
using osu.Game.Graphics;
namespace osu.Game.Overlays.Options
namespace osu.Game.Overlays.Options.Online
{
public class OnlineOptions : OptionsSection
public class OnlineSection : OptionsSection
{
protected override string Header => "Online";
public override FontAwesome Icon => FontAwesome.fa_globe;
public OnlineOptions()
public OnlineSection()
{
Children = new Drawable[]
{

View File

@ -68,6 +68,7 @@ namespace osu.Game.Overlays.Options
{
Anchor = Anchor.Centre,
Origin = Anchor.Centre,
RelativeSizeAxes = Axes.Both,
},
};
}

View File

@ -8,12 +8,12 @@ using osu.Game.Graphics.UserInterface;
namespace osu.Game.Overlays.Options
{
public class SkinOptions : OptionsSection
public class SkinSection : OptionsSection
{
protected override string Header => "Skin";
public override FontAwesome Icon => FontAwesome.fa_paint_brush;
public SkinOptions()
public SkinSection()
{
content.Spacing = new Vector2(0, 5);
Children = new Drawable[]

View File

@ -18,6 +18,12 @@ using osu.Framework.Platform;
using osu.Game.Configuration;
using osu.Game.Online.API;
using osu.Game.Overlays.Options;
using osu.Game.Overlays.Options.Audio;
using osu.Game.Overlays.Options.Gameplay;
using osu.Game.Overlays.Options.General;
using osu.Game.Overlays.Options.Graphics;
using osu.Game.Overlays.Options.Input;
using osu.Game.Overlays.Options.Online;
namespace osu.Game.Overlays
{
@ -40,15 +46,15 @@ namespace osu.Game.Overlays
var sections = new OptionsSection[]
{
new GeneralOptions(),
new GraphicsOptions(),
new GameplayOptions(),
new AudioOptions(),
new SkinOptions(),
new InputOptions(),
new EditorOptions(),
new OnlineOptions(),
new MaintenanceOptions(),
new GeneralSection(),
new GraphicsSection(),
new GameplaySection(),
new AudioSection(),
new SkinSection(),
new InputSection(),
new EditorSection(),
new OnlineSection(),
new MaintenanceSection(),
};
Children = new Drawable[]

View File

@ -197,39 +197,39 @@
<Compile Include="Database\BeatmapMetadata.cs" />
<Compile Include="Database\BeatmapInfo.cs" />
<Compile Include="Database\BaseDifficulty.cs" />
<Compile Include="Overlays\Options\LoginOptions.cs" />
<Compile Include="Overlays\Options\GeneralOptions.cs" />
<Compile Include="Overlays\Options\LanguageOptions.cs" />
<Compile Include="Overlays\Options\UpdateOptions.cs" />
<Compile Include="Overlays\Options\GraphicsOptions.cs" />
<Compile Include="Graphics\UserInterface\OsuButton.cs" />
<Compile Include="Overlays\Options\RendererOptions.cs" />
<Compile Include="Overlays\Options\LayoutOptions.cs" />
<Compile Include="Overlays\Options\DetailOptions.cs" />
<Compile Include="Overlays\Options\MainMenuOptions.cs" />
<Compile Include="Overlays\Options\SongSelectGraphicsOptions.cs" />
<Compile Include="Overlays\Options\GameplayOptions.cs" />
<Compile Include="Overlays\Options\GeneralGameplayOptions.cs" />
<Compile Include="Overlays\Options\SongSelectGameplayOptions.cs" />
<Compile Include="Overlays\Options\AudioOptions.cs" />
<Compile Include="Overlays\Options\AudioDevicesOptions.cs" />
<Compile Include="Overlays\Options\VolumeOptions.cs" />
<Compile Include="Overlays\Options\OffsetAdjustmentOptions.cs" />
<Compile Include="Overlays\Options\SkinOptions.cs" />
<Compile Include="Overlays\Options\InputOptions.cs" />
<Compile Include="Overlays\Options\MouseOptions.cs" />
<Compile Include="Overlays\Options\KeyboardOptions.cs" />
<Compile Include="Overlays\Options\OtherInputOptions.cs" />
<Compile Include="Overlays\Options\EditorOptions.cs" />
<Compile Include="Overlays\Options\OnlineOptions.cs" />
<Compile Include="Overlays\Options\AlertsPrivacyOptions.cs" />
<Compile Include="Overlays\Options\OnlineIntegrationOptions.cs" />
<Compile Include="Overlays\Options\InGameChatOptions.cs" />
<Compile Include="Overlays\Options\MaintenanceOptions.cs" />
<Compile Include="Overlays\Options\MaintenanceSection.cs" />
<Compile Include="Overlays\Options\OptionsSection.cs" />
<Compile Include="Overlays\Options\OptionsSubsection.cs" />
<Compile Include="Graphics\UserInterface\LoadingAnimation.cs" />
<Compile Include="Overlays\Options\OptionsSideNav.cs" />
<Compile Include="Overlays\Options\General\GeneralSection.cs" />
<Compile Include="Overlays\Options\General\LoginOptions.cs" />
<Compile Include="Overlays\Options\General\UpdateOptions.cs" />
<Compile Include="Overlays\Options\General\LanguageOptions.cs" />
<Compile Include="Overlays\Options\Graphics\GraphicsSection.cs" />
<Compile Include="Overlays\Options\Graphics\RendererOptions.cs" />
<Compile Include="Overlays\Options\Graphics\LayoutOptions.cs" />
<Compile Include="Overlays\Options\Graphics\DetailOptions.cs" />
<Compile Include="Overlays\Options\Graphics\MainMenuOptions.cs" />
<Compile Include="Overlays\Options\Graphics\SongSelectGraphicsOptions.cs" />
<Compile Include="Overlays\Options\Gameplay\GameplaySection.cs" />
<Compile Include="Overlays\Options\Gameplay\GeneralGameplayOptions.cs" />
<Compile Include="Overlays\Options\Gameplay\SongSelectGameplayOptions.cs" />
<Compile Include="Overlays\Options\Audio\AudioSection.cs" />
<Compile Include="Overlays\Options\Audio\AudioDevicesOptions.cs" />
<Compile Include="Overlays\Options\Audio\VolumeOptions.cs" />
<Compile Include="Overlays\Options\Audio\OffsetAdjustmentOptions.cs" />
<Compile Include="Overlays\Options\Input\InputSection.cs" />
<Compile Include="Overlays\Options\Input\MouseOptions.cs" />
<Compile Include="Overlays\Options\Input\KeyboardOptions.cs" />
<Compile Include="Overlays\Options\Input\OtherInputOptions.cs" />
<Compile Include="Overlays\Options\Online\OnlineSection.cs" />
<Compile Include="Overlays\Options\Online\AlertsPrivacyOptions.cs" />
<Compile Include="Overlays\Options\Online\OnlineIntegrationOptions.cs" />
<Compile Include="Overlays\Options\Online\InGameChatOptions.cs" />
<Compile Include="Overlays\Options\EditorSection.cs" />
<Compile Include="Overlays\Options\SkinSection.cs" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="$(SolutionDir)\osu-framework\osu.Framework\osu.Framework.csproj">
@ -251,6 +251,12 @@
<ItemGroup />
<ItemGroup>
<Folder Include="Overlays\Options\" />
<Folder Include="Overlays\Options\General\" />
<Folder Include="Overlays\Options\Graphics\" />
<Folder Include="Overlays\Options\Gameplay\" />
<Folder Include="Overlays\Options\Audio\" />
<Folder Include="Overlays\Options\Input\" />
<Folder Include="Overlays\Options\Online\" />
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.