From cb56b9822268a4020564b871caed5116a482c4b3 Mon Sep 17 00:00:00 2001
From: bao-qian <bao.github@outlook.com>
Date: Sun, 22 May 2016 20:50:06 +0100
Subject: [PATCH] Databinding for hotkey tab

part of #660
---
 Wox.Core/UserSettings/PluginHotkey.cs   |  2 +
 Wox.Core/UserSettings/PluginSettings.cs |  2 +
 Wox.Core/UserSettings/Settings.cs       |  3 +-
 Wox/CustomQueryHotkeySetting.xaml.cs    |  4 +-
 Wox/SettingWindow.xaml                  | 76 ++++++++++++-------------
 Wox/SettingWindow.xaml.cs               | 33 +++++------
 Wox/ViewModel/SettingWindowViewModel.cs | 14 +++--
 7 files changed, 66 insertions(+), 68 deletions(-)

diff --git a/Wox.Core/UserSettings/PluginHotkey.cs b/Wox.Core/UserSettings/PluginHotkey.cs
index cedeaf0886..02b607b11a 100644
--- a/Wox.Core/UserSettings/PluginHotkey.cs
+++ b/Wox.Core/UserSettings/PluginHotkey.cs
@@ -1,7 +1,9 @@
 using System;
+using PropertyChanged;
 
 namespace Wox.Core.UserSettings
 {
+    [ImplementPropertyChanged]
     public class CustomPluginHotkey
     {
         public string Hotkey { get; set; }
diff --git a/Wox.Core/UserSettings/PluginSettings.cs b/Wox.Core/UserSettings/PluginSettings.cs
index bc19879129..0d9430325b 100644
--- a/Wox.Core/UserSettings/PluginSettings.cs
+++ b/Wox.Core/UserSettings/PluginSettings.cs
@@ -1,10 +1,12 @@
 using System.Collections.Generic;
 using System.Linq;
+using PropertyChanged;
 using Wox.Core.Plugin;
 using Wox.Plugin;
 
 namespace Wox.Core.UserSettings
 {
+    [ImplementPropertyChanged]
     public class PluginsSettings
     {
         public string PythonDirectory { get; set; }
diff --git a/Wox.Core/UserSettings/Settings.cs b/Wox.Core/UserSettings/Settings.cs
index 068e8217a9..3ca977abfd 100644
--- a/Wox.Core/UserSettings/Settings.cs
+++ b/Wox.Core/UserSettings/Settings.cs
@@ -1,5 +1,6 @@
 using System;
 using System.Collections.Generic;
+using System.Collections.ObjectModel;
 using System.Drawing;
 using Newtonsoft.Json;
 using PropertyChanged;
@@ -31,7 +32,7 @@ namespace Wox.Core.UserSettings
         // Order defaults to 0 or -1, so 1 will let this property appear last
         [JsonProperty(Order = 1)]
         public PluginsSettings PluginSettings { get; set; } = new PluginsSettings();
-        public List<CustomPluginHotkey> CustomPluginHotkeys { get; set; } = new List<CustomPluginHotkey>();
+        public ObservableCollection<CustomPluginHotkey> CustomPluginHotkeys { get; set; } = new ObservableCollection<CustomPluginHotkey>();
 
         [Obsolete]
         public double Opacity { get; set; } = 1;
diff --git a/Wox/CustomQueryHotkeySetting.xaml.cs b/Wox/CustomQueryHotkeySetting.xaml.cs
index 0132756ab4..48194359ff 100644
--- a/Wox/CustomQueryHotkeySetting.xaml.cs
+++ b/Wox/CustomQueryHotkeySetting.xaml.cs
@@ -1,5 +1,6 @@
 using System;
 using System.Collections.Generic;
+using System.Collections.ObjectModel;
 using System.Linq;
 using System.Windows;
 using NHotkey;
@@ -41,7 +42,7 @@ namespace Wox
 
                 if (_settings.CustomPluginHotkeys == null)
                 {
-                    _settings.CustomPluginHotkeys = new List<CustomPluginHotkey>();
+                    _settings.CustomPluginHotkeys = new ObservableCollection<CustomPluginHotkey>();
                 }
 
                 var pluginHotkey = new CustomPluginHotkey
@@ -78,7 +79,6 @@ namespace Wox
                 MessageBox.Show(InternationalizationManager.Instance.GetTranslation("succeed"));
             }
 
-            _settingWidow.ReloadCustomPluginHotkeyView();
             Close();
         }
 
diff --git a/Wox/SettingWindow.xaml b/Wox/SettingWindow.xaml
index 05bb39f69d..1db2782b90 100644
--- a/Wox/SettingWindow.xaml
+++ b/Wox/SettingWindow.xaml
@@ -3,6 +3,7 @@
         xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
         xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
         xmlns:wox="clr-namespace:Wox"
+        xmlns:s="clr-namespace:Wox.Core.UserSettings;assembly=Wox.Core"
         xmlns:vm="clr-namespace:Wox.ViewModel"
         x:Class="Wox.SettingWindow"
         mc:Ignorable="d"
@@ -237,56 +238,51 @@
                             </ComboBox>
                         </StackPanel>
                     </StackPanel>
-
                 </Grid>
             </Grid>
         </TabItem>
-        <TabItem Header="{DynamicResource hotkey}" Selector.Selected="OnHotkeyTabSelected">
+        <TabItem Header="{DynamicResource hotkey}">
             <Grid Margin="10">
                 <Grid.RowDefinitions>
-                    <RowDefinition Height="30" />
-                    <RowDefinition />
-                    <RowDefinition Height="50" />
+                    <RowDefinition Height="35" />
+                    <RowDefinition Height="20"/>
+                    <RowDefinition Height="400"/>
+                    <RowDefinition Height="Auto" />
                 </Grid.RowDefinitions>
-                <StackPanel Grid.Row="0" Orientation="Horizontal" VerticalAlignment="Center">
+                <StackPanel Grid.Row="0" Orientation="Horizontal" VerticalAlignment="Center" Height="24" Margin="0,4,0,3">
                     <TextBlock VerticalAlignment="Center" Margin="0 0 10 0" Text="{DynamicResource woxHotkey}" />
-                    <wox:HotkeyControl x:Name="HotkeyControl" />
+                    <wox:HotkeyControl x:Name="HotkeyControl" HotkeyChanged="OnHotkeyChanged" Loaded="OnHotkeyControlLoaded" />
                 </StackPanel>
-                <Grid Grid.Row="1">
-                    <Grid.RowDefinitions>
-                        <RowDefinition Height="20" />
-                        <RowDefinition />
-                    </Grid.RowDefinitions>
-                    <TextBlock VerticalAlignment="Center" Grid.Row="0" Margin="0 0 10 0"
-                               Text="{DynamicResource customQueryHotkey}" />
-                    <ListView x:Name="CustomHotkies" Margin="0 5 0 0" Grid.Row="1">
-                        <ListView.View>
-                            <GridView>
-                                <GridViewColumn Header="{DynamicResource hotkey}" Width="180">
-                                    <GridViewColumn.CellTemplate>
-                                        <DataTemplate>
-                                            <TextBlock Text="{Binding Hotkey}" />
-                                        </DataTemplate>
-                                    </GridViewColumn.CellTemplate>
-                                </GridViewColumn>
-                                <GridViewColumn Header="{DynamicResource actionKeywords}" Width="500">
-                                    <GridViewColumn.CellTemplate>
-                                        <DataTemplate>
-                                            <TextBlock Text="{Binding ActionKeywords}" />
-                                        </DataTemplate>
-                                    </GridViewColumn.CellTemplate>
-                                </GridViewColumn>
-                            </GridView>
-                        </ListView.View>
-                    </ListView>
-
-                </Grid>
-                <StackPanel Grid.Row="2" HorizontalAlignment="Right" Orientation="Horizontal">
-                    <Button Click="BtnDeleteCustomHotkey_OnClick" Width="100"
+                <TextBlock VerticalAlignment="Center" Grid.Row="1" Margin="0,3,10,2"
+                               Text="{DynamicResource customQueryHotkey}"/>
+                <ListView ItemsSource="{Binding Settings.CustomPluginHotkeys}"
+                          SelectedItem="{Binding SelectedCustomPluginHotkey}"
+                          Margin="0 5 0 0" Grid.Row="2">
+                    <ListView.View>
+                        <GridView>
+                            <GridViewColumn Header="{DynamicResource hotkey}" Width="180">
+                                <GridViewColumn.CellTemplate>
+                                    <DataTemplate DataType="s:CustomPluginHotkey">
+                                        <TextBlock Text="{Binding Hotkey}"/>
+                                    </DataTemplate>
+                                </GridViewColumn.CellTemplate>
+                            </GridViewColumn>
+                            <GridViewColumn Header="{DynamicResource actionKeywords}" Width="500">
+                                <GridViewColumn.CellTemplate>
+                                    <DataTemplate DataType="s:CustomPluginHotkey">
+                                        <TextBlock Text="{Binding ActionKeyword}" />
+                                    </DataTemplate>
+                                </GridViewColumn.CellTemplate>
+                            </GridViewColumn>
+                        </GridView>
+                    </ListView.View>
+                </ListView>
+                <StackPanel Grid.Row="3" HorizontalAlignment="Right" VerticalAlignment="Bottom"  Orientation="Horizontal" Height="40" Width="360">
+                    <Button Click="OnDeleteCustomHotkeyClick" Width="100"
                             Margin="10" Content="{DynamicResource delete}" />
-                    <Button Click="BtnEditCustomHotkey_OnClick" Width="100" Margin="10"
+                    <Button Click="OnnEditCustomHotkeyClick" Width="100" Margin="10"
                             Content="{DynamicResource edit}" />
-                    <Button Click="BtnAddCustomeHotkey_OnClick" Width="100" Margin="10"
+                    <Button Click="OnAddCustomeHotkeyClick" Width="100" Margin="10"
                             Content="{DynamicResource add}" />
                 </StackPanel>
             </Grid>
diff --git a/Wox/SettingWindow.xaml.cs b/Wox/SettingWindow.xaml.cs
index 5076be5eb8..9f48eeece9 100644
--- a/Wox/SettingWindow.xaml.cs
+++ b/Wox/SettingWindow.xaml.cs
@@ -154,13 +154,18 @@ namespace Wox
 
         #region Hotkey
 
-        void ctlHotkey_OnHotkeyChanged(object sender, EventArgs e)
+        private void OnHotkeyControlLoaded(object sender, RoutedEventArgs e)
+        {
+            HotkeyControl.SetHotkey(_viewModel.Settings.Hotkey, false);
+        }
+
+        void OnHotkeyChanged(object sender, EventArgs e)
         {
             if (HotkeyControl.CurrentHotkeyAvailable)
             {
                 SetHotkey(HotkeyControl.CurrentHotkey, delegate
                 {
-                    if (!System.Windows.Application.Current.MainWindow.IsVisible)
+                    if (!Application.Current.MainWindow.IsVisible)
                     {
                         _api.ShowApp();
                     }
@@ -197,16 +202,9 @@ namespace Wox
             }
         }
 
-        public void OnHotkeyTabSelected(object sender, RoutedEventArgs e)
+        private void OnDeleteCustomHotkeyClick(object sender, RoutedEventArgs e)
         {
-            HotkeyControl.HotkeyChanged += ctlHotkey_OnHotkeyChanged;
-            HotkeyControl.SetHotkey(_settings.Hotkey, false);
-            CustomHotkies.ItemsSource = _settings.CustomPluginHotkeys;
-        }
-
-        private void BtnDeleteCustomHotkey_OnClick(object sender, RoutedEventArgs e)
-        {
-            CustomPluginHotkey item = CustomHotkies.SelectedItem as CustomPluginHotkey;
+            var item = _viewModel.SelectedCustomPluginHotkey;
             if (item == null)
             {
                 MessageBox.Show(InternationalizationManager.Instance.GetTranslation("pleaseSelectAnItem"));
@@ -221,14 +219,13 @@ namespace Wox
                     MessageBoxButton.YesNo) == MessageBoxResult.Yes)
             {
                 _settings.CustomPluginHotkeys.Remove(item);
-                CustomHotkies.Items.Refresh();
                 RemoveHotkey(item.Hotkey);
             }
         }
 
-        private void BtnEditCustomHotkey_OnClick(object sender, RoutedEventArgs e)
+        private void OnnEditCustomHotkeyClick(object sender, RoutedEventArgs e)
         {
-            CustomPluginHotkey item = CustomHotkies.SelectedItem as CustomPluginHotkey;
+            var item = _viewModel.SelectedCustomPluginHotkey;
             if (item != null)
             {
                 CustomQueryHotkeySetting window = new CustomQueryHotkeySetting(this, _settings);
@@ -241,16 +238,11 @@ namespace Wox
             }
         }
 
-        private void BtnAddCustomeHotkey_OnClick(object sender, RoutedEventArgs e)
+        private void OnAddCustomeHotkeyClick(object sender, RoutedEventArgs e)
         {
             new CustomQueryHotkeySetting(this, _settings).ShowDialog();
         }
 
-        public void ReloadCustomPluginHotkeyView()
-        {
-            CustomHotkies.Items.Refresh();
-        }
-
         #endregion
 
         #region Theme
@@ -433,5 +425,6 @@ namespace Wox
             e.Handled = true;
         }
 
+
     }
 }
diff --git a/Wox/ViewModel/SettingWindowViewModel.cs b/Wox/ViewModel/SettingWindowViewModel.cs
index a0bcf63af9..96936396e0 100644
--- a/Wox/ViewModel/SettingWindowViewModel.cs
+++ b/Wox/ViewModel/SettingWindowViewModel.cs
@@ -72,11 +72,11 @@ namespace Wox.ViewModel
                     {
                         multipleActionKeywordsProvider.ActionKeywordsChanged += (o, e) =>
                         {
-                            // update in-memory data
-                            PluginManager.UpdateActionKeywordForPlugin(SelectedPlugin.PluginPair, e.OldActionKeyword,
-                            e.NewActionKeyword);
-                            // update persistant data
-                            Settings.PluginSettings.UpdateActionKeyword(SelectedPlugin.Metadata);
+                                // update in-memory data
+                                PluginManager.UpdateActionKeywordForPlugin(SelectedPlugin.PluginPair, e.OldActionKeyword,
+                                e.NewActionKeyword);
+                                // update persistant data
+                                Settings.PluginSettings.UpdateActionKeyword(SelectedPlugin.Metadata);
 
                             MessageBox.Show(InternationalizationManager.Instance.GetTranslation("succeed"));
                         };
@@ -276,6 +276,10 @@ namespace Wox.ViewModel
         }
 
 
+        #endregion
+        #region hotkey
+
+        public CustomPluginHotkey SelectedCustomPluginHotkey {get;set;}
         #endregion
         public SettingWindowViewModel()
         {