forked from microsoft/terminal
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Add a keybinding option to Terminal to open the Settings UI (microsof…
…t#8048) This commit iontroduces another `target` to the `openSettings` binding: `settingsUI`. It opens the settings UI introduced in the previous commit. Closes microsoft#1564 Closes microsoft#8048 (PR) Co-authored-by: Carlos Zamora <carlos.zamora@microsoft.com> Co-authored-by: Leon Liang <lelian@microsoft.com>
- Loading branch information
Showing
15 changed files
with
285 additions
and
25 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,92 @@ | ||
// Copyright (c) Microsoft Corporation. | ||
// Licensed under the MIT license. | ||
|
||
#include "pch.h" | ||
#include <LibraryResources.h> | ||
#include "SettingsTab.h" | ||
#include "SettingsTab.g.cpp" | ||
#include "Utils.h" | ||
|
||
using namespace winrt; | ||
using namespace winrt::Windows::UI::Xaml; | ||
using namespace winrt::Windows::UI::Core; | ||
using namespace winrt::Microsoft::Terminal::TerminalControl; | ||
using namespace winrt::Microsoft::Terminal::Settings::Model; | ||
using namespace winrt::Microsoft::Terminal::Settings::Editor; | ||
using namespace winrt::Windows::System; | ||
|
||
namespace winrt | ||
{ | ||
namespace MUX = Microsoft::UI::Xaml; | ||
namespace WUX = Windows::UI::Xaml; | ||
} | ||
|
||
namespace winrt::TerminalApp::implementation | ||
{ | ||
SettingsTab::SettingsTab(MainPage settingsUI) | ||
{ | ||
Content(settingsUI); | ||
|
||
_MakeTabViewItem(); | ||
_CreateContextMenu(); | ||
_CreateIcon(); | ||
} | ||
|
||
void SettingsTab::UpdateSettings(CascadiaSettings settings) | ||
{ | ||
auto settingsUI{ Content().as<MainPage>() }; | ||
settingsUI.UpdateSettings(settings); | ||
} | ||
|
||
// Method Description: | ||
// - Focus the settings UI | ||
// Arguments: | ||
// - focusState: The FocusState mode by which focus is to be obtained. | ||
// Return Value: | ||
// - <none> | ||
void SettingsTab::Focus(WUX::FocusState focusState) | ||
{ | ||
_focusState = focusState; | ||
|
||
if (_focusState != FocusState::Unfocused) | ||
{ | ||
Content().as<WUX::Controls::Page>().Focus(focusState); | ||
} | ||
} | ||
|
||
// Method Description: | ||
// - Initializes a TabViewItem for this Tab instance. | ||
// Arguments: | ||
// - <none> | ||
// Return Value: | ||
// - <none> | ||
void SettingsTab::_MakeTabViewItem() | ||
{ | ||
TabViewItem(::winrt::MUX::Controls::TabViewItem{}); | ||
Title(RS_(L"SettingsTab")); | ||
TabViewItem().Header(winrt::box_value(Title())); | ||
} | ||
|
||
// Method Description: | ||
// - Set the icon on the TabViewItem for this tab. | ||
// Arguments: | ||
// - <none> | ||
// Return Value: | ||
// - <none> | ||
winrt::fire_and_forget SettingsTab::_CreateIcon() | ||
{ | ||
auto weakThis{ get_weak() }; | ||
|
||
co_await winrt::resume_foreground(TabViewItem().Dispatcher()); | ||
|
||
if (auto tab{ weakThis.get() }) | ||
{ | ||
auto fontFamily = winrt::WUX::Media::FontFamily(L"Segoe MDL2 Assets"); | ||
auto glyph = L"\xE713"; // This is the Setting icon (looks like a gear) | ||
|
||
// The TabViewItem Icon needs MUX while the IconSourceElement in the CommandPalette needs WUX... | ||
Icon(glyph); | ||
TabViewItem().IconSource(IconPathConverter::IconSourceMUX(glyph)); | ||
} | ||
} | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,39 @@ | ||
/*++ | ||
Copyright (c) Microsoft Corporation | ||
Licensed under the MIT license. | ||
Module Name: | ||
- SettingsTab.h | ||
Abstract: | ||
- The SettingsTab is a tab whose content is a Settings UI control. They can | ||
coexist in a TabView with all other types of tabs, like the TerminalTab. | ||
There should only be at most one SettingsTab open at any given time. | ||
Author(s): | ||
- Leon Liang - October 2020 | ||
--*/ | ||
|
||
#pragma once | ||
#include "TabBase.h" | ||
#include "SettingsTab.g.h" | ||
#include <winrt/TerminalApp.h> | ||
#include <winrt/Microsoft.Terminal.Settings.Editor.h> | ||
#include "../../cascadia/inc/cppwinrt_utils.h" | ||
|
||
namespace winrt::TerminalApp::implementation | ||
{ | ||
struct SettingsTab : SettingsTabT<SettingsTab, TabBase> | ||
{ | ||
public: | ||
SettingsTab(winrt::Microsoft::Terminal::Settings::Editor::MainPage settingsUI); | ||
|
||
void UpdateSettings(Microsoft::Terminal::Settings::Model::CascadiaSettings settings); | ||
void Focus(winrt::Windows::UI::Xaml::FocusState focusState) override; | ||
|
||
private: | ||
void _MakeTabViewItem(); | ||
winrt::fire_and_forget _CreateIcon(); | ||
}; | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,12 @@ | ||
// Copyright (c) Microsoft Corporation. | ||
// Licensed under the MIT license. | ||
|
||
import "TabBase.idl"; | ||
|
||
namespace TerminalApp | ||
{ | ||
[default_interface] runtimeclass SettingsTab : TabBase | ||
{ | ||
void UpdateSettings(Microsoft.Terminal.Settings.Model.CascadiaSettings settings); | ||
} | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.