Set LabeledBy on controls in the SymbolSpecificationDialog

ghord · May 18, 2017 · 05db52a · 05db52a
1 parent c8fd2bc
commit 05db52a
Showing 1 changed file with 14 additions and 8 deletions.
diff --git a/...e/Impl/Options/Style/NamingPreferences/SymbolSpecification/SymbolSpecificationDialog.xaml b/...e/Impl/Options/Style/NamingPreferences/SymbolSpecification/SymbolSpecificationDialog.xaml
@@ -35,8 +35,11 @@
             <RowDefinition Height="Auto"/>
         </Grid.RowDefinitions>
         <StackPanel Orientation="Horizontal" Grid.Row="0" Margin="0 5 0 0">
-            <Label Content="{Binding ElementName=dialog, Path=SymbolSpecificationTitleLabelText}"/>
-            <TextBox Width="300" Text="{Binding ItemName, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" VerticalContentAlignment="Center"></TextBox>
+            <Label Name="titleLabel" Content="{Binding ElementName=dialog, Path=SymbolSpecificationTitleLabelText}"/>
+            <TextBox Width="300" 
+                     Text="{Binding ItemName, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" 
+                     VerticalContentAlignment="Center"
+                     AutomationProperties.LabeledBy="{Binding ElementName=titleLabel}"/>
         </StackPanel>
         <Grid Grid.Row="1" Margin="0 5 0 0">
             <Grid.ColumnDefinitions>
@@ -52,13 +55,14 @@
                 <Grid.ColumnDefinitions>
                     <ColumnDefinition Width="*"/>
                 </Grid.ColumnDefinitions>
-                <Label Grid.Row="0" Grid.Column="0" Content="{Binding ElementName=dialog, Path=SymbolKindsLabelText}"/>
+                <Label Name="symbolKindsLabel" Grid.Row="0" Grid.Column="0" Content="{Binding ElementName=dialog, Path=SymbolKindsLabelText}"/>
                 <ListView Grid.Row="1" Grid.Column="0" x:Uid="SymbolKinds"
                           x:Name="SymbolKinds"
                           MinWidth="70"
                           Margin="8 4 8 7"
                           SelectionMode="Extended"
-                          ItemsSource="{Binding SymbolKindList, Mode=TwoWay}">
+                          ItemsSource="{Binding SymbolKindList, Mode=TwoWay}"
+                          AutomationProperties.LabeledBy="{Binding ElementName=symbolKindsLabel}">
                     <ListView.ItemTemplate x:Uid="SelectableMemberListItem">
                         <DataTemplate>
                             <StackPanel Orientation="Horizontal">
@@ -87,13 +91,14 @@
                     <RowDefinition Height="0.5*" />
                     <RowDefinition Height="Auto" />
                 </Grid.RowDefinitions>
-                <Label Grid.Row="0" Grid.Column="0" Content="{Binding ElementName=dialog, Path=AccessibilitiesLabelText}"/>
+                <Label Name="accessibilitiesLabel" Grid.Row="0" Grid.Column="0" Content="{Binding ElementName=dialog, Path=AccessibilitiesLabelText}"/>
                 <ListView Grid.Row="1" x:Uid="MemberSelectionList2"
                           x:Name="Accessibilities"
                           Margin="8 4 8 7"
                           MinWidth="70"
                           SelectionMode="Extended"
-                          ItemsSource="{Binding AccessibilityList, Mode=TwoWay}">
+                          ItemsSource="{Binding AccessibilityList, Mode=TwoWay}"
+                          AutomationProperties.LabeledBy="{Binding ElementName=accessibilitiesLabel}">
                     <ListView.ItemTemplate x:Uid="SelectableMemberListItem">
                         <DataTemplate>
                             <StackPanel Orientation="Horizontal">
@@ -112,13 +117,14 @@
                     <vs:DialogButton Margin="8 0 0 0" Content="{Binding ElementName=dialog, Path=SelectAllButtonText}" Click="SelectAllAccessibilities"></vs:DialogButton>
                     <vs:DialogButton Margin="7 0 0 0" Content="{Binding ElementName=dialog, Path=DeselectAllButtonText}" Click="DeselectAllAccessibilities"></vs:DialogButton>
                 </StackPanel>
-                <Label Grid.Row="3" Margin="0 4 0 0" Content="{Binding ElementName=dialog, Path=ModifiersLabelText}"/>
+                <Label Name="modifiersLabel" Grid.Row="3" Margin="0 4 0 0" Content="{Binding ElementName=dialog, Path=ModifiersLabelText}"/>
                 <ListView Grid.Row="4" x:Uid="MemberSelectionList2"
                           x:Name="Modifiers"
                           SelectionMode="Extended"
                           Margin="8 4 8 7"
                           MinWidth="70"
-                          ItemsSource="{Binding ModifierList, Mode=TwoWay}">
+                          ItemsSource="{Binding ModifierList, Mode=TwoWay}"
+                          AutomationProperties.LabeledBy="{Binding ElementName=modifiersLabel}">
                     <ListView.ItemTemplate x:Uid="SelectableMemberListItem">
                         <DataTemplate>
                             <StackPanel Orientation="Horizontal">