Skip to content

Commit 8049a5c

Browse files
committed
Merge branch 'OpenRecycleBinCommand' of https://github.com/onesounds/Flow.Launcher into OpenRecycleBinCommand
2 parents 405e3f0 + 7c62799 commit 8049a5c

File tree

50 files changed

+730
-231
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

50 files changed

+730
-231
lines changed

Flow.Launcher.Core/Plugin/PluginManager.cs

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -166,18 +166,18 @@ public static async Task InitializePluginsAsync(IPublicAPI api)
166166

167167
public static ICollection<PluginPair> ValidPluginsForQuery(Query query)
168168
{
169-
if (NonGlobalPlugins.ContainsKey(query.ActionKeyword))
170-
{
171-
var plugin = NonGlobalPlugins[query.ActionKeyword];
172-
return new List<PluginPair>
173-
{
174-
plugin
175-
};
176-
}
177-
else
178-
{
169+
if (query is null)
170+
return Array.Empty<PluginPair>();
171+
172+
if (!NonGlobalPlugins.ContainsKey(query.ActionKeyword))
179173
return GlobalPlugins;
180-
}
174+
175+
176+
var plugin = NonGlobalPlugins[query.ActionKeyword];
177+
return new List<PluginPair>
178+
{
179+
plugin
180+
};
181181
}
182182

183183
public static async Task<List<Result>> QueryForPluginAsync(PluginPair pair, Query query, CancellationToken token)

Flow.Launcher.Core/Resource/Theme.cs

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ namespace Flow.Launcher.Core.Resource
1717
{
1818
public class Theme
1919
{
20-
private const int ShadowExtraMargin = 12;
20+
private const int ShadowExtraMargin = 32;
2121

2222
private readonly List<string> _themeDirectories = new List<string>();
2323
private ResourceDictionary _oldResource;
@@ -238,9 +238,10 @@ public void AddDropShadowEffectToCurrentTheme()
238238
Property = Border.EffectProperty,
239239
Value = new DropShadowEffect
240240
{
241-
Opacity = 0.4,
242-
ShadowDepth = 2,
243-
BlurRadius = 15
241+
Opacity = 0.3,
242+
ShadowDepth = 12,
243+
Direction = 270,
244+
BlurRadius = 30
244245
}
245246
};
246247

@@ -250,7 +251,7 @@ public void AddDropShadowEffectToCurrentTheme()
250251
marginSetter = new Setter()
251252
{
252253
Property = Border.MarginProperty,
253-
Value = new Thickness(ShadowExtraMargin),
254+
Value = new Thickness(ShadowExtraMargin, 12, ShadowExtraMargin, ShadowExtraMargin),
254255
};
255256
windowBorderStyle.Setters.Add(marginSetter);
256257
}

Flow.Launcher.Plugin/Result.cs

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -66,6 +66,10 @@ public string IcoPath
6666
}
6767
}
6868
}
69+
/// <summary>
70+
/// Determines if Icon has a border radius
71+
/// </summary>
72+
public bool RoundedIcon { get; set; } = false;
6973

7074
/// <summary>
7175
/// Delegate function, see <see cref="Icon"/>
@@ -197,5 +201,16 @@ public ValueTask<bool> ExecuteAsync(ActionContext context)
197201
{
198202
return AsyncAction?.Invoke(context) ?? ValueTask.FromResult(Action?.Invoke(context) ?? false);
199203
}
204+
205+
/// <summary>
206+
/// Progress bar display. Providing an int value between 0-100 will trigger the progress bar to be displayed on the result
207+
/// </summary>
208+
public int? ProgressBar { get; set; }
209+
210+
/// <summary>
211+
/// Optionally set the color of the progress bar
212+
/// </summary>
213+
/// <default>#26a0da (blue)</default>
214+
public string ProgressBarColor { get; set; } = "#26a0da";
200215
}
201216
}

Flow.Launcher/ActionKeywords.xaml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,6 @@
5858
<TextBlock
5959
Grid.Column="0"
6060
Margin="0,0,0,0"
61-
FontFamily="Segoe UI"
6261
FontSize="20"
6362
FontWeight="SemiBold"
6463
Text="{DynamicResource actionKeywordsTitle}"

Flow.Launcher/CustomQueryHotkeySetting.xaml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,6 @@
6464
<TextBlock
6565
Grid.Column="0"
6666
Margin="0,0,0,0"
67-
FontFamily="Segoe UI"
6867
FontSize="20"
6968
FontWeight="SemiBold"
7069
Text="{DynamicResource customeQueryHotkeyTitle}"

Flow.Launcher/Languages/en.xaml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,7 @@
5252
<system:String x:Key="selectPythonDirectory">Select</system:String>
5353
<system:String x:Key="hideOnStartup">Hide Flow Launcher on startup</system:String>
5454
<system:String x:Key="hideNotifyIcon">Hide tray icon</system:String>
55+
<system:String x:Key="hideNotifyIconToolTip">When the icon is hidden from the tray, the Settings menu can be opened by right-clicking on the search window.</system:String>
5556
<system:String x:Key="querySearchPrecision">Query Search Precision</system:String>
5657
<system:String x:Key="querySearchPrecisionToolTip">Changes minimum match score required for results.</system:String>
5758
<system:String x:Key="ShouldUsePinyin">Should Use Pinyin</system:String>
@@ -71,12 +72,14 @@
7172
<system:String x:Key="currentPriority">Current Priority</system:String>
7273
<system:String x:Key="newPriority">New Priority</system:String>
7374
<system:String x:Key="priority">Priority</system:String>
75+
<system:String x:Key="priorityToolTip">Change Plugin Results Priority</system:String>
7476
<system:String x:Key="pluginDirectory">Plugin Directory</system:String>
7577
<system:String x:Key="author">by</system:String>
7678
<system:String x:Key="plugin_init_time">Init time:</system:String>
7779
<system:String x:Key="plugin_query_time">Query time:</system:String>
7880
<system:String x:Key="plugin_query_version">| Version</system:String>
7981
<system:String x:Key="plugin_query_web">Website</system:String>
82+
<system:String x:Key="plugin_uninstall">Uninstall</system:String>
8083

8184

8285
<!-- Setting Plugin Store -->

Flow.Launcher/Languages/es-419.xaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -69,6 +69,7 @@
6969
<system:String x:Key="currentPriority">Prioridad Actual</system:String>
7070
<system:String x:Key="newPriority">Nueva Prioridad</system:String>
7171
<system:String x:Key="priority">Prioridad</system:String>
72+
<system:String x:Key="priorityToolTip">Cambiar la prioridad del resultado del plugin</system:String>
7273
<system:String x:Key="pluginDirectory">Directorio de Plugins</system:String>
7374
<system:String x:Key="author">por</system:String>
7475
<system:String x:Key="plugin_init_time">Tiempo de inicio:</system:String>

Flow.Launcher/Languages/es.xaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -69,6 +69,7 @@
6969
<system:String x:Key="currentPriority">Prioridad actual</system:String>
7070
<system:String x:Key="newPriority">Nueva prioridad</system:String>
7171
<system:String x:Key="priority">Prioridad</system:String>
72+
<system:String x:Key="priorityToolTip">Cambiar la prioridad del resultado del complemento</system:String>
7273
<system:String x:Key="pluginDirectory">Carpeta de complementos</system:String>
7374
<system:String x:Key="author">por</system:String>
7475
<system:String x:Key="plugin_init_time">Tiempo de inicio:</system:String>

Flow.Launcher/Languages/ko.xaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -69,6 +69,7 @@
6969
<system:String x:Key="currentPriority">현재 중요도:</system:String>
7070
<system:String x:Key="newPriority">새 중요도:</system:String>
7171
<system:String x:Key="priority">중요도</system:String>
72+
<system:String x:Key="priorityToolTip">플러그인 결과 우선 순위 변경</system:String>
7273
<system:String x:Key="pluginDirectory">플러그인 폴더</system:String>
7374
<system:String x:Key="author">제작자</system:String>
7475
<system:String x:Key="plugin_init_time">초기화 시간:</system:String>

Flow.Launcher/Languages/zh-cn.xaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -69,6 +69,7 @@
6969
<system:String x:Key="currentPriority">当前优先级</system:String>
7070
<system:String x:Key="newPriority">新优先级</system:String>
7171
<system:String x:Key="priority">优先级</system:String>
72+
<system:String x:Key="priorityToolTip">更改插件结果优先级</system:String>
7273
<system:String x:Key="pluginDirectory">插件目录</system:String>
7374
<system:String x:Key="author">出自</system:String>
7475
<system:String x:Key="plugin_init_time">加载耗时:</system:String>

0 commit comments

Comments
 (0)