mirror of
https://github.com/Flow-Launcher/Flow.Launcher.git
synced 2026-03-11 08:54:32 +00:00
Merge branch 'master' of https://github.com/qianlifeng/Wox.git
This commit is contained in:
commit
b3f3cd2ffd
4 changed files with 6 additions and 4 deletions
|
|
@ -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)
|
||||
{
|
||||
|
|
|
|||
|
|
@ -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 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
|
||||
=========
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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)
|
||||
{
|
||||
|
|
|
|||
Loading…
Reference in a new issue