Mirrors/PowerToys
1
0
Fork 0
mirror of https://github.com/microsoft/PowerToys.git synced 2026-04-08 20:27:36 +02:00
Code Issues Packages Projects Releases Wiki Activity

Updated labels

Browse Source
This commit is contained in:
Niels Laute
2020-10-25 14:37:43 +01:00
parent 2ef451aa4a
commit 344013d860
4 changed files with 31 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
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"> <data name="PowerLauncher_ClearInputOnLaunch.Content" xml:space="preserve">
<value>Clear the previous query on launch</value> <value>Clear the previous query on launch</value>
</data> </data>
<data name="PowerLauncher_Theme.Text" xml:space="preserve">
<value>Choose color</value>
</data>
<data name="KeyboardManager_KeysMappingLayoutRightHeader.Text" xml:space="preserve"> <data name="KeyboardManager_KeysMappingLayoutRightHeader.Text" xml:space="preserve">
<value>To:</value> <value>To:</value>
<comment>Keyboard Manager mapping keys view right header</comment> <comment>Keyboard Manager mapping keys view right header</comment>
@@ -405,15 +402,6 @@
<data name="GeneralPage_PrivacyStatement_URL.Text" xml:space="preserve"> <data name="GeneralPage_PrivacyStatement_URL.Text" xml:space="preserve">
<value>Privacy statement</value> <value>Privacy statement</value>
</data> </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"> <data name="GeneralPage_ReportAbug.Text" xml:space="preserve">
<value>Report a bug</value> <value>Report a bug</value>
</data> </data>
@@ -435,9 +423,6 @@
<data name="PowerRename_Toggle_Enable.Header" xml:space="preserve"> <data name="PowerRename_Toggle_Enable.Header" xml:space="preserve">
<value>Enable PowerRename</value> <value>Enable PowerRename</value>
</data> </data>
<data name="RadioButtons_Name_Theme.Text" xml:space="preserve">
<value>Settings theme</value>
</data>
<data name="PowerRename_Toggle_EnableOnContextMenu.Header" xml:space="preserve"> <data name="PowerRename_Toggle_EnableOnContextMenu.Header" xml:space="preserve">
<value>Show icon on context menu</value> <value>Show icon on context menu</value>
</data> </data>
@@ -492,9 +477,6 @@
<data name="ShortcutGuide_OverlayOpacity.Header" xml:space="preserve"> <data name="ShortcutGuide_OverlayOpacity.Header" xml:space="preserve">
<value>Opacity of background</value> <value>Opacity of background</value>
</data> </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"> <data name="ImageResizer_CustomSizes.Text" xml:space="preserve">
<value>Image sizes</value> <value>Image sizes</value>
</data> </data>
@@ -777,13 +759,16 @@
<data name="ImageResizer_FilenameFormatPlaceholder.PlaceholderText" xml:space="preserve"> <data name="ImageResizer_FilenameFormatPlaceholder.PlaceholderText" xml:space="preserve">
<value>Example: %1 (%2)</value> <value>Example: %1 (%2)</value>
</data> </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> <value>Dark</value>
</data> </data>
<data name="PowerLauncher_Radio_Theme_Default.Content" xml:space="preserve"> <data name="Radio_Theme_Light.Content" xml:space="preserve">
<value>System default</value>
</data>
<data name="PowerLauncher_Radio_Theme_Light.Content" xml:space="preserve">
<value>Light</value> <value>Light</value>
</data> </data>
<data name="Radio_Theme_Default.Content" xml:space="preserve">
<value>Windows default</value>
</data>
</root> </root>

13
src/core/Microsoft.PowerToys.Settings.UI/Views/GeneralPage.xaml
View File

@@ -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 <!-- 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 --> Tracking issue in the winui repository - https://github.com/microsoft/microsoft-ui-xaml/issues/3156 -->
<TextBlock Name="RadioButtons_Name_Theme" <TextBlock x:Name="RadioButtons_Name_Theme"
x:Uid="RadioButtons_Name_Theme" x:Uid="ColorModeHeader"
Margin="{StaticResource SmallTopMargin}"/> Margin="{StaticResource SmallTopMargin}"/>
<StackPanel AutomationProperties.LabeledBy="{Binding ElementName=RadioButtons_Name_Theme}"> <StackPanel AutomationProperties.LabeledBy="{Binding ElementName=RadioButtons_Name_Theme}">
<RadioButton x:Uid="GeneralPage_Radio_Theme_Dark" <RadioButton x:Uid="Radio_Theme_Dark"
Content="Dark"
IsChecked="{ Binding Mode=TwoWay, Path=IsDarkThemeRadioButtonChecked}"/> IsChecked="{ Binding Mode=TwoWay, Path=IsDarkThemeRadioButtonChecked}"/>
<RadioButton x:Uid="GeneralPage_Radio_Theme_Light" <RadioButton x:Uid="Radio_Theme_Light"
Content="Light"
IsChecked="{ Binding Mode=TwoWay, Path=IsLightThemeRadioButtonChecked}"/> IsChecked="{ Binding Mode=TwoWay, Path=IsLightThemeRadioButtonChecked}"/>
<RadioButton x:Uid="GeneralPage_Radio_Theme_Default" <RadioButton x:Uid="Radio_Theme_Default"
Content="System default"
IsChecked="{ Binding Mode=TwoWay, Path=IsSystemThemeRadioButtonChecked}"/> IsChecked="{ Binding Mode=TwoWay, Path=IsSystemThemeRadioButtonChecked}"/>
</StackPanel> </StackPanel>

20
src/core/Microsoft.PowerToys.Settings.UI/Views/PowerLauncherPage.xaml
View File

@@ -146,19 +146,27 @@
<TextBlock x:Uid="Appearance_GroupSettings" <TextBlock x:Uid="Appearance_GroupSettings"
Style="{StaticResource SettingsGroupTitleStyle}" Style="{StaticResource SettingsGroupTitleStyle}"
Foreground="{x:Bind Mode=OneWay, Path=ViewModel.EnablePowerLauncher, Converter={StaticResource ModuleEnabledToForegroundConverter}}" /> 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}" Margin="{StaticResource SmallTopMargin}"
Foreground="{x:Bind Mode=OneWay, Path=ViewModel.EnablePowerLauncher, Converter={StaticResource ModuleEnabledToForegroundConverter}}" /> Foreground="{x:Bind Mode=OneWay, Path=ViewModel.EnablePowerLauncher, Converter={StaticResource ModuleEnabledToForegroundConverter}}" />
<muxc:RadioButtons IsEnabled="{x:Bind Mode=OneWay, Path=ViewModel.EnablePowerLauncher}"> <StackPanel AutomationProperties.LabeledBy="{Binding ElementName=RadioButtons_Name_Theme}">
<RadioButton x:Uid="PowerLauncher_Radio_Theme_Dark" <RadioButton x:Uid="Radio_Theme_Dark"
IsEnabled="{x:Bind Mode=OneWay, Path=ViewModel.EnablePowerLauncher}"
IsChecked="{Binding Mode=TwoWay, Path=IsDarkThemeRadioButtonChecked}" /> 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}" /> 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}" /> IsChecked="{Binding Mode=TwoWay, Path=IsSystemThemeRadioButtonChecked}" />
</muxc:RadioButtons> </StackPanel>
</StackPanel> </StackPanel>
<RelativePanel x:Name="SidePanel" <RelativePanel x:Name="SidePanel"

8
src/core/Microsoft.PowerToys.Settings.UI/Views/ShortcutGuidePage.xaml
View File

@@ -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. 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 --> Link to the issue in the winui repository - https://github.com/microsoft/microsoft-ui-xaml/issues/3156 -->
<TextBlock Name="ShortcutGuide_Theme" <TextBlock Name="ShortcutGuide_Theme"
x:Uid="ShortcutGuide_Theme" x:Uid="ColorModeHeader"
Margin="{StaticResource SmallTopMargin}" Margin="{StaticResource SmallTopMargin}"
Foreground="{x:Bind Mode=OneWay, Path=ViewModel.IsEnabled, Converter={StaticResource ModuleEnabledToForegroundConverter}}"/> Foreground="{x:Bind Mode=OneWay, Path=ViewModel.IsEnabled, Converter={StaticResource ModuleEnabledToForegroundConverter}}"/>
<muxc:RadioButtons IsEnabled="{x:Bind Mode=OneWay, Path=ViewModel.IsEnabled}" <muxc:RadioButtons IsEnabled="{x:Bind Mode=OneWay, Path=ViewModel.IsEnabled}"
SelectedIndex="{x:Bind Mode=TwoWay, Path=ViewModel.ThemeIndex}" SelectedIndex="{x:Bind Mode=TwoWay, Path=ViewModel.ThemeIndex}"
Margin="{StaticResource XXSmallTopMargin}" Margin="{StaticResource XXSmallTopMargin}"
AutomationProperties.LabeledBy="{Binding ElementName=ShortcutGuide_Theme}"> AutomationProperties.LabeledBy="{Binding ElementName=ShortcutGuide_Theme}">
<RadioButton x:Uid="GeneralPage_Radio_Theme_Dark" /> <RadioButton x:Uid="Radio_Theme_Dark" />
<RadioButton x:Uid="GeneralPage_Radio_Theme_Light" /> <RadioButton x:Uid="Radio_Theme_Light" />
<RadioButton x:Uid="GeneralPage_Radio_Theme_Default"/> <RadioButton x:Uid="Radio_Theme_Default"/>
</muxc:RadioButtons> </muxc:RadioButtons>
</StackPanel> </StackPanel>