Add start Wox on system startup config & code refactorying.

Wox.Infrastructure/ChineseToPinYin.cs

@@ -2,7 +2,7 @@
 using System.Text;
 
 //From:http://blog.csdn.net/chamychen/article/details/7976125
-namespace Wox.Plugin.System.Common
+namespace Wox.Infrastructure
 {
     public static class ChineseToPinYin
     {

Wox.Infrastructure/IniParser.cs

@@ -2,7 +2,7 @@
 using System.Collections;
 using System.IO;
 
-namespace Wox.Helper
+namespace Wox.Infrastructure
 {
     public class IniParser
     {

Wox.Infrastructure/UAC.cs

@@ -0,0 +1,96 @@
+using System;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.Drawing;
+using System.IO;
+using System.Linq;
+using System.Reflection;
+using System.Runtime.InteropServices;
+using System.Security.Principal;
+using System.Text;
+using System.Windows;
+using System.Windows.Forms;
+using System.Windows.Media.Imaging;
+using Size = System.Drawing.Size;
+
+namespace Wox.Infrastructure
+{
+
+    public static class UAC
+    {
+        /// <summary>
+        /// Execute methods that require Admin role, which will popup UAC window.
+        /// 
+        /// Notes:
+        ///     1. Invoker method shouldn't have any parameters
+        ///     2. Add  attribute [MethodImpl(MethodImplOptions.NoInlining)] to invoker method
+        /// 
+        /// Example:
+        /// [MethodImpl(MethodImplOptions.NoInlining)]
+        /// private void OnStartWithWindowUnChecked()
+        /// {
+        ///    UAC.ExecuteAdminMethod(() => SetStartup(false));
+        /// } 
+        /// 
+        /// </summary>
+        /// <param name="method"></param>
+        public static void ExecuteAdminMethod(Action method)
+        {
+            if (method == null) return;
+            if (Environment.OSVersion.Version.Major <= 5 || IsAdministrator())
+            {
+                method();
+                return;
+            }
+
+            StackTrace stackTrace = new StackTrace();
+            // Get calling method name
+            MethodBase callingMethod = stackTrace.GetFrame(1).GetMethod();
+            string methodName = callingMethod.Name;
+            if (callingMethod.ReflectedType == null) return;
+
+            string className = callingMethod.ReflectedType.Name;
+            string nameSpace = callingMethod.ReflectedType.Namespace;
+            string args = string.Format("UAC {0} {1} {2}", nameSpace,className,methodName);
+            Debug.WriteLine(args);
+            var psi = new ProcessStartInfo
+            {
+                FileName = Path.Combine(Directory.GetCurrentDirectory(), "Wox.UAC.exe"),
+                Arguments = args,
+                CreateNoWindow = true,
+                Verb = "runas"
+            };
+
+            try
+            {
+                var process = new Process();
+                process.StartInfo = psi;
+                process.Start();
+                process.WaitForExit();
+            }
+            catch (Exception e)
+            {
+                MessageBox.Show("Execute failed: " + e);
+#if (DEBUG)
+                {
+                    throw;
+                }
+#endif
+
+            }
+
+        }
+
+        private static bool IsAdministrator()
+        {
+            var identity = WindowsIdentity.GetCurrent();
+            if (identity != null)
+            {
+                var principal = new WindowsPrincipal(identity);
+                return principal.IsInRole(WindowsBuiltInRole.Administrator);
+            }
+
+            return false;
+        }
+    }
+}

Wox.Infrastructure/Wox.Infrastructure.csproj

@@ -35,15 +35,22 @@
     <Reference Include="Newtonsoft.Json">
       <HintPath>..\packages\Newtonsoft.Json.5.0.8\lib\net35\Newtonsoft.Json.dll</HintPath>
     </Reference>
+    <Reference Include="PresentationCore" />
     <Reference Include="System" />
     <Reference Include="System.Core" />
+    <Reference Include="System.Drawing" />
+    <Reference Include="System.Windows.Forms" />
     <Reference Include="System.Xml.Linq" />
     <Reference Include="System.Data.DataSetExtensions" />
     <Reference Include="System.Data" />
     <Reference Include="System.Xml" />
+    <Reference Include="WindowsBase" />
   </ItemGroup>
   <ItemGroup>
+    <Compile Include="ChineseToPinYin.cs" />
     <Compile Include="CommonStorage.cs" />
+    <Compile Include="IniParser.cs" />
+    <Compile Include="UAC.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="UserSettings\UserSelectedRecords.cs" />
     <Compile Include="UserSettings\UserSetting.cs" />

Wox.Plugin.System/BrowserBookmarks.cs

@@ -8,7 +8,7 @@ using System.Text;
 using System.Text.RegularExpressions;
 using System.Windows.Forms;
 using Newtonsoft.Json;
-using Wox.Plugin.System.Common;
+using Wox.Infrastructure;
 
 namespace Wox.Plugin.System
 {

Wox.Plugin.System/Programs.cs

@@ -7,7 +7,7 @@ using System.Runtime.InteropServices;
 using System.Text;
 using System.Windows.Forms;
 using Microsoft.Win32;
-using Wox.Plugin.System.Common;
+using Wox.Infrastructure;
 
 namespace Wox.Plugin.System
 {

Wox.Plugin.System/Wox.Plugin.System.csproj

@@ -50,7 +50,6 @@
     <Compile Include="WebSearchPlugin.cs" />
     <Compile Include="WindowsShellRun.cs" />
     <Compile Include="CMD.cs" />
-    <Compile Include="Common\ChineseToPinYin.cs" />
     <Compile Include="DirectoryIndicator.cs" />
     <Compile Include="ISystemPlugin.cs" />
     <Compile Include="Programs.cs" />

Wox.UAC/App.xaml

@@ -1,4 +1,4 @@
-<Application x:Class="Wox.WorkflowInstaller.App"
+<Application x:Class="Wox.UAC.App"
              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              StartupUri="MainWindow.xaml">

Wox.UAC/App.xaml.cs

@@ -5,7 +5,7 @@ using System.Data;
 using System.Linq;
 using System.Windows;
 
-namespace Wox.WorkflowInstaller
+namespace Wox.UAC
 {
     /// <summary>
     /// App.xaml 的交互逻辑

Wox.UAC/MainWindow.xaml

@@ -1,4 +1,4 @@
-<Window x:Class="Wox.WorkflowInstaller.MainWindow"
+<Window x:Class="Wox.UAC.MainWindow"
         xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
         Title="MainWindow" Height="350" Width="525">

Wox.UAC/MainWindow.xaml.cs

@@ -0,0 +1,47 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Reflection;
+using System.Text;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Input;
+using System.Windows.Media;
+using System.Windows.Media.Imaging;
+using System.Windows.Navigation;
+using System.Windows.Shapes;
+
+namespace Wox.UAC
+{
+    public partial class MainWindow : Window
+    {
+        public MainWindow()
+        {
+            InitializeComponent();
+            string[] param = Environment.GetCommandLineArgs();
+            if (param.Length > 2)
+            {
+                switch (param[1])
+                {
+                    case "UAC":
+                        Invoke(param[2], param[3], param[4]);
+                        break;
+                }
+            }
+            Application.Current.Shutdown(0);
+        }
+
+        private static void Invoke(string namespaceName, string className, string methodName)
+        {
+            Type type = Type.GetType(namespaceName + "." + className + "," + namespaceName);
+            if (type != null)
+            {
+                object instance = Activator.CreateInstance(type);
+                MethodInfo method = type.GetMethod(methodName, BindingFlags.NonPublic | BindingFlags.Instance);
+                if (method != null) method.Invoke(instance, null);
+            }
+        }
+    }
+}

Wox.UAC/Properties/AssemblyInfo.cs

@@ -7,25 +7,25 @@ using System.Windows;
 // 有关程序集的常规信息通过以下
 // 特性集控制。更改这些特性值可修改
 // 与程序集关联的信息。
-[assembly: AssemblyTitle("Wox.WorkflowInstaller")]
+[assembly: AssemblyTitle("Wox.UAC")]
 [assembly: AssemblyDescription("")]
 [assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("qianlifeng")]
+[assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("Wox.WorkflowInstaller")]
+[assembly: AssemblyProduct("Wox.UAC")]
-[assembly: AssemblyCopyright("Copyright © Microsoft 2014")]
+[assembly: AssemblyCopyright("Copyright ©  2014")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
 
 // 将 ComVisible 设置为 false 使此程序集中的类型
-// 对 COM 组件不可见。如果需要从 COM 访问此程序集中的类型，
+// 对 COM 组件不可见。  如果需要从 COM 访问此程序集中的类型，
 // 则将该类型上的 ComVisible 特性设置为 true。
 [assembly: ComVisible(false)]
 
 //若要开始生成可本地化的应用程序，请在 
 //<PropertyGroup> 中的 .csproj 文件中
-//设置 <UICulture>CultureYouAreCodingWith</UICulture>。例如，如果您在源文件中
+//设置 <UICulture>CultureYouAreCodingWith</UICulture>。  例如，如果您在源文件中
-//使用的是美国英语，请将 <UICulture> 设置为 en-US。然后取消
+//使用的是美国英语，请将 <UICulture> 设置为 en-US。  然后取消
-//对以下 NeutralResourceLanguage 特性的注释。更新
+//对以下 NeutralResourceLanguage 特性的注释。  更新
 //以下行中的“en-US”以匹配项目文件中的 UICulture 设置。
 
 //[assembly: NeutralResourcesLanguage("en-US", UltimateResourceFallbackLocation.Satellite)]

Wox.UAC/Properties/Resources.Designer.cs

@@ -1,14 +1,14 @@
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     此代码由工具生成。
-//     运行时版本: 4.0.30319.18052
+//     运行时版本: 4.0.30319.18408
 //
 //     对此文件的更改可能会导致不正确的行为，并且如果
 //     重新生成代码，这些更改将丢失。
 // </auto-generated>
 //------------------------------------------------------------------------------
 
-namespace Wox.WorkflowInstaller.Properties
+namespace Wox.UAC.Properties
 {
 
 
@@ -44,7 +44,7 @@ namespace Wox.WorkflowInstaller.Properties
             {
                 if ((resourceMan == null))
                 {
-                    global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("Wox.WorkflowInstaller.Properties.Resources", typeof(Resources).Assembly);
+                    global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("Wox.UAC.Properties.Resources", typeof(Resources).Assembly);
                     resourceMan = temp;
                 }
                 return resourceMan;

Wox.UAC/Properties/Settings.Designer.cs

@@ -1,14 +1,14 @@
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     This code was generated by a tool.
-//     Runtime Version:4.0.30319.18052
+//     Runtime Version:4.0.30319.18408
 //
 //     Changes to this file may cause incorrect behavior and will be lost if
 //     the code is regenerated.
 // </auto-generated>
 //------------------------------------------------------------------------------
 
-namespace Wox.WorkflowInstaller.Properties
+namespace Wox.UAC.Properties
 {
 
 

Wox.UAC/Wox.UAC.csproj

@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProjectGuid>{FAFCAD04-C37E-477B-88C9-0C945E4FB928}</ProjectGuid>
+    <ProjectGuid>{C9BC17A0-C2BC-4185-AC1F-32E3352C1233}</ProjectGuid>
     <OutputType>WinExe</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>Wox.WorkflowInstaller</RootNamespace>
+    <RootNamespace>Wox.UAC</RootNamespace>
-    <AssemblyName>Wox.WorkflowInstaller</AssemblyName>
+    <AssemblyName>Wox.UAC</AssemblyName>
     <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
@@ -35,15 +35,15 @@
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
-  <PropertyGroup>
-    <ApplicationManifest>app.manifest</ApplicationManifest>
-  </PropertyGroup>
   <PropertyGroup>
     <ApplicationIcon>app.ico</ApplicationIcon>
   </PropertyGroup>
+  <PropertyGroup>
+    <ApplicationManifest>app.manifest</ApplicationManifest>
+  </PropertyGroup>
   <ItemGroup>
-    <Reference Include="ICSharpCode.SharpZipLib">
+    <Reference Include="log4net">
-      <HintPath>..\packages\SharpZipLib.0.86.0\lib\20\ICSharpCode.SharpZipLib.dll</HintPath>
+      <HintPath>..\packages\log4net.2.0.3\lib\net35-full\log4net.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Data" />
@@ -68,7 +68,6 @@
       <DependentUpon>App.xaml</DependentUpon>
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="IniParser.cs" />
     <Compile Include="MainWindow.xaml.cs">
       <DependentUpon>MainWindow.xaml</DependentUpon>
       <SubType>Code</SubType>
@@ -92,9 +91,7 @@
       <Generator>ResXFileCodeGenerator</Generator>
       <LastGenOutput>Resources.Designer.cs</LastGenOutput>
     </EmbeddedResource>
-    <None Include="app.manifest">
+    <None Include="app.manifest" />
-      <SubType>Designer</SubType>
-    </None>
     <None Include="packages.config" />
     <None Include="Properties\Settings.settings">
       <Generator>SettingsSingleFileGenerator</Generator>
@@ -103,22 +100,37 @@
     <AppDesigner Include="Properties\" />
   </ItemGroup>
   <ItemGroup>
-    <Resource Include="app.ico">
+    <ProjectReference Include="..\Wox.Infrastructure\Wox.Infrastructure.csproj">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+      <Project>{4fd29318-a8ab-4d8f-aa47-60bc241b8da3}</Project>
-    </Resource>
+      <Name>Wox.Infrastructure</Name>
-  </ItemGroup>
+    </ProjectReference>
-  <ItemGroup>
+    <ProjectReference Include="..\Wox.Plugin.System\Wox.Plugin.System.csproj">
+      <Project>{69ce0206-cb41-453d-88af-df86092ef9b8}</Project>
+      <Name>Wox.Plugin.System</Name>
+    </ProjectReference>
     <ProjectReference Include="..\Wox.Plugin\Wox.Plugin.csproj">
-      <Project>{8451ECDD-2EA4-4966-BB0A-7BBC40138E80}</Project>
+      <Project>{8451ecdd-2ea4-4966-bb0a-7bbc40138e80}</Project>
       <Name>Wox.Plugin</Name>
     </ProjectReference>
+    <ProjectReference Include="..\Wox\Wox.csproj">
+      <Project>{DB90F671-D861-46BB-93A3-F1304F5BA1C5}</Project>
+      <Name>Wox</Name>
+    </ProjectReference>
+  </ItemGroup>
+  <ItemGroup>
+    <Resource Include="app.ico" />
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <PropertyGroup>
-    <PostBuildEvent>xcopy  /Y  $(TargetPath) $(SolutionDir)Wox\bin\Debug\
+    <PostBuildEvent>xcopy  /Y /E  $(TargetPath) $(SolutionDir)Wox\bin\Debug\</PostBuildEvent>
-xcopy  /Y  $(TargetDir)ICSharpCode.SharpZipLib.dll $(SolutionDir)Wox\bin\Debug\</PostBuildEvent>
   </PropertyGroup>
   <Import Project="$(SolutionDir)\.nuget\NuGet.targets" Condition="Exists('$(SolutionDir)\.nuget\NuGet.targets')" />
+  <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
+    <PropertyGroup>
+      <ErrorText>这台计算机上缺少此项目引用的 NuGet 程序包。启用“NuGet 程序包还原”可下载这些程序包。有关详细信息，请参阅 http://go.microsoft.com/fwlink/?LinkID=322105。缺少的文件是 {0}。</ErrorText>
+    </PropertyGroup>
+    <Error Condition="!Exists('$(SolutionDir)\.nuget\NuGet.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(SolutionDir)\.nuget\NuGet.targets'))" />
+  </Target>
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
   <Target Name="BeforeBuild">

Wox.UAC/app.manifest

@@ -4,18 +4,6 @@
   <trustInfo xmlns="urn:schemas-microsoft-com:asm.v2">
     <security>
       <requestedPrivileges xmlns="urn:schemas-microsoft-com:asm.v3">
-        <!-- UAC 清单选项
-            如果要更改 Windows 用户帐户控制级别，请用以下节点之一替换 
-            requestedExecutionLevel 节点。
-
-        <requestedExecutionLevel  level="asInvoker" uiAccess="false" />
-        <requestedExecutionLevel  level="requireAdministrator" uiAccess="false" />
-        <requestedExecutionLevel  level="highestAvailable" uiAccess="false" />
-
-            指定 requestedExecutionLevel 节点将会禁用文件和注册表虚拟化。
-            如果要利用文件和注册表虚拟化实现向后 
-            兼容性，则删除 requestedExecutionLevel 节点。
-        -->
         <requestedExecutionLevel level="requireAdministrator" uiAccess="false" />
       </requestedPrivileges>
     </security>
@@ -35,6 +23,9 @@
       <!-- 如果应用程序设计为使用 Windows 8，请取消注释以下 supportedOS 节点-->
       <!--<supportedOS Id="{4a2f28e3-53b9-4441-ba9c-d69d4a4a6e38}"></supportedOS>-->
 
+      <!-- 如果应用程序设计为使用 Windows 8.1，请取消对以下 supportedOS 节点的注释-->
+      <!--<supportedOS Id="{1f676c76-80e1-4239-95bb-83d0f6d0da78}"/>-->
+
     </application>
   </compatibility>
 

Wox.UAC/packages.config

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<packages>
+  <package id="log4net" version="2.0.3" targetFramework="net35" />
+</packages>

Wox.WorkflowInstaller/packages.config

@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<packages>
-  <package id="SharpZipLib" version="0.86.0" targetFramework="net35" />
-</packages>

Wox.sln

@@ -1,6 +1,8 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 2012
+# Visual Studio 2013
+VisualStudioVersion = 12.0.21005.1
+MinimumVisualStudioVersion = 10.0.40219.1
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Wox.Test", "Wox.Test\Wox.Test.csproj", "{FF742965-9A80-41A5-B042-D6C7D3A21708}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Wox.Plugin", "Wox.Plugin\Wox.Plugin.csproj", "{8451ECDD-2EA4-4966-BB0A-7BBC40138E80}"
@@ -13,8 +15,6 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Wox.Plugin.System", "Wox.Pl
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Wox.Plugin.Fanyi", "Plugins\Wox.Plugin.Fanyi\Wox.Plugin.Fanyi.csproj", "{353769D3-D11C-4D86-BD06-AC8C1D68642B}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Wox.WorkflowInstaller", "Wox.WorkflowInstaller\Wox.WorkflowInstaller.csproj", "{FAFCAD04-C37E-477B-88C9-0C945E4FB928}"
-EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Python.Runtime", "Pythonnet.Runtime\Python.Runtime.csproj", "{097B4AC0-74E9-4C58-BCF8-C69746EC8271}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Wox.Plugin.Doc", "Plugins\Wox.Plugin.Doc\Wox.Plugin.Doc.csproj", "{6B6696B1-A547-4FD4-85EF-E1FD0F54AD2C}"
@@ -23,6 +23,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Wox.Infrastructure", "Wox.I
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Wox.Plugin.Everything", "Plugins\Wox.Plugin.Everything\Wox.Plugin.Everything.csproj", "{230AE83F-E92E-4E69-8355-426B305DA9C0}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Wox.UAC", "Wox.UAC\Wox.UAC.csproj", "{C9BC17A0-C2BC-4185-AC1F-32E3352C1233}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -196,34 +198,6 @@ Global
 		{353769D3-D11C-4D86-BD06-AC8C1D68642B}.UnitTests|Win32.ActiveCfg = Release|Any CPU
 		{353769D3-D11C-4D86-BD06-AC8C1D68642B}.UnitTests|x64.ActiveCfg = Release|Any CPU
 		{353769D3-D11C-4D86-BD06-AC8C1D68642B}.UnitTests|x86.ActiveCfg = Release|Any CPU
-		{FAFCAD04-C37E-477B-88C9-0C945E4FB928}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{FAFCAD04-C37E-477B-88C9-0C945E4FB928}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{FAFCAD04-C37E-477B-88C9-0C945E4FB928}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{FAFCAD04-C37E-477B-88C9-0C945E4FB928}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{FAFCAD04-C37E-477B-88C9-0C945E4FB928}.Debug|Win32.ActiveCfg = Debug|Any CPU
-		{FAFCAD04-C37E-477B-88C9-0C945E4FB928}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{FAFCAD04-C37E-477B-88C9-0C945E4FB928}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{FAFCAD04-C37E-477B-88C9-0C945E4FB928}.EmbeddingTest|Any CPU.ActiveCfg = Release|Any CPU
-		{FAFCAD04-C37E-477B-88C9-0C945E4FB928}.EmbeddingTest|Any CPU.Build.0 = Release|Any CPU
-		{FAFCAD04-C37E-477B-88C9-0C945E4FB928}.EmbeddingTest|Mixed Platforms.ActiveCfg = Release|Any CPU
-		{FAFCAD04-C37E-477B-88C9-0C945E4FB928}.EmbeddingTest|Mixed Platforms.Build.0 = Release|Any CPU
-		{FAFCAD04-C37E-477B-88C9-0C945E4FB928}.EmbeddingTest|Win32.ActiveCfg = Release|Any CPU
-		{FAFCAD04-C37E-477B-88C9-0C945E4FB928}.EmbeddingTest|x64.ActiveCfg = Release|Any CPU
-		{FAFCAD04-C37E-477B-88C9-0C945E4FB928}.EmbeddingTest|x86.ActiveCfg = Release|Any CPU
-		{FAFCAD04-C37E-477B-88C9-0C945E4FB928}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{FAFCAD04-C37E-477B-88C9-0C945E4FB928}.Release|Any CPU.Build.0 = Release|Any CPU
-		{FAFCAD04-C37E-477B-88C9-0C945E4FB928}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
-		{FAFCAD04-C37E-477B-88C9-0C945E4FB928}.Release|Mixed Platforms.Build.0 = Release|Any CPU
-		{FAFCAD04-C37E-477B-88C9-0C945E4FB928}.Release|Win32.ActiveCfg = Release|Any CPU
-		{FAFCAD04-C37E-477B-88C9-0C945E4FB928}.Release|x64.ActiveCfg = Release|Any CPU
-		{FAFCAD04-C37E-477B-88C9-0C945E4FB928}.Release|x86.ActiveCfg = Release|Any CPU
-		{FAFCAD04-C37E-477B-88C9-0C945E4FB928}.UnitTests|Any CPU.ActiveCfg = Release|Any CPU
-		{FAFCAD04-C37E-477B-88C9-0C945E4FB928}.UnitTests|Any CPU.Build.0 = Release|Any CPU
-		{FAFCAD04-C37E-477B-88C9-0C945E4FB928}.UnitTests|Mixed Platforms.ActiveCfg = Release|Any CPU
-		{FAFCAD04-C37E-477B-88C9-0C945E4FB928}.UnitTests|Mixed Platforms.Build.0 = Release|Any CPU
-		{FAFCAD04-C37E-477B-88C9-0C945E4FB928}.UnitTests|Win32.ActiveCfg = Release|Any CPU
-		{FAFCAD04-C37E-477B-88C9-0C945E4FB928}.UnitTests|x64.ActiveCfg = Release|Any CPU
-		{FAFCAD04-C37E-477B-88C9-0C945E4FB928}.UnitTests|x86.ActiveCfg = Release|Any CPU
 		{097B4AC0-74E9-4C58-BCF8-C69746EC8271}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{097B4AC0-74E9-4C58-BCF8-C69746EC8271}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{097B4AC0-74E9-4C58-BCF8-C69746EC8271}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
@@ -344,6 +318,34 @@ Global
 		{230AE83F-E92E-4E69-8355-426B305DA9C0}.UnitTests|x64.ActiveCfg = Release|x64
 		{230AE83F-E92E-4E69-8355-426B305DA9C0}.UnitTests|x64.Build.0 = Release|x64
 		{230AE83F-E92E-4E69-8355-426B305DA9C0}.UnitTests|x86.ActiveCfg = Release|Any CPU
+		{C9BC17A0-C2BC-4185-AC1F-32E3352C1233}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{C9BC17A0-C2BC-4185-AC1F-32E3352C1233}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{C9BC17A0-C2BC-4185-AC1F-32E3352C1233}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{C9BC17A0-C2BC-4185-AC1F-32E3352C1233}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{C9BC17A0-C2BC-4185-AC1F-32E3352C1233}.Debug|Win32.ActiveCfg = Debug|Any CPU
+		{C9BC17A0-C2BC-4185-AC1F-32E3352C1233}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{C9BC17A0-C2BC-4185-AC1F-32E3352C1233}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{C9BC17A0-C2BC-4185-AC1F-32E3352C1233}.EmbeddingTest|Any CPU.ActiveCfg = Release|Any CPU
+		{C9BC17A0-C2BC-4185-AC1F-32E3352C1233}.EmbeddingTest|Any CPU.Build.0 = Release|Any CPU
+		{C9BC17A0-C2BC-4185-AC1F-32E3352C1233}.EmbeddingTest|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{C9BC17A0-C2BC-4185-AC1F-32E3352C1233}.EmbeddingTest|Mixed Platforms.Build.0 = Release|Any CPU
+		{C9BC17A0-C2BC-4185-AC1F-32E3352C1233}.EmbeddingTest|Win32.ActiveCfg = Release|Any CPU
+		{C9BC17A0-C2BC-4185-AC1F-32E3352C1233}.EmbeddingTest|x64.ActiveCfg = Release|Any CPU
+		{C9BC17A0-C2BC-4185-AC1F-32E3352C1233}.EmbeddingTest|x86.ActiveCfg = Release|Any CPU
+		{C9BC17A0-C2BC-4185-AC1F-32E3352C1233}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{C9BC17A0-C2BC-4185-AC1F-32E3352C1233}.Release|Any CPU.Build.0 = Release|Any CPU
+		{C9BC17A0-C2BC-4185-AC1F-32E3352C1233}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{C9BC17A0-C2BC-4185-AC1F-32E3352C1233}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+		{C9BC17A0-C2BC-4185-AC1F-32E3352C1233}.Release|Win32.ActiveCfg = Release|Any CPU
+		{C9BC17A0-C2BC-4185-AC1F-32E3352C1233}.Release|x64.ActiveCfg = Release|Any CPU
+		{C9BC17A0-C2BC-4185-AC1F-32E3352C1233}.Release|x86.ActiveCfg = Release|Any CPU
+		{C9BC17A0-C2BC-4185-AC1F-32E3352C1233}.UnitTests|Any CPU.ActiveCfg = Release|Any CPU
+		{C9BC17A0-C2BC-4185-AC1F-32E3352C1233}.UnitTests|Any CPU.Build.0 = Release|Any CPU
+		{C9BC17A0-C2BC-4185-AC1F-32E3352C1233}.UnitTests|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{C9BC17A0-C2BC-4185-AC1F-32E3352C1233}.UnitTests|Mixed Platforms.Build.0 = Release|Any CPU
+		{C9BC17A0-C2BC-4185-AC1F-32E3352C1233}.UnitTests|Win32.ActiveCfg = Release|Any CPU
+		{C9BC17A0-C2BC-4185-AC1F-32E3352C1233}.UnitTests|x64.ActiveCfg = Release|Any CPU
+		{C9BC17A0-C2BC-4185-AC1F-32E3352C1233}.UnitTests|x86.ActiveCfg = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

Wox/Commands/PluginCommand.cs

@@ -53,7 +53,6 @@ namespace Wox.Commands
         {
             if (currentPythonModulePath != thirdPlugin.Metadata.PluginDirecotry)
             {
-                //this must initial in main thread
                 currentPythonModulePath = thirdPlugin.Metadata.PluginDirecotry;
 
                 if (GIL != IntPtr.Zero)
@@ -63,8 +62,8 @@ namespace Wox.Commands
                 }
                 PythonEngine.Initialize();
                 IntPtr pyStrPtr = Runtime.PyString_FromString(thirdPlugin.Metadata.PluginDirecotry);
-                IntPtr SysDotPath = Runtime.PySys_GetObject("path");
+                IntPtr sysDotPath = Runtime.PySys_GetObject("path");
-                Runtime.PyList_Append(SysDotPath, pyStrPtr);
+                Runtime.PyList_Append(sysDotPath, pyStrPtr);
                 GIL = PythonEngine.BeginAllowThreads();
             }
         }

Wox/Helper/IniParser.cs

@@ -1,217 +0,0 @@
-using System;
-using System.Collections;
-using System.IO;
-
-namespace Wox.Helper
-{
-    public class IniParser
-    {
-        private Hashtable keyPairs = new Hashtable();
-        private String iniFilePath;
-
-        private struct SectionPair
-        {
-            public String Section;
-            public String Key;
-        }
-
-        /// <summary>
-        /// Opens the INI file at the given path and enumerates the values in the IniParser.
-        /// </summary>
-        /// <param name="iniPath">Full path to INI file.</param>
-        public IniParser(String iniPath)
-        {
-            TextReader iniFile = null;
-            String strLine = null;
-            String currentRoot = null;
-            String[] keyPair = null;
-
-            iniFilePath = iniPath;
-
-            if (File.Exists(iniPath))
-            {
-                try
-                {
-                    iniFile = new StreamReader(iniPath);
-
-                    strLine = iniFile.ReadLine();
-
-                    while (strLine != null)
-                    {
-                        strLine = strLine.Trim();
-
-                        if (strLine != "")
-                        {
-                            if (strLine.StartsWith("[") && strLine.EndsWith("]"))
-                            {
-                                currentRoot = strLine.Substring(1, strLine.Length - 2).ToUpper();
-                            }
-                            else
-                            {
-                                keyPair = strLine.Split(new char[] { '=' }, 2);
-
-                                SectionPair sectionPair;
-                                String value = null;
-
-                                if (currentRoot == null)
-                                    currentRoot = "ROOT";
-
-                                sectionPair.Section = currentRoot;
-                                sectionPair.Key = keyPair[0].ToUpper().Trim();
-
-                                if (keyPair.Length > 1)
-                                    value = keyPair[1];
-
-                                keyPairs.Add(sectionPair, value.Trim());
-                            }
-                        }
-
-                        strLine = iniFile.ReadLine();
-                    }
-
-                }
-                catch (Exception ex)
-                {
-                    throw ex;
-                }
-                finally
-                {
-                    if (iniFile != null)
-                        iniFile.Close();
-                }
-            }
-            else
-                throw new FileNotFoundException("Unable to locate " + iniPath);
-        }
-
-        /// <summary>
-        /// Returns the value for the given section, key pair.
-        /// </summary>
-        /// <param name="sectionName">Section name.</param>
-        /// <param name="settingName">Key name.</param>
-        public String GetSetting(String sectionName, String settingName)
-        {
-            SectionPair sectionPair;
-            sectionPair.Section = sectionName.ToUpper().Trim();
-            sectionPair.Key = settingName.ToUpper().Trim();
-
-            return (String)keyPairs[sectionPair];
-        }
-
-        /// <summary>
-        /// Enumerates all lines for given section.
-        /// </summary>
-        /// <param name="sectionName">Section to enum.</param>
-        public String[] EnumSection(String sectionName)
-        {
-            ArrayList tmpArray = new ArrayList();
-
-            foreach (SectionPair pair in keyPairs.Keys)
-            {
-                if (pair.Section == sectionName.ToUpper())
-                    tmpArray.Add(pair.Key);
-            }
-
-            return (String[])tmpArray.ToArray(typeof(String));
-        }
-
-        /// <summary>
-        /// Adds or replaces a setting to the table to be saved.
-        /// </summary>
-        /// <param name="sectionName">Section to add under.</param>
-        /// <param name="settingName">Key name to add.</param>
-        /// <param name="settingValue">Value of key.</param>
-        public void AddSetting(String sectionName, String settingName, String settingValue)
-        {
-            SectionPair sectionPair;
-            sectionPair.Section = sectionName.ToUpper();
-            sectionPair.Key = settingName.ToUpper();
-
-            if (keyPairs.ContainsKey(sectionPair))
-                keyPairs.Remove(sectionPair);
-
-            keyPairs.Add(sectionPair, settingValue);
-        }
-
-        /// <summary>
-        /// Adds or replaces a setting to the table to be saved with a null value.
-        /// </summary>
-        /// <param name="sectionName">Section to add under.</param>
-        /// <param name="settingName">Key name to add.</param>
-        public void AddSetting(String sectionName, String settingName)
-        {
-            AddSetting(sectionName, settingName, null);
-        }
-
-        /// <summary>
-        /// Remove a setting.
-        /// </summary>
-        /// <param name="sectionName">Section to add under.</param>
-        /// <param name="settingName">Key name to add.</param>
-        public void DeleteSetting(String sectionName, String settingName)
-        {
-            SectionPair sectionPair;
-            sectionPair.Section = sectionName.ToUpper();
-            sectionPair.Key = settingName.ToUpper();
-
-            if (keyPairs.ContainsKey(sectionPair))
-                keyPairs.Remove(sectionPair);
-        }
-
-        /// <summary>
-        /// Save settings to new file.
-        /// </summary>
-        /// <param name="newFilePath">New file path.</param>
-        public void SaveSettings(String newFilePath)
-        {
-            ArrayList sections = new ArrayList();
-            String tmpValue = "";
-            String strToSave = "";
-
-            foreach (SectionPair sectionPair in keyPairs.Keys)
-            {
-                if (!sections.Contains(sectionPair.Section))
-                    sections.Add(sectionPair.Section);
-            }
-
-            foreach (String section in sections)
-            {
-                strToSave += ("[" + section + "]\r\n");
-
-                foreach (SectionPair sectionPair in keyPairs.Keys)
-                {
-                    if (sectionPair.Section == section)
-                    {
-                        tmpValue = (String)keyPairs[sectionPair];
-
-                        if (tmpValue != null)
-                            tmpValue = "=" + tmpValue;
-
-                        strToSave += (sectionPair.Key + tmpValue + "\r\n");
-                    }
-                }
-
-                strToSave += "\r\n";
-            }
-
-            try
-            {
-                TextWriter tw = new StreamWriter(newFilePath);
-                tw.Write(strToSave);
-                tw.Close();
-            }
-            catch (Exception ex)
-            {
-                throw ex;
-            }
-        }
-
-        /// <summary>
-        /// Save settings back to ini file.
-        /// </summary>
-        public void SaveSettings()
-        {
-            SaveSettings(iniFilePath);
-        }
-    }
-}

Wox/Helper/PluginInstaller.cs

@@ -1,47 +1,72 @@
 using System;
-using System.Collections.Generic;
 using System.Diagnostics;
 using System.IO;
-using System.Linq;
 using System.Runtime.InteropServices;
-using System.Text;
 using System.Windows;
-using System.Windows.Controls;
-using System.Windows.Data;
-using System.Windows.Documents;
-using System.Windows.Input;
-using System.Windows.Media;
-using System.Windows.Media.Imaging;
-using System.Windows.Navigation;
-using System.Windows.Shapes;
 using ICSharpCode.SharpZipLib.Zip;
 using Microsoft.Win32;
-using Wox.Helper;
+using Wox.Infrastructure;
 using Wox.Plugin;
-using Path = System.IO.Path;
 
-namespace Wox.WorkflowInstaller
+namespace Wox.Helper
 {
+    public class PluginInstaller
+    {
+        [DllImport("shell32.dll")]
+        private static extern void SHChangeNotify(uint wEventId, uint uFlags, IntPtr dwItem1, IntPtr dwItem2);
 
-    public partial class MainWindow
+        /// <summary>
+        /// associate filetype with specified program
+        /// </summary>
+        /// <param name="filePath"></param>
+        /// <param name="fileType"></param>
+        /// <param name="iconPath"></param>
+        /// <param name="overrides"></param>
+        private static void SaveReg(string filePath, string fileType, string iconPath, bool overrides)
         {
-        public MainWindow()
+            RegistryKey classRootKey = Registry.ClassesRoot.OpenSubKey("", true);
+            RegistryKey woxKey = classRootKey.OpenSubKey(fileType, true);
+            if (woxKey != null)
             {
-            InitializeComponent();
+                if (!overrides)
-            Loaded += MainWindow_Loaded;
-            string[] param = Environment.GetCommandLineArgs();
-            if (param.Length == 2)
                 {
-                string workflowPath = param[1];
+                    return;
-                //string workflowPath = @"c:\Users\Scott\Desktop\Desktop.wox";
-                if (workflowPath.EndsWith(".wox"))
-                {
-                    InstallWorkflow(workflowPath);
                 }
+                classRootKey.DeleteSubKeyTree(fileType);
             }
+            classRootKey.CreateSubKey(fileType);
+            woxKey = classRootKey.OpenSubKey(fileType, true);
+            woxKey.SetValue("", "wox.wox");
+            woxKey.SetValue("Content Type", "application/wox");
+
+            RegistryKey iconKey = woxKey.CreateSubKey("DefaultIcon");
+            iconKey.SetValue("", iconPath);
+
+            woxKey.CreateSubKey("shell");
+            RegistryKey shellKey = woxKey.OpenSubKey("shell", true);
+            shellKey.SetValue("", "Open");
+            RegistryKey openKey = shellKey.CreateSubKey("open");
+            openKey.SetValue("", "Open with wox");
+
+            openKey = shellKey.OpenSubKey("open", true);
+            openKey.CreateSubKey("command");
+            RegistryKey commandKey = openKey.OpenSubKey("command", true);
+            string pathString = "\"" + filePath + "\" \"%1\"";
+            commandKey.SetValue("", pathString);
+
+            //refresh cache
+            SHChangeNotify(0x8000000, 0, IntPtr.Zero, IntPtr.Zero);
         }
 
-        private void InstallWorkflow(string path)
+        public void RegisterInstaller()
+        {
+            string filePath = Directory.GetCurrentDirectory() + "\\Wox.Installer.exe";
+            string iconPath = Directory.GetCurrentDirectory() + "\\app.ico";
+
+            SaveReg(filePath, ".wox", iconPath, false);
+        }
+
+        public void Install(string path)
         {
             if (File.Exists(path))
             {
@@ -56,7 +81,6 @@ namespace Wox.WorkflowInstaller
                 if (!File.Exists(iniPath))
                 {
                     MessageBox.Show("Install failed: config is missing");
-                    Close();
                     return;
                 }
 
@@ -64,7 +88,6 @@ namespace Wox.WorkflowInstaller
                 if (plugin == null || plugin.Name == null)
                 {
                     MessageBox.Show("Install failed: config of this workflow is invalid");
-                    Close();
                     return;
                 }
 
@@ -72,7 +95,6 @@ namespace Wox.WorkflowInstaller
                 if (!Directory.Exists(pluginFolerPath))
                 {
                     MessageBox.Show("Install failed: cound't find workflow directory");
-                    Close();
                     return;
                 }
 
@@ -122,16 +144,11 @@ namespace Wox.WorkflowInstaller
                     {
                         MessageBox.Show("You have installed workflow " + plugin.Name + " successfully. Please restart your wox to use new workflow.");
                     }
-                    Close();
-                }
-                else
-                {
-                    Close();
                 }
             }
         }
 
-        private static PluginMetadata GetMetadataFromIni(string directory)
+        private PluginMetadata GetMetadataFromIni(string directory)
         {
             string iniPath = directory + "\\plugin.ini";
 
@@ -182,7 +199,7 @@ namespace Wox.WorkflowInstaller
         /// <param name="zipedFile">The ziped file.</param>
         /// <param name="strDirectory">The STR directory.</param>
         /// <param name="overWrite">overwirte</param>
-        public void UnZip(string zipedFile, string strDirectory, bool overWrite)
+        private void UnZip(string zipedFile, string strDirectory, bool overWrite)
         {
             if (strDirectory == "")
                 strDirectory = Directory.GetCurrentDirectory();
@@ -231,52 +248,5 @@ namespace Wox.WorkflowInstaller
                 s.Close();
             }
         }
-
-        void MainWindow_Loaded(object sender, RoutedEventArgs e)
-        {
-            string filePath = Directory.GetCurrentDirectory() + "\\Wox.WorkflowInstaller.exe";
-            string iconPath = Directory.GetCurrentDirectory() + "\\app.ico";
-
-            SaveReg(filePath, ".wox", iconPath, false);
-        }
-
-        [DllImport("shell32.dll")]
-        private static extern void SHChangeNotify(uint wEventId, uint uFlags, IntPtr dwItem1, IntPtr dwItem2);
-
-        private static void SaveReg(string filePath, string fileType, string iconPath, bool overrides)
-        {
-            RegistryKey classRootKey = Registry.ClassesRoot.OpenSubKey("", true);
-            RegistryKey woxKey = classRootKey.OpenSubKey(fileType, true);
-            if (woxKey != null)
-            {
-                if (!overrides)
-                {
-                    return;
-                }
-                classRootKey.DeleteSubKeyTree(fileType);
-            }
-            classRootKey.CreateSubKey(fileType);
-            woxKey = classRootKey.OpenSubKey(fileType, true);
-            woxKey.SetValue("", "wox.wox");
-            woxKey.SetValue("Content Type", "application/wox");
-
-            RegistryKey iconKey = woxKey.CreateSubKey("DefaultIcon");
-            iconKey.SetValue("", iconPath);
-
-            woxKey.CreateSubKey("shell");
-            RegistryKey shellKey = woxKey.OpenSubKey("shell", true);
-            shellKey.SetValue("", "Open");
-            RegistryKey openKey = shellKey.CreateSubKey("open");
-            openKey.SetValue("", "Open with wox");
-
-            openKey = shellKey.OpenSubKey("open", true);
-            openKey.CreateSubKey("command");
-            RegistryKey commandKey = openKey.OpenSubKey("command", true);
-            string pathString = "\"" + filePath + "\" \"%1\"";
-            commandKey.SetValue("", pathString);
-
-            //refresh cache
-            SHChangeNotify(0x8000000, 0, IntPtr.Zero, IntPtr.Zero);
-        }
     }
 }

Wox/MainWindow.xaml.cs

@@ -182,9 +182,9 @@ namespace Wox
         {
             if (args != null && args.Length > 0)
             {
-                switch (args[0])
+                switch (args[0].ToLower())
                 {
-                    case "reloadWorkflows":
+                    case "reloadworkflows":
                         Plugins.Init();
                         break;
 

Wox/PluginLoader/BasePluginLoader.cs

@@ -5,6 +5,7 @@ using System.Linq;
 using System.Reflection;
 using System.Windows.Forms;
 using Wox.Helper;
+using Wox.Infrastructure;
 using Wox.Plugin;
 using Wox.Plugin.System;
 

Wox/SettingWindow.xaml

@@ -10,14 +10,18 @@
     <TabControl Height="auto" >
         <TabItem Header="Basic">
             <StackPanel Orientation="Vertical" Margin="10">
-                <StackPanel Orientation="Horizontal">
+                <StackPanel Orientation="Horizontal" Margin="10">
+                    <CheckBox x:Name="cbStartWithWindows" Unchecked="CbStartWithWindows_OnUnchecked" Checked="CbStartWithWindows_OnChecked" />
+                    <TextBlock Text="Start Wox on system startup" />
+                </StackPanel>
+                <StackPanel Orientation="Horizontal" Margin="10">
+                    <CheckBox x:Name="cbReplaceWinR" />
+                    <TextBlock Text="Replace Win+R" />
+                </StackPanel>
+                <StackPanel Orientation="Horizontal" Margin="10">
                     <TextBlock Text="Theme:" />
                     <ComboBox x:Name="themeComboBox" SelectionChanged="ThemeComboBox_OnSelectionChanged" HorizontalAlignment="Left" VerticalAlignment="Top" Width="120"/>
                 </StackPanel>
-                <StackPanel Orientation="Horizontal">
-                    <CheckBox x:Name="cbReplaceWinR" />
-                    <TextBlock Text="Replace Win+R:" />
-                </StackPanel>
             </StackPanel>
         </TabItem>
         <TabItem Header="Web Search">

Wox/SettingWindow.xaml.cs

@@ -1,11 +1,18 @@
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
+using System.Runtime.CompilerServices;
+using System.Security.Permissions;
 using System.Windows;
 using System.Windows.Controls;
+using System.Windows.Forms;
+using System.Windows.Media;
+using System.Windows.Media.Imaging;
+using Microsoft.Win32;
 using Wox.Helper;
 using Wox.Infrastructure;
 using Wox.Infrastructure.UserSettings;
+using MessageBox = System.Windows.MessageBox;
 
 namespace Wox
 {
@@ -13,6 +20,11 @@ namespace Wox
     {
         private MainWindow mainWindow;
 
+        public SettingWidow()
+        {
+            InitializeComponent();
+        }
+
         public SettingWidow(MainWindow mainWindow)
         {
             this.mainWindow = mainWindow;
@@ -98,5 +110,47 @@ namespace Wox
                 MessageBox.Show("Please select a web search");
             }
         }
+
+
+        private void CbStartWithWindows_OnChecked(object sender, RoutedEventArgs e)
+        {
+            OnStartWithWindowsChecked();
+        }
+
+        private void CbStartWithWindows_OnUnchecked(object sender, RoutedEventArgs e)
+        {
+            OnStartWithWindowUnChecked();
+        }
+
+        [MethodImpl(MethodImplOptions.NoInlining)]
+        private void OnStartWithWindowUnChecked()
+        {
+            UAC.ExecuteAdminMethod(() => SetStartup(false));
+        }
+
+        [MethodImpl(MethodImplOptions.NoInlining)]
+        private void OnStartWithWindowsChecked()
+        {
+            UAC.ExecuteAdminMethod(() => SetStartup(true));
+        }
+
+        private void SetStartup(bool startup)
+        {
+            RegistryKey rk = Registry.CurrentUser.OpenSubKey("SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Run", true);
+
+            if (rk != null)
+            {
+                if (startup)
+                {
+                    rk.SetValue("Wox",Path.Combine(Directory.GetCurrentDirectory(),"Wox.exe startHide"));
+                }
+                else
+                {
+                    rk.DeleteValue("Wox", false);
+                }
+            }
+        }
+
+
     }
 }

Wox/WebSearchSetting.xaml

@@ -4,13 +4,14 @@
                 Icon="Images\app.png"
         ResizeMode="NoResize"
         WindowStartupLocation="CenterScreen"
-        Title="WebSearchSetting" Height="300" Width="674.766">
+        Title="WebSearchSetting" Height="350" Width="674.766">
     <Grid>
         <Grid.RowDefinitions>
             <RowDefinition></RowDefinition>
             <RowDefinition></RowDefinition>
             <RowDefinition></RowDefinition>
             <RowDefinition></RowDefinition>
+            <RowDefinition Height="60"></RowDefinition>
             <RowDefinition></RowDefinition>
         </Grid.RowDefinitions>
         <Grid.ColumnDefinitions>
@@ -29,7 +30,13 @@
         <TextBlock Margin="10" FontSize="14" Grid.Row="3" Grid.Column="0" VerticalAlignment="Center" HorizontalAlignment="Right">Enable:</TextBlock>
         <CheckBox x:Name="cbEnable" IsChecked="True" Margin="10" Grid.Row="3" Grid.Column="1" VerticalAlignment="Center"></CheckBox>
 
-        <StackPanel Orientation="Horizontal" HorizontalAlignment="Right" Grid.Row="4" Grid.Column="1">
+        <TextBlock Margin="10" FontSize="14" Grid.Row="4" Grid.Column="0" VerticalAlignment="Center" HorizontalAlignment="Right">Icon:</TextBlock>
+        <StackPanel Orientation="Horizontal" Grid.Row="4" Grid.Column="1" Margin="10">
+            <Image x:Name="imgIcon" Width="24" Height="24" Margin="0 0 10 0" />
+            <Button x:Name="btnSelectIcon" Height="24" Click="BtnSelectIcon_OnClick">Select Icon</Button>
+            <TextBlock x:Name="tbIconPath" Visibility="Hidden"></TextBlock>
+        </StackPanel>
+        <StackPanel Orientation="Horizontal" HorizontalAlignment="Right" Grid.Row="5" Grid.Column="1">
             <Button x:Name="btnCancel" Click="BtnCancel_OnClick" Margin="10 0 10 0" Width="80" Height="25">Cancel</Button>
             <Button x:Name="btnAdd" Margin="10 0 10 0"  Width="80" Height="25" Click="btnAdd_OnClick"><TextBlock x:Name="lblAdd">Add</TextBlock></Button>
         </StackPanel>

Wox/WebSearchSetting.xaml.cs

@@ -42,12 +42,25 @@ namespace Wox
 
             update = true;
             lblAdd.Text = "Update";
+            tbIconPath.Text = webSearch.IconPath;
+            ShowIcon(webSearch.IconPath);
             cbEnable.IsChecked = webSearch.Enabled;
             tbTitle.Text = webSearch.Title;
             tbUrl.Text = webSearch.Url;
             tbActionword.Text = webSearch.ActionWord;
         }
 
+        private void ShowIcon(string path)
+        {
+            try
+            {
+                imgIcon.Source = new BitmapImage(new Uri(path));
+            }
+            catch (Exception)
+            {
+            }
+        }
+
         private void BtnCancel_OnClick(object sender, RoutedEventArgs e)
         {
             Close();
@@ -88,7 +101,7 @@ namespace Wox
                 {
                     ActionWord = action,
                     Enabled = cbEnable.IsChecked ?? false,
-                    IconPath = "",
+                    IconPath = tbIconPath.Text,
                     Url = url,
                     Title = title
                 });
@@ -97,7 +110,7 @@ namespace Wox
             else
             {
                 updateWebSearch.ActionWord = action;
-                updateWebSearch.IconPath = "";
+                updateWebSearch.IconPath = tbIconPath.Text;
                 updateWebSearch.Enabled = cbEnable.IsChecked ?? false;
                 updateWebSearch.Url = url;
                 updateWebSearch.Title= title;
@@ -107,5 +120,23 @@ namespace Wox
             settingWidow.ReloadWebSearchView();
             Close();
         }
+
+        private void BtnSelectIcon_OnClick(object sender, RoutedEventArgs e)
+        {
+            var dlg = new Microsoft.Win32.OpenFileDialog
+            {
+                DefaultExt = ".png",
+                Filter =
+                    "JPEG Files (*.jpeg)|*.jpeg|PNG Files (*.png)|*.png|JPG Files (*.jpg)|*.jpg|GIF Files (*.gif)|*.gif"
+            };
+
+            bool? result = dlg.ShowDialog();
+            if (result == true)
+            {
+                string filename = dlg.FileName;
+                tbIconPath.Text = filename;
+                ShowIcon(filename);
+            }
+        }
     }
 }

Wox/Wox.csproj

@@ -78,6 +78,10 @@
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="Accessibility" />
+    <Reference Include="ICSharpCode.SharpZipLib, Version=0.86.0.518, Culture=neutral, PublicKeyToken=1b03e6acf1164f73, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\packages\SharpZipLib.0.86.0\lib\20\ICSharpCode.SharpZipLib.dll</HintPath>
+    </Reference>
     <Reference Include="log4net">
       <HintPath>..\packages\log4net.2.0.3\lib\net35-full\log4net.dll</HintPath>
     </Reference>
@@ -119,6 +123,7 @@
     <Compile Include="Helper\DwmDropShadow.cs" />
     <Compile Include="Helper\KeyboardHook.cs" />
     <Compile Include="Helper\Log.cs" />
+    <Compile Include="Helper\PluginInstaller.cs" />
     <Compile Include="Helper\WoxException.cs" />
     <Compile Include="Helper\KeyboardListener.cs" />
     <Compile Include="Msg.xaml.cs">
@@ -126,7 +131,6 @@
     </Compile>
     <Compile Include="PluginLoader\BasePluginLoader.cs" />
     <Compile Include="PluginLoader\CSharpPluginLoader.cs" />
-    <Compile Include="Helper\IniParser.cs" />
     <Compile Include="PluginLoader\Plugins.cs" />
     <Compile Include="PluginLoader\PythonPluginLoader.cs" />
     <Compile Include="PluginLoader\PythonPluginWrapper.cs" />