polish accessibility

This commit is contained in:
Carlos Zamora
2026-06-17 18:08:39 -07:00
parent 93d90d5dc4
commit e5d95d71e0
5 changed files with 32 additions and 33 deletions

View File

@@ -295,11 +295,6 @@ namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
return RS_(L"Actions_ShortcutAction/Text");
}
winrt::hstring CommandViewModel::AdditionalArgumentsControlAutomationPropName() const
{
return RS_(L"Actions_Arguments/Text");
}
void CommandViewModel::_RegisterKeyChordVMEvents(Editor::KeyChordViewModel kcVM)
{
const auto id = ID();

View File

@@ -94,7 +94,6 @@ namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
// UIA text
winrt::hstring ActionNameTextBoxAutomationPropName() const;
winrt::hstring ShortcutActionComboBoxAutomationPropName() const;
winrt::hstring AdditionalArgumentsControlAutomationPropName() const;
til::typed_event<IInspectable, Editor::ArgWrapper> PropagateColorSchemeRequested;
til::typed_event<IInspectable, Editor::ArgWrapper> PropagateColorSchemeNamesRequested;

View File

@@ -76,7 +76,6 @@ namespace Microsoft.Terminal.Settings.Editor
// UI side (edit command page, automation property names)
String ActionNameTextBoxAutomationPropName { get; };
String ShortcutActionComboBoxAutomationPropName { get; };
String AdditionalArgumentsControlAutomationPropName { get; };
}
runtimeclass ArgWrapper : Windows.UI.Xaml.Data.INotifyPropertyChanged

View File

@@ -71,6 +71,10 @@ namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
void EditAction::OnNavigatedTo(const NavigationEventArgs& e)
{
Automation::AutomationProperties::SetName(KeyBindingsContainer(), RS_(L"EditAction_KeyBindings/Text"));
Automation::AutomationProperties::SetName(AdditionalCustomizationsContainer(), RS_(L"EditAction_AdditionalCustomizations/Text"));
Automation::AutomationProperties::SetName(NewKeyBinding(), RS_(L"EditAction_NewKeyBinding/Header"));
const auto args = e.Parameter().as<Editor::NavigateToPageArgs>();
_ViewModel = args.ViewModel().as<Editor::CommandViewModel>();
_propagateWindowRootRevoker = _ViewModel.PropagateWindowRootRequested(

View File

@@ -472,34 +472,36 @@
</ItemsControl>
</StackPanel>
<TextBlock x:Uid="EditAction_AdditionalCustomizations"
Style="{StaticResource TextBlockSubHeaderStyle}" />
<!-- Additional customizations -->
<StackPanel x:Name="AdditionalCustomizationsContainer">
<TextBlock x:Uid="EditAction_AdditionalCustomizations"
Style="{StaticResource TextBlockSubHeaderStyle}" />
<!-- Action name -->
<local:SettingsCard x:Name="ActionName"
x:Uid="EditAction_ActionName"
Margin="0,0,0,4">
<TextBox x:Name="CommandNameTextBox"
MinWidth="248"
AutomationProperties.Name="{x:Bind ViewModel.ActionNameTextBoxAutomationPropName}"
PlaceholderText="{x:Bind ViewModel.DisplayName, Mode=OneWay}"
Text="{x:Bind ViewModel.Name, Mode=TwoWay}" />
</local:SettingsCard>
<!-- Action name -->
<local:SettingsCard x:Name="ActionName"
x:Uid="EditAction_ActionName"
Margin="0,0,0,4">
<TextBox x:Name="CommandNameTextBox"
MinWidth="248"
AutomationProperties.Name="{x:Bind ViewModel.ActionNameTextBoxAutomationPropName}"
PlaceholderText="{x:Bind ViewModel.DisplayName, Mode=OneWay}"
Text="{x:Bind ViewModel.Name, Mode=TwoWay}" />
</local:SettingsCard>
<!-- Action argument controls -->
<ItemsControl HorizontalAlignment="Stretch"
HorizontalContentAlignment="Stretch"
AutomationProperties.Name="{x:Bind ViewModel.AdditionalArgumentsControlAutomationPropName}"
IsTabStop="False"
ItemTemplateSelector="{StaticResource ArgsTemplateSelector}"
ItemsSource="{x:Bind ViewModel.ActionArgsVM.ArgValues, Mode=OneWay}">
<ItemsControl.ItemsPanel>
<ItemsPanelTemplate>
<StackPanel HorizontalAlignment="Stretch"
Spacing="4" />
</ItemsPanelTemplate>
</ItemsControl.ItemsPanel>
</ItemsControl>
<!-- Action argument controls -->
<ItemsControl HorizontalAlignment="Stretch"
HorizontalContentAlignment="Stretch"
IsTabStop="False"
ItemTemplateSelector="{StaticResource ArgsTemplateSelector}"
ItemsSource="{x:Bind ViewModel.ActionArgsVM.ArgValues, Mode=OneWay}">
<ItemsControl.ItemsPanel>
<ItemsPanelTemplate>
<StackPanel HorizontalAlignment="Stretch"
Spacing="4" />
</ItemsPanelTemplate>
</ItemsControl.ItemsPanel>
</ItemsControl>
</StackPanel>
<!-- Delete command button -->
<Button x:Name="DeleteCommand"