Skip to content

Commit 29c1503

Browse files
VictoriousRaptorVictoriousRaptor
authored
Merge branch 'dev' into quicklook
2 parents c36cea7 + c202356 commit 29c1503

File tree

57 files changed

+719
-563
lines changed

Some content is hidden

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

57 files changed

+719
-563
lines changed

‎.github/workflows/default_plugins.yml

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ name: Publish Default Plugins
22

33
on:
44
push:
5-
branches: ['master']
5+
branches: ['dev']
66
paths: ['Plugins/**']
77
workflow_dispatch:
88

@@ -11,9 +11,9 @@ jobs:
1111
runs-on: windows-latest
1212

1313
steps:
14-
- uses: actions/checkout@v2
14+
- uses: actions/checkout@v4
1515
- name: Setup .NET
16-
uses: actions/setup-dotnet@v1
16+
uses: actions/setup-dotnet@v3
1717
with:
1818
dotnet-version: 7.0.x
1919

@@ -46,6 +46,7 @@ jobs:
4646
- 'Plugins/Flow.Launcher.Plugin.WebSearch/plugin.json'
4747
windowssettings:
4848
- 'Plugins/Flow.Launcher.Plugin.WindowsSettings/plugin.json'
49+
base: 'master'
4950

5051
- name: Get BrowserBookmark Version
5152
if: steps.changes.outputs.browserbookmark == 'true'

‎.github/workflows/spelling.yml

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ jobs:
7373
steps:
7474
- name: check-spelling
7575
id: spelling
76-
uses: check-spelling/check-spelling@main
76+
uses: check-spelling/check-spelling@v0.0.22
7777
with:
7878
suppress_push_for_open_pull_request: 1
7979
checkout: true
@@ -89,12 +89,13 @@ jobs:
8989
check_extra_dictionaries: ''
9090
quit_without_error: true
9191
extra_dictionaries:
92-
cspell:software-terms/src/software-terms.txt
92+
cspell:software-terms/dict/softwareTerms.txt
9393
cspell:win32/src/win32.txt
94-
cspell:php/php.txt
94+
cspell:php/src/php.txt
9595
cspell:filetypes/filetypes.txt
9696
cspell:csharp/csharp.txt
97-
cspell:dotnet/dotnet.txt
97+
cspell:dotnet/src/dotnet.txt
98+
cspell:python/src/common/extra.txt
9899
cspell:python/src/python/python-lib.txt
99100
cspell:aws/aws.txt
100101
cspell:companies/src/companies.txt
@@ -113,7 +114,7 @@ jobs:
113114
# if: (success() || failure()) && needs.spelling.outputs.followup && github.event_name == 'push'
114115
# steps:
115116
# - name: comment
116-
# uses: check-spelling/check-spelling@main
117+
# uses: check-spelling/check-spelling@@v0.0.22
117118
# with:
118119
# checkout: true
119120
# spell_check_this: check-spelling/spell-check-this@main
@@ -129,7 +130,7 @@ jobs:
129130
if: (success() || failure()) && needs.spelling.outputs.followup && contains(github.event_name, 'pull_request')
130131
steps:
131132
- name: comment
132-
uses: check-spelling/check-spelling@main
133+
uses: check-spelling/check-spelling@v0.0.22
133134
with:
134135
checkout: true
135136
spell_check_this: check-spelling/spell-check-this@main
@@ -153,7 +154,7 @@ jobs:
153154
# cancel-in-progress: false
154155
# steps:
155156
# - name: apply spelling updates
156-
# uses: check-spelling/check-spelling@main
157+
# uses: check-spelling/check-spelling@v0.0.22
157158
# with:
158159
# experimental_apply_changes_via_bot: 1
159160
# checkout: true

‎Flow.Launcher.Plugin/SharedCommands/FilesFolders.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -263,7 +263,7 @@ public static string ReturnPreviousDirectoryIfIncompleteString(string path)
263263
}
264264

265265
/// <summary>
266-
/// Returns if <paramref name="parentPath"/> contains <paramref name="subPath"/>.
266+
/// Returns if <paramref name="parentPath"/> contains <paramref name="subPath"/>. Equal paths are not considered to be contained by default.
267267
/// From https://stackoverflow.com/a/66877016
268268
/// </summary>
269269
/// <param name="parentPath">Parent path</param>

‎Flow.Launcher.Test/FilesFoldersTest.cs

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
using Flow.Launcher.Plugin.SharedCommands;
1+
using Flow.Launcher.Plugin.SharedCommands;
22
using NUnit.Framework;
33

44
namespace Flow.Launcher.Test
@@ -33,21 +33,21 @@ public class FilesFoldersTest
3333
[TestCase(@"c:\foo", @"c:\foo\..\bar\baz", false)]
3434
[TestCase(@"c:\bar", @"c:\foo\..\bar\baz", true)]
3535
[TestCase(@"c:\barr", @"c:\foo\..\bar\baz", false)]
36-
// Equality
37-
[TestCase(@"c:\foo", @"c:\foo", false)]
38-
[TestCase(@"c:\foo\", @"c:\foo", false)]
39-
[TestCase(@"c:\foo", @"c:\foo\", false)]
4036
public void GivenTwoPaths_WhenCheckPathContains_ThenShouldBeExpectedResult(string parentPath, string path, bool expectedResult)
4137
{
4238
Assert.AreEqual(expectedResult, FilesFolders.PathContains(parentPath, path));
4339
}
4440

41+
// Equality
42+
[TestCase(@"c:\foo", @"c:\foo", false)]
43+
[TestCase(@"c:\foo\", @"c:\foo", false)]
44+
[TestCase(@"c:\foo", @"c:\foo\", false)]
4545
[TestCase(@"c:\foo", @"c:\foo", true)]
4646
[TestCase(@"c:\foo\", @"c:\foo", true)]
4747
[TestCase(@"c:\foo", @"c:\foo\", true)]
48-
public void GivenTwoPathsAreTheSame_WhenCheckPathContains_ThenShouldBeTrue(string parentPath, string path, bool expectedResult)
48+
public void GivenTwoPathsAreTheSame_WhenCheckPathContains_ThenShouldBeExpectedResult(string parentPath, string path, bool expectedResult)
4949
{
50-
Assert.AreEqual(expectedResult, FilesFolders.PathContains(parentPath, path, true));
50+
Assert.AreEqual(expectedResult, FilesFolders.PathContains(parentPath, path, allowEqual: expectedResult));
5151
}
5252
}
5353
}

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

Lines changed: 1 addition & 1 deletion
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.7.0" />
57+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.7.2" />
5858
</ItemGroup>
5959

6060
</Project>

‎Flow.Launcher/Converters/BoolToVisibilityConverter.cs

Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,4 +34,38 @@ public object Convert(object value, System.Type targetType, object parameter, Cu
3434

3535
public object ConvertBack(object value, System.Type targetType, object parameter, CultureInfo culture) => throw new System.InvalidOperationException();
3636
}
37+
38+
public class SplitterConverter : IValueConverter
39+
/* Prevents the dragging part of the preview area from working when preview is turned off. */
40+
{
41+
public object Convert(object value, System.Type targetType, object parameter, CultureInfo culture)
42+
{
43+
if (parameter != null)
44+
{
45+
if (value is true)
46+
{
47+
return 0;
48+
}
49+
50+
else
51+
{
52+
return 5;
53+
}
54+
}
55+
else
56+
{
57+
if (value is true)
58+
{
59+
return 5;
60+
}
61+
62+
else
63+
{
64+
return 0;
65+
}
66+
}
67+
}
68+
69+
public object ConvertBack(object value, System.Type targetType, object parameter, CultureInfo culture) => throw new System.InvalidOperationException();
70+
}
3771
}

‎Flow.Launcher/CustomShortcutSetting.xaml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -75,6 +75,12 @@
7575
Text="{DynamicResource customeQueryShortcutTips}"
7676
TextAlignment="Left"
7777
TextWrapping="WrapWithOverflow" />
78+
<TextBlock
79+
Margin="0,20,0,0"
80+
FontSize="14"
81+
Text="{DynamicResource customeQueryShortcutGuide}"
82+
TextAlignment="Left"
83+
TextWrapping="WrapWithOverflow" />
7884
<Image
7985
Width="478"
8086
Margin="0,20,0,0"

‎Flow.Launcher/Flow.Launcher.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@
9595
<PackageReference Include="ModernWpfUI" Version="0.9.4" />
9696
<PackageReference Include="NHotkey.Wpf" Version="2.1.1" />
9797
<PackageReference Include="PropertyChanged.Fody" Version="3.4.0" />
98-
<PackageReference Include="SharpVectors" Version="1.8.1" />
98+
<PackageReference Include="SharpVectors" Version="1.8.2" />
9999
<PackageReference Include="VirtualizingWrapPanel" Version="1.5.7" />
100100
</ItemGroup>
101101

‎Flow.Launcher/Helper/HotKeyMapper.cs

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -44,10 +44,9 @@ internal static void SetHotkey(HotkeyModel hotkey, EventHandler<HotkeyEventArgs>
4444
}
4545
catch (Exception)
4646
{
47-
string errorMsg =
48-
string.Format(InternationalizationManager.Instance.GetTranslation("registerHotkeyFailed"),
49-
hotkeyStr);
50-
MessageBox.Show(errorMsg);
47+
string errorMsg = string.Format(InternationalizationManager.Instance.GetTranslation("registerHotkeyFailed"), hotkeyStr);
48+
string errorMsgTitle = InternationalizationManager.Instance.GetTranslation("MessageBoxTitle");
49+
MessageBox.Show(errorMsg,errorMsgTitle);
5150
}
5251
}
5352

‎Flow.Launcher/Images/illustration_02.png

19 KB
Loading

0 commit comments

Comments
 (0)