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

- Fix Static Hotkey's Uppercases

Browse source 
- Adjust Warning Style in dialog
- Adjust Warning Text
This commit is contained in:
DB p 2024-04-23 12:40:23 +09:00
parent 03c74590f5
commit 806e124612
3 changed files with 28 additions and 34 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

42
Flow.Launcher/HotkeyControlDialog.xaml
View file

@ -24,9 +24,7 @@
</Grid.RowDefinitions>
<!-- Window title and the keys in the hotkey -->
<Grid
Grid.Row="0"
Margin="26,12,26,0">
<Grid Grid.Row="0" Margin="26,12,26,0">
<Grid.RowDefinitions>
<RowDefinition Height="Auto" />
<RowDefinition Height="*" />
@ -38,9 +36,7 @@
FontWeight="SemiBold"
Text="{Binding WindowTitle}"
TextAlignment="Left" />
<TextBlock
FontSize="14"
Text="{DynamicResource hotkeyRegGuide}" />
<TextBlock FontSize="14" Text="{DynamicResource hotkeyRegGuide}" />
</StackPanel>
<Border
Grid.Row="1"
@ -80,7 +76,7 @@
</Border>
</Grid>
<!-- Warning message for when something went wrong with the new hotkey. -->
<!-- Warning message for when something went wrong with the new hotkey. -->
<Border Grid.Row="1">
<Border
@ -94,23 +90,21 @@
CornerRadius="5"
Visibility="Collapsed">
<Grid VerticalAlignment="Center">
<Grid.ColumnDefinitions>
<ColumnDefinition Width="50" />
<ColumnDefinition />
</Grid.ColumnDefinitions>
<ui:FontIcon
FontSize="13"
Foreground="{DynamicResource InfoBarWarningIcon}"
Glyph="&#xeb90;" />
<TextBlock
x:Name="tbMsg"
Grid.Column="1"
HorizontalAlignment="Left"
VerticalAlignment="Top"
FontSize="14"
FontWeight="SemiBold"
Foreground="{DynamicResource PopupTextColor}"
TextWrapping="Wrap" />
<StackPanel Orientation="Horizontal">
<ui:FontIcon
Margin="20,0,14,0"
VerticalAlignment="Center"
FontSize="15"
Foreground="{DynamicResource InfoBarWarningIcon}"
Glyph="&#xf167;" />
<TextBlock
x:Name="tbMsg"
Margin="0,0,0,2"
HorizontalAlignment="Left"
FontSize="13"
FontWeight="SemiBold"
Foreground="{DynamicResource Color05B}" />
</StackPanel>
</Grid>
</Border>

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

@ -310,7 +310,7 @@
<system:String x:Key="invalidPluginHotkey">Invalid plugin hotkey</system:String>
<system:String x:Key="update">Update</system:String>
<system:String x:Key="hotkeyRegTitle">Binding Hotkey</system:String>
<system:String x:Key="hotkeyUnavailable">It's unavailable hotkey.</system:String>
<system:String x:Key="hotkeyUnavailable">This hotkey is unavailable.</system:String>
<system:String x:Key="hotkeyRegGuide">Press the keys you want to use for this function.</system:String>
<!-- Custom Query Shortcut Dialog -->

18
Flow.Launcher/SettingWindow.xaml
View file

@ -2731,13 +2731,13 @@
Title="{DynamicResource OpenContainFolderHotkey}"
Icon="&#xe8b7;"
Type="Inside">
<cc:HotkeyDisplay Keys="Ctrl+ENTER" />
<cc:HotkeyDisplay Keys="Ctrl+Enter" />
</cc:Card>
<cc:Card
Title="{DynamicResource RunAsAdminHotkey}"
Icon="&#xe7ef;"
Type="Inside">
<cc:HotkeyDisplay Keys="Ctrl+SHIFT+ENTER" />
<cc:HotkeyDisplay Keys="Ctrl+Shift+Enter" />
</cc:Card>
<cc:Card
Title="{DynamicResource ToggleHistoryHotkey}"
@ -2749,7 +2749,7 @@
Title="{DynamicResource CopyFilePathHotkey}"
Icon="&#xe8c8;"
Type="Inside">
<cc:HotkeyDisplay Keys="Ctrl+SHIFT+C" />
<cc:HotkeyDisplay Keys="Ctrl+Shift+C" />
</cc:Card>
<cc:Card
Title="{DynamicResource OpenContextMenuHotkey}"
@ -2764,7 +2764,7 @@
Title="{DynamicResource OpenContextMenuHotkey}"
Icon="&#xede3;"
Type="Inside">
<cc:HotkeyDisplay Keys="SHIFT+ENTER" />
<cc:HotkeyDisplay Keys="Shift+Enter" />
</cc:Card>
<cc:Card
@ -2780,7 +2780,7 @@
Title="{DynamicResource ToggleGameModeHotkey}"
Icon="&#xe7fc;"
Type="Inside">
<cc:HotkeyDisplay Keys="Ctrl+SHIFT+C" />
<cc:HotkeyDisplay Keys="Ctrl+Shift+C" />
</cc:Card>
<cc:Card
Title="{DynamicResource ReloadPluginHotkey}"
@ -2813,8 +2813,8 @@
Icon="&#xe7ea;"
Type="Inside">
<StackPanel Orientation="Horizontal">
<cc:HotkeyDisplay Keys="CTRL+[" />
<cc:HotkeyDisplay Margin="4,0,0,0" Keys="CTRL+]" />
<cc:HotkeyDisplay Keys="Ctrl+[" />
<cc:HotkeyDisplay Margin="4,0,0,0" Keys="Ctrl+]" />
</StackPanel>
</cc:Card>
<cc:Card
@ -2822,8 +2822,8 @@
Icon="&#xe7eb;"
Type="Inside">
<StackPanel Orientation="Horizontal">
<cc:HotkeyDisplay Keys="CTRL+Plus" />
<cc:HotkeyDisplay Margin="4,0,0,0" Keys="CTRL+Minus" />
<cc:HotkeyDisplay Keys="Ctrl+Plus" />
<cc:HotkeyDisplay Margin="4,0,0,0" Keys="Ctrl+Minus" />
</StackPanel>
</cc:Card>
</StackPanel>