Merge pull request #60 from cxfksword/master

Fix Everything not handle .ico image type
This commit is contained in:
Yeechan Lu 2014-03-20 10:16:22 +08:00
commit 305fc52e73
3 changed files with 4 additions and 2 deletions

View file

@ -11,7 +11,7 @@ namespace Wox.Plugin.Everything
{
Wox.Plugin.PluginInitContext context;
EverythingAPI api = new EverythingAPI();
private static List<string> imageExts = new List<string>() { ".png", ".jpg", ".jpeg", ".gif", ".bmp", ".tiff" };
private static List<string> imageExts = new List<string>() { ".png", ".jpg", ".jpeg", ".gif", ".bmp", ".tiff", ".ico" };
public List<Result> Query(Query query)
{

View file

@ -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

View file

@ -14,7 +14,7 @@ namespace Wox
public class ImagePathConverter : IMultiValueConverter
{
private static Dictionary<string, object> imageCache = new Dictionary<string, object>();
private static List<string> imageExts = new List<string>() { ".png", ".jpg", ".jpeg", ".gif", ".bmp", ".tiff" };
private static List<string> imageExts = new List<string>() { ".png", ".jpg", ".jpeg", ".gif", ".bmp", ".tiff", ".ico" };
private static ImageSource GetIcon(string fileName)
{