@@ -40,7 +40,7 @@ namespace Wox.ImageLoader
|
||||
};
|
||||
|
||||
private readonly ImageCache _cache;
|
||||
private readonly BinaryStorage<ImageCache> _storage;
|
||||
private readonly BinaryStorage<ImageCache> _storage;
|
||||
|
||||
public ImageLoader()
|
||||
{
|
||||
@@ -93,7 +93,7 @@ namespace Wox.ImageLoader
|
||||
public ImageSource Load(string path, bool addToCache = true)
|
||||
{
|
||||
if (string.IsNullOrEmpty(path)) return null;
|
||||
ImageSource img = null;
|
||||
ImageSource image = null;
|
||||
Stopwatch.Debug($"Loading image path: {path}", () =>
|
||||
{
|
||||
|
||||
@@ -105,7 +105,7 @@ namespace Wox.ImageLoader
|
||||
|
||||
if (_imageSources.ContainsKey(path))
|
||||
{
|
||||
img = _imageSources[path];
|
||||
image = _imageSources[path];
|
||||
}
|
||||
else
|
||||
{
|
||||
@@ -113,27 +113,43 @@ namespace Wox.ImageLoader
|
||||
|
||||
if (path.StartsWith("data:", StringComparison.OrdinalIgnoreCase))
|
||||
{
|
||||
img = new BitmapImage(new Uri(path));
|
||||
image = new BitmapImage(new Uri(path));
|
||||
}
|
||||
else if (SelfExts.Contains(ext) && File.Exists(path))
|
||||
{
|
||||
img = GetIcon(path);
|
||||
image = GetIcon(path);
|
||||
}
|
||||
else if (!string.IsNullOrEmpty(path) && ImageExts.Contains(ext) && File.Exists(path))
|
||||
else if (!string.IsNullOrEmpty(path) && ImageExts.Contains(ext))
|
||||
{
|
||||
img = new BitmapImage(new Uri(path));
|
||||
if (File.Exists(path))
|
||||
{
|
||||
image = new BitmapImage(new Uri(path));
|
||||
}
|
||||
else
|
||||
{
|
||||
path = Path.Combine(WoxDirectroy.Executable, "Images", Path.GetFileName(path));
|
||||
if (File.Exists(path))
|
||||
{
|
||||
image = new BitmapImage(new Uri(path));
|
||||
}
|
||||
else
|
||||
{
|
||||
path = Path.Combine(WoxDirectroy.Executable, "Images", "app.png");
|
||||
image = new BitmapImage(new Uri(path));
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
if (img != null && addToCache)
|
||||
if (image != null && addToCache)
|
||||
{
|
||||
if (!_imageSources.ContainsKey(path))
|
||||
{
|
||||
_imageSources[path] = img;
|
||||
_imageSources[path] = image;
|
||||
}
|
||||
}
|
||||
}
|
||||
});
|
||||
return img;
|
||||
return image;
|
||||
}
|
||||
|
||||
// http://blogs.msdn.com/b/oldnewthing/archive/2011/01/27/10120844.aspx
|
||||
|
||||
BIN
Wox/Images/Browser.png
Normal file
|
After Width: | Height: | Size: 873 B |
BIN
Wox/Images/EXE.png
Normal file
|
After Width: | Height: | Size: 774 B |
BIN
Wox/Images/Link.png
Normal file
|
After Width: | Height: | Size: 796 B |
BIN
Wox/Images/New Message.png
Normal file
|
After Width: | Height: | Size: 1.3 KiB |
BIN
Wox/Images/calculator.png
Normal file
|
After Width: | Height: | Size: 597 B |
BIN
Wox/Images/cancel.png
Normal file
|
After Width: | Height: | Size: 1.0 KiB |
BIN
Wox/Images/close.png
Normal file
|
After Width: | Height: | Size: 530 B |
BIN
Wox/Images/cmd.png
Normal file
|
After Width: | Height: | Size: 752 B |
BIN
Wox/Images/color.png
Normal file
|
After Width: | Height: | Size: 1.8 KiB |
BIN
Wox/Images/copy.png
Normal file
|
After Width: | Height: | Size: 501 B |
|
Before Width: | Height: | Size: 4.1 KiB After Width: | Height: | Size: 506 B |
|
Before Width: | Height: | Size: 1.1 KiB After Width: | Height: | Size: 290 B |
BIN
Wox/Images/find.png
Normal file
|
After Width: | Height: | Size: 1.4 KiB |
BIN
Wox/Images/folder.png
Normal file
|
After Width: | Height: | Size: 468 B |
|
Before Width: | Height: | Size: 4.1 KiB After Width: | Height: | Size: 1.3 KiB |
BIN
Wox/Images/image.png
Normal file
|
After Width: | Height: | Size: 634 B |
BIN
Wox/Images/lock.png
Normal file
|
After Width: | Height: | Size: 759 B |
BIN
Wox/Images/logoff.png
Normal file
|
After Width: | Height: | Size: 674 B |
BIN
Wox/Images/ok.png
Normal file
|
After Width: | Height: | Size: 1.0 KiB |
|
Before Width: | Height: | Size: 941 B After Width: | Height: | Size: 792 B |
BIN
Wox/Images/plugin.png
Normal file
|
After Width: | Height: | Size: 269 B |
BIN
Wox/Images/recyclebin.png
Normal file
|
After Width: | Height: | Size: 436 B |
BIN
Wox/Images/restart.png
Normal file
|
After Width: | Height: | Size: 1.4 KiB |
BIN
Wox/Images/search.png
Normal file
|
After Width: | Height: | Size: 1.4 KiB |
BIN
Wox/Images/settings.png
Normal file
|
After Width: | Height: | Size: 1.7 KiB |
BIN
Wox/Images/shutdown.png
Normal file
|
After Width: | Height: | Size: 1.4 KiB |
|
Before Width: | Height: | Size: 1.2 KiB After Width: | Height: | Size: 760 B |
|
Before Width: | Height: | Size: 4.0 KiB After Width: | Height: | Size: 470 B |
|
Before Width: | Height: | Size: 17 KiB After Width: | Height: | Size: 794 B |
BIN
Wox/Images/warning.png
Normal file
|
After Width: | Height: | Size: 738 B |