2024-02-05 23:08:37 -08:00
|
|
|
<UserControl xmlns="https://github.com/avaloniaui"
|
|
|
|
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
|
|
|
|
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
|
|
|
|
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
|
|
|
|
xmlns:m="using:SourceGit.Models"
|
|
|
|
xmlns:vm="using:SourceGit.ViewModels"
|
|
|
|
xmlns:c="using:SourceGit.Converters"
|
2024-05-29 01:42:47 -07:00
|
|
|
xmlns:ac="using:Avalonia.Controls.Converters"
|
2024-02-05 23:08:37 -08:00
|
|
|
mc:Ignorable="d" d:DesignWidth="500" d:DesignHeight="450"
|
|
|
|
x:Class="SourceGit.Views.Pull"
|
|
|
|
x:DataType="vm:Pull">
|
|
|
|
<StackPanel Orientation="Vertical" Margin="8,0">
|
|
|
|
<TextBlock FontSize="18"
|
2024-04-02 01:23:47 -07:00
|
|
|
Classes="bold"
|
|
|
|
Text="{DynamicResource Text.Pull.Title}"/>
|
2024-05-29 01:42:47 -07:00
|
|
|
<Grid Margin="0,16,0,0" RowDefinitions="32,32,32,32,32" ColumnDefinitions="140,*">
|
2024-02-05 23:08:37 -08:00
|
|
|
<TextBlock Grid.Column="0"
|
2024-04-02 01:23:47 -07:00
|
|
|
HorizontalAlignment="Right" VerticalAlignment="Center"
|
|
|
|
Margin="0,0,8,0"
|
|
|
|
Text="{DynamicResource Text.Pull.Remote}"/>
|
2024-02-05 23:08:37 -08:00
|
|
|
<ComboBox Grid.Column="1"
|
|
|
|
Height="28" Padding="8,0"
|
|
|
|
VerticalAlignment="Center" HorizontalAlignment="Stretch"
|
|
|
|
ItemsSource="{Binding Remotes}"
|
|
|
|
SelectedItem="{Binding SelectedRemote, Mode=TwoWay}"
|
|
|
|
IsEnabled="{Binding !HasSpecifiedRemoteBranch}">
|
|
|
|
<ComboBox.ItemTemplate>
|
|
|
|
<DataTemplate x:DataType="{x:Type m:Remote}">
|
|
|
|
<StackPanel Orientation="Horizontal" Height="20" VerticalAlignment="Center">
|
|
|
|
<Path Margin="0,6,8,0" Width="14" Height="14" Fill="{DynamicResource Brush.FG1}" Data="{StaticResource Icons.Remote}"/>
|
|
|
|
<TextBlock Text="{Binding Name}"/>
|
|
|
|
</StackPanel>
|
|
|
|
</DataTemplate>
|
|
|
|
</ComboBox.ItemTemplate>
|
|
|
|
</ComboBox>
|
|
|
|
|
|
|
|
<TextBlock Grid.Row="1" Grid.Column="0"
|
2024-04-02 01:23:47 -07:00
|
|
|
HorizontalAlignment="Right" VerticalAlignment="Center"
|
|
|
|
Margin="0,0,8,0"
|
|
|
|
Text="{DynamicResource Text.Pull.Branch}"/>
|
2024-02-05 23:08:37 -08:00
|
|
|
<ComboBox Grid.Row="1" Grid.Column="1"
|
|
|
|
Height="28" Padding="8,0"
|
|
|
|
VerticalAlignment="Center" HorizontalAlignment="Stretch"
|
|
|
|
ItemsSource="{Binding RemoteBranches}"
|
|
|
|
SelectedItem="{Binding SelectedBranch, Mode=TwoWay}"
|
|
|
|
IsEnabled="{Binding !HasSpecifiedRemoteBranch}">
|
|
|
|
<ComboBox.ItemTemplate>
|
|
|
|
<DataTemplate x:DataType="{x:Type m:Branch}">
|
|
|
|
<StackPanel Orientation="Horizontal" Height="20" VerticalAlignment="Center">
|
|
|
|
<Path Margin="0,0,8,0" Width="14" Height="14" Fill="{DynamicResource Brush.FG1}" Data="{StaticResource Icons.Branch}"/>
|
2024-03-13 01:02:39 -07:00
|
|
|
<TextBlock Text="{Binding Converter={x:Static c:BranchConverters.ToName}}"/>
|
2024-02-05 23:08:37 -08:00
|
|
|
</StackPanel>
|
|
|
|
</DataTemplate>
|
|
|
|
</ComboBox.ItemTemplate>
|
|
|
|
</ComboBox>
|
|
|
|
|
|
|
|
<TextBlock Grid.Row="2" Grid.Column="0"
|
2024-04-02 01:23:47 -07:00
|
|
|
HorizontalAlignment="Right" VerticalAlignment="Center"
|
|
|
|
Margin="0,0,8,0"
|
|
|
|
Text="{DynamicResource Text.Pull.Into}"/>
|
2024-02-05 23:08:37 -08:00
|
|
|
<StackPanel Grid.Row="2" Grid.Column="1" Orientation="Horizontal" Height="20" VerticalAlignment="Center">
|
2024-05-29 01:42:47 -07:00
|
|
|
<Path Margin="2,0,8,0" Width="14" Height="14" Fill="{DynamicResource Brush.FG1}" Data="{StaticResource Icons.Branch}"/>
|
2024-02-05 23:08:37 -08:00
|
|
|
<TextBlock Text="{Binding Current.Name}"/>
|
|
|
|
</StackPanel>
|
|
|
|
|
2024-05-29 01:42:47 -07:00
|
|
|
<TextBlock Grid.Row="3" Grid.Column="0"
|
|
|
|
HorizontalAlignment="Right" VerticalAlignment="Center"
|
|
|
|
Margin="0,0,8,0"
|
|
|
|
Text="{DynamicResource Text.Pull.LocalChanges}"/>
|
|
|
|
<StackPanel Grid.Row="3" Grid.Column="1" Orientation="Horizontal">
|
|
|
|
<StackPanel.Resources>
|
|
|
|
<ac:EnumToBoolConverter x:Key="EnumToBoolConverter"/>
|
|
|
|
</StackPanel.Resources>
|
|
|
|
|
2024-06-19 00:29:40 -07:00
|
|
|
<RadioButton Content="{DynamicResource Text.Pull.LocalChanges.DoNothing}"
|
|
|
|
GroupName="LocalChanges"
|
|
|
|
IsChecked="{Binding PreAction, Mode=TwoWay, Converter={StaticResource EnumToBoolConverter}, ConverterParameter={x:Static m:DealWithLocalChanges.DoNothing}}"/>
|
2024-05-29 01:42:47 -07:00
|
|
|
<RadioButton Content="{DynamicResource Text.Pull.LocalChanges.StashAndReply}"
|
|
|
|
GroupName="LocalChanges"
|
2024-06-19 00:29:40 -07:00
|
|
|
Margin="8,0,0,0"
|
2024-05-29 01:42:47 -07:00
|
|
|
IsChecked="{Binding PreAction, Mode=TwoWay, Converter={StaticResource EnumToBoolConverter}, ConverterParameter={x:Static m:DealWithLocalChanges.StashAndReaply}}"/>
|
|
|
|
<RadioButton Content="{DynamicResource Text.Pull.LocalChanges.Discard}"
|
|
|
|
GroupName="LocalChanges"
|
|
|
|
Margin="8,0,0,0"
|
|
|
|
IsChecked="{Binding PreAction, Mode=TwoWay, Converter={StaticResource EnumToBoolConverter}, ConverterParameter={x:Static m:DealWithLocalChanges.Discard}}"/>
|
|
|
|
</StackPanel>
|
2024-02-05 23:08:37 -08:00
|
|
|
|
|
|
|
<CheckBox Grid.Row="4" Grid.Column="1"
|
2024-05-29 01:42:47 -07:00
|
|
|
Content="{DynamicResource Text.Pull.UseRebase}"
|
|
|
|
IsChecked="{Binding UseRebase, Mode=TwoWay}"/>
|
2024-02-05 23:08:37 -08:00
|
|
|
</Grid>
|
|
|
|
</StackPanel>
|
|
|
|
</UserControl>
|