From 806e1246126a242908f43e406290f60a88775ddb Mon Sep 17 00:00:00 2001
From: DB p <onesound@oooz.net>
Date: Tue, 23 Apr 2024 12:40:23 +0900
Subject: [PATCH] - Fix Static Hotkey's Uppercases - Adjust Warning Style in
 dialog - Adjust Warning Text

---
 Flow.Launcher/HotkeyControlDialog.xaml | 42 +++++++++++---------------
 Flow.Launcher/Languages/en.xaml        |  2 +-
 Flow.Launcher/SettingWindow.xaml       | 18 +++++------
 3 files changed, 28 insertions(+), 34 deletions(-)

diff --git a/Flow.Launcher/HotkeyControlDialog.xaml b/Flow.Launcher/HotkeyControlDialog.xaml
index 6912a1999..322f82366 100644
--- a/Flow.Launcher/HotkeyControlDialog.xaml
+++ b/Flow.Launcher/HotkeyControlDialog.xaml
@@ -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>
 
diff --git a/Flow.Launcher/Languages/en.xaml b/Flow.Launcher/Languages/en.xaml
index c92f227b3..6205c06bc 100644
--- a/Flow.Launcher/Languages/en.xaml
+++ b/Flow.Launcher/Languages/en.xaml
@@ -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  -->
diff --git a/Flow.Launcher/SettingWindow.xaml b/Flow.Launcher/SettingWindow.xaml
index 15db60573..89a454fc0 100644
--- a/Flow.Launcher/SettingWindow.xaml
+++ b/Flow.Launcher/SettingWindow.xaml
@@ -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>