Merge pull request #146 from SirCmpwn/options-wired-up

Wire up one of the settings to the config

osu.Desktop.VisualTests/Program.cs

@@ -13,9 +13,11 @@ namespace osu.Desktop.VisualTests
         [STAThread]
         public static void Main(string[] args)
         {
-            BasicGameHost host = Host.GetSuitableHost(@"osu-visual-tests");
+            using (BasicGameHost host = Host.GetSuitableHost(@"osu-visual-tests"))
+            {
                 host.Add(new VisualTestGame());
                 host.Run();
             }
         }
     }
+}

osu.Desktop/Program.cs

@@ -18,8 +18,8 @@ namespace osu.Desktop
         [STAThread]
         public static int Main(string[] args)
         {
-            DesktopGameHost host = Host.GetSuitableHost(@"osu", true);
+            using (DesktopGameHost host = Host.GetSuitableHost(@"osu", true))
-
+            {
                 if (!host.IsPrimaryInstance)
                 {
                     var importer = new BeatmapImporter(host);
@@ -35,8 +35,8 @@ namespace osu.Desktop
                     host.Add(osu);
                     host.Run();
                 }
-
                 return 0;
             }
         }
     }
+}

osu.Game/Configuration/OsuConfigManager.cs

@@ -163,7 +163,16 @@ namespace osu.Game.Configuration
             Set(OsuConfig.LetterboxPositionX, 0, -100, 100);
             Set(OsuConfig.LetterboxPositionY, 0, -100, 100);
             //Set(OsuConfig.FrameSync, FrameSync.Limit120);
-            //Set(OsuConfig.ShowUnicode, unicodeDefault);
+            bool unicodeDefault = false;
+            switch (Get<string>(OsuConfig.Language))
+            {
+                case @"zh":
+                case @"ja":
+                case @"ko":
+                    unicodeDefault = true;
+                    break;
+            }
+            Set(OsuConfig.ShowUnicode, unicodeDefault);
             Set(OsuConfig.PermanentSongInfo, false);
             Set(OsuConfig.Ticker, false);
             Set(OsuConfig.CompatibilityContext, false);

osu.Game/Overlays/Options/CheckBoxOption.cs

@@ -0,0 +1,53 @@
+using System;
+using osu.Framework.Configuration;
+using osu.Framework.Graphics.UserInterface;
+
+namespace osu.Game.Overlays.Options
+{
+    public class CheckBoxOption : BasicCheckBox
+    {
+        private Bindable<bool> bindable;
+        
+        public Bindable<bool> Bindable
+        {
+            set
+            {
+                if (bindable != null)
+                    bindable.ValueChanged -= bindableValueChanged;
+                bindable = value;
+                if (bindable != null)
+                {
+                    bool state = State == CheckBoxState.Checked;
+                    if (state != bindable.Value)
+                        State = bindable.Value ? CheckBoxState.Checked : CheckBoxState.Unchecked;
+                    bindable.ValueChanged += bindableValueChanged;
+                }
+            }
+        }
+
        private void bindableValueChanged(object sender, EventArgs e)
+        {
+            State = bindable.Value ? CheckBoxState.Checked : CheckBoxState.Unchecked;
+        }
+        
+        protected override void Dispose(bool isDisposing)
+        {
+            if (bindable != null)
+                bindable.ValueChanged -= bindableValueChanged;
+            base.Dispose(isDisposing);
+        }
+        
+        protected override void OnChecked()
+        {
+            if (bindable != null)
+                bindable.Value = true;
+            base.OnChecked();
+        }
+        
+        protected override void OnUnchecked()
+        {
+            if (bindable != null)
+                bindable.Value = false;
+            base.OnChecked();
+        }
+    }
+}

osu.Game/Overlays/Options/General/LanguageOptions.cs

@@ -1,21 +1,33 @@
-using osu.Framework.Graphics;
+using osu.Framework;
+using osu.Framework.Graphics;
 using osu.Framework.Graphics.Sprites;
-using osu.Framework.Graphics.UserInterface;
 
 namespace osu.Game.Overlays.Options.General
 {
     public class LanguageOptions : OptionsSubsection
     {
         protected override string Header => "Language";
+
        private CheckBoxOption showUnicode, altChatFont;
     
         public LanguageOptions()
         {
             Children = new Drawable[]
             {
                 new SpriteText { Text = "TODO: Dropdown" },
-                new BasicCheckBox { LabelText = "Prefer metadata in original language" },
+                showUnicode = new CheckBoxOption { LabelText = "Prefer metadata in original language" },
-                new BasicCheckBox { LabelText = "Use alternative font for chat display" },
+                altChatFont = new CheckBoxOption { LabelText = "Use alternative font for chat display" },
             };
         }
+        
+        protected override void Load(BaseGame game)
+        {
+            base.Load(game);
+            var osuGame = game as OsuGameBase;
+            if (osuGame != null)
+            {
+                showUnicode.Bindable = osuGame.Config.GetBindable<bool>(Configuration.OsuConfig.ShowUnicode);
+                altChatFont.Bindable = osuGame.Config.GetBindable<bool>(Configuration.OsuConfig.AlternativeChatFont);
+            }
+        }
     }
 }

osu.Game/osu.Game.csproj

@@ -231,6 +231,7 @@
     <Compile Include="Overlays\Options\SkinSection.cs" />
     <Compile Include="Overlays\Options\Online\PrivacyOptions.cs" />
     <Compile Include="Overlays\Options\Online\NotificationsOptions.cs" />
+    <Compile Include="Overlays\Options\CheckBoxOption.cs" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="$(SolutionDir)\osu-framework\osu.Framework\osu.Framework.csproj">