Merge branch 'dev' into 240430PreviewSetting

Author: onesounds

.github/actions/spelling/allow.txt

@@ -3,3 +3,6 @@ https
 ssh
 ubuntu
 runcount
+Firefox
+Português
+Português (Brasil)

.github/actions/spelling/expect.txt

@@ -74,6 +74,7 @@ WCA_ACCENT_POLICY
 HGlobal
 dopusrt
 firefox
+Firefox
 msedge
 svgc
 ime

Flow.Launcher.Infrastructure/UserSettings/Settings.cs

@@ -27,8 +27,8 @@ public class Settings : BaseModel, IHotkeySettings
         public string SelectNextItemHotkey2 { get; set; } = $"";
         public string SelectPrevItemHotkey { get; set; } = $"Shift + Tab";
         public string SelectPrevItemHotkey2 { get; set; } = $"";
-        public string SelectNextPageHotkey { get; set; } = $"";
-        public string SelectPrevPageHotkey { get; set; } = $"";
+        public string SelectNextPageHotkey { get; set; } = $"PageUp";
+        public string SelectPrevPageHotkey { get; set; } = $"PageDown";
         public string OpenContextMenuHotkey { get; set; } = $"Ctrl+O";
         public string SettingWindowHotkey { get; set; } = $"Ctrl+I";
 

Flow.Launcher/Languages/en.xaml

@@ -185,16 +185,17 @@
     <system:String x:Key="autoCompleteHotkey">Auto Complete</system:String>
     <system:String x:Key="autoCompleteHotkeyToolTip">Runs autocomplete for the selected items.</system:String>
     <system:String x:Key="SelectNextItemHotkey">Select Next Item</system:String>
-    <system:String x:Key="SelectPrevItemHotkey">Select Prev Item</system:String>
+    <system:String x:Key="SelectPrevItemHotkey">Select Previous Item</system:String>
     <system:String x:Key="SelectNextPageHotkey">Next Page</system:String>
-    <system:String x:Key="SelectPrevPageHotkey">Prev Page</system:String>
+    <system:String x:Key="SelectPrevPageHotkey">Previous Page</system:String>
     <system:String x:Key="OpenContextMenuHotkey">Open Context Menu</system:String>
     <system:String x:Key="SettingWindowHotkey">Open Setting Window</system:String>
     <system:String x:Key="CopyFilePathHotkey">Copy File Path</system:String>
     <system:String x:Key="ToggleGameModeHotkey">Toggle Game Mode</system:String>
     <system:String x:Key="ToggleHistoryHotkey">Toggle History</system:String>
     <system:String x:Key="OpenContainFolderHotkey">Open Containing Folder</system:String>
     <system:String x:Key="RunAsAdminHotkey">Run As Admin</system:String>
+    <system:String x:Key="RequeryHotkey">Refresh Search Results</system:String>
     <system:String x:Key="ReloadPluginHotkey">Reload Plugins Data</system:String>
     <system:String x:Key="QuickWidthHotkey">Quick Adjust Window Width</system:String>
     <system:String x:Key="QuickHeightHotkey">Quick Adjust Window Height</system:String>

Flow.Launcher/MainWindow.xaml

@@ -26,6 +26,7 @@
     LocationChanged="OnLocationChanged"
     Opacity="{Binding MainWindowOpacity, Mode=OneWay, UpdateSourceTrigger=PropertyChanged}"
     PreviewKeyDown="OnKeyDown"
+    PreviewKeyUp="OnKeyUp"
     ResizeMode="NoResize"
     ShowInTaskbar="False"
     SizeToContent="Height"

Flow.Launcher/MainWindow.xaml.cs

@@ -47,6 +47,7 @@ public partial class MainWindow
         private MainViewModel _viewModel;
         private bool _animating;
         MediaPlayer animationSound = new MediaPlayer();
+        private bool isArrowKeyPressed = false;
 
         #endregion
 
@@ -109,9 +110,11 @@ private async void OnClosing(object sender, CancelEventArgs e)
         private void OnInitialized(object sender, EventArgs e)
         {
         }
-
         private void OnLoaded(object sender, RoutedEventArgs _)
         {
+            // MouseEventHandler
+            PreviewMouseMove += MainPreviewMouseMove;
+
             CheckFirstLaunch();
             HideStartup();
             // show notify icon when flowlauncher is hidden
@@ -406,6 +409,7 @@ public void WindowAnimator()
             if (_animating)
                 return;
 
+            isArrowKeyPressed = true;
             _animating = true;
             UpdatePosition();
 
@@ -494,6 +498,7 @@ public void WindowAnimator()
             windowsb.Completed += (_, _) => _animating = false;
             _settings.WindowLeft = Left;
             _settings.WindowTop = Top;
+            isArrowKeyPressed = false;
 
             if (QueryTextBox.Text.Length == 0)
             {
@@ -644,10 +649,12 @@ private void OnKeyDown(object sender, KeyEventArgs e)
             switch (e.Key)
             {
                 case Key.Down:
+                    isArrowKeyPressed = true;
                     _viewModel.SelectNextItemCommand.Execute(null);
                     e.Handled = true;
                     break;
                 case Key.Up:
+                    isArrowKeyPressed = true;
                     _viewModel.SelectPrevItemCommand.Execute(null);
                     e.Handled = true;
                     break;
@@ -698,7 +705,21 @@ private void OnKeyDown(object sender, KeyEventArgs e)
 
             }
         }
+        private void OnKeyUp(object sender, KeyEventArgs e)
+        {
+            if (e.Key == Key.Up || e.Key == Key.Down)
+            {
+                isArrowKeyPressed = false;
+            }
+        }
 
+        private void MainPreviewMouseMove(object sender, System.Windows.Input.MouseEventArgs e)
+        {
+            if (isArrowKeyPressed)
+            {
+                e.Handled = true; // Ignore Mouse Hover when press Arrowkeys
+            }
+        }
         public void PreviewReset()
         {
             _viewModel.ResetPreview();

Flow.Launcher/SettingWindow.xaml

@@ -2802,7 +2802,13 @@
                                                 Title="{DynamicResource ToggleGameModeHotkey}"
                                                 Icon=""
                                                 Type="Inside">
-                                                <cc:HotkeyDisplay Keys="Ctrl+Shift+C" />
+                                                <cc:HotkeyDisplay Keys="Ctrl+F12" />
+                                            </cc:Card>
+                                            <cc:Card
+                                                Title="{DynamicResource RequeryHotkey}"
+                                                Icon="&#xe72c;"
+                                                Type="Inside">
+                                                <cc:HotkeyDisplay Keys="Ctrl+R" />
                                             </cc:Card>
                                             <cc:Card
                                                 Title="{DynamicResource ReloadPluginHotkey}"

Plugins/Flow.Launcher.Plugin.BrowserBookmark/ChromeBookmarkLoader.cs

@@ -3,23 +3,22 @@
 using System.Collections.Generic;
 using System.IO;
 
-namespace Flow.Launcher.Plugin.BrowserBookmark
+namespace Flow.Launcher.Plugin.BrowserBookmark;
+
+public class ChromeBookmarkLoader : ChromiumBookmarkLoader
 {
-    public class ChromeBookmarkLoader : ChromiumBookmarkLoader
+    public override List<Bookmark> GetBookmarks()
     {
-        public override List<Bookmark> GetBookmarks()
-        {
-            return LoadChromeBookmarks();
-        }
+        return LoadChromeBookmarks();
+    }
 
-        private List<Bookmark> LoadChromeBookmarks()
-        {
-            var bookmarks = new List<Bookmark>();
-            var platformPath = Environment.GetFolderPath(Environment.SpecialFolder.LocalApplicationData);
-            bookmarks.AddRange(LoadBookmarks(Path.Combine(platformPath, @"Google\Chrome\User Data"), "Google Chrome"));
-            bookmarks.AddRange(LoadBookmarks(Path.Combine(platformPath, @"Google\Chrome SxS\User Data"), "Google Chrome Canary"));
-            bookmarks.AddRange(LoadBookmarks(Path.Combine(platformPath, @"Chromium\User Data"), "Chromium"));
-            return bookmarks;
-        }
+    private List<Bookmark> LoadChromeBookmarks()
+    {
+        var bookmarks = new List<Bookmark>();
+        var platformPath = Environment.GetFolderPath(Environment.SpecialFolder.LocalApplicationData);
+        bookmarks.AddRange(LoadBookmarks(Path.Combine(platformPath, @"Google\Chrome\User Data"), "Google Chrome"));
+        bookmarks.AddRange(LoadBookmarks(Path.Combine(platformPath, @"Google\Chrome SxS\User Data"), "Google Chrome Canary"));
+        bookmarks.AddRange(LoadBookmarks(Path.Combine(platformPath, @"Chromium\User Data"), "Chromium"));
+        return bookmarks;
     }
-}
+}

Plugins/Flow.Launcher.Plugin.BrowserBookmark/ChromiumBookmarkLoader.cs

@@ -4,92 +4,91 @@
 using System.Text.Json;
 using Flow.Launcher.Infrastructure.Logger;
 
-namespace Flow.Launcher.Plugin.BrowserBookmark
+namespace Flow.Launcher.Plugin.BrowserBookmark;
+
+public abstract class ChromiumBookmarkLoader : IBookmarkLoader
 {
-    public abstract class ChromiumBookmarkLoader : IBookmarkLoader
+    public abstract List<Bookmark> GetBookmarks();
+
+    protected List<Bookmark> LoadBookmarks(string browserDataPath, string name)
     {
-        public abstract List<Bookmark> GetBookmarks();
+        var bookmarks = new List<Bookmark>();
+        if (!Directory.Exists(browserDataPath)) return bookmarks;
+        var paths = Directory.GetDirectories(browserDataPath);
 
-        protected List<Bookmark> LoadBookmarks(string browserDataPath, string name)
+        foreach (var profile in paths)
         {
-            var bookmarks = new List<Bookmark>();
-            if (!Directory.Exists(browserDataPath)) return bookmarks;
-            var paths = Directory.GetDirectories(browserDataPath);
-
-            foreach (var profile in paths)
-            {
-                var bookmarkPath = Path.Combine(profile, "Bookmarks");
-                if (!File.Exists(bookmarkPath))
-                    continue;
-
-                Main.RegisterBookmarkFile(bookmarkPath);
+            var bookmarkPath = Path.Combine(profile, "Bookmarks");
+            if (!File.Exists(bookmarkPath))
+                continue;
 
-                var source = name + (Path.GetFileName(profile) == "Default" ? "" : $" ({Path.GetFileName(profile)})");
-                bookmarks.AddRange(LoadBookmarksFromFile(bookmarkPath, source));
-            }
+            Main.RegisterBookmarkFile(bookmarkPath);
 
-            return bookmarks;
+            var source = name + (Path.GetFileName(profile) == "Default" ? "" : $" ({Path.GetFileName(profile)})");
+            bookmarks.AddRange(LoadBookmarksFromFile(bookmarkPath, source));
         }
 
-        protected List<Bookmark> LoadBookmarksFromFile(string path, string source)
-        {
-            var bookmarks = new List<Bookmark>();
+        return bookmarks;
+    }
 
-            if (!File.Exists(path))
-                return bookmarks;
+    protected List<Bookmark> LoadBookmarksFromFile(string path, string source)
+    {
+        var bookmarks = new List<Bookmark>();
 
-            using var jsonDocument = JsonDocument.Parse(File.ReadAllText(path));
-            if (!jsonDocument.RootElement.TryGetProperty("roots", out var rootElement))
-                return bookmarks;
-            EnumerateRoot(rootElement, bookmarks, source);
+        if (!File.Exists(path))
             return bookmarks;
-        }
 
-        private void EnumerateRoot(JsonElement rootElement, ICollection<Bookmark> bookmarks, string source)
+        using var jsonDocument = JsonDocument.Parse(File.ReadAllText(path));
+        if (!jsonDocument.RootElement.TryGetProperty("roots", out var rootElement))
+            return bookmarks;
+        EnumerateRoot(rootElement, bookmarks, source);
+        return bookmarks;
+    }
+
+    private void EnumerateRoot(JsonElement rootElement, ICollection<Bookmark> bookmarks, string source)
+    {
+        foreach (var folder in rootElement.EnumerateObject())
         {
-            foreach (var folder in rootElement.EnumerateObject())
-            {
-                if (folder.Value.ValueKind != JsonValueKind.Object)
-                    continue;
+            if (folder.Value.ValueKind != JsonValueKind.Object)
+                continue;
 
-                // Fix for Opera. It stores bookmarks slightly different than chrome. See PR and bug report for this change for details.
-                // If various exceptions start to build up here consider splitting this Loader into multiple separate ones.
-                if (folder.Name == "custom_root") 
-                    EnumerateRoot(folder.Value, bookmarks, source);
-                else
-                    EnumerateFolderBookmark(folder.Value, bookmarks, source);
-            }
+            // Fix for Opera. It stores bookmarks slightly different than chrome. See PR and bug report for this change for details.
+            // If various exceptions start to build up here consider splitting this Loader into multiple separate ones.
+            if (folder.Name == "custom_root")
+                EnumerateRoot(folder.Value, bookmarks, source);
+            else
+                EnumerateFolderBookmark(folder.Value, bookmarks, source);
         }
+    }
 
-        private void EnumerateFolderBookmark(JsonElement folderElement, ICollection<Bookmark> bookmarks,
-            string source)
+    private void EnumerateFolderBookmark(JsonElement folderElement, ICollection<Bookmark> bookmarks,
+        string source)
+    {
+        if (!folderElement.TryGetProperty("children", out var childrenElement))
+            return;
+        foreach (var subElement in childrenElement.EnumerateArray())
         {
-            if (!folderElement.TryGetProperty("children", out var childrenElement))
-                return;
-            foreach (var subElement in childrenElement.EnumerateArray())
+            if (subElement.TryGetProperty("type", out var type))
             {
-                if (subElement.TryGetProperty("type", out var type))
-                {
-                    switch (type.GetString())
-                    {
-                        case "folder":
-                        case "workspace": // Edge Workspace
-                            EnumerateFolderBookmark(subElement, bookmarks, source);
-                            break;
-                        default:
-                            bookmarks.Add(new Bookmark(
-                                subElement.GetProperty("name").GetString(),
-                                subElement.GetProperty("url").GetString(),
-                                source));
-                            break;
-                    }
-                }
-                else
+                switch (type.GetString())
                 {
-                    Log.Error(
-                        $"ChromiumBookmarkLoader: EnumerateFolderBookmark: type property not found for {subElement.GetString()}");
+                    case "folder":
+                    case "workspace": // Edge Workspace
+                        EnumerateFolderBookmark(subElement, bookmarks, source);
+                        break;
+                    default:
+                        bookmarks.Add(new Bookmark(
+                            subElement.GetProperty("name").GetString(),
+                            subElement.GetProperty("url").GetString(),
+                            source));
+                        break;
                 }
             }
+            else
+            {
+                Log.Error(
+                    $"ChromiumBookmarkLoader: EnumerateFolderBookmark: type property not found for {subElement.GetString()}");
+            }
         }
     }
 }