Skip to content

Commit 12263fe

Browse files
jjw24jjw24
authored
Merge pull request #2321 from Flow-Launcher/dev
Release 1.16.2
2 parents 767ff20 + a8206df commit 12263fe

File tree

58 files changed

+1113
-560
lines changed

Some content is hidden

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

58 files changed

+1113
-560
lines changed

‎.github/actions/spelling/expect.txt

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -103,3 +103,9 @@ Português
103103
Português (Brasil)
104104
Italiano
105105
Slovenský
106+
Droplex
107+
Preinstalled
108+
errormetadatafile
109+
noresult
110+
pluginsmanager
111+
alreadyexists

‎.github/workflows/default_plugins.yml

Lines changed: 371 additions & 0 deletions
Large diffs are not rendered by default.

‎Flow.Launcher.Core/ExternalPlugins/Environments/PythonEnvironment.cs

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ internal class PythonEnvironment : AbstractPluginEnvironment
1616

1717
internal override string EnvPath => Path.Combine(DataLocation.PluginEnvironmentsPath, EnvName);
1818

19-
internal override string InstallPath => Path.Combine(EnvPath, "PythonEmbeddable-v3.8.9");
19+
internal override string InstallPath => Path.Combine(EnvPath, "PythonEmbeddable-v3.11.4");
2020

2121
internal override string ExecutablePath => Path.Combine(InstallPath, "pythonw.exe");
2222

@@ -30,8 +30,9 @@ internal override void InstallEnvironment()
3030
{
3131
FilesFolders.RemoveFolderIfExists(InstallPath);
3232

33-
// Python 3.8.9 is used for Windows 7 compatibility
34-
DroplexPackage.Drop(App.python_3_8_9_embeddable, InstallPath).Wait();
33+
// Python 3.11.4 is no longer Windows 7 compatible. If user is on Win 7 and
34+
// uses Python plugin they need to custom install and use v3.8.9
35+
DroplexPackage.Drop(App.python_3_11_4_embeddable, InstallPath).Wait();
3536

3637
PluginsSettingsFilePath = ExecutablePath;
3738
}

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -53,8 +53,8 @@
5353
</ItemGroup>
5454

5555
<ItemGroup>
56-
<PackageReference Include="Droplex" Version="1.6.0" />
57-
<PackageReference Include="FSharp.Core" Version="7.0.300" />
56+
<PackageReference Include="Droplex" Version="1.7.0" />
57+
<PackageReference Include="FSharp.Core" Version="7.0.400" />
5858
<PackageReference Include="Microsoft.IO.RecyclableMemoryStream" Version="2.3.2" />
5959
<PackageReference Include="squirrel.windows" Version="1.5.2" NoWarn="NU1701" />
6060
</ItemGroup>

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@
5353
<PrivateAssets>all</PrivateAssets>
5454
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
5555
</PackageReference>
56-
<PackageReference Include="Microsoft.VisualStudio.Threading" Version="17.6.40" />
56+
<PackageReference Include="Microsoft.VisualStudio.Threading" Version="17.7.30" />
5757
<PackageReference Include="NLog" Version="4.7.10" />
5858
<PackageReference Include="NLog.Schema" Version="4.7.10" />
5959
<PackageReference Include="NLog.Web.AspNetCore" Version="4.13.0" />

‎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/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

‎Flow.Launcher/Languages/ar.xaml

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
<?xml version="1.0"?>
22
<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:system="clr-namespace:System;assembly=mscorlib">
33
<!-- MainWindow -->
4-
<system:String x:Key="registerHotkeyFailed">Failed to register hotkey: {0}</system:String>
4+
<system:String x:Key="registerHotkeyFailed">Failed to register hotkey &quot;{0}&quot;. The hotkey may be in use by another program. Change to a different hotkey, or exit another program.</system:String>
5+
<system:String x:Key="MessageBoxTitle">Flow Launcher</system:String>
56
<system:String x:Key="couldnotStartCmd">Could not start {0}</system:String>
67
<system:String x:Key="invalidFlowLauncherPluginFileFormat">Invalid Flow Launcher plugin file format</system:String>
78
<system:String x:Key="setAsTopMostInThisQuery">Set as topmost in this query</system:String>
@@ -287,6 +288,10 @@
287288
<!-- Custom Query Shortcut Dialog -->
288289
<system:String x:Key="customeQueryShortcutTitle">Custom Query Shortcut</system:String>
289290
<system:String x:Key="customeQueryShortcutTips">Enter a shortcut that automatically expands to the specified query.</system:String>
291+
<system:String x:Key="customeQueryShortcutGuide" xml:space="preserve">A shortcut is expanded when it exactly matches the query.
292+
293+
If you add an '@' prefix while inputting a shortcut, it matches any position in the query. Builtin shortcuts match any position in a query.
294+
</system:String>
290295
<system:String x:Key="duplicateShortcut">Shortcut already exists, please enter a new Shortcut or edit the existing one.</system:String>
291296
<system:String x:Key="emptyShortcut">Shortcut and/or its expansion is empty.</system:String>
292297

‎Flow.Launcher/Languages/cs.xaml

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
<?xml version="1.0"?>
22
<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:system="clr-namespace:System;assembly=mscorlib">
33
<!-- MainWindow -->
4-
<system:String x:Key="registerHotkeyFailed">Nepodařilo se zaregistrovat zkratku: {0}</system:String>
4+
<system:String x:Key="registerHotkeyFailed">Nepodařilo se zaregistrovat hotkey &quot;{0}&quot;. Klávesová zkratka může být používána jiným programem. Změňte na jinou klávesu nebo ukončíte jiný program.</system:String>
5+
<system:String x:Key="MessageBoxTitle">Flow Launcher</system:String>
56
<system:String x:Key="couldnotStartCmd">Nepodařilo se spustit {0}</system:String>
67
<system:String x:Key="invalidFlowLauncherPluginFileFormat">Neplatný typ souboru pluginu aplikace Flow Launcher</system:String>
78
<system:String x:Key="setAsTopMostInThisQuery">Připnout jako první výsledek tohoto hledání</system:String>
@@ -287,6 +288,10 @@
287288
<!-- Custom Query Shortcut Dialog -->
288289
<system:String x:Key="customeQueryShortcutTitle">Vlastní klávesová zkratka pro zadávání dotazů</system:String>
289290
<system:String x:Key="customeQueryShortcutTips">Zadejte zkratku, která automaticky vloží konkrétní dotaz.</system:String>
291+
<system:String x:Key="customeQueryShortcutGuide" xml:space="preserve">Zkratka se rozbalí, pokud přesně odpovídá dotazu.
292+
293+
Pokud před zkratku při zadávání přidáte znak &quot;@&quot;, bude odpovídat libovolné pozici v dotazu. Vestavěné zkratky odpovídají libovolné pozici v dotazu.
294+
</system:String>
290295
<system:String x:Key="duplicateShortcut">Zkratka již existuje, zadejte novou zkratku nebo upravte stávající.</system:String>
291296
<system:String x:Key="emptyShortcut">Zkratka a/nebo její plné znění je prázdné.</system:String>
292297

‎Flow.Launcher/Languages/da.xaml

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
<?xml version="1.0"?>
22
<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:system="clr-namespace:System;assembly=mscorlib">
33
<!-- MainWindow -->
4-
<system:String x:Key="registerHotkeyFailed">Kunne ikke registrere genvejstast: {0}</system:String>
4+
<system:String x:Key="registerHotkeyFailed">Failed to register hotkey &quot;{0}&quot;. The hotkey may be in use by another program. Change to a different hotkey, or exit another program.</system:String>
5+
<system:String x:Key="MessageBoxTitle">Flow Launcher</system:String>
56
<system:String x:Key="couldnotStartCmd">Kunne ikke starte {0}</system:String>
67
<system:String x:Key="invalidFlowLauncherPluginFileFormat">Ugyldigt Flow Launcher plugin filformat</system:String>
78
<system:String x:Key="setAsTopMostInThisQuery">Sæt øverst i denne søgning</system:String>
@@ -287,6 +288,10 @@
287288
<!-- Custom Query Shortcut Dialog -->
288289
<system:String x:Key="customeQueryShortcutTitle">Custom Query Shortcut</system:String>
289290
<system:String x:Key="customeQueryShortcutTips">Enter a shortcut that automatically expands to the specified query.</system:String>
291+
<system:String x:Key="customeQueryShortcutGuide" xml:space="preserve">A shortcut is expanded when it exactly matches the query.
292+
293+
If you add an '@' prefix while inputting a shortcut, it matches any position in the query. Builtin shortcuts match any position in a query.
294+
</system:String>
290295
<system:String x:Key="duplicateShortcut">Shortcut already exists, please enter a new Shortcut or edit the existing one.</system:String>
291296
<system:String x:Key="emptyShortcut">Shortcut and/or its expansion is empty.</system:String>
292297

0 commit comments

Comments
 (0)