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="flowlauncherHotkeyToolTip">Enter shortcut to show/hide Flow Launcher.</system:String>
<system:String x:Key="previewHotkey">Preview Hotkey</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="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="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="openResultModifiersToolTip">Select a modifier key to open selected result via keyboard.</system:String>
<system:String x:Key="showOpenResultHotkey">Show Hotkey</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}" Text="{DynamicResource hotkeys}"
TextAlignment="left" /> 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"> <StackPanel Grid.Row="1">
<cc:Card <cc:Card
Title="{DynamicResource flowlauncherHotkey}" Title="{DynamicResource flowlauncherHotkey}"
@ -2666,7 +2648,7 @@
<StackPanel Grid.Row="2"> <StackPanel Grid.Row="2">
<cc:Card <cc:Card
Title="{DynamicResource previewHotkey}" Title="{DynamicResource previewHotkey}"
Icon="&#xe8a1;;" Icon="&#xe8a1;"
Sub="{DynamicResource previewHotkeyToolTip}"> Sub="{DynamicResource previewHotkeyToolTip}">
<flowlauncher:HotkeyControl DataContext="{Binding PreviewHotkeyViewModel}" /> <flowlauncher:HotkeyControl DataContext="{Binding PreviewHotkeyViewModel}" />
</cc:Card> </cc:Card>
@ -2730,60 +2712,41 @@
</Border> </Border>
<StackPanel Grid.Row="2"> <StackPanel Grid.Row="2">
<Border Margin="0,16,0,0" Style="{DynamicResource SettingGroupBox}"> <cc:ExCard
<ItemsControl Style="{StaticResource SettingGrid}"> Title="{DynamicResource basicHotkey}"
<StackPanel Style="{StaticResource TextPanel}"> Margin="0,12,0,0"
<TextBlock Style="{DynamicResource SettingTitleLabel}" Text="{DynamicResource autoCompleteHotkey}" /> Icon="&#xe966;"
<TextBlock Style="{DynamicResource SettingSubTitleLabel}" Text="{DynamicResource autoCompleteHotkeyToolTip}" /> Sub="{DynamicResource basicHotkeyToolTip}">
</StackPanel> <StackPanel>
<flowlauncher:HotkeyControl <cc:Card
Grid.Row="0" Title="{DynamicResource flowlauncherHotkey}"
Grid.Column="2" Icon="&#xeda7;"
Margin="0,0,16,0" Sub="{DynamicResource flowlauncherHotkeyToolTip}"
HorizontalAlignment="Right" Type="Inside" />
HorizontalContentAlignment="Right" <cc:Card
DataContext="{Binding AutoCompleteHotkeyViewModel}" /> Title="{DynamicResource flowlauncherHotkey}"
<TextBlock Style="{StaticResource Glyph}"> Icon="&#xeda7;"
&#xe893; Sub="{DynamicResource flowlauncherHotkeyToolTip}"
</TextBlock> Type="Inside" />
</ItemsControl> </StackPanel>
</Border> </cc:ExCard>
<Border Margin="0,8,0,0" Style="{DynamicResource SettingGroupBox}">
<ItemsControl Style="{StaticResource SettingGrid}"> <cc:Card
<StackPanel Style="{StaticResource TextPanel}"> Title="{DynamicResource autoCompleteHotkey}"
<TextBlock Style="{DynamicResource SettingTitleLabel}" Text="{DynamicResource SelectNextItemHotkey}" /> Margin="0,12,0,0"
</StackPanel> Icon="&#xe893;"
<flowlauncher:HotkeyControl Sub="{DynamicResource autoCompleteHotkeyToolTip}">
x:Name="SelectNextItemHotkeyControl" <flowlauncher:HotkeyControl DataContext="{Binding AutoCompleteHotkeyViewModel}" />
Grid.Row="0" </cc:Card>
Grid.Column="2"
Margin="0,0,16,0" <cc:Card Title="{DynamicResource SelectNextItemHotkey}" Icon="&#xf0ae;">
HorizontalAlignment="Right" <flowlauncher:HotkeyControl DataContext="{Binding SelectNextItemHotkeyViewModel}" />
HorizontalContentAlignment="Right" </cc:Card>
DataContext="{Binding SelectNextItemHotkeyViewModel}" />
<TextBlock Style="{StaticResource Glyph}">
&#xf0ae; <cc:Card Title="{DynamicResource SelectPrevItemHotkey}" Icon="&#xf0ad;">
</TextBlock> <flowlauncher:HotkeyControl DataContext="{Binding SelectPrevItemHotkeyViewModel}" />
</ItemsControl> </cc:Card>
</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>
</StackPanel> </StackPanel>
<TextBlock <TextBlock