From f4a54b667e0c5b6fb20f72d5641463daa4d53ccf Mon Sep 17 00:00:00 2001
From: Niels Laute <niels.laute@live.nl>
Date: Fri, 16 Jul 2021 21:21:06 +0200
Subject: [PATCH] [Settings] Accessibility fixes (#12302)

* Added name to image

* Adding a warning sign to warnings

* Revert "Adding a warning sign to warnings"

This reverts commit 283be62bf6c5ac5e9c7ab34b3a0a47360cebc4c7.

* Added * for warnings

* Remove obsolete read more button

Co-authored-by: Niels Laute <niels9001@hotmail.com>
---
 .../SidePanel/SettingsPageControl.xaml        |  1 +
 .../Strings/en-us/Resources.resw              | 15 ++++++-----
 .../Views/GeneralPage.xaml                    | 27 +++----------------
 3 files changed, 14 insertions(+), 29 deletions(-)

diff --git a/src/settings-ui/Microsoft.PowerToys.Settings.UI/Controls/SidePanel/SettingsPageControl.xaml b/src/settings-ui/Microsoft.PowerToys.Settings.UI/Controls/SidePanel/SettingsPageControl.xaml
index c1ec4c9bea..5908d250f4 100644
--- a/src/settings-ui/Microsoft.PowerToys.Settings.UI/Controls/SidePanel/SettingsPageControl.xaml
+++ b/src/settings-ui/Microsoft.PowerToys.Settings.UI/Controls/SidePanel/SettingsPageControl.xaml
@@ -70,6 +70,7 @@
                          RelativePanel.Below="DescriptionPanel"
                          MaxWidth="240"
                          CornerRadius="4"
+                         x:Uid="Learn_More_Description"
                          NavigateUri="{x:Bind ModuleImageLink}"
                          Margin="{StaticResource SmallTopBottomMargin}">
                 <Image>
diff --git a/src/settings-ui/Microsoft.PowerToys.Settings.UI/Strings/en-us/Resources.resw b/src/settings-ui/Microsoft.PowerToys.Settings.UI/Strings/en-us/Resources.resw
index 83548cb101..6bce3756e1 100644
--- a/src/settings-ui/Microsoft.PowerToys.Settings.UI/Strings/en-us/Resources.resw
+++ b/src/settings-ui/Microsoft.PowerToys.Settings.UI/Strings/en-us/Resources.resw
@@ -811,7 +811,7 @@ Disabling this module or closing PowerToys will unmute the microphone and camera
     <value>Administrator mode</value>
   </data>
   <data name="General_RunAsAdminRequired.Text" xml:space="preserve">
-    <value>You need to run as administrator to use this setting.</value>
+    <value>* You need to run as administrator to use this setting.</value>
   </data>
   <data name="ShortcutWarningLabel.Text" xml:space="preserve">
     <value>Only shortcuts with the following hotkeys are valid:</value>
@@ -885,7 +885,7 @@ Made with 💗 by Microsoft and the PowerToys community.</value>
     <value>Preview Pane</value>
   </data>
   <data name="FileExplorerPreview_RunAsAdminRequired.Text" xml:space="preserve">
-    <value>You need to run as administrator to modify these settings.</value>
+    <value>* You need to run as administrator to modify these settings.</value>
   </data>
   <data name="FileExplorerPreview_AffectsAllUsers.Text" xml:space="preserve">
     <value>The settings on this page affect all users on the system</value>
@@ -1036,13 +1036,13 @@ Made with 💗 by Microsoft and the PowerToys community.</value>
     <value>Additional options</value>
   </data>
   <data name="Run_NotAccessibleWarning.Text" xml:space="preserve">
-    <value>Please define an activation phrase or allow this plugin for the global results to use it.</value>
+    <value>* Please define an activation phrase or allow this plugin for the global results to use it.</value>
   </data>
   <data name="Run_AllPluginsDisabled.Text" xml:space="preserve">
-    <value>PowerToys Run can't provide any results without plugins. Please enable at least one plugin.</value>
+    <value>* PowerToys Run can't provide any results without plugins. Please enable at least one plugin.</value>
   </data>
   <data name="Run_NotAllowedActionKeyword.Text" xml:space="preserve">
-    <value>This activation phrase overrides the behavior of other plugins. Please change it to something else.</value>
+    <value>* This activation phrase overrides the behavior of other plugins. Please change it to something else.</value>
   </data>
   <data name="Run_PluginUseDescription.Text" xml:space="preserve">
     <value>You can include or remove each plugin from the global results, change the direct activation phrase and configure additional options.</value>
@@ -1312,7 +1312,7 @@ From there, simply click on a Markdown file or SVG icon in the File Explorer and
     <value>You can always change modes quickly by {right-clicking the Awake icon} in the system tray.</value>
   </data>
   <data name="General_FailedToDownloadTheNewVersion.Text" xml:space="preserve">
-    <value>An error occurred trying to update to</value>
+    <value>* An error occurred trying to update to</value>
   </data>
   <data name="General_InstallNow.Content" xml:space="preserve">
     <value>Install now</value>
@@ -1341,4 +1341,7 @@ From there, simply click on a Markdown file or SVG icon in the File Explorer and
   <data name="General_DownloadAndInstall.Content" xml:space="preserve">
     <value>Download and install</value>
   </data>
+  <data name="Learn_More_Description.AutomationProperties.Name" xml:space="preserve">
+    <value>Learn more</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/src/settings-ui/Microsoft.PowerToys.Settings.UI/Views/GeneralPage.xaml b/src/settings-ui/Microsoft.PowerToys.Settings.UI/Views/GeneralPage.xaml
index dd5b19bcd3..051b99920b 100644
--- a/src/settings-ui/Microsoft.PowerToys.Settings.UI/Views/GeneralPage.xaml
+++ b/src/settings-ui/Microsoft.PowerToys.Settings.UI/Views/GeneralPage.xaml
@@ -163,16 +163,7 @@
                                x:Uid="General_NewVersionAvailable"
                                FontWeight="SemiBold"
                                Opacity="{Binding AutoUpdatesEnabled, Converter={StaticResource ModuleEnabledToOpacityConverter}}"/>
-
-                        <HyperlinkButton NavigateUri="{Binding PowerToysNewAvailableVersionLink }" Margin="4,-6,0,0" IsEnabled="{Binding AutoUpdatesEnabled}">
-                            <TextBlock Text="{Binding PowerToysNewAvailableVersion }" Style="{StaticResource SemiBoldBody}"/>
-                        </HyperlinkButton>
-
-                        <HyperlinkButton NavigateUri="{Binding PowerToysNewAvailableVersionLink}" 
-                                     Margin="4,-6,0,0" 
-                                     IsEnabled="{Binding AutoUpdatesEnabled}">
-                            <TextBlock x:Name="General_ReadMore_ReadyToDownload" x:Uid="General_ReadMore" />
-                        </HyperlinkButton>
+                        <HyperlinkButton NavigateUri="{Binding PowerToysNewAvailableVersionLink}" Content="{Binding PowerToysNewAvailableVersion}" Margin="4,-6,0,0" IsEnabled="{Binding AutoUpdatesEnabled}"/>
                     </StackPanel>
 
                     <TextBlock x:Name="General_Downloading"
@@ -205,15 +196,7 @@
                                x:Uid="General_NewVersionReadyToInstall"
                                Style="{StaticResource SemiBoldBody}"
                                Opacity="{Binding AutoUpdatesEnabled, Converter={StaticResource ModuleEnabledToOpacityConverter}}"/>
-                        <HyperlinkButton NavigateUri="{Binding PowerToysNewAvailableVersionLink }" Margin="4,-6,0,0" IsEnabled="{Binding AutoUpdatesEnabled}">
-                            <TextBlock Text="{Binding PowerToysNewAvailableVersion }" Style="{StaticResource SemiBoldBody}"/>
-                        </HyperlinkButton>
-
-                        <HyperlinkButton NavigateUri="{Binding PowerToysNewAvailableVersionLink}" 
-                                     Margin="4,-6,0,0" 
-                                     IsEnabled="{Binding AutoUpdatesEnabled}">
-                            <TextBlock x:Name="General_ReadMore_ReadyToInstall" x:Uid="General_ReadMore" />
-                        </HyperlinkButton>
+                        <HyperlinkButton NavigateUri="{Binding PowerToysNewAvailableVersionLink}" Content="{Binding PowerToysNewAvailableVersion}" Margin="4,-6,0,0" IsEnabled="{Binding AutoUpdatesEnabled}"/>
                     </StackPanel>
 
                     <Button x:Uid="General_InstallNow"
@@ -229,7 +212,7 @@
                         <TextBlock x:Name="General_Version_Error" 
                                x:Uid="General_Version" 
                                Opacity="{Binding AutoUpdatesEnabled, Converter={StaticResource ModuleEnabledToOpacityConverter}}"/>
-                        <TextBlock Text="{Binding PowerToysVersion }"
+                        <TextBlock Text="{Binding PowerToysVersion}"
                                Margin="4,0,0,0"
                                Opacity="{Binding AutoUpdatesEnabled, Converter={StaticResource ModuleEnabledToOpacityConverter}}"/>
                     </StackPanel>
@@ -240,9 +223,7 @@
                         <TextBlock x:Name="General_FailedToDownloadTheNewVersion" 
                                x:Uid="General_FailedToDownloadTheNewVersion"
                                Foreground="{ThemeResource SystemControlErrorTextForegroundBrush}"/>
-                        <HyperlinkButton NavigateUri="{Binding PowerToysNewAvailableVersionLink }" Margin="4,-6,0,0" IsEnabled="{Binding AutoUpdatesEnabled}">
-                            <TextBlock Text="{Binding PowerToysNewAvailableVersion }" />
-                        </HyperlinkButton>
+                        <HyperlinkButton NavigateUri="{Binding PowerToysNewAvailableVersionLink}" Content="{Binding PowerToysNewAvailableVersion}" Margin="4,-6,0,0" IsEnabled="{Binding AutoUpdatesEnabled}"/>
                     </StackPanel>
 
                     <TextBlock x:Name="General_Downloading_TryAgain"