prehistoric-systems/Flow.Launcher
1
0
Fork 0
mirror of https://github.com/Flow-Launcher/Flow.Launcher.git synced 2026-03-11 08:54:32 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge branch 'refs/heads/dev' into duplicate-hotkey-handling

Browse source 
# Conflicts:
#	Flow.Launcher/SettingWindow.xaml
This commit is contained in:
Yusyuriv 2024-04-26 11:47:11 +06:00
commit 2cce3618a6
No known key found for this signature in database
GPG key ID: A91C52E6F73148E0
2 changed files with 28 additions and 29 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
Flow.Launcher/Languages/en.xaml
View file

@ -196,8 +196,8 @@
<system:String x:Key="OpenContainFolderHotkey">Open Containing Folder</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="RunAsAdminHotkey">Run As Admin</system:String>
<system:String x:Key="ReloadPluginHotkey">Reload Plugins Data</system:String> <system:String x:Key="ReloadPluginHotkey">Reload Plugins Data</system:String>
<system:String x:Key="QuickWidthHotkey">Quick Adjust Window Width Size</system:String> <system:String x:Key="QuickWidthHotkey">Quick Adjust Window Width</system:String>
<system:String x:Key="QuickHeightHotkey">Quick Adjust Window Height Size</system:String> <system:String x:Key="QuickHeightHotkey">Quick Adjust Window Height</system:String>
<system:String x:Key="ReloadPluginHotkeyToolTip">Use when require plugins to reload and update their existing data.</system:String> <system:String x:Key="ReloadPluginHotkeyToolTip">Use when require plugins to reload and update their existing data.</system:String>
<system:String x:Key="AdditionalHotkeyToolTip">You can add one more hotkey for this function.</system:String> <system:String x:Key="AdditionalHotkeyToolTip">You can add one more hotkey for this function.</system:String>
<system:String x:Key="customQueryHotkey">Custom Query Hotkeys</system:String> <system:String x:Key="customQueryHotkey">Custom Query Hotkeys</system:String>

53
Flow.Launcher/SettingWindow.xaml
View file

@ -2812,22 +2812,22 @@
<cc:HotkeyDisplay Keys="F5" /> <cc:HotkeyDisplay Keys="F5" />
</cc:Card> </cc:Card>
<cc:Card <cc:Card
Title="{DynamicResource SelectNextPageHotkey}" Title="{DynamicResource SelectPrevPageHotkey}"
Icon="&#xf0ad;" Icon="&#xf0ad;"
Type="Inside"> Type="Inside">
<flowlauncher:HotkeyControl <flowlauncher:HotkeyControl
DefaultHotkey="" DefaultHotkey=""
Hotkey="{Binding Settings.SelectNextPageHotkey}" Hotkey="{Binding Settings.SelectPrevPageHotkey}"
HotkeySettings="{Binding Settings}" HotkeySettings="{Binding Settings}"
ValidateKeyGesture="False" /> ValidateKeyGesture="False" />
</cc:Card> </cc:Card>
<cc:Card <cc:Card
Title="{DynamicResource SelectPrevPageHotkey}" Title="{DynamicResource SelectNextPageHotkey}"
Icon="&#xf0ae;" Icon="&#xf0ae;"
Type="Inside"> Type="Inside">
<flowlauncher:HotkeyControl <flowlauncher:HotkeyControl
DefaultHotkey="" DefaultHotkey=""
Hotkey="{Binding Settings.SelectPrevPageHotkey}" Hotkey="{Binding Settings.SelectNextPageHotkey}"
HotkeySettings="{Binding Settings}" HotkeySettings="{Binding Settings}"
ValidateKeyGesture="False" /> ValidateKeyGesture="False" />
</cc:Card> </cc:Card>
@ -2878,6 +2878,28 @@
</cc:Card> </cc:Card>
</cc:ExCard> </cc:ExCard>
<cc:ExCard
Title="{DynamicResource SelectPrevItemHotkey}"
Margin="0,4,0,0"
Icon="&#xe74a;">
<cc:ExCard.SideContent>
<flowlauncher:HotkeyControl
DefaultHotkey="Shift+Tab"
Hotkey="{Binding Settings.SelectPrevItemHotkey}"
HotkeySettings="{Binding Settings}"
ValidateKeyGesture="False" />
</cc:ExCard.SideContent>
<cc:Card
Title="{DynamicResource SelectPrevItemHotkey}"
Sub="{DynamicResource AdditionalHotkeyToolTip}"
Type="InsideFit">
<flowlauncher:HotkeyControl
DefaultHotkey=""
Hotkey="{Binding Settings.SelectPrevItemHotkey2}"
HotkeySettings="{Binding Settings}"
ValidateKeyGesture="False" />
</cc:Card>
</cc:ExCard>
<cc:ExCard <cc:ExCard
Title="{DynamicResource SelectNextItemHotkey}" Title="{DynamicResource SelectNextItemHotkey}"
@ -2902,29 +2924,6 @@
</cc:Card> </cc:Card>
</cc:ExCard> </cc:ExCard>
<cc:ExCard
Title="{DynamicResource SelectPrevItemHotkey}"
Margin="0,4,0,0"
Icon="&#xe74a;">
<cc:ExCard.SideContent>
<flowlauncher:HotkeyControl
DefaultHotkey="Shift+Tab"
Hotkey="{Binding Settings.SelectPrevItemHotkey}"
HotkeySettings="{Binding Settings}"
ValidateKeyGesture="False" />
</cc:ExCard.SideContent>
<cc:Card
Title="{DynamicResource SelectPrevItemHotkey}"
Sub="{DynamicResource AdditionalHotkeyToolTip}"
Type="InsideFit">
<flowlauncher:HotkeyControl
DefaultHotkey=""
Hotkey="{Binding Settings.SelectPrevItemHotkey2}"
HotkeySettings="{Binding Settings}"
ValidateKeyGesture="False" />
</cc:Card>
</cc:ExCard>
<cc:ExCard <cc:ExCard
Title="{DynamicResource customQueryHotkey}" Title="{DynamicResource customQueryHotkey}"
Margin="0,20,0,0" Margin="0,20,0,0"