Eric Cornelissen
b85be454ce
* Update settings window layout with consistent margins Updated the layout of the different views of the settings window so that there is always margin at the bottom. In some cases this was achieved using <StackPanels> for clarity and extensibility, grouping e.g. a title and some radio options together with one unified margin. Also made some small consistency changes to the .xaml files. * Add width to Themes text input * Normalize margins in settings * Add default display values in Terminal settings ... for Arguments and Working Directory * Generalize TemplateSelector for empty strings * Add default display value for profile keybindings * Update margins and fontsize in theme preview * Update 'loading...' message in About ... to "Checking for updates..." and a spinner as suggested by @skipmeister123 * No popup when cancelling profile edit no changes * Delete profile when new and cancelled * Open new and cloned themes in edit mode ... and make it so canceling deletes the theme. * No popup when cancelling theme edit no changes * Add resources for margin definitions * Check for null Author in TerminalTheme * Add resource for header margin definition * Moved createdBy text to code behind
384 lines
22 KiB
XML
384 lines
22 KiB
XML
<Page
|
|
x:Class="FluentTerminal.App.Views.SettingsPages.ShellProfileSettings"
|
|
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
|
|
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
|
|
xmlns:controls="using:Microsoft.Toolkit.Uwp.UI.Controls"
|
|
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
|
|
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
|
|
xmlns:models="using:FluentTerminal.Models"
|
|
xmlns:settings="using:FluentTerminal.App.ViewModels.Settings"
|
|
xmlns:viewmodels="using:FluentTerminal.App.ViewModels"
|
|
xmlns:views="using:FluentTerminal.App.Views"
|
|
mc:Ignorable="d">
|
|
<Page.Resources>
|
|
<views:TabThemeTemplateSelector x:Key="TabThemeTemplateSelector">
|
|
<views:TabThemeTemplateSelector.DefaultTemplate>
|
|
<DataTemplate x:DataType="models:TabTheme">
|
|
<StackPanel Orientation="Horizontal">
|
|
<FontIcon
|
|
Margin="0,0,6,0"
|
|
FontFamily="Segoe MDL2 Assets"
|
|
Glyph="" />
|
|
<TextBlock Text="{x:Bind Name, Mode=OneWay}" />
|
|
</StackPanel>
|
|
</DataTemplate>
|
|
</views:TabThemeTemplateSelector.DefaultTemplate>
|
|
<views:TabThemeTemplateSelector.ColoredTemplate>
|
|
<DataTemplate x:DataType="models:TabTheme">
|
|
<StackPanel Orientation="Horizontal">
|
|
<FontIcon
|
|
Margin="0,0,6,0"
|
|
FontFamily="Segoe MDL2 Assets"
|
|
Foreground="{x:Bind Color}"
|
|
Glyph="" />
|
|
<TextBlock Text="{x:Bind Name, Mode=OneWay}" />
|
|
</StackPanel>
|
|
</DataTemplate>
|
|
</views:TabThemeTemplateSelector.ColoredTemplate>
|
|
</views:TabThemeTemplateSelector>
|
|
<views:TerminalThemeTemplateSelector x:Key="TerminalThemeTemplateSelector">
|
|
<views:TerminalThemeTemplateSelector.DefaultTemplate>
|
|
<DataTemplate x:DataType="models:TerminalTheme">
|
|
<TextBlock FontStyle="Italic" Text="{x:Bind Name}" />
|
|
</DataTemplate>
|
|
</views:TerminalThemeTemplateSelector.DefaultTemplate>
|
|
<views:TerminalThemeTemplateSelector.ThemeTemplate>
|
|
<DataTemplate x:DataType="models:TerminalTheme">
|
|
<TextBlock Text="{x:Bind Name}" />
|
|
</DataTemplate>
|
|
</views:TerminalThemeTemplateSelector.ThemeTemplate>
|
|
</views:TerminalThemeTemplateSelector>
|
|
<views:TerminalKeybindTemplateSelector x:Key="TerminalKeybindTemplateSelector">
|
|
<views:TerminalKeybindTemplateSelector.DefaultTemplate>
|
|
<DataTemplate x:DataType="settings:KeyBindingsViewModel">
|
|
<TextBlock FontStyle="Italic" Text="None" />
|
|
</DataTemplate>
|
|
</views:TerminalKeybindTemplateSelector.DefaultTemplate>
|
|
<views:TerminalKeybindTemplateSelector.KeyBindingsTemplate>
|
|
<DataTemplate x:DataType="settings:KeyBindingsViewModel">
|
|
<views:KeyBindingsView
|
|
Margin="0,6,0,0"
|
|
ShowCommandName="False"
|
|
ViewModel="{x:Bind}" />
|
|
</DataTemplate>
|
|
</views:TerminalKeybindTemplateSelector.KeyBindingsTemplate>
|
|
</views:TerminalKeybindTemplateSelector>
|
|
<views:NoValueTemplateSelector x:Key="NoValueTemplateSelector">
|
|
<views:NoValueTemplateSelector.DefaultTemplate>
|
|
<DataTemplate x:DataType="x:String">
|
|
<TextBlock FontStyle="Italic" Text="None" />
|
|
</DataTemplate>
|
|
</views:NoValueTemplateSelector.DefaultTemplate>
|
|
<views:NoValueTemplateSelector.CustomTemplate>
|
|
<DataTemplate x:DataType="x:String">
|
|
<TextBlock Text="{x:Bind}" />
|
|
</DataTemplate>
|
|
</views:NoValueTemplateSelector.CustomTemplate>
|
|
</views:NoValueTemplateSelector>
|
|
</Page.Resources>
|
|
<Grid Background="{ThemeResource ApplicationPageBackgroundThemeBrush}">
|
|
<Grid.ColumnDefinitions>
|
|
<ColumnDefinition Width="160" />
|
|
<ColumnDefinition Width="*" />
|
|
</Grid.ColumnDefinitions>
|
|
<Grid.RowDefinitions>
|
|
<RowDefinition Height="32" />
|
|
<RowDefinition Height="Auto" />
|
|
<RowDefinition Height="*" />
|
|
</Grid.RowDefinitions>
|
|
<Border
|
|
Grid.RowSpan="3"
|
|
Grid.Column="0"
|
|
Background="{ThemeResource SystemControlAcrylicWindowBrush}" />
|
|
<Grid Grid.Row="1" Grid.ColumnSpan="2" Margin="{StaticResource HeaderMargin}">
|
|
<Grid.ColumnDefinitions>
|
|
<ColumnDefinition Width="Auto" />
|
|
<ColumnDefinition Width="*" />
|
|
</Grid.ColumnDefinitions>
|
|
<TextBlock
|
|
Margin="0,10,0,0"
|
|
VerticalAlignment="Center"
|
|
FontSize="28"
|
|
Style="{StaticResource TitleTextBlockStyle}"
|
|
Text="Profiles" />
|
|
<CommandBar
|
|
Grid.Column="1"
|
|
HorizontalAlignment="Right"
|
|
VerticalAlignment="Top"
|
|
Background="Transparent"
|
|
DefaultLabelPosition="Right"
|
|
Visibility="{x:Bind ViewModel.SelectedShellProfile.InEditMode, Mode=OneWay, Converter={StaticResource FalseToVisibleConverter}}">
|
|
<AppBarButton
|
|
Command="{x:Bind ViewModel.SelectedShellProfile.SetDefaultCommand, Mode=OneWay}"
|
|
Icon="Accept"
|
|
IsEnabled="{x:Bind ViewModel.SelectedShellProfile.IsDefault, Mode=OneWay, Converter={StaticResource NegateConverter}}"
|
|
Label="Set Default" />
|
|
<AppBarButton
|
|
Command="{x:Bind ViewModel.CloneCommand, Mode=OneWay}"
|
|
CommandParameter="{x:Bind ViewModel.SelectedShellProfile, Mode=OneWay}"
|
|
Icon="Copy"
|
|
Label="Clone" />
|
|
<AppBarButton
|
|
Command="{x:Bind ViewModel.SelectedShellProfile.EditCommand, Mode=OneWay}"
|
|
Icon="Edit"
|
|
Label="Edit" />
|
|
<AppBarButton
|
|
Command="{x:Bind ViewModel.SelectedShellProfile.DeleteCommand, Mode=OneWay}"
|
|
Icon="Delete"
|
|
Label="Delete"
|
|
Visibility="{x:Bind ViewModel.SelectedShellProfile.PreInstalled, Mode=OneWay, Converter={StaticResource FalseToVisibleConverter}}" />
|
|
<AppBarButton
|
|
Command="{x:Bind ViewModel.SelectedShellProfile.RestoreDefaultsCommand, Mode=OneWay}"
|
|
Icon="Undo"
|
|
Label="Restore Defaults"
|
|
Visibility="{x:Bind ViewModel.SelectedShellProfile.PreInstalled, Mode=OneWay, Converter={StaticResource TrueToVisibleConverter}}" />
|
|
</CommandBar>
|
|
<CommandBar
|
|
Grid.Column="1"
|
|
HorizontalAlignment="Right"
|
|
VerticalAlignment="Top"
|
|
Background="Transparent"
|
|
DefaultLabelPosition="Right"
|
|
Visibility="{x:Bind ViewModel.SelectedShellProfile.InEditMode, Mode=OneWay, Converter={StaticResource TrueToVisibleConverter}}">
|
|
<AppBarButton
|
|
Command="{x:Bind ViewModel.SelectedShellProfile.SaveChangesCommand, Mode=OneWay}"
|
|
Icon="Save"
|
|
Label="Save" />
|
|
<AppBarButton
|
|
Command="{x:Bind ViewModel.SelectedShellProfile.CancelEditCommand, Mode=OneWay}"
|
|
Icon="Cancel"
|
|
Label="Cancel" />
|
|
</CommandBar>
|
|
</Grid>
|
|
<ScrollViewer
|
|
Grid.Row="2"
|
|
Grid.Column="0"
|
|
VerticalScrollBarVisibility="Auto">
|
|
<StackPanel Margin="{StaticResource ItemMargin}">
|
|
<ListView ItemsSource="{x:Bind ViewModel.ShellProfiles}" SelectedItem="{x:Bind ViewModel.SelectedShellProfile, Mode=TwoWay}">
|
|
<ListView.ItemTemplate>
|
|
<DataTemplate x:DataType="viewmodels:ShellProfileViewModel">
|
|
<Grid>
|
|
<Grid.ColumnDefinitions>
|
|
<ColumnDefinition Width="*" />
|
|
<ColumnDefinition Width="Auto" />
|
|
</Grid.ColumnDefinitions>
|
|
<TextBlock Grid.Column="0" Text="{x:Bind Name, Mode=OneWay}" />
|
|
<Viewbox
|
|
Grid.Column="1"
|
|
Width="16"
|
|
Height="16"
|
|
HorizontalAlignment="Right">
|
|
<SymbolIcon Symbol="Accept" Visibility="{x:Bind IsDefault, Mode=OneWay, Converter={StaticResource TrueToVisibleConverter}}" />
|
|
</Viewbox>
|
|
</Grid>
|
|
</DataTemplate>
|
|
</ListView.ItemTemplate>
|
|
<ListView.ItemContainerStyle>
|
|
<Style TargetType="ListViewItem">
|
|
<Setter Property="HorizontalContentAlignment" Value="Stretch" />
|
|
</Style>
|
|
</ListView.ItemContainerStyle>
|
|
</ListView>
|
|
<Button
|
|
Height="48"
|
|
Margin="0,12,0,0"
|
|
HorizontalAlignment="Stretch"
|
|
HorizontalContentAlignment="Left"
|
|
Background="Transparent"
|
|
Command="{x:Bind ViewModel.CreateShellProfileCommand}"
|
|
Style="{StaticResource ButtonRevealStyle}">
|
|
<Button.Content>
|
|
<StackPanel Orientation="Horizontal">
|
|
<Viewbox
|
|
Width="12"
|
|
Height="12"
|
|
Margin="0,0,6,0">
|
|
<SymbolIcon Symbol="Add" />
|
|
</Viewbox>
|
|
<TextBlock Style="{StaticResource CaptionTextBlockStyle}" Text="Create new" />
|
|
</StackPanel>
|
|
</Button.Content>
|
|
</Button>
|
|
</StackPanel>
|
|
</ScrollViewer>
|
|
<ScrollViewer
|
|
Grid.Row="2"
|
|
Grid.Column="1"
|
|
HorizontalAlignment="Stretch"
|
|
VerticalScrollBarVisibility="Auto">
|
|
<ContentControl
|
|
Margin="{StaticResource ContainerMargin}"
|
|
HorizontalContentAlignment="Stretch"
|
|
Content="{x:Bind ViewModel.SelectedShellProfile, Mode=OneWay}">
|
|
<ContentControl.ContentTemplate>
|
|
<DataTemplate x:DataType="viewmodels:ShellProfileViewModel">
|
|
<Grid HorizontalAlignment="Stretch" VerticalAlignment="Stretch">
|
|
<StackPanel Visibility="{x:Bind InEditMode, Converter={StaticResource TrueToVisibleConverter}, Mode=OneWay}">
|
|
<TextBox
|
|
Width="300"
|
|
Margin="{StaticResource ItemMargin}"
|
|
HorizontalAlignment="Left"
|
|
Header="Name"
|
|
IsEnabled="{x:Bind PreInstalled, Converter={StaticResource NegateConverter}, Mode=OneWay}"
|
|
IsSpellCheckEnabled="False"
|
|
Text="{x:Bind Name, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" />
|
|
|
|
<StackPanel Margin="{StaticResource ItemMargin}" Orientation="Horizontal">
|
|
<TextBox
|
|
Width="300"
|
|
Header="Shell executable location"
|
|
IsEnabled="{x:Bind PreInstalled, Converter={StaticResource NegateConverter}, Mode=OneWay}"
|
|
IsSpellCheckEnabled="False"
|
|
Text="{x:Bind Location, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" />
|
|
<Button
|
|
Margin="6,0,0,0"
|
|
VerticalAlignment="Bottom"
|
|
Command="{x:Bind BrowseForCustomShellCommand}"
|
|
Content="..."
|
|
IsEnabled="{x:Bind PreInstalled, Converter={StaticResource NegateConverter}, Mode=OneWay}"
|
|
Style="{StaticResource ButtonRevealStyle}" />
|
|
</StackPanel>
|
|
|
|
<StackPanel Margin="{StaticResource ItemMargin}" Orientation="Horizontal">
|
|
<TextBox
|
|
Width="300"
|
|
Header="Working directory"
|
|
IsEnabled="{x:Bind InEditMode, Mode=OneWay}"
|
|
IsSpellCheckEnabled="False"
|
|
Text="{x:Bind WorkingDirectory, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" />
|
|
<Button
|
|
Margin="6,0,0,0"
|
|
VerticalAlignment="Bottom"
|
|
Command="{x:Bind BrowseForWorkingDirectoryCommand}"
|
|
Content="..."
|
|
Style="{StaticResource ButtonRevealStyle}" />
|
|
</StackPanel>
|
|
|
|
<TextBox
|
|
Width="300"
|
|
Margin="{StaticResource ItemMargin}"
|
|
HorizontalAlignment="Left"
|
|
Header="Arguments"
|
|
IsEnabled="{x:Bind InEditMode, Mode=OneWay}"
|
|
IsSpellCheckEnabled="False"
|
|
Text="{x:Bind Arguments, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" />
|
|
|
|
<ComboBox
|
|
Width="150"
|
|
Margin="{StaticResource ItemMargin}"
|
|
Header="Tab color"
|
|
IsEnabled="{x:Bind InEditMode, Mode=OneWay}"
|
|
ItemTemplateSelector="{StaticResource TabThemeTemplateSelector}"
|
|
ItemsSource="{x:Bind TabThemes, Mode=OneWay}"
|
|
SelectedItem="{Binding SelectedTabTheme, Mode=TwoWay}" />
|
|
|
|
<ComboBox
|
|
Width="150"
|
|
Margin="{StaticResource ItemMargin}"
|
|
Header="Theme"
|
|
IsEnabled="{x:Bind InEditMode, Mode=OneWay}"
|
|
ItemTemplateSelector="{StaticResource TerminalThemeTemplateSelector}"
|
|
ItemsSource="{x:Bind TerminalThemes, Mode=OneWay}"
|
|
SelectedItem="{Binding SelectedTerminalTheme, Mode=TwoWay}" />
|
|
|
|
<StackPanel Margin="{StaticResource ItemMargin}">
|
|
<TextBlock Margin="0,0,0,8" Text="Line ending translation mode on paste" />
|
|
<RadioButton
|
|
Content="Do not modify line endings"
|
|
GroupName="LineEndingStyle"
|
|
IsChecked="{x:Bind DoNotModifyIsSelected, Mode=TwoWay}" />
|
|
<RadioButton
|
|
Content="Convert line endings to CR+LF"
|
|
GroupName="LineEndingStyle"
|
|
IsChecked="{x:Bind ToCRLFIsSelected, Mode=TwoWay}" />
|
|
<RadioButton
|
|
Content="Convert line endings to LF"
|
|
GroupName="LineEndingStyle"
|
|
IsChecked="{x:Bind ToLFIsSelected, Mode=TwoWay}" />
|
|
</StackPanel>
|
|
|
|
<StackPanel Margin="{StaticResource ItemMargin}">
|
|
<TextBlock
|
|
Margin="0,0,6,0"
|
|
VerticalAlignment="Center"
|
|
Text="Keyboard shortcut" />
|
|
<HyperlinkButton Command="{x:Bind AddKeyboardShortcutCommand}" Content="Add" />
|
|
<views:KeyBindingsView ShowCommandName="False" ViewModel="{x:Bind KeyBindings}" />
|
|
</StackPanel>
|
|
</StackPanel>
|
|
<StackPanel Visibility="{x:Bind InEditMode, Mode=OneWay, Converter={StaticResource FalseToVisibleConverter}}">
|
|
<TextBlock
|
|
Margin="{StaticResource ItemMargin}"
|
|
Style="{StaticResource SubtitleTextBlockStyle}"
|
|
Text="{x:Bind Name, Mode=OneWay}" />
|
|
|
|
<controls:HeaderedTextBlock
|
|
Margin="{StaticResource ItemMargin}"
|
|
Header="Shell executable location"
|
|
Text="{x:Bind Location, Mode=OneWay}" />
|
|
|
|
<controls:HeaderedContentControl
|
|
Margin="{StaticResource ItemMargin}"
|
|
HorizontalContentAlignment="Stretch"
|
|
Header="Working directory">
|
|
<ContentControl
|
|
Content="{x:Bind WorkingDirectory, Mode=OneWay}"
|
|
ContentTemplateSelector="{StaticResource NoValueTemplateSelector}"
|
|
FontSize="18"
|
|
FontWeight="Light" />
|
|
</controls:HeaderedContentControl>
|
|
|
|
<controls:HeaderedContentControl
|
|
Margin="{StaticResource ItemMargin}"
|
|
HorizontalContentAlignment="Stretch"
|
|
Header="Arguments">
|
|
<ContentControl
|
|
Content="{x:Bind Arguments, Mode=OneWay}"
|
|
ContentTemplateSelector="{StaticResource NoValueTemplateSelector}"
|
|
FontSize="18"
|
|
FontWeight="Light" />
|
|
</controls:HeaderedContentControl>
|
|
|
|
<controls:HeaderedContentControl
|
|
Margin="{StaticResource ItemMargin}"
|
|
HorizontalContentAlignment="Stretch"
|
|
Header="Tab color">
|
|
<ContentControl
|
|
Margin="0,6,0,0"
|
|
Content="{x:Bind SelectedTabTheme, Mode=OneWay}"
|
|
ContentTemplateSelector="{StaticResource TabThemeTemplateSelector}"
|
|
FontSize="18"
|
|
FontWeight="Light" />
|
|
</controls:HeaderedContentControl>
|
|
|
|
<controls:HeaderedContentControl
|
|
Margin="{StaticResource ItemMargin}"
|
|
HorizontalContentAlignment="Stretch"
|
|
Header="Line ending translation mode">
|
|
<ContentControl
|
|
Content="{x:Bind LineEndingStyle, Mode=OneWay, Converter={StaticResource EnumToDescriptionConverter}}"
|
|
ContentTemplateSelector="{StaticResource TerminalThemeTemplateSelector}"
|
|
FontSize="18"
|
|
FontWeight="Light" />
|
|
</controls:HeaderedContentControl>
|
|
|
|
<controls:HeaderedContentControl
|
|
Margin="{StaticResource ItemMargin}"
|
|
HorizontalContentAlignment="Stretch"
|
|
Header="Keyboard shortcut">
|
|
<ContentControl
|
|
Content="{x:Bind KeyBindings, Mode=OneWay}"
|
|
ContentTemplateSelector="{StaticResource TerminalKeybindTemplateSelector}"
|
|
FontSize="18"
|
|
FontWeight="Light" />
|
|
</controls:HeaderedContentControl>
|
|
</StackPanel>
|
|
</Grid>
|
|
</DataTemplate>
|
|
</ContentControl.ContentTemplate>
|
|
</ContentControl>
|
|
</ScrollViewer>
|
|
</Grid>
|
|
</Page>
|