Merge dev into fork/040427SplitSettingWindow with merge conflicts resolved

Author: Yusyuriv

Flow.Launcher.Core/ExternalPlugins/UserPlugin.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 
 namespace Flow.Launcher.Core.ExternalPlugins
 {
@@ -13,9 +13,11 @@ public record UserPlugin
         public string Website { get; set; }
         public string UrlDownload { get; set; }
         public string UrlSourceCode { get; set; }
+        public string LocalInstallPath { get; set; }
         public string IcoPath { get; set; }
         public DateTime? LatestReleaseDate { get; set; }
         public DateTime? DateAdded { get; set; }
 
+        public bool IsFromLocalInstallPath => !string.IsNullOrEmpty(LocalInstallPath);
     }
 }

Flow.Launcher.Core/Plugin/PluginManager.cs

@@ -380,7 +380,8 @@ public static bool PluginModified(string uuid)
 
 
         /// <summary>
-        /// Update a plugin to new version, from a zip file. Will Delete zip after updating.
+        /// Update a plugin to new version, from a zip file. By default will remove the zip file if update is via url,
+        /// unless it's a local path installation
         /// </summary>
         public static void UpdatePlugin(PluginMetadata existingVersion, UserPlugin newVersion, string zipFilePath)
         {
@@ -390,11 +391,11 @@ public static void UpdatePlugin(PluginMetadata existingVersion, UserPlugin newVe
         }
 
         /// <summary>
-        /// Install a plugin. Will Delete zip after updating.
+        /// Install a plugin. By default will remove the zip file if installation is from url, unless it's a local path installation
         /// </summary>
         public static void InstallPlugin(UserPlugin plugin, string zipFilePath)
         {
-            InstallPlugin(plugin, zipFilePath, true);
+            InstallPlugin(plugin, zipFilePath, checkModified: true);
         }
 
         /// <summary>
@@ -420,7 +421,9 @@ internal static void InstallPlugin(UserPlugin plugin, string zipFilePath, bool c
             // Unzip plugin files to temp folder
             var tempFolderPluginPath = Path.Combine(Path.GetTempPath(), Guid.NewGuid().ToString());
             System.IO.Compression.ZipFile.ExtractToDirectory(zipFilePath, tempFolderPluginPath);
-            File.Delete(zipFilePath);
+            
+            if(!plugin.IsFromLocalInstallPath)
+                File.Delete(zipFilePath);
 
             var pluginFolderPath = GetContainingFolderPathAfterUnzip(tempFolderPluginPath);
 

Flow.Launcher.Infrastructure/UserSettings/Settings.cs

@@ -31,6 +31,8 @@ public class Settings : BaseModel, IHotkeySettings
         public string SelectPrevPageHotkey { get; set; } = $"PageDown";
         public string OpenContextMenuHotkey { get; set; } = $"Ctrl+O";
         public string SettingWindowHotkey { get; set; } = $"Ctrl+I";
+        public string CycleHistoryUpHotkey { get; set; } = $"{KeyConstant.Alt} + Up";
+        public string CycleHistoryDownHotkey { get; set; } = $"{KeyConstant.Alt} + Down";
 
         public string Language
         {
@@ -280,42 +282,9 @@ public List<RegisteredHotkeyData> RegisteredHotkeys
         {
             get
             {
-                var list = new List<RegisteredHotkeyData>
-                {
-                    new("Up", "HotkeyLeftRightDesc"),
-                    new("Down", "HotkeyLeftRightDesc"),
-                    new("Left", "HotkeyUpDownDesc"),
-                    new("Right", "HotkeyUpDownDesc"),
-                    new("Escape", "HotkeyESCDesc"),
-                    new("F5", "ReloadPluginHotkey"),
-                    new("Alt+Home", "HotkeySelectFirstResult"),
-                    new("Alt+End", "HotkeySelectLastResult"),
-                    new("Ctrl+R", "HotkeyRequery"),
-                    new("Ctrl+H", "ToggleHistoryHotkey"),
-                    new("Ctrl+OemCloseBrackets", "QuickWidthHotkey"),
-                    new("Ctrl+OemOpenBrackets", "QuickWidthHotkey"),
-                    new("Ctrl+OemPlus", "QuickHeightHotkey"),
-                    new("Ctrl+OemMinus", "QuickHeightHotkey"),
-                    new("Ctrl+Shift+Enter", "HotkeyCtrlShiftEnterDesc"),
-                    new("Shift+Enter", "OpenContextMenuHotkey"),
-                    new("Enter", "HotkeyRunDesc"),
-                    new("Ctrl+Enter", "OpenContainFolderHotkey"),
-                    new("Alt+Enter", "HotkeyOpenResult"),
-                    new("Ctrl+F12", "ToggleGameModeHotkey"),
-                    new("Ctrl+Shift+C", "CopyFilePathHotkey"),
-
-                    new($"{OpenResultModifiers}+D1", "HotkeyOpenResultN", 1),
-                    new($"{OpenResultModifiers}+D2", "HotkeyOpenResultN", 2),
-                    new($"{OpenResultModifiers}+D3", "HotkeyOpenResultN", 3),
-                    new($"{OpenResultModifiers}+D4", "HotkeyOpenResultN", 4),
-                    new($"{OpenResultModifiers}+D5", "HotkeyOpenResultN", 5),
-                    new($"{OpenResultModifiers}+D6", "HotkeyOpenResultN", 6),
-                    new($"{OpenResultModifiers}+D7", "HotkeyOpenResultN", 7),
-                    new($"{OpenResultModifiers}+D8", "HotkeyOpenResultN", 8),
-                    new($"{OpenResultModifiers}+D9", "HotkeyOpenResultN", 9),
-                    new($"{OpenResultModifiers}+D0", "HotkeyOpenResultN", 10)
-                };
+                var list = FixedHotkeys();
 
+                // Customizeable hotkeys
                 if(!string.IsNullOrEmpty(Hotkey))
                     list.Add(new(Hotkey, "flowlauncherHotkey", () => Hotkey = ""));
                 if(!string.IsNullOrEmpty(PreviewHotkey))
@@ -340,7 +309,12 @@ public List<RegisteredHotkeyData> RegisteredHotkeys
                     list.Add(new(SelectNextPageHotkey, "SelectNextPageHotkey", () => SelectNextPageHotkey = ""));
                 if(!string.IsNullOrEmpty(SelectPrevPageHotkey))
                     list.Add(new(SelectPrevPageHotkey, "SelectPrevPageHotkey", () => SelectPrevPageHotkey = ""));
+                if (!string.IsNullOrEmpty(CycleHistoryUpHotkey))
+                    list.Add(new(CycleHistoryUpHotkey, "CycleHistoryUpHotkey", () => CycleHistoryUpHotkey = ""));
+                if (!string.IsNullOrEmpty(CycleHistoryDownHotkey))
+                    list.Add(new(CycleHistoryDownHotkey, "CycleHistoryDownHotkey", () => CycleHistoryDownHotkey = ""));
 
+                // Custom Query Hotkeys
                 foreach (var customPluginHotkey in CustomPluginHotkeys)
                 {
                     if (!string.IsNullOrEmpty(customPluginHotkey.Hotkey))
@@ -350,6 +324,45 @@ public List<RegisteredHotkeyData> RegisteredHotkeys
                 return list;
             }
         }
+
+        private List<RegisteredHotkeyData> FixedHotkeys()
+        {
+            return new List<RegisteredHotkeyData>
+            {
+                new("Up", "HotkeyLeftRightDesc"),
+                new("Down", "HotkeyLeftRightDesc"),
+                new("Left", "HotkeyUpDownDesc"),
+                new("Right", "HotkeyUpDownDesc"),
+                new("Escape", "HotkeyESCDesc"),
+                new("F5", "ReloadPluginHotkey"),
+                new("Alt+Home", "HotkeySelectFirstResult"),
+                new("Alt+End", "HotkeySelectLastResult"),
+                new("Ctrl+R", "HotkeyRequery"),
+                new("Ctrl+H", "ToggleHistoryHotkey"),
+                new("Ctrl+OemCloseBrackets", "QuickWidthHotkey"),
+                new("Ctrl+OemOpenBrackets", "QuickWidthHotkey"),
+                new("Ctrl+OemPlus", "QuickHeightHotkey"),
+                new("Ctrl+OemMinus", "QuickHeightHotkey"),
+                new("Ctrl+Shift+Enter", "HotkeyCtrlShiftEnterDesc"),
+                new("Shift+Enter", "OpenContextMenuHotkey"),
+                new("Enter", "HotkeyRunDesc"),
+                new("Ctrl+Enter", "OpenContainFolderHotkey"),
+                new("Alt+Enter", "HotkeyOpenResult"),
+                new("Ctrl+F12", "ToggleGameModeHotkey"),
+                new("Ctrl+Shift+C", "CopyFilePathHotkey"),
+
+                new($"{OpenResultModifiers}+D1", "HotkeyOpenResultN", 1),
+                new($"{OpenResultModifiers}+D2", "HotkeyOpenResultN", 2),
+                new($"{OpenResultModifiers}+D3", "HotkeyOpenResultN", 3),
+                new($"{OpenResultModifiers}+D4", "HotkeyOpenResultN", 4),
+                new($"{OpenResultModifiers}+D5", "HotkeyOpenResultN", 5),
+                new($"{OpenResultModifiers}+D6", "HotkeyOpenResultN", 6),
+                new($"{OpenResultModifiers}+D7", "HotkeyOpenResultN", 7),
+                new($"{OpenResultModifiers}+D8", "HotkeyOpenResultN", 8),
+                new($"{OpenResultModifiers}+D9", "HotkeyOpenResultN", 9),
+                new($"{OpenResultModifiers}+D0", "HotkeyOpenResultN", 10)
+            };
+        }
     }
 
     public enum LastQueryMode

Flow.Launcher.Plugin/SharedCommands/FilesFolders.cs

@@ -1,6 +1,7 @@
 using System;
 using System.Diagnostics;
 using System.IO;
+using System.Linq;
 #pragma warning disable IDE0005
 using System.Windows;
 #pragma warning restore IDE0005
@@ -200,6 +201,24 @@ public static void OpenFile(string filePath, string workingDir = "", bool asAdmi
             }
         }
 
+        ///<summary>
+        /// This checks whether a given string is a zip file path.
+        /// By default does not check if the zip file actually exist on disk, can do so by
+        /// setting checkFileExists = true.
+        ///</summary>
+        public static bool IsZipFilePath(string querySearchString, bool checkFileExists = false)
+        {
+            if (IsLocationPathString(querySearchString) && querySearchString.Split('.').Last() == "zip")
+            {
+                if (checkFileExists)
+                    return FileExists(querySearchString);
+
+                return true;
+            }
+
+            return false;
+        }
+
         ///<summary>
         /// This checks whether a given string is a directory path or network location string. 
         /// It does not check if location actually exists.

Flow.Launcher.Test/Plugins/ExplorerTest.cs

@@ -191,11 +191,15 @@ public void GivenQuery_WhenActionKeywordForFileContentSearchExists_ThenFileConte
         [TestCase(@"\c:\", false)]
         [TestCase(@"cc:\", false)]
         [TestCase(@"\\\SomeNetworkLocation\", false)]
+        [TestCase(@"\\SomeNetworkLocation\", true)]
         [TestCase("RandomFile", false)]
         [TestCase(@"c:\>*", true)]
         [TestCase(@"c:\>", true)]
         [TestCase(@"c:\SomeLocation\SomeOtherLocation\>", true)]
         [TestCase(@"c:\SomeLocation\SomeOtherLocation", true)]
+        [TestCase(@"c:\SomeLocation\SomeOtherLocation\SomeFile.exe", true)]
+        [TestCase(@"\\SomeNetworkLocation\SomeFile.exe", true)]
+
         public void WhenGivenQuerySearchString_ThenShouldIndicateIfIsLocationPathString(string querySearchString, bool expectedResult)
         {
             // When, Given

Flow.Launcher/Languages/en.xaml

@@ -188,6 +188,8 @@
     <system:String x:Key="SelectPrevItemHotkey">Select Previous Item</system:String>
     <system:String x:Key="SelectNextPageHotkey">Next Page</system:String>
     <system:String x:Key="SelectPrevPageHotkey">Previous Page</system:String>
+    <system:String x:Key="CycleHistoryUpHotkey">Cycle Previous Query</system:String>
+    <system:String x:Key="CycleHistoryDownHotkey">Cycle Next Query</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>

Flow.Launcher/MainWindow.xaml

@@ -25,6 +25,7 @@
     LocationChanged="OnLocationChanged"
     Opacity="{Binding MainWindowOpacity, Mode=OneWay, UpdateSourceTrigger=PropertyChanged}"
     PreviewKeyDown="OnKeyDown"
+    PreviewKeyUp="OnKeyUp"
     ResizeMode="NoResize"
     ShowInTaskbar="False"
     SizeToContent="Height"
@@ -197,6 +198,14 @@
             Key="{Binding SelectPrevPageHotkey, Converter={StaticResource StringToKeyBindingConverter}, ConverterParameter='key'}"
             Command="{Binding SelectPrevPageCommand}"
             Modifiers="{Binding SelectPrevPageHotkey, Converter={StaticResource StringToKeyBindingConverter}, ConverterParameter='modifiers'}" />
+        <KeyBinding
+            Key="{Binding CycleHistoryUpHotkey, Converter={StaticResource StringToKeyBindingConverter}, ConverterParameter='key'}"
+            Command="{Binding ReverseHistoryCommand}"
+            Modifiers="{Binding CycleHistoryUpHotkey, Converter={StaticResource StringToKeyBindingConverter}, ConverterParameter='modifiers'}" />
+        <KeyBinding
+            Key="{Binding CycleHistoryDownHotkey, Converter={StaticResource StringToKeyBindingConverter}, ConverterParameter='key'}"
+            Command="{Binding ForwardHistoryCommand}"
+            Modifiers="{Binding CycleHistoryDownHotkey, Converter={StaticResource StringToKeyBindingConverter}, ConverterParameter='modifiers'}" />
     </Window.InputBindings>
     <Grid>
         <Border MouseDown="OnMouseDown" Style="{DynamicResource WindowBorderStyle}">

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/SettingPages/Views/SettingsPaneHotkey.xaml

@@ -139,6 +139,26 @@
                         Type="Inside">
                         <cc:HotkeyDisplay Keys="Ctrl+R" />
                     </cc:Card>
+                    <cc:Card
+                        Title="{DynamicResource CycleHistoryUpHotkey}"
+                        Icon="&#xe70e;"
+                        Type="Inside">
+                        <flowlauncher:HotkeyControl
+                            DefaultHotkey="Alt+Up"
+                            Hotkey="{Binding Settings.CycleHistoryUpHotkey}"
+                            HotkeySettings="{Binding Settings}"
+                            ValidateKeyGesture="False" />
+                    </cc:Card>
+                    <cc:Card
+                        Title="{DynamicResource CycleHistoryDownHotkey}"
+                        Icon="&#xe70d;"
+                        Type="Inside">
+                        <flowlauncher:HotkeyControl
+                            DefaultHotkey="Alt+Down"
+                            Hotkey="{Binding Settings.CycleHistoryDownHotkey}"
+                            HotkeySettings="{Binding Settings}"
+                            ValidateKeyGesture="False" />
+                    </cc:Card>
                     <cc:Card
                         Title="{DynamicResource ReloadPluginHotkey}"
                         Icon="&#xe72c;"

Flow.Launcher/SettingWindow.xaml.cs

@@ -108,17 +108,17 @@ private void Window_StateChanged(object sender, EventArgs e)
         RefreshMaximizeRestoreButton();
     }
 
-    private void InitializePosition()
+    public void InitializePosition()
     {
-        if (_settings.SettingWindowTop >= 0 && _settings.SettingWindowLeft >= 0)
+        if (_settings.SettingWindowTop == null)
         {
-            Top = _settings.SettingWindowTop;
-            Left = _settings.SettingWindowLeft;
+            Top = WindowTop();
+            Left = WindowLeft();
         }
         else
         {
-            Top = WindowTop();
-            Left = WindowLeft();
+            Top = _settings.SettingWindowTop;
+            Left = _settings.SettingWindowLeft;
         }
         WindowState = _settings.SettingWindowState;
     }