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 PR #154: add dedicated missing image icon

Browse source
This commit is contained in:
Ioannis G 2020-10-11 20:02:26 +03:00 committed by GitHub
commit 82ebbcb811
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
8 changed files with 16 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

BIN
Doc/app_missing_img.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 44 KiB

6
Flow.Launcher.Infrastructure/Constant.cs
View file

@ -23,8 +23,10 @@ namespace Flow.Launcher.Infrastructure
public static readonly string Version = FileVersionInfo.GetVersionInfo(Assembly.Location.NonNull()).ProductVersion; public static readonly string Version = FileVersionInfo.GetVersionInfo(Assembly.Location.NonNull()).ProductVersion;
public static readonly int ThumbnailSize = 64; public static readonly int ThumbnailSize = 64;
public static readonly string DefaultIcon = Path.Combine(ProgramDirectory, "Images", "app.png"); private static readonly string ImagesDirectory = Path.Combine(ProgramDirectory, "Images");
public static readonly string ErrorIcon = Path.Combine(ProgramDirectory, "Images", "app_error.png"); public static readonly string DefaultIcon = Path.Combine(ImagesDirectory, "app.png");
public static readonly string ErrorIcon = Path.Combine(ImagesDirectory, "app_error.png");
public static readonly string MissingImgIcon = Path.Combine(ImagesDirectory, "app_missing_img.png");
public static string PythonPath; public static string PythonPath;

10
Flow.Launcher.Infrastructure/Image/ImageLoader.cs
View file

@ -38,7 +38,7 @@ namespace Flow.Launcher.Infrastructure.Image
_imageCache.Usage = LoadStorageToConcurrentDictionary(); _imageCache.Usage = LoadStorageToConcurrentDictionary();
foreach (var icon in new[] { Constant.DefaultIcon, Constant.ErrorIcon }) foreach (var icon in new[] { Constant.DefaultIcon, Constant.MissingImgIcon })
{ {
ImageSource img = new BitmapImage(new Uri(icon)); ImageSource img = new BitmapImage(new Uri(icon));
img.Freeze(); img.Freeze();
@ -106,7 +106,7 @@ namespace Flow.Launcher.Infrastructure.Image
{ {
if (string.IsNullOrEmpty(path)) if (string.IsNullOrEmpty(path))
{ {
return new ImageResult(_imageCache[Constant.ErrorIcon], ImageType.Error); return new ImageResult(_imageCache[Constant.MissingImgIcon], ImageType.Error);
} }
if (_imageCache.ContainsKey(path)) if (_imageCache.ContainsKey(path))
{ {
@ -139,7 +139,7 @@ namespace Flow.Launcher.Infrastructure.Image
Log.Exception($"|ImageLoader.Load|Failed to get thumbnail for {path} on first try", e); Log.Exception($"|ImageLoader.Load|Failed to get thumbnail for {path} on first try", e);
Log.Exception($"|ImageLoader.Load|Failed to get thumbnail for {path} on second try", e2); Log.Exception($"|ImageLoader.Load|Failed to get thumbnail for {path} on second try", e2);
ImageSource image = _imageCache[Constant.ErrorIcon]; ImageSource image = _imageCache[Constant.MissingImgIcon];
_imageCache[path] = image; _imageCache[path] = image;
imageResult = new ImageResult(image, ImageType.Error); imageResult = new ImageResult(image, ImageType.Error);
} }
@ -191,8 +191,8 @@ namespace Flow.Launcher.Infrastructure.Image
} }
else else
{ {
image = _imageCache[Constant.ErrorIcon]; image = _imageCache[Constant.MissingImgIcon];
path = Constant.ErrorIcon; path = Constant.MissingImgIcon;
} }
if (type != ImageType.Error) if (type != ImageType.Error)

BIN
Flow.Launcher/Images/app_missing_img.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 44 KiB

2
Flow.Launcher/ViewModel/ResultViewModel.cs
View file

@ -51,7 +51,7 @@ namespace Flow.Launcher.ViewModel
catch (Exception e) catch (Exception e)
{ {
Log.Exception($"|ResultViewModel.Image|IcoPath is empty and exception when calling Icon() for result <{Result.Title}> of plugin <{Result.PluginDirectory}>", e); Log.Exception($"|ResultViewModel.Image|IcoPath is empty and exception when calling Icon() for result <{Result.Title}> of plugin <{Result.PluginDirectory}>", e);
imagePath = Constant.ErrorIcon; imagePath = Constant.MissingImgIcon;
} }
} }

4
Plugins/Flow.Launcher.Plugin.Program/Programs/UWP.cs
View file

@ -536,7 +536,7 @@ namespace Flow.Launcher.Plugin.Program.Programs
ProgramLogger.LogException($"|UWP|ImageFromPath|{path}" + ProgramLogger.LogException($"|UWP|ImageFromPath|{path}" +
$"|Unable to get logo for {UserModelId} from {path} and" + $"|Unable to get logo for {UserModelId} from {path} and" +
$" located in {Package.Location}", new FileNotFoundException()); $" located in {Package.Location}", new FileNotFoundException());
return new BitmapImage(new Uri(Constant.ErrorIcon)); return new BitmapImage(new Uri(Constant.MissingImgIcon));
} }
} }
@ -586,7 +586,7 @@ namespace Flow.Launcher.Plugin.Program.Programs
$"|Unable to convert background string {BackgroundColor} " + $"|Unable to convert background string {BackgroundColor} " +
$"to color for {Package.Location}", new InvalidOperationException()); $"to color for {Package.Location}", new InvalidOperationException());
return new BitmapImage(new Uri(Constant.ErrorIcon)); return new BitmapImage(new Uri(Constant.MissingImgIcon));
} }
} }
else else

6
SolutionAssemblyInfo.cs
View file

@ -16,6 +16,6 @@ using System.Runtime.InteropServices;
[assembly: AssemblyTrademark("")] [assembly: AssemblyTrademark("")]
[assembly: AssemblyCulture("")] [assembly: AssemblyCulture("")]
[assembly: ComVisible(false)] [assembly: ComVisible(false)]
[assembly: AssemblyVersion("1.2.1")] [assembly: AssemblyVersion("1.3.0")]
[assembly: AssemblyFileVersion("1.2.1")] [assembly: AssemblyFileVersion("1.3.0")]
[assembly: AssemblyInformationalVersion("1.2.1")] [assembly: AssemblyInformationalVersion("1.3.0")]

2
appveyor.yml
View file

@ -1,4 +1,4 @@
version: '1.2.1.{build}' version: '1.3.0.{build}'
init: init:
- ps: | - ps: |