save changes hotkeys

src/OneWare.ApplicationCommands/Serialization/KeyConfigItem.cs

@@ -0,0 +1,12 @@
+using Avalonia.Input;
+
+namespace OneWare.ApplicationCommands.Serialization;
+
+public class KeyConfigItem(string command, Key key, KeyModifiers keyModifiers)
+{
+    public string Command { get; init; } = command;
+
+    public Key Key { get; } = key;
+
+    public KeyModifiers KeyModifiers { get; } = keyModifiers;
+}

src/OneWare.ApplicationCommands/Serialization/KeyConfigSerializer.cs

@@ -0,0 +1,59 @@
+using System.Text.Json;
+using Avalonia.Input;
+using OneWare.SDK.Models;
+using OneWare.SDK.Services;
+using Prism.Ioc;
+
+namespace OneWare.ApplicationCommands.Serialization;
+
+public static class KeyConfigSerializer
+{
+    private static readonly JsonSerializerOptions Options = new()
+    {
+        WriteIndented = true,
+        PropertyNameCaseInsensitive = true,
+    };
+
+    public static void SaveHotkeys(string path, IList<IApplicationCommand> commands)
+    {
+        var ser = commands.Where(x => x.ActiveGesture != null && x.ActiveGesture != x.DefaultGesture)
+            .Select(x => new KeyConfigItem(x.Name, x.ActiveGesture!.Key, x.ActiveGesture.KeyModifiers))
+            .ToArray();
+
+        try
+        {
+            using var stream = File.OpenWrite(path);
+            JsonSerializer.Serialize(stream, ser, Options);
+        }
+        catch (Exception e)
+        {
+            ContainerLocator.Container.Resolve<ILogger>().Error(e.Message, e);
+        }
+    }
+
+    public static void LoadHotkeys(string path, IList<IApplicationCommand> commands)
+    {
+        if (!File.Exists(path)) return;
+
+        try
+        {
+            using var stream = File.OpenRead(path);
+            var hotkeys = JsonSerializer.Deserialize<KeyConfigItem[]>(stream, Options);
+
+            if (hotkeys == null) throw new Exception("Could not load Hotkey json");
+
+            foreach (var hotkey in hotkeys)
+            {
+                var selected = commands.FirstOrDefault(x => x.Name == hotkey.Command);
+                if (selected != null)
+                {
+                    selected.ActiveGesture = new KeyGesture(hotkey.Key, hotkey.KeyModifiers);
+                }
+            }
+        }
+        catch (Exception e)
+        {
+            ContainerLocator.Container.Resolve<ILogger>().Error(e.Message, e);
+        }
+    }
+}

src/OneWare.ApplicationCommands/Services/ApplicationCommandService.cs

@@ -2,6 +2,7 @@
 using Avalonia.Controls;
 using Avalonia.Input;
 using Avalonia.LogicalTree;
+using OneWare.ApplicationCommands.Serialization;
 using OneWare.SDK.Models;
 using OneWare.SDK.Services;
 
@@ -10,10 +11,14 @@ namespace OneWare.ApplicationCommands.Services;
 public class ApplicationCommandService : IApplicationCommandService
 {
     public ObservableCollection<IApplicationCommand> ApplicationCommands { get; } = new();
+
+    private readonly string _keyConfigFile;
 
-    public ApplicationCommandService()
+    public ApplicationCommandService(IPaths paths)
     {
         InputElement.KeyDownEvent.AddClassHandler<TopLevel>(HandleKeyDown);
+
+        _keyConfigFile = Path.Combine(paths.AppDataDirectory, "keyConfig.json");
     }
 
     public void RegisterCommand(IApplicationCommand command)
@@ -38,4 +43,14 @@ private void HandleKeyDown(object? sender, KeyEventArgs args)
             };
         }
     }
+
+    public void LoadKeyConfiguration()
+    {
+        KeyConfigSerializer.LoadHotkeys(_keyConfigFile, ApplicationCommands);
+    }
+
+    public void SaveKeyConfiguration()
+    {
+        KeyConfigSerializer.SaveHotkeys(_keyConfigFile, ApplicationCommands);
+    }
 }

src/OneWare.ApplicationCommands/ViewModels/AssignGestureViewModel.cs

@@ -9,9 +9,13 @@ namespace OneWare.ApplicationCommands.ViewModels;
 public partial class AssignGestureViewModel(IApplicationCommand command) : FlexibleWindowViewModelBase
 {
     public IApplicationCommand ApplicationCommand { get; } = command;
-
-    [ObservableProperty]
+
     private KeyGesture? _capturedKeyGesture = command.ActiveGesture;
+    public KeyGesture? CapturedKeyGesture
+    {
+        get => _capturedKeyGesture;
+        set => SetProperty(ref _capturedKeyGesture, value);
+    }
 
     public void Clear()
     {

src/OneWare.ApplicationCommands/ViewModels/CommandManagerViewModel.cs

@@ -20,6 +20,7 @@ public partial class CommandManagerViewModel : FlexibleWindowViewModelBase
 
     private readonly IProjectExplorerService _projectExplorerService;
     private readonly IWindowService _windowService;
+    private readonly IApplicationCommandService _applicationCommandService;
 
     public ILogical ActiveFocus { get; }
     public ObservableCollection<CommandManagerTabBase> Tabs { get; } = new();
@@ -31,6 +32,7 @@ public CommandManagerViewModel(ILogical logical, IApplicationCommandService comm
     {
         ActiveFocus = logical;
         _projectExplorerService = projectExplorerService;
+        _applicationCommandService = commandService;
         _windowService = windowService;
 
         Tabs.Add(new CommandManagerAllTab(logical)
@@ -88,6 +90,8 @@ await _windowService.ShowDialogAsync(new AssignGestureView()
             DataContext = new AssignGestureViewModel(SelectedTab.SelectedItem.Command)
         }, window.Host);
 
+        _applicationCommandService.SaveKeyConfiguration();
+
         window.Host?.Activate();
         window.CloseOnDeactivated = true;
     }

src/OneWare.Core/App.axaml.cs

@@ -275,7 +275,8 @@ protected override void ConfigureModuleCatalog(IModuleCatalog moduleCatalog)
         public override void OnFrameworkInitializationCompleted()
         {
             Container.Resolve<ISettingsService>().Load(Container.Resolve<IPaths>().SettingsPath);
-
+            Container.Resolve<IApplicationCommandService>().LoadKeyConfiguration();
+
             Container.Resolve<ISettingsService>().GetSettingObservable<string>("General_SelectedTheme").Subscribe(x =>
             {
                 TypeAssistanceIconStore.Instance.Load();

src/OneWare.SDK/Controls/HotkeyTextBox.cs

@@ -29,7 +29,6 @@ public HotkeyTextBox()
     protected override void OnGotFocus(GotFocusEventArgs e)
     {
         base.OnGotFocus(e);
-        CapturedKeyGesture = null;
     }
 
     protected override void OnPropertyChanged(AvaloniaPropertyChangedEventArgs change)

src/OneWare.SDK/Services/IApplicationCommandService.cs

@@ -7,4 +7,6 @@ public interface IApplicationCommandService
 {
     public ObservableCollection<IApplicationCommand> ApplicationCommands { get; }
     public void RegisterCommand(IApplicationCommand command);
+    public void LoadKeyConfiguration();
+    public void SaveKeyConfiguration();
 }