Merge pull request #3421 from onesounds/250331-NewPluginsPage

Plugin Page Control Swap Feature & Restore "Search Delay" Field in General Page

Author: onesounds

Flow.Launcher.Infrastructure/UserSettings/PluginSettings.cs

@@ -120,10 +120,9 @@ public class Plugin
         public int Priority { get; set; }
 
         [JsonIgnore]
-        public SearchDelayTime? DefaultSearchDelayTime { get; set; }
+        public int? DefaultSearchDelayTime { get; set; }
 
-        [JsonConverter(typeof(JsonStringEnumConverter))]
-        public SearchDelayTime? SearchDelayTime { get; set; }
+        public int? SearchDelayTime { get; set; }
 
         /// <summary>
         /// Used only to save the state of the plugin in settings

Flow.Launcher.Infrastructure/UserSettings/Settings.cs

@@ -321,9 +321,7 @@ public bool HideNotifyIcon
         public bool HideWhenDeactivated { get; set; } = true;
 
         public bool SearchQueryResultsWithDelay { get; set; }
-
-        [JsonConverter(typeof(JsonStringEnumConverter))]
-        public SearchDelayTime SearchDelayTime { get; set; } = SearchDelayTime.Normal;
+        public int SearchDelayTime { get; set; } = 150;
 
         [JsonConverter(typeof(JsonStringEnumConverter))]
         public SearchWindowScreens SearchWindowScreen { get; set; } = SearchWindowScreens.Cursor;

Flow.Launcher.Plugin/PluginMetadata.cs

@@ -99,10 +99,9 @@ internal set
         public bool HideActionKeywordPanel { get; set; }
 
         /// <summary>
-        /// Plugin search delay time. Null means use default search delay time.
+        /// Plugin search delay time in ms. Null means use default search delay time.
         /// </summary>
-        [JsonConverter(typeof(JsonStringEnumConverter))]
-        public SearchDelayTime? SearchDelayTime { get; set; } = null;
+        public int? SearchDelayTime { get; set; } = null;
 
         /// <summary>
         /// Plugin icon path.

Flow.Launcher.Plugin/SearchDelayTime.cs

@@ -108,14 +108,9 @@
     <system:String x:Key="AlwaysPreviewToolTip">Always open preview panel when Flow activates. Press {0} to toggle preview.</system:String>
     <system:String x:Key="shadowEffectNotAllowed">Shadow effect is not allowed while current theme has blur effect enabled</system:String>
     <system:String x:Key="searchDelay">Search Delay</system:String>
-    <system:String x:Key="searchDelayToolTip">Delay for a while to search when typing. This reduces interface jumpiness and result load.</system:String>
+    <system:String x:Key="searchDelayToolTip">Adds a short delay while typing to reduce UI flicker and result load. Recommended if your typing speed is average.</system:String>
     <system:String x:Key="searchDelayTime">Default Search Delay Time</system:String>
-    <system:String x:Key="searchDelayTimeToolTip">Plugin default delay time after which search results appear when typing is stopped.</system:String>
-    <system:String x:Key="SearchDelayTimeVeryLong">Very long</system:String>
-    <system:String x:Key="SearchDelayTimeLong">Long</system:String>
-    <system:String x:Key="SearchDelayTimeNormal">Normal</system:String>
-    <system:String x:Key="SearchDelayTimeShort">Short</system:String>
-    <system:String x:Key="SearchDelayTimeVeryShort">Very short</system:String>
+    <system:String x:Key="searchDelayTimeToolTip">Wait time before showing results after typing stops. Higher values wait longer. (ms)</system:String>
 
     <!--  Setting Plugin  -->
     <system:String x:Key="searchplugin">Search Plugin</system:String>
@@ -134,6 +129,10 @@
     <system:String x:Key="actionKeywordsTooltip">Change Action Keywords</system:String>
     <system:String x:Key="pluginSearchDelayTime">Plugin seach delay time</system:String>
     <system:String x:Key="pluginSearchDelayTimeTooltip">Change Plugin Seach Delay Time</system:String>
+    <system:String x:Key="FilterComboboxLabel">Advanced Settings:</system:String>
+    <system:String x:Key="DisplayModeOnOff">Enabled</system:String>
+    <system:String x:Key="DisplayModePriority">Priority</system:String>
+    <system:String x:Key="DisplayModeSearchDelay">Search Delay</system:String>
     <system:String x:Key="currentPriority">Current Priority</system:String>
     <system:String x:Key="newPriority">New Priority</system:String>
     <system:String x:Key="priority">Priority</system:String>
@@ -149,7 +148,6 @@
     <system:String x:Key="failedToRemovePluginSettingsMessage">Plugins: {0} - Fail to remove plugin settings files, please remove them manually</system:String>
     <system:String x:Key="failedToRemovePluginCacheTitle">Fail to remove plugin cache</system:String>
     <system:String x:Key="failedToRemovePluginCacheMessage">Plugins: {0} - Fail to remove plugin cache files, please remove them manually</system:String>
-    <system:String x:Key="default">Default</system:String>
 
     <!--  Setting Plugin Store  -->
     <system:String x:Key="pluginStore">Plugin Store</system:String>
@@ -376,9 +374,7 @@
 
     <!--  Search Delay Settings Dialog  -->
     <system:String x:Key="searchDelayTimeTitle">Search Delay Time Setting</system:String>
-    <system:String x:Key="searchDelayTime_tips">Select the search delay time you like to use for the plugin. Select "{0}" if you don't want to specify any, and the plugin will use default search delay time.</system:String>
-    <system:String x:Key="currentSearchDelayTime">Current search delay time</system:String>
-    <system:String x:Key="newSearchDelayTime">New search delay time</system:String>
+    <system:String x:Key="searchDelayTimeTips">Input the search delay time in ms you like to use for the plugin. Input empty if you don't want to specify any, and the plugin will use default search delay time.</system:String>
 
     <!--  Custom Query Hotkey Dialog  -->
     <system:String x:Key="customeQueryHotkeyTitle">Custom Query Hotkey</system:String>