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

Adjust Item Sort

Browse source
This commit is contained in:
DB p 2024-04-17 11:17:28 +09:00
parent dc724d4b48
commit 8260f75d9b
2 changed files with 38 additions and 73 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -176,6 +176,8 @@
<system:String x:Key="flowlauncherHotkeyToolTip">Enter shortcut to show/hide Flow Launcher.</system:String>
<system:String x:Key="previewHotkey">Preview Hotkey</system:String>
<system:String x:Key="previewHotkeyToolTip">Enter shortcut to show/hide preview in search window.</system:String>
<system:String x:Key="basicHotkey">Basic Hotkeys</system:String>
<system:String x:Key="basicHotkeyToolTip">List of shortcuts used by basic</system:String>
<system:String x:Key="openResultModifiers">Open Result Modifier Key</system:String>
<system:String x:Key="openResultModifiersToolTip">Select a modifier key to open selected result via keyboard.</system:String>
<system:String x:Key="showOpenResultHotkey">Show Hotkey</system:String>

109
Flow.Launcher/SettingWindow.xaml
View file

@ -2636,24 +2636,6 @@
Text="{DynamicResource hotkeys}"
TextAlignment="left" />
<cc:ExCard
Title="Fixed Hotkeys"
Icon="&#xeda7;"
Sub="TSTSTS">
<StackPanel>
<cc:Card
Title="{DynamicResource flowlauncherHotkey}"
Icon="&#xeda7;"
Sub="{DynamicResource flowlauncherHotkeyToolTip}"
Type="Inside" />
<cc:Card
Title="{DynamicResource flowlauncherHotkey}"
Icon="&#xeda7;"
Sub="{DynamicResource flowlauncherHotkeyToolTip}"
Type="Inside" />
</StackPanel>
</cc:ExCard>
<StackPanel Grid.Row="1">
<cc:Card
Title="{DynamicResource flowlauncherHotkey}"
@ -2666,7 +2648,7 @@
<StackPanel Grid.Row="2">
<cc:Card
Title="{DynamicResource previewHotkey}"
Icon="&#xe8a1;;"
Icon="&#xe8a1;"
Sub="{DynamicResource previewHotkeyToolTip}">
<flowlauncher:HotkeyControl DataContext="{Binding PreviewHotkeyViewModel}" />
</cc:Card>
@ -2730,60 +2712,41 @@
</Border>
<StackPanel Grid.Row="2">
<Border Margin="0,16,0,0" Style="{DynamicResource SettingGroupBox}">
<ItemsControl Style="{StaticResource SettingGrid}">
<StackPanel Style="{StaticResource TextPanel}">
<TextBlock Style="{DynamicResource SettingTitleLabel}" Text="{DynamicResource autoCompleteHotkey}" />
<TextBlock Style="{DynamicResource SettingSubTitleLabel}" Text="{DynamicResource autoCompleteHotkeyToolTip}" />
</StackPanel>
<flowlauncher:HotkeyControl
Grid.Row="0"
Grid.Column="2"
Margin="0,0,16,0"
HorizontalAlignment="Right"
HorizontalContentAlignment="Right"
DataContext="{Binding AutoCompleteHotkeyViewModel}" />
<TextBlock Style="{StaticResource Glyph}">
&#xe893;
</TextBlock>
</ItemsControl>
</Border>
<Border Margin="0,8,0,0" Style="{DynamicResource SettingGroupBox}">
<ItemsControl Style="{StaticResource SettingGrid}">
<StackPanel Style="{StaticResource TextPanel}">
<TextBlock Style="{DynamicResource SettingTitleLabel}" Text="{DynamicResource SelectNextItemHotkey}" />
</StackPanel>
<flowlauncher:HotkeyControl
x:Name="SelectNextItemHotkeyControl"
Grid.Row="0"
Grid.Column="2"
Margin="0,0,16,0"
HorizontalAlignment="Right"
HorizontalContentAlignment="Right"
DataContext="{Binding SelectNextItemHotkeyViewModel}" />
<TextBlock Style="{StaticResource Glyph}">
&#xf0ae;
</TextBlock>
</ItemsControl>
</Border>
<Border Margin="0,8,0,0" Style="{DynamicResource SettingGroupBox}">
<ItemsControl Style="{StaticResource SettingGrid}">
<StackPanel Style="{StaticResource TextPanel}">
<TextBlock Style="{DynamicResource SettingTitleLabel}" Text="{DynamicResource SelectPrevItemHotkey}" />
</StackPanel>
<flowlauncher:HotkeyControl
x:Name="SelectPrevItemHotkeyControl"
Grid.Row="0"
Grid.Column="2"
Margin="0,0,16,0"
HorizontalAlignment="Right"
HorizontalContentAlignment="Right"
DataContext="{Binding SelectPrevItemHotkeyViewModel}" />
<TextBlock Style="{StaticResource Glyph}">
&#xf0ad;
</TextBlock>
</ItemsControl>
</Border>
<cc:ExCard
Title="{DynamicResource basicHotkey}"
Margin="0,12,0,0"
Icon="&#xe966;"
Sub="{DynamicResource basicHotkeyToolTip}">
<StackPanel>
<cc:Card
Title="{DynamicResource flowlauncherHotkey}"
Icon="&#xeda7;"
Sub="{DynamicResource flowlauncherHotkeyToolTip}"
Type="Inside" />
<cc:Card
Title="{DynamicResource flowlauncherHotkey}"
Icon="&#xeda7;"
Sub="{DynamicResource flowlauncherHotkeyToolTip}"
Type="Inside" />
</StackPanel>
</cc:ExCard>
<cc:Card
Title="{DynamicResource autoCompleteHotkey}"
Margin="0,12,0,0"
Icon="&#xe893;"
Sub="{DynamicResource autoCompleteHotkeyToolTip}">
<flowlauncher:HotkeyControl DataContext="{Binding AutoCompleteHotkeyViewModel}" />
</cc:Card>
<cc:Card Title="{DynamicResource SelectNextItemHotkey}" Icon="&#xf0ae;">
<flowlauncher:HotkeyControl DataContext="{Binding SelectNextItemHotkeyViewModel}" />
</cc:Card>
<cc:Card Title="{DynamicResource SelectPrevItemHotkey}" Icon="&#xf0ad;">
<flowlauncher:HotkeyControl DataContext="{Binding SelectPrevItemHotkeyViewModel}" />
</cc:Card>
</StackPanel>
<TextBlock