85 lines
3.3 KiB
XML
85 lines
3.3 KiB
XML
<Window xmlns="https://github.com/avaloniaui"
|
|
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
|
|
xmlns:vm="clr-namespace:ClaudeDo.Ui.ViewModels.Modals"
|
|
xmlns:ctl="using:ClaudeDo.Ui.Views.Controls"
|
|
x:Class="ClaudeDo.Ui.Views.Modals.MergeModalView"
|
|
x:DataType="vm:MergeModalViewModel"
|
|
Title="Merge worktree"
|
|
Width="560" Height="460"
|
|
CanResize="False"
|
|
WindowDecorations="None"
|
|
ExtendClientAreaToDecorationsHint="True"
|
|
WindowStartupLocation="CenterOwner"
|
|
Background="{DynamicResource SurfaceBrush}">
|
|
|
|
<Window.KeyBindings>
|
|
<KeyBinding Gesture="Escape" Command="{Binding CancelCommand}"/>
|
|
</Window.KeyBindings>
|
|
|
|
<ctl:ModalShell Title="MERGE WORKTREE" CloseCommand="{Binding CancelCommand}">
|
|
<ctl:ModalShell.Footer>
|
|
<StackPanel Orientation="Horizontal" Spacing="8"
|
|
HorizontalAlignment="Right" VerticalAlignment="Center"
|
|
Margin="16,0">
|
|
<Button Content="Cancel" Command="{Binding CancelCommand}" MinWidth="90"/>
|
|
<Button Content="Merge" Classes="primary"
|
|
Command="{Binding SubmitCommand}"
|
|
IsDefault="True" MinWidth="90"/>
|
|
</StackPanel>
|
|
</ctl:ModalShell.Footer>
|
|
|
|
<!-- Body -->
|
|
<ScrollViewer Padding="20,16">
|
|
<StackPanel Spacing="12">
|
|
|
|
<TextBlock Classes="title" Text="{Binding TaskTitle, StringFormat='Merging: {0}'}" />
|
|
|
|
<StackPanel Spacing="4">
|
|
<TextBlock Classes="field-label" Text="Target branch"/>
|
|
<ComboBox ItemsSource="{Binding Branches}"
|
|
SelectedItem="{Binding SelectedBranch}"
|
|
HorizontalAlignment="Stretch"
|
|
IsEnabled="{Binding !IsBusy}" />
|
|
</StackPanel>
|
|
|
|
<CheckBox Content="Remove worktree after merge"
|
|
IsChecked="{Binding RemoveWorktree}"
|
|
IsEnabled="{Binding !IsBusy}" />
|
|
|
|
<StackPanel Spacing="4">
|
|
<TextBlock Classes="field-label" Text="Commit message"/>
|
|
<TextBox Text="{Binding CommitMessage}"
|
|
AcceptsReturn="True"
|
|
TextWrapping="Wrap"
|
|
Height="70"
|
|
IsEnabled="{Binding !IsBusy}" />
|
|
</StackPanel>
|
|
|
|
<TextBlock Text="{Binding ErrorMessage}"
|
|
Foreground="{DynamicResource BloodBrush}"
|
|
TextWrapping="Wrap"
|
|
IsVisible="{Binding ErrorMessage, Converter={x:Static ObjectConverters.IsNotNull}}" />
|
|
|
|
<Border Classes="danger-box"
|
|
IsVisible="{Binding HasConflict}">
|
|
<StackPanel Spacing="4">
|
|
<TextBlock Classes="title" Text="Conflicted files:" />
|
|
<ItemsControl ItemsSource="{Binding ConflictFiles}">
|
|
<ItemsControl.ItemTemplate>
|
|
<DataTemplate>
|
|
<TextBlock Classes="meta" Text="{Binding}" />
|
|
</DataTemplate>
|
|
</ItemsControl.ItemTemplate>
|
|
</ItemsControl>
|
|
</StackPanel>
|
|
</Border>
|
|
|
|
<TextBlock Text="{Binding SuccessMessage}"
|
|
Foreground="{DynamicResource MossBrightBrush}"
|
|
IsVisible="{Binding SuccessMessage, Converter={x:Static ObjectConverters.IsNotNull}}" />
|
|
</StackPanel>
|
|
</ScrollViewer>
|
|
|
|
</ctl:ModalShell>
|
|
</Window>
|