Merge Dev

Author: onesounds

Flow.Launcher.Core/Flow.Launcher.Core.csproj

@@ -54,7 +54,7 @@
 
   <ItemGroup>
     <PackageReference Include="Droplex" Version="1.4.1" />
-    <PackageReference Include="FSharp.Core" Version="5.0.2" />
+    <PackageReference Include="FSharp.Core" Version="6.0.6" />
     <PackageReference Include="Microsoft.IO.RecyclableMemoryStream" Version="2.1.3" />
     <PackageReference Include="squirrel.windows" Version="1.5.2" NoWarn="NU1701" />
   </ItemGroup>

Flow.Launcher.Infrastructure/Flow.Launcher.Infrastructure.csproj

@@ -53,7 +53,7 @@
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="Microsoft.VisualStudio.Threading" Version="16.10.56" />
+    <PackageReference Include="Microsoft.VisualStudio.Threading" Version="17.3.44" />
     <PackageReference Include="NLog" Version="4.7.10" />
     <PackageReference Include="NLog.Schema" Version="4.7.10" />
     <PackageReference Include="NLog.Web.AspNetCore" Version="4.13.0" />

Flow.Launcher.Test/Flow.Launcher.Test.csproj

@@ -50,7 +50,7 @@
   <ItemGroup>
     <PackageReference Include="Moq" Version="4.16.1" />
     <PackageReference Include="nunit" Version="3.13.2" />
-    <PackageReference Include="NUnit3TestAdapter" Version="4.0.0">
+    <PackageReference Include="NUnit3TestAdapter" Version="4.2.1">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>

Flow.Launcher/Flow.Launcher.csproj

@@ -83,6 +83,7 @@
   </ItemGroup>
 
   <ItemGroup>
+    <PackageReference Include="CommunityToolkit.Mvvm" Version="8.0.0" />
     <PackageReference Include="Fody" Version="6.5.4">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
@@ -114,4 +115,14 @@
   <Target Name="PreBuild" BeforeTargets="PreBuildEvent">
     <Exec Command="taskkill /f /fi &quot;IMAGENAME eq Flow.Launcher.exe&quot;" />
   </Target>
+
+  <Target Name="RemoveDuplicateAnalyzers" BeforeTargets="CoreCompile">
+    <!-- Work around https://github.com/dotnet/wpf/issues/6792 -->
+
+    <ItemGroup>
+      <FilteredAnalyzer Include="@(Analyzer->Distinct())" />
+      <Analyzer Remove="@(Analyzer)" />
+      <Analyzer Include="@(FilteredAnalyzer)" />
+    </ItemGroup>
+  </Target>
 </Project>

Flow.Launcher/Languages/en.xaml

@@ -48,6 +48,7 @@
     <system:String x:Key="LastQuerySelected">Select last Query</system:String>
     <system:String x:Key="LastQueryEmpty">Empty last Query</system:String>
     <system:String x:Key="maxShowResults">Maximum results shown</system:String>
+    <system:String x:Key="maxShowResultsToolTip">You can also quickly adjust this by using CTRL+Plus and CTRL+Minus.</system:String>
     <system:String x:Key="ignoreHotkeysOnFullscreen">Ignore hotkeys in fullscreen mode</system:String>
     <system:String x:Key="ignoreHotkeysOnFullscreenToolTip">Disable Flow Launcher activation when a full screen application is active (Recommended for games).</system:String>
     <system:String x:Key="defaultFileManager">Default File Manager</system:String>
@@ -138,6 +139,7 @@
     <system:String x:Key="queryWindowShadowEffect">Query window shadow effect</system:String>
     <system:String x:Key="shadowEffectCPUUsage">Shadow effect has a substantial usage of GPU. Not recommended if your computer performance is limited.</system:String>
     <system:String x:Key="windowWidthSize">Window Width Size</system:String>
+    <system:String x:Key="windowWidthSizeToolTip">You can also quickly adjust this by using Ctrl+[ and Ctrl+].</system:String>
     <system:String x:Key="useGlyphUI">Use Segoe Fluent Icons</system:String>
     <system:String x:Key="useGlyphUIEffect">Use Segoe Fluent Icons for query results where supported</system:String>
 

Flow.Launcher/MainWindow.xaml

@@ -32,7 +32,9 @@
     Visibility="{Binding MainWindowVisibility, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
     WindowStartupLocation="Manual"
     WindowStyle="None"
-    mc:Ignorable="d">
+    mc:Ignorable="d"
+    Left="{Binding Left, Mode=TwoWay}"
+    Top="{Binding Top, Mode=TwoWay}">
     <Window.Resources>
         <converters:QuerySuggestionBoxConverter x:Key="QuerySuggestionBoxConverter" />
         <converters:BorderClipConverter x:Key="BorderClipConverter" />
@@ -84,6 +86,22 @@
             Modifiers="Ctrl" />
         <KeyBinding Key="Right" Command="{Binding LoadContextMenuCommand}" />
         <KeyBinding Key="Left" Command="{Binding EscCommand}" />
+        <KeyBinding
+            Key="OemCloseBrackets"
+            Modifiers="Control"
+            Command="{Binding IncreaseWidthCommand}"/>
+        <KeyBinding
+            Key="OemOpenBrackets"
+            Modifiers="Control"
+            Command="{Binding DecreaseWidthCommand}"/>
+        <KeyBinding
+            Key="OemPlus"
+            Modifiers="Control"
+            Command="{Binding IncreaseMaxResultCommand}"/> 
+        <KeyBinding
+            Key="OemMinus"
+            Modifiers="Control"
+            Command="{Binding DecreaseMaxResultCommand}"/>
         <KeyBinding
             Key="H"
             Command="{Binding LoadHistoryCommand}"

Flow.Launcher/MainWindow.xaml.cs

@@ -46,7 +46,6 @@ public MainWindow(Settings settings, MainViewModel mainVM)
             _viewModel = mainVM;
             _settings = settings;
             InitializeComponent();
-            InitializePosition();
             animationSound.Open(new Uri(AppDomain.CurrentDomain.BaseDirectory + "Resources\\open.wav"));
         }
 
@@ -91,6 +90,7 @@ private void OnLoaded(object sender, RoutedEventArgs _)
             InitializeColorScheme();
             WindowsInteropHelper.DisableControlBox(this);
             InitProgressbarAnimation();
+            InitializePosition();
             // since the default main window visibility is visible
             // so we need set focus during startup
             QueryTextBox.Focus();
@@ -470,6 +470,15 @@ public void HideStartup()
             }
         }
 
+        private void InitializePosition()
+        {
+            if (!_settings.RememberLastLaunchLocation)
+            {
+                Left = WindowLeft();
+                Top = WindowTop();
+            }
+        }
+        
         public double WindowLeft()
         {
             var screen = Screen.FromPoint(System.Windows.Forms.Cursor.Position);
@@ -503,6 +512,7 @@ public double WindowRight()
         /// </summary>
         private void OnKeyDown(object sender, KeyEventArgs e)
         {
+            var specialKeyState = GlobalHotkey.CheckModifiers();
             switch (e.Key)
             {
                 case Key.Down:
@@ -537,8 +547,13 @@ private void OnKeyDown(object sender, KeyEventArgs e)
                         e.Handled = true;
                     }
                     break;
+                case Key.F12:
+                    if (specialKeyState.CtrlPressed)
+                    {
+                        ToggleGameMode();
+                    }
+                    break;
                 case Key.Back:
-                    var specialKeyState = GlobalHotkey.CheckModifiers();
                     if (specialKeyState.CtrlPressed)
                     {
                         if (_viewModel.SelectedIsFromQueryResults()

Flow.Launcher/SettingWindow.xaml

@@ -832,11 +832,13 @@
                                         BorderThickness="0"
                                         Style="{DynamicResource SettingGroupBox}">
                                         <ItemsControl Style="{StaticResource SettingGrid}">
-                                            <TextBlock
-                                                Grid.Column="1"
-                                                VerticalAlignment="Center"
-                                                Style="{DynamicResource SettingTitleLabel}"
-                                                Text="{DynamicResource maxShowResults}" />
+                                            <StackPanel Grid.Column="1">
+                                                <TextBlock
+                                                    VerticalAlignment="Center"
+                                                    Style="{DynamicResource SettingTitleLabel}"
+                                                    Text="{DynamicResource maxShowResults}" />
+                                                <TextBlock Style="{DynamicResource SettingSubTitleLabel}" Text="{DynamicResource maxShowResultsToolTip}" />
+                                            </StackPanel>
                                             <ComboBox
                                                 Grid.Column="2"
                                                 Width="100"
@@ -1829,6 +1831,7 @@
                                         <ItemsControl Style="{StaticResource SettingGrid}">
                                             <StackPanel Style="{StaticResource TextPanel}">
                                                 <TextBlock Style="{DynamicResource SettingTitleLabel}" Text="{DynamicResource windowWidthSize}" />
+                                                <TextBlock Style="{DynamicResource SettingSubTitleLabel}" Text="{DynamicResource windowWidthSizeToolTip}" />
                                             </StackPanel>
                                             <StackPanel Grid.Column="2" Orientation="Horizontal">
                                                 <TextBlock
@@ -1842,6 +1845,7 @@
                                                     Name="WindowWidthValue"
                                                     Width="300"
                                                     Margin="0,0,18,0"
+                                                    VerticalAlignment="Center"
                                                     IsMoveToPointEnabled="True"
                                                     IsSnapToTickEnabled="True"
                                                     Maximum="1920"

Flow.Launcher/ViewModel/MainViewModel.cs

@@ -21,10 +21,11 @@
 using ISavable = Flow.Launcher.Plugin.ISavable;
 using System.IO;
 using System.Collections.Specialized;
+using CommunityToolkit.Mvvm.Input;
 
 namespace Flow.Launcher.ViewModel
 {
-    public class MainViewModel : BaseModel, ISavable
+    public partial class MainViewModel : BaseModel, ISavable
     {
         #region Private Fields
 
@@ -82,6 +83,7 @@ public MainViewModel(Settings settings)
             _selectedResults = Results;
 
             InitializeKeyCommands();
+
             RegisterViewUpdate();
             RegisterResultsUpdatedEvent();
 
@@ -154,6 +156,8 @@ private void RegisterResultsUpdatedEvent()
             }
         }
 
+
+
         private void InitializeKeyCommands()
         {
             EscCommand = new RelayCommand(_ =>
@@ -307,7 +311,7 @@ private void InitializeKeyCommands()
                             Notification.Show(
                                 InternationalizationManager.Instance.GetTranslation("success"),
                                 InternationalizationManager.Instance.GetTranslation("completedSuccessfully")
-                                );
+                            );
                         }), TaskScheduler.Default)
                     .ConfigureAwait(false);
             });
@@ -318,9 +322,9 @@ private void InitializeKeyCommands()
         #region ViewModel Properties
 
         public ResultsViewModel Results { get; private set; }
-        
+
         public ResultsViewModel ContextMenu { get; private set; }
-        
+
         public ResultsViewModel History { get; private set; }
 
         public bool GameModeStatus { get; set; }
@@ -336,6 +340,74 @@ public string QueryText
             }
         }
 
+
+        public double Top
+        {
+            get => _settings.WindowTop;
+            set
+            {
+                _settings.WindowTop = value;
+                OnPropertyChanged();
+            }
+        }
+        public double Left
+        {
+            get => _settings.WindowLeft;
+            set
+            {
+                _settings.WindowLeft = value;
+                OnPropertyChanged();
+            }
+        }
+
+        [RelayCommand]
+        private void IncreaseWidth()
+        {
+            if (MainWindowWidth + 100 > 1920 || _settings.WindowSize == 1920)
+            {
+               _settings.WindowSize = 1920;        
+            }
+            else 
+            { 
+                _settings.WindowSize += 100;
+                Left -= 50;
+            }
+            OnPropertyChanged();
+        }
+
+        [RelayCommand]
+        private void DecreaseWidth()
+        {
+            if (MainWindowWidth - 100 < 400 || _settings.WindowSize == 400)
+            {
+                _settings.WindowSize = 400;
+            }
+            else
+            { 
+                Left += 50;
+                _settings.WindowSize -= 100;
+            }
+            OnPropertyChanged();
+        }
+
+        [RelayCommand]
+        private void IncreaseMaxResult()
+        {
+            if (_settings.MaxResultsToShow == 17)
+                return;
+
+            _settings.MaxResultsToShow += 1;
+        }
+
+        [RelayCommand]
+        private void DecreaseMaxResult()
+        {
+            if (_settings.MaxResultsToShow == 2)
+                return;
+
+            _settings.MaxResultsToShow -= 1;
+        }
+
         /// <summary>
         /// we need move cursor to end when we manually changed query
         /// but we don't want to move cursor to end when query is updated from TextBox
@@ -411,7 +483,11 @@ private ResultsViewModel SelectedResults
 
         public Visibility SearchIconVisibility { get; set; }
 
-        public double MainWindowWidth => _settings.WindowSize;
+        public double MainWindowWidth
+        {
+            get => _settings.WindowSize;
+            set => _settings.WindowSize = value;
+        }
 
         public string PluginIconPath { get; set; } = null;
 
@@ -592,7 +668,7 @@ private async void QueryResults()
                 PluginIconPath = null;
                 SearchIconVisibility = Visibility.Visible;
             }
-            
+
 
             if (query.ActionKeyword == Plugin.Query.GlobalPluginWildcardSign)
             {
@@ -903,18 +979,18 @@ public void ResultCopy(string stringToCopy)
 
                         Clipboard.SetFileDropList(paths);
                         App.API.ShowMsg(
-                            App.API.GetTranslation("copy") 
-                                +" " 
-                                + (isFile? App.API.GetTranslation("fileTitle") : App.API.GetTranslation("folderTitle")), 
+                            App.API.GetTranslation("copy")
+                            + " "
+                            + (isFile ? App.API.GetTranslation("fileTitle") : App.API.GetTranslation("folderTitle")),
                             App.API.GetTranslation("completedSuccessfully"));
                     }
                     else
                     {
                         Clipboard.SetDataObject(copyText.ToString());
                         App.API.ShowMsg(
-                            App.API.GetTranslation("copy") 
-                                + " " 
-                                + App.API.GetTranslation("textTitle"), 
+                            App.API.GetTranslation("copy")
+                            + " "
+                            + App.API.GetTranslation("textTitle"),
                             App.API.GetTranslation("completedSuccessfully"));
                     }
                 }

Flow.Launcher/ViewModel/SettingWindowViewModel.cs

@@ -41,6 +41,9 @@ public SettingWindowViewModel(Updater updater, IPortable portable)
                     case nameof(Settings.ActivateTimes):
                         OnPropertyChanged(nameof(ActivatedTimes));
                         break;
+                    case nameof(Settings.WindowSize):
+                        OnPropertyChanged(nameof(WindowWidthSize));
+                        break;
                 }
             };
         }