Merge branch 'dev' into FixPluginListFreezing

Author: onesounds

Flow.Launcher/Flow.Launcher.csproj

@@ -89,7 +89,7 @@
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
     <PackageReference Include="InputSimulator" Version="1.0.4" />
-    <PackageReference Include="Microsoft.Toolkit.Uwp.Notifications" Version="7.1.2" />
+    <PackageReference Include="Microsoft.Toolkit.Uwp.Notifications" Version="7.1.3" />
     <PackageReference Include="ModernWpfUI" Version="0.9.4" />
     <PackageReference Include="NHotkey.Wpf" Version="2.1.0" />
     <PackageReference Include="NuGet.CommandLine" Version="5.7.2">

Flow.Launcher/Languages/en.xaml

@@ -92,6 +92,7 @@
     <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  -->

Plugins/Flow.Launcher.Plugin.BrowserBookmark/Flow.Launcher.Plugin.BrowserBookmark.csproj

@@ -3,7 +3,6 @@
   <PropertyGroup>
     <OutputType>Library</OutputType>
     <TargetFramework>net6.0-windows</TargetFramework>
-    <RuntimeIdentifier>win-x64</RuntimeIdentifier>
     <UseWPF>true</UseWPF>
     <ProjectGuid>{9B130CC5-14FB-41FF-B310-0A95B6894C37}</ProjectGuid>
     <AppDesignerFolder>Properties</AppDesignerFolder>
@@ -65,4 +64,19 @@
     <Compile Remove="Bookmark.cs" />
   </ItemGroup>
 
+  <Target Name="CopyDLLs" AfterTargets="Build">
+    <Message Text="Executing CopyDLLs task" Importance="High" />
+    <Copy
+      SourceFiles="$(TargetDir)\runtimes\win-x64\native\SQLite.Interop.dll"
+      DestinationFolder="$(TargetDir)\x64" />
+    <Copy
+      SourceFiles="$(TargetDir)\runtimes\win-x86\native\SQLite.Interop.dll"
+      DestinationFolder="$(TargetDir)\x86" />
+  </Target>
+
+  <Target Name="DeleteRuntimesFolder" AfterTargets="CopyDLLs">
+    <Message Text="Deleting runtimes folder" Importance="High" />
+    <RemoveDir Directories="$(TargetDir)\runtimes" />
+  </Target>
+
 </Project>

Plugins/Flow.Launcher.Plugin.Program/AddProgramSource.xaml

@@ -5,11 +5,12 @@
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
     Title="{DynamicResource flowlauncher_plugin_program_directory}"
-    Width="530"
+    Width="Auto"
+    Height="276"
     Background="{DynamicResource PopuBGColor}"
     Foreground="{DynamicResource PopupTextColor}"
     ResizeMode="NoResize"
-    SizeToContent="Height"
+    SizeToContent="Width"
     WindowStartupLocation="CenterScreen">
     <WindowChrome.WindowChrome>
         <WindowChrome CaptionHeight="32" ResizeBorderThickness="{x:Static SystemParameters.WindowResizeBorderThickness}" />
@@ -69,9 +70,9 @@
                         TextAlignment="Left"
                         TextWrapping="WrapWithOverflow" />
                 </StackPanel>
-                
-                <StackPanel Margin="0,10,0,0" Orientation="Horizontal">
-                    <Grid Width="470">
+
+                <StackPanel Margin="0,10,10,0" Orientation="Horizontal">
+                    <Grid>
                         <Grid.RowDefinitions>
                             <RowDefinition />
                             <RowDefinition />
@@ -88,21 +89,22 @@
                             VerticalAlignment="Center"
                             FontSize="14"
                             Text="{DynamicResource flowlauncher_plugin_program_directory}" />
-                        <DockPanel 
-                            Grid.Row="0" 
-                            Grid.Column="1" 
+                        <DockPanel
+                            Grid.Row="0"
+                            Grid.Column="1"
                             LastChildFill="True">
                             <Button
-                                Width="70"
-                                HorizontalAlignment="Right"
+                                MinWidth="70"
+                                HorizontalAlignment="Stretch"
                                 Click="BrowseButton_Click"
-                                DockPanel.Dock="Right"
-                                Content="{DynamicResource flowlauncher_plugin_program_browse}" />
+                                Content="{DynamicResource flowlauncher_plugin_program_browse}"
+                                DockPanel.Dock="Right" />
                             <TextBox
                                 Name="Directory"
+                                MinWidth="300"
                                 Margin="10"
-                                VerticalAlignment="Center"
-                                HorizontalAlignment="Stretch" />
+                                HorizontalAlignment="Stretch"
+                                VerticalAlignment="Center" />
                         </DockPanel>
                         <TextBlock
                             Grid.Row="1"
@@ -112,7 +114,8 @@
                             VerticalAlignment="Center"
                             FontSize="14"
                             Text="{DynamicResource flowlauncher_plugin_program_enabled}" />
-                        <CheckBox x:Name="Chkbox"
+                        <CheckBox
+                            x:Name="Chkbox"
                             Grid.Row="1"
                             Grid.Column="1"
                             Margin="10,0"

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

@@ -61,7 +61,7 @@
         Insert file suffixes you want to index. Suffixes should be separated by ';'. (ex>bat;py)
     </system:String>
     <system:String x:Key="flowlauncher_plugin_program_protocol_tooltip">
-        Insert protocols of .url files you want to index. Protocols should be separated by ';'. (ex>ftp;netflix)
+        Insert protocols of .url files you want to index. Protocols should be separated by ';', and should end with "://". (ex>ftp://;mailto://)
     </system:String>
 
     <system:String x:Key="flowlauncher_plugin_program_run_as_different_user">Run As Different User</system:String>

Plugins/Flow.Launcher.Plugin.Program/Main.cs

@@ -102,7 +102,7 @@ public async Task InitAsync(PluginInitContext context)
                 await Task.WhenAll(a, b);
 
             Win32.WatchProgramUpdate(_settings);
-            UWP.WatchPackageChange();
+            _ = UWP.WatchPackageChange();
         }
 
         public static void IndexWin32Programs()

Plugins/Flow.Launcher.Plugin.Program/Programs/UWP.cs

@@ -277,7 +277,8 @@ public override int GetHashCode()
         [Serializable]
         public class Application : IProgram
         {
-            public string UniqueIdentifier { get; set; }
+            private string _uid = string.Empty;
+            public string UniqueIdentifier { get => _uid; set => _uid = value == null ? string.Empty : value.ToLowerInvariant(); }
             public string DisplayName { get; set; }
             public string Description { get; set; }
             public string UserModelId { get; set; }