mirror/PowerToys
1
0
Fork 0
mirror of https://github.com/microsoft/PowerToys.git synced 2025-06-07 09:28:03 +08:00
Code Issues Actions 6 Packages Projects Releases Wiki Activity

Merge pull request #7261 from microsoft/users/niels9001/settings-accesbilitynarratorsupportforshortcutcontrol

Browse Source 
[Settings] Added improved narrator support for custom shortcut control
This commit is contained in:
Niels Laute 2020-10-27 12:00:04 +01:00 committed by GitHub
commit 9c3c5725af
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 836 additions and 855 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
src/core/Microsoft.PowerToys.Settings.UI/Controls/HotkeySettingsControl.xaml
View File

@ -6,36 +6,25 @@
xmlns:d="http://schemas.microsoft.com/expression/blend/2008" xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
mc:Ignorable="d" mc:Ignorable="d"
AutomationProperties.Name="{x:Bind Header, Mode=OneTime}"
d:DesignHeight="300" d:DesignHeight="300"
d:DesignWidth="400"> 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> <ToolTipService.ToolTip>
<ToolTip> <TextBlock x:Name="ShortcutWarningLabelText">
<StackPanel Orientation="Vertical"> <Run x:Uid="ShortcutWarningLabel"/>
<TextBlock x:Uid="ShortcutWarningLabel"/> <LineBreak/>
<TextBlock Text="{x:Bind Keys, Mode=OneTime}" FontWeight="SemiBold"/> <Run Text="{x:Bind Keys, Mode=OneTime}" FontWeight="SemiBold"/>
</StackPanel> </TextBlock>
</ToolTip>
</ToolTipService.ToolTip> </ToolTipService.ToolTip>
<TextBox.Header>
<StackPanel Orientation="Horizontal"> <TextBlock>
<TextBlock x:Name="TitleText" <Run Text="{x:Bind Header, Mode=OneTime}"/>
Text="{x:Bind Header, Mode=OneTime}" <Run Text="&#xE946;" FontFamily="Segoe MDL2 Assets"/>
Foreground="{Binding Path=IsEnabled, ElementName=HotkeyTextBox, Converter={StaticResource ModuleEnabledToForegroundConverter}}" </TextBlock>
/> </TextBox.Header>
</TextBox>
<TextBlock x:Uid="SettingsPage_SetShortcut_Glyph"
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>
</UserControl> </UserControl>

1576
src/core/Microsoft.PowerToys.Settings.UI/Strings/en-us/Resources.resw
View File

File diff suppressed because it is too large Load Diff

70
src/core/Microsoft.PowerToys.Settings.UI/Views/ImageResizerPage.xaml
View File

@ -278,7 +278,9 @@
x:Uid="ImageResizer_FilenameFormatPlaceholder" x:Uid="ImageResizer_FilenameFormatPlaceholder"
IsEnabled="{x:Bind Mode=OneWay, Path=ViewModel.IsEnabled}" IsEnabled="{x:Bind Mode=OneWay, Path=ViewModel.IsEnabled}"
Margin="{StaticResource SmallTopMargin}" Margin="{StaticResource SmallTopMargin}"
AutomationProperties.LabeledBy="{Binding ElementName=ImageResizer_FilenameFormatHeader}"> AutomationProperties.LabeledBy="{Binding ElementName=ImageResizer_FilenameFormatHeader}"
AutomationProperties.HelpText="{Binding ElementName=FileFormatTextBlock, Path=Text}"
>
<TextBox.Header> <TextBox.Header>
<StackPanel Orientation="Horizontal"> <StackPanel Orientation="Horizontal">
<TextBlock Name="ImageResizer_FilenameFormatHeader" <TextBlock Name="ImageResizer_FilenameFormatHeader"
@ -291,44 +293,34 @@
</StackPanel> </StackPanel>
</TextBox.Header> </TextBox.Header>
<ToolTipService.ToolTip> <ToolTipService.ToolTip>
<StackPanel> <TextBlock x:Name="FileFormatTextBlock">
<TextBlock x:Uid="ImageResizer_FileFormatDescription"/> <Run x:Uid="ImageResizer_FileFormatDescription"/>
<TextBlock Margin="{StaticResource SmallTopMargin}"> <LineBreak/>
<Run Text="%1" FontWeight="Bold" /> <LineBreak/>
<Run Text=" - "/> <Run Text="%1" FontWeight="Bold" />
<Run x:Uid="ImageResizer_Formatting_Filename" /> <Run Text=" - "/>
</TextBlock> <Run x:Uid="ImageResizer_Formatting_Filename" />
<LineBreak/>
<TextBlock> <Run Text="%2" FontWeight="Bold" />
<Run Text="%2" FontWeight="Bold" /> <Run Text=" - "/>
<Run Text=" - "/> <Run x:Uid="ImageResizer_Formatting_Sizename"/>
<Run x:Uid="ImageResizer_Formatting_Sizename"/> <LineBreak/>
</TextBlock> <Run Text="%3" FontWeight="Bold" />
<Run Text=" - "/>
<TextBlock> <Run x:Uid="ImageResizer_Formatting_SelectedWidth"/>
<Run Text="%3" FontWeight="Bold" /> <LineBreak/>
<Run Text=" - "/> <Run Text="%4" FontWeight="Bold" />
<Run x:Uid="ImageResizer_Formatting_SelectedWidth"/> <Run Text=" - "/>
</TextBlock> <Run x:Uid="ImageResizer_Formatting_SelectedHeight"/>
<LineBreak/>
<TextBlock> <Run Text="%5" FontWeight="Bold" />
<Run Text="%4" FontWeight="Bold" /> <Run Text=" - "/>
<Run Text=" - "/> <Run x:Uid="ImageResizer_Formatting_ActualWidth"/>
<Run x:Uid="ImageResizer_Formatting_SelectedHeight"/> <LineBreak/>
</TextBlock> <Run Text="%6" FontWeight="Bold" />
<Run Text=" - "/>
<TextBlock> <Run x:Uid="ImageResizer_Formatting_ActualHeight"/>
<Run Text="%5" FontWeight="Bold" /> </TextBlock>
<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>
</ToolTipService.ToolTip> </ToolTipService.ToolTip>
</TextBox> </TextBox>