From 7b8b60bdefa21e0bda65571248f30ba6e28d89fb Mon Sep 17 00:00:00 2001 From: Mike Griese Date: Fri, 3 May 2024 14:44:40 -0500 Subject: [PATCH] resources to localize --- .../Resources/en-US/Resources.resw | 11 ++++++ src/cascadia/TerminalApp/TasksPaneContent.cpp | 4 +-- src/cascadia/TerminalApp/TasksPaneContent.h | 4 +-- .../TerminalApp/TasksPaneContent.xaml | 35 ++++++++++++++----- 4 files changed, 41 insertions(+), 13 deletions(-) diff --git a/src/cascadia/TerminalApp/Resources/en-US/Resources.resw b/src/cascadia/TerminalApp/Resources/en-US/Resources.resw index 15b79c40ffc..3f41fd31372 100644 --- a/src/cascadia/TerminalApp/Resources/en-US/Resources.resw +++ b/src/cascadia/TerminalApp/Resources/en-US/Resources.resw @@ -898,4 +898,15 @@ Restart the active pane connection + + Snippets + Header for a page that includes small snippets of text for the user to enter + + + Filter snippets... + Placeholder text for a text box to filter snippets (on the same page as the 'SnippetPaneTitle') + + + Input this command + diff --git a/src/cascadia/TerminalApp/TasksPaneContent.cpp b/src/cascadia/TerminalApp/TasksPaneContent.cpp index 113ca0122ff..ba40a16007e 100644 --- a/src/cascadia/TerminalApp/TasksPaneContent.cpp +++ b/src/cascadia/TerminalApp/TasksPaneContent.cpp @@ -23,8 +23,8 @@ namespace winrt::TerminalApp::implementation { InitializeComponent(); - auto res = Windows::UI::Xaml::Application::Current().Resources(); - auto bg = res.Lookup(winrt::box_value(L"UnfocusedBorderBrush")); + // auto res = Windows::UI::Xaml::Application::Current().Resources(); + auto bg = Resources().Lookup(winrt::box_value(L"PageBackground")); Background(bg.try_as()); } diff --git a/src/cascadia/TerminalApp/TasksPaneContent.h b/src/cascadia/TerminalApp/TasksPaneContent.h index 7aa1f1be486..eccc4b3c0ab 100644 --- a/src/cascadia/TerminalApp/TasksPaneContent.h +++ b/src/cascadia/TerminalApp/TasksPaneContent.h @@ -6,6 +6,7 @@ #include "FilteredTask.g.h" #include "FilteredCommand.h" #include "ActionPaletteItem.h" +#include namespace winrt::TerminalApp::implementation { @@ -23,7 +24,7 @@ namespace winrt::TerminalApp::implementation winrt::Microsoft::Terminal::Settings::Model::INewContentArgs GetNewTerminalArgs(BuildStartupKind kind) const; // TODO! lots of strings here and in XAML that need RS_-ifying - winrt::hstring Title() { return L"Tasks"; } + winrt::hstring Title() { return RS_(L"SnippetPaneTitle/Text"); } uint64_t TaskbarState() { return 0; } uint64_t TaskbarProgress() { return 0; } bool ReadOnly() { return false; } @@ -49,7 +50,6 @@ namespace winrt::TerminalApp::implementation winrt::weak_ref _control{ nullptr }; winrt::Microsoft::Terminal::Settings::Model::CascadiaSettings _settings{ nullptr }; - winrt::Windows::Foundation::Collections::IObservableVector _allTasks{ nullptr }; void _runCommandButtonClicked(const Windows::Foundation::IInspectable& sender, const Windows::UI::Xaml::RoutedEventArgs&); diff --git a/src/cascadia/TerminalApp/TasksPaneContent.xaml b/src/cascadia/TerminalApp/TasksPaneContent.xaml index 6a8a7d2e7e0..7c4398209d4 100644 --- a/src/cascadia/TerminalApp/TasksPaneContent.xaml +++ b/src/cascadia/TerminalApp/TasksPaneContent.xaml @@ -42,15 +42,15 @@ Visibility="Collapsed" /> -