diff --git a/Flow.Launcher.Infrastructure/UserSettings/Settings.cs b/Flow.Launcher.Infrastructure/UserSettings/Settings.cs index 274f88dc6..f031775b4 100644 --- a/Flow.Launcher.Infrastructure/UserSettings/Settings.cs +++ b/Flow.Launcher.Infrastructure/UserSettings/Settings.cs @@ -20,6 +20,7 @@ namespace Flow.Launcher.Infrastructure.UserSettings public bool ShowOpenResultHotkey { get; set; } = true; public double WindowSize { get; set; } = 580; public string PreviewHotkey { get; set; } = $"F1"; + public string AutoCompleteHotkey { get; set; } = $"F2"; public string Language { diff --git a/Flow.Launcher/MainWindow.xaml b/Flow.Launcher/MainWindow.xaml index e2c74d367..ede285ef8 100644 --- a/Flow.Launcher/MainWindow.xaml +++ b/Flow.Launcher/MainWindow.xaml @@ -46,7 +46,6 @@ - + Command="{Binding CopyAlternativeCommand}" + Modifiers="Ctrl+Shift" /> + diff --git a/Flow.Launcher/SettingWindow.xaml b/Flow.Launcher/SettingWindow.xaml index d10634a49..08a6aec0c 100644 --- a/Flow.Launcher/SettingWindow.xaml +++ b/Flow.Launcher/SettingWindow.xaml @@ -2648,7 +2648,7 @@ Margin="0,0,16,0" HorizontalAlignment="Right" HorizontalContentAlignment="Right" - DataContext="{Binding ToggleHotkeyViewModel}"/> + DataContext="{Binding ToggleHotkeyViewModel}" />  @@ -2665,13 +2665,13 @@ + HorizontalContentAlignment="Right" + DataContext="{Binding PreviewHotkeyViewModel}" /> @@ -2736,6 +2736,27 @@ + + + + + + + + + +  + + + + + Constant.QueryTextBoxIconImagePath; public bool StartWithEnglishMode => Settings.AlwaysStartEn; diff --git a/Flow.Launcher/ViewModel/SettingWindowViewModel.cs b/Flow.Launcher/ViewModel/SettingWindowViewModel.cs index 0ee395331..c9b2519d1 100644 --- a/Flow.Launcher/ViewModel/SettingWindowViewModel.cs +++ b/Flow.Launcher/ViewModel/SettingWindowViewModel.cs @@ -82,6 +82,12 @@ namespace Flow.Launcher.ViewModel { Settings.PreviewHotkey = hotkey.ToString(); }); + + AutoCompleteHotkeyViewModel = + new HotkeyControlViewModel(Settings.AutoCompleteHotkey, "F2", false, hotkey => + { + Settings.AutoCompleteHotkey = hotkey.ToString(); + }); } public Settings Settings { get; set; } @@ -962,6 +968,7 @@ namespace Flow.Launcher.ViewModel public HotkeyControlViewModel ToggleHotkeyViewModel { get; set; } public HotkeyControlViewModel PreviewHotkeyViewModel { get; set; } + public HotkeyControlViewModel AutoCompleteHotkeyViewModel { get; set; } private static DirectoryInfo GetLogDir(string version = "") {