e49d180e13
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.
* Part of #9997
* A sequel to 5d36e5d
* [x] Closes #10960
* [x] I work here
* [x] Tests added/passed
* "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 ✔️
172 lines
9.2 KiB
XML
172 lines
9.2 KiB
XML
<!--
|
|
Copyright (c) Microsoft Corporation. All rights reserved. Licensed under
|
|
the MIT License. See LICENSE in the project root for license information.
|
|
-->
|
|
<Page x:Class="Microsoft.Terminal.Settings.Editor.Launch"
|
|
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
|
|
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
|
|
xmlns:SettingsModel="using:Microsoft.Terminal.Settings.Model"
|
|
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
|
|
xmlns:local="using:Microsoft.Terminal.Settings.Editor"
|
|
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
|
|
xmlns:muxc="using:Microsoft.UI.Xaml.Controls"
|
|
mc:Ignorable="d">
|
|
|
|
<Page.Resources>
|
|
<ResourceDictionary>
|
|
<ResourceDictionary.MergedDictionaries>
|
|
<ResourceDictionary Source="CommonResources.xaml" />
|
|
</ResourceDictionary.MergedDictionaries>
|
|
|
|
<DataTemplate x:Key="EnumRadioButtonTemplate"
|
|
x:DataType="local:EnumEntry">
|
|
<RadioButton Content="{x:Bind EnumName, Mode=OneWay}" />
|
|
</DataTemplate>
|
|
<SettingsModel:IconPathConverter x:Key="IconSourceConverter" />
|
|
<Style x:Key="LaunchSizeNumberBoxStyle"
|
|
BasedOn="{StaticResource NumberBoxSettingStyle}"
|
|
TargetType="muxc:NumberBox">
|
|
<Setter Property="SmallChange" Value="1" />
|
|
<Setter Property="LargeChange" Value="10" />
|
|
<Setter Property="Minimum" Value="1" />
|
|
</Style>
|
|
</ResourceDictionary>
|
|
</Page.Resources>
|
|
|
|
<ScrollViewer ViewChanging="ViewChanging">
|
|
<StackPanel>
|
|
<StackPanel Style="{StaticResource SettingsStackStyle}">
|
|
<!-- Default Profile -->
|
|
<local:SettingContainer x:Uid="Globals_DefaultProfile"
|
|
Margin="0">
|
|
<ComboBox x:Name="DefaultProfile"
|
|
ItemsSource="{x:Bind DefaultProfiles}"
|
|
SelectedItem="{x:Bind CurrentDefaultProfile, Mode=TwoWay}"
|
|
Style="{StaticResource ComboBoxSettingStyle}">
|
|
<ComboBox.ItemTemplate>
|
|
<DataTemplate x:DataType="SettingsModel:Profile">
|
|
<Grid HorizontalAlignment="Stretch"
|
|
ColumnSpacing="8">
|
|
|
|
<Grid.ColumnDefinitions>
|
|
<!-- icon -->
|
|
<ColumnDefinition Width="16" />
|
|
<!-- profile name -->
|
|
<ColumnDefinition Width="Auto" />
|
|
</Grid.ColumnDefinitions>
|
|
|
|
<IconSourceElement Grid.Column="0"
|
|
Width="16"
|
|
Height="16"
|
|
IconSource="{x:Bind Icon, Mode=OneWay, Converter={StaticResource IconSourceConverter}}" />
|
|
|
|
<TextBlock Grid.Column="1"
|
|
Text="{x:Bind Name}" />
|
|
|
|
</Grid>
|
|
</DataTemplate>
|
|
</ComboBox.ItemTemplate>
|
|
</ComboBox>
|
|
</local:SettingContainer>
|
|
|
|
<!-- Default Terminal -->
|
|
<local:SettingContainer x:Name="DefaultTerminalDropdown"
|
|
x:Uid="Globals_DefaultTerminal"
|
|
x:Load="false">
|
|
<ComboBox x:Name="DefaultTerminal"
|
|
ItemsSource="{x:Bind State.Settings.DefaultTerminals, Mode=OneWay}"
|
|
SelectedItem="{x:Bind State.Settings.CurrentDefaultTerminal, Mode=TwoWay}"
|
|
Style="{StaticResource ComboBoxSettingStyle}">
|
|
<ComboBox.ItemTemplate>
|
|
<DataTemplate x:DataType="SettingsModel:DefaultTerminal">
|
|
<Grid HorizontalAlignment="Stretch"
|
|
VerticalAlignment="Stretch"
|
|
ColumnSpacing="8">
|
|
|
|
<Grid.ColumnDefinitions>
|
|
<!-- icon -->
|
|
<ColumnDefinition Width="24" />
|
|
<!-- profile name and author -->
|
|
<ColumnDefinition Width="*" />
|
|
<!-- version -->
|
|
<ColumnDefinition Width="Auto" />
|
|
</Grid.ColumnDefinitions>
|
|
|
|
<Grid.RowDefinitions>
|
|
<!-- profile name -->
|
|
<RowDefinition Height="*" />
|
|
<!-- author and version -->
|
|
<RowDefinition Height="*" />
|
|
</Grid.RowDefinitions>
|
|
|
|
<IconSourceElement Grid.Row="0"
|
|
Grid.RowSpan="2"
|
|
Grid.Column="0"
|
|
Width="24"
|
|
Height="24"
|
|
VerticalAlignment="Center"
|
|
IconSource="{x:Bind Icon, Mode=OneWay, Converter={StaticResource IconSourceConverter}}" />
|
|
|
|
<TextBlock Grid.Row="0"
|
|
Grid.Column="1"
|
|
Grid.ColumnSpan="2"
|
|
Text="{x:Bind Name}" />
|
|
|
|
<TextBlock Grid.Row="1"
|
|
Grid.Column="1"
|
|
Style="{ThemeResource SecondaryTextBlockStyle}"
|
|
Text="{x:Bind Author}" />
|
|
|
|
<TextBlock Grid.Row="1"
|
|
Grid.Column="2"
|
|
Style="{ThemeResource SecondaryTextBlockStyle}"
|
|
Text="{x:Bind Version}" />
|
|
|
|
</Grid>
|
|
</DataTemplate>
|
|
</ComboBox.ItemTemplate>
|
|
</ComboBox>
|
|
</local:SettingContainer>
|
|
|
|
<!-- Start on User Login -->
|
|
<local:SettingContainer x:Uid="Globals_StartOnUserLogin">
|
|
<ToggleSwitch IsOn="{x:Bind State.Settings.GlobalSettings.StartOnUserLogin, Mode=TwoWay}" />
|
|
</local:SettingContainer>
|
|
|
|
<!-- Launch Mode -->
|
|
<local:SettingContainer x:Uid="Globals_LaunchMode">
|
|
<muxc:RadioButtons ItemTemplate="{StaticResource EnumRadioButtonTemplate}"
|
|
ItemsSource="{x:Bind LaunchModeList}"
|
|
SelectedItem="{x:Bind CurrentLaunchMode, Mode=TwoWay}" />
|
|
</local:SettingContainer>
|
|
|
|
<!-- Launch Mode -->
|
|
<local:SettingContainer x:Uid="Globals_WindowingBehavior">
|
|
<muxc:RadioButtons ItemTemplate="{StaticResource EnumRadioButtonTemplate}"
|
|
ItemsSource="{x:Bind WindowingBehaviorList}"
|
|
SelectedItem="{x:Bind CurrentWindowingBehavior, Mode=TwoWay}" />
|
|
</local:SettingContainer>
|
|
</StackPanel>
|
|
|
|
<!-- Launch Size -->
|
|
<StackPanel Style="{StaticResource SettingsStackStyle}">
|
|
<!-- Header -->
|
|
<TextBlock x:Uid="Globals_LaunchSize"
|
|
Style="{StaticResource SubtitleTextBlockStyle}" />
|
|
|
|
<!-- Columns -->
|
|
<local:SettingContainer x:Uid="Globals_InitialCols"
|
|
Margin="0">
|
|
<muxc:NumberBox Style="{StaticResource LaunchSizeNumberBoxStyle}"
|
|
Value="{x:Bind State.Settings.GlobalSettings.InitialCols, Mode=TwoWay}" />
|
|
</local:SettingContainer>
|
|
<!-- Rows -->
|
|
<local:SettingContainer x:Uid="Globals_InitialRows">
|
|
<muxc:NumberBox Style="{StaticResource LaunchSizeNumberBoxStyle}"
|
|
Value="{x:Bind State.Settings.GlobalSettings.InitialRows, Mode=TwoWay}" />
|
|
</local:SettingContainer>
|
|
</StackPanel>
|
|
</StackPanel>
|
|
</ScrollViewer>
|
|
</Page>
|