From 525c00ea18dfbac0ae3e256275589f5307e1c66e Mon Sep 17 00:00:00 2001
From: bao-qian <bao.github@outlook.com>
Date: Sun, 21 Feb 2016 13:53:20 +0000
Subject: [PATCH 01/15] ResultPanel -> ResultListBox, part 1 part of
 refactoring for PR #494

---
 Wox/{ResultPanel.xaml => ResultListBox.xaml}       | 0
 Wox/{ResultPanel.xaml.cs => ResultListBox.xaml.cs} | 0
 2 files changed, 0 insertions(+), 0 deletions(-)
 rename Wox/{ResultPanel.xaml => ResultListBox.xaml} (100%)
 rename Wox/{ResultPanel.xaml.cs => ResultListBox.xaml.cs} (100%)

diff --git a/Wox/ResultPanel.xaml b/Wox/ResultListBox.xaml
similarity index 100%
rename from Wox/ResultPanel.xaml
rename to Wox/ResultListBox.xaml
diff --git a/Wox/ResultPanel.xaml.cs b/Wox/ResultListBox.xaml.cs
similarity index 100%
rename from Wox/ResultPanel.xaml.cs
rename to Wox/ResultListBox.xaml.cs

From 0aeba7c5af3ba71099d7b1336621e94272fdca66 Mon Sep 17 00:00:00 2001
From: bao-qian <bao.github@outlook.com>
Date: Sun, 21 Feb 2016 14:14:27 +0000
Subject: [PATCH 02/15] tmp rename

---
 Wox/Wox.csproj | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/Wox/Wox.csproj b/Wox/Wox.csproj
index 5f45652b01..13edf3ec8c 100644
--- a/Wox/Wox.csproj
+++ b/Wox/Wox.csproj
@@ -128,6 +128,9 @@
     <Compile Include="ImageLoader\ImageCacheStroage.cs" />
     <Compile Include="NotifyIconManager.cs" />
     <Compile Include="PublicAPIInstance.cs" />
+    <Compile Include="ResultListBox.xaml.cs">
+      <DependentUpon>ResultListBox.xaml</DependentUpon>
+    </Compile>
     <Compile Include="Storage\QueryHistoryStorage.cs" />
     <Compile Include="Storage\TopMostRecordStorage.cs" />
     <Compile Include="Storage\UserSelectedRecordStorage.cs" />
@@ -169,9 +172,6 @@
       <DependentUpon>Msg.xaml</DependentUpon>
     </Compile>
     <Compile Include="Properties\Annotations.cs" />
-    <Compile Include="ResultPanel.xaml.cs">
-      <DependentUpon>ResultPanel.xaml</DependentUpon>
-    </Compile>
     <Compile Include="SettingWindow.xaml.cs">
       <DependentUpon>SettingWindow.xaml</DependentUpon>
     </Compile>
@@ -243,9 +243,9 @@
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
-    <Page Include="ResultPanel.xaml">
-      <SubType>Designer</SubType>
+    <Page Include="ResultListBox.xaml">
       <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
     </Page>
     <Page Include="SettingWindow.xaml">
       <SubType>Designer</SubType>

From 0e6cd0f72acf8a0a7157f8ec198e55220e060eb0 Mon Sep 17 00:00:00 2001
From: bao-qian <bao.github@outlook.com>
Date: Sun, 21 Feb 2016 14:22:34 +0000
Subject: [PATCH 03/15] ResultPanel -> ResultListBox, part 2 part of
 refactoring for PR #494

---
 Wox/MainWindow.xaml            |  4 +-
 Wox/ResultListBox.xaml         |  2 +-
 Wox/ResultListBox.xaml.cs      |  4 +-
 Wox/SettingWindow.xaml         |  2 +-
 Wox/SettingWindow.xaml.cs      |  4 +-
 Wox/ViewModel/MainViewModel.cs | 67 +++++++++++++++-------------------
 6 files changed, 38 insertions(+), 45 deletions(-)

diff --git a/Wox/MainWindow.xaml b/Wox/MainWindow.xaml
index fd00239538..2c7421081f 100644
--- a/Wox/MainWindow.xaml
+++ b/Wox/MainWindow.xaml
@@ -22,7 +22,7 @@
         PreviewKeyDown="Window_PreviewKeyDown" d:DataContext="{d:DesignInstance vm:MainViewModel, IsDesignTimeCreatable=True}">
     <Window.Resources>
         <DataTemplate DataType="{x:Type vm:ResultPanelViewModel}">
-            <wox:ResultPanel></wox:ResultPanel>
+            <wox:ResultListBox></wox:ResultListBox>
         </DataTemplate>
         <converters:VisibilityConverter x:Key="VisibilityConverter" />
     </Window.Resources>
@@ -37,7 +37,7 @@
                     <ToolTip IsOpen="{Binding IsProgressBarTooltipVisible}"></ToolTip>
                 </Line.ToolTip>
             </Line>
-            <ContentControl Content="{Binding SearchResultPanel}" Visibility="{Binding IsSearchResultPanelVisible,Converter={StaticResource VisibilityConverter}}">
+            <ContentControl Content="{Binding Results}" Visibility="{Binding IsResultListBoxVisible,Converter={StaticResource VisibilityConverter}}">
             </ContentControl>
             <ContentControl Content="{Binding ActionPanel}" Visibility="{Binding IsActionPanelVisible,Converter={StaticResource VisibilityConverter}}">
             </ContentControl>
diff --git a/Wox/ResultListBox.xaml b/Wox/ResultListBox.xaml
index d4e088186e..890c36cc37 100644
--- a/Wox/ResultListBox.xaml
+++ b/Wox/ResultListBox.xaml
@@ -1,4 +1,4 @@
-<UserControl x:Class="Wox.ResultPanel"
+<UserControl x:Class="Wox.ResultListBox"
              x:Name="Results"
              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
diff --git a/Wox/ResultListBox.xaml.cs b/Wox/ResultListBox.xaml.cs
index 05f3870f7b..430f5e5603 100644
--- a/Wox/ResultListBox.xaml.cs
+++ b/Wox/ResultListBox.xaml.cs
@@ -15,7 +15,7 @@ using Wox.ViewModel;
 namespace Wox
 {
     [Synchronization]
-    public partial class ResultPanel : UserControl
+    public partial class ResultListBox
     {
         public void AddResults(List<Result> newResults, string resultId)
         {
@@ -24,7 +24,7 @@ namespace Wox
         }
         
 
-        public ResultPanel()
+        public ResultListBox()
         {
             InitializeComponent();
         }
diff --git a/Wox/SettingWindow.xaml b/Wox/SettingWindow.xaml
index 9495da2cb2..2ac62a076e 100644
--- a/Wox/SettingWindow.xaml
+++ b/Wox/SettingWindow.xaml
@@ -149,7 +149,7 @@
                                         <RowDefinition/>
                                     </Grid.RowDefinitions>
                                     <TextBox Text="{DynamicResource helloWox}" IsReadOnly="True" Style="{DynamicResource QueryBoxStyle}" Grid.Row="0"/>
-                                    <wox:ResultPanel Grid.Row="1" x:Name="resultPanelPreview"/>
+                                    <wox:ResultListBox Grid.Row="1" x:Name="ResultListBoxPreview"/>
                                 </Grid>
                             </Border>
                         </StackPanel>
diff --git a/Wox/SettingWindow.xaml.cs b/Wox/SettingWindow.xaml.cs
index f47bbbde3b..ed76e8c523 100644
--- a/Wox/SettingWindow.xaml.cs
+++ b/Wox/SettingWindow.xaml.cs
@@ -37,7 +37,7 @@ namespace Wox
         {
             this._api = api;
             InitializeComponent();
-            this.resultPanelPreview.DataContext = new ResultPanelViewModel();
+            this.ResultListBoxPreview.DataContext = new ResultPanelViewModel();
             Loaded += Setting_Loaded;
         }
 
@@ -387,7 +387,7 @@ namespace Wox
                     ));
             }
 
-            resultPanelPreview.AddResults(new List<Result>
+            ResultListBoxPreview.AddResults(new List<Result>
             {
                 new Result
                 {
diff --git a/Wox/ViewModel/MainViewModel.cs b/Wox/ViewModel/MainViewModel.cs
index e6e5912376..9793a36966 100644
--- a/Wox/ViewModel/MainViewModel.cs
+++ b/Wox/ViewModel/MainViewModel.cs
@@ -21,11 +21,10 @@ namespace Wox.ViewModel
     {
         #region Private Fields
 
-        private ResultPanelViewModel _searchResultPanel;
         private ResultPanelViewModel _actionPanel;
         private string _queryText;
         private bool _isVisible;
-        private bool _isSearchResultPanelVisible;
+        private bool _isResultListBoxVisible;
         private bool _isActionPanelVisible;
         private bool _isProgressBarVisible;
         private bool _isProgressBarTooltipVisible;
@@ -46,7 +45,7 @@ namespace Wox.ViewModel
 
         public MainViewModel()
         {
-            this.InitializeResultPanel();
+            this.InitializeResultListBox();
             this.InitializeActionPanel();
             this.InitializeKeyCommands();
 
@@ -57,13 +56,7 @@ namespace Wox.ViewModel
 
         #region ViewModel Properties
 
-        public ResultPanelViewModel SearchResultPanel
-        {
-            get
-            {
-                return this._searchResultPanel;
-            }
-        }
+        public ResultPanelViewModel Results { get; private set; }
 
         public ResultPanelViewModel ActionPanel
         {
@@ -132,16 +125,16 @@ namespace Wox.ViewModel
             }
         }
 
-        public bool IsSearchResultPanelVisible
+        public bool IsResultListBoxVisible
         {
             get
             {
-                return this._isSearchResultPanelVisible;
+                return this._isResultListBoxVisible;
             }
             set
             {
-                this._isSearchResultPanelVisible = value;
-                OnPropertyChanged("IsSearchResultPanelVisible");
+                this._isResultListBoxVisible = value;
+                OnPropertyChanged("IsResultListBoxVisible");
             }
         }
 
@@ -311,7 +304,7 @@ namespace Wox.ViewModel
                 }
                 else
                 {
-                    this._searchResultPanel.SelectNextResult();
+                    this.Results.SelectNextResult();
                 }
 
             });
@@ -325,7 +318,7 @@ namespace Wox.ViewModel
                 }
                 else
                 {
-                    this._searchResultPanel.SelectPrevResult();
+                    this.Results.SelectPrevResult();
                 }
 
             });
@@ -339,7 +332,7 @@ namespace Wox.ViewModel
                 }
                 else
                 {
-                    ShowActionPanel(this._searchResultPanel.SelectedResult.RawResult);
+                    ShowActionPanel(this.Results.SelectedResult.RawResult);
                 }
             });
 
@@ -362,14 +355,14 @@ namespace Wox.ViewModel
             this.SelectNextPageCommand = new RelayCommand((parameter) =>
             {
 
-                this._searchResultPanel.SelectNextPage();
+                this.Results.SelectNextPage();
 
             });
 
             this.SelectPrevPageCommand = new RelayCommand((parameter) =>
             {
 
-                this._searchResultPanel.SelectPrevPage();
+                this.Results.SelectPrevPage();
 
             });
 
@@ -381,9 +374,9 @@ namespace Wox.ViewModel
             this.ShiftEnterCommand = new RelayCommand((parameter) =>
             {
 
-                if (!this.IsActionPanelVisible && null != this._searchResultPanel.SelectedResult)
+                if (!this.IsActionPanelVisible && null != this.Results.SelectedResult)
                 {
-                    this.ShowActionPanel(this._searchResultPanel.SelectedResult.RawResult);
+                    this.ShowActionPanel(this.Results.SelectedResult.RawResult);
                 }
 
             });
@@ -394,12 +387,12 @@ namespace Wox.ViewModel
                 if (null != parameter)
                 {
                     var index = int.Parse(parameter.ToString());
-                    this._searchResultPanel.SelectResult(index);
+                    this.Results.SelectResult(index);
                 }
 
-                if (null != this._searchResultPanel.SelectedResult)
+                if (null != this.Results.SelectedResult)
                 {
-                    this._searchResultPanel.SelectedResult.OpenResultCommand.Execute(null);
+                    this.Results.SelectedResult.OpenResultCommand.Execute(null);
                 }
             });
 
@@ -413,10 +406,10 @@ namespace Wox.ViewModel
             });
         }
 
-        private void InitializeResultPanel()
+        private void InitializeResultListBox()
         {
-            this._searchResultPanel = new ResultPanelViewModel();
-            this.IsSearchResultPanelVisible = false;
+            this.Results = new ResultPanelViewModel();
+            this.IsResultListBoxVisible = false;
         }
 
         private void ShowActionPanel(Result result)
@@ -448,7 +441,7 @@ namespace Wox.ViewModel
             CurrentContextMenus = actions;
 
             this.IsActionPanelVisible = true;
-            this.IsSearchResultPanelVisible = false;
+            this.IsResultListBoxVisible = false;
 
             this.QueryText = "";
         }
@@ -509,7 +502,7 @@ namespace Wox.ViewModel
                 }
                 else
                 {
-                    this._searchResultPanel.Clear();
+                    this.Results.Clear();
                 }
             }
         }
@@ -551,18 +544,18 @@ namespace Wox.ViewModel
                 {
                     if (!string.IsNullOrEmpty(keyword))
                     {
-                        this._searchResultPanel.RemoveResultsExcept(PluginManager.NonGlobalPlugins[keyword].Metadata);
+                        this.Results.RemoveResultsExcept(PluginManager.NonGlobalPlugins[keyword].Metadata);
                     }
                 }
                 else
                 {
                     if (string.IsNullOrEmpty(keyword))
                     {
-                        this._searchResultPanel.RemoveResultsFor(PluginManager.NonGlobalPlugins[lastKeyword].Metadata);
+                        this.Results.RemoveResultsFor(PluginManager.NonGlobalPlugins[lastKeyword].Metadata);
                     }
                     else if (lastKeyword != keyword)
                     {
-                        this._searchResultPanel.RemoveResultsExcept(PluginManager.NonGlobalPlugins[keyword].Metadata);
+                        this.Results.RemoveResultsExcept(PluginManager.NonGlobalPlugins[keyword].Metadata);
                     }
                 }
                 _lastQuery = query;
@@ -593,21 +586,21 @@ namespace Wox.ViewModel
 
         private void ResetQueryHistoryIndex()
         {
-            this._searchResultPanel.RemoveResultsFor(QueryHistoryStorage.MetaData);
+            this.Results.RemoveResultsFor(QueryHistoryStorage.MetaData);
             QueryHistoryStorage.Instance.Reset();
         }
 
         private void UpdateResultViewInternal(List<Result> list, PluginMetadata metadata)
         {
             Infrastructure.Stopwatch.Normal($"UI update cost for {metadata.Name}",
-                    () => { this._searchResultPanel.AddResults(list, metadata.ID); });
+                    () => { this.Results.AddResults(list, metadata.ID); });
         }
 
         private void BackToSearchMode()
         {
             this.QueryText = _textBeforeEnterContextMenuMode;
             this.IsActionPanelVisible = false;
-            this.IsSearchResultPanelVisible = true;
+            this.IsResultListBoxVisible = true;
             this.CaretIndex = this.QueryText.Length;
         }
 
@@ -622,7 +615,7 @@ namespace Wox.ViewModel
 
                 var executeQueryHistoryTitle = InternationalizationManager.Instance.GetTranslation("executeQuery");
                 var lastExecuteTime = InternationalizationManager.Instance.GetTranslation("lastExecuteTime");
-                this._searchResultPanel.RemoveResultsExcept(historyMetadata);
+                this.Results.RemoveResultsExcept(historyMetadata);
                 UpdateResultViewInternal(new List<Result>
                 {
                     new Result
@@ -666,7 +659,7 @@ namespace Wox.ViewModel
 
             if (list.Count > 0)
             {
-                this.IsSearchResultPanelVisible = true;
+                this.IsResultListBoxVisible = true;
             }
         }
 

From 78b44a1319e9dcf43208fa10c6cbecf27730e542 Mon Sep 17 00:00:00 2001
From: bao-qian <bao.github@outlook.com>
Date: Sun, 21 Feb 2016 14:30:13 +0000
Subject: [PATCH 04/15] ResultPanelViewModel -> ResultsViewModel, part 1 part
 of refactoring for PR #494

---
 Wox/ViewModel/{ResultPanelViewModel.cs => ResultsViewModel.cs} | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename Wox/ViewModel/{ResultPanelViewModel.cs => ResultsViewModel.cs} (100%)

diff --git a/Wox/ViewModel/ResultPanelViewModel.cs b/Wox/ViewModel/ResultsViewModel.cs
similarity index 100%
rename from Wox/ViewModel/ResultPanelViewModel.cs
rename to Wox/ViewModel/ResultsViewModel.cs

From 45246bccd7821e74fbca0da5fd9ff182da9d96f8 Mon Sep 17 00:00:00 2001
From: bao-qian <bao.github@outlook.com>
Date: Sun, 21 Feb 2016 14:33:18 +0000
Subject: [PATCH 05/15] ResultPanelViewModel -> ResultsViewModel, part 1

part of refactoring for PR #494
---
 Wox/MainWindow.xaml               |  2 +-
 Wox/ResultListBox.xaml            |  2 +-
 Wox/ResultListBox.xaml.cs         |  2 +-
 Wox/SettingWindow.xaml.cs         |  2 +-
 Wox/ViewModel/MainViewModel.cs    | 10 +++++-----
 Wox/ViewModel/ResultsViewModel.cs |  4 ++--
 Wox/Wox.csproj                    |  2 +-
 7 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/Wox/MainWindow.xaml b/Wox/MainWindow.xaml
index 2c7421081f..d6a6dc5a38 100644
--- a/Wox/MainWindow.xaml
+++ b/Wox/MainWindow.xaml
@@ -21,7 +21,7 @@
         Visibility="{Binding IsVisible,Converter={converters:VisibilityConverter}}"
         PreviewKeyDown="Window_PreviewKeyDown" d:DataContext="{d:DesignInstance vm:MainViewModel, IsDesignTimeCreatable=True}">
     <Window.Resources>
-        <DataTemplate DataType="{x:Type vm:ResultPanelViewModel}">
+        <DataTemplate DataType="{x:Type vm:ResultsViewModel}">
             <wox:ResultListBox></wox:ResultListBox>
         </DataTemplate>
         <converters:VisibilityConverter x:Key="VisibilityConverter" />
diff --git a/Wox/ResultListBox.xaml b/Wox/ResultListBox.xaml
index 890c36cc37..0962b7df25 100644
--- a/Wox/ResultListBox.xaml
+++ b/Wox/ResultListBox.xaml
@@ -6,7 +6,7 @@
              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:ResultPanelViewModel}">
+             mc:Ignorable="d" d:DesignWidth="100" d:DesignHeight="100" d:DataContext="{d:DesignInstance vm:ResultsViewModel}">
     <ListBox x:Name="lbResults" MaxHeight="{Binding MaxHeight}" SelectedItem="{Binding SelectedResult}"
              HorizontalContentAlignment="Stretch" ItemsSource="{Binding Results}" Margin="{Binding Margin}"
              Style="{DynamicResource BaseListboxStyle}" SelectionChanged="lbResults_SelectionChanged" Focusable="False"
diff --git a/Wox/ResultListBox.xaml.cs b/Wox/ResultListBox.xaml.cs
index 430f5e5603..f78254bd86 100644
--- a/Wox/ResultListBox.xaml.cs
+++ b/Wox/ResultListBox.xaml.cs
@@ -19,7 +19,7 @@ namespace Wox
     {
         public void AddResults(List<Result> newResults, string resultId)
         {
-            var vm = this.DataContext as ResultPanelViewModel;
+            var vm = this.DataContext as ResultsViewModel;
             vm.AddResults(newResults, resultId);
         }
         
diff --git a/Wox/SettingWindow.xaml.cs b/Wox/SettingWindow.xaml.cs
index ed76e8c523..7eeaa464bb 100644
--- a/Wox/SettingWindow.xaml.cs
+++ b/Wox/SettingWindow.xaml.cs
@@ -37,7 +37,7 @@ namespace Wox
         {
             this._api = api;
             InitializeComponent();
-            this.ResultListBoxPreview.DataContext = new ResultPanelViewModel();
+            this.ResultListBoxPreview.DataContext = new ResultsViewModel();
             Loaded += Setting_Loaded;
         }
 
diff --git a/Wox/ViewModel/MainViewModel.cs b/Wox/ViewModel/MainViewModel.cs
index 9793a36966..3584041385 100644
--- a/Wox/ViewModel/MainViewModel.cs
+++ b/Wox/ViewModel/MainViewModel.cs
@@ -21,7 +21,7 @@ namespace Wox.ViewModel
     {
         #region Private Fields
 
-        private ResultPanelViewModel _actionPanel;
+        private ResultsViewModel _actionPanel;
         private string _queryText;
         private bool _isVisible;
         private bool _isResultListBoxVisible;
@@ -56,9 +56,9 @@ namespace Wox.ViewModel
 
         #region ViewModel Properties
 
-        public ResultPanelViewModel Results { get; private set; }
+        public ResultsViewModel Results { get; private set; }
 
-        public ResultPanelViewModel ActionPanel
+        public ResultsViewModel ActionPanel
         {
             get
             {
@@ -408,7 +408,7 @@ namespace Wox.ViewModel
 
         private void InitializeResultListBox()
         {
-            this.Results = new ResultPanelViewModel();
+            this.Results = new ResultsViewModel();
             this.IsResultListBoxVisible = false;
         }
 
@@ -478,7 +478,7 @@ namespace Wox.ViewModel
 
         private void InitializeActionPanel()
         {
-            this._actionPanel = new ResultPanelViewModel();
+            this._actionPanel = new ResultsViewModel();
             this.IsActionPanelVisible = false;
         }
 
diff --git a/Wox/ViewModel/ResultsViewModel.cs b/Wox/ViewModel/ResultsViewModel.cs
index 2cc946df62..04a1e43fce 100644
--- a/Wox/ViewModel/ResultsViewModel.cs
+++ b/Wox/ViewModel/ResultsViewModel.cs
@@ -13,7 +13,7 @@ using Wox.Storage;
 
 namespace Wox.ViewModel
 {
-    public class ResultPanelViewModel : BaseViewModel
+    public class ResultsViewModel : BaseViewModel
     {
         #region Private Fields
 
@@ -28,7 +28,7 @@ namespace Wox.ViewModel
 
         #region Constructor
 
-        public ResultPanelViewModel()
+        public ResultsViewModel()
         {
             this._results = new ResultCollection();
         }
diff --git a/Wox/Wox.csproj b/Wox/Wox.csproj
index 13edf3ec8c..164fdc5846 100644
--- a/Wox/Wox.csproj
+++ b/Wox/Wox.csproj
@@ -137,7 +137,7 @@
     <Compile Include="ViewModel\BaseViewModel.cs" />
     <Compile Include="ViewModel\MainViewModel.cs" />
     <Compile Include="ViewModel\ResultItemViewModel.cs" />
-    <Compile Include="ViewModel\ResultPanelViewModel.cs" />
+    <Compile Include="ViewModel\ResultsViewModel.cs" />
     <Compile Include="WoxUpdate.xaml.cs">
       <DependentUpon>WoxUpdate.xaml</DependentUpon>
     </Compile>

From 4643810b755ea8306b74be7816250464065bcbc1 Mon Sep 17 00:00:00 2001
From: bao-qian <bao.github@outlook.com>
Date: Sun, 21 Feb 2016 14:40:10 +0000
Subject: [PATCH 06/15] ActionPanel -> ContextMenu

part of refactoring for PR #494
---
 Wox/MainWindow.xaml                  |  2 +-
 Wox/PublicAPIInstance.cs             |  2 +-
 Wox/ResultListBox.xaml               |  4 +-
 Wox/ViewModel/MainViewModel.cs       | 83 +++++++++++++---------------
 Wox/ViewModel/ResultItemViewModel.cs | 21 +++----
 5 files changed, 49 insertions(+), 63 deletions(-)

diff --git a/Wox/MainWindow.xaml b/Wox/MainWindow.xaml
index d6a6dc5a38..7ce73b08ec 100644
--- a/Wox/MainWindow.xaml
+++ b/Wox/MainWindow.xaml
@@ -39,7 +39,7 @@
             </Line>
             <ContentControl Content="{Binding Results}" Visibility="{Binding IsResultListBoxVisible,Converter={StaticResource VisibilityConverter}}">
             </ContentControl>
-            <ContentControl Content="{Binding ActionPanel}" Visibility="{Binding IsActionPanelVisible,Converter={StaticResource VisibilityConverter}}">
+            <ContentControl Content="{Binding ContextMenu}" Visibility="{Binding IsContextMenuVisible,Converter={StaticResource VisibilityConverter}}">
             </ContentControl>
         </StackPanel>
     </Border>
diff --git a/Wox/PublicAPIInstance.cs b/Wox/PublicAPIInstance.cs
index 7cb7f296f4..2374d46e19 100644
--- a/Wox/PublicAPIInstance.cs
+++ b/Wox/PublicAPIInstance.cs
@@ -181,7 +181,7 @@ namespace Wox
                     o.PluginID = plugin.ID;
                 });
 
-                this.MainVM.ShowActionPanel(results, plugin.ID);
+                this.MainVM.ShowContextMenu(results, plugin.ID);
             }
         }
 
diff --git a/Wox/ResultListBox.xaml b/Wox/ResultListBox.xaml
index 0962b7df25..9f4894f9d4 100644
--- a/Wox/ResultListBox.xaml
+++ b/Wox/ResultListBox.xaml
@@ -17,9 +17,9 @@
                 <DataTemplate.DataType>
                     <x:Type TypeName="vm:ResultItemViewModel" />
                 </DataTemplate.DataType>
-                <Button Command="{Binding OpenResultCommand}">
+                <Button Command="{Binding OpenResultListBoxItemCommand}">
                     <Button.InputBindings>
-                        <MouseBinding Command="{Binding OpenResultActionPanelCommand}" MouseAction="RightClick"></MouseBinding>
+                        <MouseBinding Command="{Binding OpenContextMenuItemCommand}" MouseAction="RightClick"></MouseBinding>
                     </Button.InputBindings>
                     <Button.Template>
                         <ControlTemplate>
diff --git a/Wox/ViewModel/MainViewModel.cs b/Wox/ViewModel/MainViewModel.cs
index 3584041385..4acdaeebb7 100644
--- a/Wox/ViewModel/MainViewModel.cs
+++ b/Wox/ViewModel/MainViewModel.cs
@@ -21,11 +21,10 @@ namespace Wox.ViewModel
     {
         #region Private Fields
 
-        private ResultsViewModel _actionPanel;
         private string _queryText;
         private bool _isVisible;
         private bool _isResultListBoxVisible;
-        private bool _isActionPanelVisible;
+        private bool _isContextMenuVisible;
         private bool _isProgressBarVisible;
         private bool _isProgressBarTooltipVisible;
         private bool _selectAllText;
@@ -46,7 +45,7 @@ namespace Wox.ViewModel
         public MainViewModel()
         {
             this.InitializeResultListBox();
-            this.InitializeActionPanel();
+            this.InitializeContextMenu();
             this.InitializeKeyCommands();
 
             this._queryHasReturn = false;
@@ -58,13 +57,7 @@ namespace Wox.ViewModel
 
         public ResultsViewModel Results { get; private set; }
 
-        public ResultsViewModel ActionPanel
-        {
-            get
-            {
-                return this._actionPanel;
-            }
-        }
+        public ResultsViewModel ContextMenu { get; private set; }
 
         public string QueryText
         {
@@ -118,7 +111,7 @@ namespace Wox.ViewModel
                 this._isVisible = value;
                 OnPropertyChanged("IsVisible");
 
-                if (!value && this.IsActionPanelVisible)
+                if (!value && this.IsContextMenuVisible)
                 {
                     this.BackToSearchMode();
                 }
@@ -138,16 +131,16 @@ namespace Wox.ViewModel
             }
         }
 
-        public bool IsActionPanelVisible
+        public bool IsContextMenuVisible
         {
             get
             {
-                return this._isActionPanelVisible;
+                return this._isContextMenuVisible;
             }
             set
             {
-                this._isActionPanelVisible = value;
-                OnPropertyChanged("IsActionPanelVisible");
+                this._isContextMenuVisible = value;
+                OnPropertyChanged("IsContextMenuVisible");
             }
         }
 
@@ -284,7 +277,7 @@ namespace Wox.ViewModel
             this.EscCommand = new RelayCommand((parameter) =>
             {
 
-                if (this.IsActionPanelVisible)
+                if (this.IsContextMenuVisible)
                 {
                     this.BackToSearchMode();
                 }
@@ -298,9 +291,9 @@ namespace Wox.ViewModel
             this.SelectNextItemCommand = new RelayCommand((parameter) =>
             {
 
-                if (this.IsActionPanelVisible)
+                if (this.IsContextMenuVisible)
                 {
-                    this._actionPanel.SelectNextResult();
+                    this.ContextMenu.SelectNextResult();
                 }
                 else
                 {
@@ -312,9 +305,9 @@ namespace Wox.ViewModel
             this.SelectPrevItemCommand = new RelayCommand((parameter) =>
             {
 
-                if (this.IsActionPanelVisible)
+                if (this.IsContextMenuVisible)
                 {
-                    this._actionPanel.SelectPrevResult();
+                    this.ContextMenu.SelectPrevResult();
                 }
                 else
                 {
@@ -326,13 +319,13 @@ namespace Wox.ViewModel
             this.CtrlOCommand = new RelayCommand((parameter) =>
             {
 
-                if (this.IsActionPanelVisible)
+                if (this.IsContextMenuVisible)
                 {
                     BackToSearchMode();
                 }
                 else
                 {
-                    ShowActionPanel(this.Results.SelectedResult.RawResult);
+                    ShowContextMenu(this.Results.SelectedResult.RawResult);
                 }
             });
 
@@ -374,9 +367,9 @@ namespace Wox.ViewModel
             this.ShiftEnterCommand = new RelayCommand((parameter) =>
             {
 
-                if (!this.IsActionPanelVisible && null != this.Results.SelectedResult)
+                if (!this.IsContextMenuVisible && null != this.Results.SelectedResult)
                 {
-                    this.ShowActionPanel(this.Results.SelectedResult.RawResult);
+                    this.ShowContextMenu(this.Results.SelectedResult.RawResult);
                 }
 
             });
@@ -392,7 +385,7 @@ namespace Wox.ViewModel
 
                 if (null != this.Results.SelectedResult)
                 {
-                    this.Results.SelectedResult.OpenResultCommand.Execute(null);
+                    this.Results.SelectedResult.OpenResultListBoxItemCommand.Execute(null);
                 }
             });
 
@@ -412,13 +405,13 @@ namespace Wox.ViewModel
             this.IsResultListBoxVisible = false;
         }
 
-        private void ShowActionPanel(Result result)
+        private void ShowContextMenu(Result result)
         {
             if (result == null) return;
-            this.ShowActionPanel(result, PluginManager.GetContextMenusForPlugin(result));
+            this.ShowContextMenu(result, PluginManager.GetContextMenusForPlugin(result));
         }
 
-        private void ShowActionPanel(Result result, List<Result> actions)
+        private void ShowContextMenu(Result result, List<Result> actions)
         {
             actions.ForEach(o =>
             {
@@ -429,18 +422,18 @@ namespace Wox.ViewModel
 
             actions.Add(GetTopMostContextMenu(result));
 
-            this.DisplayActionPanel(actions, result.PluginID);
+            this.DisplayContextMenu(actions, result.PluginID);
         }
 
-        private void DisplayActionPanel(List<Result> actions, string pluginID)
+        private void DisplayContextMenu(List<Result> actions, string pluginID)
         {
             _textBeforeEnterContextMenuMode = this.QueryText;
 
-            this._actionPanel.Clear();
-            this._actionPanel.AddResults(actions, pluginID);
+            this.ContextMenu.Clear();
+            this.ContextMenu.AddResults(actions, pluginID);
             CurrentContextMenus = actions;
 
-            this.IsActionPanelVisible = true;
+            this.IsContextMenuVisible = true;
             this.IsResultListBoxVisible = false;
 
             this.QueryText = "";
@@ -476,10 +469,10 @@ namespace Wox.ViewModel
             }
         }
 
-        private void InitializeActionPanel()
+        private void InitializeContextMenu()
         {
-            this._actionPanel = new ResultsViewModel();
-            this.IsActionPanelVisible = false;
+            this.ContextMenu = new ResultsViewModel();
+            this.IsContextMenuVisible = false;
         }
 
         private void HandleQueryTextUpdated()
@@ -487,9 +480,9 @@ namespace Wox.ViewModel
             if (_ignoreTextChange) { _ignoreTextChange = false; return; }
 
             this.IsProgressBarTooltipVisible = false;
-            if (this.IsActionPanelVisible)
+            if (this.IsContextMenuVisible)
             {
-                QueryActionPanel();
+                QueryContextMenu();
             }
             else
             {
@@ -507,14 +500,14 @@ namespace Wox.ViewModel
             }
         }
 
-        private void QueryActionPanel()
+        private void QueryContextMenu()
         {
             var contextMenuId = "Context Menu Id";
-            this._actionPanel.Clear();
+            this.ContextMenu.Clear();
             var query = this.QueryText.ToLower();
             if (string.IsNullOrEmpty(query))
             {
-                this._actionPanel.AddResults(CurrentContextMenus, contextMenuId);
+                this.ContextMenu.AddResults(CurrentContextMenus, contextMenuId);
             }
             else
             {
@@ -527,7 +520,7 @@ namespace Wox.ViewModel
                         filterResults.Add(contextMenu);
                     }
                 }
-                this._actionPanel.AddResults(filterResults, contextMenuId);
+                this.ContextMenu.AddResults(filterResults, contextMenuId);
             }
         }
 
@@ -599,7 +592,7 @@ namespace Wox.ViewModel
         private void BackToSearchMode()
         {
             this.QueryText = _textBeforeEnterContextMenuMode;
-            this.IsActionPanelVisible = false;
+            this.IsContextMenuVisible = false;
             this.IsResultListBoxVisible = true;
             this.CaretIndex = this.QueryText.Length;
         }
@@ -663,9 +656,9 @@ namespace Wox.ViewModel
             }
         }
 
-        public void ShowActionPanel(List<Result> actions, string pluginID)
+        public void ShowContextMenu(List<Result> actions, string pluginID)
         {
-            this.DisplayActionPanel(actions, pluginID);
+            this.DisplayContextMenu(actions, pluginID);
         }
 
         #endregion
diff --git a/Wox/ViewModel/ResultItemViewModel.cs b/Wox/ViewModel/ResultItemViewModel.cs
index a963e294cd..ed8c0cc78f 100644
--- a/Wox/ViewModel/ResultItemViewModel.cs
+++ b/Wox/ViewModel/ResultItemViewModel.cs
@@ -25,11 +25,12 @@ namespace Wox.ViewModel
 
         public ResultItemViewModel(Result result)
         {
-            if(null!= result)
+            if (null != result)
             {
                 this._result = result;
 
-                this.OpenResultCommand = new RelayCommand((parameter) => {
+                this.OpenResultListBoxItemCommand = new RelayCommand((parameter) =>
+                {
 
                     bool hideWindow = result.Action(new ActionContext
                     {
@@ -44,7 +45,7 @@ namespace Wox.ViewModel
                     }
                 });
 
-                this.OpenResultActionPanelCommand = new RelayCommand((parameter) =>
+                this.OpenContextMenuItemCommand = new RelayCommand((parameter) =>
                 {
 
                     var actions = PluginManager.GetContextMenusForPlugin(result);
@@ -104,17 +105,9 @@ namespace Wox.ViewModel
             }
         }
 
-        public RelayCommand OpenResultCommand
-        {
-            get;
-            set;
-        }
+        public RelayCommand OpenResultListBoxItemCommand { get; set; }
 
-        public RelayCommand OpenResultActionPanelCommand
-        {
-            get;
-            set;
-        }
+        public RelayCommand OpenContextMenuItemCommand { get; set; }
 
         #endregion
 
@@ -172,7 +165,7 @@ namespace Wox.ViewModel
             {
                 return _result.Equals(r.RawResult);
             }
-            
+
             return false;
         }
 

From b00214bdbdd375b078af6cb400598c75fe7f9b20 Mon Sep 17 00:00:00 2001
From: bao-qian <bao.github@outlook.com>
Date: Sun, 21 Feb 2016 14:53:32 +0000
Subject: [PATCH 07/15] UserControl -> ListBox

---
 Wox/ResultListBox.xaml    | 10 ++++------
 Wox/ResultListBox.xaml.cs |  2 +-
 2 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/Wox/ResultListBox.xaml b/Wox/ResultListBox.xaml
index 9f4894f9d4..5a280b760f 100644
--- a/Wox/ResultListBox.xaml
+++ b/Wox/ResultListBox.xaml
@@ -1,13 +1,12 @@
-<UserControl x:Class="Wox.ResultListBox"
-             x:Name="Results"
+<ListBox x:Class="Wox.ResultListBox"
              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}">
-    <ListBox x:Name="lbResults" MaxHeight="{Binding MaxHeight}" SelectedItem="{Binding SelectedResult}"
+             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"
@@ -99,5 +98,4 @@
                 </Setter>
             </Style>
         </ListBox.ItemContainerStyle>
-    </ListBox>
-</UserControl>
\ No newline at end of file
+</ListBox>
\ No newline at end of file
diff --git a/Wox/ResultListBox.xaml.cs b/Wox/ResultListBox.xaml.cs
index f78254bd86..d8c089f39d 100644
--- a/Wox/ResultListBox.xaml.cs
+++ b/Wox/ResultListBox.xaml.cs
@@ -33,7 +33,7 @@ namespace Wox
         {
             if (e.AddedItems.Count > 0 && e.AddedItems[0] != null)
             {
-                lbResults.ScrollIntoView(e.AddedItems[0]);
+                ScrollIntoView(e.AddedItems[0]);
             }
         }
 

From cb6160f1e408dd3d6b3ebbb94435cdc079f44550 Mon Sep 17 00:00:00 2001
From: bao-qian <bao.github@outlook.com>
Date: Sun, 21 Feb 2016 15:13:27 +0000
Subject: [PATCH 08/15] ResultItem -> Result, part 1 part of refactoring for PR
 #494

---
 Wox/ViewModel/{ResultItemViewModel.cs => ResultViewModel.cs} | 0
 Wox/Wox.csproj                                               | 2 +-
 2 files changed, 1 insertion(+), 1 deletion(-)
 rename Wox/ViewModel/{ResultItemViewModel.cs => ResultViewModel.cs} (100%)

diff --git a/Wox/ViewModel/ResultItemViewModel.cs b/Wox/ViewModel/ResultViewModel.cs
similarity index 100%
rename from Wox/ViewModel/ResultItemViewModel.cs
rename to Wox/ViewModel/ResultViewModel.cs
diff --git a/Wox/Wox.csproj b/Wox/Wox.csproj
index 164fdc5846..89de06548b 100644
--- a/Wox/Wox.csproj
+++ b/Wox/Wox.csproj
@@ -136,7 +136,7 @@
     <Compile Include="Storage\UserSelectedRecordStorage.cs" />
     <Compile Include="ViewModel\BaseViewModel.cs" />
     <Compile Include="ViewModel\MainViewModel.cs" />
-    <Compile Include="ViewModel\ResultItemViewModel.cs" />
+    <Compile Include="ViewModel\ResultViewModel.cs" />
     <Compile Include="ViewModel\ResultsViewModel.cs" />
     <Compile Include="WoxUpdate.xaml.cs">
       <DependentUpon>WoxUpdate.xaml</DependentUpon>

From 6814130570b73026e862abc259bf372d6b7a03ef Mon Sep 17 00:00:00 2001
From: bao-qian <bao.github@outlook.com>
Date: Sun, 21 Feb 2016 15:19:42 +0000
Subject: [PATCH 09/15] ResultItem -> Result, part 2

part of refactoring for PR #494
---
 Plugins/Wox.Plugin.Folder/FolderPlugin.cs   |  4 +--
 Plugins/Wox.Plugin.Program/Programs.cs      |  4 +--
 Wox.Core/Resource/Theme.cs                  |  8 ++---
 Wox.Core/UserSettings/UserSettingStorage.cs | 14 ++++----
 Wox.Plugin/IPublicAPI.cs                    |  1 +
 Wox/ResultListBox.xaml                      |  2 +-
 Wox/SettingWindow.xaml                      |  6 ++--
 Wox/SettingWindow.xaml.cs                   | 36 ++++++++++-----------
 Wox/ViewModel/ResultViewModel.cs            |  6 ++--
 Wox/ViewModel/ResultsViewModel.cs           | 31 +++++++++---------
 10 files changed, 56 insertions(+), 56 deletions(-)

diff --git a/Plugins/Wox.Plugin.Folder/FolderPlugin.cs b/Plugins/Wox.Plugin.Folder/FolderPlugin.cs
index 9fe2491019..18d83ac4d4 100644
--- a/Plugins/Wox.Plugin.Folder/FolderPlugin.cs
+++ b/Plugins/Wox.Plugin.Folder/FolderPlugin.cs
@@ -22,7 +22,7 @@ namespace Wox.Plugin.Folder
         {
             this.context = context;
             this.context.API.BackKeyDownEvent += ApiBackKeyDownEvent;
-            this.context.API.ResultItemDropEvent += API_ResultItemDropEvent;
+            this.context.API.ResultItemDropEvent += ResultDropEvent;
             InitialDriverList();
             if (FolderStorage.Instance.FolderLinks == null)
             {
@@ -31,7 +31,7 @@ namespace Wox.Plugin.Folder
             }
         }
 
-        void API_ResultItemDropEvent(Result result, IDataObject dropObject, DragEventArgs e)
+        void ResultDropEvent(Result result, IDataObject dropObject, DragEventArgs e)
         {
             if (dropObject.GetDataPresent(DataFormats.FileDrop))
             {
diff --git a/Plugins/Wox.Plugin.Program/Programs.cs b/Plugins/Wox.Plugin.Program/Programs.cs
index dae6cfb37d..6f856899ec 100644
--- a/Plugins/Wox.Plugin.Program/Programs.cs
+++ b/Plugins/Wox.Plugin.Program/Programs.cs
@@ -61,7 +61,7 @@ namespace Wox.Plugin.Program
         public void Init(PluginInitContext context)
         {
             this.context = context;
-            this.context.API.ResultItemDropEvent += API_ResultItemDropEvent;
+            this.context.API.ResultItemDropEvent += ResultDropEvent;
             Stopwatch.Debug("Preload programs", () =>
             {
                 programs = ProgramCacheStorage.Instance.Programs;
@@ -70,7 +70,7 @@ namespace Wox.Plugin.Program
             Stopwatch.Debug("Program Index", IndexPrograms);
         }
 
-        void API_ResultItemDropEvent(Result result, IDataObject dropObject, DragEventArgs e)
+        void ResultDropEvent(Result result, IDataObject dropObject, DragEventArgs e)
         {
 
             e.Handled = true;
diff --git a/Wox.Core/Resource/Theme.cs b/Wox.Core/Resource/Theme.cs
index 983b7ca55d..3d9845ea31 100644
--- a/Wox.Core/Resource/Theme.cs
+++ b/Wox.Core/Resource/Theme.cs
@@ -87,10 +87,10 @@ namespace Wox.Core.Resource
             Style resultSubItemSelectedStyle = dict["ItemSubTitleSelectedStyle"] as Style;
             if (resultItemStyle != null && resultSubItemStyle != null && resultSubItemSelectedStyle != null && resultItemSelectedStyle != null)
             {
-                Setter fontFamily = new Setter(TextBlock.FontFamilyProperty, new FontFamily(UserSettingStorage.Instance.ResultItemFont));
-                Setter fontStyle = new Setter(TextBlock.FontStyleProperty, FontHelper.GetFontStyleFromInvariantStringOrNormal(UserSettingStorage.Instance.ResultItemFontStyle));
-                Setter fontWeight = new Setter(TextBlock.FontWeightProperty, FontHelper.GetFontWeightFromInvariantStringOrNormal(UserSettingStorage.Instance.ResultItemFontWeight));
-                Setter fontStretch = new Setter(TextBlock.FontStretchProperty, FontHelper.GetFontStretchFromInvariantStringOrNormal(UserSettingStorage.Instance.ResultItemFontStretch));
+                Setter fontFamily = new Setter(TextBlock.FontFamilyProperty, new FontFamily(UserSettingStorage.Instance.ResultFont));
+                Setter fontStyle = new Setter(TextBlock.FontStyleProperty, FontHelper.GetFontStyleFromInvariantStringOrNormal(UserSettingStorage.Instance.ResultFontStyle));
+                Setter fontWeight = new Setter(TextBlock.FontWeightProperty, FontHelper.GetFontWeightFromInvariantStringOrNormal(UserSettingStorage.Instance.ResultFontWeight));
+                Setter fontStretch = new Setter(TextBlock.FontStretchProperty, FontHelper.GetFontStretchFromInvariantStringOrNormal(UserSettingStorage.Instance.ResultFontStretch));
 
                 Setter[] setters = { fontFamily, fontStyle, fontWeight, fontStretch };
                 Array.ForEach(new[] { resultItemStyle, resultSubItemStyle, resultItemSelectedStyle, resultSubItemSelectedStyle }, o => Array.ForEach(setters, p => o.Setters.Add(p)));
diff --git a/Wox.Core/UserSettings/UserSettingStorage.cs b/Wox.Core/UserSettings/UserSettingStorage.cs
index 1cab071e82..d5d54a48f3 100644
--- a/Wox.Core/UserSettings/UserSettingStorage.cs
+++ b/Wox.Core/UserSettings/UserSettingStorage.cs
@@ -44,16 +44,16 @@ namespace Wox.Core.UserSettings
         public string QueryBoxFontStretch { get; set; }
 
         [JsonProperty]
-        public string ResultItemFont { get; set; }
+        public string ResultFont { get; set; }
 
         [JsonProperty]
-        public string ResultItemFontStyle { get; set; }
+        public string ResultFontStyle { get; set; }
 
         [JsonProperty]
-        public string ResultItemFontWeight { get; set; }
+        public string ResultFontWeight { get; set; }
 
         [JsonProperty]
-        public string ResultItemFontStretch { get; set; }
+        public string ResultFontStretch { get; set; }
 
         [JsonProperty]
         public double WindowLeft { get; set; }
@@ -126,7 +126,7 @@ namespace Wox.Core.UserSettings
             CustomizedPluginConfigs = new List<CustomizedPluginConfig>();
             Hotkey = "Alt + Space";
             QueryBoxFont = FontFamily.GenericSansSerif.Name;
-            ResultItemFont = FontFamily.GenericSansSerif.Name;
+            ResultFont = FontFamily.GenericSansSerif.Name;
             Opacity = 1;
             OpacityMode = OpacityMode.Normal;
             LeaveCmdOpen = false;
@@ -147,9 +147,9 @@ namespace Wox.Core.UserSettings
             {
                 storage.QueryBoxFont = FontFamily.GenericSansSerif.Name;
             }
-            if (storage.ResultItemFont == null)
+            if (storage.ResultFont == null)
             {
-                storage.ResultItemFont = FontFamily.GenericSansSerif.Name;
+                storage.ResultFont = FontFamily.GenericSansSerif.Name;
             }
             if (storage.Language == null)
             {
diff --git a/Wox.Plugin/IPublicAPI.cs b/Wox.Plugin/IPublicAPI.cs
index cf2d383fa9..86a4bc6250 100644
--- a/Wox.Plugin/IPublicAPI.cs
+++ b/Wox.Plugin/IPublicAPI.cs
@@ -119,6 +119,7 @@ namespace Wox.Plugin
         /// <summary>
         /// Fired after drop to result item of current plugin 
         /// </summary>
+        /// todo: ResultItem -> Result
         event ResultItemDropEventHandler ResultItemDropEvent;
     }
 }
diff --git a/Wox/ResultListBox.xaml b/Wox/ResultListBox.xaml
index 5a280b760f..97b2e4eb8b 100644
--- a/Wox/ResultListBox.xaml
+++ b/Wox/ResultListBox.xaml
@@ -14,7 +14,7 @@
         <ListBox.ItemTemplate>
             <DataTemplate>
                 <DataTemplate.DataType>
-                    <x:Type TypeName="vm:ResultItemViewModel" />
+                    <x:Type TypeName="vm:ResultViewModel" />
                 </DataTemplate.DataType>
                 <Button Command="{Binding OpenResultListBoxItemCommand}">
                     <Button.InputBindings>
diff --git a/Wox/SettingWindow.xaml b/Wox/SettingWindow.xaml
index 2ac62a076e..7a2780fda4 100644
--- a/Wox/SettingWindow.xaml
+++ b/Wox/SettingWindow.xaml
@@ -177,10 +177,10 @@
                         </StackPanel>
                         <StackPanel Orientation="Horizontal" Margin="2">
                             <TextBlock Text="{DynamicResource resultItemFont}" />
-                            <ComboBox Margin="5 -2 5 0" x:Name="cbResultItemFont" ItemsSource="{x:Static Fonts.SystemFontFamilies}" SelectionChanged="CbResultItemFont_OnSelectionChanged" HorizontalAlignment="Left" VerticalAlignment="Top" Width="160"/>
+                            <ComboBox Margin="5 -2 5 0" x:Name="ResultFontComboBox" ItemsSource="{x:Static Fonts.SystemFontFamilies}" SelectionChanged="OnResultFontSelectionChanged" HorizontalAlignment="Left" VerticalAlignment="Top" Width="160"/>
                             <ComboBox Margin="0 -2 0 0"
-								x:Name="cbResultItemFontFaces"
-								ItemsSource="{Binding SelectedValue.FamilyTypefaces, ElementName=cbResultItemFont}" SelectionChanged="CbResultItemFontFaces_OnSelectionChanged" HorizontalAlignment="Left" VerticalAlignment="Top" Width="120">
+								x:Name="ResultFontFacesComboBox"
+								ItemsSource="{Binding SelectedValue.FamilyTypefaces, ElementName=ResultFontComboBox}" SelectionChanged="OnResultFontFacesSelectionChanged" HorizontalAlignment="Left" VerticalAlignment="Top" Width="120">
                                 <ComboBox.ItemTemplate>
                                     <DataTemplate>
                                         <ItemsControl ItemsSource="{Binding AdjustedFaceNames}">
diff --git a/Wox/SettingWindow.xaml.cs b/Wox/SettingWindow.xaml.cs
index 7eeaa464bb..8edefc933f 100644
--- a/Wox/SettingWindow.xaml.cs
+++ b/Wox/SettingWindow.xaml.cs
@@ -375,15 +375,15 @@ namespace Wox
                     UserSettingStorage.Instance.QueryBoxFontStretch
                     ));
             }
-            if (!string.IsNullOrEmpty(UserSettingStorage.Instance.ResultItemFont) &&
-                Fonts.SystemFontFamilies.Count(o => o.FamilyNames.Values.Contains(UserSettingStorage.Instance.ResultItemFont)) > 0)
+            if (!string.IsNullOrEmpty(UserSettingStorage.Instance.ResultFont) &&
+                Fonts.SystemFontFamilies.Count(o => o.FamilyNames.Values.Contains(UserSettingStorage.Instance.ResultFont)) > 0)
             {
-                cbResultItemFont.Text = UserSettingStorage.Instance.ResultItemFont;
+                ResultFontComboBox.Text = UserSettingStorage.Instance.ResultFont;
 
-                cbResultItemFontFaces.SelectedItem = SyntaxSugars.CallOrRescueDefault(() => ((FontFamily)cbResultItemFont.SelectedItem).ConvertFromInvariantStringsOrNormal(
-                    UserSettingStorage.Instance.ResultItemFontStyle,
-                    UserSettingStorage.Instance.ResultItemFontWeight,
-                    UserSettingStorage.Instance.ResultItemFontStretch
+                ResultFontFacesComboBox.SelectedItem = SyntaxSugars.CallOrRescueDefault(() => ((FontFamily)ResultFontComboBox.SelectedItem).ConvertFromInvariantStringsOrNormal(
+                    UserSettingStorage.Instance.ResultFontStyle,
+                    UserSettingStorage.Instance.ResultFontWeight,
+                    UserSettingStorage.Instance.ResultFontStretch
                     ));
             }
 
@@ -502,30 +502,30 @@ namespace Wox
             }
         }
 
-        private void CbResultItemFont_OnSelectionChanged(object sender, SelectionChangedEventArgs e)
+        private void OnResultFontSelectionChanged(object sender, SelectionChangedEventArgs e)
         {
             if (!settingsLoaded) return;
-            string resultItemFont = cbResultItemFont.SelectedItem.ToString();
-            UserSettingStorage.Instance.ResultItemFont = resultItemFont;
-            cbResultItemFontFaces.SelectedItem = ((FontFamily)cbResultItemFont.SelectedItem).ChooseRegularFamilyTypeface();
+            string resultItemFont = ResultFontComboBox.SelectedItem.ToString();
+            UserSettingStorage.Instance.ResultFont = resultItemFont;
+            ResultFontFacesComboBox.SelectedItem = ((FontFamily)ResultFontComboBox.SelectedItem).ChooseRegularFamilyTypeface();
             UserSettingStorage.Instance.Save();
             ThemeManager.Theme.ChangeTheme(UserSettingStorage.Instance.Theme);
         }
 
-        private void CbResultItemFontFaces_OnSelectionChanged(object sender, SelectionChangedEventArgs e)
+        private void OnResultFontFacesSelectionChanged(object sender, SelectionChangedEventArgs e)
         {
             if (!settingsLoaded) return;
-            FamilyTypeface typeface = (FamilyTypeface)cbResultItemFontFaces.SelectedItem;
+            FamilyTypeface typeface = (FamilyTypeface)ResultFontFacesComboBox.SelectedItem;
             if (typeface == null)
             {
-                if (cbResultItemFontFaces.Items.Count > 0)
-                    cbResultItemFontFaces.SelectedIndex = 0;
+                if (ResultFontFacesComboBox.Items.Count > 0)
+                    ResultFontFacesComboBox.SelectedIndex = 0;
             }
             else
             {
-                UserSettingStorage.Instance.ResultItemFontStretch = typeface.Stretch.ToString();
-                UserSettingStorage.Instance.ResultItemFontWeight = typeface.Weight.ToString();
-                UserSettingStorage.Instance.ResultItemFontStyle = typeface.Style.ToString();
+                UserSettingStorage.Instance.ResultFontStretch = typeface.Stretch.ToString();
+                UserSettingStorage.Instance.ResultFontWeight = typeface.Weight.ToString();
+                UserSettingStorage.Instance.ResultFontStyle = typeface.Style.ToString();
                 UserSettingStorage.Instance.Save();
                 ThemeManager.Theme.ChangeTheme(UserSettingStorage.Instance.Theme);
             }
diff --git a/Wox/ViewModel/ResultViewModel.cs b/Wox/ViewModel/ResultViewModel.cs
index ed8c0cc78f..d742f26617 100644
--- a/Wox/ViewModel/ResultViewModel.cs
+++ b/Wox/ViewModel/ResultViewModel.cs
@@ -12,7 +12,7 @@ using Wox.Storage;
 
 namespace Wox.ViewModel
 {
-    public class ResultItemViewModel : BaseViewModel
+    public class ResultViewModel : BaseViewModel
     {
         #region Private Fields
 
@@ -23,7 +23,7 @@ namespace Wox.ViewModel
 
         #region Constructor
 
-        public ResultItemViewModel(Result result)
+        public ResultViewModel(Result result)
         {
             if (null != result)
             {
@@ -160,7 +160,7 @@ namespace Wox.ViewModel
 
         public override bool Equals(object obj)
         {
-            ResultItemViewModel r = obj as ResultItemViewModel;
+            ResultViewModel r = obj as ResultViewModel;
             if (r != null)
             {
                 return _result.Equals(r.RawResult);
diff --git a/Wox/ViewModel/ResultsViewModel.cs b/Wox/ViewModel/ResultsViewModel.cs
index 04a1e43fce..62dede02bd 100644
--- a/Wox/ViewModel/ResultsViewModel.cs
+++ b/Wox/ViewModel/ResultsViewModel.cs
@@ -17,7 +17,7 @@ namespace Wox.ViewModel
     {
         #region Private Fields
 
-        private ResultItemViewModel _selectedResult;
+        private ResultViewModel _selectedResult;
         private ResultCollection _results;
         private bool _isVisible;
         private Thickness _margin;
@@ -53,7 +53,7 @@ namespace Wox.ViewModel
             }
         }
 
-        public ResultItemViewModel SelectedResult
+        public ResultViewModel SelectedResult
         {
             get
             {
@@ -104,7 +104,7 @@ namespace Wox.ViewModel
             return TopMostRecordStorage.Instance.IsTopMost(result);
         }
 
-        private int InsertIndexOf(int newScore, IList<ResultItemViewModel> list)
+        private int InsertIndexOf(int newScore, IList<ResultViewModel> list)
         {
             int index = 0;
             for (; index < list.Count; index++)
@@ -211,8 +211,8 @@ namespace Wox.ViewModel
         {
             lock (_resultsUpdateLock)
             {
-                var newResults = new List<ResultItemViewModel>();
-                newRawResults.ForEach((re) => { newResults.Add(new ResultItemViewModel(re)); });
+                var newResults = new List<ResultViewModel>();
+                newRawResults.ForEach((re) => { newResults.Add(new ResultViewModel(re)); });
                 // todo use async to do new result calculation
                 var resultsCopy = _results.ToList();
                 var oldResults = resultsCopy.Where(r => r.RawResult.PluginID == resultId).ToList();
@@ -275,19 +275,18 @@ namespace Wox.ViewModel
 
         #endregion
 
-        public class ResultCollection : ObservableCollection<ResultItemViewModel>
-        // todo implement custom moveItem,removeItem,insertItem for better performance
+        public class ResultCollection : ObservableCollection<ResultViewModel>
         {
 
             public ResultCollection()
             {
             }
 
-            public void RemoveAll(Predicate<ResultItemViewModel> predicate)
+            public void RemoveAll(Predicate<ResultViewModel> predicate)
             {
                 CheckReentrancy();
 
-                List<ResultItemViewModel> itemsToRemove = Items.Where(x => predicate(x)).ToList();
+                List<ResultViewModel> itemsToRemove = Items.Where(x => predicate(x)).ToList();
                 if (itemsToRemove.Count > 0)
                 {
 
@@ -309,22 +308,22 @@ namespace Wox.ViewModel
 
             }
 
-            public void Update(List<ResultItemViewModel> newItems)
+            public void Update(List<ResultViewModel> newItems)
             {
                 int newCount = newItems.Count;
                 int oldCount = Items.Count;
                 int location = newCount > oldCount ? oldCount : newCount;
                 for (int i = 0; i < location; i++)
                 {
-                    ResultItemViewModel oldItem = Items[i];
-                    ResultItemViewModel newItem = newItems[i];
-                    if (!oldItem.Equals(newItem))
+                    ResultViewModel oldResult = Items[i];
+                    ResultViewModel newResult = newItems[i];
+                    if (!oldResult.Equals(newResult))
                     {
-                        this[i] = newItem;
+                        this[i] = newResult;
                     }
-                    else if (oldItem.RawResult.Score != newItem.RawResult.Score)
+                    else if (oldResult.RawResult.Score != newResult.RawResult.Score)
                     {
-                        this[i].RawResult.Score = newItem.RawResult.Score;
+                        this[i].RawResult.Score = newResult.RawResult.Score;
                     }
                 }
 

From 5df766466af6889240b4c14b288b433a41ac8666 Mon Sep 17 00:00:00 2001
From: bao-qian <bao.github@outlook.com>
Date: Sun, 21 Feb 2016 15:26:57 +0000
Subject: [PATCH 10/15] Misc

part of refactoring for PR #494
---
 Wox/App.xaml.cs          | 8 +++++---
 Wox/PublicAPIInstance.cs | 3 +--
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/Wox/App.xaml.cs b/Wox/App.xaml.cs
index b5847ac164..3e39447d35 100644
--- a/Wox/App.xaml.cs
+++ b/Wox/App.xaml.cs
@@ -43,12 +43,14 @@ namespace Wox
                 base.OnStartup(e);
                 WoxDirectroy.Executable = Directory.GetParent(Assembly.GetExecutingAssembly().Location).ToString();
                 RegisterUnhandledException();
-                ThreadPool.QueueUserWorkItem(o => { ImageLoader.ImageLoader.PreloadImages(); });
+
+                ThreadPool.SetMaxThreads(30, 10);
+                ThreadPool.SetMinThreads(10, 5);
+                ThreadPool.QueueUserWorkItem(_ => { ImageLoader.ImageLoader.PreloadImages(); });
 
                 MainViewModel mainVM = new MainViewModel();
                 API = new PublicAPIInstance(mainVM);
-                Window = new MainWindow();
-                Window.DataContext = mainVM;
+                Window = new MainWindow {DataContext = mainVM};
 
                 NotifyIconManager notifyIconManager = new NotifyIconManager(API);
 
diff --git a/Wox/PublicAPIInstance.cs b/Wox/PublicAPIInstance.cs
index 2374d46e19..b0c07cd646 100644
--- a/Wox/PublicAPIInstance.cs
+++ b/Wox/PublicAPIInstance.cs
@@ -30,8 +30,7 @@ namespace Wox
         {
             this.MainVM = mainVM;
 
-            ThreadPool.SetMaxThreads(30, 10);
-            ThreadPool.SetMinThreads(10, 5);
+
             GlobalHotkey.Instance.hookedKeyboardCallback += KListener_hookedKeyboardCallback;
             WebRequest.RegisterPrefix("data", new DataWebRequestFactory());
 

From 5919dd998be4262f487a37bf6ff2b2bdb143465c Mon Sep 17 00:00:00 2001
From: rmterra <r.mirandaterra@gmail.com>
Date: Sun, 21 Feb 2016 17:49:43 -0300
Subject: [PATCH 11/15] adds System.Windows.Visibility extension methods to
 validates if current value is Visible or not

---
 Wox/Extensions/VisibilityExtensions.cs | 17 +++++++++++++++++
 Wox/Wox.csproj                         |  1 +
 2 files changed, 18 insertions(+)
 create mode 100644 Wox/Extensions/VisibilityExtensions.cs

diff --git a/Wox/Extensions/VisibilityExtensions.cs b/Wox/Extensions/VisibilityExtensions.cs
new file mode 100644
index 0000000000..d489c0a0f6
--- /dev/null
+++ b/Wox/Extensions/VisibilityExtensions.cs
@@ -0,0 +1,17 @@
+using System.Windows;
+
+namespace Wox.Extensions
+{
+    public static class VisibilityExtensions
+    {
+        public static bool IsVisible(this Visibility visibility)
+        {
+            return visibility == Visibility.Visible;
+        }
+
+        public static bool IsNotVisible(this Visibility visibility)
+        {
+            return !visibility.IsVisible();
+        }
+    }
+}
diff --git a/Wox/Wox.csproj b/Wox/Wox.csproj
index 89de06548b..cce82657f9 100644
--- a/Wox/Wox.csproj
+++ b/Wox/Wox.csproj
@@ -124,6 +124,7 @@
     <Compile Include="Converters\StringEmptyConverter.cs" />
     <Compile Include="Converters\StringNullOrEmptyToVisibilityConverter.cs" />
     <Compile Include="Converters\VisibilityConverter.cs" />
+    <Compile Include="Extensions\VisibilityExtensions.cs" />
     <Compile Include="Helper\SingletonWindowOpener.cs" />
     <Compile Include="ImageLoader\ImageCacheStroage.cs" />
     <Compile Include="NotifyIconManager.cs" />

From cb952b0d3a178441f82a9d4f535fc833153aba90 Mon Sep 17 00:00:00 2001
From: rmterra <r.mirandaterra@gmail.com>
Date: Sun, 21 Feb 2016 18:27:05 -0300
Subject: [PATCH 12/15] updates MainWindow visibility bindings to use
 System.Windows.Visibility instead of bool

---
 Wox/MainWindow.xaml            |   9 +-
 Wox/MainWindow.xaml.cs         |   3 +-
 Wox/PublicAPIInstance.cs       |  11 +--
 Wox/ViewModel/MainViewModel.cs | 153 +++++++++++++++++----------------
 4 files changed, 90 insertions(+), 86 deletions(-)

diff --git a/Wox/MainWindow.xaml b/Wox/MainWindow.xaml
index 7ce73b08ec..361b621d20 100644
--- a/Wox/MainWindow.xaml
+++ b/Wox/MainWindow.xaml
@@ -18,13 +18,12 @@
         Style="{DynamicResource WindowStyle}"
         Icon="Images\app.png"
         AllowsTransparency="True"
-        Visibility="{Binding IsVisible,Converter={converters:VisibilityConverter}}"
+        Visibility="{Binding WindowVisibility}"
         PreviewKeyDown="Window_PreviewKeyDown" d:DataContext="{d:DesignInstance vm:MainViewModel, IsDesignTimeCreatable=True}">
     <Window.Resources>
         <DataTemplate DataType="{x:Type vm:ResultsViewModel}">
             <wox:ResultListBox></wox:ResultListBox>
         </DataTemplate>
-        <converters:VisibilityConverter x:Key="VisibilityConverter" />
     </Window.Resources>
     <Border Style="{DynamicResource WindowBorderStyle}" MouseDown="Border_OnMouseDown">
         <StackPanel Orientation="Vertical">
@@ -32,14 +31,14 @@
                      PreviewDragOver="TbQuery_OnPreviewDragOver" AllowDrop="True"
                      x:Name="tbQuery" />
             <Line Style="{DynamicResource PendingLineStyle}" x:Name="progressBar" Y1="0" Y2="0" X2="100" Height="2" StrokeThickness="1"
-                  Visibility="{Binding IsProgressBarVisible,Converter={StaticResource VisibilityConverter}}">
+                  Visibility="{Binding ProgressBarVisibility}">
                 <Line.ToolTip>
                     <ToolTip IsOpen="{Binding IsProgressBarTooltipVisible}"></ToolTip>
                 </Line.ToolTip>
             </Line>
-            <ContentControl Content="{Binding Results}" Visibility="{Binding IsResultListBoxVisible,Converter={StaticResource VisibilityConverter}}">
+            <ContentControl Content="{Binding Results}" Visibility="{Binding ResultListBoxVisibility}">
             </ContentControl>
-            <ContentControl Content="{Binding ContextMenu}" Visibility="{Binding IsContextMenuVisible,Converter={StaticResource VisibilityConverter}}">
+            <ContentControl Content="{Binding ContextMenu}" Visibility="{Binding ContextMenuVisibility}">
             </ContentControl>
         </StackPanel>
     </Border>
diff --git a/Wox/MainWindow.xaml.cs b/Wox/MainWindow.xaml.cs
index 4430fd6fe9..7757b80ad4 100644
--- a/Wox/MainWindow.xaml.cs
+++ b/Wox/MainWindow.xaml.cs
@@ -16,6 +16,7 @@ using KeyEventArgs = System.Windows.Input.KeyEventArgs;
 using MessageBox = System.Windows.MessageBox;
 using Wox.ViewModel;
 using Wox.Plugin;
+using Wox.Extensions;
 
 namespace Wox
 {
@@ -76,7 +77,7 @@ namespace Wox
                 }
                 else if(eve.PropertyName == "IsVisible")
                 {
-                    if (vm.IsVisible)
+                    if (vm.WindowVisibility.IsVisible())
                     {
                         this.tbQuery.Focus();
                     }
diff --git a/Wox/PublicAPIInstance.cs b/Wox/PublicAPIInstance.cs
index b0c07cd646..85384dc50a 100644
--- a/Wox/PublicAPIInstance.cs
+++ b/Wox/PublicAPIInstance.cs
@@ -18,6 +18,7 @@ using Wox.Helper;
 using Wox.Infrastructure.Hotkey;
 using Wox.Plugin;
 using Wox.ViewModel;
+using Wox.Extensions;
 
 namespace Wox
 {
@@ -127,12 +128,12 @@ namespace Wox
 
         public void StartLoadingBar()
         {
-            this.MainVM.IsProgressBarVisible = true;
+            this.MainVM.ProgressBarVisibility = Visibility.Visible;
         }
 
         public void StopLoadingBar()
         {
-            this.MainVM.IsProgressBarVisible = false;
+            this.MainVM.ProgressBarVisibility = Visibility.Collapsed;
         }
 
         public void InstallPlugin(string path)
@@ -201,13 +202,13 @@ namespace Wox
         {
             UserSettingStorage.Instance.WindowLeft = this.MainVM.Left;
             UserSettingStorage.Instance.WindowTop = this.MainVM.Top;
-            this.MainVM.IsVisible = false;
+            this.MainVM.WindowVisibility = Visibility.Collapsed;
         }
 
         private void ShowWox(bool selectAll = true)
         {
             UserSettingStorage.Instance.IncreaseActivateTimes();
-            this.MainVM.IsVisible = true;
+            this.MainVM.WindowVisibility = Visibility.Visible;
             this.MainVM.SelectAllText = true;
         }
 
@@ -277,7 +278,7 @@ namespace Wox
 
         private void ToggleWox()
         {
-            if (!MainVM.IsVisible)
+            if (MainVM.WindowVisibility.IsNotVisible())
             {
                 ShowWox();
             }
diff --git a/Wox/ViewModel/MainViewModel.cs b/Wox/ViewModel/MainViewModel.cs
index 4acdaeebb7..38d788125e 100644
--- a/Wox/ViewModel/MainViewModel.cs
+++ b/Wox/ViewModel/MainViewModel.cs
@@ -14,6 +14,7 @@ using Wox.Infrastructure;
 using Wox.Infrastructure.Hotkey;
 using Wox.Plugin;
 using Wox.Storage;
+using Wox.Extensions;
 
 namespace Wox.ViewModel
 {
@@ -22,16 +23,18 @@ namespace Wox.ViewModel
         #region Private Fields
 
         private string _queryText;
-        private bool _isVisible;
-        private bool _isResultListBoxVisible;
-        private bool _isContextMenuVisible;
-        private bool _isProgressBarVisible;
+
         private bool _isProgressBarTooltipVisible;
         private bool _selectAllText;
         private int _caretIndex;
         private double _left;
         private double _top;
 
+        private Visibility _contextMenuVisibility;
+        private Visibility _progressBarVisibility;
+        private Visibility _resultListBoxVisibility;
+        private Visibility _windowVisibility;
+
         private bool _queryHasReturn;
         private Query _lastQuery = new Query();
         private bool _ignoreTextChange;
@@ -100,63 +103,6 @@ namespace Wox.ViewModel
             }
         }
 
-        public bool IsVisible
-        {
-            get
-            {
-                return this._isVisible;
-            }
-            set
-            {
-                this._isVisible = value;
-                OnPropertyChanged("IsVisible");
-
-                if (!value && this.IsContextMenuVisible)
-                {
-                    this.BackToSearchMode();
-                }
-            }
-        }
-
-        public bool IsResultListBoxVisible
-        {
-            get
-            {
-                return this._isResultListBoxVisible;
-            }
-            set
-            {
-                this._isResultListBoxVisible = value;
-                OnPropertyChanged("IsResultListBoxVisible");
-            }
-        }
-
-        public bool IsContextMenuVisible
-        {
-            get
-            {
-                return this._isContextMenuVisible;
-            }
-            set
-            {
-                this._isContextMenuVisible = value;
-                OnPropertyChanged("IsContextMenuVisible");
-            }
-        }
-
-        public bool IsProgressBarVisible
-        {
-            get
-            {
-                return this._isProgressBarVisible;
-            }
-            set
-            {
-                this._isProgressBarVisible = value;
-                OnPropertyChanged("IsProgressBarVisible");
-            }
-        }
-
         public bool IsProgressBarTooltipVisible
         {
             get
@@ -196,6 +142,63 @@ namespace Wox.ViewModel
             }
         }
 
+        public Visibility ContextMenuVisibility
+        {
+            get
+            {
+                return this._contextMenuVisibility;
+            }
+            set
+            {
+                this._contextMenuVisibility = value;
+                OnPropertyChanged("ContextMenuVisibility");
+            }
+        }
+
+        public Visibility ProgressBarVisibility
+        {
+            get
+            {
+                return this._progressBarVisibility;
+            }
+            set
+            {
+                this._progressBarVisibility = value;
+                OnPropertyChanged("ProgressBarVisibility");
+            }
+        }
+
+        public Visibility ResultListBoxVisibility
+        {
+            get
+            {
+                return this._resultListBoxVisibility;
+            }
+            set
+            {
+                this._resultListBoxVisibility = value;
+                OnPropertyChanged("ResultListBoxVisibility");
+            }
+        }
+
+        public Visibility WindowVisibility
+        {
+            get
+            {
+                return this._windowVisibility;
+            }
+            set
+            {
+                this._windowVisibility = value;
+                OnPropertyChanged("WindowVisibility");
+
+                if (value.IsNotVisible() && this.ContextMenuVisibility.IsVisible())
+                {
+                    this.BackToSearchMode();
+                }
+            }
+        }
+
         public ICommand EscCommand
         {
             get;
@@ -277,13 +280,13 @@ namespace Wox.ViewModel
             this.EscCommand = new RelayCommand((parameter) =>
             {
 
-                if (this.IsContextMenuVisible)
+                if (this.ContextMenuVisibility.IsVisible())
                 {
                     this.BackToSearchMode();
                 }
                 else
                 {
-                    this.IsVisible = false;
+                    this.WindowVisibility = Visibility.Collapsed;
                 }
 
             });
@@ -291,7 +294,7 @@ namespace Wox.ViewModel
             this.SelectNextItemCommand = new RelayCommand((parameter) =>
             {
 
-                if (this.IsContextMenuVisible)
+                if (this.ContextMenuVisibility.IsVisible())
                 {
                     this.ContextMenu.SelectNextResult();
                 }
@@ -305,7 +308,7 @@ namespace Wox.ViewModel
             this.SelectPrevItemCommand = new RelayCommand((parameter) =>
             {
 
-                if (this.IsContextMenuVisible)
+                if (this.ContextMenuVisibility.IsVisible())
                 {
                     this.ContextMenu.SelectPrevResult();
                 }
@@ -319,7 +322,7 @@ namespace Wox.ViewModel
             this.CtrlOCommand = new RelayCommand((parameter) =>
             {
 
-                if (this.IsContextMenuVisible)
+                if (this.ContextMenuVisibility.IsVisible())
                 {
                     BackToSearchMode();
                 }
@@ -367,7 +370,7 @@ namespace Wox.ViewModel
             this.ShiftEnterCommand = new RelayCommand((parameter) =>
             {
 
-                if (!this.IsContextMenuVisible && null != this.Results.SelectedResult)
+                if (this.ContextMenuVisibility.IsNotVisible() && null != this.Results.SelectedResult)
                 {
                     this.ShowContextMenu(this.Results.SelectedResult.RawResult);
                 }
@@ -402,7 +405,7 @@ namespace Wox.ViewModel
         private void InitializeResultListBox()
         {
             this.Results = new ResultsViewModel();
-            this.IsResultListBoxVisible = false;
+            this.ResultListBoxVisibility = Visibility.Collapsed;
         }
 
         private void ShowContextMenu(Result result)
@@ -433,8 +436,8 @@ namespace Wox.ViewModel
             this.ContextMenu.AddResults(actions, pluginID);
             CurrentContextMenus = actions;
 
-            this.IsContextMenuVisible = true;
-            this.IsResultListBoxVisible = false;
+            this.ContextMenuVisibility = Visibility.Visible;
+            this.ResultListBoxVisibility = Visibility.Collapsed;
 
             this.QueryText = "";
         }
@@ -472,7 +475,7 @@ namespace Wox.ViewModel
         private void InitializeContextMenu()
         {
             this.ContextMenu = new ResultsViewModel();
-            this.IsContextMenuVisible = false;
+            this.ContextMenuVisibility = Visibility.Collapsed;
         }
 
         private void HandleQueryTextUpdated()
@@ -480,7 +483,7 @@ namespace Wox.ViewModel
             if (_ignoreTextChange) { _ignoreTextChange = false; return; }
 
             this.IsProgressBarTooltipVisible = false;
-            if (this.IsContextMenuVisible)
+            if (this.ContextMenuVisibility.IsVisible())
             {
                 QueryContextMenu();
             }
@@ -592,8 +595,8 @@ namespace Wox.ViewModel
         private void BackToSearchMode()
         {
             this.QueryText = _textBeforeEnterContextMenuMode;
-            this.IsContextMenuVisible = false;
-            this.IsResultListBoxVisible = true;
+            this.ContextMenuVisibility = Visibility.Collapsed;
+            this.ResultListBoxVisibility = Visibility.Visible;
             this.CaretIndex = this.QueryText.Length;
         }
 
@@ -652,7 +655,7 @@ namespace Wox.ViewModel
 
             if (list.Count > 0)
             {
-                this.IsResultListBoxVisible = true;
+                this.ResultListBoxVisibility = Visibility.Visible;
             }
         }
 

From 1ac92c561b289201e321bf9babb8a51d3258c1b4 Mon Sep 17 00:00:00 2001
From: rmterra <r.mirandaterra@gmail.com>
Date: Sun, 21 Feb 2016 18:27:45 -0300
Subject: [PATCH 13/15] removes VisibilityConverter .cs

---
 Wox/Converters/VisibilityConverter.cs | 30 ---------------------------
 Wox/Wox.csproj                        |  1 -
 2 files changed, 31 deletions(-)
 delete mode 100644 Wox/Converters/VisibilityConverter.cs

diff --git a/Wox/Converters/VisibilityConverter.cs b/Wox/Converters/VisibilityConverter.cs
deleted file mode 100644
index 46488bde37..0000000000
--- a/Wox/Converters/VisibilityConverter.cs
+++ /dev/null
@@ -1,30 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Globalization;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using System.Windows;
-using System.Windows.Data;
-
-namespace Wox.Converters
-{
-    class VisibilityConverter : ConvertorBase<VisibilityConverter>
-    {
-        public override object Convert(object value, Type targetType, object parameter, CultureInfo culture)
-        {
-            if (value == null || value == DependencyProperty.UnsetValue)
-            {
-                return null;
-            }
-
-            return bool.Parse(value.ToString()) ? Visibility.Visible : Visibility.Collapsed;
-        }
-
-        public override object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)
-        {
-            return null;
-        }
-    }
-
-}
diff --git a/Wox/Wox.csproj b/Wox/Wox.csproj
index cce82657f9..35c29664b5 100644
--- a/Wox/Wox.csproj
+++ b/Wox/Wox.csproj
@@ -123,7 +123,6 @@
     <Compile Include="Converters\OpacityModeConverter.cs" />
     <Compile Include="Converters\StringEmptyConverter.cs" />
     <Compile Include="Converters\StringNullOrEmptyToVisibilityConverter.cs" />
-    <Compile Include="Converters\VisibilityConverter.cs" />
     <Compile Include="Extensions\VisibilityExtensions.cs" />
     <Compile Include="Helper\SingletonWindowOpener.cs" />
     <Compile Include="ImageLoader\ImageCacheStroage.cs" />

From e6df19efbc007a37ec9cab72d13824c29669f093 Mon Sep 17 00:00:00 2001
From: bao-qian <bao.github@outlook.com>
Date: Fri, 26 Feb 2016 12:01:48 +0000
Subject: [PATCH 14/15] Refactoring for PR #499, part 1

---
 Wox/{Extensions => Helper}/VisibilityExtensions.cs | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename Wox/{Extensions => Helper}/VisibilityExtensions.cs (100%)

diff --git a/Wox/Extensions/VisibilityExtensions.cs b/Wox/Helper/VisibilityExtensions.cs
similarity index 100%
rename from Wox/Extensions/VisibilityExtensions.cs
rename to Wox/Helper/VisibilityExtensions.cs

From d5ab4093a93b5fdaa1cc8d86c6dc343741627aae Mon Sep 17 00:00:00 2001
From: bao-qian <bao.github@outlook.com>
Date: Fri, 26 Feb 2016 12:05:32 +0000
Subject: [PATCH 15/15] Refactoring for PR #499, part 2

---
 Wox/Helper/VisibilityExtensions.cs |  7 +------
 Wox/MainWindow.xaml                |  2 +-
 Wox/MainWindow.xaml.cs             |  3 +--
 Wox/PublicAPIInstance.cs           |  7 +++----
 Wox/ViewModel/MainViewModel.cs     | 26 +++++++++-----------------
 Wox/Wox.csproj                     |  5 ++++-
 6 files changed, 19 insertions(+), 31 deletions(-)

diff --git a/Wox/Helper/VisibilityExtensions.cs b/Wox/Helper/VisibilityExtensions.cs
index d489c0a0f6..63ecb74b47 100644
--- a/Wox/Helper/VisibilityExtensions.cs
+++ b/Wox/Helper/VisibilityExtensions.cs
@@ -1,6 +1,6 @@
 using System.Windows;
 
-namespace Wox.Extensions
+namespace Wox.Helper
 {
     public static class VisibilityExtensions
     {
@@ -8,10 +8,5 @@ namespace Wox.Extensions
         {
             return visibility == Visibility.Visible;
         }
-
-        public static bool IsNotVisible(this Visibility visibility)
-        {
-            return !visibility.IsVisible();
-        }
     }
 }
diff --git a/Wox/MainWindow.xaml b/Wox/MainWindow.xaml
index 361b621d20..f0a1b2843c 100644
--- a/Wox/MainWindow.xaml
+++ b/Wox/MainWindow.xaml
@@ -18,7 +18,7 @@
         Style="{DynamicResource WindowStyle}"
         Icon="Images\app.png"
         AllowsTransparency="True"
-        Visibility="{Binding WindowVisibility}"
+        Visibility="{Binding MainWindowVisibility}"
         PreviewKeyDown="Window_PreviewKeyDown" d:DataContext="{d:DesignInstance vm:MainViewModel, IsDesignTimeCreatable=True}">
     <Window.Resources>
         <DataTemplate DataType="{x:Type vm:ResultsViewModel}">
diff --git a/Wox/MainWindow.xaml.cs b/Wox/MainWindow.xaml.cs
index 481e33dcf2..ba80cd1143 100644
--- a/Wox/MainWindow.xaml.cs
+++ b/Wox/MainWindow.xaml.cs
@@ -16,7 +16,6 @@ using KeyEventArgs = System.Windows.Input.KeyEventArgs;
 using MessageBox = System.Windows.MessageBox;
 using Wox.ViewModel;
 using Wox.Plugin;
-using Wox.Extensions;
 
 namespace Wox
 {
@@ -77,7 +76,7 @@ namespace Wox
                 }
                 else if(eve.PropertyName == "IsVisible")
                 {
-                    if (vm.WindowVisibility.IsVisible())
+                    if (vm.MainWindowVisibility.IsVisible())
                     {
                         tbQuery.Focus();
                     }
diff --git a/Wox/PublicAPIInstance.cs b/Wox/PublicAPIInstance.cs
index d4b6ab8093..c903a2851c 100644
--- a/Wox/PublicAPIInstance.cs
+++ b/Wox/PublicAPIInstance.cs
@@ -18,7 +18,6 @@ using Wox.Helper;
 using Wox.Infrastructure.Hotkey;
 using Wox.Plugin;
 using Wox.ViewModel;
-using Wox.Extensions;
 
 namespace Wox
 {
@@ -202,13 +201,13 @@ namespace Wox
         {
             UserSettingStorage.Instance.WindowLeft = MainVM.Left;
             UserSettingStorage.Instance.WindowTop = MainVM.Top;
-            MainVM.WindowVisibility = Visibility.Collapsed;
+            MainVM.MainWindowVisibility = Visibility.Collapsed;
         }
 
         private void ShowWox(bool selectAll = true)
         {
             UserSettingStorage.Instance.IncreaseActivateTimes();
-            MainVM.WindowVisibility = Visibility.Visible;
+            MainVM.MainWindowVisibility = Visibility.Visible;
             MainVM.SelectAllText = true;
         }
 
@@ -278,7 +277,7 @@ namespace Wox
 
         private void ToggleWox()
         {
-            if (MainVM.WindowVisibility.IsNotVisible())
+            if (!MainVM.MainWindowVisibility.IsVisible())
             {
                 ShowWox();
             }
diff --git a/Wox/ViewModel/MainViewModel.cs b/Wox/ViewModel/MainViewModel.cs
index c3a23e4576..29b7d053d2 100644
--- a/Wox/ViewModel/MainViewModel.cs
+++ b/Wox/ViewModel/MainViewModel.cs
@@ -10,11 +10,11 @@ using System.Windows.Input;
 using Wox.Core.Plugin;
 using Wox.Core.Resource;
 using Wox.Core.UserSettings;
+using Wox.Helper;
 using Wox.Infrastructure;
 using Wox.Infrastructure.Hotkey;
 using Wox.Plugin;
 using Wox.Storage;
-using Wox.Extensions;
 
 namespace Wox.ViewModel
 {
@@ -33,7 +33,7 @@ namespace Wox.ViewModel
         private Visibility _contextMenuVisibility;
         private Visibility _progressBarVisibility;
         private Visibility _resultListBoxVisibility;
-        private Visibility _windowVisibility;
+        private Visibility _mainWindowVisibility;
 
         private bool _queryHasReturn;
         private Query _lastQuery = new Query();
@@ -181,18 +181,18 @@ namespace Wox.ViewModel
             }
         }
 
-        public Visibility WindowVisibility
+        public Visibility MainWindowVisibility
         {
             get
             {
-                return _windowVisibility;
+                return _mainWindowVisibility;
             }
             set
             {
-                _windowVisibility = value;
-                OnPropertyChanged("WindowVisibility");
+                _mainWindowVisibility = value;
+                OnPropertyChanged("MainWindowVisibility");
 
-                if (value.IsNotVisible() && ContextMenuVisibility.IsVisible())
+                if (!value.IsVisible() && ContextMenuVisibility.IsVisible())
                 {
                     BackToSearchMode();
                 }
@@ -200,21 +200,13 @@ namespace Wox.ViewModel
         }
 
         public ICommand EscCommand { get; set; }
-
         public ICommand SelectNextItemCommand { get; set; }
-
         public ICommand SelectPrevItemCommand { get; set; }
-
         public ICommand CtrlOCommand { get; set; }
-
         public ICommand DisplayNextQueryCommand { get; set; }
-
         public ICommand DisplayPrevQueryCommand { get; set; }
-
         public ICommand SelectNextPageCommand { get; set; }
-
         public ICommand SelectPrevPageCommand { get; set; }
-
         public ICommand StartHelpCommand { get; set; }
         public ICommand ShiftEnterCommand { get; set; }
         public ICommand OpenResultCommand { get; set; }
@@ -234,7 +226,7 @@ namespace Wox.ViewModel
                 }
                 else
                 {
-                    WindowVisibility = Visibility.Collapsed;
+                    MainWindowVisibility = Visibility.Collapsed;
                 }
 
             });
@@ -318,7 +310,7 @@ namespace Wox.ViewModel
             ShiftEnterCommand = new RelayCommand((parameter) =>
             {
 
-                if (ContextMenuVisibility.IsNotVisible() && null != Results.SelectedResult)
+                if (!ContextMenuVisibility.IsVisible() && null != Results.SelectedResult)
                 {
                     ShowContextMenu(Results.SelectedResult.RawResult);
                 }
diff --git a/Wox/Wox.csproj b/Wox/Wox.csproj
index 35c29664b5..2bfc0d7b8a 100644
--- a/Wox/Wox.csproj
+++ b/Wox/Wox.csproj
@@ -123,7 +123,7 @@
     <Compile Include="Converters\OpacityModeConverter.cs" />
     <Compile Include="Converters\StringEmptyConverter.cs" />
     <Compile Include="Converters\StringNullOrEmptyToVisibilityConverter.cs" />
-    <Compile Include="Extensions\VisibilityExtensions.cs" />
+    <Compile Include="Helper\VisibilityExtensions.cs" />
     <Compile Include="Helper\SingletonWindowOpener.cs" />
     <Compile Include="ImageLoader\ImageCacheStroage.cs" />
     <Compile Include="NotifyIconManager.cs" />
@@ -375,6 +375,9 @@
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Resource>
   </ItemGroup>
+  <ItemGroup>
+    <Folder Include="Extensions\" />
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <PropertyGroup>
     <PostBuildEvent>xcopy /Y  $(ProjectDir)Themes\* $(TargetDir)Themes\