Merge pull request #34 from h0useRus/feature/Add-audio-config-by-default

- Removed Default program
h0useRus · Oct 27, 2023 · b35cfe9 · b35cfe9
2 parents 9789e76 + af636cc
commit b35cfe9
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 22 deletions.
diff --git a/SCTools/SCTools/Forms/LocalizationForm.cs b/SCTools/SCTools/Forms/LocalizationForm.cs
@@ -1,6 +1,5 @@
 using System;
 using System.Drawing;
-using System.Globalization;
 using System.IO;
 using System.Linq;
 using System.Windows.Forms;
@@ -69,26 +68,6 @@ private void LocalizationForm_Shown(object sender, EventArgs e)
                 _setAsDefaultLocalizationAppShown = true;
                 return;
             }
-            string? defaultLocalizationApp = LocalizationAppRegistry.GetDefaultLocalizationApp();
-            if (defaultLocalizationApp == null)
-            {
-                LocalizationAppRegistry.SetDefaultLocalizationApp(executablePath);
-            }
-            else if (!string.Equals(defaultLocalizationApp, executablePath, StringComparison.OrdinalIgnoreCase))
-            {
-                _setAsDefaultLocalizationAppShown = true;
-                var dialogResult = RtlAwareMessageBox.Show(this, string.Format(CultureInfo.CurrentUICulture, Resources.Localization_ChangeDefaultApp_Text, Program.Name),
-                    Resources.Localization_DefaultApp_Text, MessageBoxButtons.YesNoCancel, MessageBoxIcon.Question);
-                if (dialogResult != DialogResult.Cancel)
-                {
-                    Program.Settings.DefaultLocalizationAppChangeShown = true;
-                    Program.SaveAppSettings();
-                    if (dialogResult == DialogResult.Yes)
-                    {
-                        LocalizationAppRegistry.SetDefaultLocalizationApp(executablePath);
-                    }
-                }
-            }
         }
 
         private void cbRepository_SelectionChangeCommitted(object sender, EventArgs e)

diff --git a/SCTools/SCTools/user.cfg b/SCTools/SCTools/user.cfg
@@ -0,0 +1,2 @@
+g_language=korean_(south_korea)
+g_languageAudio=english
diff --git a/SCTools/SCToolsLib/Global/GameConstants.cs b/SCTools/SCToolsLib/Global/GameConstants.cs
@@ -6,12 +6,13 @@ public static class GameConstants
     {
         public const string BinFolderName = "Bin64";
         public const string DataFolderName = "data";
-        public const string LocalizationFolderName = "localization"; 
+        public const string LocalizationFolderName = "localization";
         public const string GameFolderName = "StarCitizen";
         public const string GameExeName = "StarCitizen.exe";
         public const string UserConfigName = "user.cfg";
         public const string GlobalIniName = "global.ini";
         public const string CurrentLanguageKey = "g_language";
+        public const string CurrentLanguageAudioKey = "g_languageAudio";
         public const string EnglishLocalization = "english";
 
         public static string GetGameModePath(string gamePath, GameMode mode) => Path.Combine(gamePath, mode.ToString());

diff --git a/SCTools/SCToolsLib/Localization/GameSettings.cs b/SCTools/SCToolsLib/Localization/GameSettings.cs
@@ -58,6 +58,7 @@ public bool SaveCurrentLanguage(string languageName)
                 var userConfigFile = new CfgFile(GameConstants.GetUserConfigPath(_currentGame.RootFolderPath));
                 var userConfigData = userConfigFile.Read();
                 userConfigData.AddOrUpdateRow(GameConstants.CurrentLanguageKey, languageName);
+                userConfigData.AddOrUpdateRow(GameConstants.CurrentLanguageAudioKey, GameConstants.EnglishLocalization);
                 if (userConfigFile.Save(userConfigData))
                 {
                     LanguageInfo.Current = languageName;