diff --git a/Doc/app.ico b/Doc/app.ico index 8e914ac566..38c401c8ca 100644 Binary files a/Doc/app.ico and b/Doc/app.ico differ diff --git a/Wox/App.config b/Wox/App.config index a0bdfd77d2..e95765a685 100644 --- a/Wox/App.config +++ b/Wox/App.config @@ -3,6 +3,9 @@
+ + + @@ -27,4 +30,4 @@ - + \ No newline at end of file diff --git a/Wox/Images/ctrl.png b/Wox/Images/ctrl.png deleted file mode 100644 index 0e16903098..0000000000 Binary files a/Wox/Images/ctrl.png and /dev/null differ diff --git a/Wox/Images/enter.png b/Wox/Images/enter.png deleted file mode 100644 index 0999b37cd7..0000000000 Binary files a/Wox/Images/enter.png and /dev/null differ diff --git a/Wox/Images/list.png b/Wox/Images/list.png deleted file mode 100644 index ab96e07812..0000000000 Binary files a/Wox/Images/list.png and /dev/null differ diff --git a/Wox/Properties/AssemblyInfo.cs b/Wox/Properties/AssemblyInfo.cs index 0d694b4f83..525979aae8 100644 --- a/Wox/Properties/AssemblyInfo.cs +++ b/Wox/Properties/AssemblyInfo.cs @@ -4,9 +4,7 @@ using System.Runtime.CompilerServices; using System.Runtime.InteropServices; using System.Windows; -// 有关程序集的常规信息通过以下 -// 特性集控制。更改这些特性值可修改 -// 与程序集关联的信息。 + [assembly: AssemblyTitle("Wox")] [assembly: AssemblyDescription("https://github.com/qianlifeng/Wox")] [assembly: AssemblyConfiguration("")] @@ -15,41 +13,10 @@ using System.Windows; [assembly: AssemblyCopyright("The MIT License (MIT)")] [assembly: AssemblyTrademark("")] [assembly: AssemblyCulture("")] - -// 将 ComVisible 设置为 false 使此程序集中的类型 -// 对 COM 组件不可见。如果需要从 COM 访问此程序集中的类型， -// 则将该类型上的 ComVisible 特性设置为 true。 [assembly: ComVisible(false)] - -//若要开始生成可本地化的应用程序，请在 -// 中的 .csproj 文件中 -//设置 CultureYouAreCodingWith。例如，如果您在源文件中 -//使用的是美国英语，请将 设置为 en-US。然后取消 -//对以下 NeutralResourceLanguage 特性的注释。更新 -//以下行中的“en-US”以匹配项目文件中的 UICulture 设置。 - -//[assembly: NeutralResourcesLanguage("en-US", UltimateResourceFallbackLocation.Satellite)] - - [assembly: ThemeInfo( - ResourceDictionaryLocation.None, //主题特定资源词典所处位置 - //(在页面或应用程序资源词典中 - // 未找到某个资源的情况下使用) - ResourceDictionaryLocation.SourceAssembly //常规资源词典所处位置 - //(在页面、应用程序或任何主题特定资源词典中 - // 未找到某个资源的情况下使用) + ResourceDictionaryLocation.None, + ResourceDictionaryLocation.SourceAssembly )] - - -// 程序集的版本信息由下面四个值组成: -// -// 主版本 -// 次版本 -// 生成号 -// 修订号 -// -// 可以指定所有这些值，也可以使用“生成号”和“修订号”的默认值， -// 方法是按如下所示使用“*”: -// [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("1.0.0.0")] -[assembly: AssemblyFileVersion("1.0.0.0")] \ No newline at end of file +[assembly: AssemblyVersion("1.1.0")] +[assembly: AssemblyFileVersion("1.1.0")] \ No newline at end of file diff --git a/Wox/Properties/Resources.Designer.cs b/Wox/Properties/Resources.Designer.cs index ec902f335a..6d1b535344 100644 --- a/Wox/Properties/Resources.Designer.cs +++ b/Wox/Properties/Resources.Designer.cs @@ -1,10 +1,10 @@ //------------------------------------------------------------------------------ // -// 此代码由工具生成。 -// 运行时版本:4.0.30319.18052 +// This code was generated by a tool. +// Runtime Version:4.0.30319.18444 // -// 对此文件的更改可能会导致不正确的行为，并且如果 -// 重新生成代码，这些更改将会丢失。 +// Changes to this file may cause incorrect behavior and will be lost if +// the code is regenerated. // //------------------------------------------------------------------------------ @@ -13,12 +13,12 @@ namespace Wox.Properties { /// - /// 一个强类型的资源类，用于查找本地化的字符串等。 + /// A strongly-typed resource class, for looking up localized strings, etc. /// - // 此类是由 StronglyTypedResourceBuilder - // 类通过类似于 ResGen 或 Visual Studio 的工具自动生成的。 - // 若要添加或移除成员，请编辑 .ResX 文件，然后重新运行 ResGen - // (以 /str 作为命令选项)，或重新生成 VS 项目。 + // This class was auto-generated by the StronglyTypedResourceBuilder + // 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.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] @@ -33,7 +33,7 @@ namespace Wox.Properties { } /// - /// 返回此类使用的缓存的 ResourceManager 实例。 + /// Returns the cached ResourceManager instance used by this class. /// [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)] internal static global::System.Resources.ResourceManager ResourceManager { @@ -47,8 +47,8 @@ namespace Wox.Properties { } /// - /// 使用此强类型资源类，为所有资源查找 - /// 重写当前线程的 CurrentUICulture 属性。 + /// Overrides the current thread's CurrentUICulture property for all + /// resource lookups using this strongly typed resource class. /// [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)] internal static global::System.Globalization.CultureInfo Culture { @@ -61,7 +61,7 @@ namespace Wox.Properties { } /// - /// 查找类似于 (Icon) 的 System.Drawing.Icon 类型的本地化资源。 + /// Looks up a localized resource of type System.Drawing.Icon similar to (Icon). /// internal static System.Drawing.Icon app { get { diff --git a/Wox/Properties/Resources.resx b/Wox/Properties/Resources.resx index 5dcdc10fd5..3ae43d89b0 100644 --- a/Wox/Properties/Resources.resx +++ b/Wox/Properties/Resources.resx @@ -119,6 +119,6 @@ - ..\app.ico;System.Drawing.Icon, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\Resources\app.ico;System.Drawing.Icon, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a \ No newline at end of file diff --git a/Wox/Resources/app.ico b/Wox/Resources/app.ico index f457725eea..38c401c8ca 100644 Binary files a/Wox/Resources/app.ico and b/Wox/Resources/app.ico differ diff --git a/Wox/Resources/ctrl.png b/Wox/Resources/ctrl.png deleted file mode 100644 index 0e16903098..0000000000 Binary files a/Wox/Resources/ctrl.png and /dev/null differ diff --git a/Wox/Wox.csproj b/Wox/Wox.csproj index 26790c6004..0686453fea 100644 --- a/Wox/Wox.csproj +++ b/Wox/Wox.csproj @@ -53,8 +53,7 @@ 4 - - + Resources\app.ico Wox.App @@ -278,17 +277,6 @@ Wox.Plugin - - - - - - - - - PreserveNewest - - @@ -317,9 +305,6 @@ PreserveNewest - - PreserveNewest - PreserveNewest @@ -368,10 +353,40 @@ - + + PreserveNewest + - + + PreserveNewest + + + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + + diff --git a/Wox/app.ico b/Wox/app.ico deleted file mode 100644 index 8e914ac566..0000000000 Binary files a/Wox/app.ico and /dev/null differ