Merge branch 'dev' into RenderImprovement

2026-03-11 08:54:32 +00:00 · 2020-11-27 07:32:00 +11:00 · 2020-11-27 07:32:00 +11:00 · b8b0e8c23a
commit b8b0e8c23a
parent 69e11e2861 2608d961d0
21 changed files with 55 additions and 47 deletions
--- a/Flow.Launcher.Infrastructure/Image/ImageCache.cs
+++ b/Flow.Launcher.Infrastructure/Image/ImageCache.cs
@ -26,7 +26,7 @@ namespace Flow.Launcher.Infrastructure.Image
        private const int MaxCached = 50;
        public ConcurrentDictionary<string, ImageUsage> Data { get; private set; } = new ConcurrentDictionary<string, ImageUsage>();
        private const int permissibleFactor = 2;
-
+        
        public void Initialization(Dictionary<string, int> usage)
        {
            foreach (var key in usage.Keys)
@ -66,8 +66,7 @@ namespace Flow.Launcher.Infrastructure.Image
                {
                    // To delete the images from the data dictionary based on the resizing of the Usage Dictionary.
                    foreach (var key in Data
-                        .Where(x => x.Key != Constant.MissingImgIcon
-                                 && x.Key != Constant.ErrorIcon
+                        .Where(x => x.Key != Constant.ErrorIcon
                                 && x.Key != Constant.DefaultIcon)
                        .OrderBy(x => x.Value.usage).Take(Data.Count - MaxCached).Select(x => x.Key))
                    {
@ -95,5 +94,4 @@ namespace Flow.Launcher.Infrastructure.Image
            return Data.Values.Select(x => x.imageSource).Distinct().Count();
        }
    }
-
 }
--- a/Flow.Launcher.Infrastructure/Image/ImageLoader.cs
+++ b/Flow.Launcher.Infrastructure/Image/ImageLoader.cs
@ -216,10 +216,9 @@ namespace Flow.Launcher.Infrastructure.Image

        public static bool CacheContainImage(string path)
        {
-            return ImageCache.ContainsKey(path);
+            return ImageCache.ContainsKey(path) && ImageCache[path] != null;
        }

-
        public static ImageSource Load(string path, bool loadFullImage = false)
        {
            var imageResult = LoadInternal(path, loadFullImage);
--- a/Flow.Launcher.Plugin/Flow.Launcher.Plugin.csproj
+++ b/Flow.Launcher.Plugin/Flow.Launcher.Plugin.csproj
@ -14,10 +14,10 @@
  </PropertyGroup>

  <PropertyGroup>
-    <Version>1.2.2</Version>
-    <PackageVersion>1.2.2</PackageVersion>
-    <AssemblyVersion>1.2.2</AssemblyVersion>
-    <FileVersion>1.2.2</FileVersion>
+    <Version>1.3.0</Version>
+    <PackageVersion>1.3.0</PackageVersion>
+    <AssemblyVersion>1.3.0</AssemblyVersion>
+    <FileVersion>1.3.0</FileVersion>
    <PackageId>Flow.Launcher.Plugin</PackageId>
    <Authors>Flow-Launcher</Authors>
    <PackageLicenseExpression>MIT</PackageLicenseExpression>
--- a/Flow.Launcher/Languages/sk.xaml
+++ b/Flow.Launcher/Languages/sk.xaml
@ -5,8 +5,8 @@
    <system:String x:Key="registerHotkeyFailed">Nepodarilo sa registrovať klávesovú skratku {0}</system:String>
    <system:String x:Key="couldnotStartCmd">Nepodarilo sa spustiť {0}</system:String>
    <system:String x:Key="invalidFlowLauncherPluginFileFormat">Neplatný formát súboru pre plugin Flow Launchera</system:String>
-    <system:String x:Key="setAsTopMostInThisQuery">Pri tomto dopyte umiestniť navrchu</system:String>
-    <system:String x:Key="cancelTopMostInThisQuery">Zrušiť umiestnenie navrchu pri tomto dopyte</system:String>
+    <system:String x:Key="setAsTopMostInThisQuery">Pri tomto zadaní umiestniť navrchu</system:String>
+    <system:String x:Key="cancelTopMostInThisQuery">Zrušiť umiestnenie navrchu pri tomto zadaní</system:String>
    <system:String x:Key="executeQuery">Spustiť dopyt: {0}</system:String>
    <system:String x:Key="lastExecuteTime">Posledný čas realizácie: {0}</system:String>
    <system:String x:Key="iconTrayOpen">Otvoriť</system:String>
@ -22,7 +22,7 @@
    <system:String x:Key="dontPromptUpdateMsg">Nezobrazovať upozornenia na novú verziu</system:String>
    <system:String x:Key="rememberLastLocation">Zapamätať si posledné umiestnenie</system:String>
    <system:String x:Key="language">Jazyk</system:String>
-    <system:String x:Key="lastQueryMode">Posledný dopyt</system:String>
+    <system:String x:Key="lastQueryMode">Posledné vyhľadávanie</system:String>
    <system:String x:Key="LastQueryPreserved">Ponechať</system:String>
    <system:String x:Key="LastQuerySelected">Označiť</system:String>
    <system:String x:Key="LastQueryEmpty">Vymazať</system:String>
@ -34,7 +34,7 @@
    <system:String x:Key="hideOnStartup">Schovať Flow Launcher po spustení</system:String>
    <system:String x:Key="hideNotifyIcon">Schovať ikonu z oblasti oznámení</system:String>
    <system:String x:Key="querySearchPrecision">Presnosť vyhľadávania</system:String>
-    <system:String x:Key="ShouldUsePinyin">Dá sa použiť Pinyin</system:String>
+    <system:String x:Key="ShouldUsePinyin">Použiť Pinyin</system:String>

    <!--Setting Plugin-->
    <system:String x:Key="plugin">Plugin</system:String>
@ -96,11 +96,11 @@
    <system:String x:Key="version">Verzia</system:String>
    <system:String x:Key="about_activate_times">Flow Launcher bol aktivovaný {0}-krát</system:String>
    <system:String x:Key="checkUpdates">Skontrolovať aktualizácie</system:String>
-    <system:String x:Key="newVersionTips">Je dostupná nová verzia {0}, prosím, reštartujte Flow Launcher.</system:String>
+    <system:String x:Key="newVersionTips">Je dostupná nová verzia {0}, chcete reštartovať Flow Launcher, aby sa mohol aktualizovať?</system:String>
    <system:String x:Key="checkUpdatesFailed">Kontrola aktualizácií zlyhala, prosím, skontrolujte pripojenie na internet a nastavenie proxy k api.github.com.</system:String>
    <system:String x:Key="downloadUpdatesFailed">
        Sťahovanie aktualizácií zlyhalo, skontrolujte pripojenie na internet a nastavenie proxy k github-cloud.s3.amazonaws.com, 
-        alebo prejdite na https://github.com/Flow-Launcher/Flow.Launcher/releases pre manuálne stiahnutie aktualizácií.
+        alebo prejdite na https://github.com/Flow-Launcher/Flow.Launcher/releases pre manuálne stiahnutie aktualizácie.
    </system:String>
    <system:String x:Key="releaseNotes">Poznámky k vydaniu</system:String>

--- a/Flow.Launcher/ViewModel/ResultViewModel.cs
+++ b/Flow.Launcher/ViewModel/ResultViewModel.cs
@ -2,7 +2,6 @@
 using System.Threading.Tasks;
 using System.Windows;
 using System.Windows.Media;
-using System.Windows.Threading;
 using Flow.Launcher.Infrastructure;
 using Flow.Launcher.Infrastructure.Image;
 using Flow.Launcher.Infrastructure.Logger;
@ -18,7 +17,6 @@ namespace Flow.Launcher.ViewModel
        {
            private T defaultValue;

-
            private readonly Action _updateCallback;
            public new T Value
            {
@ -30,13 +28,14 @@ namespace Flow.Launcher.ViewModel
                        {
                            _updateCallback();
                        });
+
                        return defaultValue;
                    }
-                    else if (!base.Value.IsCompleted)
-                    {
+                    
+                    if (!base.Value.IsCompleted || base.Value.IsFaulted)
                        return defaultValue;
-                    }
-                    else return base.Value.Result;
+
+                    return base.Value.Result;
                }
            }
            public LazyAsync(Func<Task<T>> factory, T defaultValue, Action updateCallback) : base(factory)
@ -45,8 +44,8 @@ namespace Flow.Launcher.ViewModel
                {
                    this.defaultValue = defaultValue;
                }
+
                _updateCallback = updateCallback;
-                
            }
        }

@ -55,10 +54,14 @@ namespace Flow.Launcher.ViewModel
            if (result != null)
            {
                Result = result;
-                Image = new LazyAsync<ImageSource>(SetImage, ImageLoader.DefaultImage, () =>
-                    {
-                        OnPropertyChanged(nameof(Image));
-                    });
+
+                Image = new LazyAsync<ImageSource>(
+                            SetImage, 
+                            ImageLoader.DefaultImage,
+                            () =>
+                                {
+                                    OnPropertyChanged(nameof(Image));
+                                });
            }

            Settings = settings;
@ -97,13 +100,17 @@ namespace Flow.Launcher.ViewModel
            }

            if (ImageLoader.CacheContainImage(imagePath))
+            {
                // will get here either when icoPath has value\icon delegate is null\when had exception in delegate
                return ImageLoader.Load(imagePath);
            else
            {
                return await Task.Run(() => ImageLoader.Load(imagePath));
            }
-
+            else
+            {
+                return await Task.Run(() => ImageLoader.Load(imagePath));
+            }
        }

        public Result Result { get; }
@ -131,6 +138,5 @@ namespace Flow.Launcher.ViewModel
        {
            return Result.ToString();
        }
-
    }
 }
--- a/Plugins/Flow.Launcher.Plugin.BrowserBookmark/plugin.json
+++ b/Plugins/Flow.Launcher.Plugin.BrowserBookmark/plugin.json
@ -4,7 +4,7 @@
  "Name": "Browser Bookmarks",
  "Description": "Search your browser bookmarks",
  "Author": "qianlifeng, Ioannis G.",
-  "Version": "1.2.1",
+  "Version": "1.3.1",
  "Language": "csharp",
  "Website": "https://github.com/Flow-Launcher/Flow.Launcher",
  "ExecuteFileName": "Flow.Launcher.Plugin.BrowserBookmark.dll",
--- a/Plugins/Flow.Launcher.Plugin.Calculator/Languages/sk.xaml
+++ b/Plugins/Flow.Launcher.Plugin.Calculator/Languages/sk.xaml
@ -12,5 +12,5 @@
    <system:String x:Key="flowlauncher_plugin_calculator_decimal_seperator_use_system_locale">Použiť podľa systému</system:String>
    <system:String x:Key="flowlauncher_plugin_calculator_decimal_seperator_comma">Čiarka (,)</system:String>
    <system:String x:Key="flowlauncher_plugin_calculator_decimal_seperator_dot">Bodka (.)</system:String>
-    <system:String x:Key="flowlauncher_plugin_calculator_max_decimal_places">Max. desatinných miest</system:String>
+    <system:String x:Key="flowlauncher_plugin_calculator_max_decimal_places">Desatinné miesta</system:String>
 </ResourceDictionary>
--- a/Plugins/Flow.Launcher.Plugin.Calculator/plugin.json
+++ b/Plugins/Flow.Launcher.Plugin.Calculator/plugin.json
@ -4,7 +4,7 @@
  "Name": "Calculator",
  "Description": "Provide mathematical calculations.(Try 5*3-2 in Flow Launcher)",
  "Author": "cxfksword",
-  "Version": "1.0.2",
+  "Version": "1.1.3",
  "Language": "csharp",
  "Website": "https://github.com/Flow-Launcher/Flow.Launcher",
  "ExecuteFileName": "Flow.Launcher.Plugin.Caculator.dll",
--- a/Plugins/Flow.Launcher.Plugin.Color/plugin.json
+++ b/Plugins/Flow.Launcher.Plugin.Color/plugin.json
@ -4,7 +4,7 @@
  "Name": "Colors",
  "Description": "Provide hex color preview.(Try #000 in Flow Launcher)",
  "Author": "qianlifeng",
-  "Version": "1.0.1",
+  "Version": "1.1.1",
  "Language": "csharp",
  "Website": "https://github.com/Flow-Launcher/Flow.Launcher",
  "ExecuteFileName": "Flow.Launcher.Plugin.Color.dll",
--- a/Plugins/Flow.Launcher.Plugin.ControlPanel/plugin.json
+++ b/Plugins/Flow.Launcher.Plugin.ControlPanel/plugin.json
@ -4,7 +4,7 @@
  "Name": "Control Panel",
  "Description": "Search within the Control Panel.",
  "Author": "CoenraadS",
-  "Version": "1.0.1",
+  "Version": "1.1.1",
  "Language": "csharp",
  "Website": "https://github.com/Flow-Launcher/Flow.Launcher",
  "ExecuteFileName": "Flow.Launcher.Plugin.ControlPanel.dll",
--- a/Plugins/Flow.Launcher.Plugin.PluginIndicator/plugin.json
+++ b/Plugins/Flow.Launcher.Plugin.PluginIndicator/plugin.json
@ -4,7 +4,7 @@
  "Name": "Plugin Indicator",
  "Description": "Provide plugin actionword suggestion",
  "Author": "qianlifeng",
-  "Version": "1.0.1",
+  "Version": "1.1.1",
  "Language": "csharp",
  "Website": "https://github.com/Flow-Launcher/Flow.Launcher",
  "ExecuteFileName": "Flow.Launcher.Plugin.PluginIndicator.dll",
--- a/Plugins/Flow.Launcher.Plugin.PluginManagement/plugin.json
+++ b/Plugins/Flow.Launcher.Plugin.PluginManagement/plugin.json
@ -4,7 +4,7 @@
  "Name": "Plugin Management",
  "Description": "Install/Remove/Update Flow Launcher plugins",
  "Author": "qianlifeng",
-  "Version": "1.0.1",
+  "Version": "1.1.1",
  "Language": "csharp",
  "Website": "https://github.com/Flow-Launcher/Flow.Launcher",
  "ExecuteFileName": "Flow.Launcher.Plugin.PluginManagement.dll",
--- a/Plugins/Flow.Launcher.Plugin.ProcessKiller/plugin.json
+++ b/Plugins/Flow.Launcher.Plugin.ProcessKiller/plugin.json
@ -4,7 +4,7 @@
    "Name":"Process Killer",
    "Description":"kill running processes from Flow",
    "Author":"Flow-Launcher",
-    "Version":"1.1.1",
+    "Version":"1.2.1",
    "Language":"csharp",
    "Website":"https://github.com/Flow-Launcher/Flow.Launcher.Plugin.ProcessKiller",
    "IcoPath":"Images\\app.png",
--- a/Plugins/Flow.Launcher.Plugin.Program/Languages/sk.xaml
+++ b/Plugins/Flow.Launcher.Plugin.Program/Languages/sk.xaml
@ -40,7 +40,12 @@
    <system:String x:Key="flowlauncher_plugin_program_plugin_description">Vyhľadávanie programov vo Flow Launcheri</system:String>
 	
    <system:String x:Key="flowlauncher_plugin_program_invalid_path">Neplatná cesta</system:String>
-    
+
+    <system:String x:Key="flowlauncher_plugin_program_customizedexplorer">Vlastný správca súborov</system:String>
+    <system:String x:Key="flowlauncher_plugin_program_args">Arg.</system:String>
+    <system:String x:Key="flowlauncher_plugin_program_tooltip_customizedexplorer">Môžete si prispôsobiť otváranie umiestnenia priečinka vložením Premenných prostredia, ktoré chcete použiť. Dostupnosť premenných prostredia môžete vyskúšať cez príkazový riadok.</system:String>
+    <system:String x:Key="flowlauncher_plugin_program_tooltip_args">Zadajte argumenty, ktoré chcete pridať pre správcu súborov. %s pre rodičovský priečinok, %f pre celú cestu (funguje iba pre win32). Pre podrobnosti pozrite webovú stránku správcu súborov.</system:String>
+	
    <!--Dialogs-->
    <system:String x:Key="flowlauncher_plugin_program_disable_dlgtitle_success">Úspešné</system:String>
    <system:String x:Key="flowlauncher_plugin_program_disable_dlgtitle_success_message">Úspešne zakázané zobrazovanie tohto programu vo výsledkoch vyhľadávania</system:String>
--- a/Plugins/Flow.Launcher.Plugin.Program/plugin.json
+++ b/Plugins/Flow.Launcher.Plugin.Program/plugin.json
@ -4,7 +4,7 @@
  "Name": "Program",
  "Description": "Search programs in Flow.Launcher",
  "Author": "qianlifeng",
-  "Version": "1.1.1",
+  "Version": "1.2.2",
  "Language": "csharp",
  "Website": "https://github.com/Flow-Launcher/Flow.Launcher",
  "ExecuteFileName": "Flow.Launcher.Plugin.Program.dll",
--- a/Plugins/Flow.Launcher.Plugin.Shell/plugin.json
+++ b/Plugins/Flow.Launcher.Plugin.Shell/plugin.json
@ -4,7 +4,7 @@
  "Name": "Shell",
  "Description": "Provide executing commands from Flow Launcher. Commands should start with >",
  "Author": "qianlifeng",
-  "Version": "1.0.1",
+  "Version": "1.1.1",
  "Language": "csharp",
  "Website": "https://github.com/Flow-Launcher/Flow.Launcher",
  "ExecuteFileName": "Flow.Launcher.Plugin.Shell.dll",
--- a/Plugins/Flow.Launcher.Plugin.Sys/plugin.json
+++ b/Plugins/Flow.Launcher.Plugin.Sys/plugin.json
@ -4,7 +4,7 @@
  "Name": "System Commands",
  "Description": "Provide System related commands. e.g. shutdown,lock,setting etc.",
  "Author": "qianlifeng",
-  "Version": "1.0.1",
+  "Version": "1.1.1",
  "Language": "csharp",
  "Website": "https://github.com/Flow-Launcher/Flow.Launcher",
  "ExecuteFileName": "Flow.Launcher.Plugin.Sys.dll",
--- a/Plugins/Flow.Launcher.Plugin.Url/plugin.json
+++ b/Plugins/Flow.Launcher.Plugin.Url/plugin.json
@ -4,7 +4,7 @@
  "Name": "URL",
  "Description": "Open the typed URL from Flow Launcher",
  "Author": "qianlifeng",
-  "Version": "1.0.1",
+  "Version": "1.1.1",
  "Language": "csharp",
  "Website": "https://github.com/Flow-Launcher/Flow.Launcher",
  "ExecuteFileName": "Flow.Launcher.Plugin.Url.dll",
--- a/Plugins/Flow.Launcher.Plugin.WebSearch/plugin.json
+++ b/Plugins/Flow.Launcher.Plugin.WebSearch/plugin.json
@ -25,7 +25,7 @@
  "Name": "Web Searches",
  "Description": "Provide the web search ability",
  "Author": "qianlifeng",
-  "Version": "1.0.2",
+  "Version": "1.1.2",
  "Language": "csharp",
  "Website": "https://github.com/Flow-Launcher/Flow.Launcher",
  "ExecuteFileName": "Flow.Launcher.Plugin.WebSearch.dll",
--- a/SolutionAssemblyInfo.cs
+++ b/SolutionAssemblyInfo.cs
@ -16,6 +16,6 @@ using System.Runtime.InteropServices;
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
 [assembly: ComVisible(false)]
-[assembly: AssemblyVersion("1.4.0")]
-[assembly: AssemblyFileVersion("1.4.0")]
-[assembly: AssemblyInformationalVersion("1.4.0")]
+[assembly: AssemblyVersion("1.5.0")]
+[assembly: AssemblyFileVersion("1.5.0")]
+[assembly: AssemblyInformationalVersion("1.5.0")]
--- a/appveyor.yml
+++ b/appveyor.yml
@ -1,4 +1,4 @@
-version: '1.4.0.{build}'
+version: '1.5.0.{build}'

 init:
 - ps: |