maxmustermann/PowerToys
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge pull request #7530 from microsoft/users/niels9001/settings-incorrecttheminglabels

Browse source 
[Settings] Fixing inconsistent theme/app mode naming
This commit is contained in:
Clint Rutkas 2020-10-27 08:55:42 -07:00 committed by GitHub
commit ce464f4816
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 37 additions and 41 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

34
src/core/Microsoft.PowerToys.Settings.UI/Strings/en-us/Resources.resw
View file

@ -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>
@ -492,9 +480,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>
@ -687,9 +672,6 @@
<data name="General_Version.Text" xml:space="preserve">
<value>Version:</value>
</data>
<data name="Shortcut_Overlay_Theme.Header" xml:space="preserve">
<value>Background theme</value>
</data>
<data name="Admin_mode.Text" xml:space="preserve">
<value>Administrator mode</value>
</data>
@ -777,13 +759,19 @@
<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>
<data name="Windows_Color_Settings.Content" xml:space="preserve">
<value>Windows color settings</value>
</data>
</root>

14
src/core/Microsoft.PowerToys.Settings.UI/Views/GeneralPage.xaml
View file

@ -89,21 +89,19 @@
<!-- 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}"/>
<HyperlinkButton x:Uid="Windows_Color_Settings" NavigateUri="ms-settings:colors"/>
</StackPanel>
<ToggleSwitch x:Uid="GeneralPage_ToggleSwitch_RunAtStartUp"

21
src/core/Microsoft.PowerToys.Settings.UI/Views/PowerLauncherPage.xaml
View file

@ -146,19 +146,28 @@
<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>
<HyperlinkButton x:Uid="Windows_Color_Settings" NavigateUri="ms-settings:colors"/>
</StackPanel>
</StackPanel>
<RelativePanel x:Name="SidePanel"

9
src/core/Microsoft.PowerToys.Settings.UI/Views/ShortcutGuidePage.xaml
View file

@ -90,17 +90,18 @@
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>
<HyperlinkButton x:Uid="Windows_Color_Settings" NavigateUri="ms-settings:colors"/>
</StackPanel>
<RelativePanel x:Name="SidePanel"