Skip to content

Commit 9f8440b

Browse files
taoocerostaooceros
committed
Merge remote-tracking branch 'upstream/dev' into ExplorerPathAsync
2 parents 9d126df + 79962fb commit 9f8440b

File tree

8 files changed

+208
-30
lines changed

8 files changed

+208
-30
lines changed

‎Flow.Launcher/Themes/BlurBlack Darker.xaml

Lines changed: 63 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,63 @@
1+
<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
2+
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
3+
xmlns:system="clr-namespace:System;assembly=mscorlib">
4+
<ResourceDictionary.MergedDictionaries>
5+
<ResourceDictionary Source="pack://application:,,,/Themes/Base.xaml" />
6+
</ResourceDictionary.MergedDictionaries>
7+
8+
<system:Boolean x:Key="ThemeBlurEnabled">True</system:Boolean>
9+
10+
<Style x:Key="QueryBoxStyle" BasedOn="{StaticResource BaseQueryBoxStyle}" TargetType="{x:Type TextBox}">
11+
<Setter Property="Foreground" Value="#FFFFFFFF" />
12+
<Setter Property="Background" Value="Transparent" />
13+
</Style>
14+
15+
<Style x:Key="QuerySuggestionBoxStyle" BasedOn="{StaticResource BaseQuerySuggestionBoxStyle}" TargetType="{x:Type TextBox}">
16+
<Setter Property="Foreground" Value="LightGray" />
17+
</Style>
18+
19+
<Style x:Key="WindowBorderStyle" BasedOn="{StaticResource BaseWindowBorderStyle}" TargetType="{x:Type Border}">
20+
<Setter Property="Background">
21+
<Setter.Value>
22+
<SolidColorBrush Color="Black" Opacity="0.6"/>
23+
</Setter.Value>
24+
</Setter>
25+
</Style>
26+
27+
<Style x:Key="WindowStyle" BasedOn="{StaticResource BaseWindowStyle}" TargetType="{x:Type Window}">
28+
<Setter Property="Width" Value="750" /> <!-- This is used to set the blur width only -->
29+
<Setter Property="Background">
30+
<Setter.Value>
31+
<SolidColorBrush Color="Black" Opacity="0.6"/>
32+
</Setter.Value>
33+
</Setter>
34+
</Style>
35+
36+
<Style x:Key="PendingLineStyle" BasedOn="{StaticResource BasePendingLineStyle}" TargetType="{x:Type Line}">
37+
</Style>
38+
39+
<!-- Item Style -->
40+
<Style x:Key="ItemTitleStyle" BasedOn="{StaticResource BaseItemTitleStyle}" TargetType="{x:Type TextBlock}">
41+
<Setter Property="Margin" Value="0, -10"/>
42+
<Setter Property="Foreground" Value="#FFFFFFFF"/>
43+
</Style>
44+
<Style x:Key="ItemSubTitleStyle" BasedOn="{StaticResource BaseItemSubTitleStyle}" TargetType="{x:Type TextBlock}" >
45+
<Setter Property="Foreground" Value="#FFFFFFFF"/>
46+
</Style>
47+
<Style x:Key="ItemTitleSelectedStyle" BasedOn="{StaticResource BaseItemTitleSelectedStyle}" TargetType="{x:Type TextBlock}" >
48+
<Setter Property="Margin" Value="0, -10"/>
49+
<Setter Property="Foreground" Value="#FFFFFFFF"/>
50+
</Style>
51+
<Style x:Key="ItemSubTitleSelectedStyle" BasedOn="{StaticResource BaseItemSubTitleSelectedStyle}" TargetType="{x:Type TextBlock}" >
52+
<Setter Property="Foreground" Value="#FFFFFFFF"/>
53+
</Style>
54+
<SolidColorBrush x:Key="ItemSelectedBackgroundColor">#356ef3</SolidColorBrush>
55+
56+
<!-- button style in the middle of the scrollbar -->
57+
<Style x:Key="ThumbStyle" BasedOn="{StaticResource BaseThumbStyle}" TargetType="{x:Type Thumb}">
58+
</Style>
59+
60+
<Style x:Key="ScrollBarStyle" BasedOn="{StaticResource BaseScrollBarStyle}" TargetType="{x:Type ScrollBar}">
61+
<Setter Property="Background" Value="#a0a0a0"/>
62+
</Style>
63+
</ResourceDictionary>

‎Flow.Launcher/Themes/BlurWhite.xaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
<Style x:Key="WindowBorderStyle" BasedOn="{StaticResource BaseWindowBorderStyle}" TargetType="{x:Type Border}">
1818
<Setter Property="Background">
1919
<Setter.Value>
20-
<SolidColorBrush Color="White" Opacity="0.1"/>
20+
<SolidColorBrush Color="White" Opacity="0.5"/>
2121
</Setter.Value>
2222
</Setter>
2323
</Style>
@@ -26,7 +26,7 @@
2626
<Setter Property="Width" Value="750" /> <!-- This is used to set the blur width only -->
2727
<Setter Property="Background">
2828
<Setter.Value>
29-
<SolidColorBrush Color="White" Opacity="0.1"/>
29+
<SolidColorBrush Color="White" Opacity="0.5"/>
3030
</Setter.Value>
3131
</Setter>
3232
</Style>

‎Flow.Launcher/Themes/Gray.xaml

Lines changed: 9 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -4,21 +4,19 @@
44
<ResourceDictionary Source="pack://application:,,,/Themes/Base.xaml" />
55
</ResourceDictionary.MergedDictionaries>
66
<Style x:Key="QueryBoxStyle" BasedOn="{StaticResource BaseQueryBoxStyle}" TargetType="{x:Type TextBox}">
7-
<Setter Property="Background" Value="#EDEDED" />
7+
<Setter Property="Background" Value="LightGray" />
88
<Setter Property="Foreground" Value="#222222" />
9-
<Setter Property="FontSize" Value="38" />
109
</Style>
1110

1211
<Style x:Key="QuerySuggestionBoxStyle" BasedOn="{StaticResource BaseQuerySuggestionBoxStyle}" TargetType="{x:Type TextBox}">
13-
<Setter Property="Background" Value="#EDEDED" />
14-
<Setter Property="Foreground" Value="#222222" />
15-
<Setter Property="FontSize" Value="38" />
12+
<Setter Property="Background" Value="LightGray" />
13+
<Setter Property="Foreground" Value="#6E6E6E" />
1614
</Style>
1715

1816
<Style x:Key="WindowBorderStyle" BasedOn="{StaticResource BaseWindowBorderStyle}" TargetType="{x:Type Border}">
19-
<Setter Property="BorderBrush" Value="#B0B0B0" />
17+
<Setter Property="BorderBrush" Value="LightGray" />
2018
<Setter Property="BorderThickness" Value="1" />
21-
<Setter Property="Background" Value="#EDEDED"></Setter>
19+
<Setter Property="Background" Value="LightGray"></Setter>
2220
</Style>
2321
<Style x:Key="WindowStyle" TargetType="{x:Type Window}" BasedOn="{StaticResource BaseWindowStyle}" >
2422
</Style>
@@ -31,15 +29,15 @@
3129
<Setter Property="Foreground" Value="#A6A6A6" />
3230
</Style>
3331
<Style x:Key="ItemSubTitleStyle" BasedOn="{StaticResource BaseItemSubTitleStyle}" TargetType="{x:Type TextBlock}">
34-
<Setter Property="Foreground" Value="#A6A6A6" />
32+
<Setter Property="Foreground" Value="#6B6B6B" />
3533
</Style>
3634
<Style x:Key="ItemTitleSelectedStyle" BasedOn="{StaticResource BaseItemTitleSelectedStyle}" TargetType="{x:Type TextBlock}">
37-
<Setter Property="Foreground" Value="#FFFFF8" />
35+
<Setter Property="Foreground" Value="White" />
3836
</Style>
3937
<Style x:Key="ItemSubTitleSelectedStyle" BasedOn="{StaticResource BaseItemSubTitleSelectedStyle}" TargetType="{x:Type TextBlock}">
40-
<Setter Property="Foreground" Value="#ffffff" />
38+
<Setter Property="Foreground" Value="#EDEDED" />
4139
</Style>
42-
<SolidColorBrush x:Key="ItemSelectedBackgroundColor">#00AAF6</SolidColorBrush>
40+
<SolidColorBrush x:Key="ItemSelectedBackgroundColor">#787878</SolidColorBrush>
4341
<Style x:Key="ThumbStyle" BasedOn="{StaticResource BaseThumbStyle}" TargetType="{x:Type Thumb}">
4442
<Setter Property="Template">
4543
<Setter.Value>

‎Flow.Launcher/Themes/Light.xaml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,19 +6,19 @@
66
</ResourceDictionary.MergedDictionaries>
77

88
<Style x:Key="QueryBoxStyle" BasedOn="{StaticResource BaseQueryBoxStyle}" TargetType="{x:Type TextBox}">
9-
<Setter Property="Background" Value="#EBEBEB"/>
9+
<Setter Property="Background" Value="White "/>
1010
<Setter Property="Foreground" Value="#000000" />
1111
</Style>
1212

1313
<Style x:Key="QuerySuggestionBoxStyle" BasedOn="{StaticResource BaseQuerySuggestionBoxStyle}" TargetType="{x:Type TextBox}">
14-
<Setter Property="Background" Value="#EBEBEB"/>
14+
<Setter Property="Background" Value="White"/>
1515
<Setter Property="Foreground" Value="#000000" />
1616
</Style>
1717

1818
<Style x:Key="WindowBorderStyle" BasedOn="{StaticResource BaseWindowBorderStyle}" TargetType="{x:Type Border}">
19-
<Setter Property="BorderBrush" Value="#AAAAAA" />
20-
<Setter Property="BorderThickness" Value="5" />
21-
<Setter Property="Background" Value="#ffffff"></Setter>
19+
<Setter Property="BorderBrush" Value="LightGray" />
20+
<Setter Property="BorderThickness" Value="1"></Setter>
21+
<Setter Property="Background" Value="White"></Setter>
2222
</Style>
2323
<Style x:Key="WindowStyle" TargetType="{x:Type Window}" BasedOn="{StaticResource BaseWindowStyle}" >
2424
</Style>
@@ -38,7 +38,7 @@
3838
<Style x:Key="ItemSubTitleSelectedStyle" BasedOn="{StaticResource BaseItemSubTitleSelectedStyle}" TargetType="{x:Type TextBlock}">
3939
<Setter Property="Foreground" Value="#F6F6FF" />
4040
</Style>
41-
<SolidColorBrush x:Key="ItemSelectedBackgroundColor">#3875D7</SolidColorBrush>
41+
<SolidColorBrush x:Key="ItemSelectedBackgroundColor">#909090</SolidColorBrush>
4242

4343
<!-- button style in the middle of the scrollbar -->
4444
<Style x:Key="ThumbStyle" BasedOn="{StaticResource BaseThumbStyle}" TargetType="{x:Type Thumb}">

‎Flow.Launcher/Themes/Nord Darker.xaml

Lines changed: 56 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,56 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
3+
<ResourceDictionary.MergedDictionaries>
4+
<ResourceDictionary Source="pack://application:,,,/Themes/Base.xaml" />
5+
</ResourceDictionary.MergedDictionaries>
6+
<Style x:Key="QueryBoxStyle" BasedOn="{StaticResource BaseQueryBoxStyle}" TargetType="{x:Type TextBox}">
7+
<Setter Property="Background" Value="#2e3440" />
8+
<Setter Property="Foreground" Value="#eceff4" />
9+
<Setter Property="FontSize" Value="30" />
10+
</Style>
11+
12+
<Style x:Key="QuerySuggestionBoxStyle" BasedOn="{StaticResource BaseQuerySuggestionBoxStyle}" TargetType="{x:Type TextBox}">
13+
<Setter Property="Background" Value="#2e3440" />
14+
<Setter Property="Foreground" Value="#eceff4" />
15+
<Setter Property="FontSize" Value="30" />
16+
</Style>
17+
18+
<Style x:Key="WindowBorderStyle" BasedOn="{StaticResource BaseWindowBorderStyle}" TargetType="{x:Type Border}">
19+
<Setter Property="BorderBrush" Value="#4c566a" />
20+
<Setter Property="BorderThickness" Value="1" />
21+
<Setter Property="Background" Value="#2e3440"></Setter>
22+
</Style>
23+
<Style x:Key="WindowStyle" TargetType="{x:Type Window}" BasedOn="{StaticResource BaseWindowStyle}" >
24+
</Style>
25+
<Style x:Key="PendingLineStyle" BasedOn="{StaticResource BasePendingLineStyle}" TargetType="{x:Type Line}" />
26+
<Style x:Key="ItemTitleStyle" BasedOn="{StaticResource BaseItemTitleStyle}" TargetType="{x:Type TextBlock}">
27+
<Setter Property="Foreground" Value="#e5e9f0" />
28+
<Setter Property="FontWeight" Value="Bold" />
29+
</Style>
30+
<Style x:Key="ItemNumberStyle" BasedOn="{StaticResource BaseItemNumberStyle}" TargetType="{x:Type TextBlock}">
31+
<Setter Property="Foreground" Value="#A6A6A6" />
32+
</Style>
33+
<Style x:Key="ItemSubTitleStyle" BasedOn="{StaticResource BaseItemSubTitleStyle}" TargetType="{x:Type TextBlock}">
34+
<Setter Property="Foreground" Value="#d8dee9" />
35+
</Style>
36+
<Style x:Key="ItemTitleSelectedStyle" BasedOn="{StaticResource BaseItemTitleSelectedStyle}" TargetType="{x:Type TextBlock}">
37+
<Setter Property="Foreground" Value="#2e3440" />
38+
</Style>
39+
<Style x:Key="ItemSubTitleSelectedStyle" BasedOn="{StaticResource BaseItemSubTitleSelectedStyle}" TargetType="{x:Type TextBlock}">
40+
<Setter Property="Foreground" Value="#4c566a" />
41+
</Style>
42+
<SolidColorBrush x:Key="ItemSelectedBackgroundColor">#5e81ac</SolidColorBrush>
43+
<Style x:Key="ThumbStyle" BasedOn="{StaticResource BaseThumbStyle}" TargetType="{x:Type Thumb}">
44+
<Setter Property="Template">
45+
<Setter.Value>
46+
<ControlTemplate TargetType="{x:Type Thumb}">
47+
<Border CornerRadius="2" DockPanel.Dock="Right" Background="#4c566a" BorderBrush="Transparent" BorderThickness="0" />
48+
</ControlTemplate>
49+
</Setter.Value>
50+
</Setter>
51+
</Style>
52+
53+
<Style x:Key="ScrollBarStyle" BasedOn="{StaticResource BaseScrollBarStyle}" TargetType="{x:Type ScrollBar}" >
54+
<Setter Property="Width" Value="3"/>
55+
</Style>
56+
</ResourceDictionary>

‎Flow.Launcher/Themes/Nord.xaml

Lines changed: 56 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,56 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
3+
<ResourceDictionary.MergedDictionaries>
4+
<ResourceDictionary Source="pack://application:,,,/Themes/Base.xaml" />
5+
</ResourceDictionary.MergedDictionaries>
6+
<Style x:Key="QueryBoxStyle" BasedOn="{StaticResource BaseQueryBoxStyle}" TargetType="{x:Type TextBox}">
7+
<Setter Property="Background" Value="#4c566a" />
8+
<Setter Property="Foreground" Value="#eceff4" />
9+
<Setter Property="FontSize" Value="30" />
10+
</Style>
11+
12+
<Style x:Key="QuerySuggestionBoxStyle" BasedOn="{StaticResource BaseQuerySuggestionBoxStyle}" TargetType="{x:Type TextBox}">
13+
<Setter Property="Background" Value="#4c566a" />
14+
<Setter Property="Foreground" Value="#eceff4" />
15+
<Setter Property="FontSize" Value="30" />
16+
</Style>
17+
18+
<Style x:Key="WindowBorderStyle" BasedOn="{StaticResource BaseWindowBorderStyle}" TargetType="{x:Type Border}">
19+
<Setter Property="BorderBrush" Value="#2e3440" />
20+
<Setter Property="BorderThickness" Value="1" />
21+
<Setter Property="Background" Value="#4c566a"></Setter>
22+
</Style>
23+
<Style x:Key="WindowStyle" TargetType="{x:Type Window}" BasedOn="{StaticResource BaseWindowStyle}" >
24+
</Style>
25+
<Style x:Key="PendingLineStyle" BasedOn="{StaticResource BasePendingLineStyle}" TargetType="{x:Type Line}" />
26+
<Style x:Key="ItemTitleStyle" BasedOn="{StaticResource BaseItemTitleStyle}" TargetType="{x:Type TextBlock}">
27+
<Setter Property="Foreground" Value="#e5e9f0" />
28+
<Setter Property="FontWeight" Value="Bold" />
29+
</Style>
30+
<Style x:Key="ItemNumberStyle" BasedOn="{StaticResource BaseItemNumberStyle}" TargetType="{x:Type TextBlock}">
31+
<Setter Property="Foreground" Value="#A6A6A6" />
32+
</Style>
33+
<Style x:Key="ItemSubTitleStyle" BasedOn="{StaticResource BaseItemSubTitleStyle}" TargetType="{x:Type TextBlock}">
34+
<Setter Property="Foreground" Value="#d8dee9" />
35+
</Style>
36+
<Style x:Key="ItemTitleSelectedStyle" BasedOn="{StaticResource BaseItemTitleSelectedStyle}" TargetType="{x:Type TextBlock}">
37+
<Setter Property="Foreground" Value="#2e3440" />
38+
</Style>
39+
<Style x:Key="ItemSubTitleSelectedStyle" BasedOn="{StaticResource BaseItemSubTitleSelectedStyle}" TargetType="{x:Type TextBlock}">
40+
<Setter Property="Foreground" Value="#4c566a" />
41+
</Style>
42+
<SolidColorBrush x:Key="ItemSelectedBackgroundColor">#5e81ac</SolidColorBrush>
43+
<Style x:Key="ThumbStyle" BasedOn="{StaticResource BaseThumbStyle}" TargetType="{x:Type Thumb}">
44+
<Setter Property="Template">
45+
<Setter.Value>
46+
<ControlTemplate TargetType="{x:Type Thumb}">
47+
<Border CornerRadius="2" DockPanel.Dock="Right" Background="#2e3440" BorderBrush="Transparent" BorderThickness="0" />
48+
</ControlTemplate>
49+
</Setter.Value>
50+
</Setter>
51+
</Style>
52+
53+
<Style x:Key="ScrollBarStyle" BasedOn="{StaticResource BaseScrollBarStyle}" TargetType="{x:Type ScrollBar}" >
54+
<Setter Property="Width" Value="3"/>
55+
</Style>
56+
</ResourceDictionary>

‎Plugins/Flow.Launcher.Plugin.PluginsManager/Main.cs

Lines changed: 15 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -30,24 +30,29 @@ public Control CreateSettingPanel()
3030
return new PluginsManagerSettings(viewModel);
3131
}
3232

33-
public async Task InitAsync(PluginInitContext context)
33+
public Task InitAsync(PluginInitContext context)
3434
{
3535
Context = context;
3636
viewModel = new SettingsViewModel(context);
3737
Settings = viewModel.Settings;
3838
contextMenu = new ContextMenu(Context);
3939
pluginManager = new PluginsManager(Context, Settings);
4040
var updateManifestTask = pluginManager.UpdateManifest();
41-
if (await Task.WhenAny(updateManifestTask, Task.Delay(500)) == updateManifestTask)
41+
_ = updateManifestTask.ContinueWith(t =>
4242
{
43-
lastUpdateTime = DateTime.Now;
44-
}
45-
else
46-
{
47-
context.API.ShowMsg("Plugin Manifest Download Fail.",
48-
@"Please check internet transmission with Github.com.
49-
You may not be able to Install and Update Plugin.", pluginManager.icoPath);
50-
}
43+
if (t.IsCompletedSuccessfully)
44+
{
45+
lastUpdateTime = DateTime.Now;
46+
}
47+
else
48+
{
49+
context.API.ShowMsg("Plugin Manifest Download Fail.",
50+
"Please check if you can connect to github.com. " +
51+
"This error means you may not be able to Install and Update Plugin.", pluginManager.icoPath, false);
52+
}
53+
});
54+
55+
return Task.CompletedTask;
5156
}
5257

5358
public List<Result> LoadContextMenus(Result selectedResult)

‎Plugins/Flow.Launcher.Plugin.PluginsManager/plugin.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
"Name": "Plugins Manager",
77
"Description": "Management of installing, uninstalling or updating Flow Launcher plugins",
88
"Author": "Jeremy Wu",
9-
"Version": "1.6.0",
9+
"Version": "1.6.1",
1010
"Language": "csharp",
1111
"Website": "https://github.com/Flow-Launcher/Flow.Launcher",
1212
"ExecuteFileName": "Flow.Launcher.Plugin.PluginsManager.dll",

0 commit comments

Comments
 (0)