From f3ce6975c9f465c772cf0c16fb1cc2e76268eb5c Mon Sep 17 00:00:00 2001
From: Jack251970 <1160210343@qq.com>
Date: Tue, 17 Jun 2025 13:28:04 +0800
Subject: [PATCH 01/13] Fix tab sequence

---
 Flow.Launcher/CustomShortcutSetting.xaml | 26 +++++++++++++-----------
 1 file changed, 14 insertions(+), 12 deletions(-)

diff --git a/Flow.Launcher/CustomShortcutSetting.xaml b/Flow.Launcher/CustomShortcutSetting.xaml
index d8623753f..5185354e7 100644
--- a/Flow.Launcher/CustomShortcutSetting.xaml
+++ b/Flow.Launcher/CustomShortcutSetting.xaml
@@ -118,24 +118,26 @@
                             FontSize="14"
                             Text="{DynamicResource customShortcutExpansion}" />
 
-                        <DockPanel
-                            Grid.Row="1"
-                            Grid.Column="1"
-                            LastChildFill="True">
-                            <Button
-                                x:Name="btnTestShortcut"
-                                Margin="0 0 10 0"
-                                Padding="10 5 10 5"
-                                Click="BtnTestShortcut_OnClick"
-                                Content="{DynamicResource preview}"
-                                DockPanel.Dock="Right" />
+                        <Grid Grid.Row="1" Grid.Column="1">
+                            <Grid.ColumnDefinitions>
+                                <ColumnDefinition Width="*" />
+                                <ColumnDefinition Width="Auto" />
+                            </Grid.ColumnDefinitions>
                             <TextBox
                                 x:Name="tbExpand"
+                                Grid.Column="0"
                                 Margin="10 0 10 0"
                                 HorizontalAlignment="Stretch"
                                 VerticalAlignment="Center"
                                 Text="{Binding Value}" />
-                        </DockPanel>
+                            <Button
+                                x:Name="btnTestShortcut"
+                                Grid.Column="1"
+                                Margin="0 0 10 0"
+                                Padding="10 5 10 5"
+                                Click="BtnTestShortcut_OnClick"
+                                Content="{DynamicResource preview}" />
+                        </Grid>
                     </Grid>
                 </StackPanel>
             </StackPanel>

From 4dd783360389b78e9c046b04a1d77aea023687e7 Mon Sep 17 00:00:00 2001
From: DB P <onesound@oooz.net>
Date: Tue, 17 Jun 2025 16:45:44 +0900
Subject: [PATCH 02/13] UI improvements and file/folder selection feature added
 - Updated "Name" and "Path" keys and added new keys in en.xaml. - Modified
 QuickAccessLinkSettings.xaml: increased Window height and improved layout
 using Grid structure. - Added new UI elements: implemented radio buttons for
 file/folder selection. - Added and initialized QuickAccessLinks property in
 QuickAccessLinkSettings.xaml.cs. - Added file selection dialog in
 SelectPath_OnClick method. - Added IsFileSelected and IsFolderSelected
 properties to implement selection functionality.

---
 .../Languages/en.xaml                         |   7 +-
 .../Views/QuickAccessLinkSettings.xaml        | 135 +++++++++++-------
 .../Views/QuickAccessLinkSettings.xaml.cs     |  42 +++++-
 3 files changed, 126 insertions(+), 58 deletions(-)

diff --git a/Plugins/Flow.Launcher.Plugin.Explorer/Languages/en.xaml b/Plugins/Flow.Launcher.Plugin.Explorer/Languages/en.xaml
index 7d0a553a4..2e0f6a67d 100644
--- a/Plugins/Flow.Launcher.Plugin.Explorer/Languages/en.xaml
+++ b/Plugins/Flow.Launcher.Plugin.Explorer/Languages/en.xaml
@@ -98,8 +98,11 @@
     <system:String x:Key="plugin_explorer_deletefilefolder">Delete</system:String>
     <system:String x:Key="plugin_explorer_deletefile_subtitle">Permanently delete current file</system:String>
     <system:String x:Key="plugin_explorer_deletefolder_subtitle">Permanently delete current folder</system:String>
-    <system:String x:Key="plugin_explorer_path">Path:</system:String>
-    <system:String x:Key="plugin_explorer_name">Name:</system:String>
+    <system:String x:Key="plugin_explorer_name">Name</system:String>
+    <system:String x:Key="plugin_explorer_type">Type</system:String>
+    <system:String x:Key="plugin_explorer_path">Path</system:String>
+    <system:String x:Key="plugin_explorer_file">File</system:String>
+    <system:String x:Key="plugin_explorer_folder">Folder</system:String>
     <system:String x:Key="plugin_explorer_deletefilefolder_subtitle">Delete the selected</system:String>
     <system:String x:Key="plugin_explorer_runasdifferentuser">Run as different user</system:String>
     <system:String x:Key="plugin_explorer_runasdifferentuser_subtitle">Run the selected using a different user account</system:String>
diff --git a/Plugins/Flow.Launcher.Plugin.Explorer/Views/QuickAccessLinkSettings.xaml b/Plugins/Flow.Launcher.Plugin.Explorer/Views/QuickAccessLinkSettings.xaml
index e9ba53618..f35633bc5 100644
--- a/Plugins/Flow.Launcher.Plugin.Explorer/Views/QuickAccessLinkSettings.xaml
+++ b/Plugins/Flow.Launcher.Plugin.Explorer/Views/QuickAccessLinkSettings.xaml
@@ -1,22 +1,23 @@
-<Window x:Class="Flow.Launcher.Plugin.Explorer.Views.QuickAccessLinkSettings"
-        xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-        xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-        xmlns:local="clr-namespace:Flow.Launcher.Plugin.Explorer.Views"
-        xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-        Title="{DynamicResource plugin_explorer_manage_quick_access_links_header}"
-        Width="Auto"
-        Height="255"
-        Background="{DynamicResource PopuBGColor}"
-        DataContext="{Binding RelativeSource={RelativeSource Self}}"
-        Foreground="{DynamicResource PopupTextColor}"
-        ResizeMode="NoResize"
-        SizeToContent="Width"
-        WindowStartupLocation="CenterScreen"
-        mc:Ignorable="d">
-        <WindowChrome.WindowChrome>
-            <WindowChrome CaptionHeight="32" ResizeBorderThickness="{x:Static SystemParameters.WindowResizeBorderThickness}" />
-        </WindowChrome.WindowChrome>
+<Window
+    x:Class="Flow.Launcher.Plugin.Explorer.Views.QuickAccessLinkSettings"
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+    xmlns:local="clr-namespace:Flow.Launcher.Plugin.Explorer.Views"
+    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    Title="{DynamicResource plugin_explorer_manage_quick_access_links_header}"
+    Width="Auto"
+    Height="300"
+    Background="{DynamicResource PopuBGColor}"
+    DataContext="{Binding RelativeSource={RelativeSource Self}}"
+    Foreground="{DynamicResource PopupTextColor}"
+    ResizeMode="NoResize"
+    SizeToContent="Width"
+    WindowStartupLocation="CenterScreen"
+    mc:Ignorable="d">
+    <WindowChrome.WindowChrome>
+        <WindowChrome CaptionHeight="32" ResizeBorderThickness="{x:Static SystemParameters.WindowResizeBorderThickness}" />
+    </WindowChrome.WindowChrome>
     <Grid>
         <Grid.RowDefinitions>
             <RowDefinition />
@@ -58,55 +59,91 @@
             <StackPanel Margin="26 0 26 0">
                 <StackPanel Margin="0 0 0 12">
                     <TextBlock
-                        Margin="0 0 0 0"
                         FontSize="20"
                         FontWeight="SemiBold"
                         Text="{DynamicResource plugin_explorer_manage_quick_access_links_header}"
                         TextAlignment="Left" />
                 </StackPanel>
-                <StackPanel Margin="0 10 0 0" Orientation="Horizontal">
+
+                <Grid>
+                    <Grid.ColumnDefinitions>
+                        <ColumnDefinition Width="Auto" MinWidth="100" />
+                        <ColumnDefinition Width="*" />
+                        <ColumnDefinition Width="Auto" />
+                    </Grid.ColumnDefinitions>
+                    <Grid.RowDefinitions>
+                        <RowDefinition Height="Auto" />
+                        <RowDefinition Height="Auto" />
+                        <RowDefinition Height="Auto" />
+                    </Grid.RowDefinitions>
+
+                    <!--  Name  -->
                     <TextBlock
-                        MinWidth="150"
-                        Margin="0 10 15 10"
-                        HorizontalAlignment="Left"
+                        Grid.Row="0"
+                        Grid.Column="0"
+                        Margin="0 10 0 0"
                         VerticalAlignment="Center"
                         FontSize="14"
                         Text="{DynamicResource plugin_explorer_name}" />
                     <TextBox
-                        Margin="10 0 0 0"
+                        Grid.Row="0"
+                        Grid.Column="1"
+                        Margin="10 10 0 0"
                         VerticalAlignment="Center"
                         FontSize="12"
-                        Width="250"
                         Text="{Binding SelectedName, Mode=TwoWay}" />
-                </StackPanel>
-                
-                <StackPanel Margin="0 10 0 0" Orientation="Horizontal">
+
+                    <!--  Type  -->
                     <TextBlock
-                        MinWidth="150"
-                        Margin="0 10 15 10"
-                        HorizontalAlignment="Left"
+                        Grid.Row="1"
+                        Grid.Column="0"
+                        Margin="0 10 0 0"
+                        VerticalAlignment="Center"
+                        FontSize="14"
+                        Text="{DynamicResource plugin_explorer_type}" />
+                    <StackPanel
+                        Grid.Row="1"
+                        Grid.Column="1"
+                        Orientation="Horizontal">
+                        <RadioButton
+                            Margin="10 10 0 0"
+                            Content="{DynamicResource plugin_explorer_file}"
+                            GroupName="PathType"
+                            IsChecked="{Binding IsFileSelected}" />
+                        <RadioButton
+                            Margin="10 10 0 0"
+                            Content="{DynamicResource plugin_explorer_folder}"
+                            GroupName="PathType"
+                            IsChecked="{Binding IsFolderSelected}" />
+                    </StackPanel>
+                    <!--  Path  -->
+                    <TextBlock
+                        Grid.Row="2"
+                        Grid.Column="0"
+                        Margin="0 10 0 0"
                         VerticalAlignment="Center"
                         FontSize="14"
                         Text="{DynamicResource plugin_explorer_path}" />
-
-
                     <TextBox
-                        Margin="10 0 0 0"
+                        Grid.Row="2"
+                        Grid.Column="1"
+                        Width="250"
+                        Margin="10 10 0 0"
                         VerticalAlignment="Center"
                         FontSize="12"
-                        Width="250"
-                        Text="{Binding SelectedPath, Mode=TwoWay}"
-                        IsReadOnly="True" />
+                        IsReadOnly="True"
+                        Text="{Binding SelectedPath, Mode=TwoWay}" />
                     <Button
-                        Width="80"
+                        Grid.Row="2"
+                        Grid.Column="2"
                         Height="Auto"
-                        Margin="10 0 0 0"
+                        MinWidth="80"
+                        Margin="10 10 0 0"
                         HorizontalAlignment="Left"
                         VerticalAlignment="Center"
-                        Content="{DynamicResource select}"
-                        Click="SelectPath_OnClick" />
-                </StackPanel>
-
+                        Click="SelectPath_OnClick"
+                        Content="{DynamicResource select}" />
+                </Grid>
             </StackPanel>
         </StackPanel>
         <Border
@@ -118,15 +155,15 @@
                 <Button
                     x:Name="btnCancel"
                     Width="145"
-                    Height="30"
-                    Margin="0 0 5 0"
+                    Height="38"
+                    Margin="0 0 5 1"
                     Click="BtnCancel_OnClick"
                     Content="{DynamicResource cancel}" />
                 <Button
                     Name="DownButton"
                     Width="145"
-                    Height="30"
-                    Margin="5 0 0 0"
+                    Height="38"
+                    Margin="5 0 0 1"
                     Click="OnDoneButtonClick"
                     Style="{StaticResource AccentButtonStyle}">
                     <TextBlock x:Name="lblAdd" Text="{DynamicResource done}" />
@@ -134,4 +171,4 @@
             </StackPanel>
         </Border>
     </Grid>
-</Window>
+</Window>
\ No newline at end of file
diff --git a/Plugins/Flow.Launcher.Plugin.Explorer/Views/QuickAccessLinkSettings.xaml.cs b/Plugins/Flow.Launcher.Plugin.Explorer/Views/QuickAccessLinkSettings.xaml.cs
index 36a00e9e5..1e52ea81e 100644
--- a/Plugins/Flow.Launcher.Plugin.Explorer/Views/QuickAccessLinkSettings.xaml.cs
+++ b/Plugins/Flow.Launcher.Plugin.Explorer/Views/QuickAccessLinkSettings.xaml.cs
@@ -49,9 +49,9 @@ public partial class QuickAccessLinkSettings : INotifyPropertyChanged
 
     private bool IsEdit { get; }
     private AccessLink SelectedAccessLink { get; }
-    
+
     public ObservableCollection<AccessLink> QuickAccessLinks { get; }
-    
+
     public QuickAccessLinkSettings(ObservableCollection<AccessLink> quickAccessLinks)
     {
         IsEdit = false;
@@ -96,7 +96,7 @@ public partial class QuickAccessLinkSettings : INotifyPropertyChanged
         }
 
         // If editing, update the existing link
-        if (IsEdit) 
+        if (IsEdit)
         {
             if (SelectedAccessLink == null) return;
 
@@ -130,12 +130,30 @@ public partial class QuickAccessLinkSettings : INotifyPropertyChanged
 
     private void SelectPath_OnClick(object commandParameter, RoutedEventArgs e)
     {
-        var folderBrowserDialog = new FolderBrowserDialog();
+        // Open file or folder selection dialog based on the selected radio button
+        if (IsFileSelected)
+        {
+            var openFileDialog = new Microsoft.Win32.OpenFileDialog
+            {
+                Multiselect = false,
+                CheckFileExists = true,
+                CheckPathExists = true
+            };
 
-        if (folderBrowserDialog.ShowDialog() != System.Windows.Forms.DialogResult.OK)
-            return;
+            if (openFileDialog.ShowDialog() == true)
+            {
+                SelectedPath = openFileDialog.FileName;
+            }
+        }
+        else // Folder selection
+        {
+            var folderBrowserDialog = new FolderBrowserDialog();
 
-        SelectedPath = folderBrowserDialog.SelectedPath;
+            if (folderBrowserDialog.ShowDialog() == System.Windows.Forms.DialogResult.OK)
+            {
+                SelectedPath = folderBrowserDialog.SelectedPath;
+            }
+        }
     }
 
     public event PropertyChangedEventHandler PropertyChanged;
@@ -144,4 +162,14 @@ public partial class QuickAccessLinkSettings : INotifyPropertyChanged
     {
         PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(propertyName));
     }
+
+    public bool IsFileSelected { get; set; }
+    public bool IsFolderSelected { get; set; }
+    
+    public QuickAccessLinkSettings()
+    {
+        IsFolderSelected = true; // Default to folder selection
+        InitializeComponent();
+        DataContext = this;
+    }
 }

From 52da1c97d998e5901e3699bc11a40d753da2de5f Mon Sep 17 00:00:00 2001
From: DB P <onesound@oooz.net>
Date: Tue, 17 Jun 2025 16:50:42 +0900
Subject: [PATCH 03/13] Adjust Button Size

---
 .../Views/QuickAccessLinkSettings.xaml                        | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Plugins/Flow.Launcher.Plugin.Explorer/Views/QuickAccessLinkSettings.xaml b/Plugins/Flow.Launcher.Plugin.Explorer/Views/QuickAccessLinkSettings.xaml
index f35633bc5..e977a72c2 100644
--- a/Plugins/Flow.Launcher.Plugin.Explorer/Views/QuickAccessLinkSettings.xaml
+++ b/Plugins/Flow.Launcher.Plugin.Explorer/Views/QuickAccessLinkSettings.xaml
@@ -155,14 +155,14 @@
                 <Button
                     x:Name="btnCancel"
                     Width="145"
-                    Height="38"
+                    Height="34"
                     Margin="0 0 5 1"
                     Click="BtnCancel_OnClick"
                     Content="{DynamicResource cancel}" />
                 <Button
                     Name="DownButton"
                     Width="145"
-                    Height="38"
+                    Height="34"
                     Margin="5 0 0 1"
                     Click="OnDoneButtonClick"
                     Style="{StaticResource AccentButtonStyle}">

From 42dc582ec1fd5bc06aedf75030ec34e0227cd315 Mon Sep 17 00:00:00 2001
From: DB P <onesound@oooz.net>
Date: Tue, 17 Jun 2025 17:07:02 +0900
Subject: [PATCH 04/13] Change default value to file

---
 .../Views/QuickAccessLinkSettings.xaml.cs                   | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/Plugins/Flow.Launcher.Plugin.Explorer/Views/QuickAccessLinkSettings.xaml.cs b/Plugins/Flow.Launcher.Plugin.Explorer/Views/QuickAccessLinkSettings.xaml.cs
index 1e52ea81e..1cfc3b6c0 100644
--- a/Plugins/Flow.Launcher.Plugin.Explorer/Views/QuickAccessLinkSettings.xaml.cs
+++ b/Plugins/Flow.Launcher.Plugin.Explorer/Views/QuickAccessLinkSettings.xaml.cs
@@ -163,13 +163,11 @@ public partial class QuickAccessLinkSettings : INotifyPropertyChanged
         PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(propertyName));
     }
 
-    public bool IsFileSelected { get; set; }
-    public bool IsFolderSelected { get; set; }
+    public bool IsFileSelected { get; set; } = true; // Default to File
+    public bool IsFolderSelected { get; set; }  
     
     public QuickAccessLinkSettings()
     {
-        IsFolderSelected = true; // Default to folder selection
         InitializeComponent();
-        DataContext = this;
     }
 }

From 12b51eb2392fae9f251476dbd29a69df9291abd8 Mon Sep 17 00:00:00 2001
From: Jack251970 <1160210343@qq.com>
Date: Tue, 17 Jun 2025 16:31:11 +0800
Subject: [PATCH 05/13] Code quality

---
 .../Views/QuickAccessLinkSettings.xaml.cs             | 11 +++--------
 1 file changed, 3 insertions(+), 8 deletions(-)

diff --git a/Plugins/Flow.Launcher.Plugin.Explorer/Views/QuickAccessLinkSettings.xaml.cs b/Plugins/Flow.Launcher.Plugin.Explorer/Views/QuickAccessLinkSettings.xaml.cs
index 1cfc3b6c0..7cc46434f 100644
--- a/Plugins/Flow.Launcher.Plugin.Explorer/Views/QuickAccessLinkSettings.xaml.cs
+++ b/Plugins/Flow.Launcher.Plugin.Explorer/Views/QuickAccessLinkSettings.xaml.cs
@@ -47,6 +47,9 @@ public partial class QuickAccessLinkSettings : INotifyPropertyChanged
         }
     }
 
+    public bool IsFileSelected { get; set; } = true; // Default to File
+    public bool IsFolderSelected { get; set; }
+
     private bool IsEdit { get; }
     private AccessLink SelectedAccessLink { get; }
 
@@ -162,12 +165,4 @@ public partial class QuickAccessLinkSettings : INotifyPropertyChanged
     {
         PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(propertyName));
     }
-
-    public bool IsFileSelected { get; set; } = true; // Default to File
-    public bool IsFolderSelected { get; set; }  
-    
-    public QuickAccessLinkSettings()
-    {
-        InitializeComponent();
-    }
 }

From 76972d38496e95d32f4f7aeea3bb35bf1bba6993 Mon Sep 17 00:00:00 2001
From: Jack251970 <1160210343@qq.com>
Date: Tue, 17 Jun 2025 16:31:25 +0800
Subject: [PATCH 06/13] Use form dialog

---
 .../Views/QuickAccessLinkSettings.xaml.cs                       | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Plugins/Flow.Launcher.Plugin.Explorer/Views/QuickAccessLinkSettings.xaml.cs b/Plugins/Flow.Launcher.Plugin.Explorer/Views/QuickAccessLinkSettings.xaml.cs
index 7cc46434f..445c128e2 100644
--- a/Plugins/Flow.Launcher.Plugin.Explorer/Views/QuickAccessLinkSettings.xaml.cs
+++ b/Plugins/Flow.Launcher.Plugin.Explorer/Views/QuickAccessLinkSettings.xaml.cs
@@ -136,7 +136,7 @@ public partial class QuickAccessLinkSettings : INotifyPropertyChanged
         // Open file or folder selection dialog based on the selected radio button
         if (IsFileSelected)
         {
-            var openFileDialog = new Microsoft.Win32.OpenFileDialog
+            var openFileDialog = new OpenFileDialog
             {
                 Multiselect = false,
                 CheckFileExists = true,

From 1c652320e6d1186fdd5dbe186bcac0bf731bb33a Mon Sep 17 00:00:00 2001
From: Jack251970 <1160210343@qq.com>
Date: Tue, 17 Jun 2025 16:32:18 +0800
Subject: [PATCH 07/13] Get access link type

---
 .../Views/QuickAccessLinkSettings.xaml.cs     | 54 +++++++++++++++----
 1 file changed, 45 insertions(+), 9 deletions(-)

diff --git a/Plugins/Flow.Launcher.Plugin.Explorer/Views/QuickAccessLinkSettings.xaml.cs b/Plugins/Flow.Launcher.Plugin.Explorer/Views/QuickAccessLinkSettings.xaml.cs
index 445c128e2..c520c2a39 100644
--- a/Plugins/Flow.Launcher.Plugin.Explorer/Views/QuickAccessLinkSettings.xaml.cs
+++ b/Plugins/Flow.Launcher.Plugin.Explorer/Views/QuickAccessLinkSettings.xaml.cs
@@ -6,12 +6,15 @@ using System.Runtime.CompilerServices;
 using System.Windows;
 using System.Windows.Forms;
 using Flow.Launcher.Plugin.Explorer.Helper;
+using Flow.Launcher.Plugin.Explorer.Search;
 using Flow.Launcher.Plugin.Explorer.Search.QuickAccessLinks;
 
 namespace Flow.Launcher.Plugin.Explorer.Views;
 
 public partial class QuickAccessLinkSettings : INotifyPropertyChanged
 {
+    private ResultType _accessLinkType = ResultType.Folder;
+
     private string _selectedPath;
     public string SelectedPath
     {
@@ -25,6 +28,7 @@ public partial class QuickAccessLinkSettings : INotifyPropertyChanged
                 if (string.IsNullOrEmpty(_selectedName))
                 {
                     SelectedName = _selectedPath.GetPathName();
+                    _accessLinkType = GetResultType(_selectedPath);
                 }
             }
         }
@@ -67,6 +71,7 @@ public partial class QuickAccessLinkSettings : INotifyPropertyChanged
         IsEdit = true;
         _selectedName = selectedAccessLink.Name;
         _selectedPath = selectedAccessLink.Path;
+        _accessLinkType = GetResultType(_selectedPath);
         SelectedAccessLink = selectedAccessLink;
         QuickAccessLinks = quickAccessLinks;
         InitializeComponent();
@@ -109,7 +114,7 @@ public partial class QuickAccessLinkSettings : INotifyPropertyChanged
                 var updatedLink = new AccessLink
                 {
                     Name = SelectedName,
-                    Type = SelectedAccessLink.Type,
+                    Type = _accessLinkType,
                     Path = SelectedPath
                 };
                 QuickAccessLinks[index] = updatedLink;
@@ -123,6 +128,7 @@ public partial class QuickAccessLinkSettings : INotifyPropertyChanged
             var newAccessLink = new AccessLink
             {
                 Name = SelectedName,
+                Type = _accessLinkType,
                 Path = SelectedPath
             };
             QuickAccessLinks.Add(newAccessLink);
@@ -143,19 +149,49 @@ public partial class QuickAccessLinkSettings : INotifyPropertyChanged
                 CheckPathExists = true
             };
 
-            if (openFileDialog.ShowDialog() == true)
-            {
-                SelectedPath = openFileDialog.FileName;
-            }
+            if (openFileDialog.ShowDialog() != System.Windows.Forms.DialogResult.OK ||
+                string.IsNullOrEmpty(openFileDialog.FileName))
+                return;
+
+            SelectedPath = openFileDialog.FileName;
         }
         else // Folder selection
         {
-            var folderBrowserDialog = new FolderBrowserDialog();
-
-            if (folderBrowserDialog.ShowDialog() == System.Windows.Forms.DialogResult.OK)
+            var folderBrowserDialog = new FolderBrowserDialog
             {
-                SelectedPath = folderBrowserDialog.SelectedPath;
+                ShowNewFolderButton = true
+            };
+
+            if (folderBrowserDialog.ShowDialog() != System.Windows.Forms.DialogResult.OK ||
+                string.IsNullOrEmpty(folderBrowserDialog.SelectedPath))
+                return;
+
+            SelectedPath = folderBrowserDialog.SelectedPath;
+        }
+    }
+
+    private static ResultType GetResultType(string path)
+    {
+        // Check if the path is a file or folder
+        if (System.IO.File.Exists(path))
+        {
+            return ResultType.File;
+        }
+        else if (System.IO.Directory.Exists(path))
+        {
+            if (string.Equals(System.IO.Path.GetPathRoot(path), path, StringComparison.OrdinalIgnoreCase))
+            {
+                return ResultType.Volume;
             }
+            else
+            {
+                return ResultType.Folder;
+            }
+        }
+        else
+        {
+            // This should not happen, but just in case, we assume it's a folder
+            return ResultType.Folder;
         }
     }
 

From af92bda06dbcd34bebfdf70e8f63d60e355b64b2 Mon Sep 17 00:00:00 2001
From: Jack251970 <1160210343@qq.com>
Date: Tue, 17 Jun 2025 16:33:25 +0800
Subject: [PATCH 08/13] Initialize default access link type

---
 .../Views/QuickAccessLinkSettings.xaml.cs                     | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/Plugins/Flow.Launcher.Plugin.Explorer/Views/QuickAccessLinkSettings.xaml.cs b/Plugins/Flow.Launcher.Plugin.Explorer/Views/QuickAccessLinkSettings.xaml.cs
index c520c2a39..798d26b42 100644
--- a/Plugins/Flow.Launcher.Plugin.Explorer/Views/QuickAccessLinkSettings.xaml.cs
+++ b/Plugins/Flow.Launcher.Plugin.Explorer/Views/QuickAccessLinkSettings.xaml.cs
@@ -71,7 +71,9 @@ public partial class QuickAccessLinkSettings : INotifyPropertyChanged
         IsEdit = true;
         _selectedName = selectedAccessLink.Name;
         _selectedPath = selectedAccessLink.Path;
-        _accessLinkType = GetResultType(_selectedPath);
+        _accessLinkType = GetResultType(_selectedPath); // Initialize link type
+        IsFileSelected = selectedAccessLink.Type == ResultType.File; // Initialize default selection
+        IsFolderSelected = !IsFileSelected;
         SelectedAccessLink = selectedAccessLink;
         QuickAccessLinks = quickAccessLinks;
         InitializeComponent();

From b28bb38f52b0714c603c85ee48de4250b45ce4ce Mon Sep 17 00:00:00 2001
From: Jack251970 <1160210343@qq.com>
Date: Tue, 17 Jun 2025 16:34:43 +0800
Subject: [PATCH 09/13] Add new link if selected link is null

---
 .../Views/QuickAccessLinkSettings.xaml.cs     | 35 ++++++++++++-------
 1 file changed, 23 insertions(+), 12 deletions(-)

diff --git a/Plugins/Flow.Launcher.Plugin.Explorer/Views/QuickAccessLinkSettings.xaml.cs b/Plugins/Flow.Launcher.Plugin.Explorer/Views/QuickAccessLinkSettings.xaml.cs
index 798d26b42..a94aa6b02 100644
--- a/Plugins/Flow.Launcher.Plugin.Explorer/Views/QuickAccessLinkSettings.xaml.cs
+++ b/Plugins/Flow.Launcher.Plugin.Explorer/Views/QuickAccessLinkSettings.xaml.cs
@@ -108,24 +108,35 @@ public partial class QuickAccessLinkSettings : INotifyPropertyChanged
         // If editing, update the existing link
         if (IsEdit)
         {
-            if (SelectedAccessLink == null) return;
-
-            var index = QuickAccessLinks.IndexOf(SelectedAccessLink);
-            if (index >= 0)
+            if (SelectedAccessLink != null)
             {
-                var updatedLink = new AccessLink
+                var index = QuickAccessLinks.IndexOf(SelectedAccessLink);
+                if (index >= 0)
                 {
-                    Name = SelectedName,
-                    Type = _accessLinkType,
-                    Path = SelectedPath
-                };
-                QuickAccessLinks[index] = updatedLink;
+                    var updatedLink = new AccessLink
+                    {
+                        Name = SelectedName,
+                        Type = _accessLinkType,
+                        Path = SelectedPath
+                    };
+                    QuickAccessLinks[index] = updatedLink;
+                }
+                DialogResult = true;
+                Close();
+            }
+            // Add a new one if the selected access link is null (should not happen in edit mode, but just in case)
+            else
+            {
+                AddNewAccessLink();
             }
-            DialogResult = true;
-            Close();
         }
         // Otherwise, add a new one
         else
+        {
+            AddNewAccessLink();
+        }
+
+        void AddNewAccessLink()
         {
             var newAccessLink = new AccessLink
             {

From 054ee4cdbe779bca503732f8694867ac855aaa07 Mon Sep 17 00:00:00 2001
From: Jack251970 <1160210343@qq.com>
Date: Tue, 17 Jun 2025 16:37:17 +0800
Subject: [PATCH 10/13] Default to folder

---
 .../Views/QuickAccessLinkSettings.xaml.cs                 | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/Plugins/Flow.Launcher.Plugin.Explorer/Views/QuickAccessLinkSettings.xaml.cs b/Plugins/Flow.Launcher.Plugin.Explorer/Views/QuickAccessLinkSettings.xaml.cs
index a94aa6b02..7b4d92bf5 100644
--- a/Plugins/Flow.Launcher.Plugin.Explorer/Views/QuickAccessLinkSettings.xaml.cs
+++ b/Plugins/Flow.Launcher.Plugin.Explorer/Views/QuickAccessLinkSettings.xaml.cs
@@ -13,8 +13,6 @@ namespace Flow.Launcher.Plugin.Explorer.Views;
 
 public partial class QuickAccessLinkSettings : INotifyPropertyChanged
 {
-    private ResultType _accessLinkType = ResultType.Folder;
-
     private string _selectedPath;
     public string SelectedPath
     {
@@ -51,14 +49,16 @@ public partial class QuickAccessLinkSettings : INotifyPropertyChanged
         }
     }
 
-    public bool IsFileSelected { get; set; } = true; // Default to File
-    public bool IsFolderSelected { get; set; }
+    public bool IsFileSelected { get; set; }
+    public bool IsFolderSelected { get; set; } = true; // Default to Folder
 
     private bool IsEdit { get; }
     private AccessLink SelectedAccessLink { get; }
 
     public ObservableCollection<AccessLink> QuickAccessLinks { get; }
 
+    private ResultType _accessLinkType = ResultType.Folder; // Default to Folder
+
     public QuickAccessLinkSettings(ObservableCollection<AccessLink> quickAccessLinks)
     {
         IsEdit = false;

From b18d0a8bdbcff45ec470528f83f30e1656964772 Mon Sep 17 00:00:00 2001
From: Jack251970 <1160210343@qq.com>
Date: Tue, 17 Jun 2025 16:55:23 +0800
Subject: [PATCH 11/13] Improve code quality

---
 .../ViewModels/ActionKeywordModel.cs          | 19 +++--------
 .../Views/ActionKeywordSetting.xaml.cs        | 32 ++++---------------
 .../Views/ExplorerSettings.xaml               |  3 +-
 .../Views/PreviewPanel.xaml.cs                | 12 ++-----
 .../Views/QuickAccessLinkSettings.xaml.cs     | 12 ++-----
 5 files changed, 18 insertions(+), 60 deletions(-)

diff --git a/Plugins/Flow.Launcher.Plugin.Explorer/ViewModels/ActionKeywordModel.cs b/Plugins/Flow.Launcher.Plugin.Explorer/ViewModels/ActionKeywordModel.cs
index 745032d2c..2c4c4e54f 100644
--- a/Plugins/Flow.Launcher.Plugin.Explorer/ViewModels/ActionKeywordModel.cs
+++ b/Plugins/Flow.Launcher.Plugin.Explorer/ViewModels/ActionKeywordModel.cs
@@ -1,16 +1,11 @@
-using System.ComponentModel;
-using System.Runtime.CompilerServices;
+#nullable enable
 
-#nullable enable
-
-namespace Flow.Launcher.Plugin.Explorer.Views
+namespace Flow.Launcher.Plugin.Explorer.ViewModels
 {
-    public class ActionKeywordModel : INotifyPropertyChanged
+    public partial class ActionKeywordModel : BaseModel
     {
         private static Settings _settings = null!;
 
-        public event PropertyChangedEventHandler? PropertyChanged;
-
         public static void Init(Settings settings)
         {
             _settings = settings;
@@ -28,13 +23,7 @@ namespace Flow.Launcher.Plugin.Explorer.Views
 
         internal Settings.ActionKeyword KeywordProperty { get; }
 
-        private void OnPropertyChanged([CallerMemberName] string propertyName = "")
-        {
-            PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(propertyName));
-        }
-
         private string? keyword;
-
         public string Keyword
         {
             get => keyword ??= _settings.GetActionKeyword(KeywordProperty);
@@ -45,8 +34,8 @@ namespace Flow.Launcher.Plugin.Explorer.Views
                 OnPropertyChanged();
             }
         }
-        private bool? enabled;
 
+        private bool? enabled;
         public bool Enabled
         {
             get => enabled ??= _settings.GetActionKeywordEnabled(KeywordProperty);
diff --git a/Plugins/Flow.Launcher.Plugin.Explorer/Views/ActionKeywordSetting.xaml.cs b/Plugins/Flow.Launcher.Plugin.Explorer/Views/ActionKeywordSetting.xaml.cs
index 10ce28fe4..829a2feed 100644
--- a/Plugins/Flow.Launcher.Plugin.Explorer/Views/ActionKeywordSetting.xaml.cs
+++ b/Plugins/Flow.Launcher.Plugin.Explorer/Views/ActionKeywordSetting.xaml.cs
@@ -1,16 +1,13 @@
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Linq;
-using System.Runtime.CompilerServices;
+using System.Linq;
 using System.Windows;
 using System.Windows.Input;
+using CommunityToolkit.Mvvm.ComponentModel;
+using Flow.Launcher.Plugin.Explorer.ViewModels;
 
 namespace Flow.Launcher.Plugin.Explorer.Views
 {
-    /// <summary>
-    /// Interaction logic for ActionKeywordSetting.xaml
-    /// </summary>
-    public partial class ActionKeywordSetting : INotifyPropertyChanged
+    [INotifyPropertyChanged]
+    public partial class ActionKeywordSetting
     {
         private ActionKeywordModel CurrentActionKeyword { get; }
 
@@ -21,14 +18,14 @@ namespace Flow.Launcher.Plugin.Explorer.Views
             {
                 // Set Enable to be true if user change ActionKeyword
                 KeywordEnabled = true;
-                _ = SetField(ref actionKeyword, value);
+                _ = SetProperty(ref actionKeyword, value);
             }
         }
 
         public bool KeywordEnabled
         {
             get => _keywordEnabled;
-            set => SetField(ref _keywordEnabled, value);
+            set => _ = SetProperty(ref _keywordEnabled, value);
         }
 
         private string actionKeyword;
@@ -116,20 +113,5 @@ namespace Flow.Launcher.Plugin.Explorer.Views
                 e.CancelCommand();
             }
         }
-        
-        public event PropertyChangedEventHandler PropertyChanged;
-        protected virtual void OnPropertyChanged([CallerMemberName] string propertyName = null)
-        {
-            PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(propertyName));
-        }
-        
-        private bool SetField<T>(ref T field, T value, [CallerMemberName] string propertyName = null)
-        {
-            if (EqualityComparer<T>.Default.Equals(field, value))
-                return false;
-            field = value;
-            OnPropertyChanged(propertyName);
-            return true;
-        }
     }
 }
diff --git a/Plugins/Flow.Launcher.Plugin.Explorer/Views/ExplorerSettings.xaml b/Plugins/Flow.Launcher.Plugin.Explorer/Views/ExplorerSettings.xaml
index 8f4b4d862..59373b4de 100644
--- a/Plugins/Flow.Launcher.Plugin.Explorer/Views/ExplorerSettings.xaml
+++ b/Plugins/Flow.Launcher.Plugin.Explorer/Views/ExplorerSettings.xaml
@@ -8,7 +8,6 @@
     xmlns:qa="clr-namespace:Flow.Launcher.Plugin.Explorer.Search.QuickAccessLinks"
     xmlns:ui="http://schemas.modernwpf.com/2019"
     xmlns:viewModels="clr-namespace:Flow.Launcher.Plugin.Explorer.ViewModels"
-    xmlns:views="clr-namespace:Flow.Launcher.Plugin.Explorer.Views"
     d:DataContext="{d:DesignInstance viewModels:SettingsViewModel}"
     d:DesignHeight="450"
     d:DesignWidth="800"
@@ -18,7 +17,7 @@
         <DataTemplate x:Key="ListViewTemplateAccessLinks" DataType="qa:AccessLink">
             <TextBlock Margin="0 5 0 5" Text="{Binding Path, Mode=OneTime}" />
         </DataTemplate>
-        <DataTemplate x:Key="ListViewActionKeywords" DataType="{x:Type views:ActionKeywordModel}">
+        <DataTemplate x:Key="ListViewActionKeywords" DataType="{x:Type viewModels:ActionKeywordModel}">
             <Grid>
                 <TextBlock
                     Margin="0 5 0 0"
diff --git a/Plugins/Flow.Launcher.Plugin.Explorer/Views/PreviewPanel.xaml.cs b/Plugins/Flow.Launcher.Plugin.Explorer/Views/PreviewPanel.xaml.cs
index 5714b0d0f..6e3cf8466 100644
--- a/Plugins/Flow.Launcher.Plugin.Explorer/Views/PreviewPanel.xaml.cs
+++ b/Plugins/Flow.Launcher.Plugin.Explorer/Views/PreviewPanel.xaml.cs
@@ -3,7 +3,6 @@ using System.ComponentModel;
 using System.Globalization;
 using System.IO;
 using System.Linq;
-using System.Runtime.CompilerServices;
 using System.Threading;
 using System.Threading.Tasks;
 using System.Windows;
@@ -11,12 +10,14 @@ using System.Windows.Controls;
 using System.Windows.Media;
 using System.Windows.Media.Imaging;
 using Flow.Launcher.Plugin.Explorer.Search;
+using CommunityToolkit.Mvvm.ComponentModel;
 
 namespace Flow.Launcher.Plugin.Explorer.Views;
 
 #nullable enable
 
-public partial class PreviewPanel : UserControl, INotifyPropertyChanged
+[INotifyPropertyChanged]
+public partial class PreviewPanel : UserControl
 {
     private static readonly string ClassName = nameof(PreviewPanel);
 
@@ -327,11 +328,4 @@ public partial class PreviewPanel : UserControl, INotifyPropertyChanged
         return yearsDiff == 1 ? Main.Context.API.GetTranslation("OneYearAgo") :
             string.Format(Main.Context.API.GetTranslation("YearsAgo"), yearsDiff);
     }
-
-    public event PropertyChangedEventHandler? PropertyChanged;
-
-    protected virtual void OnPropertyChanged([CallerMemberName] string? propertyName = null)
-    {
-        PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(propertyName));
-    }
 }
diff --git a/Plugins/Flow.Launcher.Plugin.Explorer/Views/QuickAccessLinkSettings.xaml.cs b/Plugins/Flow.Launcher.Plugin.Explorer/Views/QuickAccessLinkSettings.xaml.cs
index 7b4d92bf5..eb66e1efc 100644
--- a/Plugins/Flow.Launcher.Plugin.Explorer/Views/QuickAccessLinkSettings.xaml.cs
+++ b/Plugins/Flow.Launcher.Plugin.Explorer/Views/QuickAccessLinkSettings.xaml.cs
@@ -2,16 +2,17 @@
 using System.Collections.ObjectModel;
 using System.ComponentModel;
 using System.Linq;
-using System.Runtime.CompilerServices;
 using System.Windows;
 using System.Windows.Forms;
 using Flow.Launcher.Plugin.Explorer.Helper;
 using Flow.Launcher.Plugin.Explorer.Search;
 using Flow.Launcher.Plugin.Explorer.Search.QuickAccessLinks;
+using CommunityToolkit.Mvvm.ComponentModel;
 
 namespace Flow.Launcher.Plugin.Explorer.Views;
 
-public partial class QuickAccessLinkSettings : INotifyPropertyChanged
+[INotifyPropertyChanged]
+public partial class QuickAccessLinkSettings
 {
     private string _selectedPath;
     public string SelectedPath
@@ -207,11 +208,4 @@ public partial class QuickAccessLinkSettings : INotifyPropertyChanged
             return ResultType.Folder;
         }
     }
-
-    public event PropertyChangedEventHandler PropertyChanged;
-
-    protected virtual void OnPropertyChanged([CallerMemberName] string propertyName = null)
-    {
-        PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(propertyName));
-    }
 }

From 548435b4fde5c7843367803c549472393a7bdf5f Mon Sep 17 00:00:00 2001
From: Jack251970 <1160210343@qq.com>
Date: Tue, 17 Jun 2025 16:58:48 +0800
Subject: [PATCH 12/13] Improve code quality

---
 ...low.Launcher.Plugin.BrowserBookmark.csproj | 35 ++-----------------
 .../Views/SettingsControl.xaml.cs             | 11 +++---
 2 files changed, 8 insertions(+), 38 deletions(-)

diff --git a/Plugins/Flow.Launcher.Plugin.BrowserBookmark/Flow.Launcher.Plugin.BrowserBookmark.csproj b/Plugins/Flow.Launcher.Plugin.BrowserBookmark/Flow.Launcher.Plugin.BrowserBookmark.csproj
index 49ae26564..1211cdf18 100644
--- a/Plugins/Flow.Launcher.Plugin.BrowserBookmark/Flow.Launcher.Plugin.BrowserBookmark.csproj
+++ b/Plugins/Flow.Launcher.Plugin.BrowserBookmark/Flow.Launcher.Plugin.BrowserBookmark.csproj
@@ -37,41 +37,11 @@
   </PropertyGroup>
 
   <Target Name="RemoveUnnecessaryRuntimesAfterBuild" AfterTargets="Build">
-    <RemoveDir Directories="$(OutputPath)runtimes\browser-wasm;
-                            $(OutputPath)runtimes\linux-arm;
-                            $(OutputPath)runtimes\linux-arm64;
-                            $(OutputPath)runtimes\linux-armel;
-                            $(OutputPath)runtimes\linux-mips64;
-                            $(OutputPath)runtimes\linux-musl-arm;
-                            $(OutputPath)runtimes\linux-musl-arm64;
-                            $(OutputPath)runtimes\linux-musl-x64;
-                            $(OutputPath)runtimes\linux-ppc64le;
-                            $(OutputPath)runtimes\linux-s390x;
-                            $(OutputPath)runtimes\linux-x64;
-                            $(OutputPath)runtimes\linux-x86;
-                            $(OutputPath)runtimes\maccatalyst-arm64;
-                            $(OutputPath)runtimes\maccatalyst-x64;
-                            $(OutputPath)runtimes\osx-arm64;
-                            $(OutputPath)runtimes\osx-x64"/>
+    <RemoveDir Directories="$(OutputPath)runtimes\browser-wasm;&#xD;&#xA;                            $(OutputPath)runtimes\linux-arm;&#xD;&#xA;                            $(OutputPath)runtimes\linux-arm64;&#xD;&#xA;                            $(OutputPath)runtimes\linux-armel;&#xD;&#xA;                            $(OutputPath)runtimes\linux-mips64;&#xD;&#xA;                            $(OutputPath)runtimes\linux-musl-arm;&#xD;&#xA;                            $(OutputPath)runtimes\linux-musl-arm64;&#xD;&#xA;                            $(OutputPath)runtimes\linux-musl-x64;&#xD;&#xA;                            $(OutputPath)runtimes\linux-ppc64le;&#xD;&#xA;                            $(OutputPath)runtimes\linux-s390x;&#xD;&#xA;                            $(OutputPath)runtimes\linux-x64;&#xD;&#xA;                            $(OutputPath)runtimes\linux-x86;&#xD;&#xA;                            $(OutputPath)runtimes\maccatalyst-arm64;&#xD;&#xA;                            $(OutputPath)runtimes\maccatalyst-x64;&#xD;&#xA;                            $(OutputPath)runtimes\osx-arm64;&#xD;&#xA;                            $(OutputPath)runtimes\osx-x64" />
   </Target>
 
   <Target Name="RemoveUnnecessaryRuntimesAfterPublish" AfterTargets="Publish">
-    <RemoveDir Directories="$(PublishDir)runtimes\browser-wasm;
-                            $(PublishDir)runtimes\linux-arm;
-                            $(PublishDir)runtimes\linux-arm64;
-                            $(PublishDir)runtimes\linux-armel;
-                            $(PublishDir)runtimes\linux-mips64;
-                            $(PublishDir)runtimes\linux-musl-arm;
-                            $(PublishDir)runtimes\linux-musl-arm64;
-                            $(PublishDir)runtimes\linux-musl-x64;
-                            $(PublishDir)runtimes\linux-ppc64le;
-                            $(PublishDir)runtimes\linux-s390x;
-                            $(PublishDir)runtimes\linux-x64;
-                            $(PublishDir)runtimes\linux-x86;
-                            $(PublishDir)runtimes\maccatalyst-arm64;
-                            $(PublishDir)runtimes\maccatalyst-x64;
-                            $(PublishDir)runtimes\osx-arm64;
-                            $(PublishDir)runtimes\osx-x64"/>
+    <RemoveDir Directories="$(PublishDir)runtimes\browser-wasm;&#xD;&#xA;                            $(PublishDir)runtimes\linux-arm;&#xD;&#xA;                            $(PublishDir)runtimes\linux-arm64;&#xD;&#xA;                            $(PublishDir)runtimes\linux-armel;&#xD;&#xA;                            $(PublishDir)runtimes\linux-mips64;&#xD;&#xA;                            $(PublishDir)runtimes\linux-musl-arm;&#xD;&#xA;                            $(PublishDir)runtimes\linux-musl-arm64;&#xD;&#xA;                            $(PublishDir)runtimes\linux-musl-x64;&#xD;&#xA;                            $(PublishDir)runtimes\linux-ppc64le;&#xD;&#xA;                            $(PublishDir)runtimes\linux-s390x;&#xD;&#xA;                            $(PublishDir)runtimes\linux-x64;&#xD;&#xA;                            $(PublishDir)runtimes\linux-x86;&#xD;&#xA;                            $(PublishDir)runtimes\maccatalyst-arm64;&#xD;&#xA;                            $(PublishDir)runtimes\maccatalyst-x64;&#xD;&#xA;                            $(PublishDir)runtimes\osx-arm64;&#xD;&#xA;                            $(PublishDir)runtimes\osx-x64" />
   </Target>
 
   <ItemGroup>
@@ -95,6 +65,7 @@
   </ItemGroup>
 
   <ItemGroup>
+    <PackageReference Include="CommunityToolkit.Mvvm" Version="8.4.0" />
     <PackageReference Include="Microsoft.Data.Sqlite" Version="9.0.3" />
   </ItemGroup>
 
diff --git a/Plugins/Flow.Launcher.Plugin.BrowserBookmark/Views/SettingsControl.xaml.cs b/Plugins/Flow.Launcher.Plugin.BrowserBookmark/Views/SettingsControl.xaml.cs
index 3182adfed..1ee6b5c45 100644
--- a/Plugins/Flow.Launcher.Plugin.BrowserBookmark/Views/SettingsControl.xaml.cs
+++ b/Plugins/Flow.Launcher.Plugin.BrowserBookmark/Views/SettingsControl.xaml.cs
@@ -1,12 +1,13 @@
 using System.Windows;
-using Flow.Launcher.Plugin.BrowserBookmark.Models;
 using System.Windows.Input;
-using System.ComponentModel;
 using System.Threading.Tasks;
+using CommunityToolkit.Mvvm.ComponentModel;
+using Flow.Launcher.Plugin.BrowserBookmark.Models;
 
 namespace Flow.Launcher.Plugin.BrowserBookmark.Views;
 
-public partial class SettingsControl : INotifyPropertyChanged
+[INotifyPropertyChanged]
+public partial class SettingsControl
 {
     public Settings Settings { get; }
     public CustomBrowser SelectedCustomBrowser { get; set; }
@@ -53,12 +54,10 @@ public partial class SettingsControl : INotifyPropertyChanged
         set
         {
             Settings.OpenInNewBrowserWindow = value;
-            PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(nameof(OpenInNewBrowserWindow)));
+            OnPropertyChanged();
         }
     }
 
-    public event PropertyChangedEventHandler PropertyChanged;
-
     private void NewCustomBrowser(object sender, RoutedEventArgs e)
     {
         var newBrowser = new CustomBrowser();

From bc8e77ae02ce8b41f6062b700426c15e81a04c05 Mon Sep 17 00:00:00 2001
From: Jack251970 <1160210343@qq.com>
Date: Tue, 17 Jun 2025 17:00:28 +0800
Subject: [PATCH 13/13] Fix format

---
 ...low.Launcher.Plugin.BrowserBookmark.csproj | 34 +++++++++++++++++--
 1 file changed, 32 insertions(+), 2 deletions(-)

diff --git a/Plugins/Flow.Launcher.Plugin.BrowserBookmark/Flow.Launcher.Plugin.BrowserBookmark.csproj b/Plugins/Flow.Launcher.Plugin.BrowserBookmark/Flow.Launcher.Plugin.BrowserBookmark.csproj
index 1211cdf18..3fb0fa46f 100644
--- a/Plugins/Flow.Launcher.Plugin.BrowserBookmark/Flow.Launcher.Plugin.BrowserBookmark.csproj
+++ b/Plugins/Flow.Launcher.Plugin.BrowserBookmark/Flow.Launcher.Plugin.BrowserBookmark.csproj
@@ -37,11 +37,41 @@
   </PropertyGroup>
 
   <Target Name="RemoveUnnecessaryRuntimesAfterBuild" AfterTargets="Build">
-    <RemoveDir Directories="$(OutputPath)runtimes\browser-wasm;&#xD;&#xA;                            $(OutputPath)runtimes\linux-arm;&#xD;&#xA;                            $(OutputPath)runtimes\linux-arm64;&#xD;&#xA;                            $(OutputPath)runtimes\linux-armel;&#xD;&#xA;                            $(OutputPath)runtimes\linux-mips64;&#xD;&#xA;                            $(OutputPath)runtimes\linux-musl-arm;&#xD;&#xA;                            $(OutputPath)runtimes\linux-musl-arm64;&#xD;&#xA;                            $(OutputPath)runtimes\linux-musl-x64;&#xD;&#xA;                            $(OutputPath)runtimes\linux-ppc64le;&#xD;&#xA;                            $(OutputPath)runtimes\linux-s390x;&#xD;&#xA;                            $(OutputPath)runtimes\linux-x64;&#xD;&#xA;                            $(OutputPath)runtimes\linux-x86;&#xD;&#xA;                            $(OutputPath)runtimes\maccatalyst-arm64;&#xD;&#xA;                            $(OutputPath)runtimes\maccatalyst-x64;&#xD;&#xA;                            $(OutputPath)runtimes\osx-arm64;&#xD;&#xA;                            $(OutputPath)runtimes\osx-x64" />
+    <RemoveDir Directories="$(OutputPath)runtimes\browser-wasm;
+                            $(OutputPath)runtimes\linux-arm;
+                            $(OutputPath)runtimes\linux-arm64;
+                            $(OutputPath)runtimes\linux-armel;
+                            $(OutputPath)runtimes\linux-mips64;
+                            $(OutputPath)runtimes\linux-musl-arm;
+                            $(OutputPath)runtimes\linux-musl-arm64;
+                            $(OutputPath)runtimes\linux-musl-x64;
+                            $(OutputPath)runtimes\linux-ppc64le;
+                            $(OutputPath)runtimes\linux-s390x;
+                            $(OutputPath)runtimes\linux-x64;
+                            $(OutputPath)runtimes\linux-x86;
+                            $(OutputPath)runtimes\maccatalyst-arm64;
+                            $(OutputPath)runtimes\maccatalyst-x64;
+                            $(OutputPath)runtimes\osx-arm64;
+                            $(OutputPath)runtimes\osx-x64"/>
   </Target>
 
   <Target Name="RemoveUnnecessaryRuntimesAfterPublish" AfterTargets="Publish">
-    <RemoveDir Directories="$(PublishDir)runtimes\browser-wasm;&#xD;&#xA;                            $(PublishDir)runtimes\linux-arm;&#xD;&#xA;                            $(PublishDir)runtimes\linux-arm64;&#xD;&#xA;                            $(PublishDir)runtimes\linux-armel;&#xD;&#xA;                            $(PublishDir)runtimes\linux-mips64;&#xD;&#xA;                            $(PublishDir)runtimes\linux-musl-arm;&#xD;&#xA;                            $(PublishDir)runtimes\linux-musl-arm64;&#xD;&#xA;                            $(PublishDir)runtimes\linux-musl-x64;&#xD;&#xA;                            $(PublishDir)runtimes\linux-ppc64le;&#xD;&#xA;                            $(PublishDir)runtimes\linux-s390x;&#xD;&#xA;                            $(PublishDir)runtimes\linux-x64;&#xD;&#xA;                            $(PublishDir)runtimes\linux-x86;&#xD;&#xA;                            $(PublishDir)runtimes\maccatalyst-arm64;&#xD;&#xA;                            $(PublishDir)runtimes\maccatalyst-x64;&#xD;&#xA;                            $(PublishDir)runtimes\osx-arm64;&#xD;&#xA;                            $(PublishDir)runtimes\osx-x64" />
+    <RemoveDir Directories="$(PublishDir)runtimes\browser-wasm;
+                            $(PublishDir)runtimes\linux-arm;
+                            $(PublishDir)runtimes\linux-arm64;
+                            $(PublishDir)runtimes\linux-armel;
+                            $(PublishDir)runtimes\linux-mips64;
+                            $(PublishDir)runtimes\linux-musl-arm;
+                            $(PublishDir)runtimes\linux-musl-arm64;
+                            $(PublishDir)runtimes\linux-musl-x64;
+                            $(PublishDir)runtimes\linux-ppc64le;
+                            $(PublishDir)runtimes\linux-s390x;
+                            $(PublishDir)runtimes\linux-x64;
+                            $(PublishDir)runtimes\linux-x86;
+                            $(PublishDir)runtimes\maccatalyst-arm64;
+                            $(PublishDir)runtimes\maccatalyst-x64;
+                            $(PublishDir)runtimes\osx-arm64;
+                            $(PublishDir)runtimes\osx-x64"/>
   </Target>
 
   <ItemGroup>