From 89e2d52d2743960327927ed7306410f0ab667e53 Mon Sep 17 00:00:00 2001 From: Jeremy Wu Date: Sun, 18 Dec 2022 15:11:04 +1100 Subject: [PATCH 01/13] Update sponsors Update sponsors --- README.md | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index 0f2270dcc..dcc1da935 100644 --- a/README.md +++ b/README.md @@ -327,10 +327,9 @@ And you can download - - -
itsonlyfrans - + +       +

### Mentions From b4f44da154fc666b69dd0fcd8caf63407b1dc99a Mon Sep 17 00:00:00 2001 From: Jeremy Wu Date: Sun, 18 Dec 2022 15:28:02 +1100 Subject: [PATCH 02/13] version bump --- appveyor.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/appveyor.yml b/appveyor.yml index f296c76fb..4f371e132 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -1,4 +1,4 @@ -version: '1.10.0.{build}' +version: '1.10.1.{build}' init: - ps: | From 13eba18ac5bc70d5e5efad41373830077beac00b Mon Sep 17 00:00:00 2001 From: Vic <10308169+VictoriousRaptor@users.noreply.github.com> Date: Sat, 17 Dec 2022 21:29:25 +0800 Subject: [PATCH 03/13] Disable PATH programs by default --- Plugins/Flow.Launcher.Plugin.Program/Programs/Win32.cs | 2 +- Plugins/Flow.Launcher.Plugin.Program/Settings.cs | 2 +- .../Flow.Launcher.Plugin.Program/Views/ProgramSetting.xaml.cs | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Plugins/Flow.Launcher.Plugin.Program/Programs/Win32.cs b/Plugins/Flow.Launcher.Plugin.Program/Programs/Win32.cs index e89970fb4..f8c220610 100644 --- a/Plugins/Flow.Launcher.Plugin.Program/Programs/Win32.cs +++ b/Plugins/Flow.Launcher.Plugin.Program/Programs/Win32.cs @@ -620,7 +620,7 @@ namespace Flow.Launcher.Plugin.Program.Programs autoIndexPrograms = autoIndexPrograms.Concat(startMenu); } - if (settings.EnablePATHSource) + if (settings.EnablePathSource) { var path = PATHPrograms(settings.GetSuffixes(), protocols, commonParents); programs = programs.Concat(path); diff --git a/Plugins/Flow.Launcher.Plugin.Program/Settings.cs b/Plugins/Flow.Launcher.Plugin.Program/Settings.cs index e3e8b99b9..34da42f1f 100644 --- a/Plugins/Flow.Launcher.Plugin.Program/Settings.cs +++ b/Plugins/Flow.Launcher.Plugin.Program/Settings.cs @@ -118,7 +118,7 @@ namespace Flow.Launcher.Plugin.Program public bool EnableDescription { get; set; } = false; public bool HideAppsPath { get; set; } = true; public bool EnableRegistrySource { get; set; } = true; - public bool EnablePATHSource { get; set; } = true; + public bool EnablePathSource { get; set; } = false; public string CustomizedExplorer { get; set; } = Explorer; public string CustomizedArgs { get; set; } = ExplorerArgs; diff --git a/Plugins/Flow.Launcher.Plugin.Program/Views/ProgramSetting.xaml.cs b/Plugins/Flow.Launcher.Plugin.Program/Views/ProgramSetting.xaml.cs index 7da224b69..4abb39225 100644 --- a/Plugins/Flow.Launcher.Plugin.Program/Views/ProgramSetting.xaml.cs +++ b/Plugins/Flow.Launcher.Plugin.Program/Views/ProgramSetting.xaml.cs @@ -69,10 +69,10 @@ namespace Flow.Launcher.Plugin.Program.Views public bool EnablePATHSource { - get => _settings.EnablePATHSource; + get => _settings.EnablePathSource; set { - _settings.EnablePATHSource = value; + _settings.EnablePathSource = value; ReIndexing(); } } From 4fd5039e66f5a0a58b48a44afbac80fb4a50d682 Mon Sep 17 00:00:00 2001 From: Vic <10308169+VictoriousRaptor@users.noreply.github.com> Date: Mon, 19 Dec 2022 00:37:02 +0800 Subject: [PATCH 04/13] Fix item can't be unselected after editing shortcut --- Flow.Launcher/ViewModel/SettingWindowViewModel.cs | 3 +++ 1 file changed, 3 insertions(+) diff --git a/Flow.Launcher/ViewModel/SettingWindowViewModel.cs b/Flow.Launcher/ViewModel/SettingWindowViewModel.cs index a97a328e6..f160c2e04 100644 --- a/Flow.Launcher/ViewModel/SettingWindowViewModel.cs +++ b/Flow.Launcher/ViewModel/SettingWindowViewModel.cs @@ -775,8 +775,11 @@ namespace Flow.Launcher.ViewModel var shortcutSettingWindow = new CustomShortcutSetting(item.Key, item.Value, this); if (shortcutSettingWindow.ShowDialog() == true) { + // https://stackoverflow.com/questions/16789360/wpf-listbox-items-with-changing-hashcode + SelectedCustomShortcut = null; item.Key = shortcutSettingWindow.Key; item.Value = shortcutSettingWindow.Value; + SelectedCustomShortcut = item; return true; } return false; From 9564092e4115334078b6e728a752395b51ab1a3f Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 19 Dec 2022 22:06:11 +0000 Subject: [PATCH 05/13] Bump nunit from 3.13.2 to 3.13.3 Bumps [nunit](https://github.com/nunit/nunit) from 3.13.2 to 3.13.3. - [Release notes](https://github.com/nunit/nunit/releases) - [Changelog](https://github.com/nunit/nunit/blob/v3.13.3/CHANGES.md) - [Commits](https://github.com/nunit/nunit/compare/v3.13.2...v3.13.3) --- updated-dependencies: - dependency-name: nunit dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- Flow.Launcher.Test/Flow.Launcher.Test.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Flow.Launcher.Test/Flow.Launcher.Test.csproj b/Flow.Launcher.Test/Flow.Launcher.Test.csproj index c4341288f..c67a5cf22 100644 --- a/Flow.Launcher.Test/Flow.Launcher.Test.csproj +++ b/Flow.Launcher.Test/Flow.Launcher.Test.csproj @@ -49,7 +49,7 @@ - + all runtime; build; native; contentfiles; analyzers; buildtransitive From 5cc4a36762de2a726cde2dbb231f63b77fa73b8d Mon Sep 17 00:00:00 2001 From: DB p Date: Tue, 20 Dec 2022 13:35:20 +0900 Subject: [PATCH 06/13] Add StartEn Setting --- .../UserSettings/Settings.cs | 1 + Flow.Launcher/Languages/en.xaml | 2 ++ Flow.Launcher/MainWindow.xaml | 1 + Flow.Launcher/MainWindow.xaml.cs | 21 +++++++++++++ Flow.Launcher/SettingWindow.xaml | 31 ++++++++++++++++--- 5 files changed, 52 insertions(+), 4 deletions(-) diff --git a/Flow.Launcher.Infrastructure/UserSettings/Settings.cs b/Flow.Launcher.Infrastructure/UserSettings/Settings.cs index 09fad990b..9ae1748da 100644 --- a/Flow.Launcher.Infrastructure/UserSettings/Settings.cs +++ b/Flow.Launcher.Infrastructure/UserSettings/Settings.cs @@ -147,6 +147,7 @@ namespace Flow.Launcher.Infrastructure.UserSettings /// public bool ShouldUsePinyin { get; set; } = false; public bool AlwaysPreview { get; set; } = false; + public bool AlwaysStartEn { get; set; } = false; [JsonInclude, JsonConverter(typeof(JsonStringEnumConverter))] public SearchPrecisionScore QuerySearchPrecision { get; private set; } = SearchPrecisionScore.Regular; diff --git a/Flow.Launcher/Languages/en.xaml b/Flow.Launcher/Languages/en.xaml index d0bdfee9b..c1fafa8db 100644 --- a/Flow.Launcher/Languages/en.xaml +++ b/Flow.Launcher/Languages/en.xaml @@ -55,6 +55,8 @@ Select the file manager to use when opening the folder. Default Web Browser Setting for New Tab, New Window, Private Mode. + Always Start in English Layout + If you are using both native language and English keyboard layouts, start the flow in English layout state. Python Directory Auto Update Select diff --git a/Flow.Launcher/MainWindow.xaml b/Flow.Launcher/MainWindow.xaml index 9f8d523e0..3941c5e0a 100644 --- a/Flow.Launcher/MainWindow.xaml +++ b/Flow.Launcher/MainWindow.xaml @@ -244,6 +244,7 @@ + -  @@ -943,13 +945,34 @@ Text="{Binding Settings.PluginSettings.PythonDirectory, TargetNullValue='No Setting'}" />