Extract default preset on load

luttje · Jun 29, 2022 · 3f6dadb · 3f6dadb
1 parent e684fdf
commit 3f6dadb
Show file tree

Hide file tree

Showing 10 changed files with 390 additions and 17 deletions.
diff --git a/KeyToJoy/Config.cs b/KeyToJoy/Config.cs
@@ -68,6 +68,7 @@ public static void Load()
             if (!File.Exists(configPath))
             {
                 Instance = new Config();
+                Instance.isInitialized = true;
                 Instance.Save();
                 return;
             }

diff --git a/KeyToJoy/InitForm.cs b/KeyToJoy/InitForm.cs
@@ -16,6 +16,7 @@ public InitForm()
         private void InitForm_Load(object sender, EventArgs e)
         {
             Config.Load();
+            MappingPreset.ExtractDefaultIfNotExists();
             SimGamePad.Instance.Initialize();
             Program.GoToNextForm(new MainForm());
         }

diff --git a/KeyToJoy/KeyToJoy.csproj b/KeyToJoy/KeyToJoy.csproj
@@ -411,6 +411,7 @@
       <LastGenOutput>Resources.Designer.cs</LastGenOutput>
     </EmbeddedResource>
     <None Include="packages.config" />
+    <EmbeddedResource Include="default-profile.k2j.json" />
     <None Include="Properties\Settings.settings">
       <Generator>SettingsSingleFileGenerator</Generator>
       <LastGenOutput>Settings.Designer.cs</LastGenOutput>

diff --git a/KeyToJoy/MainForm.Designer.cs b/KeyToJoy/MainForm.Designer.cs
diff --git a/KeyToJoy/MainForm.cs b/KeyToJoy/MainForm.cs
@@ -377,11 +377,6 @@ private void savePresetToolStripMenuItem_Click(object sender, EventArgs e)
             MessageBox.Show("When you make changes to a preset, changes are automatically saved. This button is only here to explain that feature to you.", "Preset already saved!", MessageBoxButtons.OK, MessageBoxIcon.Information);
         }
 
-        private void savePresetCopyAsToolStripMenuItem_Click(object sender, EventArgs e)
-        {
-
-        }
-
         private void openPresetFolderToolStripMenuItem_Click(object sender, EventArgs e)
         {
             Process.Start(MappingPreset.GetSaveDirectory());

diff --git a/KeyToJoy/Mapping/MappingPreset.cs b/KeyToJoy/Mapping/MappingPreset.cs
@@ -6,6 +6,7 @@
 using System.ComponentModel;
 using System.IO;
 using System.Linq;
+using System.Reflection;
 
 namespace KeyToJoy.Mapping
 {
@@ -14,8 +15,10 @@ internal class MappingPreset
     {
         const int NO_VERSION = 0;
         const int CURRENT_VERSION = 4;
-
+
+        public const string DEFAULT_PRESET_PATH = "default-profile";
         public const string EXTENSION = ".k2j.json";
+
         public const string SAVE_DIR = "Presets";
 
         [JsonProperty]
@@ -93,6 +96,23 @@ private bool PostLoad(string filePath)
             return true;
         }
 
+        internal static void ExtractDefaultIfNotExists()
+        {
+            var defaultPath = Path.Combine(GetSaveDirectory(), $"{DEFAULT_PRESET_PATH}{EXTENSION}");
+
+            if (File.Exists(defaultPath))
+                return;
+
+            using (var file = new FileStream(defaultPath, FileMode.Create, FileAccess.Write))
+            using (var writer = new BinaryWriter(file))
+            {
+                writer.Write(Properties.Resources.default_profile_k2j);
+            }
+
+            if(Config.Instance.LastLoadedPreset == null)
+                Config.Instance.LastLoadedPreset = defaultPath;
+        }
+
         internal static MappingPreset Load(string filePath)
         {
             var serializer = GetSerializer();

diff --git a/KeyToJoy/Mapping/Triggers/Keyboard/KeyboardTriggerOptionsControl.cs b/KeyToJoy/Mapping/Triggers/Keyboard/KeyboardTriggerOptionsControl.cs
@@ -31,7 +31,7 @@ public KeyboardTriggerOptionsControl()
             cmbPressedState.DataSource = Enum.GetValues(typeof(PressState));
             cmbPressedState.SelectedIndex = 0;
 
-            ResetTrapping();
+            StartTrapping();
         }
 
         public void Select(BaseTrigger trigger)
@@ -54,6 +54,7 @@ public void Setup(BaseTrigger trigger)
         private void StartTrapping()
         {
             txtKeyBind.Text = TEXT_CHANGE;
+            txtKeyBind.Focus();
             isTrapping = true;
         }
 

diff --git a/KeyToJoy/Properties/Resources.Designer.cs b/KeyToJoy/Properties/Resources.Designer.cs
diff --git a/KeyToJoy/Properties/Resources.resx b/KeyToJoy/Properties/Resources.resx
@@ -139,4 +139,7 @@
   <data name="script_code" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Graphics\Icons\script_code.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
+  <data name="default_profile_k2j" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\default-profile.k2j.json;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
 </root>