83 lines
4.5 KiB
XML
83 lines
4.5 KiB
XML
<Window xmlns="https://github.com/avaloniaui"
|
|
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
|
|
xmlns:vm="using:ClaudeDo.Ui.ViewModels.Conflicts"
|
|
xmlns:ctl="using:ClaudeDo.Ui.Views.Controls"
|
|
xmlns:loc="using:ClaudeDo.Ui.Localization"
|
|
x:DataType="vm:ConflictResolverViewModel"
|
|
x:Class="ClaudeDo.Ui.Views.Conflicts.ConflictResolverView"
|
|
Title="{loc:Tr conflictResolver.windowTitle}"
|
|
Width="760" Height="640" MinWidth="560" MinHeight="420"
|
|
CanResize="True"
|
|
WindowDecorations="BorderOnly"
|
|
ExtendClientAreaToDecorationsHint="True"
|
|
ExtendClientAreaTitleBarHeightHint="-1"
|
|
WindowStartupLocation="CenterOwner"
|
|
Background="{DynamicResource SurfaceBrush}">
|
|
|
|
<Window.KeyBindings>
|
|
<KeyBinding Gesture="Escape" Command="{Binding AbortCommand}"/>
|
|
</Window.KeyBindings>
|
|
|
|
<ctl:ModalShell Title="{loc:Tr conflictResolver.modalTitle}" CloseCommand="{Binding AbortCommand}">
|
|
<ctl:ModalShell.Footer>
|
|
<StackPanel Orientation="Horizontal" Spacing="8"
|
|
HorizontalAlignment="Right" VerticalAlignment="Center">
|
|
<Button Classes="btn" Content="{loc:Tr conflictResolver.continue}"
|
|
Command="{Binding ContinueCommand}" IsEnabled="{Binding CanContinue}"/>
|
|
<Button Classes="btn" Content="{loc:Tr conflictResolver.abort}" Command="{Binding AbortCommand}"/>
|
|
</StackPanel>
|
|
</ctl:ModalShell.Footer>
|
|
|
|
<Grid RowDefinitions="Auto,*" Margin="16,12">
|
|
<TextBlock Grid.Row="0" Classes="meta" Margin="0,0,0,8"
|
|
Text="{loc:Tr conflictResolver.loading}"
|
|
IsVisible="{Binding IsBusy}"/>
|
|
<TextBlock Grid.Row="0" Classes="meta" Foreground="{DynamicResource BloodBrush}"
|
|
Text="{Binding Error}" TextWrapping="Wrap"
|
|
IsVisible="{Binding Error, Converter={x:Static ObjectConverters.IsNotNull}}"/>
|
|
|
|
<ScrollViewer Grid.Row="1">
|
|
<ItemsControl ItemsSource="{Binding Files}">
|
|
<ItemsControl.ItemTemplate>
|
|
<DataTemplate x:DataType="vm:ConflictFile">
|
|
<StackPanel Spacing="8" Margin="0,0,0,16">
|
|
<TextBlock Classes="path-mono heading" Text="{Binding Path}"/>
|
|
<ItemsControl ItemsSource="{Binding Hunks}">
|
|
<ItemsControl.ItemTemplate>
|
|
<DataTemplate x:DataType="vm:ConflictHunk">
|
|
<Border BorderBrush="{DynamicResource LineBrush}" BorderThickness="1"
|
|
CornerRadius="6" Padding="10" Margin="0,0,0,8">
|
|
<StackPanel Spacing="6">
|
|
<TextBlock Classes="meta" Text="{loc:Tr conflictResolver.current}"/>
|
|
<TextBox Text="{Binding Ours, Mode=OneWay}" IsReadOnly="True"
|
|
AcceptsReturn="True" MaxHeight="120"/>
|
|
<TextBlock Classes="meta" Text="{loc:Tr conflictResolver.incoming}"/>
|
|
<TextBox Text="{Binding Theirs, Mode=OneWay}" IsReadOnly="True"
|
|
AcceptsReturn="True" MaxHeight="120"/>
|
|
<StackPanel Orientation="Horizontal" Spacing="6">
|
|
<Button Classes="btn" Content="{loc:Tr conflictResolver.acceptCurrent}"
|
|
Command="{Binding AcceptCurrentCommand}"/>
|
|
<Button Classes="btn" Content="{loc:Tr conflictResolver.acceptIncoming}"
|
|
Command="{Binding AcceptIncomingCommand}"/>
|
|
<Button Classes="btn" Content="{loc:Tr conflictResolver.acceptBoth}"
|
|
Command="{Binding AcceptBothCommand}"/>
|
|
<Button Classes="btn" Content="{loc:Tr conflictResolver.editManually}"
|
|
Command="{Binding EditManuallyCommand}"/>
|
|
</StackPanel>
|
|
<TextBlock Classes="meta" Text="{loc:Tr conflictResolver.mergedResult}"/>
|
|
<TextBox Text="{Binding Resolution, Mode=TwoWay}"
|
|
AcceptsReturn="True" MinHeight="80" MaxHeight="200"/>
|
|
</StackPanel>
|
|
</Border>
|
|
</DataTemplate>
|
|
</ItemsControl.ItemTemplate>
|
|
</ItemsControl>
|
|
</StackPanel>
|
|
</DataTemplate>
|
|
</ItemsControl.ItemTemplate>
|
|
</ItemsControl>
|
|
</ScrollViewer>
|
|
</Grid>
|
|
</ctl:ModalShell>
|
|
</Window>
|