Change all instances of options to settings where applicable

osu.Game/Overlays/Settings/Sections/Audio/AudioDevicesSettings.cs

@@ -0,0 +1,71 @@
+// Copyright (c) 2007-2017 ppy Pty Ltd <contact@ppy.sh>.
+// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
+
+using osu.Framework.Allocation;
+using osu.Framework.Audio;
+using osu.Framework.Graphics;
+using System.Collections.Generic;
+using System.Linq;
+
+namespace osu.Game.Overlays.Settings.Sections.Audio
+{
+    public class AudioDevicesSettings : SettingsSubsection
+    {
+        protected override string Header => "Devices";
+
+        private AudioManager audio;
+        private SettingsDropdown<string> dropdown;
+
+        [BackgroundDependencyLoader]
+        private void load(AudioManager audio)
+        {
+            this.audio = audio;
+        }
+
+        protected override void Dispose(bool isDisposing)
+        {
+            base.Dispose(isDisposing);
+
+            audio.OnNewDevice -= onDeviceChanged;
+            audio.OnLostDevice -= onDeviceChanged;
+        }
+
+        private void updateItems()
+        {
+            var deviceItems = new List<KeyValuePair<string, string>> { new KeyValuePair<string, string>("Default", string.Empty) };
+            deviceItems.AddRange(audio.AudioDeviceNames.Select(d => new KeyValuePair<string, string>(d, d)));
+
+            var preferredDeviceName = audio.AudioDevice.Value;
+            if (deviceItems.All(kv => kv.Value != preferredDeviceName))
+                deviceItems.Add(new KeyValuePair<string, string>(preferredDeviceName, preferredDeviceName));
+
+            // The option dropdown for audio device selection lists all audio
+            // device names. Dropdowns, however, may not have multiple identical
+            // keys. Thus, we remove duplicate audio device names from
+            // the dropdown. BASS does not give us a simple mechanism to select
+            // specific audio devices in such a case anyways. Such
+            // functionality would require involved OS-specific code.
+            dropdown.Items = deviceItems.Distinct().ToList();
+        }
+
+        private void onDeviceChanged(string name) => updateItems();
+
+        protected override void LoadComplete()
+        {
+            base.LoadComplete();
+
+            Children = new Drawable[]
+            {
+                dropdown = new SettingsDropdown<string>
+                {
+                    Bindable = audio.AudioDevice
+                },
+            };
+
+            updateItems();
+
+            audio.OnNewDevice += onDeviceChanged;
+            audio.OnLostDevice += onDeviceChanged;
+        }
+    }
+}

osu.Game/Overlays/Settings/Sections/Audio/MainMenuSettings.cs

@@ -0,0 +1,31 @@
+// Copyright (c) 2007-2017 ppy Pty Ltd <contact@ppy.sh>.
+// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
+
+using osu.Framework.Allocation;
+using osu.Game.Configuration;
+
+namespace osu.Game.Overlays.Settings.Sections.Audio
+{
+    public class MainMenuSettings : SettingsSubsection
+    {
+        protected override string Header => "Main Menu";
+
+        [BackgroundDependencyLoader]
+        private void load(OsuConfigManager config)
+        {
+            Children = new[]
+            {
+                new SettingsCheckbox
+                {
+                    LabelText = "Interface voices",
+                    Bindable = config.GetBindable<bool>(OsuConfig.MenuVoice)
+                },
+                new SettingsCheckbox
+                {
+                    LabelText = "osu! music theme",
+                    Bindable = config.GetBindable<bool>(OsuConfig.MenuMusic)
+                },
+            };
+        }
+    }
+}

osu.Game/Overlays/Settings/Sections/Audio/OffsetSettings.cs

@@ -0,0 +1,38 @@
+// Copyright (c) 2007-2017 ppy Pty Ltd <contact@ppy.sh>.
+// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
+
+using osu.Framework.Allocation;
+using osu.Framework.Graphics;
+using osu.Game.Configuration;
+using osu.Game.Graphics.UserInterface;
+
+namespace osu.Game.Overlays.Settings.Sections.Audio
+{
+    public class OffsetSettings : SettingsSubsection
+    {
+        protected override string Header => "Offset Adjustment";
+
+        [BackgroundDependencyLoader]
+        private void load(OsuConfigManager config)
+        {
+            Children = new Drawable[]
+            {
+                new SettingsSlider<double, OffsetSlider>
+                {
+                    LabelText = "Audio Offset",
+                    Bindable = config.GetBindable<double>(OsuConfig.AudioOffset)
+                },
+                new OsuButton
+                {
+                    RelativeSizeAxes = Axes.X,
+                    Text = "Offset wizard"
+                }
+            };
+        }
+
+        private class OffsetSlider : OsuSliderBar<double>
+        {
+            public override string TooltipText => Current.Value.ToString(@"0ms");
+        }
+    }
+}

osu.Game/Overlays/Settings/Sections/Audio/VolumeSettings.cs

@@ -0,0 +1,25 @@
+// Copyright (c) 2007-2017 ppy Pty Ltd <contact@ppy.sh>.
+// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
+
+using osu.Framework.Allocation;
+using osu.Framework.Audio;
+using osu.Framework.Graphics;
+
+namespace osu.Game.Overlays.Settings.Sections.Audio
+{
+    public class VolumeSettings : SettingsSubsection
+    {
+        protected override string Header => "Volume";
+
+        [BackgroundDependencyLoader]
+        private void load(AudioManager audio)
+        {
+            Children = new Drawable[]
+            {
+                new SettingsSlider<double> { LabelText = "Master", Bindable = audio.Volume },
+                new SettingsSlider<double> { LabelText = "Effect", Bindable = audio.VolumeSample },
+                new SettingsSlider<double> { LabelText = "Music", Bindable = audio.VolumeTrack },
+            };
+        }
+    }
+}

osu.Game/Overlays/Settings/Sections/AudioSection.cs

@@ -0,0 +1,26 @@
+// Copyright (c) 2007-2017 ppy Pty Ltd <contact@ppy.sh>.
+// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
+
+using osu.Framework.Graphics;
+using osu.Game.Graphics;
+using osu.Game.Overlays.Settings.Sections.Audio;
+
+namespace osu.Game.Overlays.Settings.Sections
+{
+    public class AudioSection : SettingsSection
+    {
+        public override string Header => "Audio";
+        public override FontAwesome Icon => FontAwesome.fa_headphones;
+
+        public AudioSection()
+        {
+            Children = new Drawable[]
+            {
+                new AudioDevicesSettings(),
+                new VolumeSettings(),
+                new OffsetSettings(),
+                new MainMenuSettings(),
+            };
+        }
+    }
+}

osu.Game/Overlays/Settings/Sections/Debug/GCSettings.cs

@@ -0,0 +1,36 @@
+// Copyright (c) 2007-2017 ppy Pty Ltd <contact@ppy.sh>.
+// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
+
+using System;
+using System.Runtime;
+using osu.Framework.Allocation;
+using osu.Framework.Configuration;
+using osu.Framework.Graphics;
+using osu.Game.Graphics.UserInterface;
+
+namespace osu.Game.Overlays.Settings.Sections.Debug
+{
+    public class GCSettings : SettingsSubsection
+    {
+        protected override string Header => "Garbage Collector";
+
+        [BackgroundDependencyLoader]
+        private void load(FrameworkDebugConfigManager config)
+        {
+            Children = new Drawable[]
+            {
+                new SettingsEnumDropdown<GCLatencyMode>
+                {
+                    LabelText = "Active mode",
+                    Bindable = config.GetBindable<GCLatencyMode>(FrameworkDebugConfig.ActiveGCMode)
+                },
+                new OsuButton
+                {
+                    RelativeSizeAxes = Axes.X,
+                    Text = "Force garbage collection",
+                    Action = () => GC.Collect()
+                },
+            };
+        }
+    }
+}

osu.Game/Overlays/Settings/Sections/Debug/GeneralSettings.cs

@@ -0,0 +1,27 @@
+// Copyright (c) 2007-2017 ppy Pty Ltd <contact@ppy.sh>.
+// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
+
+using osu.Framework.Allocation;
+using osu.Framework.Configuration;
+using osu.Framework.Graphics;
+
+namespace osu.Game.Overlays.Settings.Sections.Debug
+{
+    public class GeneralSettings : SettingsSubsection
+    {
+        protected override string Header => "General";
+
+        [BackgroundDependencyLoader]
+        private void load(FrameworkDebugConfigManager config)
+        {
+            Children = new Drawable[]
+            {
+                new SettingsCheckbox
+                {
+                    LabelText = "Bypass caching",
+                    Bindable = config.GetBindable<bool>(FrameworkDebugConfig.BypassCaching)
+                }
+            };
+        }
+    }
+}

osu.Game/Overlays/Settings/Sections/DebugSection.cs

@@ -0,0 +1,24 @@
+// Copyright (c) 2007-2017 ppy Pty Ltd <contact@ppy.sh>.
+// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
+
+using osu.Framework.Graphics;
+using osu.Game.Graphics;
+using osu.Game.Overlays.Settings.Sections.Debug;
+
+namespace osu.Game.Overlays.Settings.Sections
+{
+    public class DebugSection : SettingsSection
+    {
+        public override string Header => "Debug";
+        public override FontAwesome Icon => FontAwesome.fa_bug;
+
+        public DebugSection()
+        {
+            Children = new Drawable[]
+            {
+                new GeneralSettings(),
+                new GCSettings(),
+            };
+        }
+    }
+}

osu.Game/Overlays/Settings/Sections/Gameplay/GeneralSettings.cs

@@ -0,0 +1,37 @@
+// Copyright (c) 2007-2017 ppy Pty Ltd <contact@ppy.sh>.
+// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
+
+using osu.Framework.Allocation;
+using osu.Framework.Graphics;
+using osu.Game.Configuration;
+
+namespace osu.Game.Overlays.Settings.Sections.Gameplay
+{
+    public class GeneralSettings : SettingsSubsection
+    {
+        protected override string Header => "General";
+
+        [BackgroundDependencyLoader]
+        private void load(OsuConfigManager config)
+        {
+            Children = new Drawable[]
+            {
+                new SettingsSlider<double>
+                {
+                    LabelText = "Background dim",
+                    Bindable = config.GetBindable<double>(OsuConfig.DimLevel)
+                },
+                new SettingsCheckbox
+                {
+                    LabelText = "Show score overlay",
+                    Bindable = config.GetBindable<bool>(OsuConfig.ShowInterface)
+                },
+                new SettingsCheckbox
+                {
+                    LabelText = "Always show key overlay",
+                    Bindable = config.GetBindable<bool>(OsuConfig.KeyOverlay)
+                },
+            };
+        }
+    }
+}

osu.Game/Overlays/Settings/Sections/Gameplay/SongSelectSettings.cs

@@ -0,0 +1,39 @@
+// Copyright (c) 2007-2017 ppy Pty Ltd <contact@ppy.sh>.
+// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
+
+using osu.Framework.Allocation;
+using osu.Framework.Graphics;
+using osu.Game.Configuration;
+using osu.Game.Graphics.UserInterface;
+
+namespace osu.Game.Overlays.Settings.Sections.Gameplay
+{
+    public class SongSelectSettings : SettingsSubsection
+    {
+        protected override string Header => "Song Select";
+
+        [BackgroundDependencyLoader]
+        private void load(OsuConfigManager config)
+        {
+            Children = new Drawable[]
+            {
+                new SettingsSlider<double, StarSlider>
+                {
+                    LabelText = "Display beatmaps from",
+                    Bindable = config.GetBindable<double>(OsuConfig.DisplayStarsMinimum)
+                },
+                new SettingsSlider<double, StarSlider>
+                {
+                    LabelText = "up to",
+                    Bindable = config.GetBindable<double>(OsuConfig.DisplayStarsMaximum)
+                },
+            };
+        }
+
+        private class StarSlider : OsuSliderBar<double>
+        {
+            public override string TooltipText => Current.Value.ToString(@"0.## stars");
+        }
+    }
+}
+

osu.Game/Overlays/Settings/Sections/GameplaySection.cs

@@ -0,0 +1,24 @@
+// Copyright (c) 2007-2017 ppy Pty Ltd <contact@ppy.sh>.
+// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
+
+using osu.Framework.Graphics;
+using osu.Game.Graphics;
+using osu.Game.Overlays.Settings.Sections.Gameplay;
+
+namespace osu.Game.Overlays.Settings.Sections
+{
+    public class GameplaySection : SettingsSection
+    {
+        public override string Header => "Gameplay";
+        public override FontAwesome Icon => FontAwesome.fa_circle_o;
+
+        public GameplaySection()
+        {
+            Children = new Drawable[]
+            {
+                new GeneralSettings(),
+                new SongSelectSettings(),
+            };
+        }
+    }
+}

osu.Game/Overlays/Settings/Sections/General/LanguageSettings.cs

@@ -0,0 +1,27 @@
+// Copyright (c) 2007-2017 ppy Pty Ltd <contact@ppy.sh>.
+// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
+
+using osu.Framework.Allocation;
+using osu.Framework.Configuration;
+using osu.Framework.Graphics;
+
+namespace osu.Game.Overlays.Settings.Sections.General
+{
+    public class LanguageSettings : SettingsSubsection
+    {
+        protected override string Header => "Language";
+
+        [BackgroundDependencyLoader]
+        private void load(FrameworkConfigManager frameworkConfig)
+        {
+            Children = new Drawable[]
+            {
+                new SettingsCheckbox
+                {
+                    LabelText = "Prefer metadata in original language",
+                    Bindable = frameworkConfig.GetBindable<bool>(FrameworkSetting.ShowUnicode)
+                },
+            };
+        }
+    }
+}

osu.Game/Overlays/Settings/Sections/General/LoginSettings.cs

@@ -0,0 +1,174 @@
+// Copyright (c) 2007-2017 ppy Pty Ltd <contact@ppy.sh>.
+// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
+
+using osu.Framework.Allocation;
+using osu.Framework.Graphics;
+using osu.Framework.Graphics.Containers;
+using osu.Framework.Graphics.Primitives;
+using osu.Framework.Graphics.UserInterface;
+using osu.Game.Configuration;
+using osu.Game.Graphics.Sprites;
+using osu.Game.Graphics.UserInterface;
+using osu.Game.Online.API;
+using OpenTK;
+using osu.Framework.Input;
+
+namespace osu.Game.Overlays.Settings.Sections.General
+{
+    public class LoginSettings : SettingsSubsection, IOnlineComponent
+    {
+        private bool bounding = true;
+        private LoginForm form;
+
+        protected override string Header => "Account";
+
+        public override RectangleF BoundingBox => bounding ? base.BoundingBox : RectangleF.Empty;
+
+        public bool Bounding
+        {
+            get { return bounding; }
+            set
+            {
+                bounding = value;
+                Invalidate(Invalidation.Geometry);
+            }
+        }
+
+        [BackgroundDependencyLoader(permitNulls: true)]
+        private void load(APIAccess api)
+        {
+            api?.Register(this);
+        }
+
+        public void APIStateChanged(APIAccess api, APIState state)
+        {
+            form = null;
+
+            switch (state)
+            {
+                case APIState.Offline:
+                    Children = new Drawable[]
+                    {
+                        form = new LoginForm()
+                    };
+                    break;
+                case APIState.Failing:
+                    Children = new Drawable[]
+                    {
+                        new OsuSpriteText
+                        {
+                            Text = "Connection failing :(",
+                        },
+                    };
+                    break;
+                case APIState.Connecting:
+                    Children = new Drawable[]
+                    {
+                        new OsuSpriteText
+                        {
+                            Text = "Connecting...",
+                        },
+                    };
+                    break;
+                case APIState.Online:
+                    Children = new Drawable[]
+                    {
+                        new OsuSpriteText
+                        {
+                            Text = $"Connected as {api.Username}!",
+                        },
+                        new OsuButton
+                        {
+                            RelativeSizeAxes = Axes.X,
+                            Text = "Sign out",
+                            Action = api.Logout
+                        }
+                    };
+                    break;
+            }
+
+            form?.TriggerFocus();
+        }
+
+        protected override bool OnFocus(InputState state)
+        {
+            form?.TriggerFocus();
+            return base.OnFocus(state);
+        }
+
+        private class LoginForm : FillFlowContainer
+        {
+            private TextBox username;
+            private TextBox password;
+            private APIAccess api;
+
+            private void performLogin()
+            {
+                if (!string.IsNullOrEmpty(username.Text) && !string.IsNullOrEmpty(password.Text))
+                    api.Login(username.Text, password.Text);
+            }
+
+            [BackgroundDependencyLoader(permitNulls: true)]
+            private void load(APIAccess api, OsuConfigManager config)
+            {
+                this.api = api;
+                Direction = FillDirection.Vertical;
+                Spacing = new Vector2(0, 5);
+                AutoSizeAxes = Axes.Y;
+                RelativeSizeAxes = Axes.X;
+                Children = new Drawable[]
+                {
+                    username = new OsuTextBox
+                    {
+                        PlaceholderText = "Username",
+                        RelativeSizeAxes = Axes.X,
+                        Text = api?.Username ?? string.Empty,
+                        TabbableContentContainer = this
+                    },
+                    password = new OsuPasswordTextBox
+                    {
+                        PlaceholderText = "Password",
+                        RelativeSizeAxes = Axes.X,
+                        TabbableContentContainer = this,
+                        OnCommit = (sender, newText) => performLogin()
+                    },
+                    new SettingsCheckbox
+                    {
+                        LabelText = "Remember username",
+                        Bindable = config.GetBindable<bool>(OsuConfig.SaveUsername),
+                    },
+                    new SettingsCheckbox
+                    {
+                        LabelText = "Stay logged in",
+                        Bindable = config.GetBindable<bool>(OsuConfig.SavePassword),
+                    },
+                    new OsuButton
+                    {
+                        RelativeSizeAxes = Axes.X,
+                        Text = "Sign in",
+                        Action = performLogin
+                    },
+                    new OsuButton
+                    {
+                        RelativeSizeAxes = Axes.X,
+                        Text = "Register new account",
+                        //Action = registerLink
+                    }
+                };
+            }
+
+            protected override bool OnFocus(InputState state)
+            {
+                Schedule(() =>
+                {
+                    if (string.IsNullOrEmpty(username.Text))
+                        username.TriggerFocus();
+                    else
+                        password.TriggerFocus();
+                });
+
+                return base.OnFocus(state);
+            }
+        }
+    }
+}

osu.Game/Overlays/Settings/Sections/General/UpdateSettings.cs

@@ -0,0 +1,36 @@
+// Copyright (c) 2007-2017 ppy Pty Ltd <contact@ppy.sh>.
+// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
+
+using osu.Framework.Allocation;
+using osu.Framework.Graphics;
+using osu.Framework.Platform;
+using osu.Game.Configuration;
+using osu.Game.Graphics.UserInterface;
+
+namespace osu.Game.Overlays.Settings.Sections.General
+{
+    public class UpdateSettings : SettingsSubsection
+    {
+        protected override string Header => "Updates";
+
+        [BackgroundDependencyLoader]
+        private void load(Storage storage, OsuConfigManager config)
+        {
+            Children = new Drawable[]
+            {
+                new SettingsEnumDropdown<ReleaseStream>
+                {
+                    LabelText = "Release stream",
+                    Bindable = config.GetBindable<ReleaseStream>(OsuConfig.ReleaseStream),
+                },
+                new OsuButton
+                {
+                    RelativeSizeAxes = Axes.X,
+                    Text = "Open osu! folder",
+                    Action = () => storage.OpenInNativeExplorer(),
+                }
+            };
+        }
+    }
+}
+

osu.Game/Overlays/Settings/Sections/GeneralSection.cs

@@ -0,0 +1,25 @@
+// Copyright (c) 2007-2017 ppy Pty Ltd <contact@ppy.sh>.
+// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
+
+using osu.Framework.Graphics;
+using osu.Game.Graphics;
+using osu.Game.Overlays.Settings.Sections.General;
+
+namespace osu.Game.Overlays.Settings.Sections
+{
+    public class GeneralSection : SettingsSection
+    {
+        public override string Header => "General";
+        public override FontAwesome Icon => FontAwesome.fa_gear;
+
+        public GeneralSection()
+        {
+            Children = new Drawable[]
+            {
+                new LanguageSettings(),
+                new UpdateSettings(),
+            };
+        }
+    }
+}
+

osu.Game/Overlays/Settings/Sections/Graphics/DetailSettings.cs

@@ -0,0 +1,32 @@
+// Copyright (c) 2007-2017 ppy Pty Ltd <contact@ppy.sh>.
+// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
+
+using osu.Framework.Allocation;
+using osu.Framework.Graphics;
+using osu.Game.Configuration;
+
+namespace osu.Game.Overlays.Settings.Sections.Graphics
+{
+    public class DetailSettings : SettingsSubsection
+    {
+        protected override string Header => "Detail Settings";
+
+        [BackgroundDependencyLoader]
+        private void load(OsuConfigManager config)
+        {
+            Children = new Drawable[]
+            {
+                new SettingsCheckbox
+                {
+                    LabelText = "Snaking in sliders",
+                    Bindable = config.GetBindable<bool>(OsuConfig.SnakingInSliders)
+                },
+                new SettingsCheckbox
+                {
+                    LabelText = "Snaking out sliders",
+                    Bindable = config.GetBindable<bool>(OsuConfig.SnakingOutSliders)
+                },
+            };
+        }
+    }
+}

osu.Game/Overlays/Settings/Sections/Graphics/LayoutSettings.cs

@@ -0,0 +1,66 @@
+// Copyright (c) 2007-2017 ppy Pty Ltd <contact@ppy.sh>.
+// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
+
+using osu.Framework.Allocation;
+using osu.Framework.Configuration;
+using osu.Framework.Graphics;
+
+namespace osu.Game.Overlays.Settings.Sections.Graphics
+{
+    public class LayoutSettings : SettingsSubsection
+    {
+        protected override string Header => "Layout";
+
+        private SettingsSlider<double> letterboxPositionX;
+        private SettingsSlider<double> letterboxPositionY;
+
+        private Bindable<bool> letterboxing;
+
+        [BackgroundDependencyLoader]
+        private void load(FrameworkConfigManager config)
+        {
+            letterboxing = config.GetBindable<bool>(FrameworkSetting.Letterboxing);
+
+            Children = new Drawable[]
+            {
+                new SettingsEnumDropdown<WindowMode>
+                {
+                    LabelText = "Screen mode",
+                    Bindable = config.GetBindable<WindowMode>(FrameworkSetting.WindowMode),
+                },
+                new SettingsCheckbox
+                {
+                    LabelText = "Letterboxing",
+                    Bindable = letterboxing,
+                },
+                letterboxPositionX = new SettingsSlider<double>
+                {
+                    LabelText = "Horizontal position",
+                    Bindable = config.GetBindable<double>(FrameworkSetting.LetterboxPositionX)
+                },
+                letterboxPositionY = new SettingsSlider<double>
+                {
+                    LabelText = "Vertical position",
+                    Bindable = config.GetBindable<double>(FrameworkSetting.LetterboxPositionY)
+                },
+            };
+
+            letterboxing.ValueChanged += visibilityChanged;
+            letterboxing.TriggerChange();
+        }
+
+        private void visibilityChanged(bool newVisibility)
+        {
+            if (newVisibility)
+            {
+                letterboxPositionX.Show();
+                letterboxPositionY.Show();
+            }
+            else
+            {
+                letterboxPositionX.Hide();
+                letterboxPositionY.Hide();
+            }
+        }
+    }
+}

osu.Game/Overlays/Settings/Sections/Graphics/MainMenuSettings.cs

@@ -0,0 +1,26 @@
+// Copyright (c) 2007-2017 ppy Pty Ltd <contact@ppy.sh>.
+// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
+
+using osu.Framework.Allocation;
+using osu.Game.Configuration;
+
+namespace osu.Game.Overlays.Settings.Sections.Graphics
+{
+    public class MainMenuSettings : SettingsSubsection
+    {
+        protected override string Header => "User Interface";
+
+        [BackgroundDependencyLoader]
+        private void load(OsuConfigManager config)
+        {
+            Children = new[]
+            {
+                new SettingsCheckbox
+                {
+                    LabelText = "Parallax",
+                    Bindable = config.GetBindable<bool>(OsuConfig.MenuParallax)
+                },
+            };
+        }
+    }
+}

osu.Game/Overlays/Settings/Sections/Graphics/RendererSettings.cs

@@ -0,0 +1,35 @@
+// Copyright (c) 2007-2017 ppy Pty Ltd <contact@ppy.sh>.
+// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
+
+using osu.Framework.Allocation;
+using osu.Framework.Configuration;
+using osu.Framework.Graphics;
+using osu.Game.Configuration;
+
+namespace osu.Game.Overlays.Settings.Sections.Graphics
+{
+    public class RendererSettings : SettingsSubsection
+    {
+        protected override string Header => "Renderer";
+
+        [BackgroundDependencyLoader]
+        private void load(FrameworkConfigManager config, OsuConfigManager osuConfig)
+        {
+            // NOTE: Compatability mode omitted
+            Children = new Drawable[]
+            {
+                // TODO: this needs to be a custom dropdown at some point
+                new SettingsEnumDropdown<FrameSync>
+                {
+                    LabelText = "Frame limiter",
+                    Bindable = config.GetBindable<FrameSync>(FrameworkSetting.FrameSync)
+                },
+                new SettingsCheckbox
+                {
+                    LabelText = "Show FPS",
+                    Bindable = osuConfig.GetBindable<bool>(OsuConfig.ShowFpsDisplay)
+                },
+            };
+        }
+    }
+}

osu.Game/Overlays/Settings/Sections/GraphicsSection.cs

@@ -0,0 +1,27 @@
+// Copyright (c) 2007-2017 ppy Pty Ltd <contact@ppy.sh>.
+// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
+
+using osu.Framework.Graphics;
+using osu.Game.Graphics;
+using osu.Game.Overlays.Settings.Sections.Graphics;
+
+namespace osu.Game.Overlays.Settings.Sections
+{
+    public class GraphicsSection : SettingsSection
+    {
+        public override string Header => "Graphics";
+        public override FontAwesome Icon => FontAwesome.fa_laptop;
+
+        public GraphicsSection()
+        {
+            Children = new Drawable[]
+            {
+                new RendererSettings(),
+                new LayoutSettings(),
+                new DetailSettings(),
+                new MainMenuSettings(),
+            };
+        }
+    }
+}
+

osu.Game/Overlays/Settings/Sections/Input/KeyboardSettings.cs

@@ -0,0 +1,25 @@
+// Copyright (c) 2007-2017 ppy Pty Ltd <contact@ppy.sh>.
+// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
+
+using osu.Framework.Graphics;
+using osu.Game.Graphics.UserInterface;
+
+namespace osu.Game.Overlays.Settings.Sections.Input
+{
+    public class KeyboardSettings : SettingsSubsection
+    {
+        protected override string Header => "Keyboard";
+
+        public KeyboardSettings()
+        {
+            Children = new Drawable[]
+            {
+                new OsuButton
+                {
+                    RelativeSizeAxes = Axes.X,
+                    Text = "Key Configuration"
+                },
+            };
+        }
+    }
+}

osu.Game/Overlays/Settings/Sections/Input/MouseSettings.cs

@@ -0,0 +1,45 @@
+// Copyright (c) 2007-2017 ppy Pty Ltd <contact@ppy.sh>.
+// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
+
+using osu.Framework.Allocation;
+using osu.Framework.Configuration;
+using osu.Framework.Graphics;
+using osu.Framework.Input;
+using osu.Game.Configuration;
+using osu.Game.Graphics.UserInterface;
+
+namespace osu.Game.Overlays.Settings.Sections.Input
+{
+    public class MouseSettings : SettingsSubsection
+    {
+        protected override string Header => "Mouse";
+
+        [BackgroundDependencyLoader]
+        private void load(OsuConfigManager osuConfig, FrameworkConfigManager config)
+        {
+            Children = new Drawable[]
+            {
+                new SettingsEnumDropdown<ConfineMouseMode>
+                {
+                    LabelText = "Confine mouse cursor",
+                    Bindable = config.GetBindable<ConfineMouseMode>(FrameworkSetting.ConfineMouseMode),
+                },
+                new SettingsCheckbox
+                {
+                    LabelText = "Disable mouse wheel during gameplay",
+                    Bindable = osuConfig.GetBindable<bool>(OsuConfig.MouseDisableWheel)
+                },
+                new SettingsCheckbox
+                {
+                    LabelText = "Disable mouse buttons during gameplay",
+                    Bindable = osuConfig.GetBindable<bool>(OsuConfig.MouseDisableButtons)
+                },
+            };
+        }
+
+        private class SensitivitySlider : OsuSliderBar<double>
+        {
+            public override string TooltipText => Current.Value.ToString(@"0.##x");
+        }
+    }
+}

osu.Game/Overlays/Settings/Sections/InputSection.cs

@@ -0,0 +1,25 @@
+// Copyright (c) 2007-2017 ppy Pty Ltd <contact@ppy.sh>.
+// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
+
+using osu.Framework.Graphics;
+using osu.Game.Graphics;
+using osu.Game.Overlays.Settings.Sections.Input;
+
+namespace osu.Game.Overlays.Settings.Sections
+{
+    public class InputSection : SettingsSection
+    {
+        public override string Header => "Input";
+        public override FontAwesome Icon => FontAwesome.fa_keyboard_o;
+
+        public InputSection()
+        {
+            Children = new Drawable[]
+            {
+                new MouseSettings(),
+                new KeyboardSettings(),
+            };
+        }
+    }
+}
+

osu.Game/Overlays/Settings/Sections/MaintenanceSection.cs

@@ -0,0 +1,23 @@
+// Copyright (c) 2007-2017 ppy Pty Ltd <contact@ppy.sh>.
+// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
+
+using osu.Framework.Graphics;
+using osu.Game.Graphics;
+using OpenTK;
+
+namespace osu.Game.Overlays.Settings.Sections
+{
+    public class MaintenanceSection : SettingsSection
+    {
+        public override string Header => "Maintenance";
+        public override FontAwesome Icon => FontAwesome.fa_wrench;
+
+        public MaintenanceSection()
+        {
+            FlowContent.Spacing = new Vector2(0, 5);
+            Children = new Drawable[]
+            {
+            };
+        }
+    }
+}

osu.Game/Overlays/Settings/Sections/OnlineSection.cs

@@ -0,0 +1,21 @@
+// Copyright (c) 2007-2017 ppy Pty Ltd <contact@ppy.sh>.
+// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
+
+using osu.Framework.Graphics;
+using osu.Game.Graphics;
+
+namespace osu.Game.Overlays.Settings.Sections
+{
+    public class OnlineSection : SettingsSection
+    {
+        public override string Header => "Online";
+        public override FontAwesome Icon => FontAwesome.fa_globe;
+
+        public OnlineSection()
+        {
+            Children = new Drawable[]
+            {
+            };
+        }
+    }
+}

osu.Game/Overlays/Settings/Sections/SkinSection.cs

@@ -0,0 +1,42 @@
+// Copyright (c) 2007-2017 ppy Pty Ltd <contact@ppy.sh>.
+// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
+
+using osu.Framework.Allocation;
+using osu.Framework.Graphics;
+using osu.Game.Configuration;
+using osu.Game.Graphics;
+using osu.Game.Graphics.UserInterface;
+using OpenTK;
+
+namespace osu.Game.Overlays.Settings.Sections
+{
+    public class SkinSection : SettingsSection
+    {
+        public override string Header => "Skin";
+        public override FontAwesome Icon => FontAwesome.fa_paint_brush;
+
+        [BackgroundDependencyLoader]
+        private void load(OsuConfigManager config)
+        {
+            FlowContent.Spacing = new Vector2(0, 5);
+            Children = new Drawable[]
+            {
+                new SettingsSlider<double, SizeSlider>
+                {
+                    LabelText = "Menu cursor size",
+                    Bindable = config.GetBindable<double>(OsuConfig.MenuCursorSize)
+                },
+                new SettingsSlider<double, SizeSlider>
+                {
+                    LabelText = "Gameplay cursor size",
+                    Bindable = config.GetBindable<double>(OsuConfig.GameplayCursorSize)
+                },
+            };
+        }
+
+        private class SizeSlider : OsuSliderBar<double>
+        {
+            public override string TooltipText => Current.Value.ToString(@"0.##x");
+        }
+    }
+}