prehistoric-systems/Flow.Launcher
1
0
Fork 0
mirror of https://github.com/Flow-Launcher/Flow.Launcher.git synced 2026-03-11 08:54:32 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge branch 'master' of https://github.com/qianlifeng/Wox.git

Browse source
This commit is contained in:
qianlifeng 2014-03-20 19:12:36 +08:00
commit b3f3cd2ffd
4 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Plugins/Wox.Plugin.Everything/Main.cs
View file

@ -11,7 +11,7 @@ namespace Wox.Plugin.Everything
{ {
Wox.Plugin.PluginInitContext context; Wox.Plugin.PluginInitContext context;
EverythingAPI api = new EverythingAPI(); 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) public List<Result> Query(Query query)
{ {

4
README.md
View file

@ -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)! 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. * **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 Create and Share Plugin
========= =========

2
Wox.Infrastructure/CommonStorage.cs
View file

@ -89,6 +89,8 @@ namespace Wox.Infrastructure
Instance.UserSetting.WebSearches = Instance.UserSetting.LoadDefaultWebSearches(); Instance.UserSetting.WebSearches = Instance.UserSetting.LoadDefaultWebSearches();
Instance.UserSetting.ProgramSources = Instance.UserSetting.LoadDefaultProgramSources(); Instance.UserSetting.ProgramSources = Instance.UserSetting.LoadDefaultProgramSources();
Instance.UserSetting.Hotkey = "Win + W"; Instance.UserSetting.Hotkey = "Win + W";
Instance.UserSetting.QueryBoxFont = FontFamily.GenericSansSerif.Name;
Instance.UserSetting.ResultItemFont = FontFamily.GenericSansSerif.Name;
} }
public static CommonStorage Instance public static CommonStorage Instance

2
Wox/ImagePathConverter.cs
View file

@ -14,7 +14,7 @@ namespace Wox
public class ImagePathConverter : IMultiValueConverter public class ImagePathConverter : IMultiValueConverter
{ {
private static Dictionary<string, object> imageCache = new Dictionary<string, object>(); 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) private static ImageSource GetIcon(string fileName)
{ {