From ac94bbe57527e7daf9f21415775dd19fb1867586 Mon Sep 17 00:00:00 2001
From: Niels Laute <niels.laute@live.nl>
Date: Tue, 13 Oct 2020 22:24:15 +0200
Subject: [PATCH 1/6] Added improved narrator support for custom shortcut
 control

---
 .../Strings/en-us/Resources.resw                    | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

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 380e19b3c3..e4ac27c91a 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>Set Shortcut</value>
+    <value>Enter shortcut</value>
   </data>
   <data name="SettingsPage_SetShortcut_Glyph.AutomationProperties.Name" xml:space="preserve">
     <value>Information Symbol</value>
@@ -768,4 +768,13 @@
   <data name="FileExplorerPreview_RebootRequired.Text" xml:space="preserve">
     <value>A reboot may be required for changes to these settings to take effect</value>
   </data>
-</root>
+  <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

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 2/6] 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

From 466a0015e952fc32644e14173bbc3f770c117049 Mon Sep 17 00:00:00 2001
From: Niels Laute <niels.laute@live.nl>
Date: Fri, 23 Oct 2020 15:44:31 +0200
Subject: [PATCH 3/6] Fixed tooltip call out with narrator

---
 .../Controls/HotkeySettingsControl.xaml       | 47 +++++++------------
 .../Strings/en-us/Resources.resw              | 16 +++----
 2 files changed, 25 insertions(+), 38 deletions(-)

diff --git a/src/core/Microsoft.PowerToys.Settings.UI/Controls/HotkeySettingsControl.xaml b/src/core/Microsoft.PowerToys.Settings.UI/Controls/HotkeySettingsControl.xaml
index 8b49e30aa2..89e2313a95 100644
--- a/src/core/Microsoft.PowerToys.Settings.UI/Controls/HotkeySettingsControl.xaml
+++ b/src/core/Microsoft.PowerToys.Settings.UI/Controls/HotkeySettingsControl.xaml
@@ -5,39 +5,26 @@
     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"
+    AutomationProperties.Name="{x:Bind Header, Mode=OneTime}"
     d:DesignHeight="300"
     d:DesignWidth="400">
-    <StackPanel Orientation="Vertical">
+    <TextBox x:Name="HotkeyTextBox"
+             x:Uid="SettingsPage_SetShortcut"
+             AutomationProperties.HelpText="{Binding ElementName=ShortcutWarningLabelText, Path=Text}"
+             IsReadOnly="True">
         <ToolTipService.ToolTip>
-            <ToolTip>
-                <TextBlock x:Name="ShortcutWarningLabelText">
-                        <Run x:Uid="ShortcutWarningLabel"/>
-                        <LineBreak/>
-                        <Run Text="{x:Bind Keys, Mode=OneTime}" FontWeight="SemiBold"/>
-                </TextBlock>
-            </ToolTip>
+            <TextBlock x:Name="ShortcutWarningLabelText">
+                <Run x:Uid="ShortcutWarningLabel"/>
+                <LineBreak/>
+                <Run Text="{x:Bind Keys, Mode=OneTime}" FontWeight="SemiBold"/>
+            </TextBlock>
         </ToolTipService.ToolTip>
-
-        <StackPanel Orientation="Horizontal">
-            <TextBlock x:Name="TitleText"
-                       Text="{x:Bind Header, Mode=OneTime}"
-                       Foreground="{Binding Path=IsEnabled, ElementName=HotkeyTextBox, Converter={StaticResource ModuleEnabledToForegroundConverter}}"
-                       />
-
-            <TextBlock AutomationProperties.LabeledBy="{Binding ElementName=ShortcutWarningLabelText}"
-                       x:Name="TitleGlyph" Text="&#xE946;"
-                       FontFamily="Segoe MDL2 Assets"
-                       Margin="4,4,0,0"
-                       Foreground="{Binding Path=IsEnabled, ElementName=HotkeyTextBox, Converter={StaticResource ModuleEnabledToForegroundConverter}}"
-                       />
-        
-        </StackPanel>
-        <TextBox x:Uid="SettingsPage_SetShortcut"
-                 x:Name="HotkeyTextBox"
-                 Margin="0,5,0,0"
-                 IsReadOnly="True"
-                 />
-    </StackPanel>
+        <TextBox.Header>
+            <TextBlock>
+                    <Run Text="{x:Bind Header, Mode=OneTime}"/>
+                    <Run Text="&#xE946;" FontFamily="Segoe MDL2 Assets"/>
+            </TextBlock>
+        </TextBox.Header>
+    </TextBox>
 </UserControl>
\ No newline at end of file
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 a587a376d4..6c4d136aa5 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
@@ -204,10 +204,10 @@
     <value>Current Shortcut Remappings</value>
   </data>
   <data name="KeyboardManager_RemappedKeysListItem.AutomationProperties.Name" xml:space="preserve">
-    <value>Key Remapping</value>
+    <value>Key remapping</value>
   </data>
   <data name="KeyboardManager_RemappedShortcutsListItem.AutomationProperties.Name" xml:space="preserve">
-    <value>Shortcut Remapping</value>
+    <value>Shortcut remapping</value>
   </data>
   <data name="KeyboardManager_RemappedTo.AutomationProperties.Name" xml:space="preserve">
     <value>Remapped to</value>
@@ -337,7 +337,7 @@
     <value>Open zones editor</value>
   </data>
   <data name="SettingsPage_SetShortcut.AutomationProperties.Name" xml:space="preserve">
-    <value>Set shortcut</value>
+    <value>Enter your shortcut</value>
   </data>
   <data name="SettingsPage_SetShortcut_Glyph.AutomationProperties.Name" xml:space="preserve">
     <value>Information Symbol</value>
@@ -502,7 +502,7 @@
     <value>Enable Image Resizer</value>
   </data>
   <data name="ImagesSizesListView.AutomationProperties.Name" xml:space="preserve">
-    <value>Image Size</value>
+    <value>Image size</value>
   </data>
   <data name="ImageResizer_Configurations.AutomationProperties.Name" xml:space="preserve">
     <value>Configurations</value>
@@ -511,19 +511,19 @@
     <value>Configuration Name</value>
   </data>
   <data name="ImageResizer_Fit_Property.AutomationProperties.Name" xml:space="preserve">
-    <value>Fit Property</value>
+    <value>Fit property</value>
   </data>
   <data name="ImageResizer_Width_Property.AutomationProperties.Name" xml:space="preserve">
-    <value>Width Property</value>
+    <value>Width property</value>
   </data>
   <data name="ImageResizer_Height_Property.AutomationProperties.Name" xml:space="preserve">
     <value>Height Property</value>
   </data>
   <data name="ImageResizer_Size_Property.AutomationProperties.Name" xml:space="preserve">
-    <value>Size Property</value>
+    <value>Size property</value>
   </data>
   <data name="ImageResizer_Times_Symbol.AutomationProperties.Name" xml:space="preserve">
-    <value>Times Symbol</value>
+    <value>Times symbol</value>
   </data>
   <data name="RemoveButton.AutomationProperties.Name" xml:space="preserve">
     <value>Remove</value>

From 7c4216261889c06164cee5b62bf416c9cbe01939 Mon Sep 17 00:00:00 2001
From: Niels Laute <niels.laute@live.nl>
Date: Fri, 23 Oct 2020 15:57:34 +0200
Subject: [PATCH 4/6] Updated string

---
 .../Strings/en-us/Resources.resw                                | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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 6c4d136aa5..9e9762952c 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 your shortcut</value>
+    <value>Shortcut setting</value>
   </data>
   <data name="SettingsPage_SetShortcut_Glyph.AutomationProperties.Name" xml:space="preserve">
     <value>Information Symbol</value>

From 773c57e6094ef995875faeccb569fe09ad304218 Mon Sep 17 00:00:00 2001
From: Niels Laute <niels.laute@live.nl>
Date: Fri, 23 Oct 2020 16:10:16 +0200
Subject: [PATCH 5/6] File format limitations are now announced by Narrator

---
 .../Views/ImageResizerPage.xaml               | 70 ++++++++-----------
 1 file changed, 31 insertions(+), 39 deletions(-)

diff --git a/src/core/Microsoft.PowerToys.Settings.UI/Views/ImageResizerPage.xaml b/src/core/Microsoft.PowerToys.Settings.UI/Views/ImageResizerPage.xaml
index 3939cea8ec..d7c98c4f64 100644
--- a/src/core/Microsoft.PowerToys.Settings.UI/Views/ImageResizerPage.xaml
+++ b/src/core/Microsoft.PowerToys.Settings.UI/Views/ImageResizerPage.xaml
@@ -255,7 +255,9 @@
                       MinWidth="240"
                       IsEnabled="{x:Bind Mode=OneWay, Path=ViewModel.IsEnabled}"
                       Margin="{StaticResource SmallTopMargin}"
-                      AutomationProperties.LabeledBy="{Binding ElementName=ImageResizer_FilenameFormatHeader}">
+                      AutomationProperties.LabeledBy="{Binding ElementName=ImageResizer_FilenameFormatHeader}"
+                      AutomationProperties.HelpText="{Binding ElementName=FileFormatTextBlock, Path=Text}"
+                     >
                 <TextBox.Header>
                     <StackPanel Orientation="Horizontal">
                         <TextBlock Name="ImageResizer_FilenameFormatHeader"
@@ -268,44 +270,34 @@
                     </StackPanel>
                 </TextBox.Header>
                 <ToolTipService.ToolTip>
-                    <StackPanel>
-                        <TextBlock x:Uid="ImageResizer_FileFormatDescription"/>
-                        <TextBlock Margin="{StaticResource SmallTopMargin}">
-                            <Run Text="%1" FontWeight="Bold" />
-                            <Run Text=" - "/>
-                            <Run x:Uid="ImageResizer_Formatting_Filename" />
-                        </TextBlock>
-
-                        <TextBlock>
-                            <Run Text="%2" FontWeight="Bold" />
-                            <Run Text=" - "/>
-                            <Run x:Uid="ImageResizer_Formatting_Sizename"/>
-                        </TextBlock>
-
-                        <TextBlock>
-                            <Run Text="%3" FontWeight="Bold" />
-                            <Run Text=" - "/>
-                            <Run x:Uid="ImageResizer_Formatting_SelectedWidth"/>
-                        </TextBlock>
-
-                        <TextBlock>
-                            <Run Text="%4" FontWeight="Bold" />
-                            <Run Text=" - "/>
-                            <Run x:Uid="ImageResizer_Formatting_SelectedHeight"/>
-                        </TextBlock>
-
-                        <TextBlock>
-                            <Run Text="%5" FontWeight="Bold" />
-                            <Run Text=" - "/>
-                            <Run x:Uid="ImageResizer_Formatting_ActualWidth"/>
-                        </TextBlock>
-
-                        <TextBlock>
-                            <Run Text="%6" FontWeight="Bold" />
-                            <Run Text=" - "/>
-                            <Run x:Uid="ImageResizer_Formatting_ActualHeight"/>
-                        </TextBlock>
-                    </StackPanel>
+                    <TextBlock x:Name="FileFormatTextBlock">
+                        <Run x:Uid="ImageResizer_FileFormatDescription"/>
+                        <LineBreak/>
+                        <LineBreak/>
+                        <Run Text="%1" FontWeight="Bold" />
+                        <Run Text=" - "/>
+                        <Run x:Uid="ImageResizer_Formatting_Filename" />
+                        <LineBreak/>
+                        <Run Text="%2" FontWeight="Bold" />
+                        <Run Text=" - "/>
+                        <Run x:Uid="ImageResizer_Formatting_Sizename"/>
+                        <LineBreak/>
+                        <Run Text="%3" FontWeight="Bold" />
+                        <Run Text=" - "/>
+                        <Run x:Uid="ImageResizer_Formatting_SelectedWidth"/>
+                        <LineBreak/>
+                        <Run Text="%4" FontWeight="Bold" />
+                        <Run Text=" - "/>
+                        <Run x:Uid="ImageResizer_Formatting_SelectedHeight"/>
+                        <LineBreak/>
+                        <Run Text="%5" FontWeight="Bold" />
+                        <Run Text=" - "/>
+                        <Run x:Uid="ImageResizer_Formatting_ActualWidth"/>
+                        <LineBreak/>
+                        <Run Text="%6" FontWeight="Bold" />
+                        <Run Text=" - "/>
+                        <Run x:Uid="ImageResizer_Formatting_ActualHeight"/>
+                    </TextBlock>
                 </ToolTipService.ToolTip>
             </TextBox>
 

From 61a2e5297fa006a87036178132f668d50157d8b7 Mon Sep 17 00:00:00 2001
From: Niels Laute <niels.laute@live.nl>
Date: Sat, 24 Oct 2020 16:35:10 +0200
Subject: [PATCH 6/6] Fix resource issue

---
 .../Strings/en-us/Resources.resw                             | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

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 e48dbc0734..93002886a0 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
@@ -340,7 +340,7 @@
     <value>Open zones editor</value>
   </data>
   <data name="SettingsPage_SetShortcut.AutomationProperties.Name" xml:space="preserve">
-    <value>Set Shortcut</value>
+    <value>Shortcut setting</value>
   </data>
   <data name="SettingsPage_SetShortcut_Glyph.AutomationProperties.Name" xml:space="preserve">
     <value>Information Symbol</value>
@@ -786,7 +786,4 @@
   <data name="PowerLauncher_Radio_Theme_Light.Content" xml:space="preserve">
     <value>Light</value>
   </data>
-  <data name="SettingsPage_SetShortcut.AutomationProperties.Name" xml:space="preserve">
-    <value>Set Shortcut</value>	    <value>Shortcut setting</value>
-  </data>	  </data>
 </root>
\ No newline at end of file