From 0c6b89fc92565b2487ce9450c9cc2c426e0a5110 Mon Sep 17 00:00:00 2001
From: Jack251970 <1160210343@qq.com>
Date: Wed, 26 Feb 2025 22:27:16 +0800
Subject: [PATCH] Revert "Add global search panel"

This reverts commit f7b1190f9563e188fa4d733f1fa7d9b6c0b1c3cc.
---
 Flow.Launcher/ActionKeywords.xaml.cs          |  18 +--
 Flow.Launcher/Languages/en.xaml               |   1 -
 .../InstalledPluginDisplayKeyword.xaml        | 106 ++++++------------
 Flow.Launcher/ViewModel/PluginViewModel.cs    |  17 ---
 4 files changed, 37 insertions(+), 105 deletions(-)

diff --git a/Flow.Launcher/ActionKeywords.xaml.cs b/Flow.Launcher/ActionKeywords.xaml.cs
index 4b678f42d..80a4abef1 100644
--- a/Flow.Launcher/ActionKeywords.xaml.cs
+++ b/Flow.Launcher/ActionKeywords.xaml.cs
@@ -77,25 +77,11 @@ namespace Flow.Launcher
         {
             foreach (var actionKeyword in removedActionKeywords)
             {
-                if (actionKeyword == Query.GlobalPluginWildcardSign)
-                {
-                    pluginViewModel.GlobalSearch = false;
-                }
-                else
-                {
-                    App.API.RemoveActionKeyword(id, actionKeyword);
-                }
+                App.API.RemoveActionKeyword(id, actionKeyword);
             }
             foreach (var actionKeyword in addedActionKeywords)
             {
-                if (actionKeyword == Query.GlobalPluginWildcardSign)
-                {
-                    pluginViewModel.GlobalSearch = true;
-                }
-                else
-                {
-                    App.API.AddActionKeyword(id, actionKeyword);
-                }
+                App.API.AddActionKeyword(id, actionKeyword);
             }
 
             // Update action keywords text and close window
diff --git a/Flow.Launcher/Languages/en.xaml b/Flow.Launcher/Languages/en.xaml
index f2eeb2de5..b1575b252 100644
--- a/Flow.Launcher/Languages/en.xaml
+++ b/Flow.Launcher/Languages/en.xaml
@@ -114,7 +114,6 @@
     <system:String x:Key="disable">Off</system:String>
     <system:String x:Key="actionKeywordsTitle">Action keyword Setting</system:String>
     <system:String x:Key="actionKeywords">Action keyword</system:String>
-    <system:String x:Key="globalSearch">Global search</system:String>
     <system:String x:Key="currentActionKeywords">Current action keyword</system:String>
     <system:String x:Key="newActionKeyword">New action keyword</system:String>
     <system:String x:Key="actionKeywordsTooltip">Change Action Keywords</system:String>
diff --git a/Flow.Launcher/Resources/Controls/InstalledPluginDisplayKeyword.xaml b/Flow.Launcher/Resources/Controls/InstalledPluginDisplayKeyword.xaml
index 197e9ddef..ff2f14c4b 100644
--- a/Flow.Launcher/Resources/Controls/InstalledPluginDisplayKeyword.xaml
+++ b/Flow.Launcher/Resources/Controls/InstalledPluginDisplayKeyword.xaml
@@ -4,80 +4,44 @@
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-    xmlns:ui="http://schemas.modernwpf.com/2019"
     xmlns:viewModel="clr-namespace:Flow.Launcher.ViewModel"
     d:DataContext="{d:DesignInstance viewModel:PluginViewModel}"
     d:DesignHeight="300"
     d:DesignWidth="300"
     mc:Ignorable="d">
-    <StackPanel Orientation="Vertical">
-        <Border
-            Width="Auto"
-            Height="52"
-            Margin="0"
-            Padding="0"
-            BorderThickness="0 1 0 0"
-            CornerRadius="0"
-            Style="{DynamicResource SettingGroupBox}"
-            Visibility="{Binding ActionKeywordsVisibility}">
-            <DockPanel Margin="22 0 18 0" VerticalAlignment="Center">
-                <TextBlock
-                    Margin="48 0 10 0"
-                    DockPanel.Dock="Left"
-                    Style="{StaticResource Glyph}">
-                    &#xe819;
-                </TextBlock>
-                <TextBlock
-                    HorizontalAlignment="Left"
-                    VerticalAlignment="Center"
-                    DockPanel.Dock="Left"
-                    Style="{DynamicResource SettingTitleLabel}"
-                    Text="{DynamicResource actionKeywords}" />
-                <Button
-                    Width="100"
-                    Height="34"
-                    Margin="5 0 0 0"
-                    HorizontalAlignment="Right"
-                    Command="{Binding SetActionKeywordsCommand}"
-                    Content="{Binding ActionKeywordsText}"
-                    Cursor="Hand"
-                    DockPanel.Dock="Right"
-                    FontWeight="Bold"
-                    ToolTip="{DynamicResource actionKeywordsTooltip}" />
-            </DockPanel>
-        </Border>
-        <Border
-            Width="Auto"
-            Height="52"
-            Margin="0"
-            Padding="0"
-            BorderThickness="0 1 0 0"
-            CornerRadius="0"
-            Style="{DynamicResource SettingGroupBox}"
-            Visibility="{Binding ActionKeywordsVisibility}">
-            <DockPanel Margin="22 0 18 0" VerticalAlignment="Center">
-                <TextBlock
-                    Margin="48 0 10 0"
-                    DockPanel.Dock="Left"
-                    Style="{StaticResource Glyph}">
-                    &#xE774;
-                </TextBlock>
-                <TextBlock
-                    HorizontalAlignment="Left"
-                    VerticalAlignment="Center"
-                    DockPanel.Dock="Left"
-                    Style="{DynamicResource SettingTitleLabel}"
-                    Text="{DynamicResource globalSearch}" />
-                <ui:ToggleSwitch
-                    Height="34"
-                    Margin="5 0 0 0"
-                    HorizontalAlignment="Right"
-                    Cursor="Hand"
-                    DockPanel.Dock="Right"
-                    IsOn="{Binding GlobalSearch}"
-                    OffContent="{DynamicResource disable}"
-                    OnContent="{DynamicResource enable}" />
-            </DockPanel>
-        </Border>
-    </StackPanel>
+    <Border
+        Width="Auto"
+        Height="52"
+        Margin="0"
+        Padding="0"
+        BorderThickness="0 1 0 0"
+        CornerRadius="0"
+        Style="{DynamicResource SettingGroupBox}"
+        Visibility="{Binding ActionKeywordsVisibility}">
+        <DockPanel Margin="22 0 18 0" VerticalAlignment="Center">
+            <TextBlock
+                Margin="48 0 10 0"
+                DockPanel.Dock="Left"
+                Style="{StaticResource Glyph}">
+                &#xe819;
+            </TextBlock>
+            <TextBlock
+                HorizontalAlignment="Left"
+                VerticalAlignment="Center"
+                DockPanel.Dock="Left"
+                Style="{DynamicResource SettingTitleLabel}"
+                Text="{DynamicResource actionKeywords}" />
+            <Button
+                Width="100"
+                Height="34"
+                Margin="5 0 0 0"
+                HorizontalAlignment="Right"
+                Command="{Binding SetActionKeywordsCommand}"
+                Content="{Binding ActionKeywordsText}"
+                Cursor="Hand"
+                DockPanel.Dock="Right"
+                FontWeight="Bold"
+                ToolTip="{DynamicResource actionKeywordsTooltip}" />
+        </DockPanel>
+    </Border>
 </UserControl>
diff --git a/Flow.Launcher/ViewModel/PluginViewModel.cs b/Flow.Launcher/ViewModel/PluginViewModel.cs
index 026e9965b..9b717216a 100644
--- a/Flow.Launcher/ViewModel/PluginViewModel.cs
+++ b/Flow.Launcher/ViewModel/PluginViewModel.cs
@@ -105,23 +105,6 @@ namespace Flow.Launcher.ViewModel
         public string Version => InternationalizationManager.Instance.GetTranslation("plugin_query_version") + " " + PluginPair.Metadata.Version;
         public string InitAndQueryTime => InternationalizationManager.Instance.GetTranslation("plugin_init_time") + " " + PluginPair.Metadata.InitTime + "ms, " + InternationalizationManager.Instance.GetTranslation("plugin_query_time") + " " + PluginPair.Metadata.AvgQueryTime + "ms";
         public string ActionKeywordsText => string.Join(Query.ActionKeywordSeparator, PluginPair.Metadata.ActionKeywords);
-        public bool GlobalSearch
-        {
-            get => PluginPair.Metadata.ActionKeywords.Contains(Query.GlobalPluginWildcardSign);
-            set
-            {
-                if (value)
-                {
-                    App.API.AddActionKeyword(PluginPair.Metadata.ID, Query.GlobalPluginWildcardSign);
-                }
-                else
-                {
-                    App.API.RemoveActionKeyword(PluginPair.Metadata.ID, Query.GlobalPluginWildcardSign);
-                }
-                OnPropertyChanged();
-                OnActionKeywordsChanged();
-            }
-        }
         public int Priority => PluginPair.Metadata.Priority;
         public Infrastructure.UserSettings.Plugin PluginSettingsObject { get; set; }