Merge branch 'dev' into explorerMerge

Author: taooceros

Flow.Launcher.Core/Flow.Launcher.Core.csproj

@@ -55,7 +55,7 @@
   <ItemGroup>
     <PackageReference Include="Droplex" Version="1.4.1" />
     <PackageReference Include="FSharp.Core" Version="6.0.6" />
-    <PackageReference Include="Microsoft.IO.RecyclableMemoryStream" Version="2.1.3" />
+    <PackageReference Include="Microsoft.IO.RecyclableMemoryStream" Version="2.2.1" />
     <PackageReference Include="squirrel.windows" Version="1.5.2" NoWarn="NU1701" />
   </ItemGroup>
 

Flow.Launcher.Test/Plugins/ProgramTest.cs

@@ -994,6 +994,7 @@
                                     TextAlignment="Left" />
                                 <DockPanel DockPanel.Dock="Right">
                                     <TextBox
+                                        Loaded="Plugin_GotFocus"
                                         Name="pluginFilterTxb"
                                         Width="150"
                                         Height="34"
@@ -1428,6 +1429,7 @@
                                 DockPanel.Dock="Right"
                                 FontSize="14"
                                 KeyDown="PluginStoreFilterTxb_OnKeyDown"
+                                Loaded="PluginStore_GotFocus"
                                 LostFocus="RefreshPluginStoreEventHandler"
                                 Text=""
                                 TextAlignment="Left"

Flow.Launcher/SettingWindow.xaml

@@ -562,5 +562,15 @@ private void StoreListItem_Click(object sender, RoutedEventArgs e)
             };
 
         }
+
+        private void PluginStore_GotFocus(object sender, RoutedEventArgs e)
+        {
+            Keyboard.Focus(pluginStoreFilterTxb);
+        }
+
+        private void Plugin_GotFocus(object sender, RoutedEventArgs e)
+        {
+            Keyboard.Focus(pluginFilterTxb);
+        }
     }
 }

Flow.Launcher/SettingWindow.xaml.cs

@@ -81,7 +81,9 @@
 
     <!--  Dialogs  -->
     <system:String x:Key="flowlauncher_plugin_program_disable_dlgtitle_success">Success</system:String>
+    <system:String x:Key="flowlauncher_plugin_program_disable_dlgtitle_error">Error</system:String>
     <system:String x:Key="flowlauncher_plugin_program_disable_dlgtitle_success_message">Successfully disabled this program from displaying in your query</system:String>
     <system:String x:Key="flowlauncher_plugin_program_run_as_administrator_not_supported_message">This app is not intended to be run as administrator</system:String>
+    <system:String x:Key="flowlauncher_plugin_program_run_failed">Unable to run {0}</system:String>
 
 </ResourceDictionary>

Plugins/Flow.Launcher.Plugin.Program/Languages/en.xaml

@@ -5,6 +5,7 @@
 using System.Threading;
 using System.Threading.Tasks;
 using System.Windows.Controls;
+using Flow.Launcher.Infrastructure;
 using Flow.Launcher.Infrastructure.Logger;
 using Flow.Launcher.Infrastructure.Storage;
 using Flow.Launcher.Plugin.Program.Programs;
@@ -225,9 +226,9 @@ public static void StartProcess(Func<ProcessStartInfo, Process> runProcess, Proc
             }
             catch (Exception)
             {
-                var name = "Plugin: Program";
-                var message = $"Unable to start: {info.FileName}";
-                Context.API.ShowMsg(name, message, string.Empty);
+                var title = Context.API.GetTranslation("flowlauncher_plugin_program_disable_dlgtitle_error");
+                var message = string.Format(Context.API.GetTranslation("flowlauncher_plugin_program_run_failed"), info.FileName);
+                Context.API.ShowMsg(title, string.Format(message, info.FileName), string.Empty);
             }
         }