Skip to content
Merged
Show file tree
Hide file tree
Changes from 23 commits
Commits
Show all changes
31 commits
Select commit Hold shift + click to select a range
1eacdf8
Add Control in PluginDisplay
onesounds Mar 31, 2025
5fa244c
Add setting filter
onesounds Mar 31, 2025
0136c57
Add Setting Filter
onesounds Mar 31, 2025
fb50e6d
Add search delay control
onesounds Mar 31, 2025
d77400d
Add customcontrol for searchdelay
onesounds Mar 31, 2025
378e98f
Merge branch 'dev' into 250331-NewPluginsPage
onesounds Apr 3, 2025
3ca958c
Merge remote-tracking branch 'origin/dev' into 250331-NewPluginsPage
onesounds Apr 3, 2025
a65e89b
Adjust advanced control UI
onesounds Apr 4, 2025
f3fcaee
- Add strings
onesounds Apr 4, 2025
276af43
Remove Delay item in plugin setting page layout
onesounds Apr 4, 2025
44a1a47
Add help window with content dialogue style
onesounds Apr 4, 2025
b81f9be
Adjust numberbox
onesounds Apr 4, 2025
cd39164
Fix Typo
onesounds Apr 4, 2025
adbd262
Merge branch 'dev' into 250331-NewPluginsPage
Jack251970 Apr 7, 2025
81715f1
Cleanup codes
Jack251970 Apr 7, 2025
bf63dda
Improve code quality
Jack251970 Apr 7, 2025
44f136c
Use binding instead of local functions
Jack251970 Apr 7, 2025
dc7b812
Change search delay time to int & Improve code quality & Improve strings
Jack251970 Apr 7, 2025
dfb6b0a
Fix string resource issue
Jack251970 Apr 7, 2025
24bbfcc
Support numerical box for priority
Jack251970 Apr 7, 2025
6726828
Support numerical box for search delay
Jack251970 Apr 7, 2025
65f48e3
Force priority to 0 when inputing empty
Jack251970 Apr 7, 2025
e955e47
- Change combobox to numberbox
onesounds Apr 7, 2025
cbf5031
Fix content dialog style
onesounds Apr 7, 2025
d30f292
Remove unused string
Jack251970 Apr 8, 2025
970bb3a
Add code comments
Jack251970 Apr 8, 2025
61fa460
Disable search delay number box when search delay is disabled
Jack251970 Apr 8, 2025
ade4fbf
Adjust number box width
Jack251970 Apr 8, 2025
c33fae9
Change default search delay time to value
Jack251970 Apr 8, 2025
d09899e
Adjust Placeholder color
onesounds Apr 8, 2025
c351a38
Merge branch 'dev' into 250331-NewPluginsPage
onesounds Apr 8, 2025
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 2 additions & 3 deletions Flow.Launcher.Infrastructure/UserSettings/PluginSettings.cs
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 1 addition & 3 deletions Flow.Launcher.Infrastructure/UserSettings/Settings.cs
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
5 changes: 2 additions & 3 deletions Flow.Launcher.Plugin/PluginMetadata.cs
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
32 changes: 0 additions & 32 deletions Flow.Launcher.Plugin/SearchDelayTime.cs

This file was deleted.

18 changes: 8 additions & 10 deletions Flow.Launcher/Languages/en.xaml
Original file line number Diff line number Diff line change
Expand Up @@ -108,14 +108,10 @@
<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>
<system:String x:Key="searchDelayPlaceHolder">Default</system:String>

<!-- Setting Plugin -->
<system:String x:Key="searchplugin">Search Plugin</system:String>
Expand All @@ -134,6 +130,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>
Expand Down Expand Up @@ -376,9 +376,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>
Expand Down
121 changes: 0 additions & 121 deletions Flow.Launcher/PriorityChangeWindow.xaml

This file was deleted.

67 changes: 0 additions & 67 deletions Flow.Launcher/PriorityChangeWindow.xaml.cs

This file was deleted.

Loading
Loading