From ab1fe67dd4322f495dcd5474d2075d7f7c2d8925 Mon Sep 17 00:00:00 2001
From: Jack251970 <1160210343@qq.com>
Date: Sat, 7 Jun 2025 14:00:56 +0800
Subject: [PATCH] Remove command parameter

---
 .../ViewModels/SettingsViewModel.cs           | 48 +++++++++++--------
 .../Views/ExplorerSettings.xaml               |  4 --
 2 files changed, 27 insertions(+), 25 deletions(-)

diff --git a/Plugins/Flow.Launcher.Plugin.Explorer/ViewModels/SettingsViewModel.cs b/Plugins/Flow.Launcher.Plugin.Explorer/ViewModels/SettingsViewModel.cs
index d6effb4e2..cd315a085 100644
--- a/Plugins/Flow.Launcher.Plugin.Explorer/ViewModels/SettingsViewModel.cs
+++ b/Plugins/Flow.Launcher.Plugin.Explorer/ViewModels/SettingsViewModel.cs
@@ -328,29 +328,28 @@ namespace Flow.Launcher.Plugin.Explorer.ViewModels
             container.Add(link);
         }
 
-
         [RelayCommand]
-        private void EditIndexSearchExcludePaths(object commandParameter)
+        private void EditIndexSearchExcludePaths()
         {
-
+            var selectedLink = SelectedIndexSearchExcludedPath;
             var collection = Settings.IndexSearchExcludedSubdirectoryPaths;
 
-            if (SelectedIndexSearchExcludedPath is null)
+            if (selectedLink is null)
             {
                 ShowUnselectedMessage();
                 return;
             }
 
-            var path = PromptUserSelectPath(SelectedIndexSearchExcludedPath.Type,
-                SelectedIndexSearchExcludedPath.Type == ResultType.Folder
-                    ? SelectedIndexSearchExcludedPath.Path
-                    : Path.GetDirectoryName(SelectedIndexSearchExcludedPath.Path));
+            var path = PromptUserSelectPath(selectedLink.Type,
+                selectedLink.Type == ResultType.Folder
+                    ? selectedLink.Path
+                    : Path.GetDirectoryName(selectedLink.Path));
 
             if (path is null)
                 return;
 
-            var selectedType = SelectedIndexSearchExcludedPath.Type;
-            collection.Remove(SelectedIndexSearchExcludedPath);
+            var selectedType = selectedLink.Type;
+            collection.Remove(selectedLink);
             collection.Add(new AccessLink
             {
                 Path = path, Type = selectedType, Name = path.GetPathName()
@@ -358,7 +357,7 @@ namespace Flow.Launcher.Plugin.Explorer.ViewModels
         }
 
         [RelayCommand]
-        private void AddIndexSearchExcludePaths(object commandParameter)
+        private void AddIndexSearchExcludePaths()
         {
             var container = Settings.IndexSearchExcludedSubdirectoryPaths;
             
@@ -378,30 +377,37 @@ namespace Flow.Launcher.Plugin.Explorer.ViewModels
         }
 
         [RelayCommand]
-        private void EditQuickAccessLink(object commandParameter)
+        private void EditQuickAccessLink()
         {
-            if (SelectedQuickAccessLink is null)
+            var selectedLink = SelectedQuickAccessLink;
+            var collection = Settings.QuickAccessLinks;
+
+            if (selectedLink is null)
             {
                 ShowUnselectedMessage();
                 return;
             }
-            var quickAccessLinkSettings = new QuickAccessLinkSettings(Settings.QuickAccessLinks,SelectedQuickAccessLink);
-            if (quickAccessLinkSettings.ShowDialog() == true) Save();
+            var quickAccessLinkSettings = new QuickAccessLinkSettings(collection, SelectedQuickAccessLink);
+            if (quickAccessLinkSettings.ShowDialog() == true)
+            {
+                Save();
+            }
         }
         
         [RelayCommand]
-        private void AddQuickAccessLink(object commandParameter)
+        private void AddQuickAccessLink()
         {
             var quickAccessLinkSettings = new QuickAccessLinkSettings(Settings.QuickAccessLinks);
-            if (quickAccessLinkSettings.ShowDialog() == true) Save();
+            if (quickAccessLinkSettings.ShowDialog() == true)
+            {
+                Save();
+            }
         }
-        
-        
 
         [RelayCommand]
-        private void RemoveLink(object obj)
+        private void RemoveLink(object commandParameter)
         {
-            if (obj is not string container) return;
+            if (commandParameter is not string container) return;
 
             switch (container)
             {
diff --git a/Plugins/Flow.Launcher.Plugin.Explorer/Views/ExplorerSettings.xaml b/Plugins/Flow.Launcher.Plugin.Explorer/Views/ExplorerSettings.xaml
index 547674dc0..001a9e168 100644
--- a/Plugins/Flow.Launcher.Plugin.Explorer/Views/ExplorerSettings.xaml
+++ b/Plugins/Flow.Launcher.Plugin.Explorer/Views/ExplorerSettings.xaml
@@ -785,13 +785,11 @@
                         MinWidth="100"
                         Margin="{StaticResource SettingPanelItemLeftMargin}"
                         Command="{Binding EditQuickAccessLinkCommand}"
-                        CommandParameter="QuickAccessLink"
                         Content="{DynamicResource plugin_explorer_edit}" />
                     <Button
                         MinWidth="100"
                         Margin="{StaticResource SettingPanelItemLeftMargin}"
                         Command="{Binding AddQuickAccessLinkCommand}"
-                        CommandParameter="QuickAccessLink"
                         Content="{DynamicResource plugin_explorer_add}" />
                 </StackPanel>
             </Grid>
@@ -852,13 +850,11 @@
                         MinWidth="100"
                         Margin="{StaticResource SettingPanelItemLeftMargin}"
                         Command="{Binding EditIndexSearchExcludePathsCommand}"
-                        CommandParameter="IndexSearchExcludedPaths"
                         Content="{DynamicResource plugin_explorer_edit}" />
                     <Button
                         MinWidth="100"
                         Margin="{StaticResource SettingPanelItemLeftMargin}"
                         Command="{Binding AddIndexSearchExcludePathsCommand}"
-                        CommandParameter="IndexSearchExcludedPaths"
                         Content="{DynamicResource plugin_explorer_add}" />
                 </StackPanel>
             </Grid>