From dd0cb5da01b50678a0d9472c4b4ddcd3a680d114 Mon Sep 17 00:00:00 2001
From: Drew DeVault <sir@cmpwn.com>
Date: Wed, 2 Nov 2016 19:25:00 -0400
Subject: [PATCH] Add options from old osu

---
 osu.Game/Configuration/OsuConfigManager.cs | 124 ++++++++++++++++++++-
 osu.Game/Overlays/Options.cs               |   1 +
 2 files changed, 119 insertions(+), 6 deletions(-)

diff --git a/osu.Game/Configuration/OsuConfigManager.cs b/osu.Game/Configuration/OsuConfigManager.cs
index 44fd251dd1..59f1dabf21 100644
--- a/osu.Game/Configuration/OsuConfigManager.cs
+++ b/osu.Game/Configuration/OsuConfigManager.cs
@@ -34,15 +34,127 @@ namespace osu.Game.Configuration
 
     enum OsuConfig
     {
-        Width,
-        Height,
-        MouseSensitivity,
+        // General
+        //  Sign in
         Username,
         Password,
-        Token,
-        PlayMode,
+        //  Language
+        Language,
+        PreferOriginalForMetadata,
+        AlternativeChatFont,
+        //  Updates
+        ReleaseStream,
+        // Graphics
+        //  Renderer
+        FrameLimiter,
+        FPSCounter,
+        ReduceDroppedFrames,
+        DetectPerformanceIssues,
+        //  Layout
+        Width,
+        Height,
+        EnableFullscreen,
+        EnableLetterboxing,
+        HorizontalPosition,
+        VerticalPosition,
+        //  Detail settings
+        EnableSnakingSliders,
+        EnableBackgroundVideo,
+        EnableStoryboards,
+        EnableComboBursts,
+        EnableHitLighting,
+        EnableShaders,
+        EnableSofteningFilter,
+        ScreenshotFormat,
+        //  Main menu
+        EnableMenuSnow,
+        EnableMenuParallax,
+        EnableMenuTips,
+        EnableInterfaceVoices,
+        EnableOsuMusicTheme,
+        //  Song select
+        EnableSongSelectThumbnails,
+        // Gameplay
+        //  General
+        BackgroundDim,
+        ProgressDisplay,
+        ScoreMeterType,
+        ScoreMeterSize,
+        AlwaysShowKeyOverlay,
+        ShowFirstHiddenApproachCircle,
+        ScaleManiaScrollSpeed,
+        RememberManiaScrollSpeed,
+        //  Song select
+        SongSelectMinimumStars,
+        SongSelectMaximumStars,
+        // Audio
+        //  Devices
+        OutputDevice,
+        //  Volume
         VolumeGlobal,
         VolumeEffect,
-        VolumeMusic
+        VolumeMusic,
+        IgnoreBeatmapHitsounds,
+        //  Offset
+        UniversalOffset,
+        // Skin
+        SelectedSkin,
+        IgnoreBeatmapSkins,
+        UseSkinAudioSamples,
+        UseTaikoSkin,
+        UseSkinCursor,
+        CursorSize,
+        EnableAutomaticCursorSize,
+        // Input
+        //  Mouse
+        MouseSensitivity,
+        EnableRawInput,
+        EnableMapRawInputToWindow,
+        MouseConfinementMode,
+        DisableMouseWheelInPlay,
+        DisableMouseButtonsInPlay,
+        EnableCursorRipples,
+        //  Keyboard
+        // TODO
+        //  Other
+        UseOSTabletSupport,
+        EnableWiimoteDrumSupport,
+        // Editor
+        EnableEditorBackgroundVideo,
+        EnableEditorDefaultSkin,
+        EnableEditorSnakingSliders,
+        EnableEditorHitAnimations,
+        EnableEditorFollowPoints,
+        EnableEditorStacking,
+        // Online
+        //  Alerts and Privacy
+        EnableChatTicker,
+        HideChatDuringPlay,
+        EnableNotifyOnMention,
+        EnableSoundOnMention,
+        EnableChatNotifications,
+        EnableCitySharing,
+        EnableSpectators,
+        AutoLinkBeatmapsToSpectators,
+        ShowNotificationsDuringPlay,
+        ShowFriendOnlineStatusNotifications,
+        AllowAnyMultiplayerInvites,
+        //  Integration
+        EnableYahooIntegration,
+        EnableMSNLiveIntegration,
+        AutoStartOsuDirect,
+        PreferNoVideo,
+        //  In-game chat
+        EnableWordFilter,
+        EnableForeignFilter,
+        EnablePrivateMessageLog,
+        BlockStrangerPrivateMessages,
+        ChatIgnoreList,
+        ChatHighlightList,
+        // Maintenance
+        // (no persisted options)
+        // Misc (not mapped to user-visible options)
+        Token,
+        PlayMode,
     }
 }
diff --git a/osu.Game/Overlays/Options.cs b/osu.Game/Overlays/Options.cs
index 19bb73e393..6e8fb7461e 100644
--- a/osu.Game/Overlays/Options.cs
+++ b/osu.Game/Overlays/Options.cs
@@ -46,6 +46,7 @@ namespace osu.Game.Overlays
                 {
                     RelativeSizeAxes = Axes.Both,
                     Padding = new MarginPadding { Left = 5, Right = 5, Top = 50 },
+                    ScrollDraggerOnLeft = true,
                     Children = new[]
                     {
                         optionsContainer = new FlowContainer