diff --git a/Wox/ActionKeywords.xaml b/Wox/ActionKeywords.xaml
index 6f505062ef..ffe1b5400b 100644
--- a/Wox/ActionKeywords.xaml
+++ b/Wox/ActionKeywords.xaml
@@ -9,30 +9,37 @@
Height="200" Width="600">
-
-
-
-
+
+
+
+
-
-
+
+
-
- Old ActionKeywords:
+
+
+ Old ActionKeywords:
+
-
-
-
+
+
+
-
-
+
+
-
-
-
+
\ No newline at end of file
diff --git a/Wox/App.xaml b/Wox/App.xaml
index 2f32256d20..39976c70f0 100644
--- a/Wox/App.xaml
+++ b/Wox/App.xaml
@@ -1,7 +1,6 @@
+ xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
diff --git a/Wox/CustomQueryHotkeySetting.xaml b/Wox/CustomQueryHotkeySetting.xaml
index fc714d1b0d..a4e3d77f69 100644
--- a/Wox/CustomQueryHotkeySetting.xaml
+++ b/Wox/CustomQueryHotkeySetting.xaml
@@ -8,28 +8,32 @@
Title="Custom Plugin Hotkey" Height="200" Width="674.766">
-
-
-
+
+
+
-
-
+
+
-
-
+
+
-
-
-
-
+
+
+
+
-
-
-
+
+
+
-
+
\ No newline at end of file
diff --git a/Wox/HotkeyControl.xaml b/Wox/HotkeyControl.xaml
index b3052ff164..9a57c312cb 100644
--- a/Wox/HotkeyControl.xaml
+++ b/Wox/HotkeyControl.xaml
@@ -1,17 +1,18 @@
-
+
-
-
+
+
-
-
+
+
-
+
\ No newline at end of file
diff --git a/Wox/MainWindow.xaml b/Wox/MainWindow.xaml
index 70e734c194..dd83be5594 100644
--- a/Wox/MainWindow.xaml
+++ b/Wox/MainWindow.xaml
@@ -27,8 +27,7 @@
d:DataContext="{d:DesignInstance vm:MainViewModel, IsDesignTimeCreatable=True}">
-
-
+
@@ -38,14 +37,15 @@
PreviewDragOver="OnPreviewDragOver"
AllowDrop="True"
x:Name="QueryTextBox" />
-
-
+
-
-
+
+
\ No newline at end of file
diff --git a/Wox/Msg.xaml b/Wox/Msg.xaml
index aa24747048..e8ebc1f29d 100644
--- a/Wox/Msg.xaml
+++ b/Wox/Msg.xaml
@@ -11,28 +11,30 @@
-
-
+
+
-
+
-
+
-
-
-
+
+
+
-
+
-
-
+
+
Title
sdfdsf
-
+
-
+
\ No newline at end of file
diff --git a/Wox/ResultListBox.xaml b/Wox/ResultListBox.xaml
index e1851dbd43..e4c57b84a8 100644
--- a/Wox/ResultListBox.xaml
+++ b/Wox/ResultListBox.xaml
@@ -1,97 +1,98 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+ xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+ xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+ xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+ xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+ xmlns:converters="clr-namespace:Wox.Converters"
+ xmlns:vm="clr-namespace:Wox.ViewModel"
+ mc:Ignorable="d" d:DesignWidth="100" d:DesignHeight="100"
+ d:DataContext="{d:DesignInstance vm:ResultsViewModel}"
+ MaxHeight="{Binding MaxHeight}" SelectedItem="{Binding SelectedResult}"
+ HorizontalContentAlignment="Stretch" ItemsSource="{Binding Results}" Margin="{Binding Margin}"
+ Style="{DynamicResource BaseListboxStyle}" SelectionChanged="lbResults_SelectionChanged" Focusable="False"
+ KeyboardNavigation.DirectionalNavigation="Cycle" SelectionMode="Single"
+ VirtualizingStackPanel.IsVirtualizing="True" VirtualizingStackPanel.VirtualizationMode="Standard">
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/Wox/SettingWindow.xaml b/Wox/SettingWindow.xaml
index b55fa458d3..cdbe1088dc 100644
--- a/Wox/SettingWindow.xaml
+++ b/Wox/SettingWindow.xaml
@@ -1,78 +1,87 @@
+ xmlns:woxPlugin="clr-namespace:Wox.Plugin;assembly=Wox.Plugin"
+ xmlns:converters="clr-namespace:Wox.Converters"
+ xmlns:userSettings="clr-namespace:Wox.Core.UserSettings;assembly=Wox.Core"
+ xmlns:sys="clr-namespace:System;assembly=mscorlib"
+ Icon="Images\app.png"
+ Title="{DynamicResource woxsettings}"
+ ResizeMode="NoResize"
+ WindowStartupLocation="CenterScreen"
+ Height="600" Width="800" PreviewKeyDown="Window_PreviewKeyDown">
-
+ IsEnabled="False"
+ IsHitTestVisible="False" x:Key="FeatureBoxSeperator">
+
-
-
+
+
-
+
-
+
-
+
-
+
-
+
-
-
+
+
-
-
+
+
-
-
-
+
+
+
-
-
+
+
-
-
+
-
-
+
+
-
-
+
+
@@ -81,75 +90,91 @@
-
-
+
+
-
-
+
+
-
+
-
-
-
+
+
+
-
-
+
+
-
+
-
+
-
-
-
-
-
+
+
+
+
+
-
-
-
+
-
-
+
+
-
-
-
+
+
+
-
+
-
+
-
+
-
+
-
-
+
+
@@ -158,10 +183,15 @@
-
+
+ x:Name="cbQueryBoxFontFaces"
+ ItemsSource="{Binding SelectedValue.FamilyTypefaces, ElementName=cbQueryBoxFont}"
+ SelectionChanged="CbQueryBoxFontFaces_OnSelectionChanged"
+ HorizontalAlignment="Left" VerticalAlignment="Top" Width="120">
@@ -177,10 +207,15 @@
-
+
+ x:Name="ResultFontFacesComboBox"
+ ItemsSource="{Binding SelectedValue.FamilyTypefaces, ElementName=ResultFontComboBox}"
+ SelectionChanged="OnResultFontFacesSelectionChanged" HorizontalAlignment="Left"
+ VerticalAlignment="Top" Width="120">
@@ -202,34 +237,35 @@
-
-
-
+
+
+
-
-
-
+
+
+
-
+
-
-
+
+
-
+
-
+
-
+
-
+
@@ -239,56 +275,61 @@
-
-
-
+
+
+
-
+
-
-
+
+
-
-
-
-
+
+
+
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
-
+
+
@@ -300,25 +341,28 @@
-
-
+
+
-
-
-
+
+
+
-
-
+
+
-
+
-
+
-
+
-
+
\ No newline at end of file
diff --git a/Wox/WoxUpdate.xaml b/Wox/WoxUpdate.xaml
index 648d196125..23687ff5a9 100644
--- a/Wox/WoxUpdate.xaml
+++ b/Wox/WoxUpdate.xaml
@@ -8,38 +8,39 @@
Title="{DynamicResource update_wox_update}" Height="400" Width="600">
-
-
+
+
-
-
-
+
+
+
-
-
+
+
-
+
-
-
+
+
-
-
-
+
+
-
-
-
-
-
+
+
+
-
+
\ No newline at end of file
diff --git a/Wox/packages.config b/Wox/packages.config
index cd2f4b05cd..4dbbb0cdad 100644
--- a/Wox/packages.config
+++ b/Wox/packages.config
@@ -1,4 +1,5 @@
+