Merge branch 'dev' into add_enable_portablemode_setting

2026-03-11 08:54:32 +00:00 · 2020-03-22 19:42:04 +11:00 · 2020-03-22 19:42:04 +11:00 · c5dc21dcc7
commit c5dc21dcc7
parent f939abb6e7 b50f738f42
42 changed files with 226 additions and 90 deletions
--- a/Plugins/HelloWorldCSharp/App.config
+++ b/Plugins/HelloWorldCSharp/App.config
@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<configuration>
-    <startup> 
-        <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5.2" />
-    </startup>
-</configuration>
--- a/Plugins/HelloWorldCSharp/HelloWorldCSharp.csproj
+++ b/Plugins/HelloWorldCSharp/HelloWorldCSharp.csproj
@ -9,9 +9,9 @@
    <AppDesignerFolder>Properties</AppDesignerFolder>
    <RootNamespace>HelloWorldCSharp</RootNamespace>
    <AssemblyName>HelloWorldCSharp</AssemblyName>
-    <TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
    <FileAlignment>512</FileAlignment>
-    <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
+    <TargetFrameworkProfile />
  </PropertyGroup>
  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
    <PlatformTarget>AnyCPU</PlatformTarget>
@ -52,7 +52,6 @@
    <Compile Include="Properties\AssemblyInfo.cs" />
  </ItemGroup>
  <ItemGroup>
-    <None Include="App.config" />
    <None Include="plugin.json">
      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
    </None>
--- a/Plugins/Wox.Plugin.BrowserBookmark/Wox.Plugin.BrowserBookmark.csproj
+++ b/Plugins/Wox.Plugin.BrowserBookmark/Wox.Plugin.BrowserBookmark.csproj
@ -9,7 +9,7 @@
    <AppDesignerFolder>Properties</AppDesignerFolder>
    <RootNamespace>Wox.Plugin.BrowserBookmark</RootNamespace>
    <AssemblyName>Wox.Plugin.BrowserBookmark</AssemblyName>
-    <TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
    <FileAlignment>512</FileAlignment>
    <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
    <RestorePackages>true</RestorePackages>
--- a/Plugins/Wox.Plugin.BrowserBookmark/app.config
+++ b/Plugins/Wox.Plugin.BrowserBookmark/app.config
@ -1,22 +1,22 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <configuration>
  <configSections>
    
-    <section name="entityFramework" type="System.Data.Entity.Internal.ConfigFile.EntityFrameworkSection, EntityFramework, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" requirePermission="false" />
+    <section name="entityFramework" type="System.Data.Entity.Internal.ConfigFile.EntityFrameworkSection, EntityFramework, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" requirePermission="false"/>
  </configSections>
  <startup>
-    <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5.2" />
+    <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.2"/>
  </startup>
  <entityFramework>
    <defaultConnectionFactory type="System.Data.Entity.Infrastructure.LocalDbConnectionFactory, EntityFramework">
      <parameters>
-        <parameter value="mssqllocaldb" />
+        <parameter value="mssqllocaldb"/>
      </parameters>
    </defaultConnectionFactory>
    <providers>
-      <provider invariantName="System.Data.SqlClient" type="System.Data.Entity.SqlServer.SqlProviderServices, EntityFramework.SqlServer" />
-      <provider invariantName="System.Data.SQLite.EF6" type="System.Data.SQLite.EF6.SQLiteProviderServices, System.Data.SQLite.EF6" />
+      <provider invariantName="System.Data.SqlClient" type="System.Data.Entity.SqlServer.SqlProviderServices, EntityFramework.SqlServer"/>
+      <provider invariantName="System.Data.SQLite.EF6" type="System.Data.SQLite.EF6.SQLiteProviderServices, System.Data.SQLite.EF6"/>
    </providers>
  </entityFramework>
  
-</configuration>
+</configuration>
--- a/Plugins/Wox.Plugin.Calculator/Wox.Plugin.Calculator.csproj
+++ b/Plugins/Wox.Plugin.Calculator/Wox.Plugin.Calculator.csproj
@ -9,7 +9,7 @@
    <AppDesignerFolder>Properties</AppDesignerFolder>
    <RootNamespace>Wox.Plugin.Caculator</RootNamespace>
    <AssemblyName>Wox.Plugin.Caculator</AssemblyName>
-    <TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
    <FileAlignment>512</FileAlignment>
    <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
    <TargetFrameworkProfile />
--- a/Plugins/Wox.Plugin.Color/Wox.Plugin.Color.csproj
+++ b/Plugins/Wox.Plugin.Color/Wox.Plugin.Color.csproj
@ -9,7 +9,7 @@
    <AppDesignerFolder>Properties</AppDesignerFolder>
    <RootNamespace>Wox.Plugin.Color</RootNamespace>
    <AssemblyName>Wox.Plugin.Color</AssemblyName>
-    <TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
    <FileAlignment>512</FileAlignment>
    <TargetFrameworkProfile />
  </PropertyGroup>
--- a/Plugins/Wox.Plugin.ControlPanel/Wox.Plugin.ControlPanel.csproj
+++ b/Plugins/Wox.Plugin.ControlPanel/Wox.Plugin.ControlPanel.csproj
@ -9,7 +9,7 @@
    <AppDesignerFolder>Properties</AppDesignerFolder>
    <RootNamespace>Wox.Plugin.ControlPanel</RootNamespace>
    <AssemblyName>Wox.Plugin.ControlPanel</AssemblyName>
-    <TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
    <FileAlignment>512</FileAlignment>
    <TargetFrameworkProfile />
  </PropertyGroup>
--- a/Plugins/Wox.Plugin.Everything/Wox.Plugin.Everything.csproj
+++ b/Plugins/Wox.Plugin.Everything/Wox.Plugin.Everything.csproj
@ -9,7 +9,7 @@
    <AppDesignerFolder>Properties</AppDesignerFolder>
    <RootNamespace>Wox.Plugin.Everything</RootNamespace>
    <AssemblyName>Wox.Plugin.Everything</AssemblyName>
-    <TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
    <FileAlignment>512</FileAlignment>
    <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\Wox\</SolutionDir>
    <TargetFrameworkProfile />
--- a/Plugins/Wox.Plugin.Folder/Wox.Plugin.Folder.csproj
+++ b/Plugins/Wox.Plugin.Folder/Wox.Plugin.Folder.csproj
@ -9,7 +9,7 @@
    <AppDesignerFolder>Properties</AppDesignerFolder>
    <RootNamespace>Wox.Plugin.Folder</RootNamespace>
    <AssemblyName>Wox.Plugin.Folder</AssemblyName>
-    <TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
    <FileAlignment>512</FileAlignment>
    <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
    <TargetFrameworkProfile />
--- a/Plugins/Wox.Plugin.PluginIndicator/Wox.Plugin.PluginIndicator.csproj
+++ b/Plugins/Wox.Plugin.PluginIndicator/Wox.Plugin.PluginIndicator.csproj
@ -9,7 +9,7 @@
    <AppDesignerFolder>Properties</AppDesignerFolder>
    <RootNamespace>Wox.Plugin.PluginIndicator</RootNamespace>
    <AssemblyName>Wox.Plugin.PluginIndicator</AssemblyName>
-    <TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
    <FileAlignment>512</FileAlignment>
    <TargetFrameworkProfile />
  </PropertyGroup>
--- a/Plugins/Wox.Plugin.PluginManagement/Wox.Plugin.PluginManagement.csproj
+++ b/Plugins/Wox.Plugin.PluginManagement/Wox.Plugin.PluginManagement.csproj
@ -9,7 +9,7 @@
    <AppDesignerFolder>Properties</AppDesignerFolder>
    <RootNamespace>Wox.Plugin.PluginManagement</RootNamespace>
    <AssemblyName>Wox.Plugin.PluginManagement</AssemblyName>
-    <TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
    <FileAlignment>512</FileAlignment>
    <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
    <TargetFrameworkProfile />
--- a/Plugins/Wox.Plugin.Program/Wox.Plugin.Program.csproj
+++ b/Plugins/Wox.Plugin.Program/Wox.Plugin.Program.csproj
@ -9,7 +9,7 @@
    <AppDesignerFolder>Properties</AppDesignerFolder>
    <RootNamespace>Wox.Plugin.Program</RootNamespace>
    <AssemblyName>Wox.Plugin.Program</AssemblyName>
-    <TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
    <FileAlignment>512</FileAlignment>
    <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
    <TargetFrameworkProfile />
@ -158,6 +158,9 @@
    <PackageReference Include="JetBrains.Annotations">
      <Version>10.3.0</Version>
    </PackageReference>
+    <PackageReference Include="Microsoft.Windows.SDK.Contracts">
+      <Version>10.0.18362.2005</Version>
+    </PackageReference>
    <PackageReference Include="Newtonsoft.Json">
      <Version>9.0.1</Version>
    </PackageReference>
@ -167,9 +170,6 @@
    <PackageReference Include="System.Runtime">
      <Version>4.0.0</Version>
    </PackageReference>
-    <PackageReference Include="UwpDesktop">
-      <Version>10.0.14393.3</Version>
-    </PackageReference>
  </ItemGroup>
  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
--- a/Plugins/Wox.Plugin.Shell/Wox.Plugin.Shell.csproj
+++ b/Plugins/Wox.Plugin.Shell/Wox.Plugin.Shell.csproj
@ -9,7 +9,7 @@
    <AppDesignerFolder>Properties</AppDesignerFolder>
    <RootNamespace>Wox.Plugin.Shell</RootNamespace>
    <AssemblyName>Wox.Plugin.Shell</AssemblyName>
-    <TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
    <FileAlignment>512</FileAlignment>
    <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
    <TargetFrameworkProfile />
--- a/Plugins/Wox.Plugin.Sys/Wox.Plugin.Sys.csproj
+++ b/Plugins/Wox.Plugin.Sys/Wox.Plugin.Sys.csproj
@ -9,7 +9,7 @@
    <AppDesignerFolder>Properties</AppDesignerFolder>
    <RootNamespace>Wox.Plugin.Sys</RootNamespace>
    <AssemblyName>Wox.Plugin.Sys</AssemblyName>
-    <TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
    <FileAlignment>512</FileAlignment>
    <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
    <TargetFrameworkProfile />
--- a/Plugins/Wox.Plugin.Url/Wox.Plugin.Url.csproj
+++ b/Plugins/Wox.Plugin.Url/Wox.Plugin.Url.csproj
@ -9,7 +9,7 @@
    <AppDesignerFolder>Properties</AppDesignerFolder>
    <RootNamespace>Wox.Plugin.Url</RootNamespace>
    <AssemblyName>Wox.Plugin.Url</AssemblyName>
-    <TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
    <FileAlignment>512</FileAlignment>
    <TargetFrameworkProfile />
  </PropertyGroup>
--- a/Plugins/Wox.Plugin.WebSearch/Main.cs
+++ b/Plugins/Wox.Plugin.WebSearch/Main.cs
@ -72,6 +72,7 @@ namespace Wox.Plugin.WebSearch
                            SubTitle = subtitle,
                            Score = 6,
                            IcoPath = searchSource.IconPath,
+                            ActionKeywordAssigned = searchSource.ActionKeyword == SearchSourceGlobalPluginWildCardSign ? string.Empty : searchSource.ActionKeyword,
                            Action = c =>
                            {
                                if (_settings.OpenInNewBrowser)
@ -137,6 +138,7 @@ namespace Wox.Plugin.WebSearch
                    SubTitle = subtitle,
                    Score = 5,
                    IcoPath = searchSource.IconPath,
+                    ActionKeywordAssigned = searchSource.ActionKeyword == SearchSourceGlobalPluginWildCardSign ? string.Empty : searchSource.ActionKeyword,
                    Action = c =>
                    {
                        if (_settings.OpenInNewBrowser)
--- a/Plugins/Wox.Plugin.WebSearch/Wox.Plugin.WebSearch.csproj
+++ b/Plugins/Wox.Plugin.WebSearch/Wox.Plugin.WebSearch.csproj
@ -9,7 +9,7 @@
    <AppDesignerFolder>Properties</AppDesignerFolder>
    <RootNamespace>Wox.Plugin.WebSearch</RootNamespace>
    <AssemblyName>Wox.Plugin.WebSearch</AssemblyName>
-    <TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
    <FileAlignment>512</FileAlignment>
    <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
    <TargetFrameworkProfile />
--- a/README.md
+++ b/README.md
@ -27,6 +27,7 @@ Features
 **New from this fork:**
 - Portable mode
 - Drastically improved search experience
+- Auto-complete text suggestion
 - Search all subfolders and files
 - Option to always run CMD or Powershell as administrator
 - Run CMD, Powershell and programs as a different user
@ -78,17 +79,7 @@ Contribution
 Build
 -----

-Install Visual Studio 2015/2017/2019
-
-This project requires Windows 10 SDK:
-
-  VS 2015:
-  - Tick all Windows 10 sdk options
-
-  VS 2017/2019 and later:  
-  - Last Windows 10 SDK which [supported](https://github.com/Wox-launcher/Wox/pull/1827#commitcomment-26475392) UwpDesktop is version 10.0.14393.795. It is needed to compile "Programs" Plugin (UWP.cs), you will see the "References" of Plugin.Programs as broken if you use a later SDK version.
-  - This SDK cannot be installed via VS 2019 installer.
-  - Download and install [Windows 10 SDK version 10.0.14393.795](https://go.microsoft.com/fwlink/p/?LinkId=838916).
+Install Visual Studio 2017/2019

 Documentation
 -------------
--- a/Wox.Core/Plugin/PluginManager.cs
+++ b/Wox.Core/Plugin/PluginManager.cs
@ -191,6 +191,11 @@ namespace Wox.Core.Plugin
                r.PluginDirectory = metadata.PluginDirectory;
                r.PluginID = metadata.ID;
                r.OriginQuery = query;
+
+                // ActionKeywordAssigned is used for constructing MainViewModel's query text auto-complete suggestions 
+                // Plugins may have multi-actionkeywords eg. WebSearches. In this scenario it needs to be overriden on the plugin level 
+                if (metadata.ActionKeywords.Count == 1)
+                    r.ActionKeywordAssigned = query.ActionKeyword;
            }
        }

--- a/Wox.Core/Resource/Internationalization.cs
+++ b/Wox.Core/Resource/Internationalization.cs
@ -99,6 +99,22 @@ namespace Wox.Core.Resource

        }

+        public bool PromptShouldUsePinyin(string languageCodeToSet)
+        {
+            var languageToSet = GetLanguageByLanguageCode(languageCodeToSet);
+
+            if (Settings.ShouldUsePinyin)
+                return false;
+
+            if (languageToSet != AvailableLanguages.Chinese && languageToSet != AvailableLanguages.Chinese_TW)
+                return false;
+
+            if (MessageBox.Show("Do you want to turn on search with Pinyin?", string.Empty, MessageBoxButton.YesNo) == MessageBoxResult.No)
+                return false;
+
+            return true;
+        }
+
        private void RemoveOldLanguageFiles()
        {
            var dicts = Application.Current.Resources.MergedDictionaries;
--- a/Wox.Core/Resource/Theme.cs
+++ b/Wox.Core/Resource/Theme.cs
@ -124,6 +124,12 @@ namespace Wox.Core.Resource
                queryBoxStyle.Setters.Add(new Setter(TextBox.FontStyleProperty, FontHelper.GetFontStyleFromInvariantStringOrNormal(Settings.QueryBoxFontStyle)));
                queryBoxStyle.Setters.Add(new Setter(TextBox.FontWeightProperty, FontHelper.GetFontWeightFromInvariantStringOrNormal(Settings.QueryBoxFontWeight)));
                queryBoxStyle.Setters.Add(new Setter(TextBox.FontStretchProperty, FontHelper.GetFontStretchFromInvariantStringOrNormal(Settings.QueryBoxFontStretch)));
+
+                var caretBrushPropertyValue = queryBoxStyle.Setters.OfType<Setter>().Any(x => x.Property.Name == "CaretBrush");
+                var foregroundPropertyValue = queryBoxStyle.Setters.OfType<Setter>().Where(x => x.Property.Name == "Foreground")
+                    .Select(x => x.Value).FirstOrDefault();
+                if (!caretBrushPropertyValue && foregroundPropertyValue != null) //otherwise BaseQueryBoxStyle will handle styling
+                    queryBoxStyle.Setters.Add(new Setter(TextBox.CaretBrushProperty, foregroundPropertyValue));
            }

            Style resultItemStyle = dict["ItemTitleStyle"] as Style;
--- a/Wox.Core/Wox.Core.csproj
+++ b/Wox.Core/Wox.Core.csproj
@ -9,7 +9,7 @@
    <AppDesignerFolder>Properties</AppDesignerFolder>
    <RootNamespace>Wox.Core</RootNamespace>
    <AssemblyName>Wox.Core</AssemblyName>
-    <TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
    <FileAlignment>512</FileAlignment>
    <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\</SolutionDir>
    <TargetFrameworkProfile />
--- a/Wox.Infrastructure/Alphabet.cs
+++ b/Wox.Infrastructure/Alphabet.cs
@ -162,7 +162,7 @@ namespace Wox.Infrastructure

            if (word.Length > 40)
            {
-                Log.Debug($"|Wox.Infrastructure.StringMatcher.ScoreForPinyin|skip too long string: {word}");
+                //Skip strings that are too long string for Pinyin conversion.
                return false;
            }

--- a/Wox.Infrastructure/UserSettings/Settings.cs
+++ b/Wox.Infrastructure/UserSettings/Settings.cs
@ -25,8 +25,7 @@ namespace Wox.Infrastructure.UserSettings
        /// <summary>
        /// when false Alphabet static service will always return empty results
        /// </summary>
-        public bool ShouldUsePinyin { get; set; } = true;
-
+        public bool ShouldUsePinyin { get; set; } = false;

        internal StringMatcher.SearchPrecisionScore QuerySearchPrecision { get; private set; } = StringMatcher.SearchPrecisionScore.Regular;

--- a/Wox.Infrastructure/Wox.Infrastructure.csproj
+++ b/Wox.Infrastructure/Wox.Infrastructure.csproj
@ -9,7 +9,7 @@
    <AppDesignerFolder>Properties</AppDesignerFolder>
    <RootNamespace>Wox.Infrastructure</RootNamespace>
    <AssemblyName>Wox.Infrastructure</AssemblyName>
-    <TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
    <FileAlignment>512</FileAlignment>
    <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\</SolutionDir>
    <TargetFrameworkProfile />
--- a/Wox.Plugin/IPublicAPI.cs
+++ b/Wox.Plugin/IPublicAPI.cs
@ -81,7 +81,16 @@ namespace Wox.Plugin
        /// <param name="title">Message title</param>
        /// <param name="subTitle">Message subtitle</param>
        /// <param name="iconPath">Message icon path (relative path to your plugin folder)</param>
-        void ShowMsg(string title, string subTitle = "", string iconPath = "", bool useMainWindowAsOwner = true);
+        void ShowMsg(string title, string subTitle = "", string iconPath = "");
+
+        /// <summary>
+        /// Show message box
+        /// </summary>
+        /// <param name="title">Message title</param>
+        /// <param name="subTitle">Message subtitle</param>
+        /// <param name="iconPath">Message icon path (relative path to your plugin folder)</param>
+        /// <param name="useMainWindowAsOwner">when true will use main windows as the owner</param>
+        void ShowMsg(string title, string subTitle, string iconPath, bool useMainWindowAsOwner = true);

        /// <summary>
        /// Open setting dialog
--- a/Wox.Plugin/Result.cs
+++ b/Wox.Plugin/Result.cs
@ -14,6 +14,12 @@ namespace Wox.Plugin
        public string Title { get; set; }
        public string SubTitle { get; set; }

+        /// <summary>
+        /// This holds the action keyword that triggered the result. 
+        /// If result is triggered by global keyword: *, this should be empty.
+        /// </summary>
+        public string ActionKeywordAssigned { get; set; }
+
        public string IcoPath
        {
            get { return _icoPath; }
@ -53,7 +59,7 @@ namespace Wox.Plugin
        public IList<int> SubTitleHighlightData { get; set; }

        /// <summary>
-        /// Only resulsts that originQuery match with curren query will be displayed in the panel
+        /// Only results that originQuery match with current query will be displayed in the panel
        /// </summary>
        internal Query OriginQuery { get; set; }

@ -98,13 +104,14 @@ namespace Wox.Plugin
            return Title + SubTitle;
        }

-        [Obsolete("Use IContextMenu instead")]
+
        /// <summary>
        /// Context menus associate with this result
        /// </summary>
+        [Obsolete("Use IContextMenu instead")]
        public List<Result> ContextMenu { get; set; }

-        [Obsolete("Use Object initializers instead")]
+        [Obsolete("Use Object initializer instead")]
        public Result(string Title, string IcoPath, string SubTitle = null)
        {
            this.Title = Title;
--- a/Wox.Plugin/Wox.Plugin.csproj
+++ b/Wox.Plugin/Wox.Plugin.csproj
@ -9,7 +9,7 @@
    <AppDesignerFolder>Properties</AppDesignerFolder>
    <RootNamespace>Wox.Plugin</RootNamespace>
    <AssemblyName>Wox.Plugin</AssemblyName>
-    <TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
    <FileAlignment>512</FileAlignment>
    <TargetFrameworkProfile />
    <NuGetPackageImportStamp>
--- a/Wox.Test/Wox.Test.csproj
+++ b/Wox.Test/Wox.Test.csproj
@ -9,7 +9,7 @@
    <AppDesignerFolder>Properties</AppDesignerFolder>
    <RootNamespace>Wox.Test</RootNamespace>
    <AssemblyName>Wox.Test</AssemblyName>
-    <TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
    <FileAlignment>512</FileAlignment>
    <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\</SolutionDir>
    <TargetFrameworkProfile />
--- a/Wox.sln
+++ b/Wox.sln
@ -1,7 +1,7 @@

 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 15
-VisualStudioVersion = 15.0.28307.271
+# Visual Studio Version 16
+VisualStudioVersion = 16.0.29806.167
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Wox.Test", "Wox.Test\Wox.Test.csproj", "{FF742965-9A80-41A5-B042-D6C7D3A21708}"
 	ProjectSection(ProjectDependencies) = postProject
--- a/Wox/App.config
+++ b/Wox/App.config
@ -1,9 +1,9 @@
-<?xml version="1.0"?>
+<?xml version="1.0"?>
 <configuration>
  <!--https://msdn.microsoft.com/en-us/library/dd409252(v=vs.110).aspx-->
  <configSections>
-    <sectionGroup name="applicationSettings" type="System.Configuration.ApplicationSettingsGroup, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" >
-      <section name="Wox.Properties.Settings" type="System.Configuration.ClientSettingsSection, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" requirePermission="false" />
+    <sectionGroup name="applicationSettings" type="System.Configuration.ApplicationSettingsGroup, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+      <section name="Wox.Properties.Settings" type="System.Configuration.ClientSettingsSection, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" requirePermission="false"/>
    </sectionGroup>
  </configSections>
  <runtime>
@ -16,4 +16,4 @@
      </setting>
    </Wox.Properties.Settings>
  </applicationSettings>
-</configuration>
+<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.2"/></startup></configuration>
--- a/Wox/Converters/QuerySuggestionBoxConverter.cs
+++ b/Wox/Converters/QuerySuggestionBoxConverter.cs
@ -0,0 +1,61 @@
+using System;
+using System.Globalization;
+using System.Windows.Data;
+using Wox.Infrastructure.Logger;
+using Wox.ViewModel;
+
+namespace Wox.Converters
+{
+    public class QuerySuggestionBoxConverter : IMultiValueConverter
+    {
+        public object Convert(object[] values, Type targetType, object parameter, CultureInfo culture)
+        {
+            if (values.Length != 2)
+            {
+                return string.Empty;
+            }
+
+            // first prop is the current query string
+            var queryText = (string)values[0];
+
+            if (string.IsNullOrEmpty(queryText))
+                return "Type here to search";
+
+            // second prop is the current selected item result
+            var val = values[1];
+            if (val == null)
+            {
+                return string.Empty;
+            }
+            if (!(val is ResultViewModel))
+            {
+                return System.Windows.Data.Binding.DoNothing;
+            }
+
+            try
+            {
+                var selectedItem = (ResultViewModel)val;
+
+                var selectedResult = selectedItem.Result;
+                var selectedResultActionKeyword = string.IsNullOrEmpty(selectedResult.ActionKeywordAssigned) ? "" : selectedResult.ActionKeywordAssigned + " ";
+                var selectedResultPossibleSuggestion = selectedResultActionKeyword + selectedResult.Title;
+
+                if (!selectedResultPossibleSuggestion.StartsWith(queryText, StringComparison.CurrentCultureIgnoreCase))
+                    return string.Empty;
+
+                // When user typed lower case and result title is uppercase, we still want to display suggestion
+                return queryText + selectedResultPossibleSuggestion.Substring(queryText.Length);
+            }
+            catch (Exception e)
+            {
+                Log.Exception(nameof(QuerySuggestionBoxConverter), "fail to convert text for suggestion box", e);
+                return string.Empty;
+            }
+        }
+
+        public object[] ConvertBack(object value, Type[] targetTypes, object parameter, CultureInfo culture)
+        {
+            throw new NotImplementedException();
+        }
+    }
+}
--- a/Wox/MainWindow.xaml
+++ b/Wox/MainWindow.xaml
@ -4,7 +4,9 @@
        xmlns:wox="clr-namespace:Wox"
        xmlns:vm="clr-namespace:Wox.ViewModel"
        xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-        xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" mc:Ignorable="d"
+        xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+        xmlns:converters="clr-namespace:Wox.Converters"
+        mc:Ignorable="d"
        Title="Wox"
        Topmost="True"
        SizeToContent="Height"
@ -25,6 +27,9 @@
        PreviewKeyDown="OnKeyDown"
        Visibility="{Binding MainWindowVisibility, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
        d:DataContext="{d:DesignInstance vm:MainViewModel}">
+    <Window.Resources>
+        <converters:QuerySuggestionBoxConverter x:Key="QuerySuggestionBoxConverter"/>
+    </Window.Resources>
    <Window.InputBindings>
        <KeyBinding Key="Escape" Command="{Binding EscCommand}"></KeyBinding>
        <KeyBinding Key="F1" Command="{Binding StartHelpCommand}"></KeyBinding>
@ -55,29 +60,43 @@
    </Window.InputBindings>
    <Border Style="{DynamicResource WindowBorderStyle}" MouseDown="OnMouseDown" >
        <StackPanel Orientation="Vertical">
-            <TextBox Style="{DynamicResource QueryBoxStyle}"
+            <Grid>
+                <TextBox x:Name="QueryTextSuggestionBox"
+                         Style="{DynamicResource QueryBoxStyle}"
+                         Foreground="LightGray"
+                         IsEnabled="False">
+                    <TextBox.Text>
+                        <MultiBinding Converter="{StaticResource QuerySuggestionBoxConverter}">
+                            <Binding ElementName="QueryTextBox" Path="Text"/>
+                            <Binding ElementName="ResultListBox" Path="SelectedItem"/>
+                        </MultiBinding>
+                    </TextBox.Text>
+                </TextBox>
+                <TextBox x:Name="QueryTextBox"
+                    Style="{DynamicResource QueryBoxStyle}"
                     Text="{Binding QueryText, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
                     PreviewDragOver="OnPreviewDragOver"
                     TextChanged="OnTextChanged"
                     AllowDrop="True"
                     Visibility="Visible"
-                     x:Name="QueryTextBox">
-                <TextBox.ContextMenu>
-                    <ContextMenu>
-                        <MenuItem Command="ApplicationCommands.Cut"/>
-                        <MenuItem Command="ApplicationCommands.Copy"/>
-                        <MenuItem Command="ApplicationCommands.Paste"/>
-                        <Separator />
-                        <MenuItem Header="Settings" Click="OnContextMenusForSettingsClick" />
-                    </ContextMenu>
-                </TextBox.ContextMenu>
-            </TextBox>
+                    Background="Transparent">
+                    <TextBox.ContextMenu>
+                        <ContextMenu>
+                            <MenuItem Command="ApplicationCommands.Cut"/>
+                            <MenuItem Command="ApplicationCommands.Copy"/>
+                            <MenuItem Command="ApplicationCommands.Paste"/>
+                            <Separator />
+                            <MenuItem Header="Settings" Click="OnContextMenusForSettingsClick" />
+                        </ContextMenu>
+                    </TextBox.ContextMenu>
+                </TextBox>
+            </Grid>
            <Line x:Name="ProgressBar" HorizontalAlignment="Right"
                  Style="{DynamicResource PendingLineStyle}" Visibility="{Binding ProgressBarVisibility, Mode=TwoWay}" 
                  Y1="0" Y2="0" X2="100" Height="2" Width="752" StrokeThickness="1">
            </Line>
            <ContentControl>
-                <wox:ResultListBox DataContext="{Binding Results}" PreviewMouseDown="OnPreviewMouseButtonDown" />
+                <wox:ResultListBox x:Name="ResultListBox" DataContext="{Binding Results}" PreviewMouseDown="OnPreviewMouseButtonDown" />
            </ContentControl>
            <ContentControl>
                <wox:ResultListBox DataContext="{Binding ContextMenu}" PreviewMouseDown="OnPreviewMouseButtonDown" />
--- a/Wox/Properties/Resources.Designer.cs
+++ b/Wox/Properties/Resources.Designer.cs
@ -19,7 +19,7 @@ namespace Wox.Properties {
    // class via a tool like ResGen or Visual Studio.
    // To add or remove a member, edit your .ResX file then rerun ResGen
    // with the /str option, or rebuild your VS project.
-    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0")]
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "16.0.0.0")]
    [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
    [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
    internal class Resources {
--- a/Wox/Properties/Settings.Designer.cs
+++ b/Wox/Properties/Settings.Designer.cs
@ -12,7 +12,7 @@ namespace Wox.Properties {
    
    
    [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
-    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "16.3.0.0")]
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "16.4.0.0")]
    internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase {
        
        private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings())));
--- a/Wox/PublicAPIInstance.cs
+++ b/Wox/PublicAPIInstance.cs
@ -97,7 +97,12 @@ namespace Wox
            _mainVM.MainWindowVisibility = Visibility.Visible;
        }

-        public void ShowMsg(string title, string subTitle = "", string iconPath = "", bool useMainWindowAsOwner = true)
+        public void ShowMsg(string title, string subTitle = "", string iconPath = "")
+        {
+            ShowMsg(title, subTitle, iconPath, true);
+        }
+
+        public void ShowMsg(string title, string subTitle, string iconPath, bool useMainWindowAsOwner = true)
        {
            Application.Current.Dispatcher.Invoke(() =>
            {
--- a/Wox/SettingWindow.xaml
+++ b/Wox/SettingWindow.xaml
@ -58,7 +58,7 @@
                <CheckBox Margin="10" IsChecked="{Binding Settings.AutoUpdates}">
                    <TextBlock Text="{DynamicResource autoUpdates}" />
                </CheckBox>
-                <CheckBox Margin="10" IsChecked="{Binding Settings.ShouldUsePinyin}">
+                <CheckBox Margin="10" IsChecked="{Binding ShouldUsePinyin}">
                    <TextBlock Text="{DynamicResource ShouldUsePinyin}" />
                </CheckBox>
                <StackPanel Margin="10" Orientation="Horizontal">
@ -75,8 +75,8 @@
                </StackPanel>
                <StackPanel Margin="10" Orientation="Horizontal">
                    <TextBlock Text="{DynamicResource language}" />
-                    <ComboBox Margin="10 0 0 0" Width="120" SelectionChanged="OnLanguageChanged"
-                              ItemsSource="{Binding Languages}" SelectedValue="{Binding Settings.Language}"
+                    <ComboBox Margin="10 0 0 0" Width="120"
+                              ItemsSource="{Binding Languages}" SelectedValue="{Binding Language}"
                              DisplayMemberPath="Display" SelectedValuePath="LanguageCode" />
                </StackPanel>
                <StackPanel Orientation="Horizontal" Margin="10">
--- a/Wox/SettingWindow.xaml.cs
+++ b/Wox/SettingWindow.xaml.cs
@ -40,12 +40,6 @@ namespace Wox

        #region General

-        void OnLanguageChanged(object sender, SelectionChangedEventArgs e)
-        {
-            var language = (Language)e.AddedItems[0];
-            InternationalizationManager.Instance.ChangeLanguage(language);
-        }
-
        private void OnAutoStartupChecked(object sender, RoutedEventArgs e)
        {
            SetStartup();
--- a/Wox/Themes/Base.xaml
+++ b/Wox/Themes/Base.xaml
@ -8,6 +8,7 @@
        <Setter Property="Height" Value="46" />
        <Setter Property="Background" Value="#616161" />
        <Setter Property="Foreground" Value="#E3E0E3" />
+        <Setter Property="CaretBrush" Value="#E3E0E3" />
        <Setter Property="VerticalContentAlignment" Value="Center" />
        <Setter Property="Stylus.IsFlicksEnabled" Value="False" />
    </Style>
--- a/Wox/ViewModel/MainViewModel.cs
+++ b/Wox/ViewModel/MainViewModel.cs
@ -1,5 +1,6 @@
-using System;
+using System;
 using System.Collections.Generic;
+using System.ComponentModel;
 using System.Diagnostics;
 using System.Linq;
 using System.Threading;
@ -210,7 +211,7 @@ namespace Wox.ViewModel
                Query();
            }
        }
-
+        
        /// <summary>
        /// we need move cursor to end when we manually changed query
        /// but we don't want to move cursor to end when query is updated from TextBox
@ -455,7 +456,6 @@ namespace Wox.ViewModel
            }
        }

-
        private Result ContextMenuTopMost(Result result)
        {
            Result menu;
--- a/Wox/ViewModel/SettingWindowViewModel.cs
+++ b/Wox/ViewModel/SettingWindowViewModel.cs
@ -113,6 +113,33 @@ namespace Wox.ViewModel
            }
        }

+        public string Language
+        {
+            get
+            {
+                return Settings.Language;
+            }
+            set
+            {
+                InternationalizationManager.Instance.ChangeLanguage(value);
+
+                if (InternationalizationManager.Instance.PromptShouldUsePinyin(value))
+                    ShouldUsePinyin = true;
+            }
+        }
+
+        public bool ShouldUsePinyin
+        {
+            get 
+            {
+                return Settings.ShouldUsePinyin;            
+            }
+            set 
+            {
+                Settings.ShouldUsePinyin = value;
+            }
+        }
+
        public List<string> QuerySearchPrecisionStrings
        {
            get
--- a/Wox/Wox.csproj
+++ b/Wox/Wox.csproj
@ -9,7 +9,7 @@
    <AppDesignerFolder>Properties</AppDesignerFolder>
    <RootNamespace>Wox</RootNamespace>
    <AssemblyName>Wox</AssemblyName>
-    <TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
    <FileAlignment>512</FileAlignment>
    <ProjectTypeGuids>{60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
    <WarningLevel>4</WarningLevel>
@ -93,6 +93,7 @@
    <Compile Include="Converters\HighlightTextConverter.cs" />
    <Compile Include="Helper\SingletonWindowOpener.cs" />
    <Compile Include="PublicAPIInstance.cs" />
+    <Compile Include="Converters\QuerySuggestionBoxConverter.cs" />
    <Compile Include="ReportWindow.xaml.cs" />
    <Compile Include="ResultListBox.xaml.cs">
      <DependentUpon>ResultListBox.xaml</DependentUpon>