diff options
| author | Dominique Louis <dolouis@microsoft.com> | 2020-06-17 23:05:52 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-06-17 23:05:52 +0300 |
| commit | 03144178603e8758e57b0e61dc9c91f1636520ce (patch) | |
| tree | f342e13d9e26fd22acf46e1cd5c1ca76e6d345a2 /Xamarin.PropertyEditing.Windows | |
| parent | d5de1546c3875feed2486c4b0cd0c44b937d705f (diff) | |
Ensure all the screen elements in this Window have their … (#724)
* Ensure all the screen elements in this Window have their AutomationProperties.Name property set, for accessibility.
* Fix Resources file, hopefully.
* Attempt 2 at fixing Resources file.
* Change Null Category test, as we now expect Unnamed instead of null.
Diffstat (limited to 'Xamarin.PropertyEditing.Windows')
| -rw-r--r-- | Xamarin.PropertyEditing.Windows/CollectionEditorWindow.xaml | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/Xamarin.PropertyEditing.Windows/CollectionEditorWindow.xaml b/Xamarin.PropertyEditing.Windows/CollectionEditorWindow.xaml index d0a96d6..276a804 100644 --- a/Xamarin.PropertyEditing.Windows/CollectionEditorWindow.xaml +++ b/Xamarin.PropertyEditing.Windows/CollectionEditorWindow.xaml @@ -7,7 +7,8 @@ xmlns:prop="clr-namespace:Xamarin.PropertyEditing.Properties;assembly=Xamarin.PropertyEditing" mc:Ignorable="d" Background="{DynamicResource DialogBackgroundBrush}" Foreground="{DynamicResource DialogForegroundBrush}" MinHeight="300" Height="500" MinWidth="500" Width="700" ShowIcon="False" ShowMaximize="False" ShowMinimize="False" WindowStartupLocation="CenterOwner" - Title="{Binding Property.Name, StringFormat={x:Static prop:Resources.CollectionEditorTitle},Mode=OneTime}"> + Title="{Binding Property.Name, StringFormat={x:Static prop:Resources.CollectionEditorTitle},Mode=OneTime}" + AutomationProperties.Name="{x:Static prop:Resources.AccessibilityCollectionEditor}"> <local:WindowEx.Resources> <ResourceDictionary> @@ -31,7 +32,7 @@ <TextBlock Text="{x:Static prop:Resources.Items}" Grid.Row="0" Grid.Column="0" /> <TextBlock Text="{x:Static prop:Resources.Properties}" Grid.Row="0" Grid.Column="1" Margin="12,0,0,0" /> - <ListBox ItemsSource="{Binding Targets,Mode=OneTime}" SelectedItem="{Binding SelectedTarget,Mode=TwoWay}" Margin="0,4,0,0" Grid.Column="0" Grid.Row="1"> + <ListBox ItemsSource="{Binding Targets,Mode=OneTime}" SelectedItem="{Binding SelectedTarget,Mode=TwoWay}" Margin="0,4,0,0" Grid.Column="0" Grid.Row="1" AutomationProperties.Name="{x:Static prop:Resources.AccessibilityCollectionEditorItemList}"> <ListBox.ItemContainerStyle> <Style TargetType="ListBoxItem" BasedOn="{StaticResource {x:Type ListBoxItem}}"> <Setter Property="AutomationProperties.Name"> @@ -76,14 +77,14 @@ </Style> </ComboBox.ItemContainerStyle> </ComboBox> - <Button Grid.Column="2" Command="{Binding AddTargetCommand,Mode=OneTime}" Margin="4,0,0,0" Content="{x:Static prop:Resources.AddCollectionItem}" /> + <Button Grid.Column="2" Command="{Binding AddTargetCommand,Mode=OneTime}" Margin="4,0,0,0" Content="{x:Static prop:Resources.AddCollectionItem}" AutomationProperties.Name="{x:Static prop:Resources.AccessibilityCollectionAddButton}"/> </Grid> - <ItemsControl Margin="12,4,0,0" Style="{StaticResource PropertyListStyle}" Background="{DynamicResource ListBackgroundBrush}" Grid.IsSharedSizeScope="True" DataContext="{Binding Panel}" ItemsSource="{Binding ArrangedEditors}" Grid.Column="1" Grid.Row="1" Grid.RowSpan="2" /> + <ItemsControl Margin="12,4,0,0" Style="{StaticResource PropertyListStyle}" Background="{DynamicResource ListBackgroundBrush}" Grid.IsSharedSizeScope="True" DataContext="{Binding Panel}" ItemsSource="{Binding ArrangedEditors}" Grid.Column="1" Grid.Row="1" Grid.RowSpan="2" AutomationProperties.Name="{x:Static prop:Resources.AccessibilityCollectionEditorItemProperties}"/> <StackPanel Grid.Row="3" Grid.Column="1" HorizontalAlignment="Right" Orientation="Horizontal" Margin="0,4,0,0"> - <Button IsDefault="True" MinWidth="75" MinHeight="23" Content="{x:Static prop:Resources.OK}" Command="{Binding CommitCommand,Mode=OneTime}" Click="OnOkClick" /> - <Button Margin="5,0,0,0" MinWidth="75" MinHeight="23" IsCancel="True" Content="{x:Static prop:Resources.Cancel}" Command="{Binding CancelCommand,Mode=OneTime}" Click="OnCancelClick" /> + <Button IsDefault="True" MinWidth="75" MinHeight="23" Content="{x:Static prop:Resources.OK}" Command="{Binding CommitCommand,Mode=OneTime}" Click="OnOkClick" AutomationProperties.Name="{x:Static prop:Resources.OK}"/> + <Button Margin="5,0,0,0" MinWidth="75" MinHeight="23" IsCancel="True" Content="{x:Static prop:Resources.Cancel}" Command="{Binding CancelCommand,Mode=OneTime}" Click="OnCancelClick" AutomationProperties.Name="{x:Static prop:Resources.Cancel}"/> </StackPanel> </Grid> </local:WindowEx> |