Refactor hotkey selection and display logic

Co-authored-by: toniolo.luca <toniolo.luca@outlook.com>

Author: cursoragent

src/Captura.Hotkeys/HotKey.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Linq;
 using System.Windows.Forms;
 using Captura.Native;
@@ -68,9 +68,27 @@ public void Register()
             }
         }
 
-        public Keys Key { get; private set; }
+        Keys _key;
+        public Keys Key
+        {
+            get => _key;
+            private set
+            {
+                _key = value;
+                OnPropertyChanged();
+            }
+        }
 
-        public Modifiers Modifiers { get; private set; }
+        Modifiers _modifiers;
+        public Modifiers Modifiers
+        {
+            get => _modifiers;
+            private set
+            {
+                _modifiers = value;
+                OnPropertyChanged();
+            }
+        }
 
         public void Change(Keys NewKey, Modifiers NewModifiers)
         {

src/Captura.ViewCore/ViewModels/HotkeysViewModel.cs

@@ -1,4 +1,5 @@
-using System.Collections.ObjectModel;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
 using System.Windows.Input;
 using Captura.Hotkeys;
 using Reactive.Bindings;
@@ -10,6 +11,8 @@ public class HotkeysViewModel
     {
         public ReadOnlyObservableCollection<Hotkey> Hotkeys { get; }
 
+        public IEnumerable<Service> AllServices => HotKeyManager.AllServices;
+
         public HotkeysViewModel(HotKeyManager HotKeyManager)
         {
             Hotkeys = HotKeyManager.Hotkeys;

src/Captura/Controls/HotkeySelector.cs

@@ -33,6 +33,13 @@ static void HotkeyModelChangedCallback(DependencyObject Sender, DependencyProper
                 {
                     if (E.PropertyName == nameof(Hotkey.IsActive))
                         selector.TextColor();
+                    
+                    // Update display when Key or Modifiers change
+                    if (E.PropertyName == nameof(Hotkey.Key) || E.PropertyName == nameof(Hotkey.Modifiers))
+                    {
+                        if (!selector._editing)
+                            selector.Content = hotkey.ToString();
+                    }
                 };
 
                 selector.Content = hotkey.ToString();

src/Captura/Pages/HotkeysPage.xaml

@@ -3,7 +3,7 @@
       xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
       xmlns:local="clr-namespace:Captura"
       xmlns:hotkeys="clr-namespace:Captura.Hotkeys;assembly=Captura.Hotkeys"
-      DataContext="{Binding HotKeyManager, Source={StaticResource ServiceLocator}}">
+      DataContext="{Binding HotkeysViewModel, Source={StaticResource ServiceLocator}}">
     <Grid>
         <DockPanel Margin="5">
             <Grid DockPanel.Dock="Top">
@@ -61,7 +61,7 @@
                                 <local:ModernButton DockPanel.Dock="Right"
                                                     CommandParameter="{Binding}"
                                                     IconData="{Binding Icons.Close, Source={StaticResource ServiceLocator}}"
-                                                    Command="{Binding HotKeyManager.RemoveCommand, Source={StaticResource ServiceLocator}}">
+                                                    Command="{Binding DataContext.RemoveCommand, RelativeSource={RelativeSource AncestorType=Page}}">
                                     <local:ModernButton.LayoutTransform>
                                         <ScaleTransform ScaleX="0.8" ScaleY="0.8"/>
                                     </local:ModernButton.LayoutTransform>