Skip to content

Commit 2b03193

Browse files
taoocerostaooceros
authored
Merge branch 'dev' into github-action
2 parents 27b6434 + 14f1a5a commit 2b03193

File tree

111 files changed

+3143
-3044
lines changed

Some content is hidden

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

111 files changed

+3143
-3044
lines changed

‎.cm/gitstream.cm

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ triggers:
1010
branch:
1111
- l10n_dev
1212
- dev
13-
- r/(?i)(Dependabot|Renovate)/
13+
- r/([Dd]ependabot|[Rr]enovate)/
1414

1515

1616
automations:

‎Flow.Launcher.Core/Flow.Launcher.Core.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@
5454

5555
<ItemGroup>
5656
<PackageReference Include="Droplex" Version="1.7.0" />
57-
<PackageReference Include="FSharp.Core" Version="8.0.301" />
57+
<PackageReference Include="FSharp.Core" Version="9.0.100" />
5858
<PackageReference Include="Meziantou.Framework.Win32.Jobs" Version="3.4.0" />
5959
<PackageReference Include="Microsoft.IO.RecyclableMemoryStream" Version="3.0.1" />
6060
<PackageReference Include="squirrel.windows" Version="1.5.2" NoWarn="NU1701" />

‎Flow.Launcher.Core/Plugin/JsonRPCPluginSettings.cs

+26
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,15 @@
44
using System.Windows;
55
using System.Windows.Controls;
66
using System.Windows.Documents;
7+
using System.Windows.Forms;
78
using Flow.Launcher.Infrastructure.Storage;
89
using Flow.Launcher.Plugin;
10+
using CheckBox = System.Windows.Controls.CheckBox;
11+
using ComboBox = System.Windows.Controls.ComboBox;
12+
using Control = System.Windows.Controls.Control;
13+
using Orientation = System.Windows.Controls.Orientation;
14+
using TextBox = System.Windows.Controls.TextBox;
15+
using UserControl = System.Windows.Controls.UserControl;
916

1017
namespace Flow.Launcher.Core.Plugin
1118
{
@@ -224,6 +231,7 @@ public Control CreateSettingPanel()
224231
break;
225232
}
226233
case "inputWithFileBtn":
234+
case "inputWithFolderBtn":
227235
{
228236
var textBox = new TextBox()
229237
{
@@ -243,6 +251,24 @@ public Control CreateSettingPanel()
243251
Margin = new Thickness(10, 0, 0, 0), Content = "Browse"
244252
};
245253

254+
Btn.Click += (_, _) =>
255+
{
256+
using CommonDialog dialog = type switch
257+
{
258+
"inputWithFolderBtn" => new FolderBrowserDialog(),
259+
_ => new OpenFileDialog(),
260+
};
261+
if (dialog.ShowDialog() != DialogResult.OK) return;
262+
263+
var path = dialog switch
264+
{
265+
FolderBrowserDialog folderDialog => folderDialog.SelectedPath,
266+
OpenFileDialog fileDialog => fileDialog.FileName,
267+
};
268+
textBox.Text = path;
269+
Settings[attribute.Name] = path;
270+
};
271+
246272
var dockPanel = new DockPanel() { Margin = settingControlMargin };
247273

248274
DockPanel.SetDock(Btn, Dock.Right);

‎Flow.Launcher.Infrastructure/Flow.Launcher.Infrastructure.csproj

+2-2
Original file line numberDiff line numberDiff line change
@@ -54,8 +54,8 @@
5454
<PrivateAssets>all</PrivateAssets>
5555
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
5656
</PackageReference>
57-
<PackageReference Include="MemoryPack" Version="1.21.1" />
58-
<PackageReference Include="Microsoft.VisualStudio.Threading" Version="17.10.48" />
57+
<PackageReference Include="MemoryPack" Version="1.21.3" />
58+
<PackageReference Include="Microsoft.VisualStudio.Threading" Version="17.12.19" />
5959
<PackageReference Include="NLog" Version="4.7.10" />
6060
<PackageReference Include="PropertyChanged.Fody" Version="3.4.0" />
6161
<PackageReference Include="System.Drawing.Common" Version="7.0.0" />

‎Flow.Launcher.Plugin/Flow.Launcher.Plugin.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@
6767
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
6868
</PackageReference>
6969
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1" PrivateAssets="All" />
70-
<PackageReference Include="JetBrains.Annotations" Version="2024.2.0" />
70+
<PackageReference Include="JetBrains.Annotations" Version="2024.3.0" />
7171
<PackageReference Include="PropertyChanged.Fody" Version="3.4.0" />
7272
</ItemGroup>
7373

‎Flow.Launcher.Test/Flow.Launcher.Test.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@
5454
<PrivateAssets>all</PrivateAssets>
5555
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
5656
</PackageReference>
57-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.11.1" />
57+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.12.0" />
5858
</ItemGroup>
5959

6060
</Project>

‎Flow.Launcher/App.xaml

+5
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,11 @@
2020
<ResourceDictionary Source="pack://application:,,,/Resources/Dark.xaml" />
2121
</ResourceDictionary.MergedDictionaries>
2222
</ResourceDictionary>
23+
<ResourceDictionary x:Key="HighContrast">
24+
<ResourceDictionary.MergedDictionaries>
25+
<ResourceDictionary Source="pack://application:,,,/Resources/Dark.xaml" />
26+
</ResourceDictionary.MergedDictionaries>
27+
</ResourceDictionary>
2328
</ui:ThemeResources.ThemeDictionaries>
2429
</ui:ThemeResources>
2530
<ui:XamlControlsResources />

‎Flow.Launcher/Flow.Launcher.csproj

+2-2
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@
8383
</ItemGroup>
8484

8585
<ItemGroup>
86-
<PackageReference Include="CommunityToolkit.Mvvm" Version="8.3.1" />
86+
<PackageReference Include="CommunityToolkit.Mvvm" Version="8.3.2" />
8787
<PackageReference Include="Fody" Version="6.5.4">
8888
<PrivateAssets>all</PrivateAssets>
8989
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
@@ -96,7 +96,7 @@
9696
<PackageReference Include="NHotkey.Wpf" Version="3.0.0" />
9797
<PackageReference Include="PropertyChanged.Fody" Version="3.4.0" />
9898
<PackageReference Include="SemanticVersioning" Version="3.0.0-beta2" />
99-
<PackageReference Include="VirtualizingWrapPanel" Version="2.0.10" />
99+
<PackageReference Include="VirtualizingWrapPanel" Version="2.1.0" />
100100
</ItemGroup>
101101

102102
<ItemGroup>

‎Flow.Launcher/Helper/WindowsMediaPlayerHelper.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,6 @@ internal static class WindowsMediaPlayerHelper
66
internal static bool IsWindowsMediaPlayerInstalled()
77
{
88
using var key = Registry.LocalMachine.OpenSubKey(@"SOFTWARE\Microsoft\MediaPlayer");
9-
return key.GetValue("Installation Directory") != null;
9+
return key?.GetValue("Installation Directory") != null;
1010
}
1111
}

0 commit comments

Comments
 (0)