608a49e817
Re-enables the delete button for generated profiles in the settings UI.
Additionally fixes "Startup Profiles" to only list active profiles.
Profiles are considered deleted if they're absent from settings.json, but their
GUID has been encountered before. Or in other words, from a user's perspective:
Generated profiles are added to the settings.json automatically only once.
Thus if the user chooses to delete the profile (e.g. using the delete button)
they aren't re-added automatically and thus appear to have been deleted.
Meanwhile those generated profiles are actually only marked as "hidden"
as well as "deleted", but still exist in internal profile lists.
The "hidden" attribute hides them from all existing menus. The "deleted" one
hides them from the settings UI and prevents them from being written to disk.
It would've been preferrable of course to just not generate and
add deleted profile to internal profile lists in the first place.
But this would've required far more wide-reaching changes.
The settings UI for instance requires a list of _all_ profiles in order to
allow a user to re-create previously deleted profiles. Such an approach was
attempted but discarded because of it's current complexity overhead.
## References
* Part of #9997
* A sequel to 5d36e5d
## PR Checklist
* [x] Closes #10960
* [x] I work here
* [x] Tests added/passed
## Validation Steps Performed
* "Startup Profiles" doesn't list deleted profiles ✔️
* Manually removing an item from settings.json removes the profile ✔️
* Removing cmd.exe and saving doesn't create empty objects (#10960) ✔️
* "Add a new profile" lists deleted profiles ✔️
* "Duplicate" recreates previously deleted profiles ✔️
* Profiles are always created with GUIDs ✔️
72 lines
2.6 KiB
C++
72 lines
2.6 KiB
C++
// Copyright (c) Microsoft Corporation.
|
|
// Licensed under the MIT license.
|
|
|
|
#include "pch.h"
|
|
#include "Launch.h"
|
|
#include "Launch.g.cpp"
|
|
#include "LaunchPageNavigationState.g.cpp"
|
|
#include "EnumEntry.h"
|
|
|
|
using namespace winrt::Windows::UI::Xaml::Navigation;
|
|
using namespace winrt::Windows::Foundation;
|
|
using namespace winrt::Microsoft::Terminal::Settings::Model;
|
|
|
|
namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
|
|
{
|
|
Launch::Launch()
|
|
{
|
|
InitializeComponent();
|
|
|
|
INITIALIZE_BINDABLE_ENUM_SETTING(LaunchMode, LaunchMode, LaunchMode, L"Globals_LaunchMode", L"Content");
|
|
INITIALIZE_BINDABLE_ENUM_SETTING(WindowingBehavior, WindowingMode, WindowingMode, L"Globals_WindowingBehavior", L"Content");
|
|
|
|
// BODGY
|
|
// Xaml code generator for x:Bind to this will fail to find UnloadObject() on Launch class.
|
|
// To work around, check it ourselves on construction and FindName to force load.
|
|
// It's specified as x:Load=false in the XAML. So it only loads if this passes.
|
|
if (CascadiaSettings::IsDefaultTerminalAvailable())
|
|
{
|
|
FindName(L"DefaultTerminalDropdown");
|
|
}
|
|
}
|
|
|
|
void Launch::OnNavigatedTo(const NavigationEventArgs& e)
|
|
{
|
|
_State = e.Parameter().as<Editor::LaunchPageNavigationState>();
|
|
_State.Settings().RefreshDefaultTerminals();
|
|
}
|
|
|
|
IInspectable Launch::CurrentDefaultProfile()
|
|
{
|
|
const auto defaultProfileGuid{ _State.Settings().GlobalSettings().DefaultProfile() };
|
|
return winrt::box_value(_State.Settings().FindProfile(defaultProfileGuid));
|
|
}
|
|
|
|
void Launch::CurrentDefaultProfile(const IInspectable& value)
|
|
{
|
|
const auto profile{ winrt::unbox_value<Model::Profile>(value) };
|
|
_State.Settings().GlobalSettings().DefaultProfile(profile.Guid());
|
|
}
|
|
|
|
winrt::Windows::Foundation::Collections::IObservableVector<IInspectable> Launch::DefaultProfiles() const
|
|
{
|
|
const auto allProfiles = _State.Settings().AllProfiles();
|
|
|
|
std::vector<IInspectable> profiles;
|
|
profiles.reserve(allProfiles.Size());
|
|
|
|
// Remove profiles from the selection which have been explicitly deleted.
|
|
// We do want to show hidden profiles though, as they are just hidden
|
|
// from menus, but still work as the startup profile for instance.
|
|
for (const auto& profile : allProfiles)
|
|
{
|
|
if (!profile.Deleted())
|
|
{
|
|
profiles.emplace_back(profile);
|
|
}
|
|
}
|
|
|
|
return winrt::single_threaded_observable_vector(std::move(profiles));
|
|
}
|
|
}
|