From e0ac6d5feed2b4f86e7cfcf19a476506d538b362 Mon Sep 17 00:00:00 2001
From: Jack251970 <1160210343@qq.com>
Date: Tue, 13 May 2025 12:49:35 +0800
Subject: [PATCH 1/5] Improve Program plugin delete button logic

---
 .../Languages/en.xaml                         |  1 +
 .../Views/ProgramSetting.xaml                 |  6 ++
 .../Views/ProgramSetting.xaml.cs              | 72 ++++++++++++-------
 3 files changed, 54 insertions(+), 25 deletions(-)

diff --git a/Plugins/Flow.Launcher.Plugin.Program/Languages/en.xaml b/Plugins/Flow.Launcher.Plugin.Program/Languages/en.xaml
index ee6b4379d12..c19347f2a7a 100644
--- a/Plugins/Flow.Launcher.Plugin.Program/Languages/en.xaml
+++ b/Plugins/Flow.Launcher.Plugin.Program/Languages/en.xaml
@@ -48,6 +48,7 @@
 
     <system:String x:Key="flowlauncher_plugin_program_pls_select_program_source">Please select a program source</system:String>
     <system:String x:Key="flowlauncher_plugin_program_delete_program_source">Are you sure you want to delete the selected program sources?</system:String>
+    <system:String x:Key="flowlauncher_plugin_program_delete_program_source_not_user_added">Please select program sources that you added</system:String>
     <system:String x:Key="flowlauncher_plugin_program_duplicate_program_source">Another program source with the same location already exists.</system:String>
 
     <system:String x:Key="flowlauncher_plugin_program_edit_program_source_title">Program Source</system:String>
diff --git a/Plugins/Flow.Launcher.Plugin.Program/Views/ProgramSetting.xaml b/Plugins/Flow.Launcher.Plugin.Program/Views/ProgramSetting.xaml
index 5c0ba8d0bd8..3bf1c6ad1db 100644
--- a/Plugins/Flow.Launcher.Plugin.Program/Views/ProgramSetting.xaml
+++ b/Plugins/Flow.Launcher.Plugin.Program/Views/ProgramSetting.xaml
@@ -203,6 +203,12 @@
                     Margin="{StaticResource SettingPanelItemLeftTopBottomMargin}"
                     Click="btnEditProgramSource_OnClick"
                     Content="{DynamicResource flowlauncher_plugin_program_edit}" />
+                <Button
+                    x:Name="btnDeleteProgramSource"
+                    MinWidth="100"
+                    Margin="{StaticResource SettingPanelItemLeftTopBottomMargin}"
+                    Click="btnDeleteProgramSource_OnClick"
+                    Content="{DynamicResource flowlauncher_plugin_program_delete}" />
                 <Button
                     x:Name="btnAddProgramSource"
                     MinWidth="100"
diff --git a/Plugins/Flow.Launcher.Plugin.Program/Views/ProgramSetting.xaml.cs b/Plugins/Flow.Launcher.Plugin.Program/Views/ProgramSetting.xaml.cs
index deb110698b3..71879181e0f 100644
--- a/Plugins/Flow.Launcher.Plugin.Program/Views/ProgramSetting.xaml.cs
+++ b/Plugins/Flow.Launcher.Plugin.Program/Views/ProgramSetting.xaml.cs
@@ -133,6 +133,7 @@ private void ViewRefresh()
             {
                 btnProgramSourceStatus.Visibility = Visibility.Hidden;
                 btnEditProgramSource.Visibility = Visibility.Hidden;
+                btnDeleteProgramSource.Visibility = Visibility.Hidden;
             }
 
             if (programSourceView.Items.Count > 0
@@ -141,6 +142,7 @@ private void ViewRefresh()
             {
                 btnProgramSourceStatus.Visibility = Visibility.Visible;
                 btnEditProgramSource.Visibility = Visibility.Visible;
+                btnDeleteProgramSource.Visibility = Visibility.Visible;
             }
 
             programSourceView.Items.Refresh();
@@ -270,8 +272,8 @@ private void programSourceView_Drop(object sender, DragEventArgs e)
 
                 if (directoriesToAdd.Count > 0)
                 {
-                    directoriesToAdd.ForEach(x => _settings.ProgramSources.Add(x));
-                    directoriesToAdd.ForEach(x => ProgramSettingDisplayList.Add(x));
+                    directoriesToAdd.ForEach(_settings.ProgramSources.Add);
+                    directoriesToAdd.ForEach(ProgramSettingDisplayList.Add);
 
                     ViewRefresh();
                     ReIndexing();
@@ -296,24 +298,12 @@ private async void btnProgramSourceStatus_OnClick(object sender, RoutedEventArgs
 
             if (selectedItems.Count == 0)
             {
-                string msg = context.API.GetTranslation("flowlauncher_plugin_program_pls_select_program_source");
+                var msg = context.API.GetTranslation("flowlauncher_plugin_program_pls_select_program_source");
                 context.API.ShowMsgBox(msg);
                 return;
             }
 
-            if (IsAllItemsUserAdded(selectedItems))
-            {
-                var msg = string.Format(
-                    context.API.GetTranslation("flowlauncher_plugin_program_delete_program_source"));
-
-                if (context.API.ShowMsgBox(msg, string.Empty, MessageBoxButton.YesNo) == MessageBoxResult.No)
-                {
-                    return;
-                }
-
-                DeleteProgramSources(selectedItems);
-            }
-            else if (HasMoreOrEqualEnabledItems(selectedItems))
+            if (HasMoreOrEqualEnabledItems(selectedItems))
             {
                 await ProgramSettingDisplay.SetProgramSourcesStatusAsync(selectedItems, false);
 
@@ -341,10 +331,9 @@ private void ProgramSourceView_PreviewMouseRightButtonUp(object sender, MouseBut
 
         private void GridViewColumnHeaderClickedHandler(object sender, RoutedEventArgs e)
         {
-            var headerClicked = e.OriginalSource as GridViewColumnHeader;
             ListSortDirection direction;
 
-            if (headerClicked != null)
+            if (e.OriginalSource is GridViewColumnHeader headerClicked)
             {
                 if (headerClicked.Role != GridViewColumnHeaderRole.Padding)
                 {
@@ -397,11 +386,7 @@ private void programSourceView_SelectionChanged(object sender, SelectionChangedE
                 .SelectedItems.Cast<ProgramSource>()
                 .ToList();
 
-            if (IsAllItemsUserAdded(selectedItems))
-            {
-                btnProgramSourceStatus.Content = context.API.GetTranslation("flowlauncher_plugin_program_delete");
-            }
-            else if (HasMoreOrEqualEnabledItems(selectedItems))
+            if (HasMoreOrEqualEnabledItems(selectedItems))
             {
                 btnProgramSourceStatus.Content = context.API.GetTranslation("flowlauncher_plugin_program_disable");
             }
@@ -420,6 +405,43 @@ private void programSourceView_MouseDoubleClick(object sender, MouseButtonEventA
             }
         }
 
+        [System.Diagnostics.CodeAnalysis.SuppressMessage("Usage", "VSTHRD100:Avoid async void methods", Justification = "<Pending>")]
+        private async void btnDeleteProgramSource_OnClick(object sender, RoutedEventArgs e)
+        {
+            var selectedItems = programSourceView
+                .SelectedItems.Cast<ProgramSource>()
+                .ToList();
+
+            if (selectedItems.Count == 0)
+            {
+                var msg = context.API.GetTranslation("flowlauncher_plugin_program_pls_select_program_source");
+                context.API.ShowMsgBox(msg);
+                return;
+            }
+
+            if (!IsAllItemsUserAdded(selectedItems))
+            {
+                var msg1 = context.API.GetTranslation("flowlauncher_plugin_program_delete_program_source_not_user_added");
+                context.API.ShowMsgBox(msg1);
+                return;
+            }
+
+            var msg2 = context.API.GetTranslation("flowlauncher_plugin_program_delete_program_source");
+            if (context.API.ShowMsgBox(msg2, string.Empty, MessageBoxButton.YesNo) == MessageBoxResult.No)
+            {
+                return;
+            }
+
+            DeleteProgramSources(selectedItems);
+
+            if (await selectedItems.IsReindexRequiredAsync())
+                ReIndexing();
+
+            programSourceView.SelectedItems.Clear();
+
+            ViewRefresh();
+        }
+
         private bool IsAllItemsUserAdded(List<ProgramSource> items)
         {
             return items.All(x => _settings.ProgramSources.Any(y => y.UniqueIdentifier == x.UniqueIdentifier));
@@ -427,8 +449,8 @@ private bool IsAllItemsUserAdded(List<ProgramSource> items)
 
         private void ListView_SizeChanged(object sender, SizeChangedEventArgs e)
         {
-            ListView listView = sender as ListView;
-            GridView gView = listView.View as GridView;
+            var listView = sender as ListView;
+            var gView = listView.View as GridView;
 
             var workingWidth =
                 listView.ActualWidth - SystemParameters.VerticalScrollBarWidth; // take into account vertical scrollbar

From 284729afb5ef3e5450f15e5f278612d3c4f5a3d7 Mon Sep 17 00:00:00 2001
From: Jack251970 <1160210343@qq.com>
Date: Tue, 13 May 2025 13:01:24 +0800
Subject: [PATCH 2/5] Improve message noticification

---
 Plugins/Flow.Launcher.Plugin.Program/Languages/en.xaml     | 3 ++-
 .../Views/ProgramSetting.xaml.cs                           | 7 +++++++
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/Plugins/Flow.Launcher.Plugin.Program/Languages/en.xaml b/Plugins/Flow.Launcher.Plugin.Program/Languages/en.xaml
index c19347f2a7a..bf6de50fe2c 100644
--- a/Plugins/Flow.Launcher.Plugin.Program/Languages/en.xaml
+++ b/Plugins/Flow.Launcher.Plugin.Program/Languages/en.xaml
@@ -48,7 +48,8 @@
 
     <system:String x:Key="flowlauncher_plugin_program_pls_select_program_source">Please select a program source</system:String>
     <system:String x:Key="flowlauncher_plugin_program_delete_program_source">Are you sure you want to delete the selected program sources?</system:String>
-    <system:String x:Key="flowlauncher_plugin_program_delete_program_source_not_user_added">Please select program sources that you added</system:String>
+    <system:String x:Key="flowlauncher_plugin_program_delete_program_source_user_added">Please select program sources that are not added by you</system:String>
+    <system:String x:Key="flowlauncher_plugin_program_delete_program_source_not_user_added">Please select program sources that are added by you</system:String>
     <system:String x:Key="flowlauncher_plugin_program_duplicate_program_source">Another program source with the same location already exists.</system:String>
 
     <system:String x:Key="flowlauncher_plugin_program_edit_program_source_title">Program Source</system:String>
diff --git a/Plugins/Flow.Launcher.Plugin.Program/Views/ProgramSetting.xaml.cs b/Plugins/Flow.Launcher.Plugin.Program/Views/ProgramSetting.xaml.cs
index 71879181e0f..59ee40c1231 100644
--- a/Plugins/Flow.Launcher.Plugin.Program/Views/ProgramSetting.xaml.cs
+++ b/Plugins/Flow.Launcher.Plugin.Program/Views/ProgramSetting.xaml.cs
@@ -303,6 +303,13 @@ private async void btnProgramSourceStatus_OnClick(object sender, RoutedEventArgs
                 return;
             }
 
+            if (IsAllItemsUserAdded(selectedItems))
+            {
+                var msg1 = context.API.GetTranslation("flowlauncher_plugin_program_delete_program_source_not_user_added");
+                context.API.ShowMsgBox(msg1);
+                return;
+            }
+
             if (HasMoreOrEqualEnabledItems(selectedItems))
             {
                 await ProgramSettingDisplay.SetProgramSourcesStatusAsync(selectedItems, false);

From a0999351697248e1f90a6198eb2bbd5a0eae839c Mon Sep 17 00:00:00 2001
From: Jack251970 <1160210343@qq.com>
Date: Tue, 13 May 2025 13:03:04 +0800
Subject: [PATCH 3/5] Fix message

---
 Plugins/Flow.Launcher.Plugin.Program/Languages/en.xaml        | 4 ++--
 .../Flow.Launcher.Plugin.Program/Views/ProgramSetting.xaml.cs | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Plugins/Flow.Launcher.Plugin.Program/Languages/en.xaml b/Plugins/Flow.Launcher.Plugin.Program/Languages/en.xaml
index bf6de50fe2c..65fd8951c57 100644
--- a/Plugins/Flow.Launcher.Plugin.Program/Languages/en.xaml
+++ b/Plugins/Flow.Launcher.Plugin.Program/Languages/en.xaml
@@ -48,8 +48,8 @@
 
     <system:String x:Key="flowlauncher_plugin_program_pls_select_program_source">Please select a program source</system:String>
     <system:String x:Key="flowlauncher_plugin_program_delete_program_source">Are you sure you want to delete the selected program sources?</system:String>
-    <system:String x:Key="flowlauncher_plugin_program_delete_program_source_user_added">Please select program sources that are not added by you</system:String>
-    <system:String x:Key="flowlauncher_plugin_program_delete_program_source_not_user_added">Please select program sources that are added by you</system:String>
+    <system:String x:Key="flowlauncher_plugin_program_delete_program_source_not_user_added">Please select program sources that are not added by you</system:String>
+    <system:String x:Key="flowlauncher_plugin_program_delete_program_source_user_added">Please select program sources that are added by you</system:String>
     <system:String x:Key="flowlauncher_plugin_program_duplicate_program_source">Another program source with the same location already exists.</system:String>
 
     <system:String x:Key="flowlauncher_plugin_program_edit_program_source_title">Program Source</system:String>
diff --git a/Plugins/Flow.Launcher.Plugin.Program/Views/ProgramSetting.xaml.cs b/Plugins/Flow.Launcher.Plugin.Program/Views/ProgramSetting.xaml.cs
index 59ee40c1231..8b19ba81c8d 100644
--- a/Plugins/Flow.Launcher.Plugin.Program/Views/ProgramSetting.xaml.cs
+++ b/Plugins/Flow.Launcher.Plugin.Program/Views/ProgramSetting.xaml.cs
@@ -428,7 +428,7 @@ private async void btnDeleteProgramSource_OnClick(object sender, RoutedEventArgs
 
             if (!IsAllItemsUserAdded(selectedItems))
             {
-                var msg1 = context.API.GetTranslation("flowlauncher_plugin_program_delete_program_source_not_user_added");
+                var msg1 = context.API.GetTranslation("flowlauncher_plugin_program_delete_program_source_user_added");
                 context.API.ShowMsgBox(msg1);
                 return;
             }

From 204d1d285a4cb26b29692588704fba4c9d95270d Mon Sep 17 00:00:00 2001
From: Jack251970 <1160210343@qq.com>
Date: Tue, 13 May 2025 13:04:26 +0800
Subject: [PATCH 4/5] Improve string keys

---
 Plugins/Flow.Launcher.Plugin.Program/Languages/en.xaml        | 4 ++--
 .../Flow.Launcher.Plugin.Program/Views/ProgramSetting.xaml.cs | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/Plugins/Flow.Launcher.Plugin.Program/Languages/en.xaml b/Plugins/Flow.Launcher.Plugin.Program/Languages/en.xaml
index 65fd8951c57..e551a7dcb4e 100644
--- a/Plugins/Flow.Launcher.Plugin.Program/Languages/en.xaml
+++ b/Plugins/Flow.Launcher.Plugin.Program/Languages/en.xaml
@@ -48,8 +48,8 @@
 
     <system:String x:Key="flowlauncher_plugin_program_pls_select_program_source">Please select a program source</system:String>
     <system:String x:Key="flowlauncher_plugin_program_delete_program_source">Are you sure you want to delete the selected program sources?</system:String>
-    <system:String x:Key="flowlauncher_plugin_program_delete_program_source_not_user_added">Please select program sources that are not added by you</system:String>
-    <system:String x:Key="flowlauncher_plugin_program_delete_program_source_user_added">Please select program sources that are added by you</system:String>
+    <system:String x:Key="flowlauncher_plugin_program_delete_program_source_select_not_user_added">Please select program sources that are not added by you</system:String>
+    <system:String x:Key="flowlauncher_plugin_program_delete_program_source_select_user_added">Please select program sources that are added by you</system:String>
     <system:String x:Key="flowlauncher_plugin_program_duplicate_program_source">Another program source with the same location already exists.</system:String>
 
     <system:String x:Key="flowlauncher_plugin_program_edit_program_source_title">Program Source</system:String>
diff --git a/Plugins/Flow.Launcher.Plugin.Program/Views/ProgramSetting.xaml.cs b/Plugins/Flow.Launcher.Plugin.Program/Views/ProgramSetting.xaml.cs
index 8b19ba81c8d..6ae1c4422c5 100644
--- a/Plugins/Flow.Launcher.Plugin.Program/Views/ProgramSetting.xaml.cs
+++ b/Plugins/Flow.Launcher.Plugin.Program/Views/ProgramSetting.xaml.cs
@@ -305,7 +305,7 @@ private async void btnProgramSourceStatus_OnClick(object sender, RoutedEventArgs
 
             if (IsAllItemsUserAdded(selectedItems))
             {
-                var msg1 = context.API.GetTranslation("flowlauncher_plugin_program_delete_program_source_not_user_added");
+                var msg1 = context.API.GetTranslation("flowlauncher_plugin_program_delete_program_source_select_not_user_added");
                 context.API.ShowMsgBox(msg1);
                 return;
             }
@@ -428,7 +428,7 @@ private async void btnDeleteProgramSource_OnClick(object sender, RoutedEventArgs
 
             if (!IsAllItemsUserAdded(selectedItems))
             {
-                var msg1 = context.API.GetTranslation("flowlauncher_plugin_program_delete_program_source_user_added");
+                var msg1 = context.API.GetTranslation("flowlauncher_plugin_program_delete_program_source_select_user_added");
                 context.API.ShowMsgBox(msg1);
                 return;
             }

From da770855083b33eb6fab955eda4a06ac052da54f Mon Sep 17 00:00:00 2001
From: Jack251970 <1160210343@qq.com>
Date: Wed, 14 May 2025 11:37:55 +0800
Subject: [PATCH 5/5] Fix logic & Improve code quality

---
 .../Views/ProgramSetting.xaml.cs              | 22 +++++--------------
 1 file changed, 6 insertions(+), 16 deletions(-)

diff --git a/Plugins/Flow.Launcher.Plugin.Program/Views/ProgramSetting.xaml.cs b/Plugins/Flow.Launcher.Plugin.Program/Views/ProgramSetting.xaml.cs
index 6ae1c4422c5..9ac44708594 100644
--- a/Plugins/Flow.Launcher.Plugin.Program/Views/ProgramSetting.xaml.cs
+++ b/Plugins/Flow.Launcher.Plugin.Program/Views/ProgramSetting.xaml.cs
@@ -298,15 +298,7 @@ private async void btnProgramSourceStatus_OnClick(object sender, RoutedEventArgs
 
             if (selectedItems.Count == 0)
             {
-                var msg = context.API.GetTranslation("flowlauncher_plugin_program_pls_select_program_source");
-                context.API.ShowMsgBox(msg);
-                return;
-            }
-
-            if (IsAllItemsUserAdded(selectedItems))
-            {
-                var msg1 = context.API.GetTranslation("flowlauncher_plugin_program_delete_program_source_select_not_user_added");
-                context.API.ShowMsgBox(msg1);
+                context.API.ShowMsgBox(context.API.GetTranslation("flowlauncher_plugin_program_pls_select_program_source"));
                 return;
             }
 
@@ -376,7 +368,7 @@ private void Sort(string sortBy, ListSortDirection direction)
             var dataView = CollectionViewSource.GetDefaultView(programSourceView.ItemsSource);
 
             dataView.SortDescriptions.Clear();
-            SortDescription sd = new SortDescription(sortBy, direction);
+            var sd = new SortDescription(sortBy, direction);
             dataView.SortDescriptions.Add(sd);
             dataView.Refresh();
         }
@@ -421,20 +413,18 @@ private async void btnDeleteProgramSource_OnClick(object sender, RoutedEventArgs
 
             if (selectedItems.Count == 0)
             {
-                var msg = context.API.GetTranslation("flowlauncher_plugin_program_pls_select_program_source");
-                context.API.ShowMsgBox(msg);
+                context.API.ShowMsgBox(context.API.GetTranslation("flowlauncher_plugin_program_pls_select_program_source"));
                 return;
             }
 
             if (!IsAllItemsUserAdded(selectedItems))
             {
-                var msg1 = context.API.GetTranslation("flowlauncher_plugin_program_delete_program_source_select_user_added");
-                context.API.ShowMsgBox(msg1);
+                context.API.ShowMsgBox(context.API.GetTranslation("flowlauncher_plugin_program_delete_program_source_select_user_added"));
                 return;
             }
 
-            var msg2 = context.API.GetTranslation("flowlauncher_plugin_program_delete_program_source");
-            if (context.API.ShowMsgBox(msg2, string.Empty, MessageBoxButton.YesNo) == MessageBoxResult.No)
+            if (context.API.ShowMsgBox(context.API.GetTranslation("flowlauncher_plugin_program_delete_program_source"),
+                string.Empty, MessageBoxButton.YesNo) == MessageBoxResult.No)
             {
                 return;
             }