Revert "Merge pull request #4042 from 01Dri/feature/history_mode"

jjw24 · jjw24 · commit 9f4a3ccc8b73 · 2026-02-22T14:29:38.000+11:00
This reverts commit 3d9ef2c, reversing changes made to 4fe3b55.
diff --git a/Directory.Build.props b/Directory.Build.props
@@ -1,7 +1,7 @@
 <Project>
   <PropertyGroup>
     <AccelerateBuildsInVisualStudio>true</AccelerateBuildsInVisualStudio>
-    <!-- Workaround https://github.com/dotnet/runtime/issues/109682 -->
+    <!-- Work around https://github.com/dotnet/runtime/issues/109682 -->
     <CETCompat>false</CETCompat>
   </PropertyGroup>
 </Project>
diff --git a/Flow.Launcher.Infrastructure/UserSettings/Settings.cs b/Flow.Launcher.Infrastructure/UserSettings/Settings.cs
@@ -7,7 +7,6 @@
 using Flow.Launcher.Infrastructure.Hotkey;
 using Flow.Launcher.Infrastructure.Logger;
 using Flow.Launcher.Infrastructure.Storage;
-using Flow.Launcher.Localization.Attributes;
 using Flow.Launcher.Plugin;
 using Flow.Launcher.Plugin.SharedModels;
 
@@ -515,21 +514,6 @@ public bool ShowAtTopmost
         [JsonConverter(typeof(JsonStringEnumConverter))]
         public LastQueryMode LastQueryMode { get; set; } = LastQueryMode.Selected;
 
-        private HistoryStyle _historyStyle = HistoryStyle.Query;
-        [JsonConverter(typeof(JsonStringEnumConverter))]
-        public HistoryStyle HistoryStyle
-        {
-            get => _historyStyle;
-            set
-            {
-                if (_historyStyle != value)
-                {
-                    _historyStyle = value;
-                    OnPropertyChanged();
-                }
-            }
-        }
-
         [JsonConverter(typeof(JsonStringEnumConverter))]
         public AnimationSpeeds AnimationSpeed { get; set; } = AnimationSpeeds.Medium;
         public int CustomAnimationLength { get; set; } = 360;
@@ -712,14 +696,4 @@ public enum DialogJumpFileResultBehaviours
         FullPathOpen,
         Directory
     }
-
-    [EnumLocalize]
-    public enum HistoryStyle
-    {
-        [EnumLocalizeKey(nameof(Localize.queryHistory))]
-        Query,
-
-        [EnumLocalizeKey(nameof(Localize.executedHistory))]
-        LastOpened
-    }
 }
diff --git a/Flow.Launcher/Flow.Launcher.csproj b/Flow.Launcher/Flow.Launcher.csproj
@@ -185,7 +185,7 @@
   </Target>
   
   <Target Name="RemoveDuplicateAnalyzers" BeforeTargets="CoreCompile">
-    <!-- Workaround https://github.com/dotnet/wpf/issues/6792 -->
+    <!-- Work around https://github.com/dotnet/wpf/issues/6792 -->
     <ItemGroup>
       <FilteredAnalyzer Include="@(Analyzer-&gt;Distinct())" />
       <Analyzer Remove="@(Analyzer)" />
diff --git a/Flow.Launcher/Helper/ResultHelper.cs b/Flow.Launcher/Helper/ResultHelper.cs
diff --git a/Flow.Launcher/Languages/en.xaml b/Flow.Launcher/Languages/en.xaml
@@ -172,10 +172,6 @@
     <system:String x:Key="homePageToolTip">Show home page results when query text is empty.</system:String>
     <system:String x:Key="historyResultsForHomePage">Show History Results in Home Page</system:String>
     <system:String x:Key="historyResultsCountForHomePage">Maximum History Results Shown in Home Page</system:String>
-    <system:String x:Key="historyStyle">History Style</system:String>
-    <system:String x:Key="historyStyleTooltip">Choose the type of history to show in the History and Home Page</system:String>
-    <system:String x:Key="queryHistory">Query history</system:String>
-    <system:String x:Key="executedHistory">Last opened history</system:String>
     <system:String x:Key="homeToggleBoxToolTip">This can only be edited if plugin supports Home feature and Home Page is enabled.</system:String>
     <system:String x:Key="showAtTopmost">Show Search Window at Foremost</system:String>
     <system:String x:Key="showAtTopmostToolTip">Overrides other programs' 'Always on Top' setting and displays Flow in the foremost position.</system:String>
diff --git a/Flow.Launcher/MainWindow.xaml.cs b/Flow.Launcher/MainWindow.xaml.cs
@@ -322,7 +322,6 @@ private void OnLoaded(object sender, RoutedEventArgs e)
                         break;
                     case nameof(Settings.ShowHomePage):
                     case nameof(Settings.ShowHistoryResultsForHomePage):
-                    case nameof(Settings.HistoryStyle):
                         if (_viewModel.QueryResultsSelected() && string.IsNullOrEmpty(_viewModel.QueryText))
                         {
                             _viewModel.QueryResults();
@@ -860,7 +859,7 @@ private void InitializeContextMenu()
 
         public void UpdatePosition()
         {
-            // Initialize call twice to workaround multi-display alignment issue- https://github.com/Flow-Launcher/Flow.Launcher/issues/2910
+            // Initialize call twice to work around multi-display alignment issue- https://github.com/Flow-Launcher/Flow.Launcher/issues/2910
             if (_viewModel.IsDialogJumpWindowUnderDialog())
             {
                 InitializeDialogJumpPosition();
@@ -884,7 +883,7 @@ private async Task PositionResetAsync()
 
         private void InitializePosition()
         {
-            // Initialize call twice to workaround multi-display alignment issue- https://github.com/Flow-Launcher/Flow.Launcher/issues/2910
+            // Initialize call twice to work around multi-display alignment issue- https://github.com/Flow-Launcher/Flow.Launcher/issues/2910
             InitializePositionInner();
             InitializePositionInner();
             return;
diff --git a/Flow.Launcher/SettingPages/ViewModels/SettingsPaneGeneralViewModel.cs b/Flow.Launcher/SettingPages/ViewModels/SettingsPaneGeneralViewModel.cs
@@ -147,8 +147,6 @@ public bool PortableMode
     public List<LastQueryModeData> LastQueryModes { get; } =
         DropdownDataGeneric<LastQueryMode>.GetValues<LastQueryModeData>("LastQuery");
 
-    public List<HistoryStyleLocalized> HistoryStyles { get; } = HistoryStyleLocalized.GetValues();
-
     public bool EnableDialogJump
     {
         get => Settings.EnableDialogJump;
@@ -215,7 +213,6 @@ private void UpdateEnumDropdownLocalizations()
         DropdownDataGeneric<SearchWindowAligns>.UpdateLabels(SearchWindowAligns);
         DropdownDataGeneric<SearchPrecisionScore>.UpdateLabels(SearchPrecisionScores);
         DropdownDataGeneric<LastQueryMode>.UpdateLabels(LastQueryModes);
-        HistoryStyleLocalized.UpdateLabels(HistoryStyles);
         DropdownDataGeneric<DoublePinyinSchemas>.UpdateLabels(DoublePinyinSchemas);
         DropdownDataGeneric<DialogJumpWindowPositions>.UpdateLabels(DialogJumpWindowPositions);
         DropdownDataGeneric<DialogJumpResultBehaviours>.UpdateLabels(DialogJumpResultBehaviours);
diff --git a/Flow.Launcher/SettingPages/Views/SettingsPaneGeneral.xaml b/Flow.Launcher/SettingPages/Views/SettingsPaneGeneral.xaml
@@ -255,22 +255,6 @@
                     SelectedValuePath="Value" />
             </ui:SettingsCard>
 
-            <ui:SettingsCard
-                Margin="0 14 0 0"
-                Description="{DynamicResource historyStyleTooltip}"
-                Header="{DynamicResource historyStyle}">
-                <ui:SettingsCard.HeaderIcon>
-                    <ui:FontIcon Glyph="&#xE81C;" />
-                </ui:SettingsCard.HeaderIcon>
-
-                <ComboBox
-                    MaxWidth="200"
-                    DisplayMemberPath="Display"
-                    ItemsSource="{Binding HistoryStyles}"
-                    SelectedValue="{Binding Settings.HistoryStyle}"
-                    SelectedValuePath="Value" />
-            </ui:SettingsCard>
-
             <ui:SettingsCard
                 Margin="0 14 0 0"
                 Description="{DynamicResource autoRestartAfterChangingToolTip}"
diff --git a/Flow.Launcher/Storage/HistoryItem.cs b/Flow.Launcher/Storage/HistoryItem.cs
@@ -1,8 +1,7 @@
-﻿using System;
+using System;
 
 namespace Flow.Launcher.Storage
 {
-    [Obsolete("Use LastOpenedHistoryItem instead. This class will be removed in future versions.")]
     public class HistoryItem
     {
         public string Query { get; set; }
@@ -43,4 +42,4 @@ private string DateTimeAgo(DateTime dt)
             return string.Empty;
         }
     }
-}
+}
diff --git a/Flow.Launcher/Storage/LastOpenedHistoryItem.cs b/Flow.Launcher/Storage/LastOpenedHistoryItem.cs
diff --git a/Flow.Launcher/Storage/QueryHistory.cs b/Flow.Launcher/Storage/QueryHistory.cs
@@ -1,64 +1,34 @@
-﻿using System;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text.Json.Serialization;
-using Flow.Launcher.Plugin;
 
 namespace Flow.Launcher.Storage
 {
     public class History
     {
         [JsonInclude]
-#pragma warning disable CS0618 // Type or member is obsolete
-        public List<HistoryItem> Items { get; private set; } = [];
-#pragma warning restore CS0618 // Type or member is obsolete
+        public List<HistoryItem> Items { get; private set; } = new List<HistoryItem>();
 
-        [JsonInclude]
-        public List<LastOpenedHistoryItem> LastOpenedHistoryItems { get; private set; } = [];
-
-        private readonly int _maxHistory = 300;
-
-        public void PopulateHistoryFromLegacyHistory()
-        {
-            if (Items.Count == 0) return;
-            // Migrate old history items to new LastOpenedHistoryItems
-            foreach (var item in Items)
-            {
-                LastOpenedHistoryItems.Add(new LastOpenedHistoryItem
-                {
-                    Query = item.Query,
-                    ExecutedDateTime = item.ExecutedDateTime
-                });
-            }
-            Items.Clear();
-        }
+        private int _maxHistory = 300;
 
-        public void Add(Result result)
+        public void Add(string query)
         {
-            if (string.IsNullOrEmpty(result.OriginQuery.TrimmedQuery)) return;
-            if (string.IsNullOrEmpty(result.PluginID)) return;
-
-            // Maintain the max history limit
-            if (LastOpenedHistoryItems.Count > _maxHistory)
+            if (string.IsNullOrEmpty(query)) return;
+            if (Items.Count > _maxHistory)
             {
-                LastOpenedHistoryItems.RemoveAt(0);
+                Items.RemoveAt(0);
             }
 
-            // If the last item is the same as the current result, just update the timestamp
-            if (LastOpenedHistoryItems.Count > 0 && 
-                LastOpenedHistoryItems.Last().Equals(result))
+            if (Items.Count > 0 && Items.Last().Query == query)
             {
-                LastOpenedHistoryItems.Last().ExecutedDateTime = DateTime.Now;
+                Items.Last().ExecutedDateTime = DateTime.Now;
             }
             else
             {
-                LastOpenedHistoryItems.Add(new LastOpenedHistoryItem
+                Items.Add(new HistoryItem
                 {
-                    Title = result.Title,
-                    SubTitle = result.SubTitle,
-                    PluginID = result.PluginID,
-                    Query = result.OriginQuery.TrimmedQuery,
-                    RecordKey = result.RecordKey,
+                    Query = query,
                     ExecutedDateTime = DateTime.Now
                 });
             }
diff --git a/Flow.Launcher/ViewModel/MainViewModel.cs b/Flow.Launcher/ViewModel/MainViewModel.cs

Original file line number	Diff line number	Diff line change
`@@ -322,7 +322,6 @@ private void OnLoaded(object sender, RoutedEventArgs e)`
`322`	`322`	`break;`
`323`	`323`	`case nameof(Settings.ShowHomePage):`
`324`	`324`	`case nameof(Settings.ShowHistoryResultsForHomePage):`
`325`		`- case nameof(Settings.HistoryStyle):`
`326`	`325`	`if (_viewModel.QueryResultsSelected() && string.IsNullOrEmpty(_viewModel.QueryText))`
`327`	`326`	`{`
`328`	`327`	`_viewModel.QueryResults();`
`@@ -860,7 +859,7 @@ private void InitializeContextMenu()`
`860`	`859`
`861`	`860`	`public void UpdatePosition()`
`862`	`861`	`{`
`863`		`- // Initialize call twice to workaround multi-display alignment issue- https://github.com/Flow-Launcher/Flow.Launcher/issues/2910`
	`862`	`+ // Initialize call twice to work around multi-display alignment issue- https://github.com/Flow-Launcher/Flow.Launcher/issues/2910`
`864`	`863`	`if (_viewModel.IsDialogJumpWindowUnderDialog())`
`865`	`864`	`{`
`866`	`865`	`InitializeDialogJumpPosition();`
`@@ -884,7 +883,7 @@ private async Task PositionResetAsync()`
`884`	`883`
`885`	`884`	`private void InitializePosition()`
`886`	`885`	`{`
`887`		`- // Initialize call twice to workaround multi-display alignment issue- https://github.com/Flow-Launcher/Flow.Launcher/issues/2910`
	`886`	`+ // Initialize call twice to work around multi-display alignment issue- https://github.com/Flow-Launcher/Flow.Launcher/issues/2910`
`888`	`887`	`InitializePositionInner();`
`889`	`888`	`InitializePositionInner();`
`890`	`889`	`return;`
Original file line number	Diff line number	Diff line change
`@@ -1,8 +1,7 @@`
`1`		`-using System;`
	`1`	`+using System;`
`2`	`2`
`3`	`3`	`namespace Flow.Launcher.Storage`
`4`	`4`	`{`
`5`		`- [Obsolete("Use LastOpenedHistoryItem instead. This class will be removed in future versions.")]`
`6`	`5`	`public class HistoryItem`
`7`	`6`	`{`
`8`	`7`	`public string Query { get; set; }`
`@@ -43,4 +42,4 @@ private string DateTimeAgo(DateTime dt)`
`43`	`42`	`return string.Empty;`
`44`	`43`	`}`
`45`	`44`	`}`
`46`		`-}`
	`45`	`+}`