Merge branch 'dev' into RememberSizeSettingWindow

Author: onesounds

Flow.Launcher.Core/Plugin/PluginManager.cs

@@ -166,18 +166,18 @@ public static async Task InitializePluginsAsync(IPublicAPI api)
 
         public static ICollection<PluginPair> ValidPluginsForQuery(Query query)
         {
-            if (NonGlobalPlugins.ContainsKey(query.ActionKeyword))
-            {
-                var plugin = NonGlobalPlugins[query.ActionKeyword];
-                return new List<PluginPair>
-                {
-                    plugin
-                };
-            }
-            else
-            {
+            if (query is null)
+                return Array.Empty<PluginPair>();
+            
+            if (!NonGlobalPlugins.ContainsKey(query.ActionKeyword))
                 return GlobalPlugins;
-            }
+            
+            
+            var plugin = NonGlobalPlugins[query.ActionKeyword];
+            return new List<PluginPair>
+            {
+                plugin
+            };
         }
 
         public static async Task<List<Result>> QueryForPluginAsync(PluginPair pair, Query query, CancellationToken token)

Flow.Launcher.Core/Resource/Theme.cs

@@ -17,7 +17,7 @@ namespace Flow.Launcher.Core.Resource
 {
     public class Theme
     {
-        private const int ShadowExtraMargin = 12;
+        private const int ShadowExtraMargin = 32;
 
         private readonly List<string> _themeDirectories = new List<string>();
         private ResourceDictionary _oldResource;
@@ -238,9 +238,10 @@ public void AddDropShadowEffectToCurrentTheme()
                 Property = Border.EffectProperty,
                 Value = new DropShadowEffect
                 {
-                    Opacity = 0.4,
-                    ShadowDepth = 2,
-                    BlurRadius = 15
+                    Opacity = 0.3,
+                    ShadowDepth = 12,
+                    Direction = 270,
+                    BlurRadius = 30
                 }
             };
 
@@ -250,7 +251,7 @@ public void AddDropShadowEffectToCurrentTheme()
                 marginSetter = new Setter()
                 {
                     Property = Border.MarginProperty,
-                    Value = new Thickness(ShadowExtraMargin),
+                    Value = new Thickness(ShadowExtraMargin, 12, ShadowExtraMargin, ShadowExtraMargin),
                 };
                 windowBorderStyle.Setters.Add(marginSetter);
             }

Flow.Launcher.Plugin/Result.cs

@@ -66,6 +66,10 @@ public string IcoPath
                 }
             }
         }
+        /// <summary>
+        /// Determines if Icon has a border radius
+        /// </summary>
+        public bool RoundedIcon { get; set; } = false;
 
         /// <summary>
         /// Delegate function, see <see cref="Icon"/>
@@ -197,5 +201,16 @@ public ValueTask<bool> ExecuteAsync(ActionContext context)
         {
             return AsyncAction?.Invoke(context) ?? ValueTask.FromResult(Action?.Invoke(context) ?? false);
         }
+
+        /// <summary>
+        /// Progress bar display. Providing an int value between 0-100 will trigger the progress bar to be displayed on the result
+        /// </summary>
+        public int? ProgressBar { get; set; }
+
+        /// <summary>
+        /// Optionally set the color of the progress bar
+        /// </summary>
+        /// <default>#26a0da (blue)</default>
+        public string ProgressBarColor { get; set; } = "#26a0da";
     }
 }

Flow.Launcher/ActionKeywords.xaml

@@ -58,7 +58,6 @@
                         <TextBlock
                             Grid.Column="0"
                             Margin="0,0,0,0"
-                            FontFamily="Segoe UI"
                             FontSize="20"
                             FontWeight="SemiBold"
                             Text="{DynamicResource actionKeywordsTitle}"

Flow.Launcher/CustomQueryHotkeySetting.xaml

@@ -64,7 +64,6 @@
                     <TextBlock
                         Grid.Column="0"
                         Margin="0,0,0,0"
-                        FontFamily="Segoe UI"
                         FontSize="20"
                         FontWeight="SemiBold"
                         Text="{DynamicResource customeQueryHotkeyTitle}"

Flow.Launcher/Languages/en.xaml

@@ -52,6 +52,7 @@
     <system:String x:Key="selectPythonDirectory">Select</system:String>
     <system:String x:Key="hideOnStartup">Hide Flow Launcher on startup</system:String>
     <system:String x:Key="hideNotifyIcon">Hide tray icon</system:String>
+    <system:String x:Key="hideNotifyIconToolTip">When the icon is hidden from the tray, the Settings menu can be opened by right-clicking on the search window.</system:String>
     <system:String x:Key="querySearchPrecision">Query Search Precision</system:String>
     <system:String x:Key="querySearchPrecisionToolTip">Changes minimum match score required for results.</system:String>
     <system:String x:Key="ShouldUsePinyin">Should Use Pinyin</system:String>
@@ -71,12 +72,14 @@
     <system:String x:Key="currentPriority">Current Priority</system:String>
     <system:String x:Key="newPriority">New Priority</system:String>
     <system:String x:Key="priority">Priority</system:String>
+    <system:String x:Key="priorityToolTip">Change Plugin Results Priority</system:String>
     <system:String x:Key="pluginDirectory">Plugin Directory</system:String>
     <system:String x:Key="author">by</system:String>
     <system:String x:Key="plugin_init_time">Init time:</system:String>
     <system:String x:Key="plugin_query_time">Query time:</system:String>
     <system:String x:Key="plugin_query_version">| Version</system:String>
     <system:String x:Key="plugin_query_web">Website</system:String>
+    <system:String x:Key="plugin_uninstall">Uninstall</system:String>
 
 
     <!--  Setting Plugin Store  -->

Flow.Launcher/Languages/es-419.xaml

@@ -69,6 +69,7 @@
     <system:String x:Key="currentPriority">Prioridad Actual</system:String>
     <system:String x:Key="newPriority">Nueva Prioridad</system:String>
     <system:String x:Key="priority">Prioridad</system:String>
+    <system:String x:Key="priorityToolTip">Cambiar la prioridad del resultado del plugin</system:String>
     <system:String x:Key="pluginDirectory">Directorio de Plugins</system:String>
     <system:String x:Key="author">por</system:String>
     <system:String x:Key="plugin_init_time">Tiempo de inicio:</system:String>

Flow.Launcher/Languages/es.xaml

@@ -69,6 +69,7 @@
     <system:String x:Key="currentPriority">Prioridad actual</system:String>
     <system:String x:Key="newPriority">Nueva prioridad</system:String>
     <system:String x:Key="priority">Prioridad</system:String>
+    <system:String x:Key="priorityToolTip">Cambiar la prioridad del resultado del complemento</system:String>
     <system:String x:Key="pluginDirectory">Carpeta de complementos</system:String>
     <system:String x:Key="author">por</system:String>
     <system:String x:Key="plugin_init_time">Tiempo de inicio:</system:String>

Flow.Launcher/Languages/ko.xaml

@@ -69,6 +69,7 @@
     <system:String x:Key="currentPriority">현재 중요도:</system:String>
     <system:String x:Key="newPriority">새 중요도:</system:String>
     <system:String x:Key="priority">중요도</system:String>
+    <system:String x:Key="priorityToolTip">플러그인 결과 우선 순위 변경</system:String>
     <system:String x:Key="pluginDirectory">플러그인 폴더</system:String>
     <system:String x:Key="author">제작자</system:String>
     <system:String x:Key="plugin_init_time">초기화 시간:</system:String>

Flow.Launcher/Languages/zh-cn.xaml

@@ -69,6 +69,7 @@
     <system:String x:Key="currentPriority">当前优先级</system:String>
     <system:String x:Key="newPriority">新优先级</system:String>
     <system:String x:Key="priority">优先级</system:String>
+    <system:String x:Key="priorityToolTip">更改插件结果优先级</system:String>
     <system:String x:Key="pluginDirectory">插件目录</system:String>
     <system:String x:Key="author">出自</system:String>
     <system:String x:Key="plugin_init_time">加载耗时：</system:String>