Merge branch 'dev' into UpdateWording

Author: onesounds

Flow.Launcher.Infrastructure/Constant.cs

@@ -1,4 +1,4 @@
-using System.Diagnostics;
+using System.Diagnostics;
 using System.IO;
 using System.Reflection;
 
@@ -21,6 +21,7 @@ public static class Constant
         public static readonly string PreinstalledDirectory = Path.Combine(ProgramDirectory, Plugins);
         public const string Issue = "https://github.com/Flow-Launcher/Flow.Launcher/issues/new";
         public static readonly string Version = FileVersionInfo.GetVersionInfo(Assembly.Location.NonNull()).ProductVersion;
+        public static readonly string Dev = "Dev";
         public const string Documentation = "https://flowlauncher.com/docs/#/usage-tips";
 
         public static readonly int ThumbnailSize = 64;

Flow.Launcher/HotkeyControl.xaml

@@ -38,9 +38,8 @@
                     FontSize="13"
                     FontWeight="SemiBold"
                     Foreground="{DynamicResource Color05B}"
-                    Visibility="Visible">
-                    Press key
-                </TextBlock>
+                    Text="{DynamicResource flowlauncherPressHotkey}"
+                    Visibility="Visible" />
             </Border>
         </Popup>
 
@@ -49,8 +48,8 @@
             Margin="0,0,18,0"
             VerticalContentAlignment="Center"
             input:InputMethod.IsInputMethodEnabled="False"
+            LostFocus="tbHotkey_LostFocus"
             PreviewKeyDown="TbHotkey_OnPreviewKeyDown"
-            TabIndex="100"
-            LostFocus="tbHotkey_LostFocus"/>
+            TabIndex="100" />
     </Grid>
 </UserControl>

Flow.Launcher/HotkeyControl.xaml.cs

@@ -9,6 +9,7 @@
 using Flow.Launcher.Infrastructure.Hotkey;
 using Flow.Launcher.Plugin;
 using System.Threading;
+using System.Windows.Interop;
 
 namespace Flow.Launcher
 {
@@ -113,7 +114,7 @@ public Task SetHotkeyAsync(string keyStr, bool triggerValidate = true)
         private void tbHotkey_LostFocus(object sender, RoutedEventArgs e)
         {
             tbMsg.Text = tbMsgTextOriginal;
-            tbMsg.Foreground = tbMsgForegroundColorOriginal;
+            tbMsg.SetResourceReference(TextBox.ForegroundProperty, "Color05B");
         }
     }
 }

Flow.Launcher/Languages/en.xaml

@@ -27,7 +27,7 @@
     <system:String x:Key="PositionResetToolTip">Reset search window position</system:String>
 
     <!--  Setting General  -->
-    <system:String x:Key="flowlauncher_settings">Flow Launcher Settings</system:String>
+    <system:String x:Key="flowlauncher_settings">Settings</system:String>
     <system:String x:Key="general">General</system:String>
     <system:String x:Key="portableMode">Portable Mode</system:String>
     <system:String x:Key="portableModeToolTIp">Store all settings and user data in one folder (Useful when used with removable drives or cloud services).</system:String>
@@ -146,6 +146,7 @@
     <system:String x:Key="showOpenResultHotkeyToolTip">Show result selection hotkey with results.</system:String>
     <system:String x:Key="customQueryHotkey">Custom Query Hotkey</system:String>
     <system:String x:Key="customQueryShortcut">Custom Query Shortcut</system:String>
+    <system:String x:Key="builtinShortcuts">Built-in Shortcuts</system:String>
     <system:String x:Key="customQuery">Query</system:String>
     <system:String x:Key="customShortcut">Shortcut</system:String>
     <system:String x:Key="customShortcutExpansion">Expanded</system:String>
@@ -163,6 +164,7 @@
     <system:String x:Key="windowWidthSizeToolTip">You can also quickly adjust this by using Ctrl+[ and Ctrl+].</system:String>
     <system:String x:Key="useGlyphUI">Use Segoe Fluent Icons</system:String>
     <system:String x:Key="useGlyphUIEffect">Use Segoe Fluent Icons for query results where supported</system:String>
+    <system:String x:Key="flowlauncherPressHotkey">Press Key</system:String>
 
     <!--  Setting Proxy  -->
     <system:String x:Key="proxy">HTTP Proxy</system:String>
@@ -186,6 +188,7 @@
     <system:String x:Key="github">Github</system:String>
     <system:String x:Key="docs">Docs</system:String>
     <system:String x:Key="version">Version</system:String>
+    <system:String x:Key="icons">Icons</system:String>
     <system:String x:Key="about_activate_times">You have activated Flow Launcher {0} times</system:String>
     <system:String x:Key="checkUpdates">Check for Updates</system:String>
     <system:String x:Key="newVersionTips">New version {0} is available, would you like to restart Flow Launcher to use the update?</system:String>