Rearrange options namespaces

2024-09-22 05:27:23 +08:00 · 2016-11-07 21:24:41 -05:00 · 2016-11-07 21:24:41 -05:00 · 1ce6a7285a
commit 1ce6a7285a
parent b2bbdfa284
31 changed files with 93 additions and 80 deletions
--- a/osu.Game/Overlays/Options/Audio/AudioDevicesOptions.cs
+++ b/osu.Game/Overlays/Options/Audio/AudioDevicesOptions.cs
@ -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
    {
--- a/osu.Game/Overlays/Options/Audio/AudioSection.cs
+++ b/osu.Game/Overlays/Options/Audio/AudioSection.cs
@ -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[]
            {
--- a/osu.Game/Overlays/Options/Audio/OffsetAdjustmentOptions.cs
+++ b/osu.Game/Overlays/Options/Audio/OffsetAdjustmentOptions.cs
@ -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
    {
--- a/osu.Game/Overlays/Options/Audio/VolumeOptions.cs
+++ b/osu.Game/Overlays/Options/Audio/VolumeOptions.cs
@ -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
    {
--- a/osu.Game/Overlays/Options/EditorSection.cs
+++ b/osu.Game/Overlays/Options/EditorSection.cs
@ -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[]
--- a/osu.Game/Overlays/Options/Gameplay/GameplaySection.cs
+++ b/osu.Game/Overlays/Options/Gameplay/GameplaySection.cs
@ -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[]
            {
--- a/osu.Game/Overlays/Options/Gameplay/GeneralGameplayOptions.cs
+++ b/osu.Game/Overlays/Options/Gameplay/GeneralGameplayOptions.cs
@ -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
    {
--- a/osu.Game/Overlays/Options/Gameplay/SongSelectGameplayOptions.cs
+++ b/osu.Game/Overlays/Options/Gameplay/SongSelectGameplayOptions.cs
@ -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
    {
--- a/osu.Game/Overlays/Options/General/GeneralSection.cs
+++ b/osu.Game/Overlays/Options/General/GeneralSection.cs
@ -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[]
            {
--- a/osu.Game/Overlays/Options/General/LanguageOptions.cs
+++ b/osu.Game/Overlays/Options/General/LanguageOptions.cs
@ -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
    {
--- a/osu.Game/Overlays/Options/General/LoginOptions.cs
+++ b/osu.Game/Overlays/Options/General/LoginOptions.cs
@ -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
    {
--- a/osu.Game/Overlays/Options/General/UpdateOptions.cs
+++ b/osu.Game/Overlays/Options/General/UpdateOptions.cs
@ -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
    {
--- a/osu.Game/Overlays/Options/Graphics/DetailOptions.cs
+++ b/osu.Game/Overlays/Options/Graphics/DetailOptions.cs
@ -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
    {
--- a/osu.Game/Overlays/Options/Graphics/GraphicsSection.cs
+++ b/osu.Game/Overlays/Options/Graphics/GraphicsSection.cs
@ -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[]
            {
--- a/osu.Game/Overlays/Options/Graphics/LayoutOptions.cs
+++ b/osu.Game/Overlays/Options/Graphics/LayoutOptions.cs
@ -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
    {
--- a/osu.Game/Overlays/Options/Graphics/MainMenuOptions.cs
+++ b/osu.Game/Overlays/Options/Graphics/MainMenuOptions.cs
@ -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
    {
--- a/osu.Game/Overlays/Options/Graphics/RendererOptions.cs
+++ b/osu.Game/Overlays/Options/Graphics/RendererOptions.cs
@ -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
    {
--- a/osu.Game/Overlays/Options/Graphics/SongSelectGraphicsOptions.cs
+++ b/osu.Game/Overlays/Options/Graphics/SongSelectGraphicsOptions.cs
@ -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
    {
--- a/osu.Game/Overlays/Options/Input/InputSection.cs
+++ b/osu.Game/Overlays/Options/Input/InputSection.cs
@ -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[]
            {
--- a/osu.Game/Overlays/Options/Input/KeyboardOptions.cs
+++ b/osu.Game/Overlays/Options/Input/KeyboardOptions.cs
@ -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
    {
--- a/osu.Game/Overlays/Options/Input/MouseOptions.cs
+++ b/osu.Game/Overlays/Options/Input/MouseOptions.cs
@ -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
    {
--- a/osu.Game/Overlays/Options/Input/OtherInputOptions.cs
+++ b/osu.Game/Overlays/Options/Input/OtherInputOptions.cs
@ -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
    {
--- a/osu.Game/Overlays/Options/MaintenanceSection.cs
+++ b/osu.Game/Overlays/Options/MaintenanceSection.cs
@ -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[]
--- a/osu.Game/Overlays/Options/Online/AlertsPrivacyOptions.cs
+++ b/osu.Game/Overlays/Options/Online/AlertsPrivacyOptions.cs
@ -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
    {
--- a/osu.Game/Overlays/Options/Online/InGameChatOptions.cs
+++ b/osu.Game/Overlays/Options/Online/InGameChatOptions.cs
@ -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
    {
--- a/osu.Game/Overlays/Options/Online/OnlineIntegrationOptions.cs
+++ b/osu.Game/Overlays/Options/Online/OnlineIntegrationOptions.cs
@ -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
    {
--- a/osu.Game/Overlays/Options/Online/OnlineSection.cs
+++ b/osu.Game/Overlays/Options/Online/OnlineSection.cs
@ -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[]
            {
--- a/osu.Game/Overlays/Options/OptionsSideNav.cs
+++ b/osu.Game/Overlays/Options/OptionsSideNav.cs
@ -68,6 +68,7 @@ namespace osu.Game.Overlays.Options
                    {
                        Anchor = Anchor.Centre,
                        Origin = Anchor.Centre,
+                        RelativeSizeAxes = Axes.Both,
                    },
                };
            }
--- a/osu.Game/Overlays/Options/SkinSection.cs
+++ b/osu.Game/Overlays/Options/SkinSection.cs
@ -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[]
--- a/osu.Game/Overlays/OptionsOverlay.cs
+++ b/osu.Game/Overlays/OptionsOverlay.cs
@ -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[]
--- a/osu.Game/osu.Game.csproj
+++ b/osu.Game/osu.Game.csproj
@ -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.