From 3f4336697e5aa11a9f1ddb761f7082819ac23c55 Mon Sep 17 00:00:00 2001
From: Niels Laute <niels.laute@live.nl>
Date: Tue, 13 Oct 2020 23:30:29 +0200
Subject: [PATCH] Improvements

---
 .../Controls/HotkeySettingsControl.xaml              | 12 +++++++-----
 .../Strings/en-us/Resources.resw                     | 11 +----------
 2 files changed, 8 insertions(+), 15 deletions(-)

diff --git a/src/core/Microsoft.PowerToys.Settings.UI/Controls/HotkeySettingsControl.xaml b/src/core/Microsoft.PowerToys.Settings.UI/Controls/HotkeySettingsControl.xaml
index 7611e743e8..8b49e30aa2 100644
--- a/src/core/Microsoft.PowerToys.Settings.UI/Controls/HotkeySettingsControl.xaml
+++ b/src/core/Microsoft.PowerToys.Settings.UI/Controls/HotkeySettingsControl.xaml
@@ -5,16 +5,18 @@
     xmlns:local="using:Microsoft.PowerToys.Settings.UI.Controls"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    AutomationProperties.Name="{x:Bind Header, Mode=OneTime}"
     mc:Ignorable="d"
     d:DesignHeight="300"
     d:DesignWidth="400">
     <StackPanel Orientation="Vertical">
         <ToolTipService.ToolTip>
             <ToolTip>
-                <StackPanel Orientation="Vertical">
-                    <TextBlock x:Uid="ShortcutWarningLabel"/>
-                    <TextBlock Text="{x:Bind Keys, Mode=OneTime}" FontWeight="SemiBold"/>
-                </StackPanel>
+                <TextBlock x:Name="ShortcutWarningLabelText">
+                        <Run x:Uid="ShortcutWarningLabel"/>
+                        <LineBreak/>
+                        <Run Text="{x:Bind Keys, Mode=OneTime}" FontWeight="SemiBold"/>
+                </TextBlock>
             </ToolTip>
         </ToolTipService.ToolTip>
 
@@ -24,7 +26,7 @@
                        Foreground="{Binding Path=IsEnabled, ElementName=HotkeyTextBox, Converter={StaticResource ModuleEnabledToForegroundConverter}}"
                        />
 
-            <TextBlock x:Uid="SettingsPage_SetShortcut_Glyph"
+            <TextBlock AutomationProperties.LabeledBy="{Binding ElementName=ShortcutWarningLabelText}"
                        x:Name="TitleGlyph" Text="&#xE946;"
                        FontFamily="Segoe MDL2 Assets"
                        Margin="4,4,0,0"
diff --git a/src/core/Microsoft.PowerToys.Settings.UI/Strings/en-us/Resources.resw b/src/core/Microsoft.PowerToys.Settings.UI/Strings/en-us/Resources.resw
index e4ac27c91a..a587a376d4 100644
--- a/src/core/Microsoft.PowerToys.Settings.UI/Strings/en-us/Resources.resw
+++ b/src/core/Microsoft.PowerToys.Settings.UI/Strings/en-us/Resources.resw
@@ -337,7 +337,7 @@
     <value>Open zones editor</value>
   </data>
   <data name="SettingsPage_SetShortcut.AutomationProperties.Name" xml:space="preserve">
-    <value>Enter shortcut</value>
+    <value>Set shortcut</value>
   </data>
   <data name="SettingsPage_SetShortcut_Glyph.AutomationProperties.Name" xml:space="preserve">
     <value>Information Symbol</value>
@@ -768,13 +768,4 @@
   <data name="FileExplorerPreview_RebootRequired.Text" xml:space="preserve">
     <value>A reboot may be required for changes to these settings to take effect</value>
   </data>
-  <data name="ColorPicker_ActivationShortcut.AutomationProperties.Name" xml:space="preserve">
-    <value>Open Color Picker</value>
-  </data>
-  <data name="FancyZones_HotkeyEditorControl.AutomationProperties.Name" xml:space="preserve">
-    <value>Open zones editor</value>
-  </data>
-  <data name="PowerLauncher_OpenPowerLauncher.AutomationProperties.Name" xml:space="preserve">
-    <value>Open PowerToys Run</value>
-  </data>
 </root>
\ No newline at end of file