From 344013d8606e52b05305138d7bba4b156ef5bb49 Mon Sep 17 00:00:00 2001
From: Niels Laute <niels.laute@live.nl>
Date: Sun, 25 Oct 2020 14:37:43 +0100
Subject: [PATCH] Updated labels

---
 .../Strings/en-us/Resources.resw              | 31 +++++--------------
 .../Views/GeneralPage.xaml                    | 13 +++-----
 .../Views/PowerLauncherPage.xaml              | 20 ++++++++----
 .../Views/ShortcutGuidePage.xaml              |  8 ++---
 4 files changed, 31 insertions(+), 41 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 4950b64dc0..bcdd48b4fe 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
@@ -302,9 +302,6 @@
   <data name="PowerLauncher_ClearInputOnLaunch.Content" xml:space="preserve">
     <value>Clear the previous query on launch</value>
   </data>
-  <data name="PowerLauncher_Theme.Text" xml:space="preserve">
-    <value>Choose color</value>
-  </data>
   <data name="KeyboardManager_KeysMappingLayoutRightHeader.Text" xml:space="preserve">
     <value>To:</value>
     <comment>Keyboard Manager mapping keys view right header</comment>
@@ -405,15 +402,6 @@
   <data name="GeneralPage_PrivacyStatement_URL.Text" xml:space="preserve">
     <value>Privacy statement</value>
   </data>
-  <data name="GeneralPage_Radio_Theme_Dark.Content" xml:space="preserve">
-    <value>Dark</value>
-  </data>
-  <data name="GeneralPage_Radio_Theme_Default.Content" xml:space="preserve">
-    <value>System default</value>
-  </data>
-  <data name="GeneralPage_Radio_Theme_Light.Content" xml:space="preserve">
-    <value>Light</value>
-  </data>
   <data name="GeneralPage_ReportAbug.Text" xml:space="preserve">
     <value>Report a bug</value>
   </data>
@@ -435,9 +423,6 @@
   <data name="PowerRename_Toggle_Enable.Header" xml:space="preserve">
     <value>Enable PowerRename</value>
   </data>
-  <data name="RadioButtons_Name_Theme.Text" xml:space="preserve">
-    <value>Settings theme</value>
-  </data>
   <data name="PowerRename_Toggle_EnableOnContextMenu.Header" xml:space="preserve">
     <value>Show icon on context menu</value>
   </data>
@@ -492,9 +477,6 @@
   <data name="ShortcutGuide_OverlayOpacity.Header" xml:space="preserve">
     <value>Opacity of background</value>
   </data>
-  <data name="ShortcutGuide_Theme.Text" xml:space="preserve">
-    <value>Choose Shortcut Guide overlay color</value>
-  </data>
   <data name="ImageResizer_CustomSizes.Text" xml:space="preserve">
     <value>Image sizes</value>
   </data>
@@ -777,13 +759,16 @@
   <data name="ImageResizer_FilenameFormatPlaceholder.PlaceholderText" xml:space="preserve">
     <value>Example: %1 (%2)</value>
   </data>
-  <data name="PowerLauncher_Radio_Theme_Dark.Content" xml:space="preserve">
+  <data name="ColorModeHeader.Text" xml:space="preserve">
+    <value>Choose a mode</value>
+  </data>
+  <data name="Radio_Theme_Dark.Content" xml:space="preserve">
     <value>Dark</value>
   </data>
-  <data name="PowerLauncher_Radio_Theme_Default.Content" xml:space="preserve">
-    <value>System default</value>
-  </data>
-  <data name="PowerLauncher_Radio_Theme_Light.Content" xml:space="preserve">
+  <data name="Radio_Theme_Light.Content" xml:space="preserve">
     <value>Light</value>
   </data>
+  <data name="Radio_Theme_Default.Content" xml:space="preserve">
+    <value>Windows default</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/src/core/Microsoft.PowerToys.Settings.UI/Views/GeneralPage.xaml b/src/core/Microsoft.PowerToys.Settings.UI/Views/GeneralPage.xaml
index 377d42b339..32c54a657a 100644
--- a/src/core/Microsoft.PowerToys.Settings.UI/Views/GeneralPage.xaml
+++ b/src/core/Microsoft.PowerToys.Settings.UI/Views/GeneralPage.xaml
@@ -89,20 +89,17 @@
 
             <!-- Replaced the Radiobuttons parent control with a StackPanel to mitigate the Tab and Arrow key related keyboard navigation issues due to XAML Islands
             Tracking issue in the winui repository - https://github.com/microsoft/microsoft-ui-xaml/issues/3156 -->
-            <TextBlock Name="RadioButtons_Name_Theme" 
-                       x:Uid="RadioButtons_Name_Theme"
+            <TextBlock x:Name="RadioButtons_Name_Theme" 
+                       x:Uid="ColorModeHeader"
                        Margin="{StaticResource SmallTopMargin}"/>
             <StackPanel AutomationProperties.LabeledBy="{Binding ElementName=RadioButtons_Name_Theme}">
-                <RadioButton x:Uid="GeneralPage_Radio_Theme_Dark"
-                             Content="Dark"
+                <RadioButton x:Uid="Radio_Theme_Dark"
                              IsChecked="{ Binding Mode=TwoWay, Path=IsDarkThemeRadioButtonChecked}"/>
 
-                <RadioButton x:Uid="GeneralPage_Radio_Theme_Light" 
-                             Content="Light"
+                <RadioButton x:Uid="Radio_Theme_Light" 
                              IsChecked="{ Binding Mode=TwoWay, Path=IsLightThemeRadioButtonChecked}"/>
 
-                <RadioButton x:Uid="GeneralPage_Radio_Theme_Default"
-                             Content="System default"
+                <RadioButton x:Uid="Radio_Theme_Default"
                              IsChecked="{ Binding Mode=TwoWay, Path=IsSystemThemeRadioButtonChecked}"/>
             </StackPanel>
 
diff --git a/src/core/Microsoft.PowerToys.Settings.UI/Views/PowerLauncherPage.xaml b/src/core/Microsoft.PowerToys.Settings.UI/Views/PowerLauncherPage.xaml
index 4e2df36ca7..6d5bc491ca 100644
--- a/src/core/Microsoft.PowerToys.Settings.UI/Views/PowerLauncherPage.xaml
+++ b/src/core/Microsoft.PowerToys.Settings.UI/Views/PowerLauncherPage.xaml
@@ -146,19 +146,27 @@
             <TextBlock x:Uid="Appearance_GroupSettings"
                        Style="{StaticResource SettingsGroupTitleStyle}"
                        Foreground="{x:Bind Mode=OneWay, Path=ViewModel.EnablePowerLauncher, Converter={StaticResource ModuleEnabledToForegroundConverter}}" />
-            <TextBlock x:Uid="PowerLauncher_Theme"
+
+            <!-- We cannot navigate to all the radio buttons using the arrow keys because of an XYNavigation issue in the RadioButtons control.
+            The screen reader does not read the heading when we tab into a radio button, even though the LabeledBy automation property is set.
+            Link to the issue in the winui repository - https://github.com/microsoft/microsoft-ui-xaml/issues/3156 -->
+            <TextBlock x:Uid="ColorModeHeader"
+                       x:Name="RadioButtons_Name_Theme" 
                        Margin="{StaticResource SmallTopMargin}"
                        Foreground="{x:Bind Mode=OneWay, Path=ViewModel.EnablePowerLauncher, Converter={StaticResource ModuleEnabledToForegroundConverter}}" />
-            <muxc:RadioButtons IsEnabled="{x:Bind Mode=OneWay, Path=ViewModel.EnablePowerLauncher}">
-                <RadioButton x:Uid="PowerLauncher_Radio_Theme_Dark"
+            <StackPanel AutomationProperties.LabeledBy="{Binding ElementName=RadioButtons_Name_Theme}">
+                <RadioButton x:Uid="Radio_Theme_Dark"
+                             IsEnabled="{x:Bind Mode=OneWay, Path=ViewModel.EnablePowerLauncher}"
                              IsChecked="{Binding Mode=TwoWay, Path=IsDarkThemeRadioButtonChecked}" />
 
-                <RadioButton x:Uid="PowerLauncher_Radio_Theme_Light"
+                <RadioButton x:Uid="Radio_Theme_Light"
+                             IsEnabled="{x:Bind Mode=OneWay, Path=ViewModel.EnablePowerLauncher}"
                              IsChecked="{Binding Mode=TwoWay, Path=IsLightThemeRadioButtonChecked}" />
 
-                <RadioButton x:Uid="PowerLauncher_Radio_Theme_Default"
+                <RadioButton x:Uid="Radio_Theme_Default"
+                             IsEnabled="{x:Bind Mode=OneWay, Path=ViewModel.EnablePowerLauncher}"
                              IsChecked="{Binding Mode=TwoWay, Path=IsSystemThemeRadioButtonChecked}" />
-            </muxc:RadioButtons>
+            </StackPanel>
         </StackPanel>
 
         <RelativePanel x:Name="SidePanel" 
diff --git a/src/core/Microsoft.PowerToys.Settings.UI/Views/ShortcutGuidePage.xaml b/src/core/Microsoft.PowerToys.Settings.UI/Views/ShortcutGuidePage.xaml
index 250c81b575..619af03be6 100644
--- a/src/core/Microsoft.PowerToys.Settings.UI/Views/ShortcutGuidePage.xaml
+++ b/src/core/Microsoft.PowerToys.Settings.UI/Views/ShortcutGuidePage.xaml
@@ -90,16 +90,16 @@
             The screen reader does not read the heading when we tab into a radio button, even though the LabeledBy automation property is set.
             Link to the issue in the winui repository - https://github.com/microsoft/microsoft-ui-xaml/issues/3156 -->
             <TextBlock Name="ShortcutGuide_Theme"
-                x:Uid="ShortcutGuide_Theme"
+                x:Uid="ColorModeHeader"
                 Margin="{StaticResource SmallTopMargin}"
                 Foreground="{x:Bind Mode=OneWay, Path=ViewModel.IsEnabled, Converter={StaticResource ModuleEnabledToForegroundConverter}}"/>
             <muxc:RadioButtons IsEnabled="{x:Bind Mode=OneWay, Path=ViewModel.IsEnabled}"
                                SelectedIndex="{x:Bind Mode=TwoWay, Path=ViewModel.ThemeIndex}"
                                Margin="{StaticResource XXSmallTopMargin}"
                                AutomationProperties.LabeledBy="{Binding ElementName=ShortcutGuide_Theme}">
-                <RadioButton x:Uid="GeneralPage_Radio_Theme_Dark" />
-                <RadioButton x:Uid="GeneralPage_Radio_Theme_Light" />
-                <RadioButton x:Uid="GeneralPage_Radio_Theme_Default"/>
+                <RadioButton x:Uid="Radio_Theme_Dark" />
+                <RadioButton x:Uid="Radio_Theme_Light" />
+                <RadioButton x:Uid="Radio_Theme_Default"/>
             </muxc:RadioButtons>
         </StackPanel>