eb0fb3e822
This PR adds improved override message generation for inheritance in SUI. The settings model now has an `OriginTag` to be able to denote where a `Profile` came from. This tag is used in the `SettingContainer` to generate a more specific override message. ## References #6800 - SUI Epic #8919 - SUI Inheritance PR #8804 - SUI Inheritance (old issue) ## Detailed Description of the Pull Request / Additional comments - **Terminal Settings Model** - Introduced `PROJECTED_SETTING` as a macro to more easily declare the functions for each setting - Introduced `<setting>OverrideSource` which finds the `Profile` that has \<setting\> defined - Introduced `OriginTag Profile::Origin {Custom, InBox, Generated}` to trace where a profile came from - `DefaultProfileUtils` creates profiles for profile generators. So that now sets the `Origin` tag to `Generated` - `CascadiaSettings::LoadDefaults()` tags all profiles created as `InBox`. - The view model had to ingest the API change to be able to interact with `<setting>OverrideSource` - **Override Message Generation** - The reset button now has a more specific tooltip - The reset button now only appears if base layer is being overridden - We use the settings model changes to determine the message to display for the target ## Validation Steps Performed Tested the following cases: - overrides nothing (inherited setting) - overrides value inherited from... - base layer - a profile generator - in-box profile - global settings should not have this feature
35 lines
1.4 KiB
C++
35 lines
1.4 KiB
C++
// Copyright (c) Microsoft Corporation.
|
|
// Licensed under the MIT license.
|
|
|
|
#include "pch.h"
|
|
#include "DefaultProfileUtils.h"
|
|
#include "../../types/inc/utils.hpp"
|
|
|
|
static constexpr std::wstring_view PACKAGED_PROFILE_ICON_PATH{ L"ms-appx:///ProfileIcons/" };
|
|
static constexpr std::wstring_view PACKAGED_PROFILE_ICON_EXTENSION{ L".png" };
|
|
|
|
// Method Description:
|
|
// - Helper function for creating a skeleton default profile with a pre-populated
|
|
// guid and name.
|
|
// Arguments:
|
|
// - name: the name of the new profile.
|
|
// Return Value:
|
|
// - A Profile, ready to be filled in
|
|
winrt::Microsoft::Terminal::Settings::Model::Profile CreateDefaultProfile(const std::wstring_view name)
|
|
{
|
|
const winrt::guid profileGuid{ Microsoft::Console::Utils::CreateV5Uuid(TERMINAL_PROFILE_NAMESPACE_GUID,
|
|
gsl::as_bytes(gsl::make_span(name))) };
|
|
|
|
auto newProfile = winrt::make_self<winrt::Microsoft::Terminal::Settings::Model::implementation::Profile>(profileGuid);
|
|
newProfile->Name(winrt::hstring{ name });
|
|
|
|
std::wstring iconPath{ PACKAGED_PROFILE_ICON_PATH };
|
|
iconPath.append(Microsoft::Console::Utils::GuidToString(profileGuid));
|
|
iconPath.append(PACKAGED_PROFILE_ICON_EXTENSION);
|
|
|
|
newProfile->Icon(winrt::hstring{ iconPath });
|
|
newProfile->Origin(winrt::Microsoft::Terminal::Settings::Model::OriginTag::Generated);
|
|
|
|
return *newProfile;
|
|
}
|