From d862d6714249d2ce09715ece95f4609d7d227190 Mon Sep 17 00:00:00 2001 From: Pankaj Bhojwani Date: Mon, 16 Jun 2025 16:33:39 -0700 Subject: [PATCH] uia names --- src/cascadia/TerminalSettingsEditor/ActionsViewModel.cpp | 4 ++++ src/cascadia/TerminalSettingsEditor/ActionsViewModel.h | 5 +++++ src/cascadia/TerminalSettingsEditor/ActionsViewModel.idl | 3 +++ 3 files changed, 12 insertions(+) diff --git a/src/cascadia/TerminalSettingsEditor/ActionsViewModel.cpp b/src/cascadia/TerminalSettingsEditor/ActionsViewModel.cpp index 11fd6409b3..385caa86a3 100644 --- a/src/cascadia/TerminalSettingsEditor/ActionsViewModel.cpp +++ b/src/cascadia/TerminalSettingsEditor/ActionsViewModel.cpp @@ -989,6 +989,10 @@ namespace winrt::Microsoft::Terminal::Settings::Editor::implementation DeleteKeyChordRequested.raise(*this, _currentKeys); } + hstring KeyChordViewModel::CancelButtonName() const noexcept { return RS_(L"Actions_CancelButton/[using:Windows.UI.Xaml.Controls]ToolTipService/ToolTip"); } + hstring KeyChordViewModel::AcceptButtonName() const noexcept { return RS_(L"Actions_AcceptButton/[using:Windows.UI.Xaml.Controls]ToolTipService/ToolTip"); } + hstring KeyChordViewModel::DeleteButtonName() const noexcept { return RS_(L"Actions_DeleteButton/[using:Windows.UI.Xaml.Controls]ToolTipService/ToolTip"); } + ActionsViewModel::ActionsViewModel(Model::CascadiaSettings settings) : _Settings{ settings } { diff --git a/src/cascadia/TerminalSettingsEditor/ActionsViewModel.h b/src/cascadia/TerminalSettingsEditor/ActionsViewModel.h index ca5496636a..9f6f36e3fd 100644 --- a/src/cascadia/TerminalSettingsEditor/ActionsViewModel.h +++ b/src/cascadia/TerminalSettingsEditor/ActionsViewModel.h @@ -235,6 +235,11 @@ namespace winrt::Microsoft::Terminal::Settings::Editor::implementation void CancelChanges(); void DeleteKeyChord(); + // UIA Text + hstring CancelButtonName() const noexcept; + hstring AcceptButtonName() const noexcept; + hstring DeleteButtonName() const noexcept; + VIEW_MODEL_OBSERVABLE_PROPERTY(bool, IsInEditMode, false); VIEW_MODEL_OBSERVABLE_PROPERTY(Control::KeyChord, ProposedKeys); VIEW_MODEL_OBSERVABLE_PROPERTY(winrt::hstring, KeyChordText); diff --git a/src/cascadia/TerminalSettingsEditor/ActionsViewModel.idl b/src/cascadia/TerminalSettingsEditor/ActionsViewModel.idl index 75aebd1e3f..212f62c58a 100644 --- a/src/cascadia/TerminalSettingsEditor/ActionsViewModel.idl +++ b/src/cascadia/TerminalSettingsEditor/ActionsViewModel.idl @@ -118,6 +118,9 @@ namespace Microsoft.Terminal.Settings.Editor void AttemptAcceptChanges(); void CancelChanges(); void DeleteKeyChord(); + String CancelButtonName { get; }; + String AcceptButtonName { get; }; + String DeleteButtonName { get; }; event Windows.Foundation.TypedEventHandler AddKeyChordRequested; event Windows.Foundation.TypedEventHandler ModifyKeyChordRequested;