From 58b016a9c0198780d16b302f654eb456e1b8effc Mon Sep 17 00:00:00 2001 From: cxfksword Date: Thu, 20 Mar 2014 10:01:00 +0800 Subject: [PATCH 1/4] Fix not handle .ico image type --- Plugins/Wox.Plugin.Everything/Main.cs | 2 +- Wox/ImagePathConverter.cs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Plugins/Wox.Plugin.Everything/Main.cs b/Plugins/Wox.Plugin.Everything/Main.cs index 29685b46c6..c29b3a530c 100644 --- a/Plugins/Wox.Plugin.Everything/Main.cs +++ b/Plugins/Wox.Plugin.Everything/Main.cs @@ -11,7 +11,7 @@ namespace Wox.Plugin.Everything { Wox.Plugin.PluginInitContext context; EverythingAPI api = new EverythingAPI(); - private static List imageExts = new List() { ".png", ".jpg", ".jpeg", ".gif", ".bmp", ".tiff" }; + private static List imageExts = new List() { ".png", ".jpg", ".jpeg", ".gif", ".bmp", ".tiff", ".ico" }; public List Query(Query query) { diff --git a/Wox/ImagePathConverter.cs b/Wox/ImagePathConverter.cs index 8b88f47c51..3db4550b5b 100644 --- a/Wox/ImagePathConverter.cs +++ b/Wox/ImagePathConverter.cs @@ -14,7 +14,7 @@ namespace Wox public class ImagePathConverter : IMultiValueConverter { private static Dictionary imageCache = new Dictionary(); - private static List imageExts = new List() { ".png", ".jpg", ".jpeg", ".gif", ".bmp", ".tiff" }; + private static List imageExts = new List() { ".png", ".jpg", ".jpeg", ".gif", ".bmp", ".tiff", ".ico" }; private static ImageSource GetIcon(string fileName) { From 425b20941487d84e574b77dc6b398b82084b7de6 Mon Sep 17 00:00:00 2001 From: cxfksword Date: Thu, 20 Mar 2014 10:05:12 +0800 Subject: [PATCH 2/4] Fix miss default font --- Wox.Infrastructure/CommonStorage.cs | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Wox.Infrastructure/CommonStorage.cs b/Wox.Infrastructure/CommonStorage.cs index a7b5c8d2ea..07004abacf 100644 --- a/Wox.Infrastructure/CommonStorage.cs +++ b/Wox.Infrastructure/CommonStorage.cs @@ -89,6 +89,8 @@ namespace Wox.Infrastructure Instance.UserSetting.WebSearches = Instance.UserSetting.LoadDefaultWebSearches(); Instance.UserSetting.ProgramSources = Instance.UserSetting.LoadDefaultProgramSources(); Instance.UserSetting.Hotkey = "Win + W"; + Instance.UserSetting.QueryBoxFont = FontFamily.GenericSansSerif.Name; + Instance.UserSetting.ResultItemFont = FontFamily.GenericSansSerif.Name; } public static CommonStorage Instance From 99b1c5a4560496128dc21f8d8dfbae78596a5e0a Mon Sep 17 00:00:00 2001 From: qianlifeng Date: Thu, 20 Mar 2014 12:34:12 +0800 Subject: [PATCH 3/4] [skip ci] Fix typos --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 7011e25e69..120521c257 100644 --- a/README.md +++ b/README.md @@ -21,7 +21,7 @@ Download Wox 1.0 beta has been released. [Check it out](https://github.com/qianlifeng/Wox/releases/tag/v1.0-beta)! -**Only For XP users:** you need to install [.net framework 3.5](http://www.microsoft.com/en-us/download/details.aspx?id=21) if you has not installed yet. +**Only For XP users:** you need to install [.net framework 3.5](http://www.microsoft.com/en-us/download/details.aspx?id=21) if you have not installed yet. Create and Share Plugin From 98add4b9586786bd9398f2f63304f675059d1f27 Mon Sep 17 00:00:00 2001 From: Yeechan Lu Date: Thu, 20 Mar 2014 14:25:44 +0800 Subject: [PATCH 4/4] Add Windows 8 installation note and prefer 3.5 SP1 rather than 3.5 to XP users --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 120521c257..98f8fc8188 100644 --- a/README.md +++ b/README.md @@ -21,8 +21,8 @@ Download Wox 1.0 beta has been released. [Check it out](https://github.com/qianlifeng/Wox/releases/tag/v1.0-beta)! -**Only For XP users:** you need to install [.net framework 3.5](http://www.microsoft.com/en-us/download/details.aspx?id=21) if you have not installed yet. - +* **Windows XP users:** You have to install [.NET Framework 3.5](http://www.microsoft.com/download/details.aspx?id=22) if you have not installed yet. +* **Windows 8 users:** You have to [enable the .NET Framework 3.5 in Control Panel](http://msdn.microsoft.com/library/hh506443.aspx). Create and Share Plugin =========