From 1a49178ebe6525d66758fe16672c6e1888fc5a5a Mon Sep 17 00:00:00 2001 From: DB p Date: Fri, 10 Dec 2021 23:28:47 +0900 Subject: [PATCH 1/6] Add Subtext Highlight Setting --- .../UserSettings/Settings.cs | 1 + .../Converters/HighlightTextConverter.cs | 13 ++++++++++- Flow.Launcher/Languages/en.xaml | 1 + Flow.Launcher/SettingWindow.xaml | 23 +++++++++++++++++++ .../ViewModel/SettingWindowViewModel.cs | 6 +++++ 5 files changed, 43 insertions(+), 1 deletion(-) diff --git a/Flow.Launcher.Infrastructure/UserSettings/Settings.cs b/Flow.Launcher.Infrastructure/UserSettings/Settings.cs index 8ecd6dc4b76..cbe226e6b27 100644 --- a/Flow.Launcher.Infrastructure/UserSettings/Settings.cs +++ b/Flow.Launcher.Infrastructure/UserSettings/Settings.cs @@ -40,6 +40,7 @@ public string Language public string ResultFontStretch { get; set; } public bool UseGlyphIcons { get; set; } = true; public bool UseAnimation { get; set; } = true; + public bool SubtitleHighlight { get; set; } = false; public bool UseSound { get; set; } = true; public bool FirstLaunch { get; set; } = true; diff --git a/Flow.Launcher/Converters/HighlightTextConverter.cs b/Flow.Launcher/Converters/HighlightTextConverter.cs index 972dd1bc83e..d969081d499 100644 --- a/Flow.Launcher/Converters/HighlightTextConverter.cs +++ b/Flow.Launcher/Converters/HighlightTextConverter.cs @@ -8,11 +8,15 @@ using System.Windows.Data; using System.Windows.Media; using System.Windows.Documents; +using Flow.Launcher.Infrastructure.UserSettings; +using Flow.Launcher.Core.Resource; namespace Flow.Launcher.Converters { public class HighlightTextConverter : IMultiValueConverter { + public Settings Settings { get;} + Settings settings = new Settings(); public object Convert(object[] value, Type targetType, object parameter, CultureInfo cultureInfo) { var text = value[0] as string; @@ -31,8 +35,14 @@ public object Convert(object[] value, Type targetType, object parameter, Culture var currentCharacter = text.Substring(i, 1); if (this.ShouldHighlight(highlightData, i)) { - + System.Diagnostics.Debug.WriteLine(settings.SubtitleHighlight); + if (settings.SubtitleHighlight == true) + { textBlock.Inlines.Add(new Run(currentCharacter) { Style = (Style)Application.Current.FindResource("HighlightStyle") }); + } + else + { + } } else @@ -52,5 +62,6 @@ private bool ShouldHighlight(List highlightData, int index) { return highlightData.Contains(index); } + } } diff --git a/Flow.Launcher/Languages/en.xaml b/Flow.Launcher/Languages/en.xaml index e11cbd5cbb3..e312ccf0bd3 100644 --- a/Flow.Launcher/Languages/en.xaml +++ b/Flow.Launcher/Languages/en.xaml @@ -90,6 +90,7 @@ Theme Folder Open Theme Folder Color Scheme + Subtitle Highlight System Default Light Dark diff --git a/Flow.Launcher/SettingWindow.xaml b/Flow.Launcher/SettingWindow.xaml index d8c94390ba7..91067bdcdaf 100644 --- a/Flow.Launcher/SettingWindow.xaml +++ b/Flow.Launcher/SettingWindow.xaml @@ -1937,6 +1937,29 @@ + + + + + + + + +  + + + diff --git a/Flow.Launcher/ViewModel/SettingWindowViewModel.cs b/Flow.Launcher/ViewModel/SettingWindowViewModel.cs index 342c85da202..3f4e82611a0 100644 --- a/Flow.Launcher/ViewModel/SettingWindowViewModel.cs +++ b/Flow.Launcher/ViewModel/SettingWindowViewModel.cs @@ -356,12 +356,18 @@ public bool UseAnimation set => Settings.UseAnimation = value; } + public bool UseSound { get => Settings.UseSound; set => Settings.UseSound = value; } + public bool SubtitleHighlight + { + get => Settings.SubtitleHighlight; + set => Settings.SubtitleHighlight = value; + } public Brush PreviewBackground { get From 0acd2e12980fe0297f9e2a4d8be5e3e5462b3afe Mon Sep 17 00:00:00 2001 From: DB p Date: Sat, 11 Dec 2021 03:20:07 +0900 Subject: [PATCH 2/6] Revert "Add Subtext Highlight Setting" This reverts commit 1a49178ebe6525d66758fe16672c6e1888fc5a5a. --- .../UserSettings/Settings.cs | 1 - .../Converters/HighlightTextConverter.cs | 13 +---------- Flow.Launcher/Languages/en.xaml | 1 - Flow.Launcher/SettingWindow.xaml | 23 ------------------- .../ViewModel/SettingWindowViewModel.cs | 6 ----- 5 files changed, 1 insertion(+), 43 deletions(-) diff --git a/Flow.Launcher.Infrastructure/UserSettings/Settings.cs b/Flow.Launcher.Infrastructure/UserSettings/Settings.cs index cbe226e6b27..8ecd6dc4b76 100644 --- a/Flow.Launcher.Infrastructure/UserSettings/Settings.cs +++ b/Flow.Launcher.Infrastructure/UserSettings/Settings.cs @@ -40,7 +40,6 @@ public string Language public string ResultFontStretch { get; set; } public bool UseGlyphIcons { get; set; } = true; public bool UseAnimation { get; set; } = true; - public bool SubtitleHighlight { get; set; } = false; public bool UseSound { get; set; } = true; public bool FirstLaunch { get; set; } = true; diff --git a/Flow.Launcher/Converters/HighlightTextConverter.cs b/Flow.Launcher/Converters/HighlightTextConverter.cs index d969081d499..972dd1bc83e 100644 --- a/Flow.Launcher/Converters/HighlightTextConverter.cs +++ b/Flow.Launcher/Converters/HighlightTextConverter.cs @@ -8,15 +8,11 @@ using System.Windows.Data; using System.Windows.Media; using System.Windows.Documents; -using Flow.Launcher.Infrastructure.UserSettings; -using Flow.Launcher.Core.Resource; namespace Flow.Launcher.Converters { public class HighlightTextConverter : IMultiValueConverter { - public Settings Settings { get;} - Settings settings = new Settings(); public object Convert(object[] value, Type targetType, object parameter, CultureInfo cultureInfo) { var text = value[0] as string; @@ -35,14 +31,8 @@ public object Convert(object[] value, Type targetType, object parameter, Culture var currentCharacter = text.Substring(i, 1); if (this.ShouldHighlight(highlightData, i)) { - System.Diagnostics.Debug.WriteLine(settings.SubtitleHighlight); - if (settings.SubtitleHighlight == true) - { + textBlock.Inlines.Add(new Run(currentCharacter) { Style = (Style)Application.Current.FindResource("HighlightStyle") }); - } - else - { - } } else @@ -62,6 +52,5 @@ private bool ShouldHighlight(List highlightData, int index) { return highlightData.Contains(index); } - } } diff --git a/Flow.Launcher/Languages/en.xaml b/Flow.Launcher/Languages/en.xaml index e312ccf0bd3..e11cbd5cbb3 100644 --- a/Flow.Launcher/Languages/en.xaml +++ b/Flow.Launcher/Languages/en.xaml @@ -90,7 +90,6 @@ Theme Folder Open Theme Folder Color Scheme - Subtitle Highlight System Default Light Dark diff --git a/Flow.Launcher/SettingWindow.xaml b/Flow.Launcher/SettingWindow.xaml index 91067bdcdaf..d8c94390ba7 100644 --- a/Flow.Launcher/SettingWindow.xaml +++ b/Flow.Launcher/SettingWindow.xaml @@ -1937,29 +1937,6 @@ - - - - - - - - -  - - - diff --git a/Flow.Launcher/ViewModel/SettingWindowViewModel.cs b/Flow.Launcher/ViewModel/SettingWindowViewModel.cs index 3f4e82611a0..342c85da202 100644 --- a/Flow.Launcher/ViewModel/SettingWindowViewModel.cs +++ b/Flow.Launcher/ViewModel/SettingWindowViewModel.cs @@ -356,18 +356,12 @@ public bool UseAnimation set => Settings.UseAnimation = value; } - public bool UseSound { get => Settings.UseSound; set => Settings.UseSound = value; } - public bool SubtitleHighlight - { - get => Settings.SubtitleHighlight; - set => Settings.SubtitleHighlight = value; - } public Brush PreviewBackground { get From f1c46d1048775a69f13d30daf23c24a159de31c7 Mon Sep 17 00:00:00 2001 From: DB p Date: Sat, 11 Dec 2021 03:22:47 +0900 Subject: [PATCH 3/6] Remove Subtitle Highlight --- Flow.Launcher/ResultListBox.xaml | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/Flow.Launcher/ResultListBox.xaml b/Flow.Launcher/ResultListBox.xaml index c674e9a701b..b96abca9550 100644 --- a/Flow.Launcher/ResultListBox.xaml +++ b/Flow.Launcher/ResultListBox.xaml @@ -133,12 +133,7 @@ Style="{DynamicResource ItemSubTitleStyle}" Text="{Binding Result.SubTitle}" ToolTip="{Binding ShowSubTitleToolTip}"> - - - - - - + From 6f9a879f58f7decd63521171fa3f12abb6e14469 Mon Sep 17 00:00:00 2001 From: Jeremy Date: Tue, 21 Dec 2021 07:19:31 +1100 Subject: [PATCH 4/6] remove subtitle highlighting code --- Flow.Launcher.Plugin/Result.cs | 9 +++------ Plugins/Flow.Launcher.Plugin.Sys/Main.cs | 7 +------ .../Helper/ResultHelper.cs | 1 - 3 files changed, 4 insertions(+), 13 deletions(-) diff --git a/Flow.Launcher.Plugin/Result.cs b/Flow.Launcher.Plugin/Result.cs index 29f8198ab44..6848f6ca559 100644 --- a/Flow.Launcher.Plugin/Result.cs +++ b/Flow.Launcher.Plugin/Result.cs @@ -1,4 +1,4 @@ -using System; +using System; using System.Collections.Generic; using System.IO; using System.Windows.Media; @@ -77,9 +77,7 @@ public string IcoPath /// public IList TitleHighlightData { get; set; } - /// - /// A list of indexes for the characters to be highlighted in SubTitle - /// + [Obsolete("Deprecated as of Flow Launcher v1.9.1. Subtitle highlighting is no longer offered")] public IList SubTitleHighlightData { get; set; } /// @@ -110,8 +108,7 @@ public override bool Equals(object obj) var equality = string.Equals(r?.Title, Title) && string.Equals(r?.SubTitle, SubTitle) && string.Equals(r?.IcoPath, IcoPath) && - TitleHighlightData == r.TitleHighlightData && - SubTitleHighlightData == r.SubTitleHighlightData; + TitleHighlightData == r.TitleHighlightData; return equality; } diff --git a/Plugins/Flow.Launcher.Plugin.Sys/Main.cs b/Plugins/Flow.Launcher.Plugin.Sys/Main.cs index 7b5d85ae9a8..78e4893a5a3 100644 --- a/Plugins/Flow.Launcher.Plugin.Sys/Main.cs +++ b/Plugins/Flow.Launcher.Plugin.Sys/Main.cs @@ -66,14 +66,9 @@ public List Query(Query query) if (score > 0) { c.Score = score; + if (score == titleMatch.Score) - { c.TitleHighlightData = titleMatch.MatchData; - } - else - { - c.SubTitleHighlightData = subTitleMatch.MatchData; - } results.Add(c); } diff --git a/Plugins/Flow.Launcher.Plugin.WindowsSettings/Helper/ResultHelper.cs b/Plugins/Flow.Launcher.Plugin.WindowsSettings/Helper/ResultHelper.cs index ca3b06b8d61..3005567c48d 100644 --- a/Plugins/Flow.Launcher.Plugin.WindowsSettings/Helper/ResultHelper.cs +++ b/Plugins/Flow.Launcher.Plugin.WindowsSettings/Helper/ResultHelper.cs @@ -54,7 +54,6 @@ internal static List GetResultList( if (areaMatch.IsSearchPrecisionScoreMet()) { var settingResult = NewSettingResult(areaMatch.Score + midScore, entry.Type); - settingResult.SubTitleHighlightData = areaMatch.MatchData.Select(x => x + 6).ToList(); result = settingResult; } else From 288bf4ce09c54ced8f12647c9ade5d01b3ab94ed Mon Sep 17 00:00:00 2001 From: Jeremy Date: Sat, 1 Jan 2022 21:49:53 +1100 Subject: [PATCH 5/6] version bump plugins --- Plugins/Flow.Launcher.Plugin.Sys/plugin.json | 2 +- Plugins/Flow.Launcher.Plugin.WindowsSettings/plugin.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Plugins/Flow.Launcher.Plugin.Sys/plugin.json b/Plugins/Flow.Launcher.Plugin.Sys/plugin.json index 4c381eec239..9c2dcbfff05 100644 --- a/Plugins/Flow.Launcher.Plugin.Sys/plugin.json +++ b/Plugins/Flow.Launcher.Plugin.Sys/plugin.json @@ -4,7 +4,7 @@ "Name": "System Commands", "Description": "Provide System related commands. e.g. shutdown,lock, setting etc.", "Author": "qianlifeng", - "Version": "1.6.0", + "Version": "1.6.1", "Language": "csharp", "Website": "https://github.com/Flow-Launcher/Flow.Launcher", "ExecuteFileName": "Flow.Launcher.Plugin.Sys.dll", diff --git a/Plugins/Flow.Launcher.Plugin.WindowsSettings/plugin.json b/Plugins/Flow.Launcher.Plugin.WindowsSettings/plugin.json index 5d2ad85e710..f5211e9da79 100644 --- a/Plugins/Flow.Launcher.Plugin.WindowsSettings/plugin.json +++ b/Plugins/Flow.Launcher.Plugin.WindowsSettings/plugin.json @@ -4,7 +4,7 @@ "Description": "Search settings inside Control Panel and Settings App", "Name": "Windows Settings", "Author": "TobiasSekan", - "Version": "2.0.0", + "Version": "2.0.1", "Language": "csharp", "Website": "https://github.com/Flow-Launcher/Flow.Launcher", "ExecuteFileName": "Flow.Launcher.Plugin.WindowsSettings.dll", From 4d598cd1f304187f8a359019219f0bf478b70ec2 Mon Sep 17 00:00:00 2001 From: Jeremy Date: Sat, 1 Jan 2022 21:50:13 +1100 Subject: [PATCH 6/6] bump Plugin project version --- Flow.Launcher.Plugin/Flow.Launcher.Plugin.csproj | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Flow.Launcher.Plugin/Flow.Launcher.Plugin.csproj b/Flow.Launcher.Plugin/Flow.Launcher.Plugin.csproj index 7ce2fc8fde9..f5f937c6572 100644 --- a/Flow.Launcher.Plugin/Flow.Launcher.Plugin.csproj +++ b/Flow.Launcher.Plugin/Flow.Launcher.Plugin.csproj @@ -14,10 +14,10 @@ - 2.1.0 - 2.1.0 - 2.1.0 - 2.1.0 + 2.1.1 + 2.1.1 + 2.1.1 + 2.1.1 Flow.Launcher.Plugin Flow-Launcher MIT