Use the customized voice name immediately.

tifish · Jun 15, 2024 · 8b2f8ae · 8b2f8ae
1 parent af8fc1a
commit 8b2f8ae
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 7 deletions.
diff --git a/EditAliasesForm.cs b/EditAliasesForm.cs
@@ -16,11 +16,13 @@ public EditAliasesForm(string stratagemName)
     private void okButton_Click(object sender, EventArgs e)
     {
         StratagemManager.SetUserAlias(_stratagemName, userAliasesTextBox.Text.Trim());
+        DialogResult = DialogResult.OK;
         Close();
     }
 
     private void cancelButton_Click(object sender, EventArgs e)
     {
+        DialogResult = DialogResult.Cancel;
         Close();
     }
 }
diff --git a/MainForm.cs b/MainForm.cs
@@ -430,7 +430,7 @@ private void InitStratagemGroups()
                 stratagem.CheckBox = stratagemCheckBox;
                 root.Controls.Add(stratagemCheckBox);
 
-                stratagemCheckBox.MouseUp += (_, args) =>
+                stratagemCheckBox.MouseUp += async (_, args) =>
                 {
                     switch (args.Button)
                     {
@@ -457,7 +457,9 @@ private void InitStratagemGroups()
                                 break;
                             }
                         case MouseButtons.Right:
-                            new EditAliasesForm(stratagemCheckBox.Text).ShowDialog();
+                            var result = new EditAliasesForm(stratagemCheckBox.Text).ShowDialog();
+                            if (result == DialogResult.OK)
+                                await ResetVoiceCommand();
                             break;
                     }
                 };

diff --git a/StratagemManager.cs b/StratagemManager.cs
@@ -77,7 +77,6 @@ private static void LoadStratagems()
     private static void LoadUserAliases()
     {
         _userAliasesDictionary.Clear();
-        _userAliasStratagemDictionary.Clear();
 
         if (!File.Exists(UserAliasesFile))
             return;
@@ -88,12 +87,22 @@ private static void LoadUserAliases()
             if (items.Length != 2)
                 throw new InvalidOperationException($"Invalid line: {line}");
 
-            if (!TryGet(items[0], out var stratagem))
-                continue;
-
             _userAliasesDictionary[items[0]] = items[1];
+        }
+
+        UpdateUserAliases();
+    }
+
+    private static void UpdateUserAliases()
+    {
+        _userAliasStratagemDictionary.Clear();
+
+        foreach (var (name, aliasesString) in _userAliasesDictionary)
+        {
+            if (!TryGet(name, out var stratagem))
+                continue;
 
-            var aliases = items[1].Split('|').Where(item => item != "");
+            var aliases = aliasesString.Split('|').Where(item => item != "");
             foreach (var alias in aliases)
                 _userAliasStratagemDictionary[alias] = stratagem;
         }
@@ -135,6 +144,7 @@ public static void SetUserAlias(string stratagemName, string alias)
         else
             _userAliasesDictionary[stratagemName] = alias;
 
+        UpdateUserAliases();
         SaveUserAliases();
     }
 }